@integry/sdk 4.6.73 → 4.6.75

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@integry/sdk",
-  "version": "4.6.73",
+  "version": "4.6.75",
   "description": "Integry SDK",
   "main": "dist/umd/index.umd.js",
   "module": "dist/esm/index.csm.js",

package/src/components/MultipurposeField/Dropdown/index.tsx

@@ -76,6 +76,7 @@ interface ListBoxProps {
   serverSideSearchParamName?: string;
   iconKeyPath?: string;
   optionDescriptionKeyPath?: string;
+  skipInitialLoad?: boolean;
 }
 
 const ListBox = (props: ListBoxProps) => {
@@ -120,6 +121,7 @@ const ListBox = (props: ListBoxProps) => {
     parentFieldChanged = false,
     allowWorkspaceConnectedAccounts = false,
     tagsTree = null,
+    skipInitialLoad = false,
   } = props;
 
   const [query, setQuery] = useState<string>('');
@@ -265,6 +267,7 @@ const ListBox = (props: ListBoxProps) => {
       { id: '1', value: 'Yes' },
       { id: '0', value: 'No' },
     ];
+
     // eslint-disable-next-line @typescript-eslint/no-shadow
     if (skipOptionFetch && isDynamic) {
       // skip option fetch for dynamic dropdowns only. Static dropdowns should always fetch options
@@ -279,9 +282,14 @@ const ListBox = (props: ListBoxProps) => {
     }
     const { apiHandler } = props;
 
-    if (isDynamic && sourceFlowIntegrataionInvocationUrl && !disabled) {
+    if (
+      isDynamic &&
+      sourceFlowIntegrataionInvocationUrl &&
+      !disabled &&
+      !skipInitialLoad
+    ) {
       fetchDynamicDataFromSourceFlow();
-    } else if (isDynamic && endpointUrl && !disabled) {
+    } else if (isDynamic && endpointUrl && !disabled && !skipInitialLoad) {
       setLoading(true);
       let data;
       try {
@@ -900,6 +908,9 @@ const ListBox = (props: ListBoxProps) => {
         data.connected_account_id = selectedAuthId;
         data.authorization_id = selectedAuthId;
       }
+      if (allowWorkspaceConnectedAccounts) {
+        data.allow_workspace_connected_accounts = true;
+      }
       apiHandler
         .callDynamicDataEndpoint<
           {

package/src/features/common/ActionForm/index.ts

@@ -58,6 +58,7 @@ interface ActionFormStateType {
   parentChildMapping: any;
   dynamicFieldsData: any;
   parentFieldChanged: boolean;
+  changedParentMachineName: string;
 }
 
 interface StepDataMapping {
@@ -84,6 +85,7 @@ class ActionForm extends Component<ActionFormPropsType, ActionFormStateType> {
       parentChildMapping: this.setParentChildMapping([templateStep]),
       dynamicFieldsData: {},
       parentFieldChanged: false,
+      changedParentMachineName: '',
     };
   }
 
@@ -1087,7 +1089,8 @@ class ActionForm extends Component<ActionFormPropsType, ActionFormStateType> {
       if (
         this.isParentField(this.state.parentChildMapping, machineName || '')
       ) {
-        this.setState({ parentFieldChanged: !this.state.parentFieldChanged });
+        // this.setState({ parentFieldChanged: !this.state.parentFieldChanged });
+        this.setState({ changedParentMachineName: machineName });
       }
 
       this.props.onFieldChangeCallback(machineName || '', value);
@@ -1138,7 +1141,20 @@ class ActionForm extends Component<ActionFormPropsType, ActionFormStateType> {
           this.state.parentChildMapping[stepId],
         )
       ) {
-        return this.state.dynamicFieldsData;
+        const selfParentFields =
+          this.state.parentChildMapping[stepId][
+            field.activity_field.machine_name
+          ]?.parentFields || [];
+        const result = selfParentFields.reduce(
+          (acc: Record<string, unknown>, parent: any) => {
+            if (this.state.dynamicFieldsData?.[parent]) {
+              acc[parent] = this.state.dynamicFieldsData[parent];
+            }
+            return acc;
+          },
+          {},
+        );
+        return result;
       }
     }
     return null;
@@ -1389,6 +1405,19 @@ class ActionForm extends Component<ActionFormPropsType, ActionFormStateType> {
                               case 'RADIO':
                               case 'SELECT': {
                                 let fieldVal = null;
+                                let elParentFields = [];
+                                if (
+                                  el.activity_field?.parent_fields &&
+                                  el.activity_field?.parent_fields !== ''
+                                ) {
+                                  try {
+                                    elParentFields = JSON.parse(
+                                      el.activity_field?.parent_fields,
+                                    );
+                                  } catch (e) {
+                                    elParentFields = [];
+                                  }
+                                }
                                 if (this.props.onFieldChangeCallback) {
                                   if (
                                     Object.prototype.hasOwnProperty.call(
@@ -1506,9 +1535,9 @@ class ActionForm extends Component<ActionFormPropsType, ActionFormStateType> {
                                   )}
                                   optionKeyPath=${uiField?.value_key_path || ''}
                                   valueKeyPath=${uiField?.option_key_path || ''}
-                                  parentFieldChanged=${
-                                    this.state.parentFieldChanged
-                                  }
+                                  parentFieldChanged=${elParentFields.includes(
+                                    this.state.changedParentMachineName,
+                                  )}
                                   allowWorkspaceConnectedAccounts=${!!this.props
                                     .onFieldChangeCallback}
                                   tagsTree=${
@@ -1516,6 +1545,16 @@ class ActionForm extends Component<ActionFormPropsType, ActionFormStateType> {
                                       ? this.props.tagsTree
                                       : null
                                   }
+                                  skipInitialLoad=${
+                                    (elParentFields.length ?? 0) > 0 &&
+                                    !elParentFields?.some(
+                                      (parentField: any) =>
+                                        parentField &&
+                                        this.state.dynamicFieldsData?.[
+                                          parentField
+                                        ],
+                                    )
+                                  }
 
                                 ><//>
                                 </${ConfigureFieldWrapper}>

package/src/features/common/DynamicField/index.ts

@@ -106,6 +106,9 @@ const DynamicFields = (props: DynamicFieldsProps) => {
       setLoading(true);
       try {
         data = JSON.parse(endpointData);
+        if (tagsTree) {
+          data.allow_workspace_connected_accounts = true;
+        }
       } catch (error) {
         data = '';
       }
@@ -230,7 +233,8 @@ const DynamicFields = (props: DynamicFieldsProps) => {
               : html` <a
                   className=${styles.optionsRefresh}
                   href="#"
-                  onclick=${() => {
+                  onclick=${(e: Event) => {
+                    e.preventDefault();
                     setLoading(true);
                     setIsErrorOnLoadingCustomFields(false);
                     fetchDynamicFields();