From 3b5ffcd464f2c10a2624109527888a35fe00e94a Mon Sep 17 00:00:00 2001
From: niklastheman <e.niklas.holmstrom@gmail.com>
Date: Wed, 5 Apr 2023 13:49:31 +0200
Subject: [PATCH] Feature/SK-410 | App logos should not be stored on objects
 but read from statics folder  (#113)

---
 fixtures/apps_fixtures.json | 26 +++++++++++++-------------
 models.py                   |  5 +----
 templates/app_table.html    |  3 ++-
 templates/new.html          |  4 +++-
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/fixtures/apps_fixtures.json b/fixtures/apps_fixtures.json
index 72be3e5e9..2068454cb 100644
--- a/fixtures/apps_fixtures.json
+++ b/fixtures/apps_fixtures.json
@@ -25,7 +25,7 @@
       }
   },
   "chart": "apps/mongo-express/chart",
-  "logo": "apps/mongo-express/logo.png",
+  "logo": "mongo-express-logo.png",
   "updated_on": "2021-03-10T19:45:03.927Z",
   "created_on": "2021-02-19T21:34:37.815Z"
   }
@@ -60,7 +60,7 @@
       }
     },
     "chart": "apps/mongodb/chart",
-    "logo": "apps/mongodb/logo.png",
+    "logo": "mongodb-logo.png",
     "updated_on": "2021-03-10T19:45:03.927Z",
     "created_on": "2021-02-19T21:34:37.815Z"
   }
@@ -97,7 +97,7 @@
       }
   },
   "chart": "apps/fedn-combiner/chart",
-  "logo": "apps/fedn-combiner/logo.png",
+  "logo": "fedn-combiner-logo.png",
   "updated_on": "2021-03-10T19:45:03.927Z",
   "created_on": "2021-02-19T21:34:37.815Z"
   }
@@ -136,7 +136,7 @@
       }
     },
     "chart": "apps/fedn-reducer/chart",
-    "logo": "apps/fedn-reducer/logo.png",
+    "logo": "fedn-reducer-logo.png",
     "updated_on": "2021-03-10T19:45:03.927Z",
     "created_on": "2021-02-19T21:34:37.815Z"
   }
@@ -188,7 +188,7 @@
         }
       },
       "chart": "apps/docker-registry/chart",
-      "logo": "apps/docker-registry/logo.png",
+      "logo": "docker-registry-logo.png",
       "updated_on": "2021-03-10T19:45:03.927Z",
       "created_on": "2021-02-19T21:34:37.815Z"
     }
@@ -237,7 +237,7 @@
         "export-cli": "True"
       },
       "chart": "apps/jupyter-lab/chart",
-      "logo": "apps/jupyter-lab/logo.png",
+      "logo": "jupyter-lab-logo.png",
       "updated_on": "2021-03-10T19:45:03.927Z",
       "created_on": "2021-02-19T21:34:37.815Z"
     }
@@ -290,7 +290,7 @@
         }
       },
       "chart": "apps/minio/chart",
-      "logo": "apps/minio/logo.png",
+      "logo": "minio-logo.png",
       "updated_on": "2021-03-10T19:45:03.927Z",
       "created_on": "2021-02-19T21:34:37.815Z"
     }
@@ -343,7 +343,7 @@
         }
       },
       "chart": "apps/mlflow/chart",
-      "logo": "apps/mlflow/logo.png",
+      "logo": "mlflow-logo.png",
       "updated_on": "2021-03-10T19:45:03.927Z",
       "created_on": "2021-02-19T21:34:37.815Z"
     }
@@ -399,7 +399,7 @@
         "publishable": "true"
       },
       "chart": "apps/mlflow-serve/chart",
-      "logo": "apps/mlflow-serve/logo.png",
+      "logo": "mlflow-serve-logo.png",
       "updated_on": "2021-03-10T19:45:03.927Z",
       "created_on": "2021-02-19T21:34:37.815Z"
     }
@@ -448,7 +448,7 @@
         "publishable": "true"
       },
       "chart": "apps/tensorflow-serve/chart",
-      "logo": "apps/tensorflow-serve/logo.png",
+      "logo": "tensorflow-serve-logo.png",
       "updated_on": "2021-03-10T19:45:03.927Z",
       "created_on": "2021-02-19T21:34:37.815Z"
     }
@@ -515,7 +515,7 @@
         "publishable": "true"
       },
       "chart": "apps/pytorch-serve/chart",
-      "logo": "apps/pytorch-serve/logo.png",
+      "logo": "pytorch-serve-logo.png",
       "updated_on": "2021-03-10T19:45:03.927Z",
       "created_on": "2021-02-19T21:34:37.815Z"
     }
@@ -568,7 +568,7 @@
         }
       },
       "chart": "apps/volumeK8s/chart",
-      "logo": "apps/volumeK8s/logo.png",
+      "logo": "volumeK8s-logo.png",
       "updated_on": "2021-03-10T19:45:03.927Z",
       "created_on": "2021-02-19T21:34:37.815Z"
     }
@@ -609,7 +609,7 @@
         }
       },
       "chart": "apps/vscode/chart",
-      "logo": "charts/apps/vscode/logo.png",
+      "logo": "vscode-logo.png",
       "updated_on": "2021-03-10T19:45:03.927Z",
       "created_on": "2021-02-19T21:34:37.815Z"
     }
diff --git a/models.py b/models.py
index eac7ef6ea..b485caf99 100644
--- a/models.py
+++ b/models.py
@@ -33,10 +33,7 @@ class Apps(models.Model):
     chart_archive = models.FileField(upload_to="apps/", null=True, blank=True)
     created_on = models.DateTimeField(auto_now_add=True)
     description = models.TextField(blank=True, null=True, default="")
-    logo = models.CharField(max_length=512, default="")
-    logo_file = models.ImageField(
-        upload_to="apps/logos", null=True, blank=True
-    )
+    logo = models.CharField(max_length=512, null=True, blank=True)
     name = models.CharField(max_length=512)
     priority = models.IntegerField(default=100)
     projects = models.ManyToManyField("projects.Project")
diff --git a/templates/app_table.html b/templates/app_table.html
index 30cfcb692..39aefedc1 100644
--- a/templates/app_table.html
+++ b/templates/app_table.html
@@ -15,7 +15,8 @@
   <tbody>
     {% for appinstance in appinstances %}
     <tr>
-        <td><img src="{{ media_url }}{{ appinstance.app.logo_file }}" class="img-fluid " style="max-height:25px;"></td>
+        {% static 'images/logos/apps/' as static_url %}
+        <td><img src="{{static_url}}{{appinstance.app.logo|default:'default-logo.png'}}" class="img-fluid " style="max-height:25px;"></td>
         <td>{{ appinstance.app.name }}</td>
         <td>{{ appinstance.name }}</td>
         {% if appinstance.table_field.url %}
diff --git a/templates/new.html b/templates/new.html
index 8f3ea07ee..8c428dc8f 100644
--- a/templates/new.html
+++ b/templates/new.html
@@ -53,7 +53,9 @@ <h3>{{ app.name }}</h3>
                         </div>
                     </div>
                     <div class="col-4">
-                        <img src="{{ media_url }}{{ app.logo_file }}" class="img-fluid float-end" style="height:100px;"
+
+                        {% static 'images/logos/apps/' as static_url %}
+                        <img src="{{static_url}}{{app.logo|default:'default-logo.png'}}" class="img-fluid float-end" style="height:100px;"
                             alt="App Logo">
                     </div>
                 </div>