Merge branch 'dev' into feat/1366

Author: jaspalsingh-aot

.github/workflows/.pr-close.yml

@@ -97,7 +97,18 @@ jobs:
         package: ${{ fromJson(needs.vars.outputs.packages) }}
     timeout-minutes: 1
     steps:
+      - name: Check if target image tag exists
+        run: |
+          IMAGE="ghcr.io/${{ inputs.organization }}/${{ inputs.repository }}/${{ matrix.package }}:${{ inputs.target }}"
+          if docker manifest inspect "$IMAGE" >/dev/null 2>&1; then
+            echo "IMAGE_EXISTS=true" >> $GITHUB_ENV
+          else
+            echo "IMAGE_EXISTS=false" >> $GITHUB_ENV
+            echo "Skipping retag; not found: $IMAGE"
+          fi
+
       - uses: shrink/actions-docker-registry-tag@v4
+        if: env.IMAGE_EXISTS == 'true'
         with:
           registry: ghcr.io
           repository: ${{ inputs.organization }}/${{ inputs.repository }}/${{ matrix.package }}
@@ -118,16 +129,17 @@ jobs:
             echo "ERROR: Tagging success!"
             echo "RETRY=false" >> $GITHUB_ENV
           fi
+        if: env.IMAGE_EXISTS == 'true'
 
       - uses: shrink/actions-docker-registry-tag@v4
-        if: env.RETRY == 'true'
+        if: env.IMAGE_EXISTS == 'true' && env.RETRY == 'true'
         with:
           registry: ghcr.io
           repository: ${{ inputs.organization }}/${{ inputs.repository }}/${{ matrix.package }}
           target: ${{ inputs.target }}
           tags: ${{ inputs.tag_promote }}
 
-      - if: env.RETRY == 'true'
+      - if: env.IMAGE_EXISTS == 'true' && env.RETRY == 'true'
         run: |
           # Verify tagging after retry
           INSPECT="docker manifest inspect ghcr.io/${{ inputs.organization }}/${{ inputs.repository }}/${{ matrix.package }}"
@@ -138,6 +150,7 @@ jobs:
             exit 1
           fi
 
+
   # Clean up OpenShift when PR closed, no conditions
   cleanup:
     name: OpenShift

cats-frontend/src/app/components/account/UserAccount.tsx

@@ -17,25 +17,12 @@ const UserAccount = (props: any) => {
     auth.signinRedirect({ extraQueryParams: { kc_idp_hint: 'idir' } });
   }
 
-  const userObj = {
-    firstname: auth.user?.profile.given_name,
-    lastName: auth.user?.profile.family_name,
-  };
-
-  const [user, setUser] = useState(userObj);
   const [dropdownArrow, setDropdownArrow] = useState(false);
   const toggleButton = (event: any) => {
     event.stopPropagation();
     setDropdownArrow(!dropdownArrow);
   };
 
-  useEffect(() => {
-    setUser({
-      firstname: auth.user?.profile.given_name,
-      lastName: auth.user?.profile.family_name,
-    });
-  }, []);
-
   const signOut = () => {
     auth.removeUser();
     auth.signoutRedirect({
@@ -44,6 +31,10 @@ const UserAccount = (props: any) => {
     auth.clearStaleState();
   };
 
+  // Access user data directly from auth.user
+  const firstName = auth.user?.profile?.given_name;
+  const lastName = auth.user?.profile?.family_name;
+
   if (props.mobileView) {
     return (
       <>
@@ -64,10 +55,10 @@ const UserAccount = (props: any) => {
               onClick={toggleButton}
             >
               {/* Profile image */}
-              <Avatar firstName={user.firstname} lastName={user.lastName} />
+              <Avatar firstName={firstName} lastName={lastName} />
               {/* User name */}
               <div id="user-name" className="p-3">
-                {user.firstname}
+                {firstName}
               </div>
               <div
                 id="account-dropdown"
@@ -121,7 +112,7 @@ const UserAccount = (props: any) => {
                 className="d-flex align-items-center "
                 onClick={() => setDropdownArrow(!dropdownArrow)}
               >
-                <Avatar firstName={user.firstname} lastName={user.lastName} />
+                <Avatar firstName={firstName} lastName={lastName} />
                 <div
                   id="account-dropdown"
                   className="ps-2"
@@ -148,9 +139,9 @@ const UserAccount = (props: any) => {
               <div className="account-custom-label">Logged in as:</div>
               <div className="d-flex align-items-center account-username py-3 ">
                 {/* Profile image */}
-                <Avatar firstName={user.firstname} lastName={user.lastName} />
+                <Avatar firstName={firstName} lastName={lastName} />
                 {/* User name */}
-                <span className="px-2">{user.firstname}</span>
+                <span className="px-2">{firstName}</span>
               </div>
             </Dropdown.Item>
             <div className="pt-3">

cats-frontend/src/app/features/people/person/PersonConfig.tsx

@@ -37,6 +37,10 @@ const personForm: { [key: string]: IFormField } = {
     customEditLabelCss: 'custom-people-edit-lbl',
     customInputTextCss: 'custom-people-txt',
     customEditInputTextCss: 'custom-people-edit-txt',
+    validation: {
+      required: true,
+      customMessage: 'First name is required',
+    },
   },
   middleName: {
     type: FormFieldType.Text,
@@ -59,6 +63,10 @@ const personForm: { [key: string]: IFormField } = {
     customEditLabelCss: 'custom-people-edit-lbl',
     customInputTextCss: 'custom-people-txt',
     customEditInputTextCss: 'custom-people-edit-txt',
+    validation: {
+      required: true,
+      customMessage: 'Last name is required',
+    },
   },
   phone: {
     type: FormFieldType.Text,