Forced merge: merge ai-dev into master

.gitignore

@@ -1,3 +1,8 @@
 node_modules/
 */node_modules/
 */build/
+
+**/node_modules/
+**/build/
+.DS_Store
+.env

frontend/json/runtimeError.json

@@ -0,0 +1 @@
+{}

frontend/src/components/AsideMenuItem.tsx

@@ -14,6 +14,15 @@ type Props = {
 };
 
 const AsideMenuItem = ({ item, isDropdownList = false }: Props) => {
+  // Render section header for System Settings
+  if (item.isSectionHeader) {
+    return (
+      <li className="px-3 py-2 uppercase text-xs font-semibold text-gray-500">
+        {item.label}
+      </li>
+    );
+  }
+
   const [isLinkActive, setIsLinkActive] = useState(false);
   const [isDropdownActive, setIsDropdownActive] = useState(false);
 
@@ -86,7 +95,7 @@ const AsideMenuItem = ({ item, isDropdownList = false }: Props) => {
 
   return (
     <li className={'px-3 py-1.5'}>
-      {item.withDevider && <hr className={`${borders} mb-3`} />}
+      {item.withDivider && <hr className={`${borders} mb-3`} />}
       {item.href && (
         <Link href={item.href} target={item.target} className={componentClass}>
           {asideMenuItemInnerContents}

frontend/src/interfaces/index.ts

@@ -11,7 +11,9 @@ export type MenuAsideItem = {
   target?: string;
   color?: ColorButtonKey;
   isLogout?: boolean;
-  withDevider?: boolean;
+  withDivider?: boolean;
+  isSectionHeader?: boolean;
+
   menu?: MenuAsideItem[];
   permissions?: string | string[];
 };

frontend/src/menuAside.ts

@@ -8,14 +8,6 @@ const menuAside: MenuAsideItem[] = [
     label: 'Dashboard',
   },
 
-  {
-    href: '/users/users-list',
-    label: 'Users',
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    icon: icon.mdiAccountGroup ?? icon.mdiTable,
-    permissions: 'READ_USERS',
-  },
   {
     href: '/batches/batches-list',
     label: 'Batches',
@@ -49,6 +41,21 @@ const menuAside: MenuAsideItem[] = [
         : icon.mdiTable ?? icon.mdiTable,
     permissions: 'READ_SCANNED_DOCUMENTS',
   },
+  {
+    href: '/profile',
+    label: 'Profile',
+    icon: icon.mdiAccountCircle,
+  },
+
+  { withDivider: true, permissions: 'READ_USERS' },
+  { label: 'System Settings', isSectionHeader: true, permissions: 'READ_USERS' },
+  {
+    href: '/api-docs',
+    target: '_blank',
+    label: 'API Reference',
+    icon: icon.mdiFileCode,
+    permissions: 'READ_API_DOCS',
+  },
   {
     href: '/roles/roles-list',
     label: 'Roles',
@@ -65,19 +72,17 @@ const menuAside: MenuAsideItem[] = [
     icon: icon.mdiShieldAccountOutline ?? icon.mdiTable,
     permissions: 'READ_PERMISSIONS',
   },
-  {
+
-    href: '/profile',
-    label: 'Profile',
-    icon: icon.mdiAccountCircle,
-  },
 
   {
-    href: '/api-docs',
+    href: '/users/users-list',
-    target: '_blank',
+    label: 'Users',
-    label: 'Swagger API',
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    icon: icon.mdiFileCode,
+    // @ts-ignore
-    permissions: 'READ_API_DOCS',
+    icon: icon.mdiAccountGroup ?? icon.mdiTable,
+    permissions: 'READ_USERS',
   },
+
 ];
 
 export default menuAside;

frontend/src/pages/scanned_documents/scanned_documents-list.tsx

@@ -102,7 +102,7 @@ const Scanned_documentsTablesPage = () => {
               className={'mr-3'}
               href={'/scanned_documents/scanned_documents-new'}
               color='info'
-              label='New Item'
+      label='Upload New Claim(s)'
             />
           )}
 
@@ -112,20 +112,7 @@ const Scanned_documentsTablesPage = () => {
             label='Filter'
             onClick={addFilter}
           />
-          <BaseButton
-            className={'mr-3'}
-            color='info'
-            label='Download CSV'
-            onClick={getScanned_documentsCSV}
-          />
 
-          {hasCreatePermission && (
-            <BaseButton
-              color='info'
-              label='Upload CSV'
-              onClick={() => setIsModalActive(true)}
-            />
-          )}
 
           <div className='md:inline-flex items-center ms-auto'>
             <div id='delete-rows-button'></div>