form-craft-package 1.11.1-dev.0 → 1.11.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "form-craft-package",
-  "version": "1.11.1-dev.0",
+  "version": "1.11.2",
   "main": "index.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

package/src/api/client.ts

@@ -198,18 +198,23 @@ export const auth = async (
         let userRoleIds: string[] = []
         const userForm = forms.find((form) => form.isUser)
         if (userForm?.id && loginAuthRes.data.id) {
+          let userRolesRes: AxiosResponse<any> | undefined
           try {
-            const userRolesRes = await apiClient.post(`/api/report/data/${userForm.id}`, {
+            userRolesRes = await apiClient.post(`/api/report/data/${userForm.id}`, {
               joins: [],
               match: JSON.stringify({ DeletedDate: null, 'Data.loginUser_id': loginAuthRes.data.id }),
               project: JSON.stringify({ Data_roles: '$Data.loginUser_roles' }),
               skip: 0,
               limit: 1,
             })
-            const fetchedRoles = userRolesRes?.data?.data?.[0]?.Data_roles
-            if (Array.isArray(fetchedRoles))
-              userRoleIds = fetchedRoles.filter((role): role is string => typeof role === 'string' && role.length > 0)
           } catch {}
+          if (userRolesRes?.data?.totalRecords === 0 && !JSON.parse(loginAuthRes.data.roles).includes('Admin')) {
+            cookieHandler.empty()
+            throw { status: 400, response: { status: 400, data: 'User is not found!' } }
+          }
+          const fetchedRoles = userRolesRes?.data?.data?.[0]?.Data_roles
+          if (Array.isArray(fetchedRoles))
+            userRoleIds = fetchedRoles.filter((role): role is string => typeof role === 'string' && role.length > 0)
         }
 
         if (userRoleIds.length)

package/src/components/form/layout-renderer/3-element/1-dynamic-button/index.tsx

@@ -16,12 +16,6 @@ import WarningIcon from '../../../../common/warning-icon'
 import FormDataLoadingIndicatorModal from '../../../../modals/form-data-loading.modal'
 import { IFormContext } from '../../1-row'
 import { useButtonNavigateAction } from './use-button-navigate.hook'
-import {
-  buildRolePermissionActionErrorTranslationKey,
-  constructDynamicFormHref,
-  isNewFormDataPage,
-  resolveConditionalText,
-} from '../../../../../functions'
 import { useCustomFunctionCallAction } from './use-custom-function-call.hook'
 import { ELEMENTS_DEFAULT_CLASS } from '../../../../../constants'
 import { useTranslation } from '../../../../common/custom-hooks/use-translation.hook/hook'
@@ -29,6 +23,7 @@ import { useSendNotificationAction } from './use-send-notification.hook'
 import { useSaveUserAccountAction } from './use-save-user-account-action.hook'
 import { useButtonActionPermissions, PermissionBlockKey } from './use-button-action-permissions.hook'
 import useGetCurrentBreakpoint from '../../../../common/custom-hooks/use-window-width.hook'
+import { useConfigContext } from '../../../../companies/context'
 import {
   IButtonElementProps,
   IButtonProps_CustomFunctionCall,
@@ -47,13 +42,19 @@ import {
   TranslationTextSubTypeEnum,
   TranslationTextTypeEnum,
 } from '../../../../../enums'
-import { useConfigContext } from '../../../../companies/context'
+import {
+  buildRolePermissionActionErrorTranslationKey,
+  constructDynamicFormHref,
+  isNewFormDataPage,
+  resolveConditionalText,
+} from '../../../../../functions'
 
 const DuplicateWarningModal = lazy(() => import('../../../../common/duplicate-entry-checker/duplicate-warning.modal'))
 
 export const DynamicFormButtonRender = memo((props: IDynamicButton) => {
   const { displayStateProps = {}, formContext = {}, onCustomFunctionCall = () => {} } = props
-  const { btnProps, btnKey, textConditions, textConditionsBySubType } = displayStateProps as IDynamicButton_DisplayStateProps
+  const { btnProps, btnKey, textConditions, textConditionsBySubType } =
+    displayStateProps as IDynamicButton_DisplayStateProps
   const duplicateCheckModal = useLazyModalOpener()
 
   const { getFormById } = useFindDynamiForm()
@@ -77,7 +78,7 @@ export const DynamicFormButtonRender = memo((props: IDynamicButton) => {
   const { config } = useConfigContext()
   const translations = config?.translations
   const getTranslation = useMemo(
-    () => (key: string) => (selectedLanguage ? translations?.[key]?.[selectedLanguage as CountryEnum] ?? '' : ''),
+    () => (key: string) => (selectedLanguage ? (translations?.[key]?.[selectedLanguage as CountryEnum] ?? '') : ''),
     [selectedLanguage, translations],
   )
   const isElementHidden = useIsNodeHidden(btnKey)
@@ -455,11 +456,6 @@ export const DynamicFormButtonRender = memo((props: IDynamicButton) => {
   const handleButtonClick = useCallback(async () => {
     isPrimaryActionMsgRef.current = true
 
-    if (isPermissionBlocked) {
-      setLoading(false)
-      return
-    }
-
     const handlers: Record<ButtonActionCategoryEnum, () => Promise<void>> = {
       [ButtonActionCategoryEnum.Navigate]: async () => {
         onButtonNavigate(btnProps.primaryAction as IButtonProps_Navigate, btnProps.formId)
@@ -550,7 +546,6 @@ export const DynamicFormButtonRender = memo((props: IDynamicButton) => {
     formDataId,
     isPublic,
     isDuplicateDataFound,
-    isPermissionBlocked,
     onFunctionCall,
     onDuplicateData,
     onDeleteData,
@@ -575,11 +570,11 @@ export const DynamicFormButtonRender = memo((props: IDynamicButton) => {
       <Button_FillerPortal
         {...getButtonRenderProps(btnProps)}
         loading={loading || duplicateCheckModal.isPendingTransition || isDuplicateCheckPending}
-        disabled={isElementDisabled || isPermissionBlocked}
+        disabled={isElementDisabled || (!isPublic && isPermissionBlocked)}
         className={`${ELEMENTS_DEFAULT_CLASS.Button} w-full ${isElementHidden ? 'hidden' : ''}`}
         title={permissionTooltip ? permissionTooltip : ''}
         onClick={(e) => {
-          if (isPermissionBlocked) return
+          if (!isPublic && isPermissionBlocked) return
           if (
             btnProps.primaryAction.category === ButtonActionCategoryEnum.SaveDataChanges &&
             (isDuplicateDataFound || isDuplicateCheckPending)

package/src/enums/index.ts

@@ -168,6 +168,6 @@ export enum SystemRolePermissionEnum {
   // PublishData = 6,
   // UnpublishData = 7,
   // ReadReport = 8,
-  // CreateAttachment = 10,
-  // DeleteAttachment = 11,
+  CreateAttachment = 10,
+  DeleteAttachment = 11,
 }