@antscorp/antsomi-ui 2.0.70 → 2.0.71

package/es/components/organism/TicketEditor/Content.js

@@ -213,19 +213,17 @@ const Content = ({ portalId, token, action, ticketId, listUsers, domainTicket, d
             listUsers?.length &&
             dataSelects?.length) {
             const { category, feature, followers, ownerId, priority, ticketType, title, referenceUrl, ...rests } = formatDatarender(ticketDetails, dataSelects, listUsers);
-            if (ownerId?.length > 0) {
-                updateValueInput({
-                    category,
-                    feature,
-                    followers,
-                    ownerId,
-                    priority,
-                    ticketType,
-                    title,
-                    referenceUrl,
-                    originTitle: title,
-                });
-            }
+            updateValueInput({
+                category,
+                feature,
+                followers,
+                ownerId,
+                priority,
+                ticketType,
+                title,
+                referenceUrl,
+                originTitle: title,
+            });
         }
     }, [ticketDetails, dataSelects, listUsers]);
     useEffect(() => {

package/es/components/organism/TicketEditorV2/Content.js

@@ -1,15 +1,14 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 /* eslint-disable react/no-unescaped-entities */
 /* eslint-disable jsx-a11y/label-has-associated-control */
 /* eslint-disable no-multi-str */
 import { useMemo, useEffect, useRef, useState, memo } from 'react';
 import { Helmet } from 'react-helmet';
-import DropdownComponent from './components/DropdownComponent';
 import MessageComponent from './components/MessageComponent';
 import { Spin, Tooltip, Icon, Button, SelectAccount, QuillEditor, } from '@antscorp/antsomi-ui/es/components';
 import Service from './Service';
 import { WrapperContent, WrapperContentInput, WrapperEditor, WrapperIconEditor, WrapperInputFile, WrapperLable, WrapperLeftContent, WrapperLinkItemFiles, WrapperMessageContent, WrapperRightContent, WrapperTextEdit, WrapperTextInput, } from './styled';
-import { formatAccountId, formatDatarender, handleValidateContent } from './util';
+import { formatDatarender, handleValidateContent } from './util';
 import { get, keyBy } from 'lodash';
 const initValueInput = {
     originTitle: 'Create new ticket',
@@ -58,25 +57,25 @@ const Content = ({ apiKey, domain, portalId, token, action, ticketId, listUsers,
             [name]: value,
         });
     };
-    useEffect(() => {
-        if (!isUpdate) {
-            const newFollowers = [];
-            let newOwnerIds = [];
-            if (accountManage?.length > 0 && listUsers) {
-                accountManage?.forEach(acc => {
-                    listUsers.forEach(user => {
-                        if (acc === user.userId) {
-                            newFollowers.push(user);
-                        }
-                    });
-                });
-            }
-            if (!isAllAccount && listUsers?.length > 0 && (initOwnerId || userId)) {
-                newOwnerIds = listUsers?.filter(user => user.userId === Number(initOwnerId || userId));
-            }
-            updateValueInput({ ownerId: newOwnerIds, followers: newFollowers });
-        }
-    }, [isUpdate, accountManage, listUsers]);
+    // useEffect(() => {
+    //   if (!isUpdate) {
+    //     const newFollowers: any[] = [];
+    //     let newOwnerIds = [];
+    //     if (accountManage?.length > 0 && listUsers) {
+    //       accountManage?.forEach(acc => {
+    //         listUsers.forEach(user => {
+    //           if (acc === user.userId) {
+    //             newFollowers.push(user);
+    //           }
+    //         });
+    //       });
+    //     }
+    //     if (!isAllAccount && listUsers?.length > 0 && (initOwnerId || userId)) {
+    //       newOwnerIds = listUsers?.filter(user => user.userId === Number(initOwnerId || userId));
+    //     }
+    //     updateValueInput({ ownerId: newOwnerIds, followers: newFollowers });
+    //   }
+    // }, [isUpdate, accountManage, listUsers]);
     const browserTitle = useMemo(() => {
         if (valueInput.title && valueInput.title.trim()) {
             return valueInput.title;
@@ -130,21 +129,19 @@ const Content = ({ apiKey, domain, portalId, token, action, ticketId, listUsers,
             listUsers?.length &&
             dataSelects?.length) {
             const { category, feature, followers, ownerId, priority, ticketType, title, referenceUrl, ...rests } = formatDatarender(ticketDetails, dataSelects, listUsers);
-            if (ownerId?.length > 0) {
-                updateValueInput({
-                    category,
-                    feature,
-                    followers,
-                    ownerId,
-                    priority,
-                    ticketType,
-                    title,
-                    referenceUrl,
-                    originTitle: title,
-                });
-            }
+            updateValueInput({
+                category,
+                feature,
+                followers,
+                ownerId,
+                priority,
+                ticketType,
+                title,
+                referenceUrl,
+                originTitle: title,
+            });
         }
-    }, [ticketDetails, dataSelects, listUsers]);
+    }, [ticketDetails, listUsers, dataSelects]);
     useEffect(() => {
         setIsLoading(true);
         getCustomFields();
@@ -177,7 +174,7 @@ const Content = ({ apiKey, domain, portalId, token, action, ticketId, listUsers,
             submitterEmail: '',
         };
         if (valueInput?.followers?.length) {
-            params.followers = formatAccountId(valueInput?.followers);
+            params.followers = valueInput?.followers;
         }
         if (valueInput?.files?.length > 0) {
             params.properties.attachments = valueInput?.files;
@@ -251,9 +248,14 @@ const Content = ({ apiKey, domain, portalId, token, action, ticketId, listUsers,
         }
         return get(ticketDetails, 'submitterEmail', '');
     }, [ticketDetails?.ownerId, listUsers]);
-    return (_jsxs("div", { style: { height: '100%' }, children: [_jsxs(Helmet, { children: [_jsx("meta", { charSet: "utf-8" }), _jsx("title", { children: browserTitle })] }), _jsx(Spin, { style: { height: '100vh' }, spinning: isLoading || isLoadingDetails || isLoadingDataSouce || isLoadingFollower, children: _jsxs(WrapperContent, { style: { height: '100%' }, children: [_jsxs(WrapperLeftContent, { children: [_jsxs(WrapperContentInput, { style: { alignItems: 'flex-start' }, children: [_jsxs(WrapperLable, { children: ["Owner", _jsx("span", { style: { color: '#ff0000' }, children: "*" })] }), _jsxs("div", { children: [ownerEmail, isEmptyField && !valueInput?.ownerId?.length && (_jsx("div", { className: "error-message", children: "*This field can't be empty" }))] })] }), _jsxs(WrapperContentInput, { style: { marginTop: '15px', alignItems: 'flex-start' }, children: [_jsx(WrapperLable, { children: "Follower(s)" }), _jsx(SelectAccount, { type: "default", initData: [...(valueInput?.followers || []).map((item) => item.userId)], nameKey: "userName", userIdKey: "userId", users: listUsers, onChange: (_, followers) => onChangeFollowers(followers) })] }), dataSelects?.map((data) => (_jsxs(WrapperContentInput, { style: { marginTop: '15px' }, children: [_jsx(WrapperLable, { children: data.title }), _jsx("div", { style: { flex: 1 }, children: isUpdate ? (_jsx(WrapperTextEdit, { children: !valueInput[data?.value]?.name?.length
-                                                    ? '--'
-                                                    : valueInput[data?.value]?.name })) : (_jsx(DropdownComponent, { data: data.field_options, setValueInput: updateValueInput, valueInput: valueInput, type: data.value, isUpdate: isUpdate, title: data.title })) })] }, data.id))), _jsxs(WrapperContentInput, { style: { marginTop: '15px' }, children: [_jsx(WrapperLable, { htmlFor: "referenceUrl", children: "Reference URL" }), isUpdate ? (valueInput.referenceUrl ? (_jsx(Tooltip, { title: valueInput.referenceUrl, placement: "top", children: _jsx(WrapperTextEdit, { color: "#005fb8", href: valueInput.referenceUrl, target: "_blank", children: valueInput.referenceUrl }) })) : (_jsx(WrapperTextEdit, { color: "#005fb8", href: valueInput.referenceUrl, target: "_blank", children: valueInput.referenceUrl }))) : (_jsx(WrapperTextInput, { placeholder: "Reference URL", id: "referenceUrl", 
+    const renderOptions = info => {
+        const { field_options: fieldOptions } = info;
+        const dataSelectOptions = keyBy(fieldOptions, 'value');
+        return (_jsxs(WrapperContentInput, { style: { marginTop: '15px' }, children: [_jsx(WrapperLable, { children: info.title }), _jsx("div", { style: { flex: 1 }, children: _jsx(WrapperTextEdit, { children: !ticketDetails[info?.value]
+                            ? '--'
+                            : dataSelectOptions[ticketDetails[info?.value]]?.name }) })] }, info.id));
+    };
+    return (_jsxs("div", { style: { height: '100%' }, children: [_jsxs(Helmet, { children: [_jsx("meta", { charSet: "utf-8" }), _jsx("title", { children: browserTitle })] }), _jsx(Spin, { style: { height: '100vh' }, spinning: isLoading || isLoadingDetails || isLoadingDataSouce || isLoadingFollower, children: _jsxs(WrapperContent, { style: { height: '100%' }, children: [_jsxs(WrapperLeftContent, { children: [_jsxs(WrapperContentInput, { style: { alignItems: 'flex-start' }, children: [_jsxs(WrapperLable, { children: ["Owner", _jsx("span", { style: { color: '#ff0000' }, children: "*" })] }), _jsxs("div", { children: [ownerEmail, isEmptyField && !valueInput?.ownerId?.length && (_jsx("div", { className: "error-message", children: "*This field can't be empty" }))] })] }), _jsxs(WrapperContentInput, { style: { marginTop: '15px', alignItems: 'flex-start' }, children: [_jsx(WrapperLable, { children: "Follower(s)" }), _jsx(SelectAccount, { type: "default", initData: ticketDetails?.followers || [], nameKey: "userName", userIdKey: "userId", users: listUsers, onChange: (_, followers) => onChangeFollowers(followers) })] }), dataSelects?.map((data) => _jsx(_Fragment, { children: renderOptions(data) })), _jsxs(WrapperContentInput, { style: { marginTop: '15px' }, children: [_jsx(WrapperLable, { htmlFor: "referenceUrl", children: "Reference URL" }), isUpdate ? (ticketDetails.referenceUrl ? (_jsx(Tooltip, { title: ticketDetails.referenceUrl, placement: "top", children: _jsx(WrapperTextEdit, { color: "#005fb8", href: ticketDetails.referenceUrl, target: "_blank", children: ticketDetails.referenceUrl }) })) : (_jsx(WrapperTextEdit, { color: "#005fb8", href: ticketDetails.referenceUrl, target: "_blank", children: ticketDetails.referenceUrl }))) : (_jsx(WrapperTextInput, { placeholder: "Reference URL", id: "referenceUrl", 
                                             // width="300px"
                                             onChange: handleOnchangeInput, name: "referenceUrl", value: valueInput.referenceUrl }))] })] }), _jsxs(WrapperRightContent, { children: [_jsxs(WrapperEditor, { children: [_jsxs("div", { children: [_jsx(QuillEditor, { value: textValue, uploadService: Service.tickets.callApi.uploadFile({
                                                         domain: domainUpload,

package/es/components/organism/TicketEditorV2/util.js

@@ -333,48 +333,11 @@ export const formatParams = data => {
     return params;
 };
 export const formatDatarender = (data, listSelect, listAccount) => {
-    if (data?.ownerId) {
-        data.ownerId = listAccount?.filter(acc => acc.userId === data?.ownerId);
-    }
-    if (data?.followers?.length) {
-        const newFollowers = [];
-        data.followers?.forEach(fol => {
-            listAccount.forEach(acc => {
-                if (fol === acc.userId) {
-                    newFollowers.push(acc);
-                }
-            });
-        });
-        data.followers = newFollowers;
-    }
-    if (data?.priority) {
-        const newPriority = listSelect
-            ?.filter(sel => sel.value === 'priority')[0]
-            ?.field_options?.filter(opt => opt.value === data.priority);
-        [data.priority] = newPriority;
-    }
-    if (data?.feature) {
-        const newFeature = listSelect
-            ?.filter(sel => sel.value === 'feature')[0]
-            ?.field_options?.filter(opt => opt.value === data.feature);
-        [data.feature] = newFeature;
-    }
-    if (data?.ticketType) {
-        const newTicket = listSelect
-            ?.filter(sel => sel.value === 'ticketType')[0]
-            ?.field_options?.filter(opt => opt.value === data.ticketType);
-        [data.ticketType] = newTicket;
-    }
-    if (data?.category) {
-        const newCategory = listSelect
-            ?.filter(sel => sel.value === 'category')[0]
-            ?.field_options?.filter(opt => opt.value === data.category);
-        [data.category] = newCategory;
-    }
-    // if(data?.files?.length) {
-    //   params.files = data?.files
+    const tmpData = data;
+    // if (?.files?.length) {
+    //   params.files = data?.files;
     // }
-    return data;
+    return tmpData;
 };
 export const handleValidateContent = stringHTML => {
     if (stringHTML) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antscorp/antsomi-ui",
-  "version": "2.0.70",
+  "version": "2.0.71",
   "description": "An enterprise-class UI design language and React UI library.",
   "sideEffects": [
     "dist/*",