oneentry 1.0.110 → 1.0.111

package/README.md

@@ -1293,7 +1293,7 @@ const value = await AuthProvider.signUp('email', body)
 >
 >**formData:** FormDataLangType <br>
 >*Data submitted by the form* <br>
->example: OrderedMap { "en_US": List [ OrderedMap { "marker": "naimenovanie_1", "value": "Name" } ] } <br>
+>example: OrderedMap { "en_US": List [ OrderedMap { "marker": "marker_1", "value": "Name" } ] } <br>
 >
 >**notificationData:** UserNotificationDataType <br>
 >*data for notifying the user* <br>
@@ -1378,7 +1378,7 @@ Example return:
 >
 >**formData:** FormDataLangType <br>
 >*Data submitted by the form* <br>
->example: OrderedMap { "en_US": List [ OrderedMap { "marker": "naimenovanie_1", "value": "Name" } ] } <br>
+>example: OrderedMap { "en_US": List [ OrderedMap { "marker": "marker_1", "value": "Name" } ] } <br>
 >
 >**notificationData:** UserNotificationDataType <br>
 >*data for notifying the user* <br>
@@ -2954,7 +2954,7 @@ Example return:
 >
 >**formData:** FormDataLangType <br>
 >*Data submitted by the form* <br>
->example: OrderedMap { "en_US": List [ OrderedMap { "marker": "naimenovanie_1", "value": "Name" } ] } <br>
+>example: OrderedMap { "en_US": List [ OrderedMap { "marker": "marker_1", "value": "Name" } ] } <br>
 >
 >**attributeSetIdentifier:** string <br>
 >*text identifier (marker) of the used attribute set* <br>
@@ -2998,7 +2998,7 @@ const value = await FormData.postFormsData(body)
 >
 >**formData:** FormDataLangType <br>
 >*Data submitted by the form* <br>
->example: OrderedMap { "en_US": List [ OrderedMap { "marker": "naimenovanie_1", "type": "string", "value": "Name" } ] } <br>
+>example: OrderedMap { "en_US": List [ OrderedMap { "marker": "marker_1", "type": "string", "value": "Name" } ] } <br>
 >
 ></details>
 
@@ -3036,7 +3036,7 @@ Example return:
 >
 >**formData:** FormDataLangType <br>
 >*Data submitted by the form* <br>
->example: OrderedMap { "en_US": List [ OrderedMap { "marker": "naimenovanie_1", "value": "Name" } ] } <br>
+>example: OrderedMap { "en_US": List [ OrderedMap { "marker": "marker_1", "value": "Name" } ] } <br>
 ><br>
 ></details>
 
@@ -3112,7 +3112,7 @@ Example return:
 >
 >**formData:** FormDataLangType <br>
 >*Data submitted by the form* <br>
->example: OrderedMap { "en_US": List [ OrderedMap { "marker": "naimenovanie_1", "value": "Name" } ] } <br>
+>example: OrderedMap { "en_US": List [ OrderedMap { "marker": "marker_1", "value": "Name" } ] } <br>
 >
 >**attributeSetIdentifier:** string <br>
 >*text identifier (marker) of the used attribute set* <br>
@@ -3483,7 +3483,7 @@ Example return:
   "formData": {
     "en_US": [
       {
-        "marker": "naimenovanie_1",
+        "marker": "marker_1",
         "type": "string",
         "value": "Title"
       }
@@ -3515,7 +3515,7 @@ Example return:
 >
 >**formData:** FormDataLangType <br>
 >*Data submitted by the form attached to the collection* <br>
->example: OrderedMap { "en_US": List [ OrderedMap { "marker": "naimenovanie_1", "type": "string", "value": "Title" } ] } <br>
+>example: OrderedMap { "en_US": List [ OrderedMap { "marker": "marker_1", "type": "string", "value": "Title" } ] } <br>
 ><br>
 ></details>
 
@@ -3593,7 +3593,7 @@ Example return:
 >
 >**formData:** FormDataLangType <br>
 >*Data submitted by the form attached to the collection* <br>
->example: OrderedMap { "en_US": List [ OrderedMap { "marker": "naimenovanie_1", "type": "string", "value": "Name" } ] } <br>
+>example: OrderedMap { "en_US": List [ OrderedMap { "marker": "marker_1", "type": "string", "value": "Name" } ] } <br>
 ><br>
 ></details>
 
@@ -3657,7 +3657,7 @@ Example return:
   "formData": {
     "en_US": [
       {
-        "marker": "naimenovanie_1",
+        "marker": "marker_1",
         "type": "string",
         "value": "Name"
       }
@@ -3675,7 +3675,7 @@ Example return:
 >
 >**formData:** FormDataLangType <br>
 >*Data submitted by the form attached to the collection* <br>
->example: OrderedMap { "en_US": List [ OrderedMap { "marker": "naimenovanie_1", "type": "string", "value": "Name" } ] } <br>
+>example: OrderedMap { "en_US": List [ OrderedMap { "marker": "marker_1", "type": "string", "value": "Name" } ] } <br>
 ><br>
 ></details>
 
@@ -4312,7 +4312,7 @@ Example return:
   "statusIdentifier": "inprogress",
   "formData": [
       {
-        "marker": "naimenovanie_1",
+        "marker": "marker_1",
         "type": "string",
         "value": "Name"
       }
@@ -4457,7 +4457,7 @@ Example return:
   "statusIdentifier": "inprogress",
   "formData": [
       {
-        "marker": "naimenovanie_1",
+        "marker": "marker_1",
         "type": "string",
         "value": "Name"
       }
@@ -5146,7 +5146,7 @@ Example return:
     "attributeSetIdentifier": "block",
     "version": 0,
     "position": 2,
-    "identifier": "test",
+    "identifier": "test_identifier",
     "type": "forTextBlock",
     "templateIdentifier": null,
     "isVisible": true,
@@ -5253,7 +5253,7 @@ Example return:
     "attributes": [
       {
         "type": "list",
-        "marker": "l1",
+        "marker": "list_marker",
         "position": 2,
         "listTitles": [
           {

package/dist/base/asyncModules.d.ts

@@ -6,11 +6,53 @@ export default abstract class AsyncModules extends SyncModules {
     protected _https: any;
     protected _url: string;
     protected constructor(state: StateModule);
+    /**
+     * fetchGet
+     *
+     * @param path
+     * @returns
+     */
     protected _fetchGet(path: string): Promise<any>;
+    /**
+     * fetchPost
+     *
+     * @param path
+     * @param data
+     * @returns
+     */
     protected _fetchPost(path: string, data?: any): Promise<any>;
+    /**
+     * fetchPut
+     * @param path
+     * @param data
+     * @returns
+     */
     protected _fetchPut(path: string, data: any): Promise<any>;
+    /**
+     * _fetchDelete
+     * @param path
+     * @param data
+     * @returns
+     */
     protected _fetchDelete(path: string, data?: any): Promise<any>;
+    /**
+     * refreshToken
+     *
+     * @returns
+     */
     protected refreshToken(): Promise<boolean>;
+    /**
+     * makeOptions
+     * @param method
+     * @param data
+     * @returns
+     */
     private makeOptions;
+    /**
+     * browserResponse
+     * @param path
+     * @param options
+     * @returns
+     */
     private browserResponse;
 }

package/dist/base/asyncModules.js

@@ -14,6 +14,12 @@ class AsyncModules extends syncModules_1.default {
         this._NO_FETCH = state._NO_FETCH;
         this._https = (_a = state._https) !== null && _a !== void 0 ? _a : null;
     }
+    /**
+     * fetchGet
+     *
+     * @param path
+     * @returns
+     */
     async _fetchGet(path) {
         const options = this.makeOptions('GET');
         if (!this._NO_FETCH) {
@@ -36,6 +42,13 @@ class AsyncModules extends syncModules_1.default {
             });
         }
     }
+    /**
+     * fetchPost
+     *
+     * @param path
+     * @param data
+     * @returns
+     */
     async _fetchPost(path, data) {
         const options = this.makeOptions('POST', data);
         if (!this._NO_FETCH) {
@@ -66,6 +79,12 @@ class AsyncModules extends syncModules_1.default {
             });
         }
     }
+    /**
+     * fetchPut
+     * @param path
+     * @param data
+     * @returns
+     */
     async _fetchPut(path, data) {
         const options = this.makeOptions('PUT', data);
         if (!this._NO_FETCH) {
@@ -90,6 +109,12 @@ class AsyncModules extends syncModules_1.default {
             });
         }
     }
+    /**
+     * _fetchDelete
+     * @param path
+     * @param data
+     * @returns
+     */
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     async _fetchDelete(path, data) {
         const options = this.makeOptions('DELETE');
@@ -113,6 +138,11 @@ class AsyncModules extends syncModules_1.default {
             });
         }
     }
+    /**
+     * refreshToken
+     *
+     * @returns
+     */
     async refreshToken() {
         const response = await fetch(this.state.url +
             `/api/content/users-auth-providers/marker/email/users/refresh`, {
@@ -136,6 +166,12 @@ class AsyncModules extends syncModules_1.default {
             return false;
         }
     }
+    /**
+     * makeOptions
+     * @param method
+     * @param data
+     * @returns
+     */
     makeOptions(method, data) {
         const options = {
             method: method,
@@ -155,6 +191,12 @@ class AsyncModules extends syncModules_1.default {
         }
         return options;
     }
+    /**
+     * browserResponse
+     * @param path
+     * @param options
+     * @returns
+     */
     async browserResponse(path, options) {
         try {
             const response = await fetch(this._getFullPath(path), options);

package/dist/base/syncModules.d.ts

@@ -5,13 +5,86 @@ export default abstract class SyncModules {
     protected state: StateModule;
     protected _url: string;
     protected constructor(state: StateModule);
+    /**
+     * getFullPath
+     *
+     * @param path
+     * @returns
+     */
     protected _getFullPath(path: string): string;
+    /**
+     * queryParamsToString
+     *
+     * @param query
+     * @returns
+     */
     protected _queryParamsToString(query: IProductsQuery | IUploadingQuery | any): string;
+    /**
+     * normalizeData
+     *
+     * @param data
+     * @param langCode
+     * @returns normalized data
+     */
     protected _normalizeData(data: any, langCode?: string): any;
+    /**
+     * normalizePostBody
+     *
+     * @param body
+     * @param langCode
+     * @returns
+     */
     protected _normalizePostBody(body: any, langCode?: string): any;
+    /**
+     * clearArray
+     *
+     * @param data
+     * @returns
+     */
     protected _clearArray(data: Record<string, any>): any;
+    /**
+     * sortAttributes
+     *
+     * @param data
+     * @returns
+     */
+    protected _sortAttributes: (data: any) => {
+        [k: string]: unknown;
+    };
+    /**
+     * addTimeIntervalsToSchedules
+     *
+     * @param schedules
+     * @returns
+     */
+    protected _addTimeIntervalsToSchedules(schedules: any[]): any[];
+    /**
+     * normalizeAttr
+     *
+     * @param data
+     * @returns normalized Attrs
+     */
     protected _normalizeAttr(data: any): any;
+    /**
+     * dataPostProcess
+     *
+     * @param data
+     * @param langCode
+     * @returns
+     */
     protected _dataPostProcess(data: any, langCode?: string): any;
+    /**
+     * setAccessToken
+     *
+     * @param accessToken
+     * @returns
+     */
     setAccessToken(accessToken: string): this;
+    /**
+     * setRefreshToken
+     *
+     * @param refreshToken
+     * @returns
+     */
     setRefreshToken(refreshToken: string): this;
 }

package/dist/base/syncModules.js

@@ -2,12 +2,31 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 class SyncModules {
     constructor(state) {
+        /**
+         * sortAttributes
+         *
+         * @param data
+         * @returns
+         */
+        this._sortAttributes = (data) => Object.fromEntries(Object.entries(data).sort(([, a], [, b]) => a.position - b.position));
         this.state = state;
         this._url = state.url;
     }
+    /**
+     * getFullPath
+     *
+     * @param path
+     * @returns
+     */
     _getFullPath(path) {
         return this._url + path;
     }
+    /**
+     * queryParamsToString
+     *
+     * @param query
+     * @returns
+     */
     _queryParamsToString(query) {
         let result = '';
         for (const key in query) {
@@ -17,6 +36,13 @@ class SyncModules {
         }
         return result.slice(0, result.length - 1);
     }
+    /**
+     * normalizeData
+     *
+     * @param data
+     * @param langCode
+     * @returns normalized data
+     */
     _normalizeData(data, langCode = this.state.lang) {
         if (Array.isArray(data)) {
             return this._normalizeAttr(data.map((item) => this._normalizeData(item, langCode)));
@@ -43,6 +69,13 @@ class SyncModules {
             return data;
         }
     }
+    /**
+     * normalizePostBody
+     *
+     * @param body
+     * @param langCode
+     * @returns
+     */
     _normalizePostBody(body, langCode = this.state.lang) {
         const formData = {};
         formData[langCode] = Array.isArray(body.formData)
@@ -51,6 +84,12 @@ class SyncModules {
         body.formData = formData;
         return body;
     }
+    /**
+     * clearArray
+     *
+     * @param data
+     * @returns
+     */
     _clearArray(data) {
         if (Array.isArray(data)) {
             return data.map((item) => this._clearArray(item));
@@ -84,26 +123,124 @@ class SyncModules {
             return data;
         }
     }
+    /**
+     * addTimeIntervalsToSchedules
+     *
+     * @param schedules
+     * @returns
+     */
+    _addTimeIntervalsToSchedules(schedules) {
+        // Function to add days
+        function addDays(date, days) {
+            const result = new Date(date);
+            result.setUTCDate(result.getUTCDate() + days);
+            return result;
+        }
+        // Function to add months
+        function addMonths(date, months) {
+            const result = new Date(date);
+            result.setUTCMonth(result.getUTCMonth() + months);
+            return result;
+        }
+        schedules.forEach((scheduleGroup) => {
+            scheduleGroup.values.forEach((schedule) => {
+                const utcIntervals = [];
+                const baseDate = new Date(schedule.dates[0]); // We use the first date as the base date
+                // Generate intervals based on weekly repetition
+                if (schedule.inEveryWeek) {
+                    for (let week = 0; week < 4; week++) {
+                        schedule.times.forEach((timeRange) => {
+                            const [startTime, endTime] = timeRange;
+                            const startDate = addDays(baseDate, week * 7);
+                            startDate.setUTCHours(startTime.hours, startTime.minutes, 0, 0);
+                            const endDate = addDays(baseDate, week * 7);
+                            endDate.setUTCHours(endTime.hours, endTime.minutes, 0, 0);
+                            utcIntervals.push([
+                                startDate.toISOString(),
+                                endDate.toISOString(),
+                            ]);
+                        });
+                    }
+                }
+                // Generate intervals based on monthly repetition
+                if (schedule.inEveryMonth) {
+                    for (let month = 0; month < 12; month++) {
+                        // Предполагаем 12 месяцев в году
+                        schedule.times.forEach((timeRange) => {
+                            const [startTime, endTime] = timeRange;
+                            const startDate = addMonths(baseDate, month);
+                            startDate.setUTCHours(startTime.hours, startTime.minutes, 0, 0);
+                            const endDate = addMonths(baseDate, month);
+                            endDate.setUTCHours(endTime.hours, endTime.minutes, 0, 0);
+                            utcIntervals.push([
+                                startDate.toISOString(),
+                                endDate.toISOString(),
+                            ]);
+                        });
+                    }
+                }
+                // Add the calculated intervals to the new timeIntervals field
+                schedule.timeIntervals = utcIntervals;
+            });
+        });
+        return schedules;
+    }
+    /**
+     * normalizeAttr
+     *
+     * @param data
+     * @returns normalized Attrs
+     */
     _normalizeAttr(data) {
         if ('attributeValues' in data) {
             for (const attr in data.attributeValues) {
+                // normalize numbers
                 if (data.attributeValues[attr].type === 'integer' ||
                     data.attributeValues[attr].type === 'float') {
                     data.attributeValues[attr].value = Number(data.attributeValues[attr].value);
                 }
+                // add timeIntervals
+                if (data.attributeValues[attr].type === 'timeInterval') {
+                    const schedules = data.attributeValues[attr].value;
+                    const result = this._addTimeIntervalsToSchedules(schedules);
+                    data.attributeValues[attr].value = result;
+                }
             }
+            return {
+                ...data,
+                attributeValues: this._sortAttributes(data.attributeValues),
+            };
         }
         return data;
     }
+    /**
+     * dataPostProcess
+     *
+     * @param data
+     * @param langCode
+     * @returns
+     */
     _dataPostProcess(data, langCode = this.state.lang) {
         const normalize = this._normalizeData(data, langCode);
         const result = this._clearArray(normalize);
         return result;
     }
+    /**
+     * setAccessToken
+     *
+     * @param accessToken
+     * @returns
+     */
     setAccessToken(accessToken) {
         this.state.accessToken = accessToken;
         return this;
     }
+    /**
+     * setRefreshToken
+     *
+     * @param refreshToken
+     * @returns
+     */
     setRefreshToken(refreshToken) {
         this.state.refreshToken = refreshToken;
         return this;

package/dist/pages/pagesApi.js

@@ -56,8 +56,8 @@ class PageApi extends asyncModules_1.default {
      * @returns Returns PageEntity object
      */
     async getPageByUrl(url, langCode = this.state.lang) {
-        const result = await this._fetchGet(`/url/${url}?langCode=${langCode}`);
-        return this._normalizeData(result, langCode);
+        const data = await this._fetchGet(`/url/${url}?langCode=${langCode}`);
+        return this._normalizeData(data, langCode);
     }
     /**
      * Get child pages object with information as an array.
@@ -68,8 +68,8 @@ class PageApi extends asyncModules_1.default {
      * @returns Returns all created pages as an array of PageEntity objects or an empty array [] (if there is no data) for the selected parent
      */
     async getChildPagesByParentUrl(url, langCode = this.state.lang) {
-        const result = await this._fetchGet(`/${url}/children?langCode=${langCode}`);
-        return this._normalizeData(result, langCode);
+        const data = await this._fetchGet(`/${url}/children?langCode=${langCode}`);
+        return this._normalizeData(data, langCode);
     }
     /**
      * Get all blocks by page url.

package/dist/users/usersApi.d.ts

@@ -19,6 +19,7 @@ export default class UsersApi extends AsyncModules implements IUsers {
     getUser(langCode?: string): Promise<IUserEntity | IError>;
     /**
      * Updating a single user object.
+     *
      * @description This method requires user authorization. For more information about configuring the authorization module, see the documentation in the configuration settings section of the SDK.
      *
      * @param {object} [body] - Request body.
@@ -49,13 +50,11 @@ export default class UsersApi extends AsyncModules implements IUsers {
     updateUser(body: IUserBody, langCode?: string): Promise<boolean | IError>;
     /**
      * Delete a single user object.
-     * @description This method requires user authorization. For more information about configuring the authorization module, see the documentation in the configuration settings section of the SDK.
      *
-     * @param {object} [body] - Request body.
-     * @param {string} [langCode] - Optional language field
+     * @description This method requires user authorization. For more information about configuring the authorization module, see the documentation in the configuration settings section of the SDK.
      *
      */
-    deleteUser(body: IUserBody, langCode?: string): Promise<boolean | IError>;
+    deleteUser(): Promise<boolean | IError>;
     /**
      * Adds FCM token for sending Push notification.
      *

package/dist/users/usersApi.js

@@ -25,6 +25,7 @@ class UsersApi extends asyncModules_1.default {
     }
     /**
      * Updating a single user object.
+     *
      * @description This method requires user authorization. For more information about configuring the authorization module, see the documentation in the configuration settings section of the SDK.
      *
      * @param {object} [body] - Request body.
@@ -64,20 +65,12 @@ class UsersApi extends asyncModules_1.default {
     }
     /**
      * Delete a single user object.
-     * @description This method requires user authorization. For more information about configuring the authorization module, see the documentation in the configuration settings section of the SDK.
      *
-     * @param {object} [body] - Request body.
-     * @param {string} [langCode] - Optional language field
+     * @description This method requires user authorization. For more information about configuring the authorization module, see the documentation in the configuration settings section of the SDK.
      *
      */
-    async deleteUser(body, langCode = this.state.lang) {
-        if (!('langCode' in body))
-            body['langCode'] = langCode;
-        const result = await this._fetchDelete('/me', 
-        // eslint-disable-next-line no-prototype-builtins
-        body.hasOwnProperty('formData')
-            ? this._normalizePostBody(body, langCode)
-            : body);
+    async deleteUser() {
+        const result = await this._fetchDelete('/me');
         return result;
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oneentry",
-  "version": "1.0.110",
+  "version": "1.0.111",
   "description": "OneEntry NPM package",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -10,25 +10,25 @@
   "scripts": {
     "productionBuild": "run-s lint testAll build readme",
     "testAll": "run-s admins attributesets authProvider blocks fileuploading forms formsdata generaltypes integrationcollections locales menus orders pages payments payments productstatuses products templates templatespreview users",
-    "admins": "npx jest src/admins/admins.spec.ts",
-    "attributesets": "npx jest src/attribute-sets/attributesets.spec.ts",
-    "authProvider": "npx jest src/auth-provider/authProvider.spec.ts",
-    "blocks": "npx jest src/blocks/blocks.spec.ts",
-    "fileuploading": "npx jest src/file-uploading/fileuploading.spec.ts",
-    "forms": "npx jest src/forms/forms.spec.ts",
-    "formsdata": "npx jest src/formsData/formsdata.spec.ts",
-    "generaltypes": "npx jest src/general-types/generaltypes.spec.ts",
-    "integrationcollections": "npx jest src/integration-collections/integrationcollections.spec.ts",
-    "locales": "npx jest src/locales/locales.spec.ts",
-    "menus": "npx jest src/menus/menus.spec.ts",
-    "orders": "npx jest src/orders/orders.spec.ts",
-    "pages": "npx jest src/pages/pages.spec.ts",
-    "payments": "npx jest src/payments/payments.spec.ts",
-    "productstatuses": "npx jest src/product-statuses/productstatuses.spec.ts",
-    "products": "npx jest src/products/products.spec.ts",
-    "templates": "npx jest src/templates/templates.spec.ts",
-    "templatespreview": "npx jest src/templates-preview/templatespreview.spec.ts",
-    "users": "npx jest src/users/users.spec.ts",
+    "admins": "npx jest src/admins/tests/admins.spec.ts",
+    "attributesets": "npx jest src/attribute-sets/tests/attributesets.spec.ts",
+    "authProvider": "npx jest src/auth-provider/tests/authProvider.spec.ts",
+    "blocks": "npx jest src/blocks/tests/blocks.spec.ts",
+    "fileuploading": "npx jest src/file-uploading/tests/fileuploading.spec.ts",
+    "forms": "npx jest src/forms/tests/forms.spec.ts",
+    "formsdata": "npx jest src/formsData/tests/formsdata.spec.ts",
+    "generaltypes": "npx jest src/general-types/tests/generaltypes.spec.ts",
+    "integrationcollections": "npx jest src/integration-collections/tests/integrationcollections.spec.ts",
+    "locales": "npx jest src/locales/tests/locales.spec.ts",
+    "menus": "npx jest src/menus/tests/menus.spec.ts",
+    "orders": "npx jest src/orders/tests/orders.spec.ts",
+    "pages": "npx jest src/pages/tests/pages.spec.ts",
+    "payments": "npx jest src/payments/tests/payments.spec.ts",
+    "productstatuses": "npx jest src/product-statuses/tests/productstatuses.spec.ts",
+    "products": "npx jest src/products/tests/products.spec.ts",
+    "templates": "npx jest src/templates/tests/templates.spec.ts",
+    "templatespreview": "npx jest src/templates-preview/tests/templatespreview.spec.ts",
+    "users": "npx jest src/users/tests/users.spec.ts",
     "lint": "npx eslint",
     "build": "npx tsc",
     "readme": "node ./src/readme.js"