2.1 release (#99)

* Non-working- upgraded with 1013 * initial commit * initial commit 2 * updated version and image fix * optimized AppService calls * updated with 1015 * updated with plugin support in widget catalog * Added validation for simulators * widget catalog upgraded to support plugins * reverted code in simulator manager service * ngx-echart added as part of app builder core build * Added plugin specific code changes in widget details component * plugin verfication feature implemented * Added progress indicator while installing,updating and deleting plugins * updated plugin verification logic * Hide progress modal after uninstall * upgraded timeout * updated delaytimeout * removed echart widget module * CSS Changes in widget catalog * Added pluginType entry in grid and list view, fixed simulator issue * Dashboard Catalog Changes to Support Plugins * Code changes w.r.t Plugin Install/Uninstall/Update * Lock Dashboard, Search Dashboard and Branding Issue related code changes * updated for seamless upgrade from 1.3.x to 1.4.x * updated package.json * updated with dev branch and verify widget update for seamless upgrade from 1.3.2 * Search Dashboard With Reordering Issue Fixed * Branding issue fixed * Lock Dashboard code issue fix * Lock Unlock icon css, branding issue fix when primary color is white * Drag and drop issue fixed * Drag and Drop issue fix on search * plugin installation * search dashboard issue fix and simulator code change to add required interval for new device * Branding issue w.r.t pagination * added overall progress bar and changed widget catalog to plugin catalog * updated with upgrade changes * updated with plugin message * added context-path condition to restict app builder upgrade notification * dashboard catalog changes * initial commit with version upgrade * 1.3.2 dev (#76) * updated with global role - poc * updated with global role implementation * updated dashboard catalog for role based access * updated with role base access for tab group and navigation dashboard * updated: removed console log * added role based access * updated simulator error message * added tree view for dashboard * added file for dahsboard hierarchy * Tree Structure Code Changes * CSS Changes w.r.t tree structure * Tree Structure css changes * Added CSS to show hide collapse button * bug fixed in group template * Tree Structure Code Changes * Tree Structure Code Changes * context-path app issue resolved * drag n drop issue solution * Code changes w.r.t Dashboard Structure * css changes w.r.t tree structure * updated with isDashboard flag * Code changes w.r.t tree structure * css changes in tree structure * update styling * update styling * Widget Details page issue fixed for Smart Map Widget * added expand all feature, fixed title and branding issue * fixed issue related to tree structure * installed new version of external assets binary * removed console log * Removed inline styles in dashboard config component Co-authored-by: Darpankumar Lalani <darpankumar.lalani@softwareag.com> * updated with new plugin service api integration * updated readme for 1.3.2 release * updated readme * 1.3.2 dev (#77) * updated with global role - poc * updated with global role implementation * updated dashboard catalog for role based access * updated with role base access for tab group and navigation dashboard * updated: removed console log * added role based access * updated simulator error message * added tree view for dashboard * added file for dahsboard hierarchy * Tree Structure Code Changes * CSS Changes w.r.t tree structure * Tree Structure css changes * Added CSS to show hide collapse button * bug fixed in group template * Tree Structure Code Changes * Tree Structure Code Changes * context-path app issue resolved * drag n drop issue solution * Code changes w.r.t Dashboard Structure * css changes w.r.t tree structure * updated with isDashboard flag * Code changes w.r.t tree structure * css changes in tree structure * update styling * update styling * Widget Details page issue fixed for Smart Map Widget * added expand all feature, fixed title and branding issue * fixed issue related to tree structure * installed new version of external assets binary * removed console log * Removed inline styles in dashboard config component * Lock and unlock dashboard title change Co-authored-by: Darpankumar Lalani <darpankumar.lalani@softwareag.com> * updated readme * 1.3.2 dev (#78) * updated with global role - poc * updated with global role implementation * updated dashboard catalog for role based access * updated with role base access for tab group and navigation dashboard * updated: removed console log * added role based access * updated simulator error message * added tree view for dashboard * added file for dahsboard hierarchy * Tree Structure Code Changes * CSS Changes w.r.t tree structure * Tree Structure css changes * Added CSS to show hide collapse button * bug fixed in group template * Tree Structure Code Changes * Tree Structure Code Changes * context-path app issue resolved * drag n drop issue solution * Code changes w.r.t Dashboard Structure * css changes w.r.t tree structure * updated with isDashboard flag * Code changes w.r.t tree structure * css changes in tree structure * update styling * update styling * Widget Details page issue fixed for Smart Map Widget * added expand all feature, fixed title and branding issue * fixed issue related to tree structure * installed new version of external assets binary * removed console log * Removed inline styles in dashboard config component * Lock and unlock dashboard title change * change in create dashboard Co-authored-by: Darpankumar Lalani <darpankumar.lalani@softwareag.com> * updated version * updated for dev testing * update with remove unused binary and upgrade service merge fixed * Fixed issues * added code for c8y1015 compatibility * Reverted catalog name to widget catalog * external asset service updated simulator max restrctions added widget catalog no widgets message updated * updated error handling in template catalog json * code updated for preprod branch * Dynamic select of dev/preprod branch, css fix in widget catalog and edit dashboard issue fix * Upgraded c8y to 1016.0.93 * updated by removing basic auth in simulator * Fixed undefined error in Applications page * updated with subscribe tenant fix. error handling incase of widget is assigned to different tenant * updated message for subscribed app builder bug fix for app with context path icon * updated to 1016.0.109 * updated with selectable dashboard path * url modified for template details * added support for assets in dashboard catalog * updated error handling in verify plugin * Added Under Maintenance Code * Updated under maintenance check * 1.3.3 dev (#81) * 1.3.3 code changes * Updated check in under maintenance * Updated warning message w.r.t sub-tenant * reset config remotes while updating application * Updated c8y version to 1011.0.38 * Updated package version * Removed console logs * reverted console logs and removed commented code * change label * demo catalog multiple version support added * added support for multiple demo catalog version * added iscompatible check * Custom Branding and Branding Issue Code Changes * Changes in app list component * Fixed issue in verify widget compatibility method * Custom Branding issue fixed * Fixed Custom Branding Issue * Updated condition in findInstalledWidget method * RC flag removed * updated readme * Updated readme for 1.3.3 release * update implementation to get list of packages * Custom Branding Code Changes and fixed other issues * Code Changes w.r.t direct install of app builder from administration * Bug fix for app with context path (#83) * bug fix for app with context path * Changes while uninstalling widgets * Branding Issue fixed * App Builder Home page changes * Added await and changes while installing plugins * Changes in direct install of app builder * Changes in direct install method * added exception handling * added changes for clone app logic * Changes in app builder direct install * Default view changed to list view for dashboards * css issue fixed in list view * Improved simulator locking behaviour. Avoided lock check logic if there is no simulator created * White line branding issue and App builder direct install code fix * updated messaging text * Changes w.r.t app builder external assets * removed duplicate code * Branding Issue and Dashboard Config issue fixed * Dashboard General Code Changes * fix dashboard config issue * RC tag removed * updated based on latest changes in 2.0 * updated with label changed * 2.0.0 dev 1 (#87) * Compatible check added while installing widgets in direct install method * Fixed issues for lock/unlock tab navigator data explorer * Copy Clipboard Feature and Dark Theme Issue Fixed * added logic for indirect install for demo catalog widget * dark theme issue fixed * Updated Readme * updated readme * updated readme * Updated readme with how to sections * Updated document * branding issue of icons fixed, smart rules, alarms, data explorer fixed * Update README.md * updated readme * Updated readme --------- Co-authored-by: Darpankumar Lalani <darpankumar.lalani@softwareag.com> * 2.0.0 dev 1 (#88) * Compatible check added while installing widgets in direct install method * Fixed issues for lock/unlock tab navigator data explorer * Copy Clipboard Feature and Dark Theme Issue Fixed * added logic for indirect install for demo catalog widget * dark theme issue fixed * Updated Readme * updated readme * updated readme * Updated readme with how to sections * Updated document * branding issue of icons fixed, smart rules, alarms, data explorer fixed * Update README.md * updated readme * Updated readme * search dashboard code changes --------- Co-authored-by: Darpankumar Lalani <darpankumar.lalani@softwareag.com> * update packages * 2.0.0 dev 1 (#89) * Compatible check added while installing widgets in direct install method * Fixed issues for lock/unlock tab navigator data explorer * Copy Clipboard Feature and Dark Theme Issue Fixed * added logic for indirect install for demo catalog widget * dark theme issue fixed * Updated Readme * updated readme * updated readme * Updated readme with how to sections * Updated document * branding issue of icons fixed, smart rules, alarms, data explorer fixed * Update README.md * updated readme * Updated readme * search dashboard code changes * updated with condition --------- Co-authored-by: Sheethal JR <sjr@softwareag.com> * Updated Readme * Updated readme * Updated with video link * 2.1.0 dev merge (#98) * Initial commit * updated simulators for styling * branding updates for 2.1.0 * #92,warning icon-mywidgests,default theme branding * issue #75- validating if simulator name exists * issue#74- forced min not to be greater than max * group template - Type support added * updated power by logo * fixed control by operation issue for browser based simulator * updated 1018.0.151 * default brand for custom styling is updated * added with Type option in dashboard catalog * code refactor * reverted to 1018.0.125 * widget catalog deprecation warning added * updated home screen * updated message * added ids for automation * device type added in simulator along with css and id changes for automation * globalpresales logo added for branding --------- Co-authored-by: YashPShah-swag <yash.pshah@softwareag.com> * updated image and css * updated version * Device availability issue fixed for browser based simulator * updated headers for simulator --------- Co-authored-by: Sheethal JR (SJR) <Sheethal.JR@softwareag.com> Co-authored-by: SheethalJR <99970126+SheethalJR@users.noreply.github.com> Co-authored-by: Sheethal JR <sjr@softwareag.com> Co-authored-by: YashPShah-swag <yash.pshah@softwareag.com>
Cumulocity-IoT · Dec 1, 2023 · 6835710 · 6835710
1 parent f4b39f7
commit 6835710
Show file tree

Hide file tree

Showing 88 changed files with 3,632 additions and 2,636 deletions.
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1,2 @@
+registry=https://registry.npmjs.org/
+@c8y:registry=https://download.cumulocity.com/npm/
diff --git a/README.md b/README.md
@@ -6,15 +6,14 @@ Application Builder is an open-source tool for you to create web applications
 
 ## What's new?
 
-* **Widgets turned plugins:** Application builder now support micro-frontend plugins. Standard widgets are already available as plugin in widget catalog.
-* **Optimized Performance:** Application builder now provide faster response times, reduced resource usage, and improved user experience.
-* **Custom Branding:** Provides flexibility and control over application’s look and feel.
-* **Dashboards:** Simplified the dashboard navigation by introducing path while creating dashboard.
-* **Seamless upgrade experience:** Upgrade of application builder made simpler. [Click here for more detail.](#how-to-upgrade-application-builder-to-20)
-* **Cumulocity upgrade:** Application Builder is now based on Cumulocity 1016.0.170
+* **New default branding:** Introducing our new default branding, Inspired by Delite 2.0 – Software AG's in-house design system.
+* **Enhanced group template dashboard:** Give an identical dashboard to every device/asset based on its type.
+* **Enhanced dashboard catalog:** Now you can create dashboard based on device group and asset/device type using pre-design dashboard templates.
+* **Dashboard catalog reloaded:** Experience the next level with our latest dashboard templates for Predictive Maintenance, Smart Field Services, and Smart Billing—Now with one-click Microservice installation!
+* **Enhanced Branding:** Various improvement in overall branding.
+* **Cumulocity upgrade:** Application Builder is now based on Cumulocity 1018.0.125
 * **Various bug fixes**
 
-
 ## Features
 * **Browser-based Device Simulators:** Create device simulators that run directly in your browser.
 * **DTDL Simulator:** User can now create simulator based on [DTDL](https://github.com/Azure/opendigitaltwins-dtdl/blob/master/DTDL/v2/dtdlv2.md)(Digital Twins Definition Language).
@@ -40,7 +39,7 @@ Application Builder is an open-source tool for you to create web applications
 * **Dashboard Tree view:** Dashboard Tree view provides hierarchical view for quicker and easier access to a dashboard.
 * **Dashboard Locking:** User can now lock/unlock all dashboards by just one click.
 * **Dashboard Search:** Smart search introduced to quickly search your dashboard.
-* **Seamless upgrade experience:** Upgrade of application builder made simpler.
+* **Seamless upgrade experience:** Upgrade of application builder made simpler. [Click here for more detail.](#how-to-upgrade-application-builder-to-20)
 
 ## Installation
 

diff --git a/app.module.ts b/app.module.ts
@@ -28,7 +28,7 @@ import { SimulationStrategiesModule } from "./simulation-strategies/simulation-s
 import { CustomWidgetsModule } from "./custom-widgets/custom-widgets.module";
 import { interval } from 'rxjs';
 import { SettingsService } from './builder/settings/settings.service';
-import { WidgetsModule } from '@c8y/ngx-components/widgets';
+import { cockpitWidgets } from '@c8y/ngx-components/widgets/cockpit';
 @NgModule({
   imports: [
     // Upgrade module must be the first
@@ -41,7 +41,7 @@ import { WidgetsModule } from '@c8y/ngx-components/widgets';
     DashboardUpgradeModule,
     BuilderModule,
     SimulationStrategiesModule,
-    WidgetsModule,
+    cockpitWidgets(),
     CustomWidgetsModule
   ]
 })

diff --git a/builder/app-list/app-list.component.html b/builder/app-list/app-list.component.html
@@ -2,38 +2,35 @@
 
 <div class="card-group interact-grid">
     <div class="col-xs-12 col-sm-4 col-md-3 col-lg-2" style="min-height: 194px;" *ngIf="userHasAdminRights">
-        <a class="card add-card clickable" id="addApplication" (click)="createAppWizard()">
-            <i c8yIcon="plus-square"></i><br>
-            Add application
-        </a>
+        <button (click)="createAppWizard()" class="card add-card" id="addApplication">
+            <i  style="font-size: 36px;" c8y-icon="plus-circle" class="text-muted dlt-c8y-icon-plus-circle"></i>
+            <br>Add application
+        </button>
     </div>
     <div class="c8y-empty-state text-center" style="max-width:100%; flex-direction: column; align-items: center;" *ngIf="!isBusy && !applications.length">
         <h3>No application to list.</h3>
     </div>
     <ng-container *ngIf="applications && applications.length > 0">
         <div class="col-xs-12 col-sm-4 col-md-3 col-lg-2" *ngFor="let app of applications">
             <div class="card clickable" (click)="openApp(app)">
-                <div class="dropdown card-actions" dropdown (click)="$event.stopPropagation()" *ngIf="userHasAdminRights">
-                    <button title="Settings" id="appSettings-{{app.name}}" class="dropdown-toggle c8y-dropdown" dropdownToggle type="button">
-                        <i c8yIcon="ellipsis-v"></i>
-                    </button>
-                    <ul class="dropdown-menu dropdown-menu-right" *dropdownMenu role="menu">
-                        <li role="menuitem">
-                            <a class="dropdown-item" (click)="openApp(app, '/config')">
-                                <i c8yIcon="edit"></i> Edit
-                            </a>
-                        </li>
-                        <!-- <li role="menuitem">
-                            <a class="dropdown-item" (click)="exportApp(app)">
-                                <i c8yIcon="download"></i> Export
-                            </a>
-                        </li> -->
-                        <li role="menuitem">
-                            <a (click)="deleteApplication(app.id)" class="dropdown-item clickable">
-                                <i c8yIcon="times"></i> Remove
-                            </a>
-                        </li>
-                    </ul>
+                <div class="card-actions m-t-0">
+                    <div class="dropdown" dropdown (click)="$event.stopPropagation()" *ngIf="userHasAdminRights">
+                        <button title="Settings" id="appSettings-{{app.name}}" class="dropdown-toggle c8y-dropdown" dropdownToggle type="button">
+                            <i c8yIcon="ellipsis-v"></i>
+                        </button>
+                        <ul class="dropdown-menu dropdown-menu-right" *dropdownMenu role="menu">
+                            <li role="menuitem">
+                                <button type="button" title="Edit" (click)="openApp(app, '/config')">
+                                    <i c8yIcon="edit" ></i><span> Edit</span>
+                                </button>
+                            </li>
+                            <li role="menuitem">
+                                <button type="button" id="{{app.name}}-deleteApp" title="Remove" (click)="deleteApplication(app.id)">
+                                    <i c8yIcon="times" ></i> <span> Remove</span>
+                                </button>
+                            </li>
+                        </ul>
+                    </div>
                 </div>
                 <div class="card-block text-center" style="margin-bottom: 5px;">
                     <h1 style="margin: 15px 0 10px; font-size: 42px;"><c8y-app-icon [app]="app"></c8y-app-icon></h1>

diff --git a/builder/app-list/app-list.component.ts b/builder/app-list/app-list.component.ts
@@ -27,7 +27,7 @@ import {
 } from "@c8y/client";
 import { catchError, map } from "rxjs/operators";
 import { from, Observable } from "rxjs";
-import { AppStateService } from "@c8y/ngx-components";
+import { AppStateService, PluginsService } from "@c8y/ngx-components";
 import { BsModalService, BsModalRef } from 'ngx-bootstrap/modal';
 import { NewApplicationModalComponent } from "./new-application-modal.component";
 import { Router } from "@angular/router";
@@ -47,7 +47,7 @@ export class AppListComponent {
     bsModalRef: BsModalRef;
     isBusy = true;
     constructor(private router: Router, private appService: ApplicationService,
-        private appStateService: AppStateService, private modalService: BsModalService,
+        private appStateService: AppStateService, private modalService: BsModalService, private pluginService: PluginsService,
         private userService: UserService, private appListService: AppListService, private realTimeService: Realtime) {
         this.userHasAdminRights = userService.hasRole(appStateService.currentUser.value, "ROLE_APPLICATION_MANAGEMENT_ADMIN")
         this.appListService.refreshAppList$.subscribe(() => {
@@ -72,12 +72,12 @@ export class AppListComponent {
             if (!this.allApplications || this.allApplications.length === 0) {
                 this.allApplications = (await this.appService.listByUser(this.appStateService.currentUser.value, { pageSize: 2000 })).data;
             }
-            this.applications = this.allApplications.filter(app => app.hasOwnProperty('applicationBuilder'));
+            this.applications = this.allApplications.filter((app:IApplication)=> app.hasOwnProperty('applicationBuilder') &&  !this.pluginService.isPackage(app));
             this.applications = this.applications.sort((a, b) => a.id > b.id ? 1 : -1);
             this.isBusy = false;
         } else {
             this.allApplications = (await this.appService.listByUser(this.appStateService.currentUser.value, { pageSize: 2000 })).data;
-            this.applications = this.allApplications.filter(app => app.hasOwnProperty('applicationBuilder'));
+            this.applications = this.allApplications.filter((app:IApplication) => app.hasOwnProperty('applicationBuilder') &&  !this.pluginService.isPackage(app));
             this.applications = this.applications.sort((a, b) => a.id > b.id ? 1 : -1);
             this.isBusy = false;
         }

diff --git a/builder/application-binary.service.ts b/builder/application-binary.service.ts
@@ -0,0 +1,155 @@
+/*
+* Copyright (c) 2023 Software AG, Darmstadt, Germany and/or its licensors
+*
+* SPDX-License-Identifier: Apache-2.0
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*    http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+ */
+
+import { Injectable } from "@angular/core";
+import { ApplicationService, ApplicationType, IApplication, IResultList, IUploadParamsOverride, TenantService } from "@c8y/client";
+import { AppStateService, ModalService, Status, ZipService, gettext } from "@c8y/ngx-components";
+import { BehaviorSubject, Observable } from 'rxjs';
+import { kebabCase } from 'lodash-es';
+import { SettingsService } from "./settings/settings.service";
+import { DependencyDescription } from "./template-catalog/template-catalog.model";
+
+
+@Injectable({ providedIn: 'root' })
+export class ApplicationBinaryService {
+
+    private xhr: XMLHttpRequest;
+    progress: BehaviorSubject<number> = new BehaviorSubject<number>(null);
+
+    constructor(
+        private modal: ModalService,
+        private appStateService: AppStateService,
+        private applicationService: ApplicationService,
+        private zipService: ZipService,
+        private tenantService: TenantService,
+        private settingService: SettingsService
+    ) { }
+
+    async createAppForMicroservice(binary, dependencies: DependencyDescription): Promise<IApplication> {
+        let appModel: any = {};
+        appModel = await this.getCumulocityJson(binary).toPromise();
+
+        const key =  `${kebabCase(dependencies.id)}-key`
+        const contextPath = appModel?.contextPath || dependencies?.id.toLowerCase();
+
+        const appObj = {
+            resourcesUrl: '/',
+            type: ApplicationType.MICROSERVICE,
+            name: dependencies.id,
+            key,
+            contextPath
+        };
+
+        return (await this.applicationService.create({...appObj})).data;
+    }
+
+    private getCumulocityJson(archive: File): Observable<any> {
+        return this.zipService.getJsonData(archive, {
+          filename: 'cumulocity.json'
+        });
+      }
+
+    async uploadMicroservice(file: File, microservice: IApplication): Promise<void> {
+        const subscribeToCurrentTenant = await this.requestForSubscription();
+        const microserviceApp: IApplication = await this.uploadBinary(file, microservice);
+        if(microserviceApp) {
+            if(window && window['aptrinsic'] ){
+                window['aptrinsic']('track', 'gp_microservice_installed', {
+                    "microserviceName": microserviceApp.name,
+                    "tenantId": this.settingService.getTenantName()
+                 });
+            }
+        }
+
+        await this.subscribeMicroservice(microservice, subscribeToCurrentTenant);
+    }
+
+    private async requestForSubscription(): Promise<boolean> {
+        try {
+            await this.modal.confirm(
+                gettext('Subscribe to microservice'),
+                gettext(
+                    'You are about to subscribe to the microservice after upload. Do you want to subscribe to it?'
+                ),
+                Status.INFO,
+                { ok: gettext('Subscribe'), cancel: gettext("Don't subscribe") }
+            );
+            return true;
+        } catch (ex) {
+            return false;
+        }
+    }
+
+    private async subscribeMicroservice(
+        app: IApplication,
+        subscribeToCurrentTenant: boolean
+    ): Promise<any> {
+        const tenant = (await this.tenantService.current()).data;
+        const applications = tenant.applications.references;
+
+        const isSubscribed = applications.some(({ application }) => application.id === app.id);
+        if (!isSubscribed && subscribeToCurrentTenant) {
+            try {
+                return await this.tenantService.subscribeApplication(tenant, app);
+            } catch (res) {
+                if (res.status === 409) {
+                    throw Error("ALREADY_SUBSCRIBED");
+                }
+            }
+        } else if (isSubscribed && !subscribeToCurrentTenant) {
+            return this.tenantService.unsubscribeApplication(tenant, app);
+        }
+    }
+
+    async uploadBinary( file: File, app: IApplication ): Promise<IApplication> {
+        const appBinary = (await this.applicationService.binary(app).upload(file)).data;
+        return (await this.setActiveVersion(app, appBinary.id as string)).data;
+    }
+
+    setActiveVersion(app: IApplication, activeVersionId: string): Promise<IApplication> {
+        return this.applicationService.update({ id: app.id, activeVersionId });
+    }
+
+    getApplications(customFilter: any = {}): Promise<IResultList<IApplication>> {
+        const filter: object = {
+          pageSize: 2000,
+          withTotalPages: true
+        };
+        Object.assign(filter, customFilter);
+        const currentTenant = this.appStateService.currentTenant.value;
+        return this.applicationService.listByTenant(currentTenant.name, filter);
+    }
+
+    async verifyExistingMicroservices(name: string) {
+        const apps = (await this.getApplications()).data;
+        const ms = apps.filter(app => this.isMicroservice(app) && app.name === name);
+        return (ms && ms.length > 0 ? true: false);
+    }
+
+    isMicroservice(app: IApplication): boolean {
+        return app.type === 'MICROSERVICE';
+    }
+
+    isMicroserviceEnabled(appList: IApplication[]) {
+        const featureMSHosting = appList.find( app => app.contextPath == 'feature-microservice-hosting');
+        if(featureMSHosting) { return true;}
+        return false;
+
+    }
+}
+
diff --git a/builder/application-config/dashboard-config.component.html b/builder/application-config/dashboard-config.component.html
@@ -155,7 +155,7 @@ <h3>No dashboards to list.</h3>
                                 <div class="pt-15">Global Roles</div>
                             </div>
                             <div class="font-bold col-sm-2">
-                                <div class="pt-15">Device(s)</div>
+                                <div class="pt-15">Asset(s)</div>
                             </div>
                             <div class="col-sm-1">
                                 <div class="pt-15">
@@ -195,7 +195,7 @@ <h3>No dashboards to list.</h3>
                             <div class="col">Tab Group</div>
                             <div class="col">Global Roles</div>
                             <div class="col">Icon</div>
-                            <div class="col">Device(s)</div>
+                            <div class="col">Asset(s)</div>
                             <div>
                                 <i style="font-size:18px;" title="Edit Dashboard" c8yIcon="edit"></i>
                                 <i c8yIcon="delete" title="Delete Dashboard"

diff --git a/builder/application-config/dashboard-config.component.ts b/builder/application-config/dashboard-config.component.ts
@@ -40,7 +40,7 @@ import { DOCUMENT } from "@angular/common";
 import { moveItemInArray, transferArrayItem } from '@angular/cdk/drag-drop';
 import { AppDataService } from "../app-data.service";
 import { Clipboard } from '@angular/cdk/clipboard';
-
+import { IconSelectorService } from "@c8y/ngx-components/icon-selector";
 export interface DashboardConfig {
     id: string,
     name: string,
@@ -49,6 +49,7 @@ export interface DashboardConfig {
     icon: string,
     deviceId?: string,
     roles?: any,
+    templateType?: number,
     groupTemplate: {
         groupId: string
     },
@@ -108,13 +109,17 @@ export class DashboardConfigComponent implements OnInit, OnDestroy {
 
     constructor(
         private appIdService: AppIdService, private appService: ApplicationService, private appStateService: AppStateService,
-        private brandingService: BrandingService, private inventoryService: InventoryService, private navigation: AppBuilderNavigationService,
+        private inventoryService: InventoryService, private navigation: AppBuilderNavigationService,
+        private iconSelector: IconSelectorService, private brandingService: BrandingService,
         private modalService: BsModalService, private alertService: AlertService, private settingsService: SettingsService,
         private accessRightsService: AccessRightsService, private userService: UserService, private appDataService: AppDataService,
         @Inject(DOCUMENT) private document: Document, private renderer: Renderer2, private cd: ChangeDetectorRef, private clipboard: Clipboard
     ) {
         this.app = combineLatest([appIdService.appIdDelayedUntilAfterLogin$, this.refreshApp]).pipe(
             map(([appId]) => appId),
+            tap(appId => {
+                this.appDataService.forceUpdate = true;
+            }),
             switchMap(appId => from(
                 this.appDataService.getAppDetails(appId)
             )),
@@ -144,7 +149,8 @@ export class DashboardConfigComponent implements OnInit, OnDestroy {
         let count = 0;
         this.appSubscription = this.app.pipe(first()).
             subscribe(app => {
-                if (app.applicationBuilder.branding.enabled && (app.applicationBuilder.selectedTheme && app.applicationBuilder.selectedTheme !== 'Default')) {
+                if (app.applicationBuilder.branding?.enabled && (app.applicationBuilder.selectedTheme && app.applicationBuilder.selectedTheme !== 'Default'
+                && app.applicationBuilder.selectedTheme !== 'Classic')) {
                     this.applyTheme = true;
                     this.renderer.addClass(this.document.body, 'dashboard-body-theme');
                 } else {
@@ -389,7 +395,8 @@ export class DashboardConfigComponent implements OnInit, OnDestroy {
                         dashboardType: 'group-template'
                     } : {
                         dashboardType: 'standard'
-                    })
+                    }),
+                    templateType: dashboard.templateType
                 }
             });
             this.bsModalRef.content.onSave.subscribe((isReloadRequired: boolean) => {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		registry=https://registry.npmjs.org/
		@c8y:registry=https://download.cumulocity.com/npm/