-
+
+
-
+
-
+ :is-loading="userQuery.isFetching.value"
+ />
-
+
diff --git a/frontend/src/components/common/Button.vue b/frontend/src/components/common/Button.vue
deleted file mode 100644
index d658dc1b4..000000000
--- a/frontend/src/components/common/Button.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-
-
-
diff --git a/frontend/src/components/common/Icon.vue b/frontend/src/components/common/Icon.vue
deleted file mode 100644
index 3f61be20e..000000000
--- a/frontend/src/components/common/Icon.vue
+++ /dev/null
@@ -1,125 +0,0 @@
-
-
-
-
-
-
-
diff --git a/frontend/src/components/common/NotificationMessage.vue b/frontend/src/components/common/NotificationMessage.vue
deleted file mode 100644
index c83162066..000000000
--- a/frontend/src/components/common/NotificationMessage.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
-
-
-
- {{ props.severity }}
- {{ props.msgText }}
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/frontend/src/components/common/NotificationStack.vue b/frontend/src/components/common/NotificationStack.vue
deleted file mode 100644
index df13a3bf1..000000000
--- a/frontend/src/components/common/NotificationStack.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/frontend/src/components/common/PageTitle.vue b/frontend/src/components/common/PageTitle.vue
deleted file mode 100644
index 7f7666c4f..000000000
--- a/frontend/src/components/common/PageTitle.vue
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
-
-
-
- {{ item.label }}
-
-
-
-
-
{{ props.title }}
-
- {{ props.subtitle }}
-
-
-
-
-
diff --git a/frontend/src/components/grantaccess/ForestClientCard.vue b/frontend/src/components/grantaccess/ForestClientCard.vue
deleted file mode 100644
index 932aad18a..000000000
--- a/frontend/src/components/grantaccess/ForestClientCard.vue
+++ /dev/null
@@ -1,192 +0,0 @@
-
-
-
-
-
-
- Verified Client Number information
-
-
-
-
-
-
-
-
-
-
- Please enter an active Forest Client Number
-
-
-
-
-
- {{ forestItem.forest_client_number }}
-
-
-
-
-
- {{ forestItem.client_name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/frontend/src/components/grantaccess/GrantAccess.vue b/frontend/src/components/grantaccess/GrantAccess.vue
deleted file mode 100644
index ce32b7573..000000000
--- a/frontend/src/components/grantaccess/GrantAccess.vue
+++ /dev/null
@@ -1,320 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/frontend/src/components/grantaccess/GrantApplicationAdmin.vue b/frontend/src/components/grantaccess/GrantApplicationAdmin.vue
deleted file mode 100644
index dfed72425..000000000
--- a/frontend/src/components/grantaccess/GrantApplicationAdmin.vue
+++ /dev/null
@@ -1,212 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/frontend/src/components/grantaccess/GrantDelegatedAdmin.vue b/frontend/src/components/grantaccess/GrantDelegatedAdmin.vue
deleted file mode 100644
index d649ee74b..000000000
--- a/frontend/src/components/grantaccess/GrantDelegatedAdmin.vue
+++ /dev/null
@@ -1,352 +0,0 @@
-
-
-
-
-
-
- Are you sure you want to add
- {{ formData.userId.toUpperCase() }} as a
- delegated admin? As a delegated admin
- {{ formData.userId.toUpperCase() }} will be
- able to add, edit or delete users
-
-
-
-
-
-
-
-
-
-
-
diff --git a/frontend/src/components/grantaccess/StepContainer.vue b/frontend/src/components/grantaccess/StepContainer.vue
deleted file mode 100644
index e1f54029e..000000000
--- a/frontend/src/components/grantaccess/StepContainer.vue
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
-
{{ props.title }}
-
- {{ props.subtitle }}
-
-
-
-
-
-
-
-
-
diff --git a/frontend/src/components/grantaccess/UserIdentityCard.vue b/frontend/src/components/grantaccess/UserIdentityCard.vue
deleted file mode 100644
index fe20d14ca..000000000
--- a/frontend/src/components/grantaccess/UserIdentityCard.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
- Verified user information
-
-
-
-
-
- {{ props.userIdentity.userId }}
-
-
-
-
-
- {{ props.userIdentity.firstName }}
-
-
-
-
-
- {{ props.userIdentity.lastName }}
-
-
-
-
-
- {{ props.userIdentity.businessLegalName }}
-
-
-
-
- User does not exist
-
-
-
-
- {{ props.errorMsg }}
-
-
-
-
-
diff --git a/frontend/src/components/grantaccess/form/ForestClientInput.vue b/frontend/src/components/grantaccess/form/ForestClientInput.vue
deleted file mode 100644
index 00dd70316..000000000
--- a/frontend/src/components/grantaccess/form/ForestClientInput.vue
+++ /dev/null
@@ -1,209 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/frontend/src/components/grantaccess/form/RoleSelect.vue b/frontend/src/components/grantaccess/form/RoleSelect.vue
deleted file mode 100644
index a59196da0..000000000
--- a/frontend/src/components/grantaccess/form/RoleSelect.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/frontend/src/components/grantaccess/form/RoleSelectTable.vue b/frontend/src/components/grantaccess/form/RoleSelectTable.vue
deleted file mode 100644
index b78257795..000000000
--- a/frontend/src/components/grantaccess/form/RoleSelectTable.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
diff --git a/frontend/src/components/grantaccess/form/UserNameInput.vue b/frontend/src/components/grantaccess/form/UserNameInput.vue
deleted file mode 100644
index e8a0f9498..000000000
--- a/frontend/src/components/grantaccess/form/UserNameInput.vue
+++ /dev/null
@@ -1,201 +0,0 @@
-
-
-
-
-
-
-
diff --git a/frontend/src/components/managePermissions/ConfirmDialogText.vue b/frontend/src/components/managePermissions/ConfirmDialogText.vue
deleted file mode 100644
index a002808c5..000000000
--- a/frontend/src/components/managePermissions/ConfirmDialogText.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
- Are you sure you want to remove
- {{ props.role }} {{ props.customMsg }} from
- {{ props.userName }} in
- {{ selectedApplicationDisplayText }}?
-
-
-
-
\ No newline at end of file
diff --git a/frontend/src/components/managePermissions/ManagePermissions.vue b/frontend/src/components/managePermissions/ManagePermissions.vue
deleted file mode 100644
index e3beeb2fd..000000000
--- a/frontend/src/components/managePermissions/ManagePermissions.vue
+++ /dev/null
@@ -1,349 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/frontend/src/components/managePermissions/ManagePermissionsTitle.vue b/frontend/src/components/managePermissions/ManagePermissionsTitle.vue
deleted file mode 100644
index 22f974a6b..000000000
--- a/frontend/src/components/managePermissions/ManagePermissionsTitle.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
diff --git a/frontend/src/components/managePermissions/table/ApplicationAdminTable.vue b/frontend/src/components/managePermissions/table/ApplicationAdminTable.vue
deleted file mode 100644
index e8307d5aa..000000000
--- a/frontend/src/components/managePermissions/table/ApplicationAdminTable.vue
+++ /dev/null
@@ -1,193 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- No user found.
-
-
-
-
-
-
-
- {{ data.user.user_name }}
-
-
-
-
-
-
- {{
- data.user.first_name && data.user.last_name
- ? data.user.first_name +
- " " +
- data.user.last_name
- : ""
- }}
-
-
-
-
-
-
- Admin
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/frontend/src/components/managePermissions/table/DataTableHeader.vue b/frontend/src/components/managePermissions/table/DataTableHeader.vue
deleted file mode 100644
index 6acf90f6e..000000000
--- a/frontend/src/components/managePermissions/table/DataTableHeader.vue
+++ /dev/null
@@ -1,147 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/frontend/src/components/managePermissions/table/DelegatedAdminTable.vue b/frontend/src/components/managePermissions/table/DelegatedAdminTable.vue
deleted file mode 100644
index ea5e6e259..000000000
--- a/frontend/src/components/managePermissions/table/DelegatedAdminTable.vue
+++ /dev/null
@@ -1,220 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- No user found.
-
-
-
-
-
-
-
- {{ data.user.user_name }}
-
-
-
-
-
-
- {{
- data.user.first_name && data.user.last_name
- ? data.user.first_name +
- " " +
- data.user.last_name
- : ""
- }}
-
-
-
-
-
-
-
- {{
- data.role.parent_role
- ? data.role.parent_role.role_name
- : data.role.role_name
- }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/frontend/src/components/managePermissions/table/UserDataTable.vue b/frontend/src/components/managePermissions/table/UserDataTable.vue
deleted file mode 100644
index 899118599..000000000
--- a/frontend/src/components/managePermissions/table/UserDataTable.vue
+++ /dev/null
@@ -1,207 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- No user found.
-
-
-
-
-
-
-
- {{ data.user.user_name }}
-
-
-
-
-
-
- {{
- data.user.first_name && data.user.last_name
- ? data.user.first_name +
- " " +
- data.user.last_name
- : ""
- }}
-
-
-
-
-
-
- {{
- data.role.parent_role
- ? data.role.parent_role.role_name
- : data.role.role_name
- }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/frontend/src/components/managePermissions/table/utils.ts b/frontend/src/components/managePermissions/table/utils.ts
deleted file mode 100644
index d737eaacc..000000000
--- a/frontend/src/components/managePermissions/table/utils.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { router } from "@/router";
-import { selectedApplicationId } from "@/store/ApplicationState";
-import { UserDetailsRoute } from "@/router/routes";
-
-export const navigateToUserDetails = (userId: string) => {
- router.push({
- name: UserDetailsRoute.name,
- params: {
- applicationId: selectedApplicationId.value,
- userId,
- },
- });
-};
diff --git a/frontend/src/components/myPermissions/MyPermissions.vue b/frontend/src/components/myPermissions/MyPermissions.vue
deleted file mode 100644
index 06376eea3..000000000
--- a/frontend/src/components/myPermissions/MyPermissions.vue
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
diff --git a/frontend/src/components/myPermissions/MyPermissionsTable.vue b/frontend/src/components/myPermissions/MyPermissionsTable.vue
deleted file mode 100644
index 65fcde97e..000000000
--- a/frontend/src/components/myPermissions/MyPermissionsTable.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-
-
-
-
- You have no accesses in FAM.
-
-
-
-
-
-
- {{ data.application }}
-
-
-
-
-
-
-
- {{ data.role }}
-
-
-
-
-
-
-
diff --git a/frontend/src/constants/InjectionKeys.ts b/frontend/src/constants/InjectionKeys.ts
index c7e9676b4..a79f0b50f 100644
--- a/frontend/src/constants/InjectionKeys.ts
+++ b/frontend/src/constants/InjectionKeys.ts
@@ -1 +1 @@
-export const AUTH_KEY = Symbol('auth');
+export const AUTH_KEY = Symbol("auth");
diff --git a/frontend/src/constants/SideNavConfig.ts b/frontend/src/constants/SideNavConfig.ts
index 0a9932af6..80b896da1 100644
--- a/frontend/src/constants/SideNavConfig.ts
+++ b/frontend/src/constants/SideNavConfig.ts
@@ -1,17 +1,24 @@
import type { SideNavItemType } from "@/types/SideNavTypes";
-import { ManagePermissionsRoute, MyPermissionsRoute } from "../router/routes";
+import {
+ AddAppPermissionRoute,
+ AddFamPermissionRoute,
+ ManagePermissionsRoute,
+ MyPermissionsRoute,
+ UserDetailsRoute,
+} from "../router/routes";
import UserMultiple from "@carbon/icons-vue/es/user--multiple/16";
import IbmLpa from "@carbon/icons-vue/es/ibm--lpa/16";
-import type { RouteRecordName } from "vue-router";
export const sideNavItems: SideNavItemType[] = [
{
name: "Manage permissions",
routeName: ManagePermissionsRoute.name!,
icon: UserMultiple,
- subRoutes: ManagePermissionsRoute.children?.map(
- (child) => child.name as RouteRecordName
- ),
+ subRoutes: [
+ AddAppPermissionRoute.name!,
+ AddFamPermissionRoute.name!,
+ UserDetailsRoute.name!,
+ ],
},
{
name: "My permissions",
diff --git a/frontend/src/constants/TimeUnits.ts b/frontend/src/constants/TimeUnits.ts
index 1bdae51e1..b68835350 100644
--- a/frontend/src/constants/TimeUnits.ts
+++ b/frontend/src/constants/TimeUnits.ts
@@ -18,7 +18,7 @@ export const THIRTY_SECONDS = 30 * ONE_SECOND;
export const ONE_MINUTE = 60 * ONE_SECOND;
-export const FOUR_MINUTES = 4 * ONE_MINUTE;
+export const THREE_MINUTES = 3 * ONE_MINUTE;
export const FIVE_MINUTES = 5 * ONE_MINUTE;
diff --git a/frontend/src/constants/constants.ts b/frontend/src/constants/constants.ts
index a5ef3beed..8e5f01a69 100644
--- a/frontend/src/constants/constants.ts
+++ b/frontend/src/constants/constants.ts
@@ -1,3 +1,19 @@
-export const PLACE_HOLDER = '--';
+export const PLACE_HOLDER = "--";
-export const DEFAULT_SKELETON_BORDER_RADIUS = '1rem';
+export const DEFAULT_SKELETON_BORDER_RADIUS = "1rem";
+
+export const FOREST_CLIENT_INPUT_MAX_LENGTH = 8;
+
+export const FAM_APPLICATION_NAME = "FAM";
+
+export const FAM_APPLICATION_ID = 1;
+
+export const DEFAULT_ROW_PER_PAGE = 50;
+
+export const TABLE_PAGINATOR_TEMPLATE =
+ "RowsPerPageDropdown CurrentPageReport PrevPageLink NextPageLink";
+
+export const TABLE_CURRENT_PAGE_REPORT_TEMPLATE =
+ "{first} - {last} of {totalRecords} items";
+
+export const TABLE_ROWS_PER_PAGE = [5, 10, 15, 20, 50, 100];
diff --git a/frontend/src/enum/IconEnum.ts b/frontend/src/enum/IconEnum.ts
deleted file mode 100644
index f75651372..000000000
--- a/frontend/src/enum/IconEnum.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export enum IconSize {
- small = '16',
- medium = '20',
- large = '24',
- xLarge = '32',
-}
-
-export enum IconPosition {
- left = 'left',
- right = 'right',
-}
diff --git a/frontend/src/enum/SeverityEnum.ts b/frontend/src/enum/SeverityEnum.ts
deleted file mode 100644
index 079049fe7..000000000
--- a/frontend/src/enum/SeverityEnum.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-export enum Severity {
- Success = 'success',
- Warning = 'warn',
- Error = 'error',
-}
-
-export enum ErrorCode {
- Conflict = 'Conflict',
- SelfGrantProhibited = 'SelfGrantProhibited',
- Default = 'Default',
-}
-
-export const ErrorDescription = {
- SelfGrantProhibited: 'Granting admin privilege to self is not allowed.',
- Default: 'An error has occured.',
-};
-
-export enum GrantPermissionType {
- Regular = 'GrantUserAccess',
- DelegatedAdmin = 'GrantDelegatedAdmin',
-}
diff --git a/frontend/src/enum/TabEnum.ts b/frontend/src/enum/TabEnum.ts
deleted file mode 100644
index c994a6365..000000000
--- a/frontend/src/enum/TabEnum.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export enum TabKey {
- AdminAccess = 'adminAccess',
- UserAccess = 'userAccess',
- DelegatedAdminAccess = 'delegatedAdminAccess'
-}
\ No newline at end of file
diff --git a/frontend/src/errors/FamCustomError.ts b/frontend/src/errors/FamCustomError.ts
deleted file mode 100644
index 5e80f9e90..000000000
--- a/frontend/src/errors/FamCustomError.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// Custom FAM parent error.
-export class FamCustomError extends Error {
- message: string;
- cause: Error | undefined; // Original error if any.
- constructor(message: string, caues?: Error) {
- super(message);
- this.message = message;
- this.cause = caues;
- }
-}
-
-// --- FamRouteError
-
-export enum RouteErrorName {
- NOT_AUTHENTICATED_ERROR = 'NOT_AUTHENTICATED_ERROR',
- NO_APPLICATION_SELECTED_ERROR = 'NO_APPLICATION_SELECTED_ERROR',
- ACCESS_RESTRICTED = "ACCESS_RESTRICTED"
-}
-
-type RouteInfo = { to: any, from: any };
-/**
- * FAM custom route error.
- * For use only when needing to throw during router transition.
- */
-export class FamRouteError extends FamCustomError {
- name: RouteErrorName;
- routeInfo: RouteInfo | undefined;
-
- constructor(name: RouteErrorName, message: string, routeInfo?: RouteInfo, caues?: Error) {
- super(message, caues);
- this.name = name;
- this.routeInfo = routeInfo;
- }
-}
\ No newline at end of file
diff --git a/frontend/src/components/UI/Header.vue b/frontend/src/layouts/Header.vue
similarity index 87%
rename from frontend/src/components/UI/Header.vue
rename to frontend/src/layouts/Header.vue
index d87f1aa67..ff6daecf8 100644
--- a/frontend/src/components/UI/Header.vue
+++ b/frontend/src/layouts/Header.vue
@@ -1,14 +1,16 @@
@@ -35,13 +39,9 @@ const props = defineProps({
@click="sideNavState.toggleVisible()"
aria-label="Toggle Side Navigation"
>
-
+
-