+
{
setValue("color", $tagColor.hex)}
@@ -204,7 +204,7 @@ export const CreateTagModal = ({ isOpen, onToggle }: Props): JSX.Element => {
) : (
-
+
{isValidHexColor(selectedTagColor) && (
{
setShowHexInput((prev) => !prev)}
diff --git a/frontend-v2/src/components/tags/CreateTagModal/index.tsx b/frontend-next/src/components/tags/CreateTagModal/index.tsx
similarity index 100%
rename from frontend-v2/src/components/tags/CreateTagModal/index.tsx
rename to frontend-next/src/components/tags/CreateTagModal/index.tsx
diff --git a/frontend-v2/src/components/utilities/SecurityClient.ts b/frontend-next/src/components/utilities/SecurityClient.ts
similarity index 62%
rename from frontend-v2/src/components/utilities/SecurityClient.ts
rename to frontend-next/src/components/utilities/SecurityClient.ts
index c886a45ace..f4011c2f06 100644
--- a/frontend-v2/src/components/utilities/SecurityClient.ts
+++ b/frontend-next/src/components/utilities/SecurityClient.ts
@@ -1,4 +1,4 @@
-import { setAuthToken, setMfaTempToken, setSignupTempToken } from "@app/hooks/api/reactQuery";
+import { getAuthToken, setAuthToken, setMfaTempToken, setSignupTempToken } from "@app/reactQuery";
export const PROVIDER_AUTH_TOKEN_KEY = "infisical__provider-auth-token";
@@ -23,4 +23,16 @@ export default class SecurityClient {
static setToken(tokenStr: string) {
setAuthToken(tokenStr);
}
+
+ static async fetchCall(resource: RequestInfo, options?: RequestInit | undefined) {
+ const req = new Request(resource, options);
+
+ const token = getAuthToken();
+
+ if (token) {
+ req.headers.set("Authorization", `Bearer ${token}`);
+ }
+
+ return fetch(req);
+ }
}
diff --git a/frontend-v2/src/components/utilities/attemptChangePassword.ts b/frontend-next/src/components/utilities/attemptChangePassword.ts
similarity index 97%
rename from frontend-v2/src/components/utilities/attemptChangePassword.ts
rename to frontend-next/src/components/utilities/attemptChangePassword.ts
index e51168525f..45281f2f2a 100644
--- a/frontend-v2/src/components/utilities/attemptChangePassword.ts
+++ b/frontend-next/src/components/utilities/attemptChangePassword.ts
@@ -38,7 +38,7 @@ const attemptChangePassword = ({ email, currentPassword, newPassword }: Params):
const clientProof = clientOldPassword.getProof();
clientNewPassword.init({ username: email, password: newPassword }, async () => {
- clientNewPassword.createVerifier(async (_err, result) => {
+ clientNewPassword.createVerifier(async (err, result) => {
try {
const derivedKey = await deriveArgonKey({
password: newPassword,
diff --git a/frontend-v2/src/components/utilities/attemptCliLogin.ts b/frontend-next/src/components/utilities/attemptCliLogin.ts
similarity index 96%
rename from frontend-v2/src/components/utilities/attemptCliLogin.ts
rename to frontend-next/src/components/utilities/attemptCliLogin.ts
index d897ebeaae..6eba08d61d 100644
--- a/frontend-v2/src/components/utilities/attemptCliLogin.ts
+++ b/frontend-next/src/components/utilities/attemptCliLogin.ts
@@ -1,8 +1,8 @@
/* eslint-disable prefer-destructuring */
import jsrp from "jsrp";
-import { decryptPrivateKeyHelper } from "@app/helpers/key";
import { login1, login2 } from "@app/hooks/api/auth/queries";
+import KeyService from "@app/services/KeyService";
import Telemetry from "./telemetry/Telemetry";
import { saveTokenToLocalStorage } from "./saveTokenToLocalStorage";
@@ -101,7 +101,7 @@ const attemptLogin = async ({
// set JWT token
SecurityClient.setToken(token);
- const privateKey = await decryptPrivateKeyHelper({
+ const privateKey = await KeyService.decryptPrivateKey({
encryptionVersion,
encryptedPrivateKey,
iv,
diff --git a/frontend-v2/src/components/utilities/attemptCliLoginMfa.ts b/frontend-next/src/components/utilities/attemptCliLoginMfa.ts
similarity index 95%
rename from frontend-v2/src/components/utilities/attemptCliLoginMfa.ts
rename to frontend-next/src/components/utilities/attemptCliLoginMfa.ts
index 14a61d817e..b2fd190934 100644
--- a/frontend-v2/src/components/utilities/attemptCliLoginMfa.ts
+++ b/frontend-next/src/components/utilities/attemptCliLoginMfa.ts
@@ -1,8 +1,8 @@
/* eslint-disable prefer-destructuring */
import jsrp from "jsrp";
-import { decryptPrivateKeyHelper } from "@app/helpers/key";
import { login1, verifyMfaToken } from "@app/hooks/api/auth/queries";
+import KeyService from "@app/services/KeyService";
import { saveTokenToLocalStorage } from "./saveTokenToLocalStorage";
import SecurityClient from "./SecurityClient";
@@ -71,7 +71,7 @@ const attemptLoginMfa = async ({
SecurityClient.setToken(token);
SecurityClient.setProviderAuthToken("");
- const privateKey = await decryptPrivateKeyHelper({
+ const privateKey = await KeyService.decryptPrivateKey({
encryptionVersion,
encryptedPrivateKey,
iv,
diff --git a/frontend-v2/src/components/utilities/attemptLogin.ts b/frontend-next/src/components/utilities/attemptLogin.ts
similarity index 95%
rename from frontend-v2/src/components/utilities/attemptLogin.ts
rename to frontend-next/src/components/utilities/attemptLogin.ts
index c371d9c910..120ae62eca 100644
--- a/frontend-v2/src/components/utilities/attemptLogin.ts
+++ b/frontend-next/src/components/utilities/attemptLogin.ts
@@ -1,8 +1,8 @@
/* eslint-disable prefer-destructuring */
import jsrp from "jsrp";
-import { decryptPrivateKeyHelper } from "@app/helpers/key";
import { login1, login2 } from "@app/hooks/api/auth/queries";
+import KeyService from "@app/services/KeyService";
import Telemetry from "./telemetry/Telemetry";
import { saveTokenToLocalStorage } from "./saveTokenToLocalStorage";
@@ -86,7 +86,7 @@ const attemptLogin = async ({
// set JWT token
SecurityClient.setToken(token);
- const privateKey = await decryptPrivateKeyHelper({
+ const privateKey = await KeyService.decryptPrivateKey({
encryptionVersion,
encryptedPrivateKey,
iv,
diff --git a/frontend-v2/src/components/utilities/attemptLoginMfa.ts b/frontend-next/src/components/utilities/attemptLoginMfa.ts
similarity index 93%
rename from frontend-v2/src/components/utilities/attemptLoginMfa.ts
rename to frontend-next/src/components/utilities/attemptLoginMfa.ts
index 10f36ec397..672cecea5f 100644
--- a/frontend-v2/src/components/utilities/attemptLoginMfa.ts
+++ b/frontend-next/src/components/utilities/attemptLoginMfa.ts
@@ -1,8 +1,8 @@
/* eslint-disable prefer-destructuring */
import jsrp from "jsrp";
-import { decryptPrivateKeyHelper } from "@app/helpers/key";
import { login1, verifyMfaToken } from "@app/hooks/api/auth/queries";
+import KeyService from "@app/services/KeyService";
import { saveTokenToLocalStorage } from "./saveTokenToLocalStorage";
import SecurityClient from "./SecurityClient";
@@ -27,7 +27,7 @@ const attemptLoginMfa = async ({
password: string;
providerAuthToken?: string;
mfaToken: string;
-}): Promise => {
+}): Promise => {
return new Promise((resolve, reject) => {
client.init(
{
@@ -63,7 +63,7 @@ const attemptLoginMfa = async ({
SecurityClient.setToken(token);
SecurityClient.setProviderAuthToken("");
- const privateKey = await decryptPrivateKeyHelper({
+ const privateKey = await KeyService.decryptPrivateKey({
encryptionVersion,
encryptedPrivateKey,
iv,
diff --git a/frontend-v2/src/components/utilities/checks/OnboardingCheck.ts b/frontend-next/src/components/utilities/checks/OnboardingCheck.ts
similarity index 100%
rename from frontend-v2/src/components/utilities/checks/OnboardingCheck.ts
rename to frontend-next/src/components/utilities/checks/OnboardingCheck.ts
diff --git a/frontend-v2/src/components/utilities/checks/password/PasswordCheck.ts b/frontend-next/src/components/utilities/checks/password/PasswordCheck.ts
similarity index 100%
rename from frontend-v2/src/components/utilities/checks/password/PasswordCheck.ts
rename to frontend-next/src/components/utilities/checks/password/PasswordCheck.ts
diff --git a/frontend-v2/src/components/utilities/checks/password/checkIsPasswordBreached.ts b/frontend-next/src/components/utilities/checks/password/checkIsPasswordBreached.ts
similarity index 100%
rename from frontend-v2/src/components/utilities/checks/password/checkIsPasswordBreached.ts
rename to frontend-next/src/components/utilities/checks/password/checkIsPasswordBreached.ts
diff --git a/frontend-v2/src/components/utilities/checks/password/checkPassword.ts b/frontend-next/src/components/utilities/checks/password/checkPassword.ts
similarity index 100%
rename from frontend-v2/src/components/utilities/checks/password/checkPassword.ts
rename to frontend-next/src/components/utilities/checks/password/checkPassword.ts
diff --git a/frontend-v2/src/components/utilities/checks/password/passwordRegexes.ts b/frontend-next/src/components/utilities/checks/password/passwordRegexes.ts
similarity index 100%
rename from frontend-v2/src/components/utilities/checks/password/passwordRegexes.ts
rename to frontend-next/src/components/utilities/checks/password/passwordRegexes.ts
diff --git a/frontend-v2/src/components/utilities/checks/tempLocalStorage.ts b/frontend-next/src/components/utilities/checks/tempLocalStorage.ts
similarity index 100%
rename from frontend-v2/src/components/utilities/checks/tempLocalStorage.ts
rename to frontend-next/src/components/utilities/checks/tempLocalStorage.ts
diff --git a/frontend-v2/src/components/utilities/config/index.ts b/frontend-next/src/components/utilities/config/index.ts
similarity index 100%
rename from frontend-v2/src/components/utilities/config/index.ts
rename to frontend-next/src/components/utilities/config/index.ts
diff --git a/frontend-v2/src/components/utilities/cryptography/aes-256-gcm.ts b/frontend-next/src/components/utilities/cryptography/aes-256-gcm.ts
similarity index 100%
rename from frontend-v2/src/components/utilities/cryptography/aes-256-gcm.ts
rename to frontend-next/src/components/utilities/cryptography/aes-256-gcm.ts
diff --git a/frontend-v2/src/components/utilities/cryptography/crypto.ts b/frontend-next/src/components/utilities/cryptography/crypto.ts
similarity index 86%
rename from frontend-v2/src/components/utilities/cryptography/crypto.ts
rename to frontend-next/src/components/utilities/cryptography/crypto.ts
index 82bac0ad55..c0e5d4c218 100644
--- a/frontend-v2/src/components/utilities/cryptography/crypto.ts
+++ b/frontend-next/src/components/utilities/cryptography/crypto.ts
@@ -1,11 +1,10 @@
-// @ts-expect-error to avoid wasm dependencies
-// eslint-disable-next-line
-import argon2 from "argon2-browser/dist/argon2-bundled.min.js";
-import nacl from "tweetnacl";
-import { decodeBase64, decodeUTF8, encodeBase64, encodeUTF8 } from "tweetnacl-util";
+import argon2 from "argon2-browser";
import aes from "./aes-256-gcm";
+const nacl = require("tweetnacl");
+nacl.util = require("tweetnacl-util");
+
/**
* Return new base64, NaCl, public-private key pair.
* @returns {Object} obj
@@ -16,8 +15,8 @@ const generateKeyPair = () => {
const pair = nacl.box.keyPair();
return {
- publicKey: encodeBase64(pair.publicKey),
- privateKey: encodeBase64(pair.secretKey)
+ publicKey: nacl.util.encodeBase64(pair.publicKey),
+ privateKey: nacl.util.encodeBase64(pair.secretKey)
};
};
@@ -35,8 +34,8 @@ type EncryptAsymmetricProps = {
* @param {String} - base64-encoded Nacl public key
*/
const verifyPrivateKey = ({ privateKey, publicKey }: { privateKey: string; publicKey: string }) => {
- const derivedPublicKey = encodeBase64(
- nacl.box.keyPair.fromSecretKey(decodeBase64(privateKey)).publicKey
+ const derivedPublicKey = nacl.util.encodeBase64(
+ nacl.box.keyPair.fromSecretKey(nacl.util.decodeBase64(privateKey)).publicKey
);
if (derivedPublicKey !== publicKey) {
@@ -109,15 +108,15 @@ const encryptAssymmetric = ({
} => {
const nonce = nacl.randomBytes(24);
const ciphertext = nacl.box(
- decodeUTF8(plaintext),
+ nacl.util.decodeUTF8(plaintext),
nonce,
- decodeBase64(publicKey),
- decodeBase64(privateKey)
+ nacl.util.decodeBase64(publicKey),
+ nacl.util.decodeBase64(privateKey)
);
return {
- ciphertext: encodeBase64(ciphertext),
- nonce: encodeBase64(nonce)
+ ciphertext: nacl.util.encodeBase64(ciphertext),
+ nonce: nacl.util.encodeBase64(nonce)
};
};
@@ -144,13 +143,13 @@ const decryptAssymmetric = ({
privateKey
}: DecryptAsymmetricProps): string => {
const plaintext = nacl.box.open(
- decodeBase64(ciphertext),
- decodeBase64(nonce),
- decodeBase64(publicKey),
- decodeBase64(privateKey)
+ nacl.util.decodeBase64(ciphertext),
+ nacl.util.decodeBase64(nonce),
+ nacl.util.decodeBase64(publicKey),
+ nacl.util.decodeBase64(privateKey)
);
- return encodeUTF8(plaintext!);
+ return nacl.util.encodeUTF8(plaintext);
};
type EncryptSymmetricProps = {
diff --git a/frontend-v2/src/components/utilities/cryptography/issueBackupKey.ts b/frontend-next/src/components/utilities/cryptography/issueBackupKey.ts
similarity index 96%
rename from frontend-v2/src/components/utilities/cryptography/issueBackupKey.ts
rename to frontend-next/src/components/utilities/cryptography/issueBackupKey.ts
index 52a502e4ea..e65c537488 100644
--- a/frontend-v2/src/components/utilities/cryptography/issueBackupKey.ts
+++ b/frontend-next/src/components/utilities/cryptography/issueBackupKey.ts
@@ -73,7 +73,7 @@ const issueBackupKey = async ({
},
async () => {
clientKey.createVerifier(
- async (_err: any, result: { salt: string; verifier: string }) => {
+ async (err: any, result: { salt: string; verifier: string }) => {
const { ciphertext, iv, tag } = Aes256Gcm.encrypt({
text: String(localStorage.getItem("PRIVATE_KEY")),
secret: generatedKey
@@ -104,7 +104,7 @@ const issueBackupKey = async ({
);
}
);
- } catch {
+ } catch (error) {
setBackupKeyError(true);
console.log("Failed to issue a backup key");
}
diff --git a/frontend-v2/src/components/utilities/generateBackupPDF.ts b/frontend-next/src/components/utilities/generateBackupPDF.ts
similarity index 100%
rename from frontend-v2/src/components/utilities/generateBackupPDF.ts
rename to frontend-next/src/components/utilities/generateBackupPDF.ts
diff --git a/frontend/src/components/utilities/intercom/intercom.ts b/frontend-next/src/components/utilities/intercom/intercom.ts
similarity index 100%
rename from frontend/src/components/utilities/intercom/intercom.ts
rename to frontend-next/src/components/utilities/intercom/intercom.ts
diff --git a/frontend/src/components/utilities/intercom/intercomProvider.ts b/frontend-next/src/components/utilities/intercom/intercomProvider.ts
similarity index 100%
rename from frontend/src/components/utilities/intercom/intercomProvider.ts
rename to frontend-next/src/components/utilities/intercom/intercomProvider.ts
diff --git a/frontend-v2/src/components/utilities/isValidHexColor.ts b/frontend-next/src/components/utilities/isValidHexColor.ts
similarity index 100%
rename from frontend-v2/src/components/utilities/isValidHexColor.ts
rename to frontend-next/src/components/utilities/isValidHexColor.ts
diff --git a/frontend-v2/src/components/utilities/parseSecrets.ts b/frontend-next/src/components/utilities/parseSecrets.ts
similarity index 100%
rename from frontend-v2/src/components/utilities/parseSecrets.ts
rename to frontend-next/src/components/utilities/parseSecrets.ts
diff --git a/frontend-v2/src/components/utilities/randomId.ts b/frontend-next/src/components/utilities/randomId.ts
similarity index 100%
rename from frontend-v2/src/components/utilities/randomId.ts
rename to frontend-next/src/components/utilities/randomId.ts
diff --git a/frontend-v2/src/components/utilities/saveTokenToLocalStorage.ts b/frontend-next/src/components/utilities/saveTokenToLocalStorage.ts
similarity index 100%
rename from frontend-v2/src/components/utilities/saveTokenToLocalStorage.ts
rename to frontend-next/src/components/utilities/saveTokenToLocalStorage.ts
diff --git a/frontend/src/components/utilities/secrets/checkOverrides.ts b/frontend-next/src/components/utilities/secrets/checkOverrides.ts
similarity index 100%
rename from frontend/src/components/utilities/secrets/checkOverrides.ts
rename to frontend-next/src/components/utilities/secrets/checkOverrides.ts
diff --git a/frontend/src/components/utilities/secrets/downloadDotEnv.ts b/frontend-next/src/components/utilities/secrets/downloadDotEnv.ts
similarity index 100%
rename from frontend/src/components/utilities/secrets/downloadDotEnv.ts
rename to frontend-next/src/components/utilities/secrets/downloadDotEnv.ts
diff --git a/frontend/src/components/utilities/secrets/downloadYaml.ts b/frontend-next/src/components/utilities/secrets/downloadYaml.ts
similarity index 100%
rename from frontend/src/components/utilities/secrets/downloadYaml.ts
rename to frontend-next/src/components/utilities/secrets/downloadYaml.ts
diff --git a/frontend/src/components/utilities/secrets/encryptSecrets.ts b/frontend-next/src/components/utilities/secrets/encryptSecrets.ts
similarity index 100%
rename from frontend/src/components/utilities/secrets/encryptSecrets.ts
rename to frontend-next/src/components/utilities/secrets/encryptSecrets.ts
diff --git a/frontend-v2/src/components/utilities/telemetry/Telemetry.ts b/frontend-next/src/components/utilities/telemetry/Telemetry.ts
similarity index 100%
rename from frontend-v2/src/components/utilities/telemetry/Telemetry.ts
rename to frontend-next/src/components/utilities/telemetry/Telemetry.ts
diff --git a/frontend/src/components/v2/Accordion/Accordion.stories.tsx b/frontend-next/src/components/v2/Accordion/Accordion.stories.tsx
similarity index 100%
rename from frontend/src/components/v2/Accordion/Accordion.stories.tsx
rename to frontend-next/src/components/v2/Accordion/Accordion.stories.tsx
diff --git a/frontend-v2/src/components/v2/Accordion/Accordion.tsx b/frontend-next/src/components/v2/Accordion/Accordion.tsx
similarity index 88%
rename from frontend-v2/src/components/v2/Accordion/Accordion.tsx
rename to frontend-next/src/components/v2/Accordion/Accordion.tsx
index 203ca3b2cb..c37649393d 100644
--- a/frontend-v2/src/components/v2/Accordion/Accordion.tsx
+++ b/frontend-next/src/components/v2/Accordion/Accordion.tsx
@@ -27,7 +27,7 @@ export const AccordionTrigger = forwardRef<
(({ children, className, ...props }, forwardedRef) => (
-
));
diff --git a/frontend-v2/src/components/v2/Accordion/index.tsx b/frontend-next/src/components/v2/Accordion/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Accordion/index.tsx
rename to frontend-next/src/components/v2/Accordion/index.tsx
diff --git a/frontend/src/components/v2/Alert/Alert.stories.tsx b/frontend-next/src/components/v2/Alert/Alert.stories.tsx
similarity index 100%
rename from frontend/src/components/v2/Alert/Alert.stories.tsx
rename to frontend-next/src/components/v2/Alert/Alert.stories.tsx
diff --git a/frontend-v2/src/components/v2/Alert/Alert.tsx b/frontend-next/src/components/v2/Alert/Alert.tsx
similarity index 97%
rename from frontend-v2/src/components/v2/Alert/Alert.tsx
rename to frontend-next/src/components/v2/Alert/Alert.tsx
index 0f3a86f1f8..9b68f83bb4 100644
--- a/frontend-v2/src/components/v2/Alert/Alert.tsx
+++ b/frontend-next/src/components/v2/Alert/Alert.tsx
@@ -5,7 +5,7 @@ import {
faInfoCircle
} from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { cva, type VariantProps } from "cva";
+import { type VariantProps, cva } from "cva";
import { twMerge } from "tailwind-merge";
const alertVariants = cva(
diff --git a/frontend-v2/src/components/v2/Alert/index.tsx b/frontend-next/src/components/v2/Alert/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Alert/index.tsx
rename to frontend-next/src/components/v2/Alert/index.tsx
diff --git a/frontend-v2/src/components/v2/Badge/Badge.tsx b/frontend-next/src/components/v2/Badge/Badge.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Badge/Badge.tsx
rename to frontend-next/src/components/v2/Badge/Badge.tsx
diff --git a/frontend-v2/src/components/v2/Badge/index.tsx b/frontend-next/src/components/v2/Badge/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Badge/index.tsx
rename to frontend-next/src/components/v2/Badge/index.tsx
diff --git a/frontend/src/components/v2/Button/Button.stories.tsx b/frontend-next/src/components/v2/Button/Button.stories.tsx
similarity index 100%
rename from frontend/src/components/v2/Button/Button.stories.tsx
rename to frontend-next/src/components/v2/Button/Button.stories.tsx
diff --git a/frontend-v2/src/components/v2/Button/Button.tsx b/frontend-next/src/components/v2/Button/Button.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Button/Button.tsx
rename to frontend-next/src/components/v2/Button/Button.tsx
diff --git a/frontend-v2/src/components/v2/Button/index.tsx b/frontend-next/src/components/v2/Button/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Button/index.tsx
rename to frontend-next/src/components/v2/Button/index.tsx
diff --git a/frontend/src/components/v2/Card/Card.stories.tsx b/frontend-next/src/components/v2/Card/Card.stories.tsx
similarity index 100%
rename from frontend/src/components/v2/Card/Card.stories.tsx
rename to frontend-next/src/components/v2/Card/Card.stories.tsx
diff --git a/frontend-v2/src/components/v2/Card/Card.tsx b/frontend-next/src/components/v2/Card/Card.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Card/Card.tsx
rename to frontend-next/src/components/v2/Card/Card.tsx
diff --git a/frontend-v2/src/components/v2/Card/index.tsx b/frontend-next/src/components/v2/Card/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Card/index.tsx
rename to frontend-next/src/components/v2/Card/index.tsx
diff --git a/frontend/src/components/v2/Checkbox/Checkbox.stories.tsx b/frontend-next/src/components/v2/Checkbox/Checkbox.stories.tsx
similarity index 100%
rename from frontend/src/components/v2/Checkbox/Checkbox.stories.tsx
rename to frontend-next/src/components/v2/Checkbox/Checkbox.stories.tsx
diff --git a/frontend-v2/src/components/v2/Checkbox/Checkbox.tsx b/frontend-next/src/components/v2/Checkbox/Checkbox.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Checkbox/Checkbox.tsx
rename to frontend-next/src/components/v2/Checkbox/Checkbox.tsx
diff --git a/frontend-v2/src/components/v2/Checkbox/index.tsx b/frontend-next/src/components/v2/Checkbox/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Checkbox/index.tsx
rename to frontend-next/src/components/v2/Checkbox/index.tsx
diff --git a/frontend/src/components/v2/ComboBox/ComboBox.tsx b/frontend-next/src/components/v2/ComboBox/ComboBox.tsx
similarity index 100%
rename from frontend/src/components/v2/ComboBox/ComboBox.tsx
rename to frontend-next/src/components/v2/ComboBox/ComboBox.tsx
diff --git a/frontend/src/components/v2/ComboBox/index.tsx b/frontend-next/src/components/v2/ComboBox/index.tsx
similarity index 100%
rename from frontend/src/components/v2/ComboBox/index.tsx
rename to frontend-next/src/components/v2/ComboBox/index.tsx
diff --git a/frontend-v2/src/components/v2/ContentLoader/ContentLoader.tsx b/frontend-next/src/components/v2/ContentLoader/ContentLoader.tsx
similarity index 97%
rename from frontend-v2/src/components/v2/ContentLoader/ContentLoader.tsx
rename to frontend-next/src/components/v2/ContentLoader/ContentLoader.tsx
index 91937ff634..dd34e99416 100644
--- a/frontend-v2/src/components/v2/ContentLoader/ContentLoader.tsx
+++ b/frontend-next/src/components/v2/ContentLoader/ContentLoader.tsx
@@ -40,7 +40,7 @@ export const ContentLoader = ({ text, frequency = 2000, className }: Props) => {
loading="lazy"
/>
{text && isTextArray && (
-
+
({
control: ({ isFocused }) =>
twMerge(
isFocused ? "border-primary-400/50" : "border-mineshaft-600 hover:border-gray-400",
- "w-full rounded-md border bg-mineshaft-900 p-0.5 font-inter text-mineshaft-200 hover:cursor-pointer"
+ "border w-full p-0.5 rounded-md text-mineshaft-200 font-inter bg-mineshaft-900 hover:cursor-pointer"
),
placeholder: () => "text-mineshaft-400 text-sm pl-1 py-0.5",
input: () => "pl-1 py-0.5",
@@ -58,7 +58,7 @@ export const CreatableSelect = ({
twMerge(
isFocused && "bg-mineshaft-700 active:bg-mineshaft-600",
isSelected && "text-mineshaft-200",
- "px-3 py-2 text-xs hover:cursor-pointer"
+ "hover:cursor-pointer text-xs px-3 py-2"
),
noOptionsMessage: () => "text-mineshaft-400 p-2 rounded-md"
}}
diff --git a/frontend-v2/src/components/v2/CreatableSelect/index.tsx b/frontend-next/src/components/v2/CreatableSelect/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/CreatableSelect/index.tsx
rename to frontend-next/src/components/v2/CreatableSelect/index.tsx
diff --git a/frontend/src/components/v2/DatePicker/DatePicker.stories.tsx b/frontend-next/src/components/v2/DatePicker/DatePicker.stories.tsx
similarity index 100%
rename from frontend/src/components/v2/DatePicker/DatePicker.stories.tsx
rename to frontend-next/src/components/v2/DatePicker/DatePicker.stories.tsx
diff --git a/frontend-v2/src/components/v2/DatePicker/DatePicker.tsx b/frontend-next/src/components/v2/DatePicker/DatePicker.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/DatePicker/DatePicker.tsx
rename to frontend-next/src/components/v2/DatePicker/DatePicker.tsx
diff --git a/frontend-v2/src/components/v2/DatePicker/index.tsx b/frontend-next/src/components/v2/DatePicker/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/DatePicker/index.tsx
rename to frontend-next/src/components/v2/DatePicker/index.tsx
diff --git a/frontend-v2/src/components/v2/DeleteActionModal/DeleteActionModal.tsx b/frontend-next/src/components/v2/DeleteActionModal/DeleteActionModal.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/DeleteActionModal/DeleteActionModal.tsx
rename to frontend-next/src/components/v2/DeleteActionModal/DeleteActionModal.tsx
diff --git a/frontend-v2/src/components/v2/DeleteActionModal/index.tsx b/frontend-next/src/components/v2/DeleteActionModal/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/DeleteActionModal/index.tsx
rename to frontend-next/src/components/v2/DeleteActionModal/index.tsx
diff --git a/frontend-v2/src/components/v2/Divider/Divider.tsx b/frontend-next/src/components/v2/Divider/Divider.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Divider/Divider.tsx
rename to frontend-next/src/components/v2/Divider/Divider.tsx
diff --git a/frontend-v2/src/components/v2/Divider/index.tsx b/frontend-next/src/components/v2/Divider/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Divider/index.tsx
rename to frontend-next/src/components/v2/Divider/index.tsx
diff --git a/frontend/src/components/v2/Drawer/Drawer.stories.tsx b/frontend-next/src/components/v2/Drawer/Drawer.stories.tsx
similarity index 100%
rename from frontend/src/components/v2/Drawer/Drawer.stories.tsx
rename to frontend-next/src/components/v2/Drawer/Drawer.stories.tsx
diff --git a/frontend-v2/src/components/v2/Drawer/Drawer.tsx b/frontend-next/src/components/v2/Drawer/Drawer.tsx
similarity index 97%
rename from frontend-v2/src/components/v2/Drawer/Drawer.tsx
rename to frontend-next/src/components/v2/Drawer/Drawer.tsx
index e74995333e..027946a2ec 100644
--- a/frontend-v2/src/components/v2/Drawer/Drawer.tsx
+++ b/frontend-next/src/components/v2/Drawer/Drawer.tsx
@@ -59,7 +59,7 @@ export const DrawerContent = forwardRef(
diff --git a/frontend-v2/src/components/v2/Drawer/index.tsx b/frontend-next/src/components/v2/Drawer/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Drawer/index.tsx
rename to frontend-next/src/components/v2/Drawer/index.tsx
diff --git a/frontend/src/components/v2/Dropdown/Dropdown.stories.tsx b/frontend-next/src/components/v2/Dropdown/Dropdown.stories.tsx
similarity index 100%
rename from frontend/src/components/v2/Dropdown/Dropdown.stories.tsx
rename to frontend-next/src/components/v2/Dropdown/Dropdown.stories.tsx
diff --git a/frontend-v2/src/components/v2/Dropdown/Dropdown.tsx b/frontend-next/src/components/v2/Dropdown/Dropdown.tsx
similarity index 88%
rename from frontend-v2/src/components/v2/Dropdown/Dropdown.tsx
rename to frontend-next/src/components/v2/Dropdown/Dropdown.tsx
index 4eb66670b0..a2d5f0322f 100644
--- a/frontend-v2/src/components/v2/Dropdown/Dropdown.tsx
+++ b/frontend-next/src/components/v2/Dropdown/Dropdown.tsx
@@ -14,7 +14,7 @@ export type DropdownMenuTriggerProps = DropdownMenuPrimitive.DropdownMenuTrigger
export const DropdownMenuTrigger = DropdownMenuPrimitive.Trigger;
// item container
-export type DropdownMenuContentProps = DropdownMenuPrimitive.DropdownMenuContentProps;
+export type DropdownMenuContentProps = DropdownMenuPrimitive.MenuContentProps;
export const DropdownMenuContent = forwardRef(
({ children, className, ...props }, forwardedRef) => {
return (
@@ -24,7 +24,7 @@ export const DropdownMenuContent = forwardRef
@@ -38,7 +38,7 @@ export const DropdownMenuContent = forwardRef(
({ children, className, ...props }, forwardedRef) => {
return (
@@ -48,7 +48,7 @@ export const DropdownSubMenuContent = forwardRef
@@ -62,17 +62,17 @@ export const DropdownSubMenuContent = forwardRef (
=
- DropdownMenuPrimitive.DropdownMenuContentProps & {
+ DropdownMenuPrimitive.MenuContentProps & {
icon?: ReactNode;
as?: T;
inputRef?: Ref;
diff --git a/frontend-v2/src/components/v2/Dropdown/index.tsx b/frontend-next/src/components/v2/Dropdown/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Dropdown/index.tsx
rename to frontend-next/src/components/v2/Dropdown/index.tsx
diff --git a/frontend-v2/src/components/v2/EmailServiceSetupModal/EmailServiceSetupModal.tsx b/frontend-next/src/components/v2/EmailServiceSetupModal/EmailServiceSetupModal.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/EmailServiceSetupModal/EmailServiceSetupModal.tsx
rename to frontend-next/src/components/v2/EmailServiceSetupModal/EmailServiceSetupModal.tsx
diff --git a/frontend-v2/src/components/v2/EmailServiceSetupModal/index.tsx b/frontend-next/src/components/v2/EmailServiceSetupModal/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/EmailServiceSetupModal/index.tsx
rename to frontend-next/src/components/v2/EmailServiceSetupModal/index.tsx
diff --git a/frontend/src/components/v2/EmptyState/EmptyState.stories.tsx b/frontend-next/src/components/v2/EmptyState/EmptyState.stories.tsx
similarity index 100%
rename from frontend/src/components/v2/EmptyState/EmptyState.stories.tsx
rename to frontend-next/src/components/v2/EmptyState/EmptyState.stories.tsx
diff --git a/frontend-v2/src/components/v2/EmptyState/EmptyState.tsx b/frontend-next/src/components/v2/EmptyState/EmptyState.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/EmptyState/EmptyState.tsx
rename to frontend-next/src/components/v2/EmptyState/EmptyState.tsx
diff --git a/frontend-v2/src/components/v2/EmptyState/index.tsx b/frontend-next/src/components/v2/EmptyState/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/EmptyState/index.tsx
rename to frontend-next/src/components/v2/EmptyState/index.tsx
diff --git a/frontend-v2/src/components/v2/FilterableSelect/FilterableSelect.tsx b/frontend-next/src/components/v2/FilterableSelect/FilterableSelect.tsx
similarity index 88%
rename from frontend-v2/src/components/v2/FilterableSelect/FilterableSelect.tsx
rename to frontend-next/src/components/v2/FilterableSelect/FilterableSelect.tsx
index 7bf546b134..dd8ba330dc 100644
--- a/frontend-v2/src/components/v2/FilterableSelect/FilterableSelect.tsx
+++ b/frontend-next/src/components/v2/FilterableSelect/FilterableSelect.tsx
@@ -41,12 +41,12 @@ export const FilterableSelect = ({
}}
classNames={{
container: ({ isDisabled }) =>
- twMerge("w-full font-inter text-sm", isDisabled && "!pointer-events-auto opacity-50"),
+ twMerge("w-full text-sm font-inter", isDisabled && "!pointer-events-auto opacity-50"),
control: ({ isFocused, isDisabled }) =>
twMerge(
- isFocused ? "border-primary-400/50" : "border-mineshaft-600",
- `w-full rounded-md border bg-mineshaft-900 p-0.5 font-inter text-mineshaft-200 ${
- isDisabled ? "!cursor-not-allowed" : "hover:cursor-pointer hover:border-gray-400"
+ isFocused ? "border-primary-400/50" : "border-mineshaft-600 ",
+ `border w-full p-0.5 rounded-md text-mineshaft-200 font-inter bg-mineshaft-900 ${
+ isDisabled ? "!cursor-not-allowed" : "hover:border-gray-400 hover:cursor-pointer"
} `
),
placeholder: () =>
@@ -72,7 +72,7 @@ export const FilterableSelect = ({
twMerge(
isFocused && "bg-mineshaft-700 active:bg-mineshaft-600",
isSelected && "text-mineshaft-200",
- "rounded px-3 py-2 text-xs hover:cursor-pointer"
+ "hover:cursor-pointer rounded text-xs px-3 py-2"
),
noOptionsMessage: () => "text-mineshaft-400 p-2 rounded-md"
}}
diff --git a/frontend-v2/src/components/v2/FilterableSelect/index.tsx b/frontend-next/src/components/v2/FilterableSelect/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/FilterableSelect/index.tsx
rename to frontend-next/src/components/v2/FilterableSelect/index.tsx
diff --git a/frontend-v2/src/components/v2/FontAwesomeSymbol/FontAwesomeSymbol.tsx b/frontend-next/src/components/v2/FontAwesomeSymbol/FontAwesomeSymbol.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/FontAwesomeSymbol/FontAwesomeSymbol.tsx
rename to frontend-next/src/components/v2/FontAwesomeSymbol/FontAwesomeSymbol.tsx
diff --git a/frontend-v2/src/components/v2/FontAwesomeSymbol/index.tsx b/frontend-next/src/components/v2/FontAwesomeSymbol/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/FontAwesomeSymbol/index.tsx
rename to frontend-next/src/components/v2/FontAwesomeSymbol/index.tsx
diff --git a/frontend/src/components/v2/FormControl/FormControl.stories.tsx b/frontend-next/src/components/v2/FormControl/FormControl.stories.tsx
similarity index 100%
rename from frontend/src/components/v2/FormControl/FormControl.stories.tsx
rename to frontend-next/src/components/v2/FormControl/FormControl.stories.tsx
diff --git a/frontend-v2/src/components/v2/FormControl/FormControl.tsx b/frontend-next/src/components/v2/FormControl/FormControl.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/FormControl/FormControl.tsx
rename to frontend-next/src/components/v2/FormControl/FormControl.tsx
diff --git a/frontend-v2/src/components/v2/FormControl/index.tsx b/frontend-next/src/components/v2/FormControl/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/FormControl/index.tsx
rename to frontend-next/src/components/v2/FormControl/index.tsx
diff --git a/frontend-v2/src/components/v2/HoverCard/HoverCard.tsx b/frontend-next/src/components/v2/HoverCard/HoverCard.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/HoverCard/HoverCard.tsx
rename to frontend-next/src/components/v2/HoverCard/HoverCard.tsx
diff --git a/frontend-v2/src/components/v2/HoverCard/index.tsx b/frontend-next/src/components/v2/HoverCard/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/HoverCard/index.tsx
rename to frontend-next/src/components/v2/HoverCard/index.tsx
diff --git a/frontend/src/components/v2/HoverCardv2/HoverCardv2.stories.tsx b/frontend-next/src/components/v2/HoverCardv2/HoverCardv2.stories.tsx
similarity index 100%
rename from frontend/src/components/v2/HoverCardv2/HoverCardv2.stories.tsx
rename to frontend-next/src/components/v2/HoverCardv2/HoverCardv2.stories.tsx
diff --git a/frontend-v2/src/components/v2/HoverCardv2/HoverCardv2.tsx b/frontend-next/src/components/v2/HoverCardv2/HoverCardv2.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/HoverCardv2/HoverCardv2.tsx
rename to frontend-next/src/components/v2/HoverCardv2/HoverCardv2.tsx
diff --git a/frontend-v2/src/components/v2/HoverCardv2/index.tsx b/frontend-next/src/components/v2/HoverCardv2/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/HoverCardv2/index.tsx
rename to frontend-next/src/components/v2/HoverCardv2/index.tsx
diff --git a/frontend/src/components/v2/IconButton/IconButton.stories.tsx b/frontend-next/src/components/v2/IconButton/IconButton.stories.tsx
similarity index 100%
rename from frontend/src/components/v2/IconButton/IconButton.stories.tsx
rename to frontend-next/src/components/v2/IconButton/IconButton.stories.tsx
diff --git a/frontend-v2/src/components/v2/IconButton/IconButton.tsx b/frontend-next/src/components/v2/IconButton/IconButton.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/IconButton/IconButton.tsx
rename to frontend-next/src/components/v2/IconButton/IconButton.tsx
diff --git a/frontend-v2/src/components/v2/IconButton/index.tsx b/frontend-next/src/components/v2/IconButton/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/IconButton/index.tsx
rename to frontend-next/src/components/v2/IconButton/index.tsx
diff --git a/frontend-v2/src/components/v2/InfisicalSecretInput/InfisicalSecretInput.tsx b/frontend-next/src/components/v2/InfisicalSecretInput/InfisicalSecretInput.tsx
similarity index 99%
rename from frontend-v2/src/components/v2/InfisicalSecretInput/InfisicalSecretInput.tsx
rename to frontend-next/src/components/v2/InfisicalSecretInput/InfisicalSecretInput.tsx
index 6fbe962389..45b45b01a2 100644
--- a/frontend-v2/src/components/v2/InfisicalSecretInput/InfisicalSecretInput.tsx
+++ b/frontend-next/src/components/v2/InfisicalSecretInput/InfisicalSecretInput.tsx
@@ -294,7 +294,7 @@ export const InfisicalSecretInput = forwardRef(
}}
>
{children}
+ {children}
{suggestions.map((item, i) => {
diff --git a/frontend-v2/src/components/v2/InfisicalSecretInput/index.tsx b/frontend-next/src/components/v2/InfisicalSecretInput/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/InfisicalSecretInput/index.tsx
rename to frontend-next/src/components/v2/InfisicalSecretInput/index.tsx
diff --git a/frontend/src/components/v2/Input/Input.stories.tsx b/frontend-next/src/components/v2/Input/Input.stories.tsx
similarity index 100%
rename from frontend/src/components/v2/Input/Input.stories.tsx
rename to frontend-next/src/components/v2/Input/Input.stories.tsx
diff --git a/frontend-v2/src/components/v2/Input/Input.tsx b/frontend-next/src/components/v2/Input/Input.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Input/Input.tsx
rename to frontend-next/src/components/v2/Input/Input.tsx
diff --git a/frontend-v2/src/components/v2/Input/index.tsx b/frontend-next/src/components/v2/Input/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Input/index.tsx
rename to frontend-next/src/components/v2/Input/index.tsx
diff --git a/frontend-v2/src/components/v2/LeaveProjectModal/LeaveProjectModal.tsx b/frontend-next/src/components/v2/LeaveProjectModal/LeaveProjectModal.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/LeaveProjectModal/LeaveProjectModal.tsx
rename to frontend-next/src/components/v2/LeaveProjectModal/LeaveProjectModal.tsx
diff --git a/frontend-v2/src/components/v2/LeaveProjectModal/index.tsx b/frontend-next/src/components/v2/LeaveProjectModal/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/LeaveProjectModal/index.tsx
rename to frontend-next/src/components/v2/LeaveProjectModal/index.tsx
diff --git a/frontend/src/components/v2/Menu/Menu.stories.tsx b/frontend-next/src/components/v2/Menu/Menu.stories.tsx
similarity index 100%
rename from frontend/src/components/v2/Menu/Menu.stories.tsx
rename to frontend-next/src/components/v2/Menu/Menu.stories.tsx
diff --git a/frontend-v2/src/components/v2/Menu/Menu.tsx b/frontend-next/src/components/v2/Menu/Menu.tsx
similarity index 51%
rename from frontend-v2/src/components/v2/Menu/Menu.tsx
rename to frontend-next/src/components/v2/Menu/Menu.tsx
index f33f6c21bd..0555ef826b 100644
--- a/frontend-v2/src/components/v2/Menu/Menu.tsx
+++ b/frontend-next/src/components/v2/Menu/Menu.tsx
@@ -1,6 +1,10 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
+/* eslint-disable import/no-extraneous-dependencies */
+/* eslint-disable global-require */
import { ComponentPropsWithRef, ElementType, ReactNode, Ref, useRef } from "react";
-import { DotLottie, DotLottieReact } from "@lottiefiles/dotlottie-react";
import { motion } from "framer-motion";
+import Lottie from "lottie-react";
import { twMerge } from "tailwind-merge";
export type MenuProps = {
@@ -36,7 +40,8 @@ export const MenuItem = ({
inputRef,
...props
}: MenuItemProps & ComponentPropsWithRef): JSX.Element => {
- const iconRef = useRef(null);
+ const iconRef = useRef();
+
return (
iconRef.current?.play()} onMouseLeave={() => iconRef.current?.stop()}>
({
isSelected ? "visisble" : "invisible"
} absolute -left-[0.28rem] h-5 w-[0.07rem] rounded-md bg-primary`}
/>
+ {/* {icon && {icon}} */}
{icon && (
- ({
);
};
+export const SubMenuItem = ({
+ children,
+ icon,
+ className,
+ isDisabled,
+ isSelected,
+ as: Item = "button",
+ description,
+ // wrapping in forward ref with generic component causes the loss of ts definitions on props
+ inputRef,
+ ...props
+}: MenuItemProps & ComponentPropsWithRef): JSX.Element => {
+ const iconRef = useRef();
+
+ return (
+ iconRef.current?.play()} onMouseLeave={() => iconRef.current?.stop()}>
+
+
+ -
+
+ {description && {description}}
+
+
+
+ );
+};
+
MenuItem.displayName = "MenuItem";
export type MenuGroupProps = {
diff --git a/frontend-v2/src/components/v2/Menu/index.tsx b/frontend-next/src/components/v2/Menu/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Menu/index.tsx
rename to frontend-next/src/components/v2/Menu/index.tsx
diff --git a/frontend/src/components/v2/Modal/Modal.stories.tsx b/frontend-next/src/components/v2/Modal/Modal.stories.tsx
similarity index 100%
rename from frontend/src/components/v2/Modal/Modal.stories.tsx
rename to frontend-next/src/components/v2/Modal/Modal.stories.tsx
diff --git a/frontend-v2/src/components/v2/Modal/Modal.tsx b/frontend-next/src/components/v2/Modal/Modal.tsx
similarity index 91%
rename from frontend-v2/src/components/v2/Modal/Modal.tsx
rename to frontend-next/src/components/v2/Modal/Modal.tsx
index 2ef6b81f7c..2e216ba08b 100644
--- a/frontend-v2/src/components/v2/Modal/Modal.tsx
+++ b/frontend-next/src/components/v2/Modal/Modal.tsx
@@ -40,7 +40,7 @@ export const ModalContent = forwardRef(
(
@@ -72,7 +72,7 @@ ModalContent.displayName = "ModalContent";
export type ModalProps = Omit & { isOpen?: boolean };
export const Modal = ({ isOpen, ...props }: ModalProps) => (
-
diff --git a/frontend-v2/src/components/v2/Popoverv2/index.tsx b/frontend-next/src/components/v2/Popoverv2/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Popoverv2/index.tsx
rename to frontend-next/src/components/v2/Popoverv2/index.tsx
diff --git a/frontend-v2/src/components/v2/RadioGroup/RadioGroup.tsx b/frontend-next/src/components/v2/RadioGroup/RadioGroup.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/RadioGroup/RadioGroup.tsx
rename to frontend-next/src/components/v2/RadioGroup/RadioGroup.tsx
diff --git a/frontend-v2/src/components/v2/RadioGroup/index.tsx b/frontend-next/src/components/v2/RadioGroup/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/RadioGroup/index.tsx
rename to frontend-next/src/components/v2/RadioGroup/index.tsx
diff --git a/frontend-v2/src/components/v2/SecretInput/SecretInput.tsx b/frontend-next/src/components/v2/SecretInput/SecretInput.tsx
similarity index 96%
rename from frontend-v2/src/components/v2/SecretInput/SecretInput.tsx
rename to frontend-next/src/components/v2/SecretInput/SecretInput.tsx
index 96f79e65f7..6818b0c37b 100644
--- a/frontend-v2/src/components/v2/SecretInput/SecretInput.tsx
+++ b/frontend-next/src/components/v2/SecretInput/SecretInput.tsx
@@ -78,8 +78,8 @@ export const SecretInput = forwardRef(
style={{ maxHeight: `${21 * 7}px` }}
>
- {
- iconRef.current = el;
- }}
- src={`/lotties/${icon}.json`}
- loop
- className="h-full w-full"
- />
-
+
+
+);
diff --git a/frontend-v2/src/components/v2/NoticeBanner/index.tsx b/frontend-next/src/components/v2/NoticeBanner/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/NoticeBanner/index.tsx
rename to frontend-next/src/components/v2/NoticeBanner/index.tsx
diff --git a/frontend/src/components/v2/Pagination/Pagination.stories.tsx b/frontend-next/src/components/v2/Pagination/Pagination.stories.tsx
similarity index 100%
rename from frontend/src/components/v2/Pagination/Pagination.stories.tsx
rename to frontend-next/src/components/v2/Pagination/Pagination.stories.tsx
diff --git a/frontend-v2/src/components/v2/Pagination/Pagination.tsx b/frontend-next/src/components/v2/Pagination/Pagination.tsx
similarity index 98%
rename from frontend-v2/src/components/v2/Pagination/Pagination.tsx
rename to frontend-next/src/components/v2/Pagination/Pagination.tsx
index 417e450bd3..2d0e8b1a9f 100644
--- a/frontend-v2/src/components/v2/Pagination/Pagination.tsx
+++ b/frontend-next/src/components/v2/Pagination/Pagination.tsx
@@ -49,7 +49,7 @@ export const Pagination = ({
return (
+
+ {title}
+ {children}
+
diff --git a/frontend-v2/src/components/v2/Pagination/index.tsx b/frontend-next/src/components/v2/Pagination/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Pagination/index.tsx
rename to frontend-next/src/components/v2/Pagination/index.tsx
diff --git a/frontend-v2/src/components/v2/Popover/Popover.tsx b/frontend-next/src/components/v2/Popover/Popover.tsx
similarity index 84%
rename from frontend-v2/src/components/v2/Popover/Popover.tsx
rename to frontend-next/src/components/v2/Popover/Popover.tsx
index 79fe0987c8..04c5d688ba 100644
--- a/frontend-v2/src/components/v2/Popover/Popover.tsx
+++ b/frontend-next/src/components/v2/Popover/Popover.tsx
@@ -21,7 +21,7 @@ export const PopoverObject = ({ children, text, onChangeHandler, id }: Props) =>
onChange={(e) => onChangeHandler(e.target.value, id)}
// type={type}
value={text}
- className="ph-no-capture placeholder peer z-10 h-[20rem] w-full rounded-md border border-mineshaft-500 bg-bunker-600 px-2 py-2.5 text-sm text-bunker-300 caret-bunker-200 outline-none duration-200 placeholder:text-bunker-400 focus:text-bunker-100 placeholder:focus:text-transparent dark:[color-scheme:dark]"
+ className="ph-no-capture placeholder peer z-10 h-[20rem] w-full rounded-md border border-mineshaft-500 bg-bunker-600 py-2.5 px-2 text-sm text-bunker-300 caret-bunker-200 outline-none duration-200 placeholder:text-bunker-400 focus:text-bunker-100 placeholder:focus:text-transparent dark:[color-scheme:dark]"
spellCheck="false"
placeholder="–"
/>
-
-
+
+
{syntaxHighlight(value, isVisible || isSecretFocused, isImport)}
diff --git a/frontend-v2/src/components/v2/SecretInput/index.tsx b/frontend-next/src/components/v2/SecretInput/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/SecretInput/index.tsx
rename to frontend-next/src/components/v2/SecretInput/index.tsx
diff --git a/frontend-v2/src/components/v2/SecretPathInput/SecretPathInput.tsx b/frontend-next/src/components/v2/SecretPathInput/SecretPathInput.tsx
similarity index 98%
rename from frontend-v2/src/components/v2/SecretPathInput/SecretPathInput.tsx
rename to frontend-next/src/components/v2/SecretPathInput/SecretPathInput.tsx
index c28b179272..bbe63bc6e0 100644
--- a/frontend-v2/src/components/v2/SecretPathInput/SecretPathInput.tsx
+++ b/frontend-next/src/components/v2/SecretPathInput/SecretPathInput.tsx
@@ -39,7 +39,7 @@ export const SecretPathInput = ({
const workspaceId = currentWorkspace?.id || "";
const { folderNames: folders } = useGetFoldersByEnv({
path: secretPath,
- environments: [environment || currentWorkspace?.environments?.[0].slug || ""],
+ environments: [environment || currentWorkspace?.environments?.[0].slug!],
projectId: workspaceId
});
@@ -141,7 +141,7 @@ export const SecretPathInput = ({
maxHeight: "var(--radix-select-content-available-height)"
}}
>
-
+
{suggestions.map((suggestion, i) => (
(
(
(
onSelect={() => onClear()}
onClick={() => onClear()}
className={twMerge(
- "relative mb-0.5 flex cursor-pointer select-none items-center rounded-md py-2 pl-10 pr-4 text-sm outline-none transition-all hover:bg-mineshaft-500 data-[highlighted]:bg-mineshaft-700/80",
+ `relative mb-0.5 flex
+ cursor-pointer select-none items-center rounded-md py-2 pl-10 pr-4 text-sm
+ outline-none transition-all hover:bg-mineshaft-500 data-[highlighted]:bg-mineshaft-700/80`,
isSelected && "bg-primary",
isDisabled &&
"cursor-not-allowed text-gray-600 hover:bg-transparent hover:text-mineshaft-600",
diff --git a/frontend-v2/src/components/v2/Select/components/index.tsx b/frontend-next/src/components/v2/Select/components/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Select/components/index.tsx
rename to frontend-next/src/components/v2/Select/components/index.tsx
diff --git a/frontend-v2/src/components/v2/Select/index.tsx b/frontend-next/src/components/v2/Select/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Select/index.tsx
rename to frontend-next/src/components/v2/Select/index.tsx
diff --git a/frontend/src/components/v2/Skeleton/Skeleton.stories.tsx b/frontend-next/src/components/v2/Skeleton/Skeleton.stories.tsx
similarity index 100%
rename from frontend/src/components/v2/Skeleton/Skeleton.stories.tsx
rename to frontend-next/src/components/v2/Skeleton/Skeleton.stories.tsx
diff --git a/frontend-v2/src/components/v2/Skeleton/Skeleton.tsx b/frontend-next/src/components/v2/Skeleton/Skeleton.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Skeleton/Skeleton.tsx
rename to frontend-next/src/components/v2/Skeleton/Skeleton.tsx
diff --git a/frontend-v2/src/components/v2/Skeleton/index.tsx b/frontend-next/src/components/v2/Skeleton/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Skeleton/index.tsx
rename to frontend-next/src/components/v2/Skeleton/index.tsx
diff --git a/frontend-v2/src/components/v2/Spinner/Spinner.tsx b/frontend-next/src/components/v2/Spinner/Spinner.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Spinner/Spinner.tsx
rename to frontend-next/src/components/v2/Spinner/Spinner.tsx
diff --git a/frontend-v2/src/components/v2/Spinner/index.tsx b/frontend-next/src/components/v2/Spinner/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Spinner/index.tsx
rename to frontend-next/src/components/v2/Spinner/index.tsx
diff --git a/frontend-v2/src/components/v2/Stepper/Stepper.tsx b/frontend-next/src/components/v2/Stepper/Stepper.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Stepper/Stepper.tsx
rename to frontend-next/src/components/v2/Stepper/Stepper.tsx
diff --git a/frontend-v2/src/components/v2/Stepper/index.tsx b/frontend-next/src/components/v2/Stepper/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Stepper/index.tsx
rename to frontend-next/src/components/v2/Stepper/index.tsx
diff --git a/frontend/src/components/v2/Switch/Switch.stories.tsx b/frontend-next/src/components/v2/Switch/Switch.stories.tsx
similarity index 100%
rename from frontend/src/components/v2/Switch/Switch.stories.tsx
rename to frontend-next/src/components/v2/Switch/Switch.stories.tsx
diff --git a/frontend-v2/src/components/v2/Switch/Switch.tsx b/frontend-next/src/components/v2/Switch/Switch.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Switch/Switch.tsx
rename to frontend-next/src/components/v2/Switch/Switch.tsx
diff --git a/frontend-v2/src/components/v2/Switch/index.tsx b/frontend-next/src/components/v2/Switch/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Switch/index.tsx
rename to frontend-next/src/components/v2/Switch/index.tsx
diff --git a/frontend/src/components/v2/Table/Table.stories.tsx b/frontend-next/src/components/v2/Table/Table.stories.tsx
similarity index 100%
rename from frontend/src/components/v2/Table/Table.stories.tsx
rename to frontend-next/src/components/v2/Table/Table.stories.tsx
diff --git a/frontend-v2/src/components/v2/Table/Table.tsx b/frontend-next/src/components/v2/Table/Table.tsx
similarity index 97%
rename from frontend-v2/src/components/v2/Table/Table.tsx
rename to frontend-next/src/components/v2/Table/Table.tsx
index 1d5a9c394d..065efab1ef 100644
--- a/frontend-v2/src/components/v2/Table/Table.tsx
+++ b/frontend-next/src/components/v2/Table/Table.tsx
@@ -101,7 +101,7 @@ export type ThProps = {
export const Th = ({ children, className }: ThProps): JSX.Element => (
diff --git a/frontend-v2/src/components/v2/Table/index.tsx b/frontend-next/src/components/v2/Table/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Table/index.tsx
rename to frontend-next/src/components/v2/Table/index.tsx
diff --git a/frontend-v2/src/components/v2/Tabs/Tabs.tsx b/frontend-next/src/components/v2/Tabs/Tabs.tsx
similarity index 94%
rename from frontend-v2/src/components/v2/Tabs/Tabs.tsx
rename to frontend-next/src/components/v2/Tabs/Tabs.tsx
index a4e897a422..ca5c22dcb4 100644
--- a/frontend-v2/src/components/v2/Tabs/Tabs.tsx
+++ b/frontend-next/src/components/v2/Tabs/Tabs.tsx
@@ -13,7 +13,7 @@ export type TabListProps = TabsPrimitive.TabsListProps;
export const TabList = ({ className, children, ...props }: TabListProps) => (
{children}
diff --git a/frontend-v2/src/components/v2/Tabs/index.tsx b/frontend-next/src/components/v2/Tabs/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Tabs/index.tsx
rename to frontend-next/src/components/v2/Tabs/index.tsx
diff --git a/frontend-v2/src/components/v2/Tag/Tag.tsx b/frontend-next/src/components/v2/Tag/Tag.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Tag/Tag.tsx
rename to frontend-next/src/components/v2/Tag/Tag.tsx
diff --git a/frontend-v2/src/components/v2/Tag/index.tsx b/frontend-next/src/components/v2/Tag/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Tag/index.tsx
rename to frontend-next/src/components/v2/Tag/index.tsx
diff --git a/frontend/src/components/v2/TextArea/TextArea.stories.tsx b/frontend-next/src/components/v2/TextArea/TextArea.stories.tsx
similarity index 100%
rename from frontend/src/components/v2/TextArea/TextArea.stories.tsx
rename to frontend-next/src/components/v2/TextArea/TextArea.stories.tsx
diff --git a/frontend-v2/src/components/v2/TextArea/TextArea.tsx b/frontend-next/src/components/v2/TextArea/TextArea.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/TextArea/TextArea.tsx
rename to frontend-next/src/components/v2/TextArea/TextArea.tsx
diff --git a/frontend-v2/src/components/v2/TextArea/index.tsx b/frontend-next/src/components/v2/TextArea/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/TextArea/index.tsx
rename to frontend-next/src/components/v2/TextArea/index.tsx
diff --git a/frontend/src/components/v2/Tooltip/Tooltip.stories.tsx b/frontend-next/src/components/v2/Tooltip/Tooltip.stories.tsx
similarity index 100%
rename from frontend/src/components/v2/Tooltip/Tooltip.stories.tsx
rename to frontend-next/src/components/v2/Tooltip/Tooltip.stories.tsx
diff --git a/frontend-v2/src/components/v2/Tooltip/Tooltip.tsx b/frontend-next/src/components/v2/Tooltip/Tooltip.tsx
similarity index 74%
rename from frontend-v2/src/components/v2/Tooltip/Tooltip.tsx
rename to frontend-next/src/components/v2/Tooltip/Tooltip.tsx
index 3c9dcf1cb2..abfebc5b49 100644
--- a/frontend-v2/src/components/v2/Tooltip/Tooltip.tsx
+++ b/frontend-next/src/components/v2/Tooltip/Tooltip.tsx
@@ -45,11 +45,16 @@ export const Tooltip = ({
sideOffset={5}
{...props}
className={twMerge(
- "z-50 max-w-[15rem] select-none border border-mineshaft-600 bg-mineshaft-800 font-light text-bunker-200 shadow-md data-[state=delayed-open]:data-[side=bottom]:animate-slideUpAndFade data-[state=delayed-open]:data-[side=left]:animate-slideRightAndFade data-[state=delayed-open]:data-[side=right]:animate-slideLeftAndFade data-[state=delayed-open]:data-[side=top]:animate-slideDownAndFade",
+ `z-50 max-w-[15rem] select-none border border-mineshaft-600 bg-mineshaft-800 font-light text-bunker-200 shadow-md
+ data-[state=delayed-open]:data-[side=top]:animate-slideDownAndFade
+ data-[state=delayed-open]:data-[side=right]:animate-slideLeftAndFade
+ data-[state=delayed-open]:data-[side=left]:animate-slideRightAndFade
+ data-[state=delayed-open]:data-[side=bottom]:animate-slideUpAndFade
+ `,
isDisabled && "!hidden",
center && "text-center",
- size === "sm" && "rounded-sm px-2 py-1 text-xs",
- size === "md" && "rounded-md px-4 py-2 text-sm",
+ size === "sm" && "rounded-sm py-1 px-2 text-xs",
+ size === "md" && "rounded-md py-2 px-4 text-sm",
className
)}
>
diff --git a/frontend-v2/src/components/v2/Tooltip/index.tsx b/frontend-next/src/components/v2/Tooltip/index.tsx
similarity index 100%
rename from frontend-v2/src/components/v2/Tooltip/index.tsx
rename to frontend-next/src/components/v2/Tooltip/index.tsx
diff --git a/frontend/src/components/v2/UpgradePlanModal/UpgradePlanModal.tsx b/frontend-next/src/components/v2/UpgradePlanModal/UpgradePlanModal.tsx
similarity index 100%
rename from frontend/src/components/v2/UpgradePlanModal/UpgradePlanModal.tsx
rename to frontend-next/src/components/v2/UpgradePlanModal/UpgradePlanModal.tsx
diff --git a/frontend-v2/src/components/license/UpgradePlanModal/index.tsx b/frontend-next/src/components/v2/UpgradePlanModal/index.tsx
similarity index 100%
rename from frontend-v2/src/components/license/UpgradePlanModal/index.tsx
rename to frontend-next/src/components/v2/UpgradePlanModal/index.tsx
diff --git a/frontend-v2/src/components/v2/index.tsx b/frontend-next/src/components/v2/index.tsx
similarity index 94%
rename from frontend-v2/src/components/v2/index.tsx
rename to frontend-next/src/components/v2/index.tsx
index 8e195102b3..725a27ed33 100644
--- a/frontend-v2/src/components/v2/index.tsx
+++ b/frontend-next/src/components/v2/index.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react-refresh/only-export-components */
export * from "./Accordion";
export * from "./Alert";
export * from "./Badge";
@@ -34,3 +33,4 @@ export * from "./Tabs";
export * from "./Tag";
export * from "./TextArea";
export * from "./Tooltip";
+export * from "./UpgradePlanModal";
diff --git a/frontend/src/components/v2/projects/NewProjectModal.tsx b/frontend-next/src/components/v2/projects/NewProjectModal.tsx
similarity index 100%
rename from frontend/src/components/v2/projects/NewProjectModal.tsx
rename to frontend-next/src/components/v2/projects/NewProjectModal.tsx
diff --git a/frontend-v2/src/components/projects/index.tsx b/frontend-next/src/components/v2/projects/index.tsx
similarity index 100%
rename from frontend-v2/src/components/projects/index.tsx
rename to frontend-next/src/components/v2/projects/index.tsx
diff --git a/frontend-v2/src/config/request.ts b/frontend-next/src/config/request.ts
similarity index 97%
rename from frontend-v2/src/config/request.ts
rename to frontend-next/src/config/request.ts
index 9a06296196..b29f19f5e7 100644
--- a/frontend-v2/src/config/request.ts
+++ b/frontend-next/src/config/request.ts
@@ -1,7 +1,7 @@
import axios from "axios";
import SecurityClient from "@app/components/utilities/SecurityClient";
-import { getAuthToken, getMfaTempToken, getSignupTempToken } from "@app/hooks/api/reactQuery";
+import { getAuthToken, getMfaTempToken, getSignupTempToken } from "@app/reactQuery";
export const apiRequest = axios.create({
baseURL: "/",
diff --git a/frontend-v2/src/const.ts b/frontend-next/src/const.ts
similarity index 100%
rename from frontend-v2/src/const.ts
rename to frontend-next/src/const.ts
diff --git a/frontend/src/context/AuthContext/AuthContext.tsx b/frontend-next/src/context/AuthContext/AuthContext.tsx
similarity index 100%
rename from frontend/src/context/AuthContext/AuthContext.tsx
rename to frontend-next/src/context/AuthContext/AuthContext.tsx
diff --git a/frontend/src/context/AuthContext/index.tsx b/frontend-next/src/context/AuthContext/index.tsx
similarity index 100%
rename from frontend/src/context/AuthContext/index.tsx
rename to frontend-next/src/context/AuthContext/index.tsx
diff --git a/frontend-next/src/context/OrgPermissionContext/OrgPermissionContext.tsx b/frontend-next/src/context/OrgPermissionContext/OrgPermissionContext.tsx
new file mode 100644
index 0000000000..36422b7223
--- /dev/null
+++ b/frontend-next/src/context/OrgPermissionContext/OrgPermissionContext.tsx
@@ -0,0 +1,58 @@
+import { createContext, ReactNode, useContext } from "react";
+
+import { useGetUserOrgPermissions } from "@app/hooks/api";
+import { OrgUser } from "@app/hooks/api/types";
+
+import { useOrganization } from "../OrganizationContext";
+import { TOrgPermission } from "./types";
+
+type Props = {
+ children: ReactNode;
+};
+
+const OrgPermissionContext = createContext(null);
+
+export const OrgPermissionProvider = ({ children }: Props): JSX.Element => {
+ const { currentOrg } = useOrganization();
+ const orgId = currentOrg?.id || "";
+ const { data: permission, isLoading } = useGetUserOrgPermissions({ orgId });
+
+ if (isLoading) {
+ return (
+
+ 
+
+ );
+ }
+
+ if (!permission) {
+ return (
+
+ Failed to load user permissions
+
+ );
+ }
+
+ return (
+ {children}
+ );
+};
+
+export const useOrgPermission = () => {
+ const ctx = useContext(OrgPermissionContext);
+ if (!ctx) {
+ throw new Error("useOrgPermission to be used within ");
+ }
+
+ return ctx;
+};
diff --git a/frontend-v2/src/context/OrgPermissionContext/index.tsx b/frontend-next/src/context/OrgPermissionContext/index.tsx
similarity index 59%
rename from frontend-v2/src/context/OrgPermissionContext/index.tsx
rename to frontend-next/src/context/OrgPermissionContext/index.tsx
index 300f05904b..730fe55b1c 100644
--- a/frontend-v2/src/context/OrgPermissionContext/index.tsx
+++ b/frontend-next/src/context/OrgPermissionContext/index.tsx
@@ -1,3 +1,3 @@
-export { useOrgPermission } from "./OrgPermissionContext";
+export { OrgPermissionProvider, useOrgPermission } from "./OrgPermissionContext";
export type { TOrgPermission } from "./types";
export { OrgPermissionActions, OrgPermissionSubjects } from "./types";
diff --git a/frontend-v2/src/context/OrgPermissionContext/types.ts b/frontend-next/src/context/OrgPermissionContext/types.ts
similarity index 100%
rename from frontend-v2/src/context/OrgPermissionContext/types.ts
rename to frontend-next/src/context/OrgPermissionContext/types.ts
diff --git a/frontend-next/src/context/OrganizationContext/OrganizationContext.tsx b/frontend-next/src/context/OrganizationContext/OrganizationContext.tsx
new file mode 100644
index 0000000000..e73578d135
--- /dev/null
+++ b/frontend-next/src/context/OrganizationContext/OrganizationContext.tsx
@@ -0,0 +1,44 @@
+import { createContext, ReactNode, useContext, useMemo } from "react";
+
+import { useGetOrganizations } from "@app/hooks/api";
+import { Organization } from "@app/hooks/api/types";
+
+type TOrgContext = {
+ orgs?: Organization[];
+ currentOrg?: Organization;
+ isLoading: boolean;
+};
+
+const OrgContext = createContext(null);
+
+type Props = {
+ children: ReactNode;
+};
+
+export const OrgProvider = ({ children }: Props): JSX.Element => {
+ const { data: userOrgs, isLoading } = useGetOrganizations();
+
+ // const currentWsOrgID = currentWorkspace?.organization;
+ const currentWsOrgID = localStorage.getItem("orgData.id");
+
+ // memorize the workspace details for the context
+ const value = useMemo(
+ () => ({
+ orgs: userOrgs,
+ currentOrg: (userOrgs || []).find(({ id }) => id === currentWsOrgID),
+ isLoading
+ }),
+ [currentWsOrgID, userOrgs, isLoading]
+ );
+
+ return {children} ;
+};
+
+export const useOrganization = () => {
+ const ctx = useContext(OrgContext);
+ if (!ctx) {
+ throw new Error("useOrganization to be used within ");
+ }
+
+ return ctx;
+};
diff --git a/frontend-next/src/context/OrganizationContext/index.tsx b/frontend-next/src/context/OrganizationContext/index.tsx
new file mode 100644
index 0000000000..65aba8ca4f
--- /dev/null
+++ b/frontend-next/src/context/OrganizationContext/index.tsx
@@ -0,0 +1 @@
+export { OrgProvider, useOrganization } from "./OrganizationContext";
diff --git a/frontend-next/src/context/ProjectPermissionContext/ProjectPermissionContext.tsx b/frontend-next/src/context/ProjectPermissionContext/ProjectPermissionContext.tsx
new file mode 100644
index 0000000000..b0ee59960d
--- /dev/null
+++ b/frontend-next/src/context/ProjectPermissionContext/ProjectPermissionContext.tsx
@@ -0,0 +1,62 @@
+import { createContext, ReactNode, useContext } from "react";
+
+import { useGetUserProjectPermissions } from "@app/hooks/api";
+import { TProjectMembership } from "@app/hooks/api/users/types";
+
+import { useWorkspace } from "../WorkspaceContext";
+import { TProjectPermission } from "./types";
+
+type Props = {
+ children: ReactNode;
+};
+
+const ProjectPermissionContext = createContext(null);
+
+export const ProjectPermissionProvider = ({ children }: Props): JSX.Element => {
+ const { currentWorkspace, isLoading: isWsLoading } = useWorkspace();
+ const workspaceId = currentWorkspace?.id || "";
+ const { data: permission, isLoading } = useGetUserProjectPermissions({ workspaceId });
+
+ if ((isLoading && currentWorkspace) || isWsLoading) {
+ return (
+
+
+
+ );
+ }
+
+ if (!permission && currentWorkspace) {
+ return (
+
+ Failed to load user permissions
+
+ );
+ }
+
+ return (
+
+ {children}
+
+ );
+};
+
+export const useProjectPermission = () => {
+ const ctx = useContext(ProjectPermissionContext);
+ if (!ctx) {
+ throw new Error("useProjectPermission to be used within ");
+ }
+
+ const hasProjectRole = (role: string) => ctx?.membership?.roles?.includes(role) || false;
+
+ return { ...ctx, hasProjectRole };
+};
diff --git a/frontend-v2/src/context/ProjectPermissionContext/index.tsx b/frontend-next/src/context/ProjectPermissionContext/index.tsx
similarity index 70%
rename from frontend-v2/src/context/ProjectPermissionContext/index.tsx
rename to frontend-next/src/context/ProjectPermissionContext/index.tsx
index 009bc9451b..4b04f5cb84 100644
--- a/frontend-v2/src/context/ProjectPermissionContext/index.tsx
+++ b/frontend-next/src/context/ProjectPermissionContext/index.tsx
@@ -1,4 +1,4 @@
-export { useProjectPermission } from "./ProjectPermissionContext";
+export { ProjectPermissionProvider, useProjectPermission } from "./ProjectPermissionContext";
export type { ProjectPermissionSet, TProjectPermission } from "./types";
export {
ProjectPermissionActions,
diff --git a/frontend-v2/src/context/ProjectPermissionContext/types.ts b/frontend-next/src/context/ProjectPermissionContext/types.ts
similarity index 100%
rename from frontend-v2/src/context/ProjectPermissionContext/types.ts
rename to frontend-next/src/context/ProjectPermissionContext/types.ts
diff --git a/frontend-next/src/context/ServerConfigContext/ServerConfigContext.tsx b/frontend-next/src/context/ServerConfigContext/ServerConfigContext.tsx
new file mode 100644
index 0000000000..659cff9687
--- /dev/null
+++ b/frontend-next/src/context/ServerConfigContext/ServerConfigContext.tsx
@@ -0,0 +1,89 @@
+import { createContext, ReactNode, useContext, useEffect, useMemo } from "react";
+import Head from "next/head";
+import { useRouter } from "next/router";
+
+import { ContentLoader } from "@app/components/v2/ContentLoader";
+import { useGetServerConfig } from "@app/hooks/api";
+import { TServerConfig } from "@app/hooks/api/admin/types";
+
+type TServerConfigContext = {
+ config: TServerConfig;
+};
+
+const ServerConfigContext = createContext(null);
+
+type Props = {
+ children: ReactNode;
+};
+
+export const ServerConfigProvider = ({ children }: Props): JSX.Element => {
+ const router = useRouter();
+ const { data, isLoading } = useGetServerConfig();
+
+ // memorize the workspace details for the context
+ const value = useMemo(() => {
+ return {
+ config: data!
+ };
+ }, [data]);
+
+ useEffect(() => {
+ if (!isLoading && data && !data.initialized && !data.isMigrationModeOn) {
+ router.push("/admin/signup");
+ }
+ }, [isLoading, data]);
+
+ if (!isLoading && data?.isMigrationModeOn) {
+ return (
+
+
+ Infisical Maintenance Mode
+
+
+ 
+
+ Scheduled Maintenance
+
+
+ Infisical is undergoing planned maintenance.
No action is required on your end —
+ your applications will continue to fetch secrets.
+
If you have questions, please{" "}
+
+ join our Slack community
+
+ .
+
+
+ );
+ }
+
+ if (isLoading || (!data?.initialized && router.pathname !== "/admin/signup")) {
+ return (
+
+ {children} ;
+};
+
+export const useServerConfig = () => {
+ const ctx = useContext(ServerConfigContext);
+ if (!ctx) {
+ throw new Error("useServerConfig has to be used within ");
+ }
+
+ return ctx;
+};
diff --git a/frontend-next/src/context/ServerConfigContext/index.tsx b/frontend-next/src/context/ServerConfigContext/index.tsx
new file mode 100644
index 0000000000..856eb5c77a
--- /dev/null
+++ b/frontend-next/src/context/ServerConfigContext/index.tsx
@@ -0,0 +1 @@
+export { ServerConfigProvider, useServerConfig } from "./ServerConfigContext";
diff --git a/frontend-next/src/context/SubscriptionContext/SubscriptionContext.tsx b/frontend-next/src/context/SubscriptionContext/SubscriptionContext.tsx
new file mode 100644
index 0000000000..9c50e425f6
--- /dev/null
+++ b/frontend-next/src/context/SubscriptionContext/SubscriptionContext.tsx
@@ -0,0 +1,45 @@
+import { createContext, ReactNode, useContext, useMemo } from "react";
+
+import { useGetOrgSubscription } from "@app/hooks/api";
+import { SubscriptionPlan } from "@app/hooks/api/types";
+
+import { useOrganization } from "../OrganizationContext";
+
+type TSubscriptionContext = {
+ subscription?: SubscriptionPlan;
+ isLoading: boolean;
+};
+
+const SubscriptionContext = createContext(null);
+
+type Props = {
+ children: ReactNode;
+};
+
+export const SubscriptionProvider = ({ children }: Props): JSX.Element => {
+ const { currentOrg } = useOrganization();
+
+ const { data, isLoading } = useGetOrgSubscription({
+ orgID: currentOrg?.id || ""
+ });
+
+ // memorize the workspace details for the context
+ const value = useMemo(
+ () => ({
+ subscription: data,
+ isLoading
+ }),
+ [data, isLoading]
+ );
+
+ return {children} ;
+};
+
+export const useSubscription = () => {
+ const ctx = useContext(SubscriptionContext);
+ if (!ctx) {
+ throw new Error("useSubscription has to be used within ");
+ }
+
+ return ctx;
+};
diff --git a/frontend-next/src/context/SubscriptionContext/index.tsx b/frontend-next/src/context/SubscriptionContext/index.tsx
new file mode 100644
index 0000000000..50a97eeb28
--- /dev/null
+++ b/frontend-next/src/context/SubscriptionContext/index.tsx
@@ -0,0 +1 @@
+export { SubscriptionProvider, useSubscription } from "./SubscriptionContext";
diff --git a/frontend-next/src/context/UserContext/UserContext.tsx b/frontend-next/src/context/UserContext/UserContext.tsx
new file mode 100644
index 0000000000..0e23ccb7cf
--- /dev/null
+++ b/frontend-next/src/context/UserContext/UserContext.tsx
@@ -0,0 +1,53 @@
+import { createContext, ReactNode, useContext, useMemo } from "react";
+
+import { useGetUser } from "@app/hooks/api";
+import { User, UserEnc } from "@app/hooks/api/types";
+
+type TUserContext = {
+ user: User & UserEnc;
+ isLoading: boolean;
+};
+
+const UserContext = createContext(null);
+
+type Props = {
+ children: ReactNode;
+};
+
+export const UserProvider = ({ children }: Props): JSX.Element => {
+ const { data, isLoading } = useGetUser();
+
+ // memorize the workspace details for the context
+ const value = useMemo(() => {
+ return {
+ user: data!,
+ isLoading
+ };
+ }, [data, isLoading]);
+
+ if (isLoading) {
+ return (
+
+
+
+ );
+ }
+
+ return {children} ;
+};
+
+export const useUser = () => {
+ const ctx = useContext(UserContext);
+ if (!ctx) {
+ throw new Error("useUser has to be used within ");
+ }
+
+ return ctx;
+};
diff --git a/frontend-next/src/context/UserContext/index.tsx b/frontend-next/src/context/UserContext/index.tsx
new file mode 100644
index 0000000000..b4f6056ddf
--- /dev/null
+++ b/frontend-next/src/context/UserContext/index.tsx
@@ -0,0 +1 @@
+export { UserProvider, useUser } from "./UserContext";
diff --git a/frontend-next/src/context/WorkspaceContext/WorkspaceContext.tsx b/frontend-next/src/context/WorkspaceContext/WorkspaceContext.tsx
new file mode 100644
index 0000000000..e4d7612ecb
--- /dev/null
+++ b/frontend-next/src/context/WorkspaceContext/WorkspaceContext.tsx
@@ -0,0 +1,73 @@
+import { createContext, ReactNode, useContext, useEffect, useMemo } from "react";
+import { useRouter } from "next/router";
+
+import { createNotification } from "@app/components/notifications";
+import { useGetUserWorkspaces } from "@app/hooks/api";
+import { ProjectType, Workspace } from "@app/hooks/api/workspace/types";
+
+type TWorkspaceContext = {
+ workspaces: Workspace[];
+ currentWorkspace?: Workspace;
+ isLoading: boolean;
+};
+
+const WorkspaceContext = createContext(null);
+
+type Props = {
+ children: ReactNode;
+};
+
+export const WorkspaceProvider = ({ children }: Props): JSX.Element => {
+ const { data: ws, isLoading } = useGetUserWorkspaces();
+ const router = useRouter();
+ const workspaceId = router.query.id;
+
+ // memorize the workspace details for the context
+ const value = useMemo(() => {
+ const wsId = workspaceId || localStorage.getItem("projectData.id");
+ return {
+ workspaces: ws || [],
+ currentWorkspace: (ws || []).find(({ id }) => id === wsId),
+ isLoading
+ };
+ }, [ws, workspaceId, isLoading]);
+
+ const shouldTriggerNoProjectAccess =
+ !value.isLoading &&
+ !value.currentWorkspace &&
+ Object.values(ProjectType).some((el) => router.pathname.startsWith(`/${el}`)) &&
+ workspaceId;
+
+ // handle redirects for project-specific routes
+ useEffect(() => {
+ if (shouldTriggerNoProjectAccess) {
+ createNotification({
+ text: "You are not a member of this project.",
+ type: "info"
+ });
+
+ setTimeout(() => {
+ router.push("/");
+ }, 5000);
+ }
+ }, [shouldTriggerNoProjectAccess, router]);
+
+ if (shouldTriggerNoProjectAccess) {
+ return (
+
+ You do not have sufficient access to this project.
+
+ );
+ }
+
+ return {children} ;
+};
+
+export const useWorkspace = () => {
+ const ctx = useContext(WorkspaceContext);
+ if (!ctx) {
+ throw new Error("useWorkspace has to be used within ");
+ }
+
+ return ctx;
+};
diff --git a/frontend-next/src/context/WorkspaceContext/index.tsx b/frontend-next/src/context/WorkspaceContext/index.tsx
new file mode 100644
index 0000000000..0ae8cb4c58
--- /dev/null
+++ b/frontend-next/src/context/WorkspaceContext/index.tsx
@@ -0,0 +1 @@
+export { useWorkspace, WorkspaceProvider } from "./WorkspaceContext";
diff --git a/frontend-next/src/context/index.tsx b/frontend-next/src/context/index.tsx
new file mode 100644
index 0000000000..91dae5d2d2
--- /dev/null
+++ b/frontend-next/src/context/index.tsx
@@ -0,0 +1,22 @@
+export { AuthProvider } from "./AuthContext";
+export { OrgProvider, useOrganization } from "./OrganizationContext";
+export type { TOrgPermission } from "./OrgPermissionContext";
+export {
+ OrgPermissionActions,
+ OrgPermissionProvider,
+ OrgPermissionSubjects,
+ useOrgPermission
+} from "./OrgPermissionContext";
+export type { TProjectPermission } from "./ProjectPermissionContext";
+export {
+ ProjectPermissionActions,
+ ProjectPermissionCmekActions,
+ ProjectPermissionDynamicSecretActions,
+ ProjectPermissionProvider,
+ ProjectPermissionSub,
+ useProjectPermission
+} from "./ProjectPermissionContext";
+export { ServerConfigProvider, useServerConfig } from "./ServerConfigContext";
+export { SubscriptionProvider, useSubscription } from "./SubscriptionContext";
+export { UserProvider, useUser } from "./UserContext";
+export { useWorkspace, WorkspaceProvider } from "./WorkspaceContext";
diff --git a/frontend/src/ee/api/memberships/UpdateUserProjectPermission.ts b/frontend-next/src/ee/api/memberships/UpdateUserProjectPermission.ts
similarity index 100%
rename from frontend/src/ee/api/memberships/UpdateUserProjectPermission.ts
rename to frontend-next/src/ee/api/memberships/UpdateUserProjectPermission.ts
diff --git a/frontend/src/ee/api/secrets/GetActionData.ts b/frontend-next/src/ee/api/secrets/GetActionData.ts
similarity index 100%
rename from frontend/src/ee/api/secrets/GetActionData.ts
rename to frontend-next/src/ee/api/secrets/GetActionData.ts
diff --git a/frontend/src/ee/api/secrets/GetProjectSercetShanpshots.ts b/frontend-next/src/ee/api/secrets/GetProjectSercetShanpshots.ts
similarity index 100%
rename from frontend/src/ee/api/secrets/GetProjectSercetShanpshots.ts
rename to frontend-next/src/ee/api/secrets/GetProjectSercetShanpshots.ts
diff --git a/frontend/src/ee/api/secrets/GetProjectSercetSnapshotsCount.ts b/frontend-next/src/ee/api/secrets/GetProjectSercetSnapshotsCount.ts
similarity index 100%
rename from frontend/src/ee/api/secrets/GetProjectSercetSnapshotsCount.ts
rename to frontend-next/src/ee/api/secrets/GetProjectSercetSnapshotsCount.ts
diff --git a/frontend/src/ee/api/secrets/GetSecretSnapshotData.ts b/frontend-next/src/ee/api/secrets/GetSecretSnapshotData.ts
similarity index 100%
rename from frontend/src/ee/api/secrets/GetSecretSnapshotData.ts
rename to frontend-next/src/ee/api/secrets/GetSecretSnapshotData.ts
diff --git a/frontend/src/ee/api/secrets/GetSecretVersions.ts b/frontend-next/src/ee/api/secrets/GetSecretVersions.ts
similarity index 100%
rename from frontend/src/ee/api/secrets/GetSecretVersions.ts
rename to frontend-next/src/ee/api/secrets/GetSecretVersions.ts
diff --git a/frontend/src/ee/api/secrets/PerformSecretRollback.ts b/frontend-next/src/ee/api/secrets/PerformSecretRollback.ts
similarity index 100%
rename from frontend/src/ee/api/secrets/PerformSecretRollback.ts
rename to frontend-next/src/ee/api/secrets/PerformSecretRollback.ts
diff --git a/frontend/src/ee/utilities/findTextDifferences.ts b/frontend-next/src/ee/utilities/findTextDifferences.ts
similarity index 100%
rename from frontend/src/ee/utilities/findTextDifferences.ts
rename to frontend-next/src/ee/utilities/findTextDifferences.ts
diff --git a/frontend/src/ee/utilities/timeSince.ts b/frontend-next/src/ee/utilities/timeSince.ts
similarity index 100%
rename from frontend/src/ee/utilities/timeSince.ts
rename to frontend-next/src/ee/utilities/timeSince.ts
diff --git a/frontend-v2/src/helpers/appConnections.ts b/frontend-next/src/helpers/appConnections.ts
similarity index 100%
rename from frontend-v2/src/helpers/appConnections.ts
rename to frontend-next/src/helpers/appConnections.ts
diff --git a/frontend-v2/src/helpers/key.ts b/frontend-next/src/helpers/key.ts
similarity index 99%
rename from frontend-v2/src/helpers/key.ts
rename to frontend-next/src/helpers/key.ts
index c516826f16..9301bb77b9 100644
--- a/frontend-v2/src/helpers/key.ts
+++ b/frontend-next/src/helpers/key.ts
@@ -74,7 +74,7 @@ const decryptPrivateKeyHelper = async ({
} else {
throw new Error("Insufficient details to decrypt private key");
}
- } catch {
+ } catch (err) {
throw new Error("Failed to decrypt private key");
}
diff --git a/frontend-v2/src/helpers/members.ts b/frontend-next/src/helpers/members.ts
similarity index 100%
rename from frontend-v2/src/helpers/members.ts
rename to frontend-next/src/helpers/members.ts
diff --git a/frontend-v2/src/helpers/parseEnvVar.ts b/frontend-next/src/helpers/parseEnvVar.ts
similarity index 96%
rename from frontend-v2/src/helpers/parseEnvVar.ts
rename to frontend-next/src/helpers/parseEnvVar.ts
index 6c3221e3b1..8bde050844 100644
--- a/frontend-v2/src/helpers/parseEnvVar.ts
+++ b/frontend-next/src/helpers/parseEnvVar.ts
@@ -1,31 +1,31 @@
-/** Extracts the key and value from a passed in env string based on the provided delimiters. */
-export const getKeyValue = (pastedContent: string, delimiters: string[]) => {
- if (!pastedContent) {
- return { key: "", value: "" };
- }
-
- let firstDelimiterIndex = -1;
- let foundDelimiter = "";
-
- delimiters.forEach((delimiter) => {
- const index = pastedContent.indexOf(delimiter);
- if (index !== -1 && (firstDelimiterIndex === -1 || index < firstDelimiterIndex)) {
- firstDelimiterIndex = index;
- foundDelimiter = delimiter;
- }
- });
-
- const hasValueAfterDelimiter = pastedContent.length > firstDelimiterIndex + foundDelimiter.length;
-
- if (firstDelimiterIndex === -1 || !hasValueAfterDelimiter) {
- return { key: pastedContent.trim(), value: "" };
- }
-
- const key = pastedContent.substring(0, firstDelimiterIndex);
- const value = pastedContent.substring(firstDelimiterIndex + foundDelimiter.length);
-
- return {
- key: key.trim(),
- value: value.trim()
- };
-};
+/** Extracts the key and value from a passed in env string based on the provided delimiters. */
+export const getKeyValue = (pastedContent: string, delimiters: string[]) => {
+ if (!pastedContent) {
+ return { key: "", value: "" };
+ }
+
+ let firstDelimiterIndex = -1;
+ let foundDelimiter = "";
+
+ delimiters.forEach((delimiter) => {
+ const index = pastedContent.indexOf(delimiter);
+ if (index !== -1 && (firstDelimiterIndex === -1 || index < firstDelimiterIndex)) {
+ firstDelimiterIndex = index;
+ foundDelimiter = delimiter;
+ }
+ });
+
+ const hasValueAfterDelimiter = pastedContent.length > firstDelimiterIndex + foundDelimiter.length;
+
+ if (firstDelimiterIndex === -1 || !hasValueAfterDelimiter) {
+ return { key: pastedContent.trim(), value: "" };
+ }
+
+ const key = pastedContent.substring(0, firstDelimiterIndex);
+ const value = pastedContent.substring(firstDelimiterIndex + foundDelimiter.length);
+
+ return {
+ key: key.trim(),
+ value: value.trim()
+ };
+};
diff --git a/frontend-v2/src/helpers/platform.ts b/frontend-next/src/helpers/platform.ts
similarity index 100%
rename from frontend-v2/src/helpers/platform.ts
rename to frontend-next/src/helpers/platform.ts
diff --git a/frontend-v2/src/helpers/policies.ts b/frontend-next/src/helpers/policies.ts
similarity index 99%
rename from frontend-v2/src/helpers/policies.ts
rename to frontend-next/src/helpers/policies.ts
index 7828807dc5..c6d7c935ae 100644
--- a/frontend-v2/src/helpers/policies.ts
+++ b/frontend-next/src/helpers/policies.ts
@@ -9,4 +9,4 @@ export const policyDetails: Record {
- return `/${workspace.type}/$projectId/overview` as const;
+ if (workspace.type === ProjectType.SecretManager) {
+ return `/${workspace.type}/${workspace.id}/secrets/overview`;
+ }
+ if (workspace.type === ProjectType.CertificateManager) {
+ return `/${workspace.type}/${workspace.id}/certificates`;
+ }
+
+ if (workspace.type === ProjectType.KMS) {
+ return `/${workspace.type}/${workspace.id}/kms`;
+ }
+
+ return `/${workspace.type}/${workspace.id}/ssh`;
};
export const getProjectTitle = (type: ProjectType) => {
diff --git a/frontend-v2/src/helpers/reverseTruncate.ts b/frontend-next/src/helpers/reverseTruncate.ts
similarity index 100%
rename from frontend-v2/src/helpers/reverseTruncate.ts
rename to frontend-next/src/helpers/reverseTruncate.ts
diff --git a/frontend-v2/src/helpers/roles.ts b/frontend-next/src/helpers/roles.ts
similarity index 100%
rename from frontend-v2/src/helpers/roles.ts
rename to frontend-next/src/helpers/roles.ts
diff --git a/frontend-v2/src/helpers/string.ts b/frontend-next/src/helpers/string.ts
similarity index 99%
rename from frontend-v2/src/helpers/string.ts
rename to frontend-next/src/helpers/string.ts
index 109b51d494..bd97d8a3c5 100644
--- a/frontend-v2/src/helpers/string.ts
+++ b/frontend-next/src/helpers/string.ts
@@ -11,4 +11,4 @@ export const isValidPath = (val: string): boolean => {
// Check for valid characters and no consecutive slashes
const validPathRegex = /^[a-zA-Z0-9-_.:]+(?:\/[a-zA-Z0-9-_.:]+)*$/;
return validPathRegex.test(val);
-};
+}
\ No newline at end of file
diff --git a/frontend-v2/src/hoc/index.tsx b/frontend-next/src/hoc/index.tsx
similarity index 100%
rename from frontend-v2/src/hoc/index.tsx
rename to frontend-next/src/hoc/index.tsx
diff --git a/frontend-v2/src/hoc/withPermission/index.tsx b/frontend-next/src/hoc/withPermission/index.tsx
similarity index 100%
rename from frontend-v2/src/hoc/withPermission/index.tsx
rename to frontend-next/src/hoc/withPermission/index.tsx
diff --git a/frontend-v2/src/hoc/withPermission/withPermission.tsx b/frontend-next/src/hoc/withPermission/withPermission.tsx
similarity index 96%
rename from frontend-v2/src/hoc/withPermission/withPermission.tsx
rename to frontend-next/src/hoc/withPermission/withPermission.tsx
index ef814d9583..0fe2d9f4fb 100644
--- a/frontend-v2/src/hoc/withPermission/withPermission.tsx
+++ b/frontend-next/src/hoc/withPermission/withPermission.tsx
@@ -16,7 +16,7 @@ type Props = (T extends AbilityTuple
subject: string;
}) & { className?: string; containerClassName?: string };
-export const withPermission = (
+export const withPermission = (
Component: ComponentType,
{ action, subject, className, containerClassName }: Props["abilities"]>
) => {
diff --git a/frontend-v2/src/hoc/withProjectPermission/index.tsx b/frontend-next/src/hoc/withProjectPermission/index.tsx
similarity index 100%
rename from frontend-v2/src/hoc/withProjectPermission/index.tsx
rename to frontend-next/src/hoc/withProjectPermission/index.tsx
diff --git a/frontend-v2/src/hoc/withProjectPermission/withProjectPermission.tsx b/frontend-next/src/hoc/withProjectPermission/withProjectPermission.tsx
similarity index 97%
rename from frontend-v2/src/hoc/withProjectPermission/withProjectPermission.tsx
rename to frontend-next/src/hoc/withProjectPermission/withProjectPermission.tsx
index 564d44adcc..22c91ab52e 100644
--- a/frontend-v2/src/hoc/withProjectPermission/withProjectPermission.tsx
+++ b/frontend-next/src/hoc/withProjectPermission/withProjectPermission.tsx
@@ -14,7 +14,7 @@ type Props = {
subject: T[1];
};
-export const withProjectPermission = (
+export const withProjectPermission = (
Component: ComponentType, "action" | "subject"> & T>,
{ action, subject, className, containerClassName }: Props
) => {
diff --git a/frontend-v2/src/hooks/api/accessApproval/index.tsx b/frontend-next/src/hooks/api/accessApproval/index.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/accessApproval/index.tsx
rename to frontend-next/src/hooks/api/accessApproval/index.tsx
diff --git a/frontend-v2/src/hooks/api/accessApproval/mutation.tsx b/frontend-next/src/hooks/api/accessApproval/mutation.tsx
similarity index 73%
rename from frontend-v2/src/hooks/api/accessApproval/mutation.tsx
rename to frontend-next/src/hooks/api/accessApproval/mutation.tsx
index 115b731868..9c3199a996 100644
--- a/frontend-v2/src/hooks/api/accessApproval/mutation.tsx
+++ b/frontend-next/src/hooks/api/accessApproval/mutation.tsx
@@ -15,7 +15,7 @@ import {
export const useCreateAccessApprovalPolicy = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation<{}, {}, TCreateAccessPolicyDTO>({
mutationFn: async ({
environment,
projectSlug,
@@ -37,9 +37,7 @@ export const useCreateAccessApprovalPolicy = () => {
return data;
},
onSuccess: (_, { projectSlug }) => {
- queryClient.invalidateQueries({
- queryKey: accessApprovalKeys.getAccessApprovalPolicies(projectSlug)
- });
+ queryClient.invalidateQueries(accessApprovalKeys.getAccessApprovalPolicies(projectSlug));
}
});
};
@@ -47,7 +45,7 @@ export const useCreateAccessApprovalPolicy = () => {
export const useUpdateAccessApprovalPolicy = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation<{}, {}, TUpdateAccessPolicyDTO>({
mutationFn: async ({ id, approvers, approvals, name, secretPath, enforcementLevel }) => {
const { data } = await apiRequest.patch(`/api/v1/access-approvals/policies/${id}`, {
approvals,
@@ -59,9 +57,7 @@ export const useUpdateAccessApprovalPolicy = () => {
return data;
},
onSuccess: (_, { projectSlug }) => {
- queryClient.invalidateQueries({
- queryKey: accessApprovalKeys.getAccessApprovalPolicies(projectSlug)
- });
+ queryClient.invalidateQueries(accessApprovalKeys.getAccessApprovalPolicies(projectSlug));
}
});
};
@@ -69,22 +65,20 @@ export const useUpdateAccessApprovalPolicy = () => {
export const useDeleteAccessApprovalPolicy = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation<{}, {}, TDeleteSecretPolicyDTO>({
mutationFn: async ({ id }) => {
const { data } = await apiRequest.delete(`/api/v1/access-approvals/policies/${id}`);
return data;
},
onSuccess: (_, { projectSlug }) => {
- queryClient.invalidateQueries({
- queryKey: accessApprovalKeys.getAccessApprovalPolicies(projectSlug)
- });
+ queryClient.invalidateQueries(accessApprovalKeys.getAccessApprovalPolicies(projectSlug));
}
});
};
export const useCreateAccessRequest = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation<{}, {}, TCreateAccessRequestDTO>({
mutationFn: async ({ projectSlug, ...request }) => {
const { data } = await apiRequest.post(
"/api/v1/access-approvals/requests",
@@ -102,9 +96,7 @@ export const useCreateAccessRequest = () => {
return data;
},
onSuccess: (_, { projectSlug }) => {
- queryClient.invalidateQueries({
- queryKey: accessApprovalKeys.getAccessApprovalRequestCount(projectSlug)
- });
+ queryClient.invalidateQueries(accessApprovalKeys.getAccessApprovalRequestCount(projectSlug));
}
});
};
@@ -112,8 +104,8 @@ export const useCreateAccessRequest = () => {
export const useReviewAccessRequest = () => {
const queryClient = useQueryClient();
return useMutation<
- object,
- object,
+ {},
+ {},
{
requestId: string;
status: "approved" | "rejected";
@@ -132,12 +124,10 @@ export const useReviewAccessRequest = () => {
return data;
},
onSuccess: (_, { projectSlug, envSlug, requestedBy }) => {
- queryClient.invalidateQueries({
- queryKey: accessApprovalKeys.getAccessApprovalRequests(projectSlug, envSlug, requestedBy)
- });
- queryClient.invalidateQueries({
- queryKey: accessApprovalKeys.getAccessApprovalRequestCount(projectSlug)
- });
+ queryClient.invalidateQueries(
+ accessApprovalKeys.getAccessApprovalRequests(projectSlug, envSlug, requestedBy)
+ );
+ queryClient.invalidateQueries(accessApprovalKeys.getAccessApprovalRequestCount(projectSlug));
}
});
};
diff --git a/frontend-v2/src/hooks/api/accessApproval/queries.tsx b/frontend-next/src/hooks/api/accessApproval/queries.tsx
similarity index 80%
rename from frontend-v2/src/hooks/api/accessApproval/queries.tsx
rename to frontend-next/src/hooks/api/accessApproval/queries.tsx
index 1aa40c588a..599962e433 100644
--- a/frontend-v2/src/hooks/api/accessApproval/queries.tsx
+++ b/frontend-next/src/hooks/api/accessApproval/queries.tsx
@@ -1,8 +1,7 @@
import { PackRule, unpackRules } from "@casl/ability/extra";
-import { useQuery } from "@tanstack/react-query";
+import { useQuery, UseQueryOptions } from "@tanstack/react-query";
import { apiRequest } from "@app/config/request";
-import { TReactQueryOptions } from "@app/types/reactQuery";
import { TProjectPermission } from "../roles/types";
import {
@@ -42,9 +41,15 @@ export const useGetAccessPolicyApprovalCount = ({
projectSlug,
envSlug,
options = {}
-}: TGetAccessPolicyApprovalCountDTO & TReactQueryOptions) =>
+}: TGetAccessPolicyApprovalCountDTO & {
+ options?: UseQueryOptions<
+ number,
+ unknown,
+ number,
+ ReturnType
+ >;
+}) =>
useQuery({
- queryKey: accessApprovalKeys.getAccessApprovalRequestCount(projectSlug),
queryFn: () => fetchPolicyApprovalCount({ projectSlug, envSlug }),
...options,
enabled: Boolean(projectSlug) && (options?.enabled ?? true)
@@ -94,7 +99,14 @@ const fetchAccessRequestsCount = async (projectSlug: string) => {
export const useGetAccessRequestsCount = ({
projectSlug,
options = {}
-}: TGetAccessApprovalRequestsDTO & TReactQueryOptions) =>
+}: TGetAccessApprovalRequestsDTO & {
+ options?: UseQueryOptions<
+ TAccessRequestCount,
+ unknown,
+ { pendingCount: number; finalizedCount: number },
+ ReturnType
+ >;
+}) =>
useQuery({
queryKey: accessApprovalKeys.getAccessApprovalRequestCount(projectSlug),
queryFn: () => fetchAccessRequestsCount(projectSlug),
@@ -107,7 +119,14 @@ export const useGetAccessApprovalPolicies = ({
envSlug,
authorProjectMembershipId,
options = {}
-}: TGetAccessApprovalRequestsDTO & TReactQueryOptions) =>
+}: TGetAccessApprovalRequestsDTO & {
+ options?: UseQueryOptions<
+ TAccessApprovalPolicy[],
+ unknown,
+ TAccessApprovalPolicy[],
+ ReturnType
+ >;
+}) =>
useQuery({
queryKey: accessApprovalKeys.getAccessApprovalPolicies(projectSlug),
queryFn: () => fetchApprovalPolicies({ projectSlug, envSlug, authorProjectMembershipId }),
@@ -120,7 +139,14 @@ export const useGetAccessApprovalRequests = ({
envSlug,
authorProjectMembershipId,
options = {}
-}: TGetAccessApprovalRequestsDTO & TReactQueryOptions) =>
+}: TGetAccessApprovalRequestsDTO & {
+ options?: UseQueryOptions<
+ TAccessApprovalRequest[],
+ unknown,
+ TAccessApprovalRequest[],
+ ReturnType
+ >;
+}) =>
useQuery({
queryKey: accessApprovalKeys.getAccessApprovalRequests(
projectSlug,
diff --git a/frontend-v2/src/hooks/api/accessApproval/types.ts b/frontend-next/src/hooks/api/accessApproval/types.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/accessApproval/types.ts
rename to frontend-next/src/hooks/api/accessApproval/types.ts
diff --git a/frontend-v2/src/hooks/api/admin/index.ts b/frontend-next/src/hooks/api/admin/index.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/admin/index.ts
rename to frontend-next/src/hooks/api/admin/index.ts
diff --git a/frontend-v2/src/hooks/api/admin/mutation.ts b/frontend-next/src/hooks/api/admin/mutation.ts
similarity index 81%
rename from frontend-v2/src/hooks/api/admin/mutation.ts
rename to frontend-next/src/hooks/api/admin/mutation.ts
index c68760fa48..6cd13050ee 100644
--- a/frontend-v2/src/hooks/api/admin/mutation.ts
+++ b/frontend-next/src/hooks/api/admin/mutation.ts
@@ -18,7 +18,7 @@ export const useCreateAdminUser = () => {
return useMutation<
{ user: User; token: string; organization: { id: string } },
- object,
+ {},
TCreateAdminUserDTO
>({
mutationFn: async (opt) => {
@@ -26,7 +26,7 @@ export const useCreateAdminUser = () => {
return data;
},
onSuccess: () => {
- queryClient.invalidateQueries({ queryKey: adminQueryKeys.serverConfig() });
+ queryClient.invalidateQueries(adminQueryKeys.serverConfig());
}
});
};
@@ -36,7 +36,7 @@ export const useUpdateServerConfig = () => {
return useMutation<
TServerConfig,
- object,
+ {},
Partial
>({
mutationFn: async (opt) => {
@@ -48,8 +48,8 @@ export const useUpdateServerConfig = () => {
},
onSuccess: (data) => {
queryClient.setQueryData(adminQueryKeys.serverConfig(), data);
- queryClient.invalidateQueries({ queryKey: adminQueryKeys.serverConfig() });
- queryClient.invalidateQueries({ queryKey: organizationKeys.getUserOrganizations });
+ queryClient.invalidateQueries(adminQueryKeys.serverConfig());
+ queryClient.invalidateQueries(organizationKeys.getUserOrganizations);
}
});
};
@@ -72,7 +72,7 @@ export const useAdminDeleteUser = () => {
export const useUpdateAdminSlackConfig = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async (dto) => {
const { data } = await apiRequest.put(
"/api/v1/admin/integrations/slack/config",
@@ -82,7 +82,7 @@ export const useUpdateAdminSlackConfig = () => {
return data;
},
onSuccess: () => {
- queryClient.invalidateQueries({ queryKey: adminQueryKeys.getAdminSlackConfig() });
+ queryClient.invalidateQueries(adminQueryKeys.getAdminSlackConfig());
}
});
};
@@ -94,7 +94,7 @@ export const useUpdateServerEncryptionStrategy = () => {
await apiRequest.patch("/api/v1/admin/encryption-strategies", { strategy });
},
onSuccess: () => {
- queryClient.invalidateQueries({ queryKey: adminQueryKeys.getServerEncryptionStrategies() });
+ queryClient.invalidateQueries(adminQueryKeys.getServerEncryptionStrategies());
}
});
};
diff --git a/frontend-v2/src/hooks/api/admin/queries.ts b/frontend-next/src/hooks/api/admin/queries.ts
similarity index 97%
rename from frontend-v2/src/hooks/api/admin/queries.ts
rename to frontend-next/src/hooks/api/admin/queries.ts
index 12ae1cf646..a1d32bce35 100644
--- a/frontend-v2/src/hooks/api/admin/queries.ts
+++ b/frontend-next/src/hooks/api/admin/queries.ts
@@ -21,7 +21,7 @@ export const adminQueryKeys = {
getServerEncryptionStrategies: () => ["server-encryption-strategies"] as const
};
-export const fetchServerConfig = async () => {
+const fetchServerConfig = async () => {
const { data } = await apiRequest.get<{ config: TServerConfig }>("/api/v1/admin/config");
return data.config;
};
@@ -48,7 +48,6 @@ export const useGetServerConfig = ({
export const useAdminGetUsers = (filters: AdminGetUsersFilters) => {
return useInfiniteQuery({
- initialPageParam: 0,
queryKey: adminQueryKeys.getUsers(filters),
queryFn: async ({ pageParam }) => {
const { data } = await apiRequest.get<{ users: User[] }>(
diff --git a/frontend-v2/src/hooks/api/admin/types.ts b/frontend-next/src/hooks/api/admin/types.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/admin/types.ts
rename to frontend-next/src/hooks/api/admin/types.ts
diff --git a/frontend-v2/src/hooks/api/apiKeys/index.ts b/frontend-next/src/hooks/api/apiKeys/index.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/apiKeys/index.ts
rename to frontend-next/src/hooks/api/apiKeys/index.ts
diff --git a/frontend-v2/src/hooks/api/apiKeys/queries.tsx b/frontend-next/src/hooks/api/apiKeys/queries.tsx
similarity index 73%
rename from frontend-v2/src/hooks/api/apiKeys/queries.tsx
rename to frontend-next/src/hooks/api/apiKeys/queries.tsx
index 22997ec15b..c1a2e43558 100644
--- a/frontend-v2/src/hooks/api/apiKeys/queries.tsx
+++ b/frontend-next/src/hooks/api/apiKeys/queries.tsx
@@ -13,7 +13,7 @@ import {
export const useCreateAPIKeyV2 = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({ name }) => {
const { data } = await apiRequest.post("/api/v3/api-key", {
name
@@ -22,14 +22,14 @@ export const useCreateAPIKeyV2 = () => {
return data;
},
onSuccess: () => {
- queryClient.invalidateQueries({ queryKey: userKeys.myAPIKeysV2 });
+ queryClient.invalidateQueries(userKeys.myAPIKeysV2);
}
});
};
export const useUpdateAPIKeyV2 = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({ apiKeyDataId, name }) => {
const {
data: { apiKeyData }
@@ -39,14 +39,14 @@ export const useUpdateAPIKeyV2 = () => {
return apiKeyData;
},
onSuccess: () => {
- queryClient.invalidateQueries({ queryKey: userKeys.myAPIKeysV2 });
+ queryClient.invalidateQueries(userKeys.myAPIKeysV2);
}
});
};
export const useDeleteAPIKeyV2 = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({ apiKeyDataId }) => {
const {
data: { apiKeyData }
@@ -54,7 +54,7 @@ export const useDeleteAPIKeyV2 = () => {
return apiKeyData;
},
onSuccess: () => {
- queryClient.invalidateQueries({ queryKey: userKeys.myAPIKeysV2 });
+ queryClient.invalidateQueries(userKeys.myAPIKeysV2);
}
});
};
diff --git a/frontend-v2/src/hooks/api/apiKeys/types.ts b/frontend-next/src/hooks/api/apiKeys/types.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/apiKeys/types.ts
rename to frontend-next/src/hooks/api/apiKeys/types.ts
diff --git a/frontend-v2/src/hooks/api/appConnections/enums.ts b/frontend-next/src/hooks/api/appConnections/enums.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/appConnections/enums.ts
rename to frontend-next/src/hooks/api/appConnections/enums.ts
diff --git a/frontend-v2/src/hooks/api/appConnections/index.ts b/frontend-next/src/hooks/api/appConnections/index.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/appConnections/index.ts
rename to frontend-next/src/hooks/api/appConnections/index.ts
diff --git a/frontend-v2/src/hooks/api/appConnections/mutations.tsx b/frontend-next/src/hooks/api/appConnections/mutations.tsx
similarity index 78%
rename from frontend-v2/src/hooks/api/appConnections/mutations.tsx
rename to frontend-next/src/hooks/api/appConnections/mutations.tsx
index bb8831342d..d9e2912d72 100644
--- a/frontend-v2/src/hooks/api/appConnections/mutations.tsx
+++ b/frontend-next/src/hooks/api/appConnections/mutations.tsx
@@ -20,7 +20,7 @@ export const useCreateAppConnection = () => {
return data.appConnection;
},
- onSuccess: () => queryClient.invalidateQueries({ queryKey: appConnectionKeys.list() })
+ onSuccess: () => queryClient.invalidateQueries(appConnectionKeys.list())
});
};
@@ -36,8 +36,8 @@ export const useUpdateAppConnection = () => {
return data.appConnection;
},
onSuccess: (_, { connectionId, app }) => {
- queryClient.invalidateQueries({ queryKey: appConnectionKeys.list() });
- queryClient.invalidateQueries({ queryKey: appConnectionKeys.byId(app, connectionId) });
+ queryClient.invalidateQueries(appConnectionKeys.list());
+ queryClient.invalidateQueries(appConnectionKeys.byId(app, connectionId));
}
});
};
@@ -51,8 +51,8 @@ export const useDeleteAppConnection = () => {
return data;
},
onSuccess: (_, { connectionId, app }) => {
- queryClient.invalidateQueries({ queryKey: appConnectionKeys.list() });
- queryClient.invalidateQueries({ queryKey: appConnectionKeys.byId(app, connectionId) });
+ queryClient.invalidateQueries(appConnectionKeys.list());
+ queryClient.invalidateQueries(appConnectionKeys.byId(app, connectionId));
}
});
};
diff --git a/frontend-v2/src/hooks/api/appConnections/queries.tsx b/frontend-next/src/hooks/api/appConnections/queries.tsx
similarity index 94%
rename from frontend-v2/src/hooks/api/appConnections/queries.tsx
rename to frontend-next/src/hooks/api/appConnections/queries.tsx
index e18c1facd3..10e2601ed6 100644
--- a/frontend-v2/src/hooks/api/appConnections/queries.tsx
+++ b/frontend-next/src/hooks/api/appConnections/queries.tsx
@@ -49,12 +49,12 @@ export const useAppConnectionOptions = (
};
export const useGetAppConnectionOption = (app: T) => {
- const { data: options = [], isPending } = useAppConnectionOptions();
+ const { data: options = [], isLoading } = useAppConnectionOptions();
return useMemo(
() => ({
option: (options.find((opt) => opt.app === app) as TAppConnectionOptionMap[T]) ?? {},
- isLoading: isPending
+ isLoading
}),
[options, app]
);
@@ -74,8 +74,9 @@ export const useListAppConnections = (
return useQuery({
queryKey: appConnectionKeys.list(),
queryFn: async () => {
- const { data } =
- await apiRequest.get>("/api/v1/app-connections");
+ const { data } = await apiRequest.get>(
+ "/api/v1/app-connections"
+ );
return data.appConnections;
},
diff --git a/frontend-v2/src/hooks/api/appConnections/types/app-options.ts b/frontend-next/src/hooks/api/appConnections/types/app-options.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/appConnections/types/app-options.ts
rename to frontend-next/src/hooks/api/appConnections/types/app-options.ts
diff --git a/frontend-v2/src/hooks/api/appConnections/types/aws-connection.ts b/frontend-next/src/hooks/api/appConnections/types/aws-connection.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/appConnections/types/aws-connection.ts
rename to frontend-next/src/hooks/api/appConnections/types/aws-connection.ts
diff --git a/frontend-v2/src/hooks/api/appConnections/types/github-connection.ts b/frontend-next/src/hooks/api/appConnections/types/github-connection.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/appConnections/types/github-connection.ts
rename to frontend-next/src/hooks/api/appConnections/types/github-connection.ts
diff --git a/frontend-v2/src/hooks/api/appConnections/types/index.ts b/frontend-next/src/hooks/api/appConnections/types/index.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/appConnections/types/index.ts
rename to frontend-next/src/hooks/api/appConnections/types/index.ts
diff --git a/frontend-v2/src/hooks/api/appConnections/types/root-connection.ts b/frontend-next/src/hooks/api/appConnections/types/root-connection.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/appConnections/types/root-connection.ts
rename to frontend-next/src/hooks/api/appConnections/types/root-connection.ts
diff --git a/frontend-v2/src/hooks/api/auditLogStreams/index.tsx b/frontend-next/src/hooks/api/auditLogStreams/index.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/auditLogStreams/index.tsx
rename to frontend-next/src/hooks/api/auditLogStreams/index.tsx
diff --git a/frontend-v2/src/hooks/api/auditLogStreams/mutations.tsx b/frontend-next/src/hooks/api/auditLogStreams/mutations.tsx
similarity index 71%
rename from frontend-v2/src/hooks/api/auditLogStreams/mutations.tsx
rename to frontend-next/src/hooks/api/auditLogStreams/mutations.tsx
index 1ed93f95b9..2d99f57c49 100644
--- a/frontend-v2/src/hooks/api/auditLogStreams/mutations.tsx
+++ b/frontend-next/src/hooks/api/auditLogStreams/mutations.tsx
@@ -13,7 +13,7 @@ import {
export const useCreateAuditLogStream = () => {
const queryClient = useQueryClient();
- return useMutation<{ auditLogStream: TAuditLogStream }, object, TCreateAuditLogStreamDTO>({
+ return useMutation<{ auditLogStream: TAuditLogStream }, {}, TCreateAuditLogStreamDTO>({
mutationFn: async (dto) => {
const { data } = await apiRequest.post<{ auditLogStream: TAuditLogStream }>(
"/api/v1/audit-log-streams",
@@ -22,7 +22,7 @@ export const useCreateAuditLogStream = () => {
return data;
},
onSuccess: (_, { orgId }) => {
- queryClient.invalidateQueries({ queryKey: auditLogStreamKeys.list(orgId) });
+ queryClient.invalidateQueries(auditLogStreamKeys.list(orgId));
}
});
};
@@ -30,7 +30,7 @@ export const useCreateAuditLogStream = () => {
export const useUpdateAuditLogStream = () => {
const queryClient = useQueryClient();
- return useMutation<{ auditLogStream: TAuditLogStream }, object, TUpdateAuditLogStreamDTO>({
+ return useMutation<{ auditLogStream: TAuditLogStream }, {}, TUpdateAuditLogStreamDTO>({
mutationFn: async (dto) => {
const { data } = await apiRequest.patch<{ auditLogStream: TAuditLogStream }>(
`/api/v1/audit-log-streams/${dto.id}`,
@@ -39,7 +39,7 @@ export const useUpdateAuditLogStream = () => {
return data;
},
onSuccess: (_, { orgId }) => {
- queryClient.invalidateQueries({ queryKey: auditLogStreamKeys.list(orgId) });
+ queryClient.invalidateQueries(auditLogStreamKeys.list(orgId));
}
});
};
@@ -47,7 +47,7 @@ export const useUpdateAuditLogStream = () => {
export const useDeleteAuditLogStream = () => {
const queryClient = useQueryClient();
- return useMutation<{ auditLogStream: TAuditLogStream }, object, TDeleteAuditLogStreamDTO>({
+ return useMutation<{ auditLogStream: TAuditLogStream }, {}, TDeleteAuditLogStreamDTO>({
mutationFn: async (dto) => {
const { data } = await apiRequest.delete<{ auditLogStream: TAuditLogStream }>(
`/api/v1/audit-log-streams/${dto.id}`
@@ -55,7 +55,7 @@ export const useDeleteAuditLogStream = () => {
return data;
},
onSuccess: (_, { orgId }) => {
- queryClient.invalidateQueries({ queryKey: auditLogStreamKeys.list(orgId) });
+ queryClient.invalidateQueries(auditLogStreamKeys.list(orgId));
}
});
};
diff --git a/frontend-next/src/hooks/api/auditLogStreams/queries.tsx b/frontend-next/src/hooks/api/auditLogStreams/queries.tsx
new file mode 100644
index 0000000000..f86ca0dce4
--- /dev/null
+++ b/frontend-next/src/hooks/api/auditLogStreams/queries.tsx
@@ -0,0 +1,40 @@
+import { useQuery } from "@tanstack/react-query";
+
+import { apiRequest } from "@app/config/request";
+
+import { TAuditLogStream } from "./types";
+
+export const auditLogStreamKeys = {
+ list: (orgId: string) => ["audit-log-stream", { orgId }],
+ getById: (id: string) => ["audit-log-stream-details", { id }]
+};
+
+const fetchAuditLogStreams = async () => {
+ const { data } = await apiRequest.get<{ auditLogStreams: TAuditLogStream[] }>(
+ "/api/v1/audit-log-streams"
+ );
+
+ return data.auditLogStreams;
+};
+
+export const useGetAuditLogStreams = (orgId: string) =>
+ useQuery({
+ queryKey: auditLogStreamKeys.list(orgId),
+ queryFn: () => fetchAuditLogStreams(),
+ enabled: Boolean(orgId)
+ });
+
+const fetchAuditLogStreamDetails = async (id: string) => {
+ const { data } = await apiRequest.get<{ auditLogStream: TAuditLogStream }>(
+ `/api/v1/audit-log-streams/${id}`
+ );
+
+ return data.auditLogStream;
+};
+
+export const useGetAuditLogStreamDetails = (id: string) =>
+ useQuery({
+ queryKey: auditLogStreamKeys.getById(id),
+ queryFn: () => fetchAuditLogStreamDetails(id),
+ enabled: Boolean(id)
+ });
diff --git a/frontend-v2/src/hooks/api/auditLogStreams/types.ts b/frontend-next/src/hooks/api/auditLogStreams/types.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/auditLogStreams/types.ts
rename to frontend-next/src/hooks/api/auditLogStreams/types.ts
diff --git a/frontend-v2/src/hooks/api/auditLogs/constants.tsx b/frontend-next/src/hooks/api/auditLogs/constants.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/auditLogs/constants.tsx
rename to frontend-next/src/hooks/api/auditLogs/constants.tsx
diff --git a/frontend-v2/src/hooks/api/auditLogs/enums.tsx b/frontend-next/src/hooks/api/auditLogs/enums.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/auditLogs/enums.tsx
rename to frontend-next/src/hooks/api/auditLogs/enums.tsx
diff --git a/frontend-v2/src/hooks/api/auditLogs/index.tsx b/frontend-next/src/hooks/api/auditLogs/index.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/auditLogs/index.tsx
rename to frontend-next/src/hooks/api/auditLogs/index.tsx
diff --git a/frontend-v2/src/hooks/api/auditLogs/queries.tsx b/frontend-next/src/hooks/api/auditLogs/queries.tsx
similarity index 87%
rename from frontend-v2/src/hooks/api/auditLogs/queries.tsx
rename to frontend-next/src/hooks/api/auditLogs/queries.tsx
index 3b851f1cb9..5ec69b0e72 100644
--- a/frontend-v2/src/hooks/api/auditLogs/queries.tsx
+++ b/frontend-next/src/hooks/api/auditLogs/queries.tsx
@@ -1,9 +1,8 @@
-import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
+import { useInfiniteQuery, UseInfiniteQueryOptions, useQuery } from "@tanstack/react-query";
import { AxiosError } from "axios";
import { createNotification } from "@app/components/notifications";
import { apiRequest } from "@app/config/request";
-import { TReactQueryOptions } from "@app/types/reactQuery";
import { Actor, AuditLog, TGetAuditLogsFilter } from "./types";
@@ -17,10 +16,18 @@ export const auditLogKeys = {
export const useGetAuditLogs = (
filters: TGetAuditLogsFilter,
projectId: string | null,
- options: TReactQueryOptions["options"] = {}
+ options: Omit<
+ UseInfiniteQueryOptions<
+ AuditLog[],
+ unknown,
+ AuditLog[],
+ AuditLog[],
+ ReturnType
+ >,
+ "queryFn" | "queryKey" | "getNextPageParam"
+ > = {}
) => {
return useInfiniteQuery({
- initialPageParam: 0,
queryKey: auditLogKeys.getAuditLogs(projectId, filters),
queryFn: async ({ pageParam }) => {
try {
diff --git a/frontend-v2/src/hooks/api/auditLogs/types.tsx b/frontend-next/src/hooks/api/auditLogs/types.tsx
similarity index 99%
rename from frontend-v2/src/hooks/api/auditLogs/types.tsx
rename to frontend-next/src/hooks/api/auditLogs/types.tsx
index 62cf1b823a..5221b50339 100644
--- a/frontend-v2/src/hooks/api/auditLogs/types.tsx
+++ b/frontend-next/src/hooks/api/auditLogs/types.tsx
@@ -45,9 +45,10 @@ export interface IdentityActor {
metadata: IdentityActorMetadata;
}
+export interface PlatformActorMetadata {}
export interface PlatformActor {
type: ActorType.PLATFORM;
- metadata: object;
+ metadata: PlatformActorMetadata;
}
export type Actor = UserActor | ServiceActor | IdentityActor | PlatformActor;
diff --git a/frontend-v2/src/hooks/api/auth/index.tsx b/frontend-next/src/hooks/api/auth/index.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/auth/index.tsx
rename to frontend-next/src/hooks/api/auth/index.tsx
diff --git a/frontend-v2/src/hooks/api/auth/queries.tsx b/frontend-next/src/hooks/api/auth/queries.tsx
similarity index 91%
rename from frontend-v2/src/hooks/api/auth/queries.tsx
rename to frontend-next/src/hooks/api/auth/queries.tsx
index 07baf011ea..0c3dbe0d9a 100644
--- a/frontend-v2/src/hooks/api/auth/queries.tsx
+++ b/frontend-next/src/hooks/api/auth/queries.tsx
@@ -2,9 +2,9 @@ import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
import SecurityClient from "@app/components/utilities/SecurityClient";
import { apiRequest } from "@app/config/request";
+import { setAuthToken } from "@app/reactQuery";
import { organizationKeys } from "../organization/queries";
-import { setAuthToken } from "../reactQuery";
import { workspaceKeys } from "../workspace";
import {
ChangePasswordDTO,
@@ -31,7 +31,7 @@ import {
VerifySignupInviteDTO
} from "./types";
-export const authKeys = {
+const authKeys = {
getAuthToken: ["token"] as const
};
@@ -77,11 +77,16 @@ export const selectOrganization = async (data: {
export const useSelectOrganization = () => {
const queryClient = useQueryClient();
return useMutation({
- mutationFn: async (details: { organizationId: string; userAgent?: UserAgentType }) => {
+ mutationFn: async (details: {
+ organizationId: string;
+ userAgent?: UserAgentType;
+ forceSetCredentials?: boolean;
+ }) => {
const data = await selectOrganization(details);
// If a custom user agent is set, then this session is meant for another consuming application, not the web application.
- if (!details.userAgent && !data.isMfaEnabled) {
+ if ((!details.userAgent && !data.isMfaEnabled) || details.forceSetCredentials) {
+ localStorage.setItem("orgData.id", details.organizationId);
SecurityClient.setToken(data.token);
SecurityClient.setProviderAuthToken("");
}
@@ -89,9 +94,10 @@ export const useSelectOrganization = () => {
return data;
},
onSuccess: () => {
- queryClient.invalidateQueries({
- queryKey: [organizationKeys.getUserOrganizations, workspaceKeys.getAllUserWorkspace]
- });
+ queryClient.invalidateQueries([
+ organizationKeys.getUserOrganizations,
+ workspaceKeys.getAllUserWorkspace
+ ]);
}
});
};
@@ -147,7 +153,7 @@ export const useCompleteAccountSignup = () => {
};
export const useSendMfaToken = () => {
- return useMutation({
+ return useMutation<{}, {}, SendMfaTokenDTO>({
mutationFn: async ({ email }) => {
const { data } = await apiRequest.post("/api/v2/auth/mfa/send", { email });
return data;
@@ -174,7 +180,7 @@ export const verifyMfaToken = async ({
};
export const useVerifyMfaToken = () => {
- return useMutation({
+ return useMutation({
mutationFn: async ({ email, mfaCode, mfaMethod }) => {
return verifyMfaToken({
email,
@@ -300,18 +306,17 @@ export const useChangePassword = () => {
// Refresh token is set as cookie when logged in
// Using that we fetch the auth bearer token needed for auth calls
-export const fetchAuthToken = async () => {
+const fetchAuthToken = async () => {
const { data } = await apiRequest.post("/api/v1/auth/token", undefined, {
withCredentials: true
});
- setAuthToken(data.token);
+
return data;
};
export const useGetAuthToken = () =>
- useQuery({
- queryKey: authKeys.getAuthToken,
- queryFn: fetchAuthToken,
+ useQuery(authKeys.getAuthToken, fetchAuthToken, {
+ onSuccess: (data) => setAuthToken(data.token),
retry: 0
});
diff --git a/frontend-v2/src/hooks/api/auth/types.ts b/frontend-next/src/hooks/api/auth/types.ts
similarity index 99%
rename from frontend-v2/src/hooks/api/auth/types.ts
rename to frontend-next/src/hooks/api/auth/types.ts
index d0c718e48f..fd0604a88b 100644
--- a/frontend-v2/src/hooks/api/auth/types.ts
+++ b/frontend-next/src/hooks/api/auth/types.ts
@@ -1,6 +1,5 @@
export type GetAuthTokenAPI = {
token: string;
- organizationId?: string;
};
export type SendMfaTokenDTO = {
diff --git a/frontend-v2/src/hooks/api/bots/index.tsx b/frontend-next/src/hooks/api/bots/index.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/bots/index.tsx
rename to frontend-next/src/hooks/api/bots/index.tsx
diff --git a/frontend-v2/src/hooks/api/bots/queries.tsx b/frontend-next/src/hooks/api/bots/queries.tsx
similarity index 86%
rename from frontend-v2/src/hooks/api/bots/queries.tsx
rename to frontend-next/src/hooks/api/bots/queries.tsx
index 8b2aedcddd..23049892c0 100644
--- a/frontend-v2/src/hooks/api/bots/queries.tsx
+++ b/frontend-next/src/hooks/api/bots/queries.tsx
@@ -23,7 +23,7 @@ export const useGetWorkspaceBot = (workspaceId: string) =>
export const useUpdateBotActiveStatus = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation<{}, {}, TSetBotActiveStatusDto>({
mutationFn: ({ botId, isActive, botKey }) => {
return apiRequest.patch(`/api/v1/bot/${botId}/active`, {
isActive,
@@ -31,7 +31,7 @@ export const useUpdateBotActiveStatus = () => {
});
},
onSuccess: (_, { workspaceId }) => {
- queryClient.invalidateQueries({ queryKey: queryKeys.getBot(workspaceId) });
+ queryClient.invalidateQueries(queryKeys.getBot(workspaceId));
}
});
};
diff --git a/frontend-v2/src/hooks/api/bots/types.ts b/frontend-next/src/hooks/api/bots/types.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/bots/types.ts
rename to frontend-next/src/hooks/api/bots/types.ts
diff --git a/frontend-v2/src/hooks/api/ca/constants.tsx b/frontend-next/src/hooks/api/ca/constants.tsx
similarity index 82%
rename from frontend-v2/src/hooks/api/ca/constants.tsx
rename to frontend-next/src/hooks/api/ca/constants.tsx
index 8838ef7481..bbc75f90d3 100644
--- a/frontend-v2/src/hooks/api/ca/constants.tsx
+++ b/frontend-next/src/hooks/api/ca/constants.tsx
@@ -1,5 +1,6 @@
-import { SshCaStatus } from "../sshCa";
-import { SshCertTemplateStatus } from "../sshCertificateTemplates";
+import { SshCaStatus } from "@app/hooks/api/ssh-ca";
+import { SshCertTemplateStatus } from "@app/hooks/api/sshCertificateTemplates";
+
import { CaStatus, CaType } from "./enums";
export const caTypeToNameMap: { [K in CaType]: string } = {
diff --git a/frontend-v2/src/hooks/api/ca/enums.tsx b/frontend-next/src/hooks/api/ca/enums.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/ca/enums.tsx
rename to frontend-next/src/hooks/api/ca/enums.tsx
diff --git a/frontend-v2/src/hooks/api/ca/index.tsx b/frontend-next/src/hooks/api/ca/index.tsx
similarity index 62%
rename from frontend-v2/src/hooks/api/ca/index.tsx
rename to frontend-next/src/hooks/api/ca/index.tsx
index 47d7baee8c..4993a8fdcb 100644
--- a/frontend-v2/src/hooks/api/ca/index.tsx
+++ b/frontend-next/src/hooks/api/ca/index.tsx
@@ -8,11 +8,4 @@ export {
useSignIntermediate,
useUpdateCa
} from "./mutations";
-export {
- useGetCaById,
- useGetCaCert,
- useGetCaCerts,
- useGetCaCertTemplates,
- useGetCaCrls,
- useGetCaCsr
-} from "./queries";
+export { useGetCaById, useGetCaCert, useGetCaCerts, useGetCaCertTemplates,useGetCaCrls, useGetCaCsr } from "./queries";
diff --git a/frontend-v2/src/hooks/api/ca/mutations.tsx b/frontend-next/src/hooks/api/ca/mutations.tsx
similarity index 62%
rename from frontend-v2/src/hooks/api/ca/mutations.tsx
rename to frontend-next/src/hooks/api/ca/mutations.tsx
index 93ac4e6f0a..0bbec617b1 100644
--- a/frontend-v2/src/hooks/api/ca/mutations.tsx
+++ b/frontend-next/src/hooks/api/ca/mutations.tsx
@@ -21,7 +21,7 @@ import {
export const useCreateCa = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async (body) => {
const {
data: { ca }
@@ -29,14 +29,14 @@ export const useCreateCa = () => {
return ca;
},
onSuccess: (_, { projectSlug }) => {
- queryClient.invalidateQueries({ queryKey: workspaceKeys.getWorkspaceCas({ projectSlug }) });
+ queryClient.invalidateQueries(workspaceKeys.getWorkspaceCas({ projectSlug }));
}
});
};
export const useUpdateCa = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({ caId, projectSlug, ...body }) => {
const {
data: { ca }
@@ -44,15 +44,15 @@ export const useUpdateCa = () => {
return ca;
},
onSuccess: ({ id }, { projectSlug }) => {
- queryClient.invalidateQueries({ queryKey: workspaceKeys.getWorkspaceCas({ projectSlug }) });
- queryClient.invalidateQueries({ queryKey: caKeys.getCaById(id) });
+ queryClient.invalidateQueries(workspaceKeys.getWorkspaceCas({ projectSlug }));
+ queryClient.invalidateQueries(caKeys.getCaById(id));
}
});
};
export const useDeleteCa = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({ caId }) => {
const {
data: { ca }
@@ -60,14 +60,14 @@ export const useDeleteCa = () => {
return ca;
},
onSuccess: (_, { projectSlug }) => {
- queryClient.invalidateQueries({ queryKey: workspaceKeys.getWorkspaceCas({ projectSlug }) });
+ queryClient.invalidateQueries(workspaceKeys.getWorkspaceCas({ projectSlug }));
}
});
};
export const useSignIntermediate = () => {
// TODO: consider renaming
- return useMutation({
+ return useMutation({
mutationFn: async (body) => {
const { data } = await apiRequest.post(
`/api/v1/pki/ca/${body.caId}/sign-intermediate`,
@@ -80,7 +80,7 @@ export const useSignIntermediate = () => {
export const useImportCaCertificate = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({ caId, ...body }) => {
const { data } = await apiRequest.post(
`/api/v1/pki/ca/${caId}/import-certificate`,
@@ -89,9 +89,9 @@ export const useImportCaCertificate = () => {
return data;
},
onSuccess: (_, { caId, projectSlug }) => {
- queryClient.invalidateQueries({ queryKey: workspaceKeys.getWorkspaceCas({ projectSlug }) });
- queryClient.invalidateQueries({ queryKey: caKeys.getCaCerts(caId) });
- queryClient.invalidateQueries({ queryKey: caKeys.getCaCert(caId) });
+ queryClient.invalidateQueries(workspaceKeys.getWorkspaceCas({ projectSlug }));
+ queryClient.invalidateQueries(caKeys.getCaCerts(caId));
+ queryClient.invalidateQueries(caKeys.getCaCert(caId));
}
});
};
@@ -99,7 +99,7 @@ export const useImportCaCertificate = () => {
// consider rename to issue certificate
export const useCreateCertificate = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async (body) => {
const { data } = await apiRequest.post(
"/api/v1/pki/certificates/issue-certificate",
@@ -108,16 +108,14 @@ export const useCreateCertificate = () => {
return data;
},
onSuccess: (_, { projectSlug }) => {
- queryClient.invalidateQueries({
- queryKey: workspaceKeys.forWorkspaceCertificates(projectSlug)
- });
+ queryClient.invalidateQueries(workspaceKeys.forWorkspaceCertificates(projectSlug));
}
});
};
export const useRenewCa = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async (body) => {
const { data } = await apiRequest.post(
`/api/v1/pki/ca/${body.caId}/renew`,
@@ -126,12 +124,12 @@ export const useRenewCa = () => {
return data;
},
onSuccess: (_, { caId, projectSlug }) => {
- queryClient.invalidateQueries({ queryKey: workspaceKeys.getWorkspaceCas({ projectSlug }) });
- queryClient.invalidateQueries({ queryKey: caKeys.getCaById(caId) });
- queryClient.invalidateQueries({ queryKey: caKeys.getCaCert(caId) });
- queryClient.invalidateQueries({ queryKey: caKeys.getCaCerts(caId) });
- queryClient.invalidateQueries({ queryKey: caKeys.getCaCsr(caId) });
- queryClient.invalidateQueries({ queryKey: caKeys.getCaCrl(caId) });
+ queryClient.invalidateQueries(workspaceKeys.getWorkspaceCas({ projectSlug }));
+ queryClient.invalidateQueries(caKeys.getCaById(caId));
+ queryClient.invalidateQueries(caKeys.getCaCert(caId));
+ queryClient.invalidateQueries(caKeys.getCaCerts(caId));
+ queryClient.invalidateQueries(caKeys.getCaCsr(caId));
+ queryClient.invalidateQueries(caKeys.getCaCrl(caId));
}
});
};
diff --git a/frontend-v2/src/hooks/api/ca/queries.tsx b/frontend-next/src/hooks/api/ca/queries.tsx
similarity index 98%
rename from frontend-v2/src/hooks/api/ca/queries.tsx
rename to frontend-next/src/hooks/api/ca/queries.tsx
index d5eb896446..da010c8665 100644
--- a/frontend-v2/src/hooks/api/ca/queries.tsx
+++ b/frontend-next/src/hooks/api/ca/queries.tsx
@@ -7,7 +7,7 @@ import { TCertificateAuthority } from "./types";
export const caKeys = {
getCaById: (caId: string) => [{ caId }, "ca"],
- getCaCerts: (caId: string) => [{ caId }, "ca-cert"],
+ getCaCerts: (caId: string) => [{ caId }, "ca-certs"],
getCaCrls: (caId: string) => [{ caId }, "ca-crls"],
getCaCert: (caId: string) => [{ caId }, "ca-cert"],
getCaCsr: (caId: string) => [{ caId }, "ca-csr"],
@@ -104,4 +104,4 @@ export const useGetCaCertTemplates = (caId: string) => {
},
enabled: Boolean(caId)
});
-};
+};
\ No newline at end of file
diff --git a/frontend-v2/src/hooks/api/ca/types.ts b/frontend-next/src/hooks/api/ca/types.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/ca/types.ts
rename to frontend-next/src/hooks/api/ca/types.ts
diff --git a/frontend-v2/src/hooks/api/certificateTemplates/index.tsx b/frontend-next/src/hooks/api/certificateTemplates/index.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/certificateTemplates/index.tsx
rename to frontend-next/src/hooks/api/certificateTemplates/index.tsx
diff --git a/frontend-v2/src/hooks/api/certificateTemplates/mutations.tsx b/frontend-next/src/hooks/api/certificateTemplates/mutations.tsx
similarity index 62%
rename from frontend-v2/src/hooks/api/certificateTemplates/mutations.tsx
rename to frontend-next/src/hooks/api/certificateTemplates/mutations.tsx
index 55bbcd4177..8545cf70c8 100644
--- a/frontend-v2/src/hooks/api/certificateTemplates/mutations.tsx
+++ b/frontend-next/src/hooks/api/certificateTemplates/mutations.tsx
@@ -16,7 +16,7 @@ import {
export const useCreateCertTemplate = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async (data) => {
const { data: certificateTemplate } = await apiRequest.post(
"/api/v1/pki/certificate-templates",
@@ -25,17 +25,15 @@ export const useCreateCertTemplate = () => {
return certificateTemplate;
},
onSuccess: ({ caId }, { projectId }) => {
- queryClient.invalidateQueries({
- queryKey: workspaceKeys.getWorkspaceCertificateTemplates(projectId)
- });
- queryClient.invalidateQueries({ queryKey: caKeys.getCaCertTemplates(caId) });
+ queryClient.invalidateQueries(workspaceKeys.getWorkspaceCertificateTemplates(projectId));
+ queryClient.invalidateQueries(caKeys.getCaCertTemplates(caId));
}
});
};
export const useUpdateCertTemplate = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async (data) => {
const { data: certificateTemplate } = await apiRequest.patch(
`/api/v1/pki/certificate-templates/${data.id}`,
@@ -45,18 +43,16 @@ export const useUpdateCertTemplate = () => {
return certificateTemplate;
},
onSuccess: ({ caId }, { projectId, id }) => {
- queryClient.invalidateQueries({
- queryKey: workspaceKeys.getWorkspaceCertificateTemplates(projectId)
- });
- queryClient.invalidateQueries({ queryKey: certTemplateKeys.getCertTemplateById(id) });
- queryClient.invalidateQueries({ queryKey: caKeys.getCaCertTemplates(caId) });
+ queryClient.invalidateQueries(workspaceKeys.getWorkspaceCertificateTemplates(projectId));
+ queryClient.invalidateQueries(certTemplateKeys.getCertTemplateById(id));
+ queryClient.invalidateQueries(caKeys.getCaCertTemplates(caId));
}
});
};
export const useDeleteCertTemplate = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async (data) => {
const { data: certificateTemplate } = await apiRequest.delete(
`/api/v1/pki/certificate-templates/${data.id}`
@@ -64,18 +60,16 @@ export const useDeleteCertTemplate = () => {
return certificateTemplate;
},
onSuccess: ({ caId }, { projectId, id }) => {
- queryClient.invalidateQueries({
- queryKey: workspaceKeys.getWorkspaceCertificateTemplates(projectId)
- });
- queryClient.invalidateQueries({ queryKey: certTemplateKeys.getCertTemplateById(id) });
- queryClient.invalidateQueries({ queryKey: caKeys.getCaCertTemplates(caId) });
+ queryClient.invalidateQueries(workspaceKeys.getWorkspaceCertificateTemplates(projectId));
+ queryClient.invalidateQueries(certTemplateKeys.getCertTemplateById(id));
+ queryClient.invalidateQueries(caKeys.getCaCertTemplates(caId));
}
});
};
export const useCreateEstConfig = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation<{}, {}, TCreateEstConfigDTO>({
mutationFn: async (body) => {
const { data } = await apiRequest.post(
`/api/v1/pki/certificate-templates/${body.certificateTemplateId}/est-config`,
@@ -84,16 +78,14 @@ export const useCreateEstConfig = () => {
return data;
},
onSuccess: (_, { certificateTemplateId }) => {
- queryClient.invalidateQueries({
- queryKey: certTemplateKeys.getEstConfig(certificateTemplateId)
- });
+ queryClient.invalidateQueries(certTemplateKeys.getEstConfig(certificateTemplateId));
}
});
};
export const useUpdateEstConfig = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation<{}, {}, TUpdateEstConfigDTO>({
mutationFn: async (body) => {
const { data } = await apiRequest.patch(
`/api/v1/pki/certificate-templates/${body.certificateTemplateId}/est-config`,
@@ -102,9 +94,7 @@ export const useUpdateEstConfig = () => {
return data;
},
onSuccess: (_, { certificateTemplateId }) => {
- queryClient.invalidateQueries({
- queryKey: certTemplateKeys.getEstConfig(certificateTemplateId)
- });
+ queryClient.invalidateQueries(certTemplateKeys.getEstConfig(certificateTemplateId));
}
});
};
diff --git a/frontend-v2/src/hooks/api/certificateTemplates/queries.tsx b/frontend-next/src/hooks/api/certificateTemplates/queries.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/certificateTemplates/queries.tsx
rename to frontend-next/src/hooks/api/certificateTemplates/queries.tsx
diff --git a/frontend-v2/src/hooks/api/certificateTemplates/types.ts b/frontend-next/src/hooks/api/certificateTemplates/types.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/certificateTemplates/types.ts
rename to frontend-next/src/hooks/api/certificateTemplates/types.ts
diff --git a/frontend-v2/src/hooks/api/certificates/constants.tsx b/frontend-next/src/hooks/api/certificates/constants.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/certificates/constants.tsx
rename to frontend-next/src/hooks/api/certificates/constants.tsx
diff --git a/frontend-v2/src/hooks/api/certificates/enums.tsx b/frontend-next/src/hooks/api/certificates/enums.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/certificates/enums.tsx
rename to frontend-next/src/hooks/api/certificates/enums.tsx
diff --git a/frontend-v2/src/hooks/api/certificates/index.tsx b/frontend-next/src/hooks/api/certificates/index.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/certificates/index.tsx
rename to frontend-next/src/hooks/api/certificates/index.tsx
diff --git a/frontend-v2/src/hooks/api/certificates/mutations.tsx b/frontend-next/src/hooks/api/certificates/mutations.tsx
similarity index 75%
rename from frontend-v2/src/hooks/api/certificates/mutations.tsx
rename to frontend-next/src/hooks/api/certificates/mutations.tsx
index 7e9cf4f91e..d73a0cd15f 100644
--- a/frontend-v2/src/hooks/api/certificates/mutations.tsx
+++ b/frontend-next/src/hooks/api/certificates/mutations.tsx
@@ -7,7 +7,7 @@ import { TCertificate, TDeleteCertDTO, TRevokeCertDTO } from "./types";
export const useDeleteCert = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({ serialNumber }) => {
const {
data: { certificate }
@@ -17,16 +17,14 @@ export const useDeleteCert = () => {
return certificate;
},
onSuccess: (_, { projectSlug }) => {
- queryClient.invalidateQueries({
- queryKey: workspaceKeys.forWorkspaceCertificates(projectSlug)
- });
+ queryClient.invalidateQueries(workspaceKeys.forWorkspaceCertificates(projectSlug));
}
});
};
export const useRevokeCert = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({ serialNumber, revocationReason }) => {
const {
data: { certificate }
@@ -39,9 +37,7 @@ export const useRevokeCert = () => {
return certificate;
},
onSuccess: (_, { projectSlug }) => {
- queryClient.invalidateQueries({
- queryKey: workspaceKeys.forWorkspaceCertificates(projectSlug)
- });
+ queryClient.invalidateQueries(workspaceKeys.forWorkspaceCertificates(projectSlug));
}
});
};
diff --git a/frontend-v2/src/hooks/api/certificates/queries.tsx b/frontend-next/src/hooks/api/certificates/queries.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/certificates/queries.tsx
rename to frontend-next/src/hooks/api/certificates/queries.tsx
diff --git a/frontend-v2/src/hooks/api/certificates/types.ts b/frontend-next/src/hooks/api/certificates/types.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/certificates/types.ts
rename to frontend-next/src/hooks/api/certificates/types.ts
diff --git a/frontend-v2/src/hooks/api/cmeks/index.ts b/frontend-next/src/hooks/api/cmeks/index.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/cmeks/index.ts
rename to frontend-next/src/hooks/api/cmeks/index.ts
diff --git a/frontend-v2/src/hooks/api/cmeks/mutations.tsx b/frontend-next/src/hooks/api/cmeks/mutations.tsx
similarity index 88%
rename from frontend-v2/src/hooks/api/cmeks/mutations.tsx
rename to frontend-next/src/hooks/api/cmeks/mutations.tsx
index 41e70c193c..f3a1e6eaeb 100644
--- a/frontend-v2/src/hooks/api/cmeks/mutations.tsx
+++ b/frontend-next/src/hooks/api/cmeks/mutations.tsx
@@ -22,7 +22,7 @@ export const useCreateCmek = () => {
return data;
},
onSuccess: (_, { projectId }) => {
- queryClient.invalidateQueries({ queryKey: cmekKeys.getCmeksByProjectId({ projectId }) });
+ queryClient.invalidateQueries(cmekKeys.getCmeksByProjectId({ projectId }));
}
});
};
@@ -40,7 +40,7 @@ export const useUpdateCmek = () => {
return data;
},
onSuccess: (_, { projectId }) => {
- queryClient.invalidateQueries({ queryKey: cmekKeys.getCmeksByProjectId({ projectId }) });
+ queryClient.invalidateQueries(cmekKeys.getCmeksByProjectId({ projectId }));
}
});
};
@@ -54,7 +54,7 @@ export const useDeleteCmek = () => {
return data;
},
onSuccess: (_, { projectId }) => {
- queryClient.invalidateQueries({ queryKey: cmekKeys.getCmeksByProjectId({ projectId }) });
+ queryClient.invalidateQueries(cmekKeys.getCmeksByProjectId({ projectId }));
}
});
};
diff --git a/frontend-v2/src/hooks/api/cmeks/queries.tsx b/frontend-next/src/hooks/api/cmeks/queries.tsx
similarity index 96%
rename from frontend-v2/src/hooks/api/cmeks/queries.tsx
rename to frontend-next/src/hooks/api/cmeks/queries.tsx
index 69eedfb429..5c2dac8952 100644
--- a/frontend-v2/src/hooks/api/cmeks/queries.tsx
+++ b/frontend-next/src/hooks/api/cmeks/queries.tsx
@@ -47,7 +47,7 @@ export const useGetCmeksByProjectId = (
return data;
},
enabled: Boolean(projectId) && (options?.enabled ?? true),
- placeholderData: (previousData) => previousData,
+ keepPreviousData: true,
...options
});
};
diff --git a/frontend-v2/src/hooks/api/cmeks/types.ts b/frontend-next/src/hooks/api/cmeks/types.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/cmeks/types.ts
rename to frontend-next/src/hooks/api/cmeks/types.ts
diff --git a/frontend-v2/src/hooks/api/dashboard/index.ts b/frontend-next/src/hooks/api/dashboard/index.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/dashboard/index.ts
rename to frontend-next/src/hooks/api/dashboard/index.ts
diff --git a/frontend-v2/src/hooks/api/dashboard/queries.tsx b/frontend-next/src/hooks/api/dashboard/queries.tsx
similarity index 83%
rename from frontend-v2/src/hooks/api/dashboard/queries.tsx
rename to frontend-next/src/hooks/api/dashboard/queries.tsx
index 4b63be9883..3aa5997168 100644
--- a/frontend-v2/src/hooks/api/dashboard/queries.tsx
+++ b/frontend-next/src/hooks/api/dashboard/queries.tsx
@@ -1,6 +1,8 @@
import { useCallback } from "react";
import { useQuery, UseQueryOptions } from "@tanstack/react-query";
+import axios from "axios";
+import { createNotification } from "@app/components/notifications";
import { apiRequest } from "@app/config/request";
import {
DashboardProjectSecretsByKeys,
@@ -173,6 +175,26 @@ export const useGetProjectSecretsOverview = (
includeDynamicSecrets,
environments
}),
+ onError: (error) => {
+ if (axios.isAxiosError(error)) {
+ const { message, requestId } = error.response?.data as {
+ message: string;
+ requestId: string;
+ };
+ createNotification({
+ title: "Error fetching secret details",
+ type: "error",
+ text: message,
+ copyActions: [
+ {
+ value: requestId,
+ name: "Request ID",
+ label: `Request ID: ${requestId}`
+ }
+ ]
+ });
+ }
+ },
select: useCallback((data: Awaited>) => {
const { secrets, ...select } = data;
const uniqueSecrets = secrets ? unique(secrets, (i) => i.secretKey) : [];
@@ -191,7 +213,7 @@ export const useGetProjectSecretsOverview = (
totalUniqueFoldersInPage: uniqueFolders.length
};
}, []),
- placeholderData: (previousData) => previousData
+ keepPreviousData: true
});
};
@@ -256,6 +278,26 @@ export const useGetProjectSecretsDetails = (
includeDynamicSecrets,
tags
}),
+ onError: (error) => {
+ if (axios.isAxiosError(error)) {
+ const { message, requestId } = error.response?.data as {
+ message: string;
+ requestId: string;
+ };
+ createNotification({
+ title: "Error fetching secret details",
+ type: "error",
+ text: message,
+ copyActions: [
+ {
+ value: requestId,
+ name: "Request ID",
+ label: `Request ID: ${requestId}`
+ }
+ ]
+ });
+ }
+ },
select: useCallback(
(data: Awaited>) => ({
...data,
@@ -263,7 +305,7 @@ export const useGetProjectSecretsDetails = (
}),
[]
),
- placeholderData: (previousData) => previousData
+ keepPreviousData: true
});
};
@@ -331,6 +373,26 @@ export const useGetProjectSecretsQuickSearch = (
environments,
tags
}),
+ onError: (error) => {
+ if (axios.isAxiosError(error)) {
+ const { message, requestId } = error.response?.data as {
+ message: string;
+ requestId: string;
+ };
+ createNotification({
+ title: "Error fetching secrets deep search",
+ type: "error",
+ text: message,
+ copyActions: [
+ {
+ value: requestId,
+ name: "Request ID",
+ label: `Request ID: ${requestId}`
+ }
+ ]
+ });
+ }
+ },
select: useCallback((data: Awaited>) => {
const { secrets, folders, dynamicSecrets } = data;
@@ -351,6 +413,6 @@ export const useGetProjectSecretsQuickSearch = (
dynamicSecrets: groupedDynamicSecrets
};
}, []),
- placeholderData: (previousData) => previousData
+ keepPreviousData: true
});
};
diff --git a/frontend-v2/src/hooks/api/dashboard/types.ts b/frontend-next/src/hooks/api/dashboard/types.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/dashboard/types.ts
rename to frontend-next/src/hooks/api/dashboard/types.ts
diff --git a/frontend-v2/src/hooks/api/dynamicSecret/index.ts b/frontend-next/src/hooks/api/dynamicSecret/index.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/dynamicSecret/index.ts
rename to frontend-next/src/hooks/api/dynamicSecret/index.ts
diff --git a/frontend-v2/src/hooks/api/dynamicSecret/mutation.ts b/frontend-next/src/hooks/api/dynamicSecret/mutation.ts
similarity index 68%
rename from frontend-v2/src/hooks/api/dynamicSecret/mutation.ts
rename to frontend-next/src/hooks/api/dynamicSecret/mutation.ts
index e347e44931..f8fbb4d055 100644
--- a/frontend-v2/src/hooks/api/dynamicSecret/mutation.ts
+++ b/frontend-next/src/hooks/api/dynamicSecret/mutation.ts
@@ -14,7 +14,7 @@ import {
export const useCreateDynamicSecret = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation<{}, {}, TCreateDynamicSecretDTO>({
mutationFn: async (dto) => {
const { data } = await apiRequest.post<{ dynamicSecret: TDynamicSecret }>(
"/api/v1/dynamic-secrets",
@@ -24,10 +24,8 @@ export const useCreateDynamicSecret = () => {
},
onSuccess: (_, { path, environmentSlug, projectSlug }) => {
// TODO: optimize but we currently don't pass projectId
- queryClient.invalidateQueries({ queryKey: dashboardKeys.all() });
- queryClient.invalidateQueries({
- queryKey: dynamicSecretKeys.list({ path, projectSlug, environmentSlug })
- });
+ queryClient.invalidateQueries(dashboardKeys.all());
+ queryClient.invalidateQueries(dynamicSecretKeys.list({ path, projectSlug, environmentSlug }));
}
});
};
@@ -35,7 +33,7 @@ export const useCreateDynamicSecret = () => {
export const useUpdateDynamicSecret = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation<{}, {}, TUpdateDynamicSecretDTO>({
mutationFn: async (dto) => {
const { data } = await apiRequest.patch<{ dynamicSecret: TDynamicSecret }>(
`/api/v1/dynamic-secrets/${dto.name}`,
@@ -45,10 +43,8 @@ export const useUpdateDynamicSecret = () => {
},
onSuccess: (_, { path, environmentSlug, projectSlug }) => {
// TODO: optimize but currently don't pass projectId
- queryClient.invalidateQueries({ queryKey: dashboardKeys.all() });
- queryClient.invalidateQueries({
- queryKey: dynamicSecretKeys.list({ path, projectSlug, environmentSlug })
- });
+ queryClient.invalidateQueries(dashboardKeys.all());
+ queryClient.invalidateQueries(dynamicSecretKeys.list({ path, projectSlug, environmentSlug }));
}
});
};
@@ -56,7 +52,7 @@ export const useUpdateDynamicSecret = () => {
export const useDeleteDynamicSecret = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation<{}, {}, TDeleteDynamicSecretDTO>({
mutationFn: async (dto) => {
const { data } = await apiRequest.delete<{ dynamicSecret: TDynamicSecret }>(
`/api/v1/dynamic-secrets/${dto.name}`,
@@ -66,10 +62,8 @@ export const useDeleteDynamicSecret = () => {
},
onSuccess: (_, { path, environmentSlug, projectSlug }) => {
// TODO: optimize but currently don't pass projectId
- queryClient.invalidateQueries({ queryKey: dashboardKeys.all() });
- queryClient.invalidateQueries({
- queryKey: dynamicSecretKeys.list({ path, projectSlug, environmentSlug })
- });
+ queryClient.invalidateQueries(dashboardKeys.all());
+ queryClient.invalidateQueries(dynamicSecretKeys.list({ path, projectSlug, environmentSlug }));
}
});
};
diff --git a/frontend-v2/src/hooks/api/dynamicSecret/queries.ts b/frontend-next/src/hooks/api/dynamicSecret/queries.ts
similarity index 97%
rename from frontend-v2/src/hooks/api/dynamicSecret/queries.ts
rename to frontend-next/src/hooks/api/dynamicSecret/queries.ts
index 860e8917a0..f84fd07124 100644
--- a/frontend-v2/src/hooks/api/dynamicSecret/queries.ts
+++ b/frontend-next/src/hooks/api/dynamicSecret/queries.ts
@@ -80,12 +80,12 @@ export const useGetDynamicSecretProviderData = ({
tenantId: string;
applicationId: string;
clientSecret: string;
- enabled: boolean;
+ enabled: boolean
}) => {
return useQuery({
queryKey: ["users"],
queryFn: async () => {
- const { data } = await apiRequest.post<{ id: string; email: string; name: string }[]>(
+ const { data } = await apiRequest.post<{id:string, email: string, name:string}[]>(
"/api/v1/dynamic-secrets/entra-id/users",
{
tenantId,
diff --git a/frontend-v2/src/hooks/api/dynamicSecret/types.ts b/frontend-next/src/hooks/api/dynamicSecret/types.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/dynamicSecret/types.ts
rename to frontend-next/src/hooks/api/dynamicSecret/types.ts
diff --git a/frontend-v2/src/hooks/api/dynamicSecretLease/index.ts b/frontend-next/src/hooks/api/dynamicSecretLease/index.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/dynamicSecretLease/index.ts
rename to frontend-next/src/hooks/api/dynamicSecretLease/index.ts
diff --git a/frontend-v2/src/hooks/api/dynamicSecretLease/mutation.ts b/frontend-next/src/hooks/api/dynamicSecretLease/mutation.ts
similarity index 69%
rename from frontend-v2/src/hooks/api/dynamicSecretLease/mutation.ts
rename to frontend-next/src/hooks/api/dynamicSecretLease/mutation.ts
index 1a95a3ab0e..3ed2b75d94 100644
--- a/frontend-v2/src/hooks/api/dynamicSecretLease/mutation.ts
+++ b/frontend-next/src/hooks/api/dynamicSecretLease/mutation.ts
@@ -15,7 +15,7 @@ export const useCreateDynamicSecretLease = () => {
return useMutation<
{ lease: TDynamicSecretLease; data: unknown },
- object,
+ {},
TCreateDynamicSecretLeaseDTO
>({
mutationFn: async (dto) => {
@@ -26,14 +26,9 @@ export const useCreateDynamicSecretLease = () => {
return data;
},
onSuccess: (_, { path, environmentSlug, projectSlug, dynamicSecretName }) => {
- queryClient.invalidateQueries({
- queryKey: dynamicSecretLeaseKeys.list({
- path,
- projectSlug,
- environmentSlug,
- dynamicSecretName
- })
- });
+ queryClient.invalidateQueries(
+ dynamicSecretLeaseKeys.list({ path, projectSlug, environmentSlug, dynamicSecretName })
+ );
}
});
};
@@ -41,7 +36,7 @@ export const useCreateDynamicSecretLease = () => {
export const useRenewDynamicSecretLease = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation<{}, {}, TRenewDynamicSecretLeaseDTO>({
mutationFn: async (dto) => {
const { data } = await apiRequest.post<{ lease: TDynamicSecretLease }>(
`/api/v1/dynamic-secrets/leases/${dto.leaseId}/renew`,
@@ -50,14 +45,9 @@ export const useRenewDynamicSecretLease = () => {
return data.lease;
},
onSuccess: (_, { path, environmentSlug, projectSlug, dynamicSecretName }) => {
- queryClient.invalidateQueries({
- queryKey: dynamicSecretLeaseKeys.list({
- path,
- projectSlug,
- environmentSlug,
- dynamicSecretName
- })
- });
+ queryClient.invalidateQueries(
+ dynamicSecretLeaseKeys.list({ path, projectSlug, environmentSlug, dynamicSecretName })
+ );
}
});
};
@@ -65,7 +55,7 @@ export const useRenewDynamicSecretLease = () => {
export const useRevokeDynamicSecretLease = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation<{}, {}, TRevokeDynamicSecretLeaseDTO>({
mutationFn: async (dto) => {
const { data } = await apiRequest.delete<{ lease: TDynamicSecretLease }>(
`/api/v1/dynamic-secrets/leases/${dto.leaseId}`,
@@ -74,14 +64,9 @@ export const useRevokeDynamicSecretLease = () => {
return data.lease;
},
onSuccess: (_, { path, environmentSlug, projectSlug, dynamicSecretName }) => {
- queryClient.invalidateQueries({
- queryKey: dynamicSecretLeaseKeys.list({
- path,
- projectSlug,
- environmentSlug,
- dynamicSecretName
- })
- });
+ queryClient.invalidateQueries(
+ dynamicSecretLeaseKeys.list({ path, projectSlug, environmentSlug, dynamicSecretName })
+ );
}
});
};
diff --git a/frontend-v2/src/hooks/api/dynamicSecretLease/queries.ts b/frontend-next/src/hooks/api/dynamicSecretLease/queries.ts
similarity index 88%
rename from frontend-v2/src/hooks/api/dynamicSecretLease/queries.ts
rename to frontend-next/src/hooks/api/dynamicSecretLease/queries.ts
index 095ece0f73..556c0edbfd 100644
--- a/frontend-v2/src/hooks/api/dynamicSecretLease/queries.ts
+++ b/frontend-next/src/hooks/api/dynamicSecretLease/queries.ts
@@ -17,12 +17,7 @@ export const useGetDynamicSecretLeases = ({
enabled = true
}: TListDynamicSecretLeaseDTO) => {
return useQuery({
- queryKey: dynamicSecretLeaseKeys.list({
- path,
- environmentSlug,
- projectSlug,
- dynamicSecretName
- }),
+ queryKey: dynamicSecretLeaseKeys.list({ path, environmentSlug, projectSlug, dynamicSecretName }),
enabled: Boolean(projectSlug && environmentSlug && path && dynamicSecretName && enabled),
queryFn: async () => {
const { data } = await apiRequest.get<{ leases: TDynamicSecretLease[] }>(
@@ -40,3 +35,5 @@ export const useGetDynamicSecretLeases = ({
}
});
};
+
+
diff --git a/frontend-v2/src/hooks/api/dynamicSecretLease/types.ts b/frontend-next/src/hooks/api/dynamicSecretLease/types.ts
similarity index 99%
rename from frontend-v2/src/hooks/api/dynamicSecretLease/types.ts
rename to frontend-next/src/hooks/api/dynamicSecretLease/types.ts
index 76bedc8b3d..e6fbb0e758 100644
--- a/frontend-v2/src/hooks/api/dynamicSecretLease/types.ts
+++ b/frontend-next/src/hooks/api/dynamicSecretLease/types.ts
@@ -46,3 +46,4 @@ export type TRevokeDynamicSecretLeaseDTO = {
environmentSlug: string;
isForced?: boolean;
};
+
diff --git a/frontend-v2/src/hooks/api/externalGroupOrgRoleMappings/index.ts b/frontend-next/src/hooks/api/externalGroupOrgRoleMappings/index.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/externalGroupOrgRoleMappings/index.ts
rename to frontend-next/src/hooks/api/externalGroupOrgRoleMappings/index.ts
diff --git a/frontend-v2/src/hooks/api/externalGroupOrgRoleMappings/mutations.tsx b/frontend-next/src/hooks/api/externalGroupOrgRoleMappings/mutations.tsx
similarity index 88%
rename from frontend-v2/src/hooks/api/externalGroupOrgRoleMappings/mutations.tsx
rename to frontend-next/src/hooks/api/externalGroupOrgRoleMappings/mutations.tsx
index ccf4f567db..aac46726a1 100644
--- a/frontend-v2/src/hooks/api/externalGroupOrgRoleMappings/mutations.tsx
+++ b/frontend-next/src/hooks/api/externalGroupOrgRoleMappings/mutations.tsx
@@ -13,7 +13,7 @@ export const useUpdateExternalGroupOrgRoleMappings = () => {
return data;
},
onSuccess: () => {
- queryClient.invalidateQueries({ queryKey: externalGroupOrgRoleMappingKeys.list() });
+ queryClient.invalidateQueries(externalGroupOrgRoleMappingKeys.list());
}
});
};
diff --git a/frontend-v2/src/hooks/api/externalGroupOrgRoleMappings/queries.tsx b/frontend-next/src/hooks/api/externalGroupOrgRoleMappings/queries.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/externalGroupOrgRoleMappings/queries.tsx
rename to frontend-next/src/hooks/api/externalGroupOrgRoleMappings/queries.tsx
diff --git a/frontend-v2/src/hooks/api/externalGroupOrgRoleMappings/types.ts b/frontend-next/src/hooks/api/externalGroupOrgRoleMappings/types.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/externalGroupOrgRoleMappings/types.ts
rename to frontend-next/src/hooks/api/externalGroupOrgRoleMappings/types.ts
diff --git a/frontend-v2/src/hooks/api/generic/types.ts b/frontend-next/src/hooks/api/generic/types.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/generic/types.ts
rename to frontend-next/src/hooks/api/generic/types.ts
diff --git a/frontend-v2/src/hooks/api/groups/index.tsx b/frontend-next/src/hooks/api/groups/index.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/groups/index.tsx
rename to frontend-next/src/hooks/api/groups/index.tsx
diff --git a/frontend-v2/src/hooks/api/groups/mutations.tsx b/frontend-next/src/hooks/api/groups/mutations.tsx
similarity index 77%
rename from frontend-v2/src/hooks/api/groups/mutations.tsx
rename to frontend-next/src/hooks/api/groups/mutations.tsx
index d45971995f..2f5c5984ce 100644
--- a/frontend-v2/src/hooks/api/groups/mutations.tsx
+++ b/frontend-next/src/hooks/api/groups/mutations.tsx
@@ -29,7 +29,7 @@ export const useCreateGroup = () => {
return group;
},
onSuccess: (_, { organizationId }) => {
- queryClient.invalidateQueries({ queryKey: organizationKeys.getOrgGroups(organizationId) });
+ queryClient.invalidateQueries(organizationKeys.getOrgGroups(organizationId));
}
});
};
@@ -57,8 +57,8 @@ export const useUpdateGroup = () => {
return group;
},
onSuccess: ({ orgId, id: groupId }) => {
- queryClient.invalidateQueries({ queryKey: organizationKeys.getOrgGroups(orgId) });
- queryClient.invalidateQueries({ queryKey: groupKeys.getGroupById(groupId) });
+ queryClient.invalidateQueries(organizationKeys.getOrgGroups(orgId));
+ queryClient.invalidateQueries(groupKeys.getGroupById(groupId));
}
});
};
@@ -72,8 +72,8 @@ export const useDeleteGroup = () => {
return group;
},
onSuccess: ({ orgId, id: groupId }) => {
- queryClient.invalidateQueries({ queryKey: organizationKeys.getOrgGroups(orgId) });
- queryClient.invalidateQueries({ queryKey: groupKeys.getGroupById(groupId) });
+ queryClient.invalidateQueries(organizationKeys.getOrgGroups(orgId));
+ queryClient.invalidateQueries(groupKeys.getGroupById(groupId));
}
});
};
@@ -94,7 +94,7 @@ export const useAddUserToGroup = () => {
return data;
},
onSuccess: (_, { slug }) => {
- queryClient.invalidateQueries({ queryKey: groupKeys.forGroupUserMemberships(slug) });
+ queryClient.invalidateQueries(groupKeys.forGroupUserMemberships(slug));
}
});
};
@@ -117,8 +117,8 @@ export const useRemoveUserFromGroup = () => {
return data;
},
onSuccess: (_, { slug, username }) => {
- queryClient.invalidateQueries({ queryKey: groupKeys.forGroupUserMemberships(slug) });
- queryClient.invalidateQueries({ queryKey: userKeys.listUserGroupMemberships(username) });
+ queryClient.invalidateQueries(groupKeys.forGroupUserMemberships(slug));
+ queryClient.invalidateQueries(userKeys.listUserGroupMemberships(username));
}
});
};
diff --git a/frontend-v2/src/hooks/api/groups/queries.tsx b/frontend-next/src/hooks/api/groups/queries.tsx
similarity index 97%
rename from frontend-v2/src/hooks/api/groups/queries.tsx
rename to frontend-next/src/hooks/api/groups/queries.tsx
index eb10085bc7..dc3791db79 100644
--- a/frontend-v2/src/hooks/api/groups/queries.tsx
+++ b/frontend-next/src/hooks/api/groups/queries.tsx
@@ -60,7 +60,7 @@ export const useListGroupUsers = ({
filter
}),
enabled: Boolean(groupSlug),
- placeholderData: (previousData) => previousData,
+ keepPreviousData: true,
queryFn: async () => {
const params = new URLSearchParams({
offset: String(offset),
diff --git a/frontend-v2/src/hooks/api/groups/types.ts b/frontend-next/src/hooks/api/groups/types.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/groups/types.ts
rename to frontend-next/src/hooks/api/groups/types.ts
diff --git a/frontend-v2/src/hooks/api/identities/constants.tsx b/frontend-next/src/hooks/api/identities/constants.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/identities/constants.tsx
rename to frontend-next/src/hooks/api/identities/constants.tsx
diff --git a/frontend-v2/src/hooks/api/identities/enums.tsx b/frontend-next/src/hooks/api/identities/enums.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/identities/enums.tsx
rename to frontend-next/src/hooks/api/identities/enums.tsx
diff --git a/frontend-v2/src/hooks/api/identities/index.tsx b/frontend-next/src/hooks/api/identities/index.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/identities/index.tsx
rename to frontend-next/src/hooks/api/identities/index.tsx
diff --git a/frontend-v2/src/hooks/api/identities/mutations.tsx b/frontend-next/src/hooks/api/identities/mutations.tsx
similarity index 66%
rename from frontend-v2/src/hooks/api/identities/mutations.tsx
rename to frontend-next/src/hooks/api/identities/mutations.tsx
index 42de92e71b..8daaae2365 100644
--- a/frontend-v2/src/hooks/api/identities/mutations.tsx
+++ b/frontend-next/src/hooks/api/identities/mutations.tsx
@@ -55,7 +55,7 @@ import {
export const useCreateIdentity = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async (body) => {
const {
data: { identity }
@@ -63,16 +63,14 @@ export const useCreateIdentity = () => {
return identity;
},
onSuccess: (_, { organizationId }) => {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
- });
+ queryClient.invalidateQueries(organizationKeys.getOrgIdentityMemberships(organizationId));
}
});
};
export const useUpdateIdentity = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({ identityId, name, role, metadata }) => {
const {
data: { identity }
@@ -85,17 +83,15 @@ export const useUpdateIdentity = () => {
return identity;
},
onSuccess: (_, { organizationId, identityId }) => {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
- });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityById(identityId) });
+ queryClient.invalidateQueries(organizationKeys.getOrgIdentityMemberships(organizationId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityById(identityId));
}
});
};
export const useDeleteIdentity = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({ identityId }) => {
const {
data: { identity }
@@ -103,9 +99,7 @@ export const useDeleteIdentity = () => {
return identity;
},
onSuccess: (_, { organizationId }) => {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
- });
+ queryClient.invalidateQueries(organizationKeys.getOrgIdentityMemberships(organizationId));
}
});
};
@@ -114,7 +108,7 @@ export const useDeleteIdentity = () => {
export const useAddIdentityUniversalAuth = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({
identityId,
clientSecretTrustedIps,
@@ -135,20 +129,16 @@ export const useAddIdentityUniversalAuth = () => {
return identityUniversalAuth;
},
onSuccess: (_, { identityId, organizationId }) => {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
- });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityById(identityId) });
- queryClient.invalidateQueries({
- queryKey: identitiesKeys.getIdentityUniversalAuth(identityId)
- });
+ queryClient.invalidateQueries(organizationKeys.getOrgIdentityMemberships(organizationId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityById(identityId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityUniversalAuth(identityId));
}
});
};
export const useUpdateIdentityUniversalAuth = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({
identityId,
clientSecretTrustedIps,
@@ -169,20 +159,16 @@ export const useUpdateIdentityUniversalAuth = () => {
return identityUniversalAuth;
},
onSuccess: (_, { identityId, organizationId }) => {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
- });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityById(identityId) });
- queryClient.invalidateQueries({
- queryKey: identitiesKeys.getIdentityUniversalAuth(identityId)
- });
+ queryClient.invalidateQueries(organizationKeys.getOrgIdentityMemberships(organizationId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityById(identityId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityUniversalAuth(identityId));
}
});
};
export const useDeleteIdentityUniversalAuth = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({ identityId }) => {
const {
data: { identityUniversalAuth }
@@ -190,13 +176,9 @@ export const useDeleteIdentityUniversalAuth = () => {
return identityUniversalAuth;
},
onSuccess: (_, { organizationId, identityId }) => {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
- });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityById(identityId) });
- queryClient.invalidateQueries({
- queryKey: identitiesKeys.getIdentityUniversalAuth(identityId)
- });
+ queryClient.invalidateQueries(organizationKeys.getOrgIdentityMemberships(organizationId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityById(identityId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityUniversalAuth(identityId));
}
});
};
@@ -205,7 +187,7 @@ export const useCreateIdentityUniversalAuthClientSecret = () => {
const queryClient = useQueryClient();
return useMutation<
CreateIdentityUniversalAuthClientSecretRes,
- object,
+ {},
CreateIdentityUniversalAuthClientSecretDTO
>({
mutationFn: async ({ identityId, description, ttl, numUsesLimit }) => {
@@ -220,16 +202,16 @@ export const useCreateIdentityUniversalAuthClientSecret = () => {
return data;
},
onSuccess: (_, { identityId }) => {
- queryClient.invalidateQueries({
- queryKey: identitiesKeys.getIdentityUniversalAuthClientSecrets(identityId)
- });
+ queryClient.invalidateQueries(
+ identitiesKeys.getIdentityUniversalAuthClientSecrets(identityId)
+ );
}
});
};
export const useRevokeIdentityUniversalAuthClientSecret = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({ identityId, clientSecretId }) => {
const {
data: { clientSecretData }
@@ -239,16 +221,16 @@ export const useRevokeIdentityUniversalAuthClientSecret = () => {
return clientSecretData;
},
onSuccess: (_, { identityId }) => {
- queryClient.invalidateQueries({
- queryKey: identitiesKeys.getIdentityUniversalAuthClientSecrets(identityId)
- });
+ queryClient.invalidateQueries(
+ identitiesKeys.getIdentityUniversalAuthClientSecrets(identityId)
+ );
}
});
};
export const useAddIdentityGcpAuth = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({
identityId,
type,
@@ -279,18 +261,16 @@ export const useAddIdentityGcpAuth = () => {
return identityGcpAuth;
},
onSuccess: (_, { identityId, organizationId }) => {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
- });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityById(identityId) });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityGcpAuth(identityId) });
+ queryClient.invalidateQueries(organizationKeys.getOrgIdentityMemberships(organizationId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityById(identityId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityGcpAuth(identityId));
}
});
};
export const useUpdateIdentityGcpAuth = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({
identityId,
type,
@@ -321,18 +301,16 @@ export const useUpdateIdentityGcpAuth = () => {
return identityGcpAuth;
},
onSuccess: (_, { identityId, organizationId }) => {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
- });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityById(identityId) });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityGcpAuth(identityId) });
+ queryClient.invalidateQueries(organizationKeys.getOrgIdentityMemberships(organizationId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityById(identityId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityGcpAuth(identityId));
}
});
};
export const useDeleteIdentityGcpAuth = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({ identityId }) => {
const {
data: { identityGcpAuth }
@@ -340,18 +318,16 @@ export const useDeleteIdentityGcpAuth = () => {
return identityGcpAuth;
},
onSuccess: (_, { organizationId, identityId }) => {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
- });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityById(identityId) });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityGcpAuth(identityId) });
+ queryClient.invalidateQueries(organizationKeys.getOrgIdentityMemberships(organizationId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityById(identityId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityGcpAuth(identityId));
}
});
};
export const useAddIdentityAwsAuth = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({
identityId,
stsEndpoint,
@@ -380,18 +356,16 @@ export const useAddIdentityAwsAuth = () => {
return identityAwsAuth;
},
onSuccess: (_, { identityId, organizationId }) => {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
- });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityById(identityId) });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityAwsAuth(identityId) });
+ queryClient.invalidateQueries(organizationKeys.getOrgIdentityMemberships(organizationId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityById(identityId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityAwsAuth(identityId));
}
});
};
export const useUpdateIdentityAwsAuth = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({
identityId,
stsEndpoint,
@@ -420,18 +394,16 @@ export const useUpdateIdentityAwsAuth = () => {
return identityAwsAuth;
},
onSuccess: (_, { identityId, organizationId }) => {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
- });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityById(identityId) });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityAwsAuth(identityId) });
+ queryClient.invalidateQueries(organizationKeys.getOrgIdentityMemberships(organizationId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityById(identityId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityAwsAuth(identityId));
}
});
};
export const useDeleteIdentityAwsAuth = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({ identityId }) => {
const {
data: { identityAwsAuth }
@@ -439,18 +411,16 @@ export const useDeleteIdentityAwsAuth = () => {
return identityAwsAuth;
},
onSuccess: (_, { organizationId, identityId }) => {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
- });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityById(identityId) });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityAwsAuth(identityId) });
+ queryClient.invalidateQueries(organizationKeys.getOrgIdentityMemberships(organizationId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityById(identityId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityAwsAuth(identityId));
}
});
};
export const useUpdateIdentityOidcAuth = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({
identityId,
accessTokenTTL,
@@ -485,18 +455,16 @@ export const useUpdateIdentityOidcAuth = () => {
return identityOidcAuth;
},
onSuccess: (_, { identityId, organizationId }) => {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
- });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityById(identityId) });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityOidcAuth(identityId) });
+ queryClient.invalidateQueries(organizationKeys.getOrgIdentityMemberships(organizationId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityById(identityId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityOidcAuth(identityId));
}
});
};
export const useAddIdentityOidcAuth = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({
identityId,
oidcDiscoveryUrl,
@@ -531,18 +499,16 @@ export const useAddIdentityOidcAuth = () => {
return identityOidcAuth;
},
onSuccess: (_, { identityId, organizationId }) => {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
- });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityById(identityId) });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityOidcAuth(identityId) });
+ queryClient.invalidateQueries(organizationKeys.getOrgIdentityMemberships(organizationId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityById(identityId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityOidcAuth(identityId));
}
});
};
export const useDeleteIdentityOidcAuth = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({ identityId }) => {
const {
data: { identityOidcAuth }
@@ -550,17 +516,15 @@ export const useDeleteIdentityOidcAuth = () => {
return identityOidcAuth;
},
onSuccess: (_, { organizationId, identityId }) => {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
- });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityById(identityId) });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityOidcAuth(identityId) });
+ queryClient.invalidateQueries(organizationKeys.getOrgIdentityMemberships(organizationId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityById(identityId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityOidcAuth(identityId));
}
});
};
export const useUpdateIdentityJwtAuth = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({
identityId,
configurationType,
@@ -599,18 +563,16 @@ export const useUpdateIdentityJwtAuth = () => {
return identityJwtAuth;
},
onSuccess: (_, { identityId, organizationId }) => {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
- });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityById(identityId) });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityJwtAuth(identityId) });
+ queryClient.invalidateQueries(organizationKeys.getOrgIdentityMemberships(organizationId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityById(identityId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityJwtAuth(identityId));
}
});
};
export const useAddIdentityJwtAuth = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({
identityId,
configurationType,
@@ -649,18 +611,16 @@ export const useAddIdentityJwtAuth = () => {
return identityJwtAuth;
},
onSuccess: (_, { identityId, organizationId }) => {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
- });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityById(identityId) });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityJwtAuth(identityId) });
+ queryClient.invalidateQueries(organizationKeys.getOrgIdentityMemberships(organizationId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityById(identityId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityJwtAuth(identityId));
}
});
};
export const useDeleteIdentityJwtAuth = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({ identityId }) => {
const {
data: { identityJwtAuth }
@@ -668,18 +628,16 @@ export const useDeleteIdentityJwtAuth = () => {
return identityJwtAuth;
},
onSuccess: (_, { organizationId, identityId }) => {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
- });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityById(identityId) });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityJwtAuth(identityId) });
+ queryClient.invalidateQueries(organizationKeys.getOrgIdentityMemberships(organizationId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityById(identityId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityJwtAuth(identityId));
}
});
};
export const useAddIdentityAzureAuth = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({
identityId,
tenantId,
@@ -708,20 +666,16 @@ export const useAddIdentityAzureAuth = () => {
return identityAzureAuth;
},
onSuccess: (_, { identityId, organizationId }) => {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
- });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityById(identityId) });
- queryClient.invalidateQueries({
- queryKey: identitiesKeys.getIdentityKubernetesAuth(identityId)
- });
+ queryClient.invalidateQueries(organizationKeys.getOrgIdentityMemberships(organizationId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityById(identityId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityKubernetesAuth(identityId));
}
});
};
export const useAddIdentityKubernetesAuth = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({
identityId,
kubernetesHost,
@@ -756,18 +710,16 @@ export const useAddIdentityKubernetesAuth = () => {
return identityKubernetesAuth;
},
onSuccess: (_, { identityId, organizationId }) => {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
- });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityById(identityId) });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityAzureAuth(identityId) });
+ queryClient.invalidateQueries(organizationKeys.getOrgIdentityMemberships(organizationId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityById(identityId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityAzureAuth(identityId));
}
});
};
export const useUpdateIdentityAzureAuth = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({
identityId,
tenantId,
@@ -796,18 +748,16 @@ export const useUpdateIdentityAzureAuth = () => {
return identityAzureAuth;
},
onSuccess: (_, { identityId, organizationId }) => {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
- });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityById(identityId) });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityAzureAuth(identityId) });
+ queryClient.invalidateQueries(organizationKeys.getOrgIdentityMemberships(organizationId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityById(identityId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityAzureAuth(identityId));
}
});
};
export const useDeleteIdentityAzureAuth = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({ identityId }) => {
const {
data: { identityAzureAuth }
@@ -815,18 +765,16 @@ export const useDeleteIdentityAzureAuth = () => {
return identityAzureAuth;
},
onSuccess: (_, { organizationId, identityId }) => {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
- });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityById(identityId) });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityAzureAuth(identityId) });
+ queryClient.invalidateQueries(organizationKeys.getOrgIdentityMemberships(organizationId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityById(identityId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityAzureAuth(identityId));
}
});
};
export const useUpdateIdentityKubernetesAuth = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({
identityId,
kubernetesHost,
@@ -861,20 +809,16 @@ export const useUpdateIdentityKubernetesAuth = () => {
return identityKubernetesAuth;
},
onSuccess: (_, { identityId, organizationId }) => {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
- });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityById(identityId) });
- queryClient.invalidateQueries({
- queryKey: identitiesKeys.getIdentityKubernetesAuth(identityId)
- });
+ queryClient.invalidateQueries(organizationKeys.getOrgIdentityMemberships(organizationId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityById(identityId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityKubernetesAuth(identityId));
}
});
};
export const useDeleteIdentityKubernetesAuth = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({ identityId }) => {
const {
data: { identityKubernetesAuth }
@@ -882,20 +826,16 @@ export const useDeleteIdentityKubernetesAuth = () => {
return identityKubernetesAuth;
},
onSuccess: (_, { organizationId, identityId }) => {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
- });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityById(identityId) });
- queryClient.invalidateQueries({
- queryKey: identitiesKeys.getIdentityKubernetesAuth(identityId)
- });
+ queryClient.invalidateQueries(organizationKeys.getOrgIdentityMemberships(organizationId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityById(identityId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityKubernetesAuth(identityId));
}
});
};
export const useAddIdentityTokenAuth = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({
identityId,
accessTokenTTL,
@@ -918,20 +858,16 @@ export const useAddIdentityTokenAuth = () => {
return identityTokenAuth;
},
onSuccess: (_, { identityId, organizationId }) => {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
- });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityById(identityId) });
- queryClient.invalidateQueries({
- queryKey: identitiesKeys.getIdentityUniversalAuth(identityId)
- });
+ queryClient.invalidateQueries(organizationKeys.getOrgIdentityMemberships(organizationId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityById(identityId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityUniversalAuth(identityId));
}
});
};
export const useUpdateIdentityTokenAuth = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({
identityId,
accessTokenTTL,
@@ -954,20 +890,16 @@ export const useUpdateIdentityTokenAuth = () => {
return identityTokenAuth;
},
onSuccess: (_, { identityId, organizationId }) => {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
- });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityById(identityId) });
- queryClient.invalidateQueries({
- queryKey: identitiesKeys.getIdentityUniversalAuth(identityId)
- });
+ queryClient.invalidateQueries(organizationKeys.getOrgIdentityMemberships(organizationId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityById(identityId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityUniversalAuth(identityId));
}
});
};
export const useDeleteIdentityTokenAuth = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({ identityId }) => {
const {
data: { identityTokenAuth }
@@ -975,18 +907,16 @@ export const useDeleteIdentityTokenAuth = () => {
return identityTokenAuth;
},
onSuccess: (_, { organizationId, identityId }) => {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgIdentityMemberships(organizationId)
- });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityById(identityId) });
- queryClient.invalidateQueries({ queryKey: identitiesKeys.getIdentityTokenAuth(identityId) });
+ queryClient.invalidateQueries(organizationKeys.getOrgIdentityMemberships(organizationId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityById(identityId));
+ queryClient.invalidateQueries(identitiesKeys.getIdentityTokenAuth(identityId));
}
});
};
export const useCreateTokenIdentityTokenAuth = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({ identityId, name }) => {
const { data } = await apiRequest.post(
`/api/v1/auth/token-auth/identities/${identityId}/tokens`,
@@ -998,16 +928,14 @@ export const useCreateTokenIdentityTokenAuth = () => {
return data;
},
onSuccess: (_, { identityId }) => {
- queryClient.invalidateQueries({
- queryKey: identitiesKeys.getIdentityTokensTokenAuth(identityId)
- });
+ queryClient.invalidateQueries(identitiesKeys.getIdentityTokensTokenAuth(identityId));
}
});
};
export const useUpdateIdentityTokenAuthToken = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({ tokenId, name }) => {
const {
data: { token }
@@ -1021,16 +949,14 @@ export const useUpdateIdentityTokenAuthToken = () => {
return token;
},
onSuccess: (_, { identityId }) => {
- queryClient.invalidateQueries({
- queryKey: identitiesKeys.getIdentityTokensTokenAuth(identityId)
- });
+ queryClient.invalidateQueries(identitiesKeys.getIdentityTokensTokenAuth(identityId));
}
});
};
export const useRevokeIdentityTokenAuthToken = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({ tokenId }) => {
const { data } = await apiRequest.post(
`/api/v1/auth/token-auth/tokens/${tokenId}/revoke`
@@ -1039,9 +965,7 @@ export const useRevokeIdentityTokenAuthToken = () => {
return data;
},
onSuccess: (_, { identityId }) => {
- queryClient.invalidateQueries({
- queryKey: identitiesKeys.getIdentityTokensTokenAuth(identityId)
- });
+ queryClient.invalidateQueries(identitiesKeys.getIdentityTokensTokenAuth(identityId));
}
});
};
diff --git a/frontend-v2/src/hooks/api/identities/queries.tsx b/frontend-next/src/hooks/api/identities/queries.tsx
similarity index 84%
rename from frontend-v2/src/hooks/api/identities/queries.tsx
rename to frontend-next/src/hooks/api/identities/queries.tsx
index 0058823591..49136614eb 100644
--- a/frontend-v2/src/hooks/api/identities/queries.tsx
+++ b/frontend-next/src/hooks/api/identities/queries.tsx
@@ -1,7 +1,6 @@
-import { useQuery } from "@tanstack/react-query";
+import { useQuery, UseQueryOptions } from "@tanstack/react-query";
import { apiRequest } from "@app/config/request";
-import { TReactQueryOptions } from "@app/types/reactQuery";
import {
ClientSecretData,
@@ -70,7 +69,12 @@ export const useGetIdentityProjectMemberships = (identityId: string) => {
export const useGetIdentityUniversalAuth = (
identityId: string,
- options?: TReactQueryOptions["options"]
+ options?: UseQueryOptions<
+ IdentityUniversalAuth,
+ unknown,
+ IdentityUniversalAuth,
+ ReturnType
+ >
) => {
return useQuery({
queryKey: identitiesKeys.getIdentityUniversalAuth(identityId),
@@ -82,7 +86,7 @@ export const useGetIdentityUniversalAuth = (
);
return identityUniversalAuth;
},
- gcTime: 0,
+ cacheTime: 0,
staleTime: 0,
...options,
enabled: Boolean(identityId) && (options?.enabled ?? true)
@@ -106,7 +110,12 @@ export const useGetIdentityUniversalAuthClientSecrets = (identityId: string) =>
export const useGetIdentityGcpAuth = (
identityId: string,
- options?: TReactQueryOptions["options"]
+ options?: UseQueryOptions<
+ IdentityGcpAuth,
+ unknown,
+ IdentityGcpAuth,
+ ReturnType
+ >
) => {
return useQuery({
queryKey: identitiesKeys.getIdentityGcpAuth(identityId),
@@ -119,7 +128,7 @@ export const useGetIdentityGcpAuth = (
return identityGcpAuth;
},
staleTime: 0,
- gcTime: 0,
+ cacheTime: 0,
...options,
enabled: Boolean(identityId) && (options?.enabled ?? true)
});
@@ -127,7 +136,12 @@ export const useGetIdentityGcpAuth = (
export const useGetIdentityAwsAuth = (
identityId: string,
- options?: TReactQueryOptions["options"]
+ options?: UseQueryOptions<
+ IdentityAwsAuth,
+ unknown,
+ IdentityAwsAuth,
+ ReturnType
+ >
) => {
return useQuery({
queryKey: identitiesKeys.getIdentityAwsAuth(identityId),
@@ -140,7 +154,7 @@ export const useGetIdentityAwsAuth = (
return identityAwsAuth;
},
staleTime: 0,
- gcTime: 0,
+ cacheTime: 0,
...options,
enabled: Boolean(identityId) && (options?.enabled ?? true)
});
@@ -148,7 +162,12 @@ export const useGetIdentityAwsAuth = (
export const useGetIdentityAzureAuth = (
identityId: string,
- options?: TReactQueryOptions["options"]
+ options?: UseQueryOptions<
+ IdentityAzureAuth,
+ unknown,
+ IdentityAzureAuth,
+ ReturnType
+ >
) => {
return useQuery({
queryKey: identitiesKeys.getIdentityAzureAuth(identityId),
@@ -161,7 +180,7 @@ export const useGetIdentityAzureAuth = (
return identityAzureAuth;
},
staleTime: 0,
- gcTime: 0,
+ cacheTime: 0,
...options,
enabled: Boolean(identityId) && (options?.enabled ?? true)
});
@@ -169,7 +188,12 @@ export const useGetIdentityAzureAuth = (
export const useGetIdentityKubernetesAuth = (
identityId: string,
- options?: TReactQueryOptions["options"]
+ options?: UseQueryOptions<
+ IdentityKubernetesAuth,
+ unknown,
+ IdentityKubernetesAuth,
+ ReturnType
+ >
) => {
return useQuery({
queryKey: identitiesKeys.getIdentityKubernetesAuth(identityId),
@@ -182,7 +206,7 @@ export const useGetIdentityKubernetesAuth = (
return identityKubernetesAuth;
},
staleTime: 0,
- gcTime: 0,
+ cacheTime: 0,
...options,
enabled: Boolean(identityId) && (options?.enabled ?? true)
});
@@ -190,7 +214,12 @@ export const useGetIdentityKubernetesAuth = (
export const useGetIdentityTokenAuth = (
identityId: string,
- options?: TReactQueryOptions["options"]
+ options?: UseQueryOptions<
+ IdentityTokenAuth,
+ unknown,
+ IdentityTokenAuth,
+ ReturnType
+ >
) => {
return useQuery({
queryKey: identitiesKeys.getIdentityTokenAuth(identityId),
@@ -203,7 +232,7 @@ export const useGetIdentityTokenAuth = (
return identityTokenAuth;
},
staleTime: 0,
- gcTime: 0,
+ cacheTime: 0,
...options,
enabled: Boolean(identityId) && (options?.enabled ?? true)
});
@@ -226,7 +255,12 @@ export const useGetIdentityTokensTokenAuth = (identityId: string) => {
export const useGetIdentityOidcAuth = (
identityId: string,
- options?: TReactQueryOptions["options"]
+ options?: UseQueryOptions<
+ IdentityOidcAuth,
+ unknown,
+ IdentityOidcAuth,
+ ReturnType
+ >
) => {
return useQuery({
queryKey: identitiesKeys.getIdentityOidcAuth(identityId),
@@ -239,7 +273,7 @@ export const useGetIdentityOidcAuth = (
return identityOidcAuth;
},
staleTime: 0,
- gcTime: 0,
+ cacheTime: 0,
...options,
enabled: Boolean(identityId) && (options?.enabled ?? true)
});
@@ -247,7 +281,12 @@ export const useGetIdentityOidcAuth = (
export const useGetIdentityJwtAuth = (
identityId: string,
- options?: TReactQueryOptions["options"]
+ options?: UseQueryOptions<
+ IdentityJwtAuth,
+ unknown,
+ IdentityJwtAuth,
+ ReturnType
+ >
) => {
return useQuery({
queryKey: identitiesKeys.getIdentityJwtAuth(identityId),
@@ -261,7 +300,7 @@ export const useGetIdentityJwtAuth = (
return identityJwtAuth;
},
staleTime: 0,
- gcTime: 0,
+ cacheTime: 0,
...options,
enabled: Boolean(identityId) && (options?.enabled ?? true)
});
diff --git a/frontend-v2/src/hooks/api/identities/types.ts b/frontend-next/src/hooks/api/identities/types.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/identities/types.ts
rename to frontend-next/src/hooks/api/identities/types.ts
diff --git a/frontend-v2/src/hooks/api/identityProjectAdditionalPrivilege/index.tsx b/frontend-next/src/hooks/api/identityProjectAdditionalPrivilege/index.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/identityProjectAdditionalPrivilege/index.tsx
rename to frontend-next/src/hooks/api/identityProjectAdditionalPrivilege/index.tsx
diff --git a/frontend-v2/src/hooks/api/identityProjectAdditionalPrivilege/mutation.tsx b/frontend-next/src/hooks/api/identityProjectAdditionalPrivilege/mutation.tsx
similarity index 72%
rename from frontend-v2/src/hooks/api/identityProjectAdditionalPrivilege/mutation.tsx
rename to frontend-next/src/hooks/api/identityProjectAdditionalPrivilege/mutation.tsx
index 96b0c420a0..ab8a2e5d17 100644
--- a/frontend-v2/src/hooks/api/identityProjectAdditionalPrivilege/mutation.tsx
+++ b/frontend-next/src/hooks/api/identityProjectAdditionalPrivilege/mutation.tsx
@@ -13,15 +13,13 @@ import {
export const useCreateIdentityProjectAdditionalPrivilege = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async (dto) => {
const { data } = await apiRequest.post("/api/v2/identity-project-additional-privilege", dto);
return data.privilege;
},
onSuccess: (_, { projectId, identityId }) => {
- queryClient.invalidateQueries({
- queryKey: identitiyProjectPrivilegeKeys.list({ projectId, identityId })
- });
+ queryClient.invalidateQueries(identitiyProjectPrivilegeKeys.list({ projectId, identityId }));
}
});
};
@@ -29,7 +27,7 @@ export const useCreateIdentityProjectAdditionalPrivilege = () => {
export const useUpdateIdentityProjectAdditionalPrivilege = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({ projectId, privilegeId, identityId, permissions, slug, type }) => {
const { data: res } = await apiRequest.patch(
`/api/v2/identity-project-additional-privilege/${privilegeId}`,
@@ -45,9 +43,7 @@ export const useUpdateIdentityProjectAdditionalPrivilege = () => {
return res.privilege;
},
onSuccess: (_, { projectId, identityId }) => {
- queryClient.invalidateQueries({
- queryKey: identitiyProjectPrivilegeKeys.list({ projectId, identityId })
- });
+ queryClient.invalidateQueries(identitiyProjectPrivilegeKeys.list({ projectId, identityId }));
}
});
};
@@ -55,7 +51,7 @@ export const useUpdateIdentityProjectAdditionalPrivilege = () => {
export const useDeleteIdentityProjectAdditionalPrivilege = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({ identityId, projectId, privilegeId }) => {
const { data } = await apiRequest.delete(
`/api/v2/identity-project-additional-privilege/${privilegeId}`,
@@ -70,9 +66,7 @@ export const useDeleteIdentityProjectAdditionalPrivilege = () => {
return data.privilege;
},
onSuccess: (_, { projectId, identityId }) => {
- queryClient.invalidateQueries({
- queryKey: identitiyProjectPrivilegeKeys.list({ projectId, identityId })
- });
+ queryClient.invalidateQueries(identitiyProjectPrivilegeKeys.list({ projectId, identityId }));
}
});
};
diff --git a/frontend-v2/src/hooks/api/identityProjectAdditionalPrivilege/queries.tsx b/frontend-next/src/hooks/api/identityProjectAdditionalPrivilege/queries.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/identityProjectAdditionalPrivilege/queries.tsx
rename to frontend-next/src/hooks/api/identityProjectAdditionalPrivilege/queries.tsx
diff --git a/frontend-v2/src/hooks/api/identityProjectAdditionalPrivilege/types.tsx b/frontend-next/src/hooks/api/identityProjectAdditionalPrivilege/types.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/identityProjectAdditionalPrivilege/types.tsx
rename to frontend-next/src/hooks/api/identityProjectAdditionalPrivilege/types.tsx
diff --git a/frontend-v2/src/hooks/api/incidentContacts/index.tsx b/frontend-next/src/hooks/api/incidentContacts/index.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/incidentContacts/index.tsx
rename to frontend-next/src/hooks/api/incidentContacts/index.tsx
diff --git a/frontend-v2/src/hooks/api/incidentContacts/queries.tsx b/frontend-next/src/hooks/api/incidentContacts/queries.tsx
similarity index 82%
rename from frontend-v2/src/hooks/api/incidentContacts/queries.tsx
rename to frontend-next/src/hooks/api/incidentContacts/queries.tsx
index d79117e535..98f95d7852 100644
--- a/frontend-v2/src/hooks/api/incidentContacts/queries.tsx
+++ b/frontend-next/src/hooks/api/incidentContacts/queries.tsx
@@ -25,7 +25,7 @@ export const useGetOrgIncidentContact = (orgId: string) =>
export const useAddIncidentContact = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation<{}, {}, AddIncidentContactDTO>({
mutationFn: async ({ orgId, email }) => {
const { data } = await apiRequest.post(`/api/v1/organization/${orgId}/incidentContactOrg`, {
email
@@ -33,7 +33,7 @@ export const useAddIncidentContact = () => {
return data;
},
onSuccess: (_, { orgId }) => {
- queryClient.invalidateQueries({ queryKey: incidentContactKeys.getAllContact(orgId) });
+ queryClient.invalidateQueries(incidentContactKeys.getAllContact(orgId));
}
});
};
@@ -41,7 +41,7 @@ export const useAddIncidentContact = () => {
export const useDeleteIncidentContact = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation<{}, {}, DeleteIncidentContactDTO>({
mutationFn: async ({ orgId, incidentContactId }) => {
const { data } = await apiRequest.delete(
`/api/v1/organization/${orgId}/incidentContactOrg/${incidentContactId}`
@@ -49,7 +49,7 @@ export const useDeleteIncidentContact = () => {
return data;
},
onSuccess: (_, { orgId }) => {
- queryClient.invalidateQueries({ queryKey: incidentContactKeys.getAllContact(orgId) });
+ queryClient.invalidateQueries(incidentContactKeys.getAllContact(orgId));
}
});
};
diff --git a/frontend-v2/src/hooks/api/incidentContacts/types.ts b/frontend-next/src/hooks/api/incidentContacts/types.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/incidentContacts/types.ts
rename to frontend-next/src/hooks/api/incidentContacts/types.ts
diff --git a/frontend-v2/src/hooks/api/index.tsx b/frontend-next/src/hooks/api/index.tsx
similarity index 98%
rename from frontend-v2/src/hooks/api/index.tsx
rename to frontend-next/src/hooks/api/index.tsx
index 441b5ba861..19a6fcc06d 100644
--- a/frontend-v2/src/hooks/api/index.tsx
+++ b/frontend-next/src/hooks/api/index.tsx
@@ -38,7 +38,7 @@ export * from "./secretSharing";
export * from "./secretSnapshots";
export * from "./serverDetails";
export * from "./serviceTokens";
-export * from "./sshCa";
+export * from "./ssh-ca";
export * from "./sshCertificateTemplates";
export * from "./ssoConfig";
export * from "./subscriptions";
diff --git a/frontend-v2/src/hooks/api/integrationAuth/index.tsx b/frontend-next/src/hooks/api/integrationAuth/index.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/integrationAuth/index.tsx
rename to frontend-next/src/hooks/api/integrationAuth/index.tsx
diff --git a/frontend-v2/src/hooks/api/integrationAuth/mutations.tsx b/frontend-next/src/hooks/api/integrationAuth/mutations.tsx
similarity index 87%
rename from frontend-v2/src/hooks/api/integrationAuth/mutations.tsx
rename to frontend-next/src/hooks/api/integrationAuth/mutations.tsx
index b66eea530a..b7a3f18bd6 100644
--- a/frontend-v2/src/hooks/api/integrationAuth/mutations.tsx
+++ b/frontend-next/src/hooks/api/integrationAuth/mutations.tsx
@@ -6,7 +6,7 @@ import { IntegrationAuth, TDuplicateIntegrationAuthDTO } from "./types";
// For now, this should only be used in the Github app integration flow.
export const useDuplicateIntegrationAuth = () => {
- return useMutation({
+ return useMutation({
mutationFn: async (body) => {
const { data } = await apiRequest.post<{ integrationAuth: IntegrationAuth }>(
`/api/v1/integration-auth/${body.integrationAuthId}/duplicate`,
diff --git a/frontend-v2/src/hooks/api/integrationAuth/queries.tsx b/frontend-next/src/hooks/api/integrationAuth/queries.tsx
similarity index 95%
rename from frontend-v2/src/hooks/api/integrationAuth/queries.tsx
rename to frontend-next/src/hooks/api/integrationAuth/queries.tsx
index 44b199a247..84a50ae1f6 100644
--- a/frontend-v2/src/hooks/api/integrationAuth/queries.tsx
+++ b/frontend-next/src/hooks/api/integrationAuth/queries.tsx
@@ -1,7 +1,6 @@
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useMutation, useQuery, useQueryClient, UseQueryOptions } from "@tanstack/react-query";
import { apiRequest } from "@app/config/request";
-import { TReactQueryOptions } from "@app/types/reactQuery";
import { workspaceKeys } from "../workspace";
import {
@@ -514,6 +513,15 @@ const fetchIntegrationAuthOctopusDeployScopeValues = async ({
return data;
};
+const fetchIntegrationAuthCircleCIOrganizations = async (integrationAuthId: string) => {
+ const {
+ data: { organizations }
+ } = await apiRequest.get<{
+ organizations: CircleCIOrganization[];
+ }>(`/api/v1/integration-auth/${integrationAuthId}/circleci/organizations`);
+ return organizations;
+};
+
export const useGetIntegrationAuthById = (integrationAuthId: string) => {
return useQuery({
queryKey: integrationAuthKeys.getIntegrationAuthById(integrationAuthId),
@@ -534,7 +542,11 @@ export const useGetIntegrationAuthApps = (
azureDevOpsOrgName?: string;
workspaceSlug?: string;
},
- options?: TReactQueryOptions["options"]
+ options?: UseQueryOptions<
+ Awaited>,
+ unknown,
+ Awaited>
+ >
) => {
return useQuery({
queryKey: integrationAuthKeys.getIntegrationAuthApps(integrationAuthId, teamId, workspaceSlug),
@@ -806,7 +818,11 @@ export const useGetIntegrationAuthOctopusDeploySpaces = (integrationAuthId: stri
export const useGetIntegrationAuthOctopusDeployScopeValues = (
params: TGetIntegrationAuthOctopusDeployScopeValuesDTO,
- options?: TReactQueryOptions["options"]
+ options?: UseQueryOptions<
+ TOctopusDeployVariableSetScopeValues,
+ unknown,
+ TOctopusDeployVariableSetScopeValues
+ >
) =>
useQuery({
queryKey: integrationAuthKeys.getIntegrationAuthOctopusDeployScopeValues(params),
@@ -824,7 +840,7 @@ export const useGetIntegrationAuthBitBucketEnvironments = (
workspaceSlug: string;
repoSlug: string;
},
- options?: TReactQueryOptions["options"]
+ options?: UseQueryOptions
) => {
return useQuery({
queryKey: integrationAuthKeys.getIntegrationAuthBitBucketEnvironments(
@@ -838,21 +854,6 @@ export const useGetIntegrationAuthBitBucketEnvironments = (
});
};
-const fetchIntegrationAuthCircleCIOrganizations = async (integrationAuthId: string) => {
- const {
- data: { organizations }
- } = await apiRequest.get<{
- organizations: CircleCIOrganization[];
- }>(`/api/v1/integration-auth/${integrationAuthId}/circleci/organizations`);
- return organizations;
-};
-export const useGetIntegrationAuthCircleCIOrganizations = (integrationAuthId: string) => {
- return useQuery({
- queryKey: integrationAuthKeys.getIntegrationAuthCircleCIOrganizations(integrationAuthId),
- queryFn: () => fetchIntegrationAuthCircleCIOrganizations(integrationAuthId)
- });
-};
-
export const useGetIntegrationAuthNorthflankSecretGroups = ({
integrationAuthId,
appId
@@ -895,6 +896,13 @@ export const useGetIntegrationAuthTeamCityBuildConfigs = ({
});
};
+export const useGetIntegrationAuthCircleCIOrganizations = (integrationAuthId: string) => {
+ return useQuery({
+ queryKey: integrationAuthKeys.getIntegrationAuthCircleCIOrganizations(integrationAuthId),
+ queryFn: () => fetchIntegrationAuthCircleCIOrganizations(integrationAuthId)
+ });
+};
+
export const useAuthorizeIntegration = () => {
const queryClient = useQueryClient();
@@ -925,9 +933,7 @@ export const useAuthorizeIntegration = () => {
return integrationAuth;
},
onSuccess: (res) => {
- queryClient.invalidateQueries({
- queryKey: { queryKey: workspaceKeys.getWorkspaceAuthorization(res.workspace) }
- });
+ queryClient.invalidateQueries(workspaceKeys.getWorkspaceAuthorization(res.workspace));
}
});
};
@@ -971,9 +977,7 @@ export const useSaveIntegrationAccessToken = () => {
return integrationAuth;
},
onSuccess: (res) => {
- queryClient.invalidateQueries({
- queryKey: workspaceKeys.getWorkspaceAuthorization(res.workspace)
- });
+ queryClient.invalidateQueries(workspaceKeys.getWorkspaceAuthorization(res.workspace));
}
});
};
@@ -981,7 +985,7 @@ export const useSaveIntegrationAccessToken = () => {
export const useDeleteIntegrationAuths = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation<{}, {}, { integration: string; workspaceId: string }>({
mutationFn: ({ integration, workspaceId }) =>
apiRequest.delete(
`/api/v1/integration-auth?${new URLSearchParams({
@@ -990,12 +994,8 @@ export const useDeleteIntegrationAuths = () => {
})}`
),
onSuccess: (_, { workspaceId }) => {
- queryClient.invalidateQueries({
- queryKey: workspaceKeys.getWorkspaceAuthorization(workspaceId)
- });
- queryClient.invalidateQueries({
- queryKey: workspaceKeys.getWorkspaceIntegrations(workspaceId)
- });
+ queryClient.invalidateQueries(workspaceKeys.getWorkspaceAuthorization(workspaceId));
+ queryClient.invalidateQueries(workspaceKeys.getWorkspaceIntegrations(workspaceId));
}
});
};
@@ -1004,15 +1004,11 @@ export const useDeleteIntegrationAuth = () => {
// not used
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation<{}, {}, { id: string; workspaceId: string }>({
mutationFn: ({ id }) => apiRequest.delete(`/api/v1/integration-auth/${id}`),
onSuccess: (_, { workspaceId }) => {
- queryClient.invalidateQueries({
- queryKey: workspaceKeys.getWorkspaceAuthorization(workspaceId)
- });
- queryClient.invalidateQueries({
- queryKey: workspaceKeys.getWorkspaceIntegrations(workspaceId)
- });
+ queryClient.invalidateQueries(workspaceKeys.getWorkspaceAuthorization(workspaceId));
+ queryClient.invalidateQueries(workspaceKeys.getWorkspaceIntegrations(workspaceId));
}
});
};
diff --git a/frontend-v2/src/hooks/api/integrationAuth/types.ts b/frontend-next/src/hooks/api/integrationAuth/types.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/integrationAuth/types.ts
rename to frontend-next/src/hooks/api/integrationAuth/types.ts
diff --git a/frontend-v2/src/hooks/api/integrations/index.tsx b/frontend-next/src/hooks/api/integrations/index.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/integrations/index.tsx
rename to frontend-next/src/hooks/api/integrations/index.tsx
diff --git a/frontend-v2/src/hooks/api/integrations/queries.tsx b/frontend-next/src/hooks/api/integrations/queries.tsx
similarity index 90%
rename from frontend-v2/src/hooks/api/integrations/queries.tsx
rename to frontend-next/src/hooks/api/integrations/queries.tsx
index 2b90d5e9a3..5c059ae984 100644
--- a/frontend-v2/src/hooks/api/integrations/queries.tsx
+++ b/frontend-next/src/hooks/api/integrations/queries.tsx
@@ -80,6 +80,7 @@ export const useCreateIntegration = () => {
key: string;
value: string;
}[];
+ azureLabel?: string;
githubVisibility?: string;
githubVisibilityRepoIds?: string[];
kmsKeyId?: string;
@@ -114,9 +115,7 @@ export const useCreateIntegration = () => {
return integration;
},
onSuccess: (res) => {
- queryClient.invalidateQueries({
- queryKey: workspaceKeys.getWorkspaceIntegrations(res.workspace)
- });
+ queryClient.invalidateQueries(workspaceKeys.getWorkspaceIntegrations(res.workspace));
}
});
};
@@ -125,8 +124,8 @@ export const useDeleteIntegration = () => {
const queryClient = useQueryClient();
return useMutation<
- object,
- object,
+ {},
+ {},
{ id: string; workspaceId: string; shouldDeleteIntegrationSecrets: boolean }
>({
mutationFn: ({ id, shouldDeleteIntegrationSecrets }) =>
@@ -134,12 +133,8 @@ export const useDeleteIntegration = () => {
`/api/v1/integration/${id}?shouldDeleteIntegrationSecrets=${shouldDeleteIntegrationSecrets}`
),
onSuccess: (_, { workspaceId }) => {
- queryClient.invalidateQueries({
- queryKey: workspaceKeys.getWorkspaceIntegrations(workspaceId)
- });
- queryClient.invalidateQueries({
- queryKey: workspaceKeys.getWorkspaceAuthorization(workspaceId)
- });
+ queryClient.invalidateQueries(workspaceKeys.getWorkspaceIntegrations(workspaceId));
+ queryClient.invalidateQueries(workspaceKeys.getWorkspaceAuthorization(workspaceId));
}
});
};
@@ -165,7 +160,7 @@ export const useGetIntegration = (
};
export const useSyncIntegration = () => {
- return useMutation({
+ return useMutation<{}, {}, { id: string; workspaceId: string; lastUsed: string }>({
mutationFn: ({ id }) => apiRequest.post(`/api/v1/integration/${id}/sync`),
onSuccess: () => {
createNotification({
diff --git a/frontend-v2/src/hooks/api/integrations/types.ts b/frontend-next/src/hooks/api/integrations/types.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/integrations/types.ts
rename to frontend-next/src/hooks/api/integrations/types.ts
diff --git a/frontend-v2/src/hooks/api/keys/index.tsx b/frontend-next/src/hooks/api/keys/index.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/keys/index.tsx
rename to frontend-next/src/hooks/api/keys/index.tsx
diff --git a/frontend-v2/src/hooks/api/keys/queries.tsx b/frontend-next/src/hooks/api/keys/queries.tsx
similarity index 96%
rename from frontend-v2/src/hooks/api/keys/queries.tsx
rename to frontend-next/src/hooks/api/keys/queries.tsx
index f902f85d37..7e59c08408 100644
--- a/frontend-v2/src/hooks/api/keys/queries.tsx
+++ b/frontend-next/src/hooks/api/keys/queries.tsx
@@ -31,7 +31,7 @@ export const uploadWsKey = async ({ workspaceId, userId, encryptedKey, nonce }:
};
export const useUploadWsKey = () =>
- useMutation({
+ useMutation<{}, {}, UploadWsKeyDTO>({
mutationFn: async ({ encryptedKey, nonce, userId, workspaceId }) => {
return uploadWsKey({
workspaceId,
diff --git a/frontend-v2/src/hooks/api/keys/types.ts b/frontend-next/src/hooks/api/keys/types.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/keys/types.ts
rename to frontend-next/src/hooks/api/keys/types.ts
diff --git a/frontend-v2/src/hooks/api/kms/index.tsx b/frontend-next/src/hooks/api/kms/index.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/kms/index.tsx
rename to frontend-next/src/hooks/api/kms/index.tsx
diff --git a/frontend-v2/src/hooks/api/kms/mutations.tsx b/frontend-next/src/hooks/api/kms/mutations.tsx
similarity index 85%
rename from frontend-v2/src/hooks/api/kms/mutations.tsx
rename to frontend-next/src/hooks/api/kms/mutations.tsx
index 2bf27bf6a0..b87c495c93 100644
--- a/frontend-v2/src/hooks/api/kms/mutations.tsx
+++ b/frontend-next/src/hooks/api/kms/mutations.tsx
@@ -24,7 +24,7 @@ export const useAddExternalKms = (orgId: string) => {
return data;
},
onSuccess: () => {
- queryClient.invalidateQueries({ queryKey: kmsKeys.getExternalKmsList(orgId) });
+ queryClient.invalidateQueries(kmsKeys.getExternalKmsList(orgId));
}
});
};
@@ -49,8 +49,8 @@ export const useUpdateExternalKms = (orgId: string) => {
return data;
},
onSuccess: (_, { kmsId }) => {
- queryClient.invalidateQueries({ queryKey: kmsKeys.getExternalKmsList(orgId) });
- queryClient.invalidateQueries({ queryKey: kmsKeys.getExternalKmsById(kmsId) });
+ queryClient.invalidateQueries(kmsKeys.getExternalKmsList(orgId));
+ queryClient.invalidateQueries(kmsKeys.getExternalKmsById(kmsId));
}
});
};
@@ -64,7 +64,7 @@ export const useRemoveExternalKms = (orgId: string) => {
return data;
},
onSuccess: () => {
- queryClient.invalidateQueries({ queryKey: kmsKeys.getExternalKmsList(orgId) });
+ queryClient.invalidateQueries(kmsKeys.getExternalKmsList(orgId));
}
});
};
@@ -82,7 +82,7 @@ export const useUpdateProjectKms = (projectId: string) => {
return data;
},
onSuccess: () => {
- queryClient.invalidateQueries({ queryKey: kmsKeys.getActiveProjectKms(projectId) });
+ queryClient.invalidateQueries(kmsKeys.getActiveProjectKms(projectId));
}
});
};
@@ -98,7 +98,7 @@ export const useLoadProjectKmsBackup = (projectId: string) => {
return data;
},
onSuccess: () => {
- queryClient.invalidateQueries({ queryKey: kmsKeys.getActiveProjectKms(projectId) });
+ queryClient.invalidateQueries(kmsKeys.getActiveProjectKms(projectId));
}
});
};
@@ -139,7 +139,7 @@ export const useExternalKmsFetchGcpKeys = (orgId: string) => {
return data;
},
onSuccess: () => {
- queryClient.invalidateQueries({ queryKey: kmsKeys.getExternalKmsList(orgId) });
+ queryClient.invalidateQueries(kmsKeys.getExternalKmsList(orgId));
}
});
};
diff --git a/frontend-v2/src/hooks/api/kms/queries.tsx b/frontend-next/src/hooks/api/kms/queries.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/kms/queries.tsx
rename to frontend-next/src/hooks/api/kms/queries.tsx
diff --git a/frontend-v2/src/hooks/api/kms/types.ts b/frontend-next/src/hooks/api/kms/types.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/kms/types.ts
rename to frontend-next/src/hooks/api/kms/types.ts
diff --git a/frontend-v2/src/hooks/api/ldapConfig/index.tsx b/frontend-next/src/hooks/api/ldapConfig/index.tsx
similarity index 80%
rename from frontend-v2/src/hooks/api/ldapConfig/index.tsx
rename to frontend-next/src/hooks/api/ldapConfig/index.tsx
index fcb392f246..20ba1469a8 100644
--- a/frontend-v2/src/hooks/api/ldapConfig/index.tsx
+++ b/frontend-next/src/hooks/api/ldapConfig/index.tsx
@@ -3,6 +3,5 @@ export {
useCreateLDAPGroupMapping,
useDeleteLDAPGroupMapping,
useTestLDAPConnection,
- useUpdateLDAPConfig
-} from "./mutations";
+ useUpdateLDAPConfig} from "./mutations";
export { useGetLDAPConfig, useGetLDAPGroupMaps } from "./queries";
diff --git a/frontend-v2/src/hooks/api/ldapConfig/mutations.tsx b/frontend-next/src/hooks/api/ldapConfig/mutations.tsx
similarity index 89%
rename from frontend-v2/src/hooks/api/ldapConfig/mutations.tsx
rename to frontend-next/src/hooks/api/ldapConfig/mutations.tsx
index 6bab003cba..2014f52bd0 100644
--- a/frontend-v2/src/hooks/api/ldapConfig/mutations.tsx
+++ b/frontend-next/src/hooks/api/ldapConfig/mutations.tsx
@@ -49,7 +49,7 @@ export const useCreateLDAPConfig = () => {
return data;
},
onSuccess(_, dto) {
- queryClient.invalidateQueries({ queryKey: ldapConfigKeys.getLDAPConfig(dto.organizationId) });
+ queryClient.invalidateQueries(ldapConfigKeys.getLDAPConfig(dto.organizationId));
}
});
};
@@ -99,7 +99,7 @@ export const useUpdateLDAPConfig = () => {
return data;
},
onSuccess(_, dto) {
- queryClient.invalidateQueries({ queryKey: ldapConfigKeys.getLDAPConfig(dto.organizationId) });
+ queryClient.invalidateQueries(ldapConfigKeys.getLDAPConfig(dto.organizationId));
}
});
};
@@ -123,7 +123,7 @@ export const useCreateLDAPGroupMapping = () => {
return data;
},
onSuccess(_, { ldapConfigId }) {
- queryClient.invalidateQueries({ queryKey: ldapConfigKeys.getLDAPGroupMaps(ldapConfigId) });
+ queryClient.invalidateQueries(ldapConfigKeys.getLDAPGroupMaps(ldapConfigId));
}
});
};
@@ -144,7 +144,7 @@ export const useDeleteLDAPGroupMapping = () => {
return data;
},
onSuccess(_, { ldapConfigId }) {
- queryClient.invalidateQueries({ queryKey: ldapConfigKeys.getLDAPGroupMaps(ldapConfigId) });
+ queryClient.invalidateQueries(ldapConfigKeys.getLDAPGroupMaps(ldapConfigId));
}
});
};
diff --git a/frontend-v2/src/hooks/api/ldapConfig/queries.tsx b/frontend-next/src/hooks/api/ldapConfig/queries.tsx
similarity index 98%
rename from frontend-v2/src/hooks/api/ldapConfig/queries.tsx
rename to frontend-next/src/hooks/api/ldapConfig/queries.tsx
index d3358014b1..e92a7a1c76 100644
--- a/frontend-v2/src/hooks/api/ldapConfig/queries.tsx
+++ b/frontend-next/src/hooks/api/ldapConfig/queries.tsx
@@ -19,7 +19,7 @@ export const useGetLDAPConfig = (organizationId: string) => {
);
return data;
- } catch {
+ } catch (err) {
return null;
}
},
diff --git a/frontend-v2/src/hooks/api/ldapConfig/types.ts b/frontend-next/src/hooks/api/ldapConfig/types.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/ldapConfig/types.ts
rename to frontend-next/src/hooks/api/ldapConfig/types.ts
diff --git a/frontend-v2/src/hooks/api/migration/mutations.tsx b/frontend-next/src/hooks/api/migration/mutations.tsx
similarity index 79%
rename from frontend-v2/src/hooks/api/migration/mutations.tsx
rename to frontend-next/src/hooks/api/migration/mutations.tsx
index c2b903f8a6..feee7778df 100644
--- a/frontend-v2/src/hooks/api/migration/mutations.tsx
+++ b/frontend-next/src/hooks/api/migration/mutations.tsx
@@ -21,9 +21,7 @@ export const useImportEnvKey = () => {
"Content-Type": "multipart/form-data"
},
onUploadProgress: (progressEvent) => {
- const percentCompleted = Math.round(
- (progressEvent.loaded * 100) / (progressEvent?.total || 1)
- );
+ const percentCompleted = Math.round((progressEvent.loaded * 100) / progressEvent.total);
console.log(`Upload Progress: ${percentCompleted}%`);
}
});
@@ -34,9 +32,7 @@ export const useImportEnvKey = () => {
}
},
onSuccess: () => {
- queryClient.invalidateQueries({
- queryKey: workspaceKeys.getAllUserWorkspace(ProjectType.SecretManager)
- });
+ queryClient.invalidateQueries(workspaceKeys.getAllUserWorkspace(ProjectType.SecretManager));
}
});
};
diff --git a/frontend-v2/src/hooks/api/oidcConfig/index.tsx b/frontend-next/src/hooks/api/oidcConfig/index.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/oidcConfig/index.tsx
rename to frontend-next/src/hooks/api/oidcConfig/index.tsx
diff --git a/frontend-v2/src/hooks/api/oidcConfig/mutations.tsx b/frontend-next/src/hooks/api/oidcConfig/mutations.tsx
similarity index 90%
rename from frontend-v2/src/hooks/api/oidcConfig/mutations.tsx
rename to frontend-next/src/hooks/api/oidcConfig/mutations.tsx
index b29ebd333f..9f57c0332b 100644
--- a/frontend-v2/src/hooks/api/oidcConfig/mutations.tsx
+++ b/frontend-next/src/hooks/api/oidcConfig/mutations.tsx
@@ -53,8 +53,8 @@ export const useUpdateOIDCConfig = () => {
return data;
},
onSuccess(_, dto) {
- queryClient.invalidateQueries({ queryKey: oidcConfigKeys.getOIDCConfig(dto.orgSlug) });
- queryClient.invalidateQueries({ queryKey: organizationKeys.getUserOrganizations });
+ queryClient.invalidateQueries(oidcConfigKeys.getOIDCConfig(dto.orgSlug));
+ queryClient.invalidateQueries(organizationKeys.getUserOrganizations);
}
});
};
@@ -107,7 +107,7 @@ export const useCreateOIDCConfig = () => {
return data;
},
onSuccess(_, dto) {
- queryClient.invalidateQueries({ queryKey: oidcConfigKeys.getOIDCConfig(dto.orgSlug) });
+ queryClient.invalidateQueries(oidcConfigKeys.getOIDCConfig(dto.orgSlug));
}
});
};
diff --git a/frontend-v2/src/hooks/api/oidcConfig/queries.tsx b/frontend-next/src/hooks/api/oidcConfig/queries.tsx
similarity index 96%
rename from frontend-v2/src/hooks/api/oidcConfig/queries.tsx
rename to frontend-next/src/hooks/api/oidcConfig/queries.tsx
index e22d2ee2f3..49db7c5d46 100644
--- a/frontend-v2/src/hooks/api/oidcConfig/queries.tsx
+++ b/frontend-next/src/hooks/api/oidcConfig/queries.tsx
@@ -18,7 +18,7 @@ export const useGetOIDCConfig = (orgSlug: string) => {
);
return data;
- } catch {
+ } catch (err) {
return null;
}
},
diff --git a/frontend-v2/src/hooks/api/oidcConfig/types.ts b/frontend-next/src/hooks/api/oidcConfig/types.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/oidcConfig/types.ts
rename to frontend-next/src/hooks/api/oidcConfig/types.ts
diff --git a/frontend-v2/src/hooks/api/orgAdmin/index.tsx b/frontend-next/src/hooks/api/orgAdmin/index.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/orgAdmin/index.tsx
rename to frontend-next/src/hooks/api/orgAdmin/index.tsx
diff --git a/frontend-v2/src/hooks/api/orgAdmin/mutation.tsx b/frontend-next/src/hooks/api/orgAdmin/mutation.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/orgAdmin/mutation.tsx
rename to frontend-next/src/hooks/api/orgAdmin/mutation.tsx
diff --git a/frontend-v2/src/hooks/api/orgAdmin/queries.tsx b/frontend-next/src/hooks/api/orgAdmin/queries.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/orgAdmin/queries.tsx
rename to frontend-next/src/hooks/api/orgAdmin/queries.tsx
diff --git a/frontend-v2/src/hooks/api/orgAdmin/types.ts b/frontend-next/src/hooks/api/orgAdmin/types.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/orgAdmin/types.ts
rename to frontend-next/src/hooks/api/orgAdmin/types.ts
diff --git a/frontend-v2/src/hooks/api/organization/index.ts b/frontend-next/src/hooks/api/organization/index.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/organization/index.ts
rename to frontend-next/src/hooks/api/organization/index.ts
diff --git a/frontend-v2/src/hooks/api/organization/queries.tsx b/frontend-next/src/hooks/api/organization/queries.tsx
similarity index 81%
rename from frontend-v2/src/hooks/api/organization/queries.tsx
rename to frontend-next/src/hooks/api/organization/queries.tsx
index 2eddda50a8..82894d9887 100644
--- a/frontend-v2/src/hooks/api/organization/queries.tsx
+++ b/frontend-next/src/hooks/api/organization/queries.tsx
@@ -1,5 +1,6 @@
import { useMutation, useQuery, useQueryClient, UseQueryOptions } from "@tanstack/react-query";
+import SecurityClient from "@app/components/utilities/SecurityClient";
import { apiRequest } from "@app/config/request";
import { OrderByDirection } from "@app/hooks/api/generic/types";
@@ -41,8 +42,7 @@ export const organizationKeys = {
}: TListOrgIdentitiesDTO) =>
[...organizationKeys.getOrgIdentityMemberships(orgId), params] as const,
getOrgGroups: (orgId: string) => [{ orgId }, "organization-groups"] as const,
- getOrgIntegrationAuths: (orgId: string) => [{ orgId }, "integration-auths"] as const,
- getOrgById: (orgId: string) => ["org-by-id", { orgId }]
+ getOrgIntegrationAuths: (orgId: string) => [{ orgId }, "integration-auths"] as const
};
export const fetchOrganizations = async () => {
@@ -61,22 +61,6 @@ export const useGetOrganizations = () => {
});
};
-export const fetchOrganizationById = async (id: string) => {
- const {
- data: { organization }
- } = await apiRequest.get<{ organization: Organization }>(`/api/v1/organization/${id}`);
- return organization;
-};
-
-export const useGetOrganizationById = (id: string) => {
- return useQuery({
- queryKey: organizationKeys.getOrgById(id),
- queryFn: async () => {
- return fetchOrganizationById(id);
- }
- });
-};
-
export const useCreateOrg = (options: { invalidate: boolean } = { invalidate: true }) => {
const queryClient = useQueryClient();
@@ -84,7 +68,7 @@ export const useCreateOrg = (options: { invalidate: boolean } = { invalidate: tr
mutationFn: async ({ name }: { name: string }) => {
const {
data: { organization }
- } = await apiRequest.post("/api/v2/organizations", {
+ } = await apiRequest.post<{ organization: { id: string } }>("/api/v2/organizations", {
name
});
@@ -92,7 +76,7 @@ export const useCreateOrg = (options: { invalidate: boolean } = { invalidate: tr
},
onSuccess: () => {
if (options?.invalidate) {
- queryClient.invalidateQueries({ queryKey: organizationKeys.getUserOrganizations });
+ queryClient.invalidateQueries(organizationKeys.getUserOrganizations);
}
}
});
@@ -100,7 +84,7 @@ export const useCreateOrg = (options: { invalidate: boolean } = { invalidate: tr
export const useUpdateOrg = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation<{}, {}, UpdateOrgDTO>({
mutationFn: ({
name,
authEnforced,
@@ -122,7 +106,7 @@ export const useUpdateOrg = () => {
});
},
onSuccess: () => {
- queryClient.invalidateQueries({ queryKey: organizationKeys.getUserOrganizations });
+ queryClient.invalidateQueries(organizationKeys.getUserOrganizations);
}
});
};
@@ -226,9 +210,7 @@ export const useUpdateOrgBillingDetails = () => {
return data;
},
onSuccess(_, dto) {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgBillingDetails(dto.organizationId)
- });
+ queryClient.invalidateQueries(organizationKeys.getOrgBillingDetails(dto.organizationId));
}
});
};
@@ -273,9 +255,7 @@ export const useAddOrgPmtMethod = () => {
return url;
},
onSuccess(_, dto) {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgPmtMethods(dto.organizationId)
- });
+ queryClient.invalidateQueries(organizationKeys.getOrgPmtMethods(dto.organizationId));
}
});
};
@@ -298,9 +278,7 @@ export const useDeleteOrgPmtMethod = () => {
return data;
},
onSuccess(_, dto) {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgPmtMethods(dto.organizationId)
- });
+ queryClient.invalidateQueries(organizationKeys.getOrgPmtMethods(dto.organizationId));
}
});
};
@@ -343,9 +321,7 @@ export const useAddOrgTaxId = () => {
return data;
},
onSuccess(_, dto) {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgTaxIds(dto.organizationId)
- });
+ queryClient.invalidateQueries(organizationKeys.getOrgTaxIds(dto.organizationId));
}
});
};
@@ -362,9 +338,7 @@ export const useDeleteOrgTaxId = () => {
return data;
},
onSuccess(_, dto) {
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgTaxIds(dto.organizationId)
- });
+ queryClient.invalidateQueries(organizationKeys.getOrgTaxIds(dto.organizationId));
}
});
};
@@ -464,41 +438,30 @@ export const useDeleteOrgById = () => {
return useMutation({
mutationFn: async ({ organizationId }: { organizationId: string }) => {
const {
- data: { organization }
- } = await apiRequest.delete<{ organization: Organization }>(
+ data: { organization, accessToken }
+ } = await apiRequest.delete<{ organization: Organization; accessToken: string }>(
`/api/v2/organizations/${organizationId}`
);
+ SecurityClient.setToken(accessToken);
+ localStorage.removeItem("orgData.id");
+
return organization;
},
onSuccess(_, dto) {
- queryClient.invalidateQueries({ queryKey: organizationKeys.getUserOrganizations });
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgPlanBillingInfo(dto.organizationId)
- });
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgPlanTable(dto.organizationId)
- });
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgPlansTable(dto.organizationId, "monthly")
- }); // You might need to invalidate for 'yearly' as well.
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgPlansTable(dto.organizationId, "yearly")
- });
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgBillingDetails(dto.organizationId)
- });
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgPmtMethods(dto.organizationId)
- });
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgTaxIds(dto.organizationId)
- });
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgInvoices(dto.organizationId)
- });
- queryClient.invalidateQueries({
- queryKey: organizationKeys.getOrgLicenses(dto.organizationId)
- });
+ queryClient.invalidateQueries(organizationKeys.getUserOrganizations);
+ queryClient.invalidateQueries(organizationKeys.getOrgPlanBillingInfo(dto.organizationId));
+ queryClient.invalidateQueries(organizationKeys.getOrgPlanTable(dto.organizationId));
+ queryClient.invalidateQueries(
+ organizationKeys.getOrgPlansTable(dto.organizationId, "monthly")
+ ); // You might need to invalidate for 'yearly' as well.
+ queryClient.invalidateQueries(
+ organizationKeys.getOrgPlansTable(dto.organizationId, "yearly")
+ );
+ queryClient.invalidateQueries(organizationKeys.getOrgBillingDetails(dto.organizationId));
+ queryClient.invalidateQueries(organizationKeys.getOrgPmtMethods(dto.organizationId));
+ queryClient.invalidateQueries(organizationKeys.getOrgTaxIds(dto.organizationId));
+ queryClient.invalidateQueries(organizationKeys.getOrgInvoices(dto.organizationId));
+ queryClient.invalidateQueries(organizationKeys.getOrgLicenses(dto.organizationId));
}
});
};
diff --git a/frontend-v2/src/hooks/api/organization/types.ts b/frontend-next/src/hooks/api/organization/types.ts
similarity index 100%
rename from frontend-v2/src/hooks/api/organization/types.ts
rename to frontend-next/src/hooks/api/organization/types.ts
diff --git a/frontend-v2/src/hooks/api/pkiAlerts/index.tsx b/frontend-next/src/hooks/api/pkiAlerts/index.tsx
similarity index 100%
rename from frontend-v2/src/hooks/api/pkiAlerts/index.tsx
rename to frontend-next/src/hooks/api/pkiAlerts/index.tsx
diff --git a/frontend-v2/src/hooks/api/pkiAlerts/mutations.tsx b/frontend-next/src/hooks/api/pkiAlerts/mutations.tsx
similarity index 65%
rename from frontend-v2/src/hooks/api/pkiAlerts/mutations.tsx
rename to frontend-next/src/hooks/api/pkiAlerts/mutations.tsx
index 34397c1412..54aa8eeffe 100644
--- a/frontend-v2/src/hooks/api/pkiAlerts/mutations.tsx
+++ b/frontend-next/src/hooks/api/pkiAlerts/mutations.tsx
@@ -8,20 +8,20 @@ import { TCreatePkiAlertDTO, TDeletePkiAlertDTO, TPkiAlert, TUpdatePkiAlertDTO }
export const useCreatePkiAlert = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async (body) => {
const { data: alert } = await apiRequest.post("/api/v1/pki/alerts", body);
return alert;
},
onSuccess: (_, { projectId }) => {
- queryClient.invalidateQueries({ queryKey: workspaceKeys.getWorkspacePkiAlerts(projectId) });
+ queryClient.invalidateQueries(workspaceKeys.getWorkspacePkiAlerts(projectId));
}
});
};
export const useUpdatePkiAlert = () => {
const queryClient = useQueryClient();
- return useMutation({
+ return useMutation({
mutationFn: async ({ alertId, ...body }) => {
const { data: alert } = await apiRequest.patch(
`/api/v1/pki/alerts/${alertId}`,
@@ -30,22 +30,22 @@ export const useUpdatePkiAlert = () => {
return alert;
},
onSuccess: (_, { projectId, alertId }) => {
- queryClient.invalidateQueries({ queryKey: workspaceKeys.getWorkspacePkiAlerts(projectId) });
- queryClient.invalidateQueries({ queryKey: pkiAlertKeys.getPkiAlertById(alertId) });
+ queryClient.invalidateQueries(workspaceKeys.getWorkspacePkiAlerts(projectId));
+ queryClient.invalidateQueries(pkiAlertKeys.getPkiAlertById(alertId));
}
});
};
export const useDeletePkiAlert = () => {
const queryClient = useQueryClient();
- return useMutation