feat: proper handling of the updated asset

sovity · Aug 5, 2024 · 9b1dba8 · 9b1dba8
1 parent f0551c5
commit 9b1dba8
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 5 deletions.
diff --git a/src/app/core/services/asset-data-source-mapper-legacy.ts b/src/app/core/services/asset-data-source-mapper-legacy.ts
@@ -12,7 +12,10 @@ export class AssetDataSourceMapperLegacy {
   buildDataSourceOrNullLegacy(
     formValue: AssetDatasourceFormValue,
   ): UiDataSource | null {
-    if (formValue.dataAddressType === 'Unchanged') {
+    if (
+      !formValue?.dataAddressType ||
+      formValue.dataAddressType === 'Unchanged'
+    ) {
       return null;
     }
     return this.buildDataSourceLegacy(formValue);

diff --git a/src/app/core/validators/url-validator.ts b/src/app/core/validators/url-validator.ts
@@ -11,7 +11,7 @@ export const urlValidator: ValidatorFn = (
 ): ValidationErrors | null => {
   const value: string = control.value;
 
-  if (!value.length || validUrlPattern.test(value)) {
+  if (!value?.length || validUrlPattern.test(value)) {
     return null;
   }
 

diff --git a/src/app/routes/connector-ui/asset-page/asset-edit-dialog/asset-edit-dialog.component.ts b/src/app/routes/connector-ui/asset-page/asset-edit-dialog/asset-edit-dialog.component.ts
@@ -62,6 +62,7 @@ export class AssetEditDialogComponent implements OnDestroy {
         takeUntil(this.ngOnDestroy$),
         tap(() => {
           this.notificationService.showInfo('Successfully saved asset');
+          console.log('Successfully saved asset', formValue);
         }),
         catchError((error) => {
           console.error('Failed saving asset!', error);

diff --git a/...pp/routes/connector-ui/asset-page/asset-edit-dialog/form/asset-edit-dialog-form-mapper.ts b/...pp/routes/connector-ui/asset-page/asset-edit-dialog/form/asset-edit-dialog-form-mapper.ts
@@ -101,7 +101,7 @@ export class AssetEditDialogFormMapper {
   private emptyEditDatasource(): AssetDatasourceFormValue {
     return {
       ...this.emptyHttpDatasource(),
-      dataAddressType: 'Http',
+      dataAddressType: 'Unchanged',
     };
   }
 }
diff --git a/src/app/routes/connector-ui/asset-page/asset-page/asset-page.component.ts b/src/app/routes/connector-ui/asset-page/asset-page/asset-page.component.ts
@@ -60,7 +60,7 @@ export class AssetPageComponent implements OnInit, OnDestroy {
 
   onAssetClick(asset: UiAssetMapped) {
     const onAssetEditClick: OnAssetEditClickFn = (asset, onAssetUpdated) => {
-      this.onEdit(asset);
+      this.onEdit(asset, onAssetUpdated);
     };
 
     const buildDialogData = (asset: UiAssetMapped) =>
@@ -85,11 +85,24 @@ export class AssetPageComponent implements OnInit, OnDestroy {
       });
   }
 
-  onEdit(asset: UiAssetMapped) {
+  onEdit(
+    asset: UiAssetMapped,
+    onAssetUpdated: (updatedDialogData: any) => void,
+  ) {
     this.assetEditDialogService
       .showEditDialog(asset, this.ngOnDestroy$)
       .subscribe((result) => {
         if (result?.refreshedList) {
+          onAssetUpdated(
+            this.assetDetailDialogDataService.assetDetailsEditable(
+              result.asset,
+              {
+                onAssetEditClick: () => {
+                  this.onEdit(result.asset, onAssetUpdated);
+                },
+              },
+            ),
+          );
           this.refresh();
         }
       });