@apia/execution 4.0.31 → 4.0.32

package/dist/index.d.ts

@@ -2742,7 +2742,7 @@ type TEntity = {
     title: string;
     readOnly: boolean;
     separator: string;
-    associations: Associations[];
+    associations: Association[];
     date: {
         label: string;
         toolTip: string;
@@ -2825,10 +2825,13 @@ type PoolId = {
     poolName: string;
     canUpdate: boolean;
 };
-type Associations = {
+type Association = {
     asocName: string;
     asocId: string;
     asocRelName: string;
+    errorNameMessage?: string;
+    errorRelNameMessage?: string;
+    focusTarget?: boolean;
 };
 
 declare class Entity {
@@ -2840,13 +2843,15 @@ declare class Entity {
     get name(): string | undefined;
     private hasInited;
     init(): Promise<void>;
+    addAssociation(): void;
     getConfirmParams(): any;
-    loadCategories: () => Promise<void>;
-    loadPools: () => Promise<void>;
-    loadAssociations: () => Promise<void>;
+    protected loadCategories: () => Promise<void>;
+    protected loadPools: () => Promise<void>;
+    protected loadAssociations: () => Promise<void>;
     private parseRows;
-    deleteRow(): void;
-    addRow(): void;
+    deleteAssociation(): void;
+    deleteVisibility(id: string): void;
+    validateAssociations(): boolean;
 }
 
 type TObservations = {
@@ -3404,6 +3409,7 @@ type EditorEvents = 'onChange';
 declare class Editor extends TranslatableField<TApiaEditorProperties, string> {
     fireEvent(eventName: EditorEvents, options?: TFireEventOptions): Promise<boolean>;
     protected isValidValue(): boolean;
+    protected getSynchronizePostConfiguration(value: string): IApiaApiPostConfig<any>;
 }
 
 declare class File$1 extends FieldWithAttribute<TApiaFileProperties> {
@@ -3726,6 +3732,7 @@ declare class Select extends FieldWithAttribute<TApiaSelectProperties, string, T
 
 declare class Textarea extends TranslatableField<TApiaTextareaProperties, string> {
     protected isValidValue(): boolean;
+    protected getSynchronizePostConfiguration(value: string): IApiaApiPostConfig<any>;
 }
 
 declare class Title extends Field<TApiaTitleProperties> {

package/dist/index.js

@@ -4,12 +4,13 @@ import xml2js from 'xml2js';
 import he from 'he';
 import { parseBooleans, parseNumbers } from 'xml2js/lib/processors';
 import QueryString from 'qs';
-import { arrayOrArray, EventEmitter as EventEmitter$1, isTrue, toBoolean, downloadUrl, addBoundary, formatMessage, parseAsSize, shallowEqual as shallowEqual$1, Mutex, awaitTime, noNaN as noNaN$1, getDateFormat, uniqueId, parseXMLRequestResponse, Url, postNavigation } from '@apia/util';
+import { arrayOrArray, EventEmitter as EventEmitter$1, isTrue, toBoolean, downloadUrl, addBoundary, formatMessage, parseAsSize, shallowEqual as shallowEqual$1, Mutex, awaitTime, noNaN as noNaN$1, getDateFormat, decodeBase64ToUtf8 as decodeBase64ToUtf8$1, uniqueId, parseXMLRequestResponse, Url, postNavigation } from '@apia/util';
 import { Cell, TableController, Row, FocusControllerPlugin } from '@apia/table2-controller';
 import dayjs from 'dayjs';
 import customParseFormat from 'dayjs/plugin/customParseFormat';
 import { MobXTree } from '@apia/tree2-controller';
 import { Scheduler } from '@apia/scheduler-controller';
+import { ApiaUtil } from '@apia/components';
 
 const deepEqual = (a, b) => {
   if (Object.is(a, b))
@@ -683,7 +684,7 @@ function makeApiaUrl(execution, props) {
   if (props?.queryString && props.queryString.includes("timestamp=") || queryString?.includes("timestamp=")) {
     timestamp = "";
   }
-  const contextWord = CONTEXT.replaceAll("/", "");
+  const contextWord = CONTEXT.replace(/^\/?(.+?)\/?$/, "$1");
   actualAjaxUrl = actualAjaxUrl.match(
     new RegExp(`^(?:(?:/?${contextWord})?/)?(.+)$`)
   )?.[1];
@@ -1990,6 +1991,11 @@ class Editor extends TranslatableField {
   isValidValue() {
     return !!new DOMParser().parseFromString(this.getValue(), "text/html").documentElement.textContent;
   }
+  getSynchronizePostConfiguration(value) {
+    const conf = super.getSynchronizePostConfiguration(value);
+    conf.postData.clearValues = "true";
+    return conf;
+  }
 }
 
 var __defProp$j = Object.defineProperty;
@@ -2250,7 +2256,8 @@ class UploaderModalController {
           isValid = false;
         }
         if (c.value.trim() === "") {
-          c.errorMessage = getLabel(this.api.execution, "msgReqField").text;
+          if (!c.errorMessage)
+            c.errorMessage = getLabel(this.api.execution, "msgReqField").text;
           isValid = false;
         }
       }
@@ -2828,7 +2835,7 @@ class UploaderApi extends EventEmitter$1 {
           if (isOneClickUploadEnabled(
             this.execution,
             this.modalConfig.oneClickUpload
-          ) && !this.state.versioningFile) {
+          )) {
             if (langId && translatingFile)
               void this.confirmDropModal({ langId, translatingFile });
             else
@@ -5254,15 +5261,21 @@ class Input extends TranslatableField {
       const inFmt = getDateFormat(options?.format);
       const outFmt = getDateFormat();
       if (typeof newValue === "string") {
-        const d = dayjs(newValue.trim(), inFmt, true);
-        if (!d.isValid() && newValue.trim() !== "") {
-          this.state.validation.errorMessage = getLabel(
-            this.getForm().execution,
-            "msgInvalidDate"
-          ).text;
-          this.validDate = false;
+        if (newValue.match(/^\d+$/)) {
+          const value = new Date(Number.parseInt(newValue));
+          const d = dayjs(value);
+          return super.setValue(d.isValid() ? d.format(outFmt) : "", options);
+        } else {
+          const d = dayjs(newValue.trim(), inFmt, true);
+          if (!d.isValid() && newValue.trim() !== "") {
+            this.state.validation.errorMessage = getLabel(
+              this.getForm().execution,
+              "msgInvalidDate"
+            ).text;
+            this.validDate = false;
+          }
+          return super.setValue(d.isValid() ? d.format(outFmt) : "", options);
         }
-        return super.setValue(d.isValid() ? d.format(outFmt) : "", options);
       }
       if (newValue instanceof Date) {
         const d = dayjs(newValue);
@@ -5389,6 +5402,11 @@ class Textarea extends TranslatableField {
   isValidValue() {
     return !!String(this.getValue()).trim();
   }
+  getSynchronizePostConfiguration(value) {
+    const conf = super.getSynchronizePostConfiguration(value);
+    conf.postData.clearValues = "true";
+    return conf;
+  }
 }
 
 class Title extends Field {
@@ -7253,7 +7271,9 @@ class CustomComponent {
       }
     }
     arrayOrArray(o.attribute).forEach((c) => {
-      this._state.attributes[c.name] = arrayOrArray(JSON.parse(atob(c.values)));
+      this._state.attributes[c.name] = arrayOrArray(
+        JSON.parse(decodeBase64ToUtf8$1(c.values))
+      );
     });
     arrayOrArray(o.property).forEach((c) => {
       this._state.properties[c.name] = c.value;
@@ -8215,6 +8235,24 @@ class Entity {
       }
     }
   }
+  addAssociation() {
+    const id = String(uniqueId());
+    this.state.associations.push({
+      asocId: id,
+      asocName: "",
+      asocRelName: ""
+    });
+    const row = new Row(id);
+    row.build({
+      id: String(uniqueId()),
+      cells: [{ colName: "name" }, { colName: "relName" }],
+      isSelected: true
+    });
+    this.controller.body.addRow(row);
+    this.controller.setSelection([
+      this.controller.body.getState("rows").length
+    ]);
+  }
   getConfirmParams() {
     const result = {
       busEntSta: this.state?.status.value ?? ""
@@ -8262,27 +8300,46 @@ class Entity {
       return newRow;
     });
   }
-  deleteRow() {
+  deleteAssociation() {
     const selectedRows = this.controller.getState("selection");
-    [...selectedRows.values()].map((row, rowIndex) => {
-      this.state.associations = this.state?.associations.filter((_, idx) => rowIndex !== idx) ?? [];
+    const lastIdx = Array.from(selectedRows).pop()?.index;
+    [...selectedRows.values()].forEach((row) => {
+      this.state.associations = this.state?.associations.filter((_, idx) => row.index !== idx) ?? [];
       this.controller.body.removeRow(row);
     });
+    if (lastIdx)
+      this.controller.setSelection([lastIdx - 1]);
   }
-  addRow() {
-    const id = String(uniqueId());
-    this.state.associations.push({
-      asocId: id,
-      asocName: "",
-      asocRelName: ""
-    });
-    const row = new Row(id);
-    row.build({
-      id: String(uniqueId()),
-      cells: [{ colName: "name" }, { colName: "relName" }],
-      isSelected: true
-    });
-    this.controller.body.addRow(row);
+  deleteVisibility(id) {
+    if (this.state) {
+      this.state.visibilities = this.state.visibilities.filter(
+        (c) => c.poolId !== id
+      );
+    }
+  }
+  validateAssociations() {
+    if (this.state?.associations.length === 0)
+      return true;
+    if (this.state) {
+      const invalidAssociations = this.state.associations.filter(
+        (c) => !c.asocName || !c.asocRelName
+      );
+      if (invalidAssociations.length > 0) {
+        invalidAssociations.forEach((c, idx) => {
+          c.errorRelNameMessage = "";
+          c.errorNameMessage = "";
+          c.focusTarget = void 0;
+          if (idx === 0)
+            c.focusTarget = true;
+          if (c.asocName === "")
+            c.errorNameMessage = labels.errorFieldRequired(this.execution);
+          if (c.asocRelName === "")
+            c.errorRelNameMessage = labels.errorFieldRequired(this.execution);
+        });
+        return false;
+      }
+    }
+    return true;
   }
 }
 
@@ -8904,17 +8961,21 @@ async function defaultConfirm(execution, status) {
       setAjaxFormResponse(execution, checkConfirmEntity.data?.form);
     }
     const url = arrayOrArray(confirmResponse.data.actions?.action.param)[1];
-    const c = new Url(url);
-    getWindow(execution).location.assign(
-      makeApiaUrl(execution, {
-        ajaxUrl: c.base,
-        action: c.getParameter("action")
-      })
-    );
-    (getWindow(execution)?.top?.ApiaUtil).notifications.notify({
-      message: confirmResponse?.data?.load?.text?.label,
-      type: "success"
-    });
+    if (url === "callNavigateClose") {
+      ApiaUtil.instance.tabs.currentTab.close(true);
+    } else {
+      const c = new Url(url);
+      getWindow(execution).location.assign(
+        makeApiaUrl(execution, {
+          ajaxUrl: c.base,
+          action: c.getParameter("action")
+        })
+      );
+      (getWindow(execution)?.top?.ApiaUtil).notifications.notify({
+        message: confirmResponse?.data?.load?.text?.label,
+        type: "success"
+      });
+    }
   }
   return {
     ...status,
@@ -9237,6 +9298,9 @@ class Execution extends EventEmitter$1 {
       if (validationResult !== true) {
         return validationResult;
       }
+      if (this.executionConfig?.isEntity && !this.entity.validateAssociations()) {
+        return false;
+      }
       const isValid = status !== void 0 || await this.fireEvents("onSubmit");
       const canConfirm = this.executionConfig?.canConfirm && isValid === true;
       if (canConfirm) {