Update DAJ unit name display to last item

MTES-MCT · Jan 25, 2024 · 419f8d6 · 419f8d6
1 parent 6f30335
commit 419f8d6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/frontend/js/components/ReferralDetailAssignment/ReferralUnitAssignmentButton.tsx b/src/frontend/js/components/ReferralDetailAssignment/ReferralUnitAssignmentButton.tsx
@@ -9,6 +9,7 @@ import { useReferralAction } from 'data';
 import { Referral, Unit } from 'types';
 import { AssignUnitModal } from './AssignUnitModal';
 import { ReferralContext } from '../../data/providers/ReferralProvider';
+import { getLastItem } from '../../utils/string';
 
 const messages = defineMessages({
   assignIt: {
@@ -84,7 +85,7 @@ export const ReferralUnitAssignmentButton: React.FC<ReferralUnitAssignmentButton
               className="truncate"
               style={{ maxWidth: 'calc(100% - 1.5rem)' }}
             >
-              {unit.name}
+              {getLastItem(unit.name, '/')}
             </div>
           </div>
           {mutation.isLoading ? null : <Tickbox isTicked={isAssigned} />}

diff --git a/src/frontend/js/components/ReferralDetailAssignment/index.tsx b/src/frontend/js/components/ReferralDetailAssignment/index.tsx
@@ -415,7 +415,7 @@ export const ReferralDetailAssignmentUnits: React.FC<ReferralDetailAssignmentUni
                 {referral.units.map((unit, index) => (
                   <React.Fragment key={unit.id}>
                     {index > 0 && ', '}
-                    {unit.name}
+                    {getLastItem(unit.name, '/')}
                   </React.Fragment>
                 ))}
               </span>

diff --git a/src/frontend/js/components/modals/ValidationModal.tsx b/src/frontend/js/components/modals/ValidationModal.tsx
@@ -15,6 +15,7 @@ import { kebabCase } from 'lodash-es';
 import { useVersionValidatorsAction } from '../../data/versions';
 import { sortObject } from '../../utils/object';
 import { commonMessages } from '../../const/translations';
+import { getLastItem } from '../../utils/string';
 
 const messages = defineMessages({
   mainTitle: {
@@ -270,7 +271,9 @@ export const ValidationModal = ({
                                     <CheckIcon className="fill-black" />
                                   </div>
                                   <div className="flex flex-col">
-                                    <p className="text-base">{unitName}</p>
+                                    <p className="text-base">
+                                      {getLastItem(unitName, '/')}
+                                    </p>
                                     <div className="flex items-center justify-start w-full space-x-2">
                                       {members.map((member: any) => (
                                         <div