Use swagger api for import KSM Key (#3204)

Author: cesnietor

web-app/package.json

@@ -81,7 +81,7 @@
     "customize-cra": "^1.0.0",
     "minio": "^7.1.3",
     "nyc": "^15.1.0",
-    "prettier": "3.1.1",
+    "prettier": "3.2.4",
     "react-app-rewire-hot-loader": "^2.0.1",
     "react-app-rewired": "^2.2.1",
     "react-scripts": "5.0.1",

web-app/src/screens/Console/Account/Account.tsx

@@ -179,9 +179,8 @@ const Account = () => {
     },
   ];
 
-  const filteredRecords = records.filter(
-    (elementItem) =>
-      elementItem?.accessKey?.toLowerCase().includes(filter.toLowerCase()),
+  const filteredRecords = records.filter((elementItem) =>
+    elementItem?.accessKey?.toLowerCase().includes(filter.toLowerCase()),
   );
 
   return (

web-app/src/screens/Console/KMS/ImportKey.tsx

@@ -27,34 +27,41 @@ import {
 } from "mds";
 import { useNavigate } from "react-router-dom";
 import { IAM_PAGES } from "../../../common/SecureComponent/permissions";
-import { ErrorResponseHandler } from "../../../common/types";
 import { setErrorSnackMessage, setHelpName } from "../../../systemSlice";
 import { useAppDispatch } from "../../../store";
 import { modalStyleUtils } from "../Common/FormComponents/common/styleLibrary";
-import useApi from "../Common/Hooks/useApi";
 import KMSHelpBox from "./KMSHelpbox";
 import PageHeaderWrapper from "../Common/PageHeaderWrapper/PageHeaderWrapper";
 import HelpMenu from "../HelpMenu";
+import { api } from "api";
+import { ApiError, HttpResponse } from "api/consoleApi";
+import { errorToHandler } from "api/errors";
 
 export const emptyContent = '{\n    "bytes": ""\n}';
 
 const ImportKey = () => {
   const dispatch = useAppDispatch();
   const navigate = useNavigate();
 
-  const onSuccess = () => navigate(`${IAM_PAGES.KMS_KEYS}`);
-
-  const onError = (err: ErrorResponseHandler) =>
-    dispatch(setErrorSnackMessage(err));
-
-  const [loading, invokeApi] = useApi(onSuccess, onError);
+  const [loadingImport, setLoadingImport] = useState<boolean>(false);
   const [keyName, setKeyName] = useState<string>("");
   const [keyContent, setKeyContent] = useState<string>(emptyContent);
 
   const importRecord = (event: React.FormEvent) => {
+    setLoadingImport(true);
     event.preventDefault();
     let data = JSON.parse(keyContent);
-    invokeApi("POST", `/api/v1/kms/keys/${keyName}/import`, data);
+
+    api.kms
+      .kmsImportKey(keyName, data)
+      .then((_) => {
+        navigate(`${IAM_PAGES.KMS_KEYS}`);
+      })
+      .catch(async (res: HttpResponse<void, ApiError>) => {
+        const err = (await res.json()) as ApiError;
+        dispatch(setErrorSnackMessage(errorToHandler(err)));
+      })
+      .finally(() => setLoadingImport(false));
   };
 
   const resetForm = () => {
@@ -140,7 +147,7 @@ const ImportKey = () => {
                   type="submit"
                   variant="callAction"
                   color="primary"
-                  disabled={loading || !validSave}
+                  disabled={loadingImport || !validSave}
                   label={"Import"}
                 />
               </Grid>

web-app/src/screens/Console/Policies/ListPolicies.tsx

@@ -159,8 +159,8 @@ const ListPolicies = () => {
     },
   ];
 
-  const filteredRecords = records.filter(
-    (elementItem) => elementItem.name?.includes(filterPolicies),
+  const filteredRecords = records.filter((elementItem) =>
+    elementItem.name?.includes(filterPolicies),
   );
 
   useEffect(() => {

web-app/tsconfig.json

@@ -17,7 +17,7 @@
     "downlevelIteration": true,
     "noFallthroughCasesInSwitch": true,
     "baseUrl": "./src",
-    "rootDir": "./src"
+    "rootDir": "./src",
   },
-  "include": ["src"]
+  "include": ["src"],
 }

web-app/yarn.lock

@@ -9954,10 +9954,10 @@ prelude-ls@~1.1.2:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
 
-prettier@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.1.1.tgz#6ba9f23165d690b6cbdaa88cb0807278f7019848"
-  integrity sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==
+prettier@3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.4.tgz#4723cadeac2ce7c9227de758e5ff9b14e075f283"
+  integrity sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ==
 
 pretty-bytes@^5.3.0, pretty-bytes@^5.4.1:
   version "5.6.0"