PR Review fixes

Author: CarlosNZ

src/components/PageElements/PageElements.tsx

@@ -61,6 +61,7 @@ const PageElements: React.FC<PageElementProps> = ({
   const {
     push,
     query: { showHistory },
+    currentPageType,
   } = useRouter()
 
   const visibleElements = elements.filter(({ element }) => element.isVisible)
@@ -77,6 +78,8 @@ const PageElements: React.FC<PageElementProps> = ({
     return (
       <Form className="form-area">
         {elements.map(({ element, isChangeRequest, isChanged, previousApplicationResponse }) => {
+          if (element.pluginCode === 'getValues' && currentPageType !== 'admin') return null
+
           const currentReview = previousApplicationResponse?.reviewResponses.nodes[0]
           const changesRequired =
             isChangeRequest || isChanged

src/containers/TemplateBuilder/template/General/DataViews/useManageDataViews.ts

@@ -21,7 +21,6 @@ export type DataViewFilter =
 export const useDataViews = (filter: DataViewFilter) => {
   const { template, dataViewJoins } = useTemplateState()
   const [dataViewDetails, setDataViewDetails] = useState<DataViewDetails[]>([])
-  const [menuItems, setMenuItems] = useState<DataView[]>([])
   const [error, setError] = useState<string>('')
 
   const dataViews = (dataViewJoins.map((node) => {
@@ -57,9 +56,7 @@ export const useDataViews = (filter: DataViewFilter) => {
       })
   }, [dataViewJoins])
 
-  useEffect(() => {
-    setMenuItems(getDataViewMenuItems(dataViewDetails, currentlyLinkedDataViewIDs, filter))
-  }, [filter, dataViewDetails])
+  const menuItems = getDataViewMenuItems(dataViewDetails, currentlyLinkedDataViewIDs, filter)
 
   return {
     current: dataViews,

src/containers/TemplateBuilder/template/General/Fragments/useManageFragments.ts

@@ -4,6 +4,7 @@ import getServerUrl from '../../../../../utils/helpers/endpoints/endpointUrlBuil
 import { EvaluatorFragment } from '../../../../../utils/generated/graphql'
 import { useTemplateState } from '../../TemplateWrapper'
 
+
 interface FragmentsDetails {
   data: EvaluatorFragment
   applicantAccessible: boolean
@@ -21,7 +22,6 @@ export type FragmentFilter =
 export const useFragments = (filter: FragmentFilter) => {
   const { template, fragmentJoins } = useTemplateState()
   const [fragmentDetails, setFragmentDetails] = useState<FragmentsDetails[]>([])
-  const [menuItems, setMenuItems] = useState<EvaluatorFragment[]>([])
   const [error, setError] = useState<string>('')
 
   const fragments = (fragmentJoins.map((node) => {
@@ -57,9 +57,7 @@ export const useFragments = (filter: FragmentFilter) => {
       })
   }, [fragmentJoins])
 
-  useEffect(() => {
-    setMenuItems(getFragmentMenuItems(fragmentDetails, currentlyLinkedFragmentIDs, filter))
-  }, [filter, fragmentDetails])
+  const menuItems = getFragmentMenuItems(fragmentDetails, currentlyLinkedFragmentIDs, filter)
 
   return {
     current: fragments,

src/containers/TemplateBuilder/template/General/shared/JoinedEntityLabel.tsx

@@ -48,7 +48,13 @@ export const JoinedEntityLabel = ({
         }
       }}
     >
-      <div className="ext-icon clickable" onClick={() => window.open(editLink, '_blank')}>
+      <div
+        className="ext-icon clickable"
+        onClick={(e) => {
+          e.stopPropagation()
+          window.open(editLink, '_blank')
+        }}
+      >
         <Icon name="external" size="small" className="floating-icon clickable" />
       </div>
       {name}

src/contexts/Toast/ToastProvider.tsx

@@ -104,6 +104,8 @@ export const useToast = (toastSettings: Partial<ToastProps> = {}) => {
 export const Toast = ({ toast, removeToast }: { toast: ToastState; removeToast: () => void }) => {
   const [visible, setVisible] = useState(false)
   const timerId = useRef<number>(0)
+  const removeToastRef = useRef(removeToast)
+  removeToastRef.current = removeToast
   const { timeout } = toast
 
   useEffect(() => {
@@ -114,9 +116,9 @@ export const Toast = ({ toast, removeToast }: { toast: ToastState; removeToast:
     if (timeout !== 0)
       timerId.current = setTimeout(() => {
         setVisible(false)
-        setTimeout(() => removeToast(), TRANSITION_DURATION + 50)
+        setTimeout(() => removeToastRef.current(), TRANSITION_DURATION + 50)
       }, timeout)
-  }, [timeout, removeToast])
+  }, [timeout])
 
   const closeToast = () => {
     setVisible(false)

src/utils/helpers/structure/addEvaluatedResponsesToStructure.ts

@@ -97,7 +97,8 @@ const flattenStructureElements = (structure: FullStructure) => {
   })
   // Also include Review sections if they exist
   const sectionName = Object.keys(structure.reviewSections)?.[0]
-  if (sectionName) flattened.push(...structure.reviewSections[sectionName].pages['1'].state)
+  const reviewPage = sectionName ? structure.reviewSections[sectionName].pages['1'] : undefined
+  if (reviewPage) flattened.push(...reviewPage.state)
 
   return flattened
 }