2.2.0 Release

README.md

@@ -4,7 +4,12 @@ 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?
+## What's new ?
+* **Deploy with Blueprint Forge:** Users can now clone Application Builder apps and deploy it to Blueprint Forge apps.
+  ![image](https://github.com/user-attachments/assets/a18fad95-93ce-4578-a10a-abedcf9decf9)
+* **Widget Catalog:** The Widget catalog has been removed. You manage your widgets/plugins from Administration -> Ecosystem -> Extensions.
+
+## 2.1.0
 
 * **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.
@@ -26,7 +31,6 @@ Application Builder is an open-source tool for you to create web applications 
 * **Home Page:** User can find quick start videos, help and support information on home page.
 * **Tabs:** Group your dashboards into tabs.
 * **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 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 one clicks theme selection and custom theme creation.
 *  **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".

builder/app-data.service.ts

@@ -16,7 +16,7 @@
 * limitations under the License.
  */
 
-import {from, Observable} from "rxjs";
+import {BehaviorSubject, from, Observable} from "rxjs";
 import {Injectable} from "@angular/core";
 import { ApplicationService, IApplication } from "@c8y/client";
 
@@ -29,6 +29,7 @@ export class AppDataService {
     private appId: string | number = '';
     private lastUpdated = 0; 
     forceUpdate = false;
+    refreshAppForDashboard = new BehaviorSubject<void>(undefined);
     constructor(private appService: ApplicationService) {
     }
 

builder/app-list/app-list.component.html

@@ -29,15 +29,28 @@ <h3>No application to list.</h3>
                                     <i c8yIcon="times" ></i> <span> Remove</span>
                                 </button>
                             </li>
+                            <li role="menuitem" *ngIf="!isBlueprintApp(app)">
+                                <button type="button" id="{{app.name}}-deployBlueprintForge" title="Deploy with Blueprint Forge" (click)="deployWithBlueprintForge(app)">
+                                    <i c8yIcon="deploy" ></i> <span> Deploy with Blueprint Forge</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>
                     <p style="word-wrap: break-word;" class="e2e-appCardName">{{app.name}}</p>
                 </div>
+                <div class="card-block text-center">
+                    <button *ngIf="!isBlueprintApp(app)" placement="top" class="btn-clean" title="Application Builder App">
+                        <span class="label label-info"> Application Builder app </span>
+                    </button>
+                    <button *ngIf="isBlueprintApp(app)" placement="top" class="btn-clean" title="Blueprint Forge App">
+                        <span class="label label-success"> Blueprint Forge App </span>
+                    </button>
+                </div>
                 <div class="card-actions-group">
-                    <a class="clickable" id="OpenApp-{{app.name}}">
+                    <a class="clickable" id="OpenApp-{{app.name}}" >
                         <i c8yIcon="external-link"></i> Open
                     </a>
                 </div>

builder/app-list/app-list.component.ts

@@ -33,6 +33,7 @@ import { NewApplicationModalComponent } from "./new-application-modal.component"
 import { Router } from "@angular/router";
 import { contextPathFromURL } from "../utils/contextPathFromURL";
 import { AppListService } from "./app-list.service";
+import { NewBlueprintForgeModalComponent } from "./new-blueprint-forge-app-modal.component";
 
 @Component({
     templateUrl: './app-list.component.html'
@@ -106,6 +107,13 @@ export class AppListComponent {
         });
     }
 
+    deployWithBlueprintForge(app: IApplication) {
+        this.bsModalRef = this.modalService.show(NewBlueprintForgeModalComponent, {
+            class: 'c8y-wizard', initialState:
+                { application: app, allApplications: this.allApplications }
+        });
+    }
+
     async deleteApplication(id: number) {
         await this.appService.delete(id);
 
@@ -121,7 +129,13 @@ export class AppListComponent {
             this.router.navigateByUrl(`/application/${app.id}${subPath || ''}`);
         }
     }
-    exportApp(app: IApplication) {
+
+    isBlueprintApp(app: IApplication) {
+        return (app && app.manifest?.package === 'blueprint');
+    }
+
+    // TODO: not used. Alternative available in migration tool
+    /* exportApp(app: IApplication) {
         const filename = app.name + '.json';
         const jsonStr = JSON.stringify(app.applicationBuilder);
         let element = document.createElement('a');
@@ -131,5 +145,5 @@ export class AppListComponent {
         document.body.appendChild(element);
         element.click();
         document.body.removeChild(element);
-    }
+    } */
 }

builder/app-list/app-list.module.ts

@@ -30,6 +30,7 @@ import {IconSelectorModule} from "../../icon-selector/icon-selector.module";
 import {ApplicationService, IApplication, UserService} from "@c8y/client";
 import { filter, first } from "rxjs/operators";
 import {contextPathFromURL} from "../utils/contextPathFromURL";
+import { NewBlueprintForgeModalComponent } from "./new-blueprint-forge-app-modal.component";
 
 /**
  * Some app-builder applications hide the ability to create new applications, they do this by having a default application that is redirected to if the user tries to access the '/' path.
@@ -80,10 +81,12 @@ export class RedirectToDefaultApplicationOrBuilder implements CanActivate {
     ],
     declarations: [
         AppListComponent,
-        NewApplicationModalComponent
+        NewApplicationModalComponent,
+        NewBlueprintForgeModalComponent
     ],
     entryComponents: [
-        NewApplicationModalComponent
+        NewApplicationModalComponent,
+        NewBlueprintForgeModalComponent
     ],
     providers: [
         { provide: HOOK_NAVIGATOR_NODES, useClass: AppListNavigation, multi: true}

builder/app-list/app-list.navigation.ts

@@ -63,14 +63,15 @@ export class AppListNavigation implements NavigatorNodeFactory {
                             path: `/settings-properties`,
                             priority: 0
                         }));
-                        const widgetCatalogNode = new NavigatorNode({
+                        // TODO: remove widget catalog
+                        /* const widgetCatalogNode = new NavigatorNode({
                             label: 'Widget Catalog',
                             icon: 'registry-editor',
                             path: `/widget-catalog/my-widgets`,
                             priority: 2
-                        });
+                        }); */
                         if (this.userService.hasAllRoles(this.appStateService.currentUser.value, ["ROLE_INVENTORY_ADMIN","ROLE_APPLICATION_MANAGEMENT_ADMIN"])) {
-                            appNode.push(widgetCatalogNode);
+                         //   appNode.push(widgetCatalogNode);
                             appNode.push(settingsNode);
                         }
                         return appNode;