Added admin step to save base state of dash app

Mark Gibbs · Mark Gibbs · commit eb06c989cedc · 2018-05-11T14:34:57.000-07:00
diff --git a/demo/demo/templates/index.html b/demo/demo/templates/index.html
@@ -3,15 +3,15 @@
 {%load plotly_dash%}
   <title>Simple stuff</title>
 <body>
-  <div width="300">
+  <div>
     Content here
-    {%plotly_item "simpleexample-1"%}
+    {%plotly_item "simpleexample-1" ratio=0.2 %}
   </div>
   <div>
     Content here
     {%plotly_item "SimpleExample"%}
   </div>
-  <div width="800">
+  <div>
     Content here
     {%plotly_item "Ex2"%}
   </div>
diff --git a/django_plotly_dash/dash_wrapper.py b/django_plotly_dash/dash_wrapper.py
@@ -36,7 +36,10 @@ def get_app_instance_by_id(id):
     return nd_apps.get(id,None)
 
 def clear_app_instance(id):
-    del nd_apps[id]
+    try:
+        del nd_apps[id]
+    except:
+        pass
 
 def get_or_form_app(id, name, **kwargs):
     '''
@@ -170,6 +173,22 @@ def augment_initial_layout(self, base_response):
         return HttpResponse(response_data,
                             content_type=base_response.mimetype)
 
+    def walk_tree_and_extract(self, data, target):
+        if isinstance(data, dict):
+            for key in ['children','props',]:
+                self.walk_tree_and_extract(data.get(key,None),target)
+            ident = data.get('id', None)
+            if ident is not None:
+                idVals = target.get(ident,{})
+                for key, value in data.items():
+                    if key not in ['props','options','children','id']:
+                        idVals[key] = value
+                if len(idVals) > 0:
+                    target[ident] = idVals
+        if isinstance(data, list):
+            for element in data:
+                self.walk_tree_and_extract(element, target)
+
     def walk_tree_and_replace(self, data):
         # Walk the tree. Rely on json decoding to insert instances of dict and list
         # ie we use a dna test for anatine, rather than our eyes and ears...
diff --git a/django_plotly_dash/models.py b/django_plotly_dash/models.py
@@ -57,7 +57,40 @@ def get_app_instance(id):
         dd = get_app_by_name(id)
         return dd.form_dash_instance()
 
+    def _get_base_state(self):
+        '''
+        Get the base state of the object, as defined by the app.layout code, as a python dict
+        '''
+        # Get base layout response, from a base object
+        base_app_inst = get_app_instance_by_id(self.app_name)
+        if not base_app_inst:
+            base_app = get_app_by_name(self.app_name)
+            base_app_inst = base_app.form_dash_instance()
+
+        base_resp = base_app_inst.locate_endpoint_function('dash-layout')()
+
+        base_obj = json.loads(base_resp.data.decode('utf-8'))
+
+        # Walk the base layout and find all values; insert into base state map
+        obj = {}
+        base_app_inst.walk_tree_and_extract(base_obj, obj)
+        return obj
+
+    def populate_values(self):
+        '''
+        Add values from the underlying dash layout configuration
+        '''
+        obj = self._get_base_state()
+        self.base_state = json.dumps(obj)
+
 class DashAppAdmin(admin.ModelAdmin):
-    list_display = ['app_name','instance_name','slug','creation','update',]
+    list_display = ['instance_name','app_name','slug','creation','update',]
     list_filter = ['app_name','creation','update',]
 
+    def _populate_values(self, request, queryset):
+        for da in queryset:
+            da.populate_values()
+            da.save()
+    _populate_values.short_description = "Populate app"
+
+    actions = ['_populate_values',]
diff --git a/django_plotly_dash/views.py b/django_plotly_dash/views.py
@@ -37,10 +37,13 @@ def update(request, id, **kwargs):
             resp = mFunc()
     else:
         # Use direct dispatch with extra arguments in the argMap
+        print("Update args")
+        print(rb)
         argMap = {'id':id,
                   'request':request,
                   'session':request.session}
         resp = app.dispatch_with_args(rb, argMap)
+        print(resp.data)
 
     return HttpResponse(resp.data,
                         content_type=resp.mimetype)
