@genesislcap/pbc-notify-ui 15.14.0 → 15.14.1

package/src/components/foundation-notification-dashboard/components/templates/template-dialog/template-dialog.ts

@@ -64,6 +64,7 @@ export class TemplateDialog extends AlertSoundAttachmentMixin(GenesisElement) {
   @observable resources: Array<string> = [];
   @observable fields: Array<Field> = [];
   @observable topics: Array<string> = [];
+  private hydrating = false;
 
   private requiredFields = () => [this.name, this.description, this.header, this.message];
 
@@ -82,23 +83,31 @@ export class TemplateDialog extends AlertSoundAttachmentMixin(GenesisElement) {
   }
 
   public async openDialog(params: any) {
-    this.topics = await this.notifyService.getNotifyRouteTopics();
-    this.resources = await this.systemService.getResources(); // TODO: Tables + Views
     this.templateDialogMode = params.mode;
+    this.hydrating = true;
+    this.dialog.show();
 
-    switch (params.mode) {
-      case TemplateDialogMode.CREATE:
-        await this.createTemplate();
-        break;
-      case TemplateDialogMode.EDIT:
-        await this.editTemplate(params.data);
-        break;
-      default:
-        logger.error('Error on TemplateDialogMode');
-        break;
+    try {
+      this.topics = await this.notifyService.getNotifyRouteTopics();
+      this.resources = await this.systemService.getResources(); // TODO: Tables + Views
+
+      switch (params.mode) {
+        case TemplateDialogMode.CREATE:
+          await this.createTemplate();
+          break;
+        case TemplateDialogMode.EDIT:
+          await this.editTemplate(params.data);
+          break;
+        default:
+          logger.error('Error on TemplateDialogMode');
+          break;
+      }
+    } catch (error) {
+      logger.error('Failed to initialize template dialog', error);
+      this.close();
+    } finally {
+      this.hydrating = false;
     }
-
-    this.dialog.show();
   }
 
   close() {
@@ -262,6 +271,10 @@ export class TemplateDialog extends AlertSoundAttachmentMixin(GenesisElement) {
   }
 
   async resourceChanged() {
+    if (this.hydrating) {
+      return;
+    }
+
     this.conditions = [DynamicRuleUtils.createEmptyCondition()];
     this.fields = await this.systemService.getFields(this.resource);
     this.refreshExpressionPreview();

package/src/services/system.service.ts

@@ -12,6 +12,27 @@ export interface SystemService {
   getFields(resource: string): Promise<Field[]>;
 }
 
+function schemaDefinitionToField(name: string, def: unknown): Field {
+  const raw = def && typeof def === 'object' ? (def as Record<string, unknown>) : {};
+  const oneOf = Array.isArray(raw.oneOf) ? raw.oneOf : [];
+  const concrete =
+    (oneOf.find((option) => {
+      if (!option || typeof option !== 'object') {
+        return false;
+      }
+      return (option as Record<string, unknown>).type !== 'null';
+    }) as Record<string, unknown> | undefined) ?? raw;
+  const genesisType = typeof concrete.genesisType === 'string' ? concrete.genesisType : undefined;
+  const jsonType = typeof concrete.type === 'string' ? concrete.type : undefined;
+  const enumValues = Array.isArray(concrete.enum) ? concrete.enum.map(String) : null;
+
+  return {
+    FIELD_NAME: name,
+    FIELD_TYPE: (genesisType ?? jsonType ?? 'STRING').toUpperCase(),
+    FIELD_VALUES: enumValues,
+  };
+}
+
 class SystemServiceImpl implements SystemService {
   @Connect private connect: Connect;
 
@@ -27,18 +48,24 @@ class SystemServiceImpl implements SystemService {
       return [];
     }
 
-    const response = await this.connect.request('SYSTEM_ENTITY_FIELDS', {
-      REQUEST: {
-        ENTITY_NAME: resource,
-      },
-    });
-    return response.REPLY.sort((a, b) => a.NAME.localeCompare(b.NAME)).map((entity) => ({
-      FIELD_NAME: entity.NAME,
-      FIELD_TYPE: entity.TYPE,
-      // Enum fields expose their allowed values (space-separated) so the condition
-      // builder can render a multiselect for them.
-      FIELD_VALUES: entity.VALUES ? entity.VALUES.split(' ').filter((v: string) => v.length) : null,
-    }));
+    try {
+      const schema = await this.connect.getJSONSchema(resource);
+      const reply = schema?.OUTBOUND?.properties?.REPLY;
+      if (!reply || typeof reply === 'boolean') {
+        return [];
+      }
+
+      const items = Array.isArray(reply.items) ? reply.items[0] : reply.items;
+      if (!items || typeof items === 'boolean' || !items.properties) {
+        return [];
+      }
+
+      return Object.entries(items.properties)
+        .map(([name, def]) => schemaDefinitionToField(name, def))
+        .sort((a, b) => a.FIELD_NAME.localeCompare(b.FIELD_NAME));
+    } catch {
+      return [];
+    }
   }
 }