eservices-core 1.0.454 → 1.0.456

package/dist/hooks/use-form-request-data.d.ts

@@ -1,4 +1,7 @@
 import { Form } from "jenesius-vue-form";
+/**
+ * @deprecated Please, use useFormRequest
+ * */
 export default function useFormRequestData(form: Form, options: {
     fields: string | string[];
 }): {

package/dist/hooks/use-form-request.d.ts

@@ -0,0 +1,20 @@
+import { Form } from "jenesius-vue-form";
+/**
+ * @description Если используете shadowFormState - не забудь иницилизировать её при помощи функции initShadow.
+ * */
+export default function useFormRequest<T extends Form>(form: T, formParams: () => IReadFormParams): {
+    shadowFormState: {
+        ready: boolean;
+        show: boolean;
+    };
+    initShadow: () => void;
+};
+interface IReadFormParams {
+    id: number;
+    fields?: string;
+}
+export interface IShadowState {
+    ready: boolean;
+    show: boolean;
+}
+export {};

package/dist/index.d.ts

@@ -51,6 +51,7 @@ import Filter from "./utils/Filter";
 import staticLink from "./utils/static-link";
 import groupArrayByField from "./utils/group-array-by-field";
 import uuidv4 from "./utils/uuid";
+import parseError from "./utils/parse-error";
 import useFormMetadata from "./hooks/use-form-metadata";
 import useFormAction from "./hooks/use-form-action";
 import useFormLabel from "./hooks/use-form-label";
@@ -59,6 +60,7 @@ import { useListFilter, useListOrder, useListState } from "./classes/List";
 import useCustomerState from "./hooks/use-customer-state";
 import { useTableRequest, useTableState } from "./classes/table/Table";
 import { useCommunication } from "./classes/Communication";
+import useFormRequest from "./hooks/use-form-request";
 import { SYMBOL_ROW } from "./classes/table/Table";
 export { 
 /**
@@ -74,11 +76,15 @@ export { fileService, processWizardService, viewService, authService, dataServic
 /**
  * HOOKS
  * */
-export { useFormMetadata, useFormAction, useFormLabel, useFormRequestData, useListFilter, useListOrder, useListState, useCustomerState, useTableState, useTableRequest, useCommunication };
+export { useFormMetadata, useFormAction, useFormLabel, useFormRequestData, useListFilter, useListOrder, useListState, useCustomerState, useTableState, useTableRequest, useCommunication, useFormRequest };
 /**
  * All components binding with VueComponents must have name started with Widget.
  * */
 export { WidgetNotificationSystem, WidgetForm, ModalValidation, WidgetTable, WidgetSpinner, WidgetBreadcrumbs, WidgetList, WidgetSection, WidgetImage, WidgetButton, WidgetNotFound, WidgetIcon, WidgetCard, WidgetMultiButton, WidgetShadowForm };
+/**
+ * @description New Utils
+ * */
+export { parseError };
 declare const utils: {
     clickOutside: typeof _utils.clickOutside;
     requestHandler: typeof _utils.requestHandler;

package/dist/index.js

@@ -1,5 +1,5 @@
 /*!
-  * eservices-core v1.0.454
+  * eservices-core v1.0.456
   * (c) 2022 ESERVICES
   */
 'use strict';
@@ -1927,6 +1927,28 @@ class CoreError extends Error {
 }
 CoreError.ID = 0;
 
+const DEFAULT_ERROR = `Please try again later or submit a feedback if problem doesn't go.`;
+function parseError(data) {
+    if (typeof data === 'string')
+        return ErrorModel(data);
+    if (isErrorObject(data)) {
+        return ErrorModel(data.message);
+    }
+    return ErrorModel(DEFAULT_ERROR);
+}
+function isErrorObject(data) {
+    if (typeof data === 'object' && Object.hasOwnProperty.call(data, 'message') && data !== null) {
+        return true;
+    }
+    return false;
+}
+function ErrorModel(message, details = []) {
+    return {
+        message,
+        details
+    };
+}
+
 function parseData(res) {
     return res.text()
         .then(res => {
@@ -1934,7 +1956,7 @@ function parseData(res) {
             return JSON.parse(res);
         }
         catch (e) {
-            return res;
+            return DEFAULT_ERROR;
         }
     });
 }
@@ -5137,6 +5159,9 @@ function useFormLabel(form) {
     return { label, update };
 }
 
+/**
+ * @deprecated Please, use useFormRequest
+ * */
 function useFormRequestData(form, options) {
     const route = vueRouter.useRoute();
     const id = vue.computed(() => Number(route.params.id));
@@ -5237,6 +5262,74 @@ function useCustomerState() {
     };
 }
 
+/**
+ * @description Если используете shadowFormState - не забудь иницилизировать её при помощи функции initShadow.
+ * */
+function useFormRequest(form, formParams) {
+    const shadowFormState = vue.reactive({
+        ready: false,
+        show: false
+    });
+    /**
+     * @description Функция используется для инициализациия ShadowFormState
+     * */
+    function initShadow() {
+        shadowFormState.ready = false;
+        shadowFormState.show = false;
+    }
+    form.read = () => {
+        let params = formParams();
+        shadowFormState.ready = false;
+        return Promise.resolve()
+            .then(() => {
+            if (!form.name)
+                throw CoreError.EntityWithoutName('Use Form Request');
+            return dataService.readById(form.name, params.id, {
+                fields: params.fields
+            });
+        })
+            .then(utils$1.valuesToUpperCase)
+            .then(values => {
+            /**
+             * @description Если в ответе присутствует версия объекта - сохраняем её в форму.
+             * */
+            if (values.hasOwnProperty('Version'))
+                form.version = Number(values.Version);
+            form.setValues(values);
+            shadowFormState.show = true;
+            return values;
+        })
+            .catch(err => {
+            const errorObject = parseError(err);
+            NotificationSystem.add('error', errorObject.message);
+            throw errorObject;
+        })
+            .finally(() => {
+            shadowFormState.ready = true;
+        });
+    };
+    form.save = () => {
+        let params = formParams();
+        return Promise.resolve()
+            .then(() => {
+            if (!form.name)
+                throw CoreError.EntityWithoutName('Use Form Request');
+            return dataService.updateById(form.name, params.id, form.changes, { version: form.version });
+        })
+            .then(response => {
+            // @ts-ignore
+            form.version = response.version || response['Version'];
+        })
+            .catch(err => {
+            const errorObject = parseError(err);
+            NotificationSystem.add('error', errorObject.message);
+            throw errorObject;
+        });
+    };
+    form.on(jenesiusVueForm.Form.EVENT_SAVE, form.read.bind(form));
+    return { shadowFormState, initShadow };
+}
+
 const utils = {
     clickOutside,
     requestHandler,
@@ -5291,6 +5384,7 @@ exports.invitationService = InvitationService;
 exports.metadataService = metadataService;
 exports.newImport = newImport;
 exports.openService = openService;
+exports.parseError = parseError;
 exports.processWizardService = processWizardService;
 exports.requestHandler = requestHandler;
 exports.ruleValidationService = ruleValidationService;
@@ -5300,6 +5394,7 @@ exports.useCustomerState = useCustomerState;
 exports.useFormAction = useFormAction;
 exports.useFormLabel = useFormLabel;
 exports.useFormMetadata = useFormMetadata;
+exports.useFormRequest = useFormRequest;
 exports.useFormRequestData = useFormRequestData;
 exports.useListFilter = useListFilter;
 exports.useListOrder = useListOrder;

package/dist/utils/parse-error.d.ts

@@ -0,0 +1,6 @@
+export declare const DEFAULT_ERROR = "Please try again later or submit a feedback if problem doesn't go.";
+export default function parseError(data: unknown): IErrorObject;
+export interface IErrorObject {
+    message: string;
+    details: string[];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eservices-core",
-  "version": "1.0.454",
+  "version": "1.0.456",
   "description": "Core library",
   "author": "",
   "scripts": {