update to new version: jsonEditor, c8ySDK

Cumulocity-IoT · Oct 7, 2024 · 2d2eea1 · 2d2eea1
1 parent f37be37
commit 2d2eea1
Show file tree

Hide file tree

Showing 7 changed files with 2,081 additions and 1,311 deletions.
diff --git a/dynamic-mapping-ui/package-lock.json b/dynamic-mapping-ui/package-lock.json
diff --git a/dynamic-mapping-ui/package.json b/dynamic-mapping-ui/package.json
@@ -29,9 +29,9 @@
     "@angular/platform-server": "^17.3.0",
     "@angular/router": "^17.3.0",
     "@angular/upgrade": "^17.3.0",
-    "@c8y/bootstrap": "^1020.18.1",
-    "@c8y/ngx-components": "^1020.18.1",
-    "@c8y/options": "^1020.18.1",
+    "@c8y/bootstrap": "^1020.26.2",
+    "@c8y/ngx-components": "^1020.26.2",
+    "@c8y/options": "^1020.26.2",
     "@ngx-translate/core": "15.0.0",
     "css-loader": "^7.1.2",
     "echarts": "^5.5.1",
@@ -53,8 +53,8 @@
     "@angular/language-service": "^18.2.2",
     "@angular/localize": "^17.3.0",
     "@angular/service-worker": "^17.3.0",
-    "@c8y/devkit": "^1020.18.3",
-    "@c8y/package-blueprint": "^1020.18.1",
+    "@c8y/devkit": "^1020.26.2",
+    "@c8y/package-blueprint": "^1020.26.2",
     "@typescript-eslint/eslint-plugin": "^7.17.0",
     "cumulocity-cypress": "^0.4.6",
     "cypress": "^13.13.3",

diff --git a/dynamic-mapping-ui/src/mapping/grid/mapping.component.html b/dynamic-mapping-ui/src/mapping/grid/mapping.component.html
@@ -77,6 +77,7 @@
     </c8y-data-grid>
   </div>
   <div class="card-block col-md-offset-5 bg-white">
+    <c8y-client-grid-example></c8y-client-grid-example>
     <div
       class="c8y-empty-state"
       *ngIf="(mappingsEnriched$ | async)?.length === 0"

diff --git a/dynamic-mapping-ui/src/mapping/grid/mapping.component.ts b/dynamic-mapping-ui/src/mapping/grid/mapping.component.ts
@@ -64,7 +64,6 @@ import { ImportMappingsComponent } from '../import/import-modal.component';
 import { MappingTypeComponent } from '../mapping-type/mapping-type.component';
 import { APIRendererComponent } from '../renderer/api.renderer.component';
 import { NameRendererComponent } from '../renderer/name.renderer.component';
-// import { QOSRendererComponent } from '../renderer/qos-cell.renderer.component';
 import { StatusActivationRendererComponent } from '../renderer/status-activation-renderer.component';
 import { StatusRendererComponent } from '../renderer/status-cell.renderer.component';
 // import { TemplateRendererComponent } from '../renderer/template.renderer.component';
@@ -265,7 +264,11 @@ export class MappingComponent implements OnInit, OnDestroy {
     this.bulkActionControls.push(
       {
         type: BuiltInActionType.Delete,
-        callback: this.deleteMappingBulkWithConfirmation.bind(this)
+        callback: this.deleteMappingBulkWithConfirmation.bind(this),
+        showIf: (selectedItemIds) => {
+          console.log('Selected mappings (showIf):', selectedItemIds);
+          return true;
+        }
       },
       {
         type: 'ACTIVATE',

diff --git a/dynamic-mapping-ui/src/shared/connector-configuration.service.ts b/dynamic-mapping-ui/src/shared/connector-configuration.service.ts
@@ -110,7 +110,7 @@ export class ConnectorConfigurationService {
           switchMap(() => from(this.getConnectorConfigurations()))
         )
       ).pipe(
-        tap(() => console.log('Something happened')),
+        // tap(() => console.log('Something happened')),
         shareReplay(1)
       );
       // this.testRealtime();
@@ -273,7 +273,7 @@ export class ConnectorConfigurationService {
   getConnectorConfigurationsWithLiveStatus(): Observable<
     ConnectorConfiguration[]
   > {
-    console.log('Further up 0');
+    // console.log('Further up 0');
     return this.sharedConnectorConfigurations$;
   }
 }
diff --git a/dynamic-mapping-ui/src/shared/editor2/jsoneditor2.component.ts b/dynamic-mapping-ui/src/shared/editor2/jsoneditor2.component.ts
@@ -31,7 +31,7 @@ import {
   ViewEncapsulation
 } from '@angular/core';
 import {
-  JSONEditor,
+  createJSONEditor,
   stringifyJSONPath,
   Content,
   MenuItem,
@@ -87,7 +87,7 @@ export class JsonEditor2Component implements OnInit, OnDestroy {
 
   constructor(private elementRef: ElementRef) {}
 
-  private editor: JSONEditor;
+  private editor: any;
   id = `angjsoneditor${Math.floor(Math.random() * 1000000)}`;
   content: Content = {
     text: undefined,
@@ -100,7 +100,7 @@ export class JsonEditor2Component implements OnInit, OnDestroy {
       console.error("Can't find the ElementRef reference for jsoneditor)");
     }
     delete (this.content as any).text;
-    this.editor = new JSONEditor({
+    this.editor = createJSONEditor({
       target: this.jsonEditorContainer.nativeElement,
       props: {
         ...this.options,

diff --git a/dynamic-mapping-ui/src/shared/navigation.factory.ts b/dynamic-mapping-ui/src/shared/navigation.factory.ts
@@ -48,7 +48,7 @@ export class MappingNavigationFactory implements NavigatorNodeFactory {
     public router: Router
   ) {
     this.appStateService.currentApplication.subscribe((cur) => {
-      console.log('AppName in MappingNavigationFactory', cur, this.router.url);
+      // console.log('AppName in MappingNavigationFactory', cur, this.router.url);
 
       if (_.has(cur?.manifest, 'isPackage')) {
         this.isStandaloneApp = cur?.manifest?.isPackage;