1.3.4 Release (#84)

* 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 * 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 * search dashboard issue fix and simulator code change to add required interval for new device * Branding issue w.r.t pagination * updated with upgrade changes * added context-path condition to restict app builder upgrade notification * dashboard catalog changes * 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 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 * 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 iscompatible check * Fixed issue in verify widget compatibility method * Updated condition in findInstalledWidget method * RC flag removed * updated readme * Updated readme for 1.3.3 release * Bug fix for app with context path (#83) * Changes while uninstalling widgets * Branding Issue fixed --------- 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>
Cumulocity-IoT · Mar 27, 2023 · 892d57f · 892d57f
1 parent 088b06b
commit 892d57f
Show file tree

Hide file tree

Showing 5 changed files with 240 additions and 235 deletions.
diff --git a/builder/app-builder-upgrade/app-builder-upgrade.service.ts b/builder/app-builder-upgrade/app-builder-upgrade.service.ts
@@ -509,7 +509,7 @@ export class AppBuilderUpgradeService {
  private async uninstallWidgets(plugins: any) {
  const appList = await this.getApplicationList();
  for (const pluginBinary of plugins) {
- const widgetAppObj = appList.find(app => app.contextPath === pluginBinary.contextPath)
+ const widgetAppObj = appList.find(app => pluginBinary.oldContextPath ? app.contextPath === pluginBinary.oldContextPath : app.contextPath === pluginBinary.contextPath)
  if (widgetAppObj) {
  try {
  await this.appService.delete(widgetAppObj.id);

diff --git a/builder/app-list/new-application-modal.component.ts b/builder/app-list/new-application-modal.component.ts
@@ -214,7 +214,8 @@ export class NewApplicationModalComponent implements OnInit {
  existingAppBuilderId = appBuilderMarket.id;
  appBuilder = await this.fetchClient.fetch(`application/applications/${appBuilderMarket.id}/clone`, { method: 'POST' }) as Response;
  appList = (await this.appService.list({ pageSize: 2000 })).data;
- appBuilder = appList.find((app: any) => app.contextPath && app.contextPath.indexOf('app-builder') !== -1 && app.availability === 'PRIVATE');
+ appBuilder = appList.find((app: any) => app.contextPath && app.contextPath.indexOf('app-builder') !== -1 && (app.availability === 'PRIVATE' || 
+ (app.owner && app.owner.tenant && this.settingsService.getTenantName() === app.owner.tenant.id)));
  isClone = true;
  if (!appBuilderMarket)
  throw Error('Could not find application builder');

diff --git a/builder/branding/branding.component.ts b/builder/branding/branding.component.ts
@@ -45,6 +45,9 @@ export class BrandingComponent implements OnInit,OnDestroy {
  )),
  tap((app: any & { applicationBuilder: any }) => {
  this.showIcon = !app.applicationBuilder.branding.hideIcon;
+ if (app.applicationBuilder.branding.colors.hover === '' || app.applicationBuilder.branding.colors.hover === undefined) {
+ app.applicationBuilder.branding.colors.hover = '#14629F';
+ }
  })
  )
  }
@@ -56,6 +59,7 @@ export class BrandingComponent implements OnInit,OnDestroy {
  this.renderer.addClass(this.document.body, 'body-theme');
  } else {
  this.applyTheme = false;
+ app.applicationBuilder.branding.colors.hover = '#14629F';
  }
  }); 
  }