clear code and fix white labeling bugs

Author: blackstar-baba

application/src/main/java/org/thingsboard/server/controller/WhiteLabelController.java

@@ -3,7 +3,11 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.base.Charsets;
-import freemarker.template.Configuration;
+import io.bit3.jsass.Compiler;
+import io.bit3.jsass.Options;
+import io.bit3.jsass.Output;
+import io.bit3.jsass.OutputStyle;
+import io.bit3.jsass.importer.Import;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
@@ -19,25 +23,19 @@
 import org.thingsboard.server.common.data.whitelabel.PaletteSettings;
 import org.thingsboard.server.dao.settings.AdminSettingsService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
-import io.bit3.jsass.Compiler;
-import io.bit3.jsass.Options;
-import io.bit3.jsass.Output;
-import io.bit3.jsass.OutputStyle;
-import io.bit3.jsass.importer.Import;
 
 import javax.annotation.PostConstruct;
 import java.net.URI;
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 
 @RequiredArgsConstructor
 @RestController
 @TbCoreComponent
 @RequestMapping("/api")
 public class WhiteLabelController extends BaseController{
 
-    @Autowired
-    private Configuration freemarkerConfig;
-
     @Autowired
     private AdminSettingsService adminSettingsService;
 
@@ -82,7 +80,7 @@ private void initCompiler() throws Exception {
             } else if (fileName != null) {
                 URI scssFileUri = scssResource.getURI();
                 Import scssImport = new Import(scssFileUri, scssFileUri, scssContent);
-                String path = fileName.substring(0, fileName.length() - ".scss".length());
+                String path = fileName.substring(0, fileName.length() - SCSS_EXTENSION.length());
                 this.importMap.put(path, scssImport);
             }
         }

ui-ngx/src/app/core/services/whitelabel-utils.service.ts

@@ -23,7 +23,7 @@ import {LocalStorageService} from "@core/local-storage/local-storage.service";
 import {AdminService} from "@core/http/admin.service";
 import {DOCUMENT} from "@angular/common";
 import {WhiteLabelService} from "@core/http/white-label.service";
-import {WhiteLabeling} from "@shared/models/settings.models";
+import {Palette, WhiteLabeling} from "@shared/models/settings.models";
 import {whiteLabeling as wl} from "@global/white-labeling";
 import {ActionSettingsChangeLanguage} from "@core/settings/settings.actions";
 import {select, Store} from "@ngrx/store";
@@ -44,8 +44,6 @@ export class WhitelabelUtilsService {
 
   appThemeCss: String;
 
-  // tempAppThemeCss: String;
-
   loginThemeCssElm: any;
 
   appThemeCssElm: any;
@@ -91,6 +89,9 @@ export class WhitelabelUtilsService {
   setup():Observable<WhiteLabeling>{
     return this.whiteLabelService.getWhiteLabel().pipe(
       map((whiteLabel)=>{
+        if (!whiteLabel) {
+          whiteLabel = this.getDefaultWhiteLabeling();
+        }
         this.whiteLabeling = this.mergeWithConst(whiteLabel);
         this.process(true);
         return whiteLabel;
@@ -112,6 +113,26 @@ export class WhitelabelUtilsService {
     );
   }
 
+  getDefaultWhiteLabeling(): WhiteLabeling {
+    return {
+      appTitle: null,
+      customCss: null,
+      enableHelpLinks: false,
+      faviconUrl: null,
+      helpLinkBaseUrl: null,
+      logoImageHeight: null,
+      logoImageUrl: null,
+      paletteSettings: {
+        primaryPalette: null,
+        accentPalette: null
+      },
+      platformName: null,
+      platformVersion: null,
+      showNameVersion: false,
+      whiteLabelingEnabled: true
+    }
+  }
+
   setupLoginTheme():Observable<void> {
     this.addLoginTheme();
     return this.whiteLabelService.getLoginTheme(this.whiteLabeling).pipe(

ui-ngx/src/app/modules/home/pages/admin/white-labeling.component.ts

@@ -4,11 +4,11 @@ import { AppState } from '@core/core.state';
 import { PageComponent } from '@shared/components/page.component';
 import { Router } from '@angular/router';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import {WhiteLabeling} from '@shared/models/settings.models';
-import { WhiteLabelService } from '@core/http/white-label.service';
 import { HasConfirmForm } from '@core/guards/confirm-on-exit.guard';
-import {WhitelabelUtilsService} from "@core/services/whitelabel-utils.service";
-import {MaterialColorItem, materialColors} from '@app/shared/models/material.models';
+import { MaterialColorItem } from '@app/shared/models/material.models';
+import { WhiteLabeling } from '@shared/models/settings.models';
+import { WhiteLabelService } from '@core/http/white-label.service';
+import { WhitelabelUtilsService } from "@core/services/whitelabel-utils.service";
 
 @Component({
   selector: 'tb-white-labeling',
@@ -39,6 +39,9 @@ export class WhiteLabelingComponent extends PageComponent implements OnInit, Has
     this.buildWhitelabelingSettingsForm();
     this.whiteLabelService.getWhiteLabel().subscribe(
       (whiteLabel) => {
+        if(!whiteLabel) {
+          whiteLabel = this.whiteLabelUtilsService.getDefaultWhiteLabeling();
+        }
         this.whiteLabeling = whiteLabel;
         this.whiteLabelingSettings.reset(this.whiteLabeling);
       }