Merge branch 'main' of https://github.com/SoftwareAG/cumulocity-analy…

…tics-management
Cumulocity-IoT · Nov 29, 2023 · 19a494c · 19a494c
2 parents b5ce878 + 58e1fdb
commit 19a494c
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 23 deletions.
diff --git a/analytics-ui/src/analytics-extension.module.ts b/analytics-ui/src/analytics-extension.module.ts
@@ -22,7 +22,7 @@ import { BlockGridComponent } from "./analytics/list/block.component";
 import { AnalyticsAddExtensionComponent } from "./analytics/manage/extension-add.component";
 import { SampleGridComponent } from "./sample/list/sample.component";
 import { HttpClientModule } from "@angular/common/http";
-import { NameExtensionComponent } from "./wizard/name-extension-modal.component";
+import { CreateExtensionComponent } from "./wizard/create-extension-modal.component";
 import { EditorStepperComponent } from "./sample/editor/editor-stepper.component";
 import { EditorModalComponent } from "./sample/editor/editor-modal.component";
 import { RepositoriesModalComponent } from "./sample/editor/repositories-modal.component";
@@ -60,7 +60,7 @@ const routes: Route[] = [
     AnalyticsExtensionCardComponent,
     AnalyticsAddExtensionComponent,
     AddExtensionWizardComponent,
-    NameExtensionComponent,
+    CreateExtensionComponent,
     BlockGridComponent,
     SampleGridComponent,
     EditorStepperComponent,

diff --git a/analytics-ui/src/sample/list/sample.component.ts b/analytics-ui/src/sample/list/sample.component.ts
@@ -36,7 +36,7 @@ import {
 import { AnalyticsService } from "../../shared/analytics.service";
 import { CEP_Block } from "../../shared/analytics.model";
 import { BsModalService } from "ngx-bootstrap/modal";
-import { NameExtensionComponent } from "../../wizard/name-extension-modal.component";
+import { CreateExtensionComponent } from "../../wizard/create-extension-modal.component";
 import { EditorModalComponent } from "../editor/editor-modal.component";
 import { RepositoriesModalComponent } from "../editor/repositories-modal.component";
 import { RepositoryService } from "../editor/repository.service";
@@ -175,7 +175,8 @@ export class SampleGridComponent implements OnInit {
       monitors
     };
 
-    const modalRef = this.bsModalService.show(NameExtensionComponent, {
+    const modalRef = this.bsModalService.show(CreateExtensionComponent, {
+      class: "modal-lg",
       initialState,
     });
 

diff --git a/analytics-ui/src/shared/analytics.service.ts b/analytics-ui/src/shared/analytics.service.ts
@@ -81,6 +81,7 @@ export class AnalyticsService {
 
   async createExtensionsZIP(
     name: string,
+    upload: boolean,
     monitors: string[]
   ): Promise<IFetchResponse> {
     console.log(`Create extensions for : ${name},  ${monitors},`);
@@ -90,8 +91,8 @@ export class AnalyticsService {
       },
       body: JSON.stringify({
         extension_name: name,
+        upload: upload,
         monitors: monitors,
-        upload: false,
       }),
       method: "POST",
       responseType: "blob",

diff --git a/.../wizard/name-extension-modal.component.ts → ...izard/create-extension-modal.component.ts b/.../wizard/name-extension-modal.component.ts → ...izard/create-extension-modal.component.ts
@@ -21,20 +21,22 @@ import { saveAs } from "file-saver";
           [fields]="configFormlyFields"
           [model]="configuration"
         ></formly-form>
+        <div class="col-lg-8">
+          <button
+            class="btn btn-default"
+            title="{{ 'Create Extension' | translate }}"
+            (click)="createExtension()"
+          >
+            <i c8yIcon="plugin"></i>
+            {{ "Create Extension" | translate }}
+          </button>
+        </div>
       </div>
-      <button
-        class="btn btn-default"
-        title="{{ 'Create Extension' | translate }}"
-        (click)="createExtension()"
-      >
-        <i c8yIcon="plugin"></i>
-        {{ "Create Extension" | translate }}
-      </button>
     </div>
     <div *ngIf="loading"><c8y-loading></c8y-loading></div>
   </c8y-modal>`,
 })
-export class NameExtensionComponent implements OnInit {
+export class CreateExtensionComponent implements OnInit {
   @Output() closeSubject: Subject<any> = new Subject();
   @Input() monitors: string[];
   configuration: any = {};
@@ -51,14 +53,30 @@ export class NameExtensionComponent implements OnInit {
   ngOnInit(): void {
     this.configFormlyFields = [
       {
-        className: "col-lg-12",
-        key: "name",
-        type: "input",
-        wrappers: ["c8y-form-field"],
-        templateOptions: {
-          label: "Name Extension",
-          required: true,
-        },
+        fieldGroup: [
+          {
+            className: "col-lg-8",
+            key: "name",
+            type: "input",
+            wrappers: ["c8y-form-field"],
+            templateOptions: {
+              label: "Name Extension",
+              required: true,
+            },
+          },
+          {
+            className: "col-lg-4",
+            key: "upload",
+            type: "switch",
+            defaultValue: false,
+            wrappers: ["c8y-form-field"],
+            templateOptions: {
+              label: "Upload Extension",
+              description:
+              "The generated extension for the selected blocks is uploaded. After initiating a restart they are available in the Analytics Builder model pallet.",
+            },
+          },
+        ],
       },
     ];
   }
@@ -73,6 +91,7 @@ export class NameExtensionComponent implements OnInit {
     console.log("Create Extension");
     const response = await this.analyticsService.createExtensionsZIP(
       this.configuration.name,
+      this.configuration.upload,
       this.monitors
     );
     const binary = await await response.arrayBuffer();
@@ -81,7 +100,9 @@ export class NameExtensionComponent implements OnInit {
       type: "application/x-zip-compressed",
     });
     saveAs(blob, `${this.configuration.name}.zip`);
-    this.alertService.success(`Created extension ${this.configuration.name}.zip!`)
+    this.alertService.success(
+      `Created extension ${this.configuration.name}.zip!`
+    );
     this.closeSubject.next(true);
   }
 }