Add check to hide extra columns for normal programs

msupply-foundation · Nov 14, 2024 · d674f72 · d674f72
1 parent 5896854
commit d674f72
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/...ges/requisitions/src/ResponseRequisition/DetailView/ResponseLineEdit/ResponseLineEdit.tsx b/...ges/requisitions/src/ResponseRequisition/DetailView/ResponseLineEdit/ResponseLineEdit.tsx
@@ -14,6 +14,7 @@ import {
   Popover,
   ReasonOptionNodeType,
   TextArea,
+  useAuthContext,
   useToggle,
 } from '@openmsupply-client/common';
 import { useResponse } from '../../api';
@@ -49,6 +50,7 @@ export const ResponseLineEdit = ({
   isProgram,
 }: ResponseLineEditProps) => {
   const t = useTranslation();
+  const { store } = useAuthContext();
   const { isOn: ourStats, toggle: toggleOurStats } = useToggle();
   const { isOn: theirStats, toggle: toggleTheirStats } = useToggle();
   const { data } = useResponse.line.stats(draft?.id);
@@ -107,7 +109,7 @@ export const ResponseLineEdit = ({
               sx={{ marginBottom: 1 }}
             />
           )}
-          {isProgram && (
+          {isProgram && store?.preferences.extraFieldsInRequisition && (
             <>
               <InputWithLabelRow
                 Input={
@@ -204,7 +206,7 @@ export const ResponseLineEdit = ({
             label={t('label.amc')}
             sx={{ marginBottom: 1 }}
           />
-          {isProgram && (
+          {isProgram && store?.preferences.extraFieldsInRequisition && (
             <InputWithLabelRow
               Input={
                 <NumericTextInput
@@ -281,7 +283,7 @@ export const ResponseLineEdit = ({
               )}
             </Box>
           </Box>
-          {isProgram && (
+          {isProgram && store?.preferences.extraFieldsInRequisition && (
             <InputWithLabelRow
               Input={
                 <NumericTextInput
@@ -384,7 +386,7 @@ export const ResponseLineEdit = ({
               )}
             </Box>
           </Box>
-          {isProgram && (
+          {isProgram && store?.preferences.extraFieldsInRequisition && (
             <InputWithLabelRow
               Input={
                 <ReasonOptionsSearchInput

diff --git a/client/packages/requisitions/src/ResponseRequisition/DetailView/columns.ts b/client/packages/requisitions/src/ResponseRequisition/DetailView/columns.ts
@@ -7,6 +7,7 @@ import {
   useUrlQueryParams,
   ColumnDescription,
   TooltipTextCell,
+  useAuthContext,
 } from '@openmsupply-client/common';
 import { ResponseLineFragment, useResponse } from './../api';
 import { PackQuantityCell } from '@openmsupply-client/system';
@@ -16,6 +17,7 @@ export const useResponseColumns = () => {
     updateSortQuery,
     queryParams: { sortBy },
   } = useUrlQueryParams({ initialSort: { key: 'itemName', dir: 'asc' } });
+  const { store } = useAuthContext();
   const { isRemoteAuthorisation } = useResponse.utils.isRemoteAuthorisation();
   const { programName } = useResponse.document.fields(['programName']);
 
@@ -71,7 +73,7 @@ export const useResponseColumns = () => {
       accessor: ({ rowData }) => rowData.availableStockOnHand,
     });
   }
-  if (programName) {
+  if (programName && store?.preferences?.extraFieldsInRequisition) {
     columnDefinitions.push(
       // TODO: Global pref to show/hide the next columns
       {
@@ -234,7 +236,7 @@ export const useResponseColumns = () => {
   ]);
 
   // TODO: Global pref to show/hide column
-  if (programName) {
+  if (programName && store?.preferences?.extraFieldsInRequisition) {
     columnDefinitions.push({
       key: 'reason',
       label: 'label.reason',