Merge pull request #1528 from the-deep/fix/json-export

Fix json export and exportable

apps/analysis_framework/serializers.py

@@ -656,6 +656,7 @@ def update(self, instance, validated_data):
         if instance.created_by_id and not instance.members.filter(id=instance.created_by_id).exists():
             owner_role = instance.get_or_create_owner_role()
             instance.add_member(instance.created_by, owner_role)
+
         ProjectChangeManager.log_framework_update(instance.pk, self.context['request'].user)
         self._post_save(instance)
         return instance

apps/export/entries/json_exporter.py

@@ -8,8 +8,14 @@ def __init__(self, is_preview=False):
         self.is_preview = is_preview
         self.data = {}
 
-    def load_exportables(self, exportables):
-        self.exportables = exportables
+    def load_exportables(self, exportables, analysis_framework):
+        # get all widget key name in list
+        widgets_key = Widget.objects.filter(analysis_framework=analysis_framework).values_list(
+            'key',
+            flat=True
+        )
+        # exclude widgets_key which are not in exportables table
+        self.exportables = exportables.filter(widget_key__in=widgets_key)
         self.widget_ids = []
 
         self.data['widgets'] = []

apps/export/tasks/tasks_entries.py

@@ -123,7 +123,7 @@ def export_entries(export):
 
     elif export_type == Export.ExportType.JSON:
         export_data = JsonExporter(is_preview=is_preview)\
-            .load_exportables(exportables)\
+            .load_exportables(exportables, project.analysis_framework)\
             .add_entries(entries_qs)\
             .export()