Merge pull request #5 from fleetbase/dev-v0.2.2

Patch branding settings by saving logo/icon file id and generate secu…

app/controllers/console/admin/branding.js

@@ -94,8 +94,9 @@ export default class ConsoleAdminBrandingController extends Controller {
                 path: `uploads/system`,
                 type: `system`,
             },
-            ({ url }) => {
-                this.model.icon_url = url;
+            (uploadedFile) => {
+                this.model.icon_uuid = uploadedFile.id;
+                this.model.icon_url = uploadedFile.url;
                 this.isLoading = false;
             }
         );
@@ -116,8 +117,9 @@ export default class ConsoleAdminBrandingController extends Controller {
                 path: `uploads/system`,
                 type: `system`,
             },
-            ({ url }) => {
-                this.model.logo_url = url;
+            (uploadedFile) => {
+                this.model.logo_uuid = uploadedFile.id;
+                this.model.logo_url = uploadedFile.url;
                 this.isLoading = false;
             }
         );

app/models/brand.js

@@ -1,8 +1,13 @@
 import Model, { attr } from '@ember-data/model';
 
 export default class BrandModel extends Model {
+    /** @ids */
     @attr('string') uuid;
-    @attr('string') icon_url;
-    @attr('string') logo_url;
+    @attr('string') logo_uuid;
+    @attr('string') icon_uuid;
+
+    /** @attributes */
     @attr('string') default_theme;
+    @attr('string') logo_url;
+    @attr('string') icon_url;
 }

app/serializers/brand.js

@@ -0,0 +1,4 @@
+import ApplicationSerializer from '@fleetbase/ember-core/serializers/application';
+import { EmbeddedRecordsMixin } from '@ember-data/serializer/rest';
+
+export default class BrandSerializer extends ApplicationSerializer.extend(EmbeddedRecordsMixin) {}

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/console",
-    "version": "0.2.1",
+    "version": "0.2.2",
     "private": true,
     "description": "Fleetbase Console",
     "repository": "",