@apia/api 4.0.26 → 4.0.27

package/dist/index.d.ts

@@ -279,6 +279,8 @@ type TFilter = {
     errorMessage?: string;
     id: string;
     filterToId?: string;
+    filterToValue?: string;
+    hideToFilter?: true;
     isAdditional?: boolean;
     isHidden?: boolean;
     onChange?: (queryController: QueryController) => unknown;
@@ -291,6 +293,7 @@ type TFilter = {
     title?: string;
     tooltip?: string;
     isRange?: boolean;
+    group?: string;
     type?: 'date' | 'D' | 'S' | 'number' | 'N' | 'apiaNumber' | 'triple' | 'dateHour';
     value: any;
     valueTo?: any;
@@ -400,12 +403,23 @@ type QueryControllerStructure = {
     title: string;
     columns: TResponsiveTableColumn[];
     filters: TFilter[];
+    queryData?: {
+        noExecFirstTime?: boolean;
+        autoFilter?: boolean;
+        showAllAttributes?: boolean;
+        showColumn?: string;
+        name?: string;
+        hideCount?: boolean;
+        description?: string;
+        storeColumn?: string;
+        title?: string;
+    };
 };
 type StoredQueryControllerStructure = Omit<QueryControllerStructure, 'columns' | 'filters'>;
 declare class QueryController {
     ajaxUrl: string;
-    private hasInited;
-    private initializing;
+    protected hasInited: boolean;
+    protected initializing: boolean;
     protected mutex: Mutex;
     structure: StoredQueryControllerStructure | null;
     tableController: TableController;
@@ -461,13 +475,12 @@ type QueryModalControllerEvents = Pick<TableControllerEvents, 'onSelectRows'> &
     cancel: null;
 };
 declare class QueryModalController {
-    protected title?: string | undefined;
     protected emitter: EventEmitter<QueryModalControllerEvents>;
     protected queryController: QueryController;
     private modalHandler;
     protected currentSelection: TResponsiveTableRowsSelectionEvent | null;
     private additionalFiltersController;
-    constructor(queryController: QueryController, title?: string | undefined);
+    constructor(queryController: QueryController);
     protected getModalDefinition(): TOpenModal;
     getQueryController(): QueryController;
     protected on<K extends keyof QueryModalControllerEvents>(ev: K, cb: (e: QueryModalControllerEvents[K]) => unknown): UnSubscriber;
@@ -490,7 +503,6 @@ declare class GenericListQuery extends QueryController {
     protected getRefreshParameters(): Record<string, unknown>;
     protected parseRefreshResponse(response?: TApiaFunction | null): void;
     protected parseLoadStructureResponse(response: any): QueryControllerStructure;
-    initialLoad(): Promise<void>;
 }
 
 declare const makeApiaPoolsModals2: () => QueryModalController;

package/dist/index.js

@@ -2,18 +2,19 @@ import { jsx, jsxs, Fragment } from '@apia/theme/jsx-runtime';
 import * as React from 'react';
 import React__default, { createContext, useState, useCallback, useEffect, useId, useRef, useMemo } from 'react';
 import { Box, Label, spacing, getVariant, Input as Input$1, Select as Select$1 } from '@apia/theme';
-import { debugDispatcher, parseXmlAsync, EventEmitter, arrayOrArray, useMount, encrypt, noNaN, getIndex, getLabel, StatefulEmitter, focus, focusSelector, useLatest, useIntermediateValue, Mutex, uniqueId as uniqueId$1 } from '@apia/util';
+import { debugDispatcher, parseXmlAsync, EventEmitter, arrayOrArray, useMount, encrypt, noNaN, getIndex, getLabel, StatefulEmitter, focus, focusSelector, useLatest, useIntermediateValue, formatMessage, getDateFormat, Mutex, uniqueId as uniqueId$1 } from '@apia/util';
 import { notify, getNotificationMessageObj, dispatchNotifications } from '@apia/notifications';
 import { classToValidate, Checkbox, FileInput, classToValidationFunction, Input, Radio, Select, Textarea, useFormContext, validationsStore, hasSucceedFormValidation, Form } from '@apia/validations';
 import { Accordion, AccordionItem, useModal, LabelBox, SimpleButton, ApiaUtil, Modal, ProgressBar, DateInput } from '@apia/components';
-import axios from 'axios';
+import axios, { AxiosError } from 'axios';
 import merge from 'lodash-es/merge';
 import QueryString from 'qs';
 import { session } from '@apia/session';
 import uniqueId from 'lodash-es/uniqueId';
-import { ResponsiveTableContext, ResponsiveTable, Pagination, Sort, Responsive, Additional, responsiveTableStore, useResponsiveTableContext, getResponsiveTableContext, TableLoadingContext, defaultLabels, makeController2, responsiveTableActions, TableContextReproducer } from '@apia/table';
+import { ResponsiveTableContext, ResponsiveTable, Pagination, Sort, Responsive, Additional, responsiveTableStore, useResponsiveTableContext, getResponsiveTableContext, TableLoadingContext, defaultLabels, makeController2, responsiveTableActions, TableContextReproducer, Grouped } from '@apia/table';
 import { makeObservable, observable, reaction, toJS, action, computed } from 'mobx';
 import { observer } from 'mobx-react-lite';
+import dayjs from 'dayjs';
 import { Icon, FileIcon } from '@apia/icons';
 
 const ApiaApiId = createContext("apiaApi");
@@ -78,6 +79,10 @@ function getColor(color, colors = defaultConfig.colors ?? {
   return colors[color];
 }
 const handleWrongResponse = (error) => {
+  if (error instanceof AxiosError && (error.status === 403 || error.response?.status === 403)) {
+    session.invalidate();
+    return;
+  }
   let errorMessage;
   if (typeof error !== "string") {
     if (error.message)
@@ -378,7 +383,7 @@ async function post(par1, par2) {
     );
   }
   const response = await axios.post(parsedUrl, behaveConfig.postData, behaveConfig.axiosConfig).catch((e) => {
-    handleWrongResponse(new Error(e));
+    handleWrongResponse(e instanceof AxiosError ? e : new Error(e));
   });
   if (response) {
     const result = handleResponse(response, actualUrl, behaveConfig);
@@ -405,7 +410,7 @@ async function get(par1, par2) {
       }
     );
   const response = await axios.get(parsedUrl, behaveConfig.axiosConfig).catch((e) => {
-    handleWrongResponse(new Error(e));
+    handleWrongResponse(e instanceof AxiosError ? e : new Error(e));
   });
   if (response) {
     const result = await handleResponse(
@@ -3362,26 +3367,63 @@ const InputFilterRenderer = observer(
   }
 );
 
+const dateFormat = getDateFormat();
+function controlDatesOrder(first, last) {
+  if (!first || !last)
+    return true;
+  if (dayjs(last, dateFormat).isBefore(dayjs(first, dateFormat))) {
+    return false;
+  }
+  return true;
+}
 const DateFilterRenderer = observer(
   ({ filter, state }) => {
-    const { onFilterBlur, onFilterPressEnter } = useResponsiveTableContext();
-    return /* @__PURE__ */ jsx(
-      DateInput,
-      {
-        value: state.value,
-        onChange: (date) => {
-          state.value = date;
-        },
-        onKeyDown: (ev) => {
-          if (ev.code === "Enter") {
-            onFilterPressEnter?.(filter);
+    const { onFilterBlur, onFilterChange } = useResponsiveTableContext();
+    return /* @__PURE__ */ jsxs(Fragment, { children: [
+      /* @__PURE__ */ jsx(Box, { as: "span", children: state?.filterToId ? formatMessage(window.LBL_DATE_FILTER_FROM_TXT, {
+        TOK1: filter.title ?? ""
+      }) : state.title }),
+      /* @__PURE__ */ jsx(
+        DateInput,
+        {
+          value: state.value,
+          onChange: (date) => {
+            state.value = date;
+            onFilterChange?.(filter);
+          },
+          onBlur: () => {
+            onFilterBlur?.(filter);
           }
-        },
-        onBlur: () => {
-          onFilterBlur?.(filter);
         }
-      }
-    );
+      ),
+      (state?.isAdditional || state.group) && state?.filterToId && /* @__PURE__ */ jsxs(Fragment, { children: [
+        /* @__PURE__ */ jsx(Box, { as: "span", children: formatMessage(window.LBL_DATE_FILTER_TO_TXT, {
+          TOK1: state.title ?? ""
+        }) }),
+        /* @__PURE__ */ jsx(
+          DateInput,
+          {
+            value: state.filterToValue,
+            onChange: (date) => {
+              const result = controlDatesOrder(state.value, date);
+              if (result) {
+                state.filterToValue = date;
+                onFilterChange?.(filter);
+              } else {
+                state.filterToValue = void 0;
+                ApiaUtil.instance.notifications.notify({
+                  message: window.MSG_FEC_FIN_MAY_FEC_INI,
+                  type: "warning"
+                });
+              }
+            },
+            onBlur: () => {
+              onFilterBlur?.(filter);
+            }
+          }
+        )
+      ] })
+    ] });
   }
 );
 
@@ -3407,7 +3449,7 @@ class Filter {
       if (arrayOrArray(this.filterState.options).length > 0) {
         return this.getSelectRenderer({ filter });
       }
-      if (this.filterState.type === "D") {
+      if (this.filterState.type === "D" || this.filterState.type === "date") {
         return this.getDateRenderer({ filter });
       }
       return this.getInputRenderer({ filter });
@@ -3754,10 +3796,10 @@ class QueryController {
   }
   getFiltersValuesMap() {
     return [...this.tableController.state.filters.values()].reduce((result, filterWrapper) => {
-      const { id, value, filterToId, valueTo } = filterWrapper.filterState;
+      const { id, value, filterToId, filterToValue } = filterWrapper.filterState;
       result[id] = filterWrapper.filterState.multiplier ? value * filterWrapper.filterState.multiplier : value;
-      if (filterToId !== void 0 && valueTo) {
-        result[filterToId] = filterWrapper.filterState.multiplier ? valueTo * filterWrapper.filterState.multiplier : valueTo;
+      if (filterToId !== void 0 && filterToValue != void 0) {
+        result[filterToId] = filterWrapper.filterState.multiplier ? Number(filterToValue) * filterWrapper.filterState.multiplier : filterToValue;
       }
       return result;
     }, {});
@@ -3816,6 +3858,8 @@ class QueryController {
       this.hasInited = true;
       this.initializing = false;
       this.loadFilterTypes();
+      if (!this.structure.queryData?.noExecFirstTime)
+        this.refresh();
     }
   }
   async loadFilterTypes() {
@@ -3859,7 +3903,7 @@ class QueryController {
           id: c.name,
           showAsAdditional: c.asMoreInformation,
           title: c.toolTip,
-          width: c.width
+          width: c.width === "" || c.width === void 0 ? "300px" : c.width
         };
         return column;
       }),
@@ -3868,16 +3912,18 @@ class QueryController {
         const filter = {
           id: f.id ?? `filter${String(i + 1)}`,
           // Id generado en APIA
-          filterToId: f?.filterToId,
+          filterToId: f?.filterToId ?? f.type == "D" ? `filter${String(i + 1)}i` : void 0,
+          // Id generado en APIA
           value: f.currentValue,
-          valueTo: f?.filterToValue,
-          avoidLabel: false,
+          avoidLabel: f.type === "D" || f.type === "date" ? true : false,
+          filterToValue: f?.filterToValue,
           column: f.column,
           isAdditional: f.asAdditional,
           isHidden: f.hideFilterOption,
           title: f.title,
           tooltip: f.toolTip,
           type: f.type,
+          hideToFilter: true,
           onChange: () => {
           },
           options: [],
@@ -3895,7 +3941,8 @@ class QueryController {
       title: typedResponse.queryData?.title,
       openFiltersAutomatically: typedResponse.filters.openFiltersAutomatically,
       runFiltersAutomatically: typedResponse.filters.runFiltersAutomatically,
-      hideFilterTypes: typedResponse.filters.hideFilterTypes
+      hideFilterTypes: typedResponse.filters.hideFilterTypes,
+      queryData: typedResponse?.queryData
     };
   }
   parseRefreshResponse(response) {
@@ -4038,6 +4085,9 @@ const AdditionalFiltersComponent = ({
   const hasSortable = !![
     ...queryController.tableController.state.columns.values()
   ].find((c) => c.allowSorting !== false);
+  const hasGroupFilter = [
+    ...queryController.tableController.state.filters.values()
+  ].find((f) => f.filterState.group && f.filterState.group !== "")?.filterState;
   return /* @__PURE__ */ jsx(
     TableContextReproducer,
     {
@@ -4063,6 +4113,23 @@ const AdditionalFiltersComponent = ({
             children: /* @__PURE__ */ jsx(Additional, {})
           }
         ),
+        hasGroupFilter && /* @__PURE__ */ jsx(
+          AccordionItem,
+          {
+            id: "Group",
+            buttonProps: {
+              ariaLabel: getLabel("titMetadata").text,
+              label: getLabel("titMetadata").text
+            },
+            children: /* @__PURE__ */ jsx(
+              Grouped,
+              {
+                tableName: queryController.tableController.getTableName(),
+                group: hasGroupFilter?.group ?? ""
+              }
+            )
+          }
+        ),
         hasSortable && /* @__PURE__ */ jsx(
           AccordionItem,
           {
@@ -4156,8 +4223,7 @@ var __publicField$1 = (obj, key, value) => {
   return value;
 };
 class QueryModalController {
-  constructor(queryController, title) {
-    this.title = title;
+  constructor(queryController) {
     __publicField$1(this, "emitter", new EventEmitter());
     __publicField$1(this, "queryController");
     __publicField$1(this, "modalHandler", null);
@@ -4189,7 +4255,7 @@ class QueryModalController {
         /* @__PURE__ */ jsx(tableController.Table, {}),
         /* @__PURE__ */ jsx(tableController.Pagination, {})
       ] }),
-      title: this.title ?? structure?.title,
+      title: structure?.title,
       onConfirm: () => {
         this.onConfirm();
       },
@@ -4202,6 +4268,16 @@ class QueryModalController {
         cancelButtonText: getLabel("btnCan").text
       },
       NavBar: /* @__PURE__ */ jsxs(Fragment, { children: [
+        /* @__PURE__ */ jsx(
+          SimpleButton,
+          {
+            variant: "primary-sm",
+            onClick: () => {
+              this.queryController.refresh();
+            },
+            children: getLabel("btnSearch").text
+          }
+        ),
         /* @__PURE__ */ jsx(
           SimpleButton,
           {
@@ -4233,11 +4309,11 @@ class QueryModalController {
     return this.emitter.on(ev, cb);
   }
   async openModal(properties) {
+    await this.queryController.initialLoad();
     this.modalHandler = ApiaUtil.instance.modals.open({
       ...this.getModalDefinition(),
       ...properties
     });
-    await this.queryController.initialLoad();
     return this.onConfirmResolve();
   }
   getModalHandler() {
@@ -4308,12 +4384,6 @@ class GenericListQuery extends QueryController {
       }
     });
   }
-  async initialLoad() {
-    this.tableController.updateState({
-      props: this.getTableControllerDefaultProps()
-    });
-    await this.refresh();
-  }
 }
 
 class UsersQuery extends GenericListQuery {
@@ -4331,6 +4401,11 @@ class UsersQuery extends GenericListQuery {
       forCurrentEnv: false
     };
   }
+  parseLoadStructureResponse(response) {
+    const structure = { ...super.parseLoadStructureResponse(response) };
+    structure.hideFilterTypes = true;
+    return structure;
+  }
 }
 const makeApiaUsersModal2 = () => new QueryModalController(new UsersQuery());
 
@@ -4353,6 +4428,11 @@ class PoolsQuery extends GenericListQuery {
       fetchAllInHierarchy: false
     };
   }
+  parseLoadStructureResponse(response) {
+    const structure = { ...super.parseLoadStructureResponse(response) };
+    structure.hideFilterTypes = true;
+    return structure;
+  }
 }
 const makeApiaPoolsModals2 = () => new QueryModalController(new PoolsQuery());
 
@@ -4385,6 +4465,44 @@ class MonDocQuery extends QueryController {
       ]
     };
   }
+  async initialLoad() {
+    await super.initialLoad();
+    await this.loadMetadataFilters();
+    await this.setFilters();
+  }
+  async loadMetadataFilters() {
+    const res = await ApiaApi.post(
+      makeApiaUrl({
+        ajaxUrl: this.ajaxUrl,
+        action: "loadMetadata",
+        docTypeId: !this.hasInited ? this.dynamicParams.docTypeSel : this.tableController.state.filters.get("txtDocTypeId")?.filterState.value
+      })
+    );
+    if (res?.data?.docMetadata?.metadata) {
+      const parsedFilters = res.data.docMetadata.metadata.map((c) => {
+        const filter = {
+          ...c,
+          group: "metadata",
+          hideToFilter: true,
+          filterToId: `${String(c.id)}i`,
+          filterToValue: c.value2,
+          avoidLabel: c.type === "D"
+        };
+        return filter;
+      });
+      const metadataFilters = new Map(
+        arrayOrArray(parsedFilters).map((f) => {
+          return [f.id, new Filter(f)];
+        })
+      );
+      this.tableController.updateState({
+        filters: new Map([
+          ...this.tableController.state.filters.entries(),
+          ...metadataFilters.entries()
+        ])
+      });
+    }
+  }
   async loadFilterTypes() {
   }
   processFilterChangeEvent(ev) {
@@ -4414,10 +4532,49 @@ class MonDocQuery extends QueryController {
       isAjax: true
     };
   }
+  getFiltersValuesMap() {
+    const metadataValues = [];
+    const filtersValues = [
+      ...this.tableController.state.filters.values()
+    ].reduce((result, filterWrapper) => {
+      const { id, value, type, group, multiplier, filterToId, filterToValue } = filterWrapper.filterState;
+      if (group?.match(/metadata(\d+)/)) {
+        if (value !== "") {
+          const prefix = `${id}${window.PRIMARY_SEPARATOR}`;
+          if (type) {
+            const t = type === "apiaNumber" ? "N" : type;
+            metadataValues.push(
+              `${prefix}${t}${window.PRIMARY_SEPARATOR}${value}`
+            );
+            if (filterToValue) {
+              metadataValues.push(
+                `${prefix}${t}${window.PRIMARY_SEPARATOR}${filterToValue}`
+              );
+            }
+          } else {
+            metadataValues.push(`${prefix}${value}`);
+          }
+        }
+        return result;
+      }
+      result[id] = multiplier ? value * multiplier : value;
+      if (filterToId !== void 0 && filterToValue != void 0) {
+        result[filterToId] = multiplier ? Number(filterToValue) * multiplier : filterToValue;
+      }
+      return result;
+    }, {});
+    return {
+      ...filtersValues,
+      strDocMetadata: metadataValues.join(";")
+    };
+  }
   getEventsHandlers() {
     return {
       ...super.getEventsHandlers(),
-      onFilterChange: () => {
+      onFilterChange: (e) => {
+        if (e.id === "txtDocTypeId") {
+          this.loadMetadataFilters();
+        }
         this.refresh(false);
       }
     };
@@ -4505,13 +4662,15 @@ class MonDocQuery extends QueryController {
         const filter = {
           id: f.id,
           filterToId: f?.filterToId,
-          valueTo: f?.filterToValue,
-          value: f.currentValue,
-          avoidLabel: false,
+          filterToValue: f?.filterToValue,
+          isAdditional: f.type === "date",
+          value: f?.options?.[1].value ?? f.currentValue,
           column: f.column,
           title: f.title,
           tooltip: f.toolTip,
-          type: f.options ? "date" : "S",
+          hideToFilter: true,
+          avoidLabel: f.type === "date",
+          type: f.type,
           onChange: () => {
           },
           options: f.options?.map((option) => ({
@@ -4530,10 +4689,20 @@ class MonDocQuery extends QueryController {
       isDynamic: false,
       openFiltersAutomatically: false,
       runFiltersAutomatically: true,
-      title: ""
+      title: "",
+      queryData: { noExecFirstTime: true }
     };
     return returnObject;
   }
+  async setFilters() {
+    await ApiaApi.post(
+      makeApiaUrl({
+        ajaxUrl: this.ajaxUrl,
+        action: "setFilters",
+        txtDocTypeId: this.tableController.state.filters.get("txtDocTypeId")?.filterState.value
+      })
+    );
+  }
 }
 class ApiaMonDocModal2 extends QueryModalController {
   constructor() {