chore(deps): fix deprecated deps and peer requirements

canonical · Feb 17, 2025 · 53b5260 · 53b5260
1 parent 21cd83e
commit 53b5260
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 474 deletions.
diff --git a/package.json b/package.json
@@ -52,6 +52,7 @@
     "@reduxjs/toolkit": "2.5.1",
     "@sentry/browser": "9.1.0",
     "@sentry/core": "9.1.0",
+    "@tanstack/react-query": "5.66.0",
     "ansi-to-html": "0.7.2",
     "async-limiter": "2.0.0",
     "axios": "1.7.9",
@@ -60,10 +61,10 @@
     "d3": "7.9.0",
     "date-fns": "4.1.0",
     "dompurify": "3.2.4",
+    "fast-deep-equal": "3.1.3",
     "formik": "2.4.6",
     "framer-motion": "12.4.2",
     "fuse.js": "7.1.0",
-    "lodash.isequal": "4.5.0",
     "lodash.mergewith": "4.6.2",
     "loglevel": "1.9.2",
     "prism-react-renderer": "2.4.1",
@@ -81,16 +82,12 @@
     "yup": "1.6.1"
   },
   "devDependencies": {
-    "@babel/plugin-proposal-private-property-in-object": "7.21.11",
     "@testing-library/dom": "10.4.0",
     "@testing-library/jest-dom": "6.6.3",
     "@testing-library/react": "16.2.0",
     "@testing-library/user-event": "14.6.1",
-    "@types/classnames": "2.3.4",
     "@types/clone-deep": "4.0.4",
     "@types/d3": "7.4.3",
-    "@types/dompurify": "3.2.0",
-    "@types/lodash.isequal": "4.5.8",
     "@types/lodash.mergewith": "4.6.9",
     "@types/node": "18.19.76",
     "@types/prismjs": "1.26.5",
@@ -121,8 +118,6 @@
     "postcss": "8.5.2",
     "prettier": "3.5.1",
     "react-anchorme": "4.0.1",
-    "redux-devtools": "3.7.0",
-    "redux-devtools-extension": "2.13.9",
     "redux-mock-store": "1.5.5",
     "sass": "1.85.0",
     "stylelint": "16.14.1",

diff --git a/src/pages/AdvancedSearch/ErrorsBlock/ErrorsBlock.tsx b/src/pages/AdvancedSearch/ErrorsBlock/ErrorsBlock.tsx
@@ -1,4 +1,4 @@
-import isEqual from "lodash.isequal";
+import fastDeepEqual from "fast-deep-equal/es6";
 
 import type { CrossModelQueryResponse } from "juju/jimm/JIMMV4";
 import {
@@ -17,7 +17,8 @@ const ErrorsBlock = (): JSX.Element | null => {
   const hasEqualErrors = (errors: CrossModelQueryResponse["errors"]) => {
     const firstError = Object.values(errors)[0].slice().sort();
     return Object.values(errors).reduce(
-      (result, error) => result && isEqual(error.slice().sort(), firstError),
+      (result, error) =>
+        result && fastDeepEqual(error.slice().sort(), firstError),
       true,
     );
   };

diff --git a/src/store/juju/selectors.ts b/src/store/juju/selectors.ts
@@ -5,7 +5,7 @@ import type {
 } from "@canonical/jujulib/dist/api/facades/client/ClientV6";
 import { createSelector } from "@reduxjs/toolkit";
 import cloneDeep from "clone-deep";
-import isEqual from "lodash.isequal";
+import fastDeepEqual from "fast-deep-equal/es6";
 
 import type { AuditEvent } from "juju/jimm/JIMMV3";
 import type { RelationshipTuple } from "juju/jimm/JIMMV4";
@@ -1068,7 +1068,7 @@ export const getReBACRelationsState = createSelector(
 export const getReBACPermission = createSelector(
   [getReBACRelationsState, (_state, tuple?: RelationshipTuple | null) => tuple],
   (rebacRelations, tuple) =>
-    rebacRelations.find((relation) => isEqual(relation.tuple, tuple)),
+    rebacRelations.find((relation) => fastDeepEqual(relation.tuple, tuple)),
 );
 
 export const getReBACPermissionLoading = createSelector(

diff --git a/src/store/juju/slice.ts b/src/store/juju/slice.ts
@@ -10,7 +10,7 @@ import type {
 } from "@canonical/jujulib/dist/api/facades/secrets/SecretsV2";
 import type { PayloadAction } from "@reduxjs/toolkit";
 import { createSlice } from "@reduxjs/toolkit";
-import isEqual from "lodash.isequal";
+import fastDeepEqual from "fast-deep-equal/es6";
 
 import type { AuditEvent, FindAuditEventsRequest } from "juju/jimm/JIMMV3";
 import type {
@@ -37,9 +37,7 @@ import type {
 
 export const DEFAULT_AUDIT_EVENTS_LIMIT = 50;
 
-type WsControllerURLParam = {
-  wsControllerURL: string;
-};
+type WsControllerURLParam = { wsControllerURL: string };
 
 const DEFAULT_MODEL_SECRETS: ModelSecrets = {
   items: null,
@@ -58,16 +56,12 @@ const DEFAULT_MODEL_SECRETS_CONTENT: SecretsContent = {
 const getOrSetContentState = (state: JujuState, modelUUID: string) => {
   let modelSecrets = state.secrets[modelUUID];
   if (!modelSecrets) {
-    modelSecrets = state.secrets[modelUUID] = {
-      ...DEFAULT_MODEL_SECRETS,
-    };
+    modelSecrets = state.secrets[modelUUID] = { ...DEFAULT_MODEL_SECRETS };
   }
 
   let content = modelSecrets.content;
   if (!content) {
-    content = modelSecrets.content = {
-      ...DEFAULT_MODEL_SECRETS_CONTENT,
-    };
+    content = modelSecrets.content = { ...DEFAULT_MODEL_SECRETS_CONTENT };
   }
   return content;
 };
@@ -103,11 +97,7 @@ const slice = createSlice({
   reducers: {
     updateModelList: (
       state,
-      action: PayloadAction<
-        {
-          models: UserModelList;
-        } & WsControllerURLParam
-      >,
+      action: PayloadAction<{ models: UserModelList } & WsControllerURLParam>,
     ) => {
       const modelList = state.models;
       let userModels = action.payload.models["user-models"];
@@ -159,9 +149,7 @@ const slice = createSlice({
     updateModelInfo: (
       state,
       action: PayloadAction<
-        {
-          modelInfo: ModelInfoResults;
-        } & WsControllerURLParam
+        { modelInfo: ModelInfoResults } & WsControllerURLParam
       >,
     ) => {
       const modelInfo = action.payload.modelInfo.results[0].result;
@@ -179,20 +167,15 @@ const slice = createSlice({
     updateModelFeatures: (
       state,
       action: PayloadAction<
-        {
-          modelUUID: string;
-          features: ModelFeatures;
-        } & WsControllerURLParam
+        { modelUUID: string; features: ModelFeatures } & WsControllerURLParam
       >,
     ) => {
       state.modelFeatures[action.payload.modelUUID] = action.payload.features;
     },
     updateModelsError: (
       state,
       action: PayloadAction<
-        {
-          modelsError: string | null;
-        } & WsControllerURLParam
+        { modelsError: string | null } & WsControllerURLParam
       >,
     ) => {
       state.modelsError = action.payload.modelsError;
@@ -271,9 +254,7 @@ const slice = createSlice({
     updateControllerList: (
       state,
       action: PayloadAction<
-        {
-          controllers: Controllers[0];
-        } & WsControllerURLParam
+        { controllers: Controllers[0] } & WsControllerURLParam
       >,
     ) => {
       const controllers = state.controllers ?? {};
@@ -328,11 +309,7 @@ const slice = createSlice({
     },
     secretsLoading: (
       state,
-      action: PayloadAction<
-        {
-          modelUUID: string;
-        } & WsControllerURLParam
-      >,
+      action: PayloadAction<{ modelUUID: string } & WsControllerURLParam>,
     ) => {
       if (!state.secrets[action.payload.modelUUID]) {
         state.secrets[action.payload.modelUUID] = { ...DEFAULT_MODEL_SECRETS };
@@ -358,10 +335,7 @@ const slice = createSlice({
     setSecretsErrors: (
       state,
       action: PayloadAction<
-        {
-          modelUUID: string;
-          errors: string;
-        } & WsControllerURLParam
+        { modelUUID: string; errors: string } & WsControllerURLParam
       >,
     ) => {
       if (!state.secrets[action.payload.modelUUID]) {
@@ -373,21 +347,13 @@ const slice = createSlice({
     },
     clearSecrets: (
       state,
-      action: PayloadAction<
-        {
-          modelUUID: string;
-        } & WsControllerURLParam
-      >,
+      action: PayloadAction<{ modelUUID: string } & WsControllerURLParam>,
     ) => {
       delete state.secrets[action.payload.modelUUID];
     },
     secretsContentLoading: (
       state,
-      action: PayloadAction<
-        {
-          modelUUID: string;
-        } & WsControllerURLParam
-      >,
+      action: PayloadAction<{ modelUUID: string } & WsControllerURLParam>,
     ) => {
       const content = getOrSetContentState(state, action.payload.modelUUID);
       content.loading = true;
@@ -410,10 +376,7 @@ const slice = createSlice({
     setSecretsContentErrors: (
       state,
       action: PayloadAction<
-        {
-          modelUUID: string;
-          errors: string;
-        } & WsControllerURLParam
+        { modelUUID: string; errors: string } & WsControllerURLParam
       >,
     ) => {
       const content = getOrSetContentState(state, action.payload.modelUUID);
@@ -424,11 +387,7 @@ const slice = createSlice({
     },
     clearSecretsContent: (
       state,
-      action: PayloadAction<
-        {
-          modelUUID: string;
-        } & WsControllerURLParam
-      >,
+      action: PayloadAction<{ modelUUID: string } & WsControllerURLParam>,
     ) => {
       const secrets = state.secrets[action.payload.modelUUID];
       if (secrets) {
@@ -449,7 +408,7 @@ const slice = createSlice({
         tuple,
       };
       const existingIndex = state.rebacRelations.findIndex((relation) =>
-        isEqual(relation.tuple, tuple),
+        fastDeepEqual(relation.tuple, tuple),
       );
       if (existingIndex >= 0) {
         state.rebacRelations[existingIndex] = relationState;
@@ -464,7 +423,7 @@ const slice = createSlice({
       }: PayloadAction<{ tuple: RelationshipTuple; allowed: boolean }>,
     ) => {
       const existingIndex = state.rebacRelations.findIndex((relation) =>
-        isEqual(relation.tuple, payload.tuple),
+        fastDeepEqual(relation.tuple, payload.tuple),
       );
       if (existingIndex >= 0) {
         state.rebacRelations[existingIndex] = {
@@ -481,7 +440,7 @@ const slice = createSlice({
       { payload }: PayloadAction<{ tuple: RelationshipTuple; errors: string }>,
     ) => {
       const existingIndex = state.rebacRelations.findIndex((relation) =>
-        isEqual(relation.tuple, payload.tuple),
+        fastDeepEqual(relation.tuple, payload.tuple),
       );
       if (existingIndex >= 0) {
         state.rebacRelations[existingIndex] = {
@@ -498,7 +457,7 @@ const slice = createSlice({
       { payload }: PayloadAction<{ tuple: RelationshipTuple }>,
     ) => {
       const existingIndex = state.rebacRelations.findIndex((relation) =>
-        isEqual(relation.tuple, payload.tuple),
+        fastDeepEqual(relation.tuple, payload.tuple),
       );
       if (existingIndex >= 0) {
         state.rebacRelations.splice(existingIndex, 1);