fix parkedparentsource of pendingFlow and InputEntry of Funding Source

UN-OCHA · Jun 6, 2024 · 7135a6e · 7135a6e
1 parent 663d171
commit 7135a6e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/apps/hpc-ftsadmin/src/app/components/flow-form.tsx b/apps/hpc-ftsadmin/src/app/components/flow-form.tsx
@@ -2625,18 +2625,7 @@ export const FlowForm = (props: Props) => {
               }}
             >
               <StyledHalfSection>
-                <StyledFullSection
-                  style={{
-                    pointerEvents: readOnly
-                      ? 'none'
-                      : isShowParentFlow
-                      ? 'none'
-                      : 'auto',
-                    opacity: readOnly ? 0.6 : isShowParentFlow ? 0.6 : 1,
-                    position: 'relative',
-                  }}
-                  id="parentDiv"
-                >
+                <StyledFullSection id="parentDiv">
                   <C.FormSection title="Funding Source(s)" isLeftSection>
                     {values.parentFlow && values.parentFlow.length ? (
                       <StyledParentInfo
@@ -2710,6 +2699,7 @@ export const FlowForm = (props: Props) => {
                       isMulti
                       entryInfo={inputEntries.sourceOrganizations}
                       rejectInputEntry={rejectInputEntry}
+                      isDisabled={isShowParentFlow}
                     />
                     <StyledRow>
                       <StyledHalfSection>
@@ -2730,6 +2720,7 @@ export const FlowForm = (props: Props) => {
                           isAutocompleteAPI={false}
                           entryInfo={inputEntries.sourceUsageYears}
                           rejectInputEntry={rejectInputEntry}
+                          isDisabled={isShowParentFlow}
                         />
                       </StyledHalfSection>
                       <StyledHalfSection>
@@ -2743,6 +2734,7 @@ export const FlowForm = (props: Props) => {
                           isMulti
                           entryInfo={inputEntries.sourceLocations}
                           rejectInputEntry={rejectInputEntry}
+                          isDisabled={isShowParentFlow}
                         />
                       </StyledHalfSection>
                     </StyledRow>
@@ -2759,6 +2751,7 @@ export const FlowForm = (props: Props) => {
                       isMulti
                       entryInfo={inputEntries.sourceEmergencies}
                       rejectInputEntry={rejectInputEntry}
+                      isDisabled={isShowParentFlow}
                     />
                     <C.AsyncAutocompleteSelectFTSAdmin
                       label="Global Cluster(s)"
@@ -2774,6 +2767,7 @@ export const FlowForm = (props: Props) => {
                       isAutocompleteAPI={false}
                       entryInfo={inputEntries.sourceGlobalClusters}
                       rejectInputEntry={rejectInputEntry}
+                      isDisabled={isShowParentFlow}
                     />
                     <C.AsyncAutocompleteSelectFTSAdmin
                       label="Plan"
@@ -2786,6 +2780,7 @@ export const FlowForm = (props: Props) => {
                       }}
                       entryInfo={inputEntries.sourcePlans}
                       rejectInputEntry={rejectInputEntry}
+                      isDisabled={isShowParentFlow}
                     />
                     {showSourceGoverningEntities && (
                       <C.AsyncAutocompleteSelectFTSAdmin
@@ -2798,6 +2793,7 @@ export const FlowForm = (props: Props) => {
                         isAutocompleteAPI={false}
                         entryInfo={inputEntries.sourceGoverningEntities}
                         rejectInputEntry={rejectInputEntry}
+                        isDisabled={isShowParentFlow}
                       />
                     )}
                     <C.AsyncAutocompleteSelectFTSAdmin
@@ -2813,6 +2809,7 @@ export const FlowForm = (props: Props) => {
                       isMulti
                       entryInfo={inputEntries.sourceProjects}
                       rejectInputEntry={rejectInputEntry}
+                      isDisabled={isShowParentFlow}
                     />
                   </C.FormSection>
                 </StyledFullSection>

diff --git a/apps/hpc-ftsadmin/src/app/pages/flows/pending-flows-list.tsx b/apps/hpc-ftsadmin/src/app/pages/flows/pending-flows-list.tsx
@@ -66,7 +66,10 @@ export default (props: Props) => {
       'flow.updatedAt'
     ),
     orderDir: withDefault(createEnumParam(['ASC', 'DESC']), 'DESC'),
-    filters: withDefault(JsonParam, JSON.stringify({})),
+    filters: withDefault(
+      JsonParam,
+      JSON.stringify({ includeChildrenOfParkedFlows: true })
+    ),
     tableHeaders: withDefault(StringParam, encodeTableHeaders([])), //  Default value of table headers
     prevPageCursor: withDefault(NumberParam, 0),
     nextPageCursor: withDefault(NumberParam, 0),

diff --git a/libs/hpc-ui/src/lib/components/form-fields/async-autocomplete-field-ftsadmin.tsx b/libs/hpc-ui/src/lib/components/form-fields/async-autocomplete-field-ftsadmin.tsx
@@ -83,6 +83,7 @@ type AsyncAutocompleteSelectProps = {
   values?: any;
   alreadyIsFetch?: boolean;
   fetchedData?: readonly FormObjectValue[];
+  isDisabled?: boolean;
 };
 
 const AsyncAutocompleteSelect = ({
@@ -102,6 +103,7 @@ const AsyncAutocompleteSelect = ({
   withoutFormik = false,
   values,
   setFieldValue,
+  isDisabled,
   ...otherProps
 }: AsyncAutocompleteSelectProps) => {
   const [open, setOpen] = useState(false);
@@ -367,6 +369,7 @@ const AsyncAutocompleteSelect = ({
         rejectInputEntry={rejectInputEntry}
         alreadyIsFetch={isFetch}
         fetchedData={options}
+        isDisabled={isDisabled}
       />
     );
   }
@@ -380,6 +383,7 @@ const AsyncAutocompleteSelect = ({
     // ...field,
     ...otherProps,
     multiple: isMulti,
+    disabled: isDisabled,
     onOpen: () => {
       setOpen(true);
     },
@@ -554,6 +558,7 @@ const FormikAsyncAutocompleteSelect = ({
   rejectInputEntry,
   alreadyIsFetch,
   fetchedData,
+  isDisabled,
   ...otherProps
 }: AsyncAutocompleteSelectProps) => {
   const [open, setOpen] = useState(false);
@@ -811,6 +816,7 @@ const FormikAsyncAutocompleteSelect = ({
   > = {
     ...field,
     ...otherProps,
+    disabled: isDisabled,
     multiple: isMulti,
     onOpen: () => {
       setOpen(true);