Refactor UserPermissionsProvider to TypeScript, remove unused permissions API routes, and enhance cache reset functionality

frontend/src/features/about/releaseNotes/ReleaseNotesContainer.tsx

@@ -1,7 +1,7 @@
-import React, { useState, useEffect } from "react";
+import React from "react";
 import ReleaseNotesList from "./ReleaseNotesList";
 import TimelineComponent from "../timeline/TimelineComponent";
-import { routes, get, endpoints } from "../../../utils/api";
+import { endpoints } from "../../../utils/api";
 import useSWR from "swr";
 import { fetcher } from "utils/swr";
 import { blip } from "utils";

frontend/src/features/about/system/SystemVersionComponent.tsx

@@ -1,5 +1,5 @@
 import React, { useMemo } from "react";
-import { List, ListItem, ListItemText, ListItemAvatar, Theme, styled } from "@mui/material";
+import { List, ListItem, ListItemText, ListItemAvatar, styled } from "@mui/material";
 import Avatar from "@mui/material/Avatar";
 import WebAssetIcon from "@mui/icons-material/WebAsset";
 import DeveloperBoardIcon from "@mui/icons-material/DeveloperBoard";
@@ -7,7 +7,6 @@ import SettingsInputSvideoIcon from "@mui/icons-material/SettingsInputSvideo";
 import { useTranslation } from "react-i18next";
 import packageData from "../../../../package.json";
 import Paper from "@mui/material/Paper";
-import { useTheme } from "@mui/material/styles";
 import { dtos } from "types";
 
 const VersionAvatar = styled(Avatar)(({ theme }) => ({
@@ -25,7 +24,6 @@ type Props = {
 
 const SystemVersionComponent: React.FC<Props> = ({ data }) => {
   const { t } = useTranslation();
-  const theme = useTheme();
 
   const lastReleaseDate = useMemo(() => {
     const format = "DD-MM-YYYY HH:mm:ss";

frontend/src/features/settings/system/CacheSettingsContainer.tsx

@@ -17,7 +17,7 @@ const CacheSettingsContainer: React.FC = () => {
     onSuccess: () => blip.info(t("Settings.Cache.ResetInfo"))
   });
 
-  const handleResetCache = useCallback(() => trigger(), [t]);
+  const handleResetCache = useCallback(() => trigger(), [trigger]);
 
   return <CacheSettingsComponent onResetCache={handleResetCache} />;
 };

frontend/src/providers/UserPermissionsProvider.tsx

@@ -1,6 +1,9 @@
-import React, { useState, useEffect, useContext, useMemo } from "react";
+import React, { useState, useContext, useMemo, ReactNode } from "react";
-import PropTypes from "prop-types";
+import { endpoints } from "../utils/api";
-import { routes, get } from "../utils/api";
+import { PermissionsDto } from "types/dtos";
+import useSWR from "swr";
+import { fetcher } from "utils/swr";
+import { blip } from "utils";
 
 const permissionCodes = {
   VIEW_DASHBOARD: "VIEW_DASHBOARD",
@@ -13,12 +16,17 @@ const permissionCodes = {
   SYSTEM_ADMINISTRATION: "SYSTEM_ADMINISTRATION"
 };
 
-const initialState = {
+type UserPermissionsContextPayload = {
+  permissions: string[];
+  loading: boolean;
+};
+
+const initialState: UserPermissionsContextPayload = {
   permissions: [],
   loading: true
 };
 
-const getPermissionFlags = permissions => {
+const getPermissionFlags = (permissions: string[]) => {
   const viewDashboard = permissions.includes(permissionCodes.VIEW_DASHBOARD) ?? false;
   const manageUsers = permissions.includes(permissionCodes.MANAGE_USERS) ?? false;
   const manageSettings = permissions.includes(permissionCodes.MANAGE_SETTINGS) ?? false;
@@ -49,7 +57,7 @@ const getPermissionFlags = permissions => {
   };
 };
 
-const UserPermissionsContext = React.createContext(initialState);
+const UserPermissionsContext = React.createContext<UserPermissionsContextPayload>(initialState);
 
 const usePermissions = () => {
   const { permissions, loading } = useContext(UserPermissionsContext);
@@ -57,20 +65,21 @@ const usePermissions = () => {
   return { loading, ...flags };
 };
 
-const UserPermissionsProvider = ({ children }) => {
+type Props = {
-  const [permissions, setPermissions] = useState(initialState);
+  children: ReactNode;
-
-  useEffect(() => {
-    get(routes.permissions, {
-      onCompleted: data => setPermissions({ ...data, loading: false })
-    });
-  }, []);
-
-  return <UserPermissionsContext.Provider value={permissions}>{children}</UserPermissionsContext.Provider>;
 };
 
-UserPermissionsProvider.propTypes = {
+const UserPermissionsProvider: React.FC<Props> = ({ children }) => {
-  children: PropTypes.node.isRequired
+  const [state, setState] = useState<UserPermissionsContextPayload>(initialState);
+
+  const url = useMemo(() => (state.permissions?.length ? null : endpoints.security.permissions), [state.permissions]);
+  useSWR<PermissionsDto, Error>(url, fetcher, {
+    revalidateOnFocus: false,
+    onError: err => blip.error(err.message),
+    onSuccess: data => setState({ ...data, loading: false })
+  });
+
+  return <UserPermissionsContext.Provider value={state}>{children}</UserPermissionsContext.Provider>;
 };
 
 export { UserPermissionsProvider, usePermissions };

frontend/src/types/dtos.ts

@@ -13,3 +13,7 @@ export type ReleaseNote = {
   date: string;
   notes: string[];
 };
+
+export type PermissionsDto = {
+  permissions: string[];
+};

frontend/src/utils/api.js

@@ -10,8 +10,6 @@ const powerActionsRoute = `${apiHost}/resurrector`;
 const securityRoute = `${apiHost}/security`;
 
 const routes = {
-  permissions: `${securityRoute}/permissions`,
-  resetCache: `${systemRoute}/reset-cache`,
   machines: `${networkRoute}/machines`,
   wakeMachine: `${powerActionsRoute}/wake`,
   pingMachine: `${powerActionsRoute}/ping`,
@@ -21,6 +19,9 @@ const routes = {
     version: `${systemRoute}/version`,
     releaseNotes: `${systemRoute}/release-notes`,
     resetCache: `${systemRoute}/reset-cache`
+  },
+  security: {
+    permissions: `${securityRoute}/permissions`
   }
 };