1.3.2 release (#79)

* 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 Co-authored-by: Sheethal JR (SJR) <Sheethal.JR@softwareag.com> Co-authored-by: SheethalJR <99970126+SheethalJR@users.noreply.github.com>
Cumulocity-IoT · Dec 13, 2022 · 15cadf8 · 15cadf8
1 parent 94eb8b9
commit 15cadf8
Show file tree

Hide file tree

Showing 35 changed files with 2,406 additions and 1,105 deletions.
diff --git a/README.md b/README.md
@@ -5,10 +5,11 @@ Application Builder is an open-source tool for you to create web applications
 ![](https://user-images.githubusercontent.com/38696279/72333172-47cec300-36b3-11ea-9abf-1bb29b490a22.png)
 
 ## What's new?
-* **Role Based Access:** User can now control dashboard visibility in application builder by assigning global role(s) to a dashboard.
-* **File(CSV/JSON) Based Simulator:** Application Builder now supports File Based Simulators(Server-side). User just need to install micro-service from [here](https://github.com/SoftwareAG/cumulocity-app-builder/releases/download/v1.3.1/csv-simulator-ms.zip) and use simulator type as File(CSV/JSON). User can import CSV/JSON file to create measurements/events to simulate use cases.
-* **Widget Catalog:** Grid view introduced to enhance user experience.
-* **Branding:** Improvement in branding functionalities such as one clicks theme selection and addition of new themes (Navy Blue, Dark).
+
+* **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.
 * **Various bug fixes**
 
 ## Features
@@ -25,8 +26,10 @@ Application Builder is an open-source tool for you to create web applications
 * **Dashboard Catalog:** User can select any pre-designed template for dashboard and ability to install dependent runtime widgets.
 * **Widget Catalog:** Now user has ability to install/update runtime widgets directly from Widget Catalog. This is single place where user can also find widget details such as documentation, preview, license and author details.
 * **Branding:** Now user can use color picker to choose millions of colors to customize branding. Header, Action bar and tab bar are also customizable.
-* **Theme:** Application builder now support dark theme and branded themes for dashboards and widgets.
+* **Theme:** Application builder now support one clicks theme selection.
 * **Server-Side Simulators:** Application Builder now supports Server-side simulators. User just need to install micro-service from [here](https://github.com/SoftwareAG/cumulocity-app-builder/releases/download/v1.3.1/simulator-app-builder.zip) and you will get option while creating simulator to "Run on Server".
+* **Role Based Access:** User can now control dashboard visibility in application builder by assigning global role(s) to a dashboard.
+* **File(CSV/JSON) Based Simulator:** Application Builder now supports File Based Simulators(Server-side). User just need to install micro-service from [here](https://github.com/SoftwareAG/cumulocity-app-builder/releases/download/v1.3.1/csv-simulator-ms.zip) and use simulator type as File(CSV/JSON). User can import CSV/JSON file to create measurements/events to simulate use cases.
 * **Help & Support:** Try out our new help & support dashboard template while creating dashboard. This will help user to quickly create help and support page for cumulocity application.
 * **Demo Catalog:** User now able to try out pre-built cumulocity demos by installing Demo Catalog which is available in your home page.
 * **Auto Upgrade Notification:** From Application Builder 1.3.0 onwards user will get notification whenever new version of app builder available and ability to seamless upgrade by single click.
@@ -109,7 +112,7 @@ cd cumulocity-app-builder
 ```
 2. (Optional) Checkout a specific version: 
 ```
-git checkout v1.3.1
+git checkout v1.3.2
 ```
 3. Install the dependencies: 
 ```

diff --git a/binary/app-builder-external-assets-2.0.8.tgz b/binary/app-builder-external-assets-2.0.8.tgz
diff --git a/binary/app-builder-external-assets-2.1.0.tgz b/binary/app-builder-external-assets-2.1.0.tgz
diff --git a/builder/app-builder-upgrade/app-builder-upgrade.model.ts b/builder/app-builder-upgrade/app-builder-upgrade.model.ts
@@ -19,20 +19,24 @@
 export interface AppBuilderConfig {
  versionInfo: VersionInfo;
  externalApps: ExternalApp[];
+ upgradeInfo: VersionInfo[];
 }
 
 export interface VersionInfo {
  updateAvailable?: string;
+ currentVersion?: string;
  updateURL?: string;
  fileName?: string;
  contextPath?: string;
  successMsg?: string;
  confirmMsg?: string;
+ releaseLink?: string;
+ verifyPlugins?: boolean;
 }
 
 export interface ExternalApp {
  appName?: string;
  binaryLink?: string;
  fileName?: string;
  contextPath?:string;
-}
+}
diff --git a/builder/app-builder-upgrade/app-builder-upgrade.service.ts b/builder/app-builder-upgrade/app-builder-upgrade.service.ts
diff --git a/builder/app-list/app-list.component.ts b/builder/app-list/app-list.component.ts
@@ -121,7 +121,6 @@ export class AppListComponent {
  }
  }
  exportApp(app: IApplication) {
- console.log(app);
  const filename = app.name + '.json';
  const jsonStr = JSON.stringify(app.applicationBuilder);
  let element = document.createElement('a');

diff --git a/builder/app-list/new-application-modal.component.ts b/builder/app-list/new-application-modal.component.ts
@@ -199,7 +199,8 @@ export class NewApplicationModalComponent implements OnInit {
  let isClone = false;
  let appList = (await this.appService.list({ pageSize: 2000 })).data;
  let appBuilder: any;
- appBuilder = appList.find((app: any) => app.contextPath === contextPathFromURL() && app.availability === 'PRIVATE');
+ appBuilder = appList.find((app: any) => app.contextPath === contextPathFromURL() && (app.availability === 'PRIVATE' || 
+ (app.owner && app.owner.tenant && this.settingsService.getTenantName() === app.owner.tenant.id)));
  let existingAppBuilderId: any = '';
  if (appBuilder) { existingAppBuilderId = appBuilder.id; }