Update Dockerfiles and docker-compose config

Django/data/heatmap/heatmap.py

@@ -117,10 +117,12 @@ class ClusteredHeatmap:
         self.fig = sns.clustermap(self.correlation, row_linkage=link,
                                   col_linkage=link, **self.seaborn_options)
 
+        """
         if self.annotated:
             for label, color in self.annotation_legend.items():
                 self.fig.ax_col_dendrogram.bar(0, 0, color=color, label=label, linewidth=0)
             self.fig.ax_col_dendrogram.legend(loc="center", ncol=4)
+        """
 
         self.highlighted = self.fig
 

Django/data/views.py

@@ -33,9 +33,9 @@ def query_handler(request):
     print("Options: %s" % (str(options)))
     heatmap = ClusteredHeatmap(params["species"], options)
     heatmap.add_filters(filters)
-    heatmap.add_highlights(highlights)
     if params["annotated"] != "":
         heatmap.annotate_field(params["annotated"])
+    heatmap.add_highlights(highlights)
     request.session['legend'] = heatmap.annotation_legend
     print(heatmap)
     return heatmap
@@ -53,6 +53,7 @@ def get_image(request):
     request.session.save()
     print("Session key (image): \n%s" % (str(request.session.session_key)))
     print("Session legend: \n%s" % (str(request.session['legend'])))
+    request.session.set_test_cookie()
     return response
 
 
@@ -63,6 +64,7 @@ def get_legend(request):
     #    return HttpResponse()
     #heatmap = query_handler(request)
     #legend = json.dumps(heatmap.annotation_legend)
+    print("Test cookie worked: %s" %(str(request.session.test_cookie_worked())))
     print("Session key (legend): \n%s" % (str(request.session.session_key)))
     print("Session legend: \n%s" % (str(request.session['legend'])))
     legend = json.dumps(request.session['legend'])

docker-compose.yaml

@@ -4,16 +4,17 @@ services:
   dj:
     container_name: dj
     build: Django
-    command: python manage.py runserver 0.0.0.0:80
+    command: python3.8 manage.py runserver
     volumes:
       - ./Django:/code
       - /tmp/.X11-unix:/tmp/.X11-unix
     ports:
-      - "80:80"
+      - "8000:8000"
     environment:
       - DISPLAY=unix:0
   ng:
     container_name: ng
     build: Angular
+    command: ng serve
     ports:
-      - "8080:80"
+      - "8080:4200"