Merge remote-tracking branch 'origin' into jumpcloud-saml

backend/src/controllers/v1/secretImportController.ts

@@ -108,7 +108,7 @@ export const getAllSecretsFromImport = async (req: Request, res: Response) => {
   });
 
   if (!importSecDoc) {
-    return res.status(200).json({ secrets: {} });
+    return res.status(200).json({ secrets: [] });
   }
 
   const secrets = await getAllImportedSecrets(workspaceId, environment, folderId);

backend/src/helpers/bot.ts

@@ -275,3 +275,70 @@ export const decryptSymmetricHelper = async ({
 
   return plaintext;
 };
+
+/**
+ * Return decrypted comments for workspace secrets with id [workspaceId]
+ * and [envionment] using bot
+ * @param {Object} obj
+ * @param {String} obj.workspaceId - id of workspace
+ * @param {String} obj.environment - environment 
+ */
+export const getSecretsCommentBotHelper = async ({
+  workspaceId,
+  environment,
+  secretPath
+} : {
+  workspaceId: Types.ObjectId;
+  environment: string;
+  secretPath: string;
+}) => {
+  const content = {} as any;
+  const key = await getKey({ workspaceId: workspaceId });
+  
+  let folderId = "root";
+  const folders = await Folder.findOne({
+    workspace: workspaceId,
+    environment,
+  });
+
+  if (!folders && secretPath !== "/") {
+    throw InternalServerError({ message: "Folder not found" });
+  }
+
+  if (folders) {
+    const folder = getFolderByPath(folders.nodes, secretPath);
+    if (!folder) {
+      throw InternalServerError({ message: "Folder not found" });
+    }
+    folderId = folder.id;
+  }
+
+  const secrets = await Secret.find({
+    workspace: workspaceId,
+    environment,
+    type: SECRET_SHARED,
+    folder: folderId,
+  });
+
+  secrets.forEach((secret: ISecret) => {
+    if(secret.secretCommentCiphertext && secret.secretCommentIV && secret.secretCommentTag) {
+      const secretKey = decryptSymmetric128BitHexKeyUTF8({
+        ciphertext: secret.secretKeyCiphertext,
+        iv: secret.secretKeyIV,
+        tag: secret.secretKeyTag,
+        key,
+      });
+  
+      const commentValue = decryptSymmetric128BitHexKeyUTF8({
+        ciphertext: secret.secretCommentCiphertext,
+        iv: secret.secretCommentIV,
+        tag: secret.secretCommentTag,
+        key,
+      });
+
+      content[secretKey] = commentValue;
+    }
+  });
+
+  return content;
+}

backend/src/helpers/integration.ts

@@ -123,7 +123,7 @@ export const syncIntegrationsHelper = async ({
         ? {
           environment,
         }
-        : {}),
+      : {}),
       isActive: true,
       app: { $ne: null },
     });
@@ -133,17 +133,24 @@ export const syncIntegrationsHelper = async ({
     for await (const integration of integrations) {
       // get workspace, environment (shared) secrets
       const secrets = await BotService.getSecrets({
-        // issue here?
         workspaceId: integration.workspace,
         environment: integration.environment,
         secretPath: integration.secretPath,
       });
 
+      // get workspace, environment (shared) secrets comments
+      const secretComments = await BotService.getSecretComments({
+        workspaceId: integration.workspace,
+        environment: integration.environment,
+        secretPath: integration.secretPath,
+      })
+
       const integrationAuth = await IntegrationAuth.findById(
         integration.integrationAuth
       );
-      if (!integrationAuth) throw new Error("Failed to find integration auth");
 
+      if (!integrationAuth) throw new Error("Failed to find integration auth");
+      
       // get integration auth access token
       const access = await getIntegrationAuthAccessHelper({
         integrationAuthId: integration.integrationAuth,
@@ -156,6 +163,7 @@ export const syncIntegrationsHelper = async ({
         secrets,
         accessId: access.accessId === undefined ? null : access.accessId,
         accessToken: access.accessToken,
+        secretComments
       });
     }
   } catch (err) {

backend/src/helpers/secrets.ts

@@ -346,6 +346,7 @@ export const createSecretHelper = async ({
     workspace: new Types.ObjectId(workspaceId),
     folder: folderId,
     type,
+    environment,
     ...(type === SECRET_PERSONAL ? getAuthDataPayloadUserObj(authData) : {})
   });
 
@@ -362,6 +363,7 @@ export const createSecretHelper = async ({
       secretBlindIndex,
       folder: folderId,
       workspace: new Types.ObjectId(workspaceId),
+      environment,
       type: SECRET_SHARED
     });
 

backend/src/integrations/apps.ts

@@ -40,7 +40,9 @@ import {
   INTEGRATION_TRAVISCI,
   INTEGRATION_TRAVISCI_API_URL,
   INTEGRATION_VERCEL,
-  INTEGRATION_VERCEL_API_URL
+  INTEGRATION_VERCEL_API_URL,
+  INTEGRATION_WINDMILL,
+  INTEGRATION_WINDMILL_API_URL,
 } from "../variables";
 import { IIntegrationAuth } from "../models";
 import { Octokit } from "@octokit/rest";
@@ -181,6 +183,11 @@ const getApps = async ({
         accessToken,
       });
       break;
+    case INTEGRATION_WINDMILL:
+      apps = await getAppsWindmill({
+        accessToken
+      });
+      break;
     case INTEGRATION_DIGITAL_OCEAN_APP_PLATFORM:
       apps = await getAppsDigitalOceanAppPlatform({ 
         accessToken 
@@ -941,6 +948,106 @@ const getAppsCodefresh = async ({
 
 };
 
+/**
+ * Return list of projects for Windmill integration
+ * @param {Object} obj
+ * @param {String} obj.accessToken - access token for Windmill API
+ * @returns {Object[]} apps - names of Windmill workspaces
+ * @returns {String} apps.name - name of Windmill workspace
+ */
+const getAppsWindmill = async ({ accessToken }: { accessToken: string }) => {
+  const { data } = await standardRequest.get(
+    `${INTEGRATION_WINDMILL_API_URL}/workspaces/list`,
+    {
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+        "Accept-Encoding": "application/json",
+      },
+    }
+  );
+  
+  // check for write access of secrets in windmill workspaces
+  const writeAccessCheck = data.map(async (app: any) => {
+    try {
+      const userPath = "u/user/variable";
+      const folderPath = "f/folder/variable";
+
+      const { data: writeUser } = await standardRequest.post(
+        `${INTEGRATION_WINDMILL_API_URL}/w/${app.id}/variables/create`,
+        {
+          path: userPath,
+          value: "variable",
+          is_secret: true,
+          description: "variable description"
+        },
+        {
+          headers: {
+            Authorization: `Bearer ${accessToken}`,
+            "Accept-Encoding": "application/json",
+          },
+        }
+      );
+
+      const { data: writeFolder } = await standardRequest.post(
+        `${INTEGRATION_WINDMILL_API_URL}/w/${app.id}/variables/create`,
+        {
+          path: folderPath,
+          value: "variable",
+          is_secret: true,
+          description: "variable description"
+        },
+        {
+          headers: {
+            Authorization: `Bearer ${accessToken}`,
+            "Accept-Encoding": "application/json",
+          },
+        }
+      );
+      
+      // is write access is allowed then delete the created secrets from workspace
+      if (writeUser && writeFolder) {
+        await standardRequest.delete(
+        `${INTEGRATION_WINDMILL_API_URL}/w/${app.id}/variables/delete/${userPath}`,
+          {
+            headers: {
+              Authorization: `Bearer ${accessToken}`,
+              "Accept-Encoding": "application/json",
+            },
+          }
+        );
+
+        await standardRequest.delete(
+        `${INTEGRATION_WINDMILL_API_URL}/w/${app.id}/variables/delete/${folderPath}`,
+          {
+            headers: {
+              Authorization: `Bearer ${accessToken}`,
+              "Accept-Encoding": "application/json",
+            },
+          }
+        );
+
+        return app;
+      } else {
+        return { error: "cannot write secret" };
+      }
+    } catch (err: any) {
+      return { error: err.message };
+    }
+  });
+
+  const appsWriteResponses = await Promise.all(writeAccessCheck);
+  const appsWithWriteAccess = appsWriteResponses.filter((appRes: any) => !appRes.error);
+  
+  const apps = appsWithWriteAccess.map((a: any) => {
+    return {
+      name: a.name,
+      appId: a.id,
+    };
+  });
+  
+  return apps;
+}
+
 /**
  * Return list of applications for DigitalOcean App Platform integration
  * @param {Object} obj

backend/src/integrations/sync.ts

@@ -49,7 +49,9 @@ import {
   INTEGRATION_TRAVISCI,
   INTEGRATION_TRAVISCI_API_URL,
   INTEGRATION_VERCEL,
-  INTEGRATION_VERCEL_API_URL
+  INTEGRATION_VERCEL_API_URL,
+  INTEGRATION_WINDMILL,
+  INTEGRATION_WINDMILL_API_URL,
 } from "../variables";
 import AWS from "aws-sdk";
 import { Octokit } from "@octokit/rest";
@@ -65,19 +67,22 @@ import { standardRequest } from "../config/request";
  * @param {Object} obj.secrets - secrets to push to integration (object where keys are secret keys and values are secret values)
  * @param {String} obj.accessId - access id for integration
  * @param {String} obj.accessToken - access token for integration
+ * @param {Object} obj.secretComments - secret comments to push to integration (object where keys are secret keys and values are comment values)
  */
 const syncSecrets = async ({
   integration,
   integrationAuth,
   secrets,
   accessId,
-  accessToken
+  accessToken,
+  secretComments
 }: {
   integration: IIntegration;
   integrationAuth: IIntegrationAuth;
   secrets: any;
   accessId: string | null;
   accessToken: string;
+  secretComments: any;
 }) => {
   switch (integration.integration) {
     case INTEGRATION_AZURE_KEY_VAULT:
@@ -256,7 +261,15 @@ const syncSecrets = async ({
         accessToken
       });
       break;
-  }
+    case INTEGRATION_WINDMILL:
+      await syncSecretsWindmill({
+          integration,
+          secrets,
+          accessToken,
+          secretComments
+      });
+      break;
+    }
 };
 
 /**
@@ -2244,7 +2257,7 @@ const syncSecretsCodefresh = async ({
  * @param {IIntegration} obj.integration - integration details
  * @param {IIntegrationAuth} obj.integrationAuth - integration auth details
  * @param {Object} obj.secrets - secrets to push to integration (object where keys are secret keys and values are secret values)
- * @param {String} obj.accessToken - personal access token for DigitalOcean
+ * @param {String} obj.accessToken - access token for integration
  */
 const syncSecretsDigitalOceanAppPlatform = async ({
   integration,
@@ -2272,6 +2285,114 @@ const syncSecretsDigitalOceanAppPlatform = async ({
   );
 }
 
+/**
+ * Sync/push [secrets] to Windmill with name [integration.app]
+ * @param {Object} obj
+ * @param {IIntegration} obj.integration - integration details
+ * @param {IIntegrationAuth} obj.integrationAuth - integration auth details
+ * @param {Object} obj.secrets - secrets to push to integration (object where keys are secret keys and values are secret values)
+ * @param {String} obj.accessToken - access token for windmill integration
+ * @param {Object} obj.secretComments - secret comments to push to integration (object where keys are secret keys and values are comment values)
+ */
+const syncSecretsWindmill = async ({
+  integration,
+  secrets,
+  accessToken,
+  secretComments
+}: {
+  integration: IIntegration;
+  secrets: any;
+  accessToken: string;
+  secretComments: any;
+}) => {
+  interface WindmillSecret {
+    path: string;
+    value: string;
+    is_secret: boolean;
+    description?: string;
+  }
+
+  // get secrets stored in windmill workspace
+  const res = (await standardRequest.get(
+    `${INTEGRATION_WINDMILL_API_URL}/w/${integration.appId}/variables/list`,
+    {
+      headers: {
+          Authorization: `Bearer ${accessToken}`,
+          "Accept-Encoding": "application/json",
+      },
+    }
+  ))
+  .data
+  .reduce(
+    (obj: any, secret: WindmillSecret) => ({
+      ...obj,
+      [secret.path]: secret
+    }),
+    {}
+  );
+  
+  // eslint-disable-next-line no-useless-escape
+  const pattern = new RegExp("^(u\/|f\/)[a-zA-Z0-9_-]+\/([a-zA-Z0-9_-]+\/)*[a-zA-Z0-9_-]*[^\/]$");
+  
+  for await (const key of Object.keys(secrets)) {
+    if((key.startsWith("u/") || key.startsWith("f/")) && pattern.test(key)) {
+          if(!(key in res)) {
+            // case: secret does not exist in windmill
+            // -> create secret
+            
+            await standardRequest.post(
+              `${INTEGRATION_WINDMILL_API_URL}/w/${integration.appId}/variables/create`,
+              {
+                path: key,
+                value: secrets[key],
+                is_secret: true,
+                description: secretComments[key] || ""
+              },
+              {
+                headers: {
+                    Authorization: `Bearer ${accessToken}`,
+                    "Accept-Encoding": "application/json",
+                },
+              }
+            );
+          } else {
+            // -> update secret
+            await standardRequest.post(
+              `${INTEGRATION_WINDMILL_API_URL}/w/${integration.appId}/variables/update/${res[key].path}`,
+              {
+                path: key,
+                value: secrets[key],
+                is_secret: true,
+                description: secretComments[key] || ""
+              },
+              {
+                headers: {
+                    Authorization: `Bearer ${accessToken}`,
+                    "Accept-Encoding": "application/json",
+                },
+              }
+            );
+          }
+      }
+  }
+  
+  for await (const key of Object.keys(res)) {
+    if (!(key in secrets)) {
+      // -> delete secret
+      await standardRequest.delete(
+        `${INTEGRATION_WINDMILL_API_URL}/w/${integration.appId}/variables/delete/${res[key].path}`,
+        {
+          headers: {
+            Authorization: `Bearer ${accessToken}`,
+            "Content-Type": "application/json",
+            "Accept-Encoding": "application/json",
+          }
+        }
+      );
+    }
+  }
+}
+
 /**
  * Sync/push [secrets] to Cloud66 application with name [integration.app]
  * @param {Object} obj

backend/src/models/integration.ts

@@ -22,7 +22,8 @@ import {
   INTEGRATION_SUPABASE,
   INTEGRATION_TERRAFORM_CLOUD,
   INTEGRATION_TRAVISCI,
-  INTEGRATION_VERCEL
+  INTEGRATION_VERCEL,
+  INTEGRATION_WINDMILL
 } from "../variables";
 import { Schema, Types, model } from "mongoose";
 
@@ -67,6 +68,7 @@ export interface IIntegration {
     | "digital-ocean-app-platform"
     | "cloud-66"
     | "northflank"
+    | "windmill";
   integrationAuth: Types.ObjectId;
 }
 
@@ -157,9 +159,10 @@ const integrationSchema = new Schema<IIntegration>(
         INTEGRATION_TERRAFORM_CLOUD,
         INTEGRATION_HASHICORP_VAULT,
         INTEGRATION_CLOUDFLARE_PAGES,
+        INTEGRATION_CODEFRESH,
+        INTEGRATION_WINDMILL,
         INTEGRATION_BITBUCKET,
         INTEGRATION_DIGITAL_OCEAN_APP_PLATFORM,
-        INTEGRATION_CODEFRESH,
         INTEGRATION_CLOUD_66,
         INTEGRATION_NORTHFLANK
       ],

backend/src/models/integrationAuth.ts

@@ -24,7 +24,8 @@ import {
   INTEGRATION_SUPABASE,
   INTEGRATION_TERRAFORM_CLOUD,
   INTEGRATION_TRAVISCI,
-  INTEGRATION_VERCEL
+  INTEGRATION_VERCEL,
+  INTEGRATION_WINDMILL
 } from "../variables";
 import { Document, Schema, Types, model } from "mongoose";
 
@@ -54,7 +55,8 @@ export interface IIntegrationAuth extends Document {
     | "bitbucket"
     | "cloud-66"
     | "terraform-cloud"
-    | "northflank";
+    | "northflank"
+    | "windmill";
   teamId: string;
   accountId: string;
   url: string;
@@ -101,9 +103,10 @@ const integrationAuthSchema = new Schema<IIntegrationAuth>(
         INTEGRATION_TERRAFORM_CLOUD,
         INTEGRATION_HASHICORP_VAULT,
         INTEGRATION_CLOUDFLARE_PAGES,
+        INTEGRATION_CODEFRESH,
+        INTEGRATION_WINDMILL,
         INTEGRATION_BITBUCKET,
         INTEGRATION_DIGITAL_OCEAN_APP_PLATFORM,
-        INTEGRATION_CODEFRESH,
         INTEGRATION_CLOUD_66,
         INTEGRATION_NORTHFLANK
       ],

backend/src/services/BotService.ts

@@ -5,6 +5,7 @@ import {
   getIsWorkspaceE2EEHelper,
   getKey,
   getSecretsBotHelper,
+  getSecretsCommentBotHelper,
 } from "../helpers/bot";
 
 /**
@@ -107,6 +108,30 @@ class BotService {
       tag,
     });
   }
+
+  /**
+   * Return decrypted secret comments for workspace with id [worskpaceId] and
+   * environment [environment] shared to bot.
+   * @param {Object} obj
+   * @param {String} obj.workspaceId - id of workspace of secrets
+   * @param {String} obj.environment - environment for secrets
+   * @returns {Object} secretObj - object where keys are secret keys and values are comments
+   */
+  static async getSecretComments({
+    workspaceId,
+    environment,
+    secretPath
+  }: {
+    workspaceId: Types.ObjectId;
+    environment: string;
+    secretPath: string;
+  }) {
+    return await getSecretsCommentBotHelper({
+      workspaceId,
+      environment,
+      secretPath
+    });
+  }
 }
 
 export default BotService;

backend/src/variables/integration.ts

@@ -30,6 +30,7 @@ export const INTEGRATION_HASHICORP_VAULT = "hashicorp-vault";
 export const INTEGRATION_CLOUDFLARE_PAGES = "cloudflare-pages";
 export const INTEGRATION_BITBUCKET = "bitbucket";
 export const INTEGRATION_CODEFRESH = "codefresh";
+export const INTEGRATION_WINDMILL = "windmill";
 export const INTEGRATION_DIGITAL_OCEAN_APP_PLATFORM = "digital-ocean-app-platform";
 export const INTEGRATION_CLOUD_66 = "cloud-66";
 export const INTEGRATION_NORTHFLANK = "northflank";
@@ -50,9 +51,10 @@ export const INTEGRATION_SET = new Set([
   INTEGRATION_TERRAFORM_CLOUD,
   INTEGRATION_HASHICORP_VAULT,
   INTEGRATION_CLOUDFLARE_PAGES,
+  INTEGRATION_CODEFRESH,
+  INTEGRATION_WINDMILL,
   INTEGRATION_BITBUCKET,
   INTEGRATION_DIGITAL_OCEAN_APP_PLATFORM,
-  INTEGRATION_CODEFRESH,
   INTEGRATION_CLOUD_66,
   INTEGRATION_NORTHFLANK
 ]);
@@ -88,6 +90,7 @@ export const INTEGRATION_TERRAFORM_CLOUD_API_URL = "https://app.terraform.io";
 export const INTEGRATION_CLOUDFLARE_PAGES_API_URL = "https://api.cloudflare.com";
 export const INTEGRATION_BITBUCKET_API_URL = "https://api.bitbucket.org";
 export const INTEGRATION_CODEFRESH_API_URL = "https://g.codefresh.io/api";
+export const INTEGRATION_WINDMILL_API_URL = "https://app.windmill.dev/api";
 export const INTEGRATION_DIGITAL_OCEAN_API_URL = "https://api.digitalocean.com";
 export const INTEGRATION_CLOUD_66_API_URL = "https://app.cloud66.com/api";
 export const INTEGRATION_NORTHFLANK_API_URL = "https://api.northflank.com";
@@ -293,6 +296,15 @@ export const getIntegrationOptions = async () => {
             clientId: "",
             docsLink: "",
         },
+        {
+            name: "Windmill",
+            slug: "windmill",
+            image: "Windmill.png",
+            isAvailable: true,
+            type: "pat",
+            clientId: "",
+            docsLink: "",
+        },
         {
             name: "Digital Ocean App Platform",
             slug: "digital-ocean-app-platform",

docs/integrations/cloud/windmill.mdx

@@ -0,0 +1,46 @@
+---
+title: "Windmill"
+description: "How to sync secrets from Infisical to Windmill"
+---
+
+Prerequisites:
+
+- Set up and add envars to [Infisical Cloud](https://app.infisical.com)
+
+## Navigate to your project's integrations tab
+
+![integrations](../../images/integrations.png)
+
+## Enter your Windmill Access Token
+
+Obtain a Windmill access token in Access Tokens
+
+![integrations windmill dashboard](../../images/integrations-windmill-dashboard.png)
+![integrations windmill token](../../images/integrations-windmill-token.png)
+
+Press on the Windmill tile and input your Windmill access token to grant Infisical access to your Windmill account.
+
+![integrations windmill authorization](../../images/integrations-windmill-auth.png)
+
+<Info>
+  If this is your project's first cloud integration, then you'll have to grant
+  Infisical access to your project's environment variables. Although this step
+  breaks E2EE, it's necessary for Infisical to sync the environment variables to
+  the cloud platform.
+</Info>
+
+## Start integration
+
+Select which Infisical environment secrets you want to sync to which Windmill workspace and press create integration to start syncing secrets to Windmill.
+
+![integrations windmill](../../images/integrations-windmill-create.png)
+![integrations windmill](../../images/integrations-windmill.png)
+
+<Warning>
+  Secrets synced to Windmill are subject to the [ownership path
+  prefix](https://www.windmill.dev/docs/core_concepts/roles_and_permissions)
+  convention of Windmill. Accordingly, all secrets must be prefixed with either
+  `u/` or `f/` for user-based and folder-based secret along with the name of the
+  secret. Put differently, you must use the full path of the secret as its name
+  in Infisical to be considered valid such as `u/user/FOO/BAR`.
+</Warning>

docs/integrations/overview.mdx

@@ -30,6 +30,7 @@ Missing an integration? [Throw in a request](https://github.com/Infisical/infisi
 | [AWS Parameter Store](/integrations/cloud/aws-parameter-store) | Cloud                  | Available   |
 | [AWS Secret Manager](/integrations/cloud/aws-secret-manager)   | Cloud                  | Available   |
 | [Azure Key Vault](/integrations/cloud/azure-key-vault)         | Cloud                  | Available   |
+| [Windmill](/integrations/cloud/windmill)                       | Cloud                  | Available   |
 | [BitBucket](/integrations/cicd/bitbucket)                      | CI/CD                  | Available   |
 | [Codefresh](/integrations/cicd/codefresh)                      | CI/CD                  | Available   |
 | [GitHub Actions](/integrations/cicd/githubactions)             | CI/CD                  | Available   |

docs/mint.json

@@ -237,6 +237,7 @@
         "integrations/cloud/hashicorp-vault",
         "integrations/cloud/azure-key-vault",
         "integrations/cloud/cloud-66",
+        "integrations/cloud/windmill",
         "integrations/cicd/githubactions",
         "integrations/cicd/gitlab",
         "integrations/cicd/circleci",

frontend/package-lock.json

@@ -67,6 +67,7 @@
         "react": "^17.0.2",
         "react-beautiful-dnd": "^13.1.1",
         "react-code-input": "^3.10.1",
+        "react-contenteditable": "^3.3.7",
         "react-dom": "^17.0.2",
         "react-grid-layout": "^1.3.4",
         "react-hook-form": "^7.43.0",
@@ -75,6 +76,7 @@
         "react-markdown": "^8.0.3",
         "react-redux": "^8.0.2",
         "react-table": "^7.8.0",
+        "sanitize-html": "^2.11.0",
         "set-cookie-parser": "^2.5.1",
         "sharp": "^0.32.0",
         "styled-components": "^5.3.7",
@@ -99,6 +101,7 @@
         "@types/jsrp": "^0.2.4",
         "@types/node": "18.11.9",
         "@types/react": "^18.0.26",
+        "@types/sanitize-html": "^2.9.0",
         "@typescript-eslint/eslint-plugin": "^5.48.1",
         "@typescript-eslint/parser": "^5.45.0",
         "autoprefixer": "^10.4.7",
@@ -7922,6 +7925,89 @@
         "redux": "^4.0.0"
       }
     },
+    "node_modules/@types/sanitize-html": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/@types/sanitize-html/-/sanitize-html-2.9.0.tgz",
+      "integrity": "sha512-4fP/kEcKNj2u39IzrxWYuf/FnCCwwQCpif6wwY6ROUS1EPRIfWJjGkY3HIowY1EX/VbX5e86yq8AAE7UPMgATg==",
+      "dev": true,
+      "dependencies": {
+        "htmlparser2": "^8.0.0"
+      }
+    },
+    "node_modules/@types/sanitize-html/node_modules/dom-serializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.2",
+        "entities": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "node_modules/@types/sanitize-html/node_modules/domhandler": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.3.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/@types/sanitize-html/node_modules/domutils": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
+      "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
+      "dev": true,
+      "dependencies": {
+        "dom-serializer": "^2.0.0",
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/@types/sanitize-html/node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/@types/sanitize-html/node_modules/htmlparser2": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz",
+      "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==",
+      "dev": true,
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "dependencies": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3",
+        "domutils": "^3.0.1",
+        "entities": "^4.4.0"
+      }
+    },
     "node_modules/@types/scheduler": {
       "version": "0.16.3",
       "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz",
@@ -10745,7 +10831,6 @@
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
       "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -11203,7 +11288,6 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
       "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-      "dev": true,
       "funding": [
         {
           "type": "github",
@@ -12690,8 +12774,7 @@
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "node_modules/fast-diff": {
       "version": "1.3.0",
@@ -17860,6 +17943,11 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/parse-srcset": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz",
+      "integrity": "sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q=="
+    },
     "node_modules/parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -18113,7 +18201,6 @@
       "version": "8.4.23",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.23.tgz",
       "integrity": "sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA==",
-      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -18936,6 +19023,18 @@
         "react-dom": ">=16.8.0"
       }
     },
+    "node_modules/react-contenteditable": {
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/react-contenteditable/-/react-contenteditable-3.3.7.tgz",
+      "integrity": "sha512-GA9NbC0DkDdpN3iGvib/OMHWTJzDX2cfkgy5Tt98JJAbA3kLnyrNbBIpsSpPpq7T8d3scD39DHP+j8mAM7BIfQ==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "prop-types": "^15.7.1"
+      },
+      "peerDependencies": {
+        "react": ">=16.3"
+      }
+    },
     "node_modules/react-docgen": {
       "version": "5.4.3",
       "resolved": "https://registry.npmjs.org/react-docgen/-/react-docgen-5.4.3.tgz",
@@ -20017,6 +20116,88 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
       "dev": true
     },
+    "node_modules/sanitize-html": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.11.0.tgz",
+      "integrity": "sha512-BG68EDHRaGKqlsNjJ2xUB7gpInPA8gVx/mvjO743hZaeMCZ2DwzW7xvsqZ+KNU4QKwj86HJ3uu2liISf2qBBUA==",
+      "dependencies": {
+        "deepmerge": "^4.2.2",
+        "escape-string-regexp": "^4.0.0",
+        "htmlparser2": "^8.0.0",
+        "is-plain-object": "^5.0.0",
+        "parse-srcset": "^1.0.2",
+        "postcss": "^8.3.11"
+      }
+    },
+    "node_modules/sanitize-html/node_modules/dom-serializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+      "dependencies": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.2",
+        "entities": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "node_modules/sanitize-html/node_modules/domhandler": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+      "dependencies": {
+        "domelementtype": "^2.3.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/sanitize-html/node_modules/domutils": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
+      "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
+      "dependencies": {
+        "dom-serializer": "^2.0.0",
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/sanitize-html/node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/sanitize-html/node_modules/htmlparser2": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz",
+      "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==",
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "dependencies": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3",
+        "domutils": "^3.0.1",
+        "entities": "^4.4.0"
+      }
+    },
     "node_modules/sass-loader": {
       "version": "12.6.0",
       "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz",
@@ -28425,6 +28606,66 @@
         "redux": "^4.0.0"
       }
     },
+    "@types/sanitize-html": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/@types/sanitize-html/-/sanitize-html-2.9.0.tgz",
+      "integrity": "sha512-4fP/kEcKNj2u39IzrxWYuf/FnCCwwQCpif6wwY6ROUS1EPRIfWJjGkY3HIowY1EX/VbX5e86yq8AAE7UPMgATg==",
+      "dev": true,
+      "requires": {
+        "htmlparser2": "^8.0.0"
+      },
+      "dependencies": {
+        "dom-serializer": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+          "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+          "dev": true,
+          "requires": {
+            "domelementtype": "^2.3.0",
+            "domhandler": "^5.0.2",
+            "entities": "^4.2.0"
+          }
+        },
+        "domhandler": {
+          "version": "5.0.3",
+          "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+          "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+          "dev": true,
+          "requires": {
+            "domelementtype": "^2.3.0"
+          }
+        },
+        "domutils": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
+          "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
+          "dev": true,
+          "requires": {
+            "dom-serializer": "^2.0.0",
+            "domelementtype": "^2.3.0",
+            "domhandler": "^5.0.3"
+          }
+        },
+        "entities": {
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+          "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+          "dev": true
+        },
+        "htmlparser2": {
+          "version": "8.0.2",
+          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz",
+          "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==",
+          "dev": true,
+          "requires": {
+            "domelementtype": "^2.3.0",
+            "domhandler": "^5.0.3",
+            "domutils": "^3.0.1",
+            "entities": "^4.4.0"
+          }
+        }
+      }
+    },
     "@types/scheduler": {
       "version": "0.16.3",
       "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz",
@@ -30633,8 +30874,7 @@
     "deepmerge": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
-      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
-      "dev": true
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A=="
     },
     "default-browser": {
       "version": "4.0.0",
@@ -30963,8 +31203,7 @@
     "domelementtype": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-      "dev": true
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="
     },
     "domhandler": {
       "version": "4.3.1",
@@ -32126,8 +32365,7 @@
     "fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "fast-diff": {
       "version": "1.3.0",
@@ -35865,6 +36103,11 @@
       "dev": true,
       "peer": true
     },
+    "parse-srcset": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz",
+      "integrity": "sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q=="
+    },
     "parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -36081,7 +36324,6 @@
       "version": "8.4.23",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.23.tgz",
       "integrity": "sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA==",
-      "dev": true,
       "requires": {
         "nanoid": "^3.3.6",
         "picocolors": "^1.0.0",
@@ -36653,6 +36895,15 @@
       "dev": true,
       "requires": {}
     },
+    "react-contenteditable": {
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/react-contenteditable/-/react-contenteditable-3.3.7.tgz",
+      "integrity": "sha512-GA9NbC0DkDdpN3iGvib/OMHWTJzDX2cfkgy5Tt98JJAbA3kLnyrNbBIpsSpPpq7T8d3scD39DHP+j8mAM7BIfQ==",
+      "requires": {
+        "fast-deep-equal": "^3.1.3",
+        "prop-types": "^15.7.1"
+      }
+    },
     "react-docgen": {
       "version": "5.4.3",
       "resolved": "https://registry.npmjs.org/react-docgen/-/react-docgen-5.4.3.tgz",
@@ -37421,6 +37672,65 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
       "dev": true
     },
+    "sanitize-html": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.11.0.tgz",
+      "integrity": "sha512-BG68EDHRaGKqlsNjJ2xUB7gpInPA8gVx/mvjO743hZaeMCZ2DwzW7xvsqZ+KNU4QKwj86HJ3uu2liISf2qBBUA==",
+      "requires": {
+        "deepmerge": "^4.2.2",
+        "escape-string-regexp": "^4.0.0",
+        "htmlparser2": "^8.0.0",
+        "is-plain-object": "^5.0.0",
+        "parse-srcset": "^1.0.2",
+        "postcss": "^8.3.11"
+      },
+      "dependencies": {
+        "dom-serializer": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+          "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+          "requires": {
+            "domelementtype": "^2.3.0",
+            "domhandler": "^5.0.2",
+            "entities": "^4.2.0"
+          }
+        },
+        "domhandler": {
+          "version": "5.0.3",
+          "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+          "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+          "requires": {
+            "domelementtype": "^2.3.0"
+          }
+        },
+        "domutils": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
+          "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
+          "requires": {
+            "dom-serializer": "^2.0.0",
+            "domelementtype": "^2.3.0",
+            "domhandler": "^5.0.3"
+          }
+        },
+        "entities": {
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+          "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="
+        },
+        "htmlparser2": {
+          "version": "8.0.2",
+          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz",
+          "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==",
+          "requires": {
+            "domelementtype": "^2.3.0",
+            "domhandler": "^5.0.3",
+            "domutils": "^3.0.1",
+            "entities": "^4.4.0"
+          }
+        }
+      }
+    },
     "sass-loader": {
       "version": "12.6.0",
       "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz",

frontend/package.json

@@ -75,6 +75,7 @@
     "react": "^17.0.2",
     "react-beautiful-dnd": "^13.1.1",
     "react-code-input": "^3.10.1",
+    "react-contenteditable": "^3.3.7",
     "react-dom": "^17.0.2",
     "react-grid-layout": "^1.3.4",
     "react-hook-form": "^7.43.0",
@@ -83,6 +84,7 @@
     "react-markdown": "^8.0.3",
     "react-redux": "^8.0.2",
     "react-table": "^7.8.0",
+    "sanitize-html": "^2.11.0",
     "set-cookie-parser": "^2.5.1",
     "sharp": "^0.32.0",
     "styled-components": "^5.3.7",
@@ -107,6 +109,7 @@
     "@types/jsrp": "^0.2.4",
     "@types/node": "18.11.9",
     "@types/react": "^18.0.26",
+    "@types/sanitize-html": "^2.9.0",
     "@typescript-eslint/eslint-plugin": "^5.48.1",
     "@typescript-eslint/parser": "^5.45.0",
     "autoprefixer": "^10.4.7",

frontend/public/data/frequentConstants.ts

@@ -26,8 +26,9 @@ const integrationSlugNameMapping: Mapping = {
   "digital-ocean-app-platform": "Digital Ocean App Platform",
   bitbucket: "BitBucket",
   "cloud-66": "Cloud 66",
-  northflank: "Northflank"
-};
+  northflank: "Northflank",
+  'windmill': 'Windmill'
+}
 
 const envMapping: Mapping = {
   Development: "dev",

frontend/src/components/navigation/NavHeader.tsx

@@ -58,15 +58,13 @@ export default function NavHeader({
 
   return (
     <div className="flex flex-row items-center pt-6">
-      <div className="mr-2 flex h-5 w-5 items-center justify-center rounded-md bg-primary text-black text-sm">
+      <div className="mr-2 flex h-5 w-5 items-center justify-center rounded-md bg-primary text-sm text-black">
         {currentOrg?.name?.charAt(0)}
       </div>
-      <Link
-        passHref
-        legacyBehavior
-        href={`/org/${currentOrg?._id}/overview`}
-      >
-        <a className="text-sm font-semibold text-primary/80 hover:text-primary pl-0.5">{currentOrg?.name}</a>
+      <Link passHref legacyBehavior href={`/org/${currentOrg?._id}/overview`}>
+        <a className="pl-0.5 text-sm font-semibold text-primary/80 hover:text-primary">
+          {currentOrg?.name}
+        </a>
       </Link>
       {isProjectRelated && (
         <>
@@ -85,7 +83,7 @@ export default function NavHeader({
         <Link
           passHref
           legacyBehavior
-          href={{ pathname: "/project/[id]/secrets", query: { id: router.query.id } }}
+          href={{ pathname: "/project/[id]/secrets/overview", query: { id: router.query.id } }}
         >
           <a className="text-sm font-semibold text-primary/80 hover:text-primary">{pageName}</a>
         </Link>
@@ -126,7 +124,11 @@ export default function NavHeader({
               {index + 1 === folders?.length ? (
                 <span className="text-sm font-semibold text-bunker-300">{name}</span>
               ) : (
-                <Link passHref legacyBehavior href={{ pathname: "/project/[id]/secrets", query }}>
+                <Link
+                  passHref
+                  legacyBehavior
+                  href={{ pathname: "/project/[id]/secrets/[env]", query }}
+                >
                   <a className="text-sm font-semibold text-primary/80 hover:text-primary">
                     {name === "root" ? selectedEnv?.name : name}
                   </a>

frontend/src/components/utilities/parseDotEnv.ts

@@ -1,5 +1,5 @@
 const LINE =
-  /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/gm;
+  /(?:^|^)\s*(?:export\s+)?([\w.-:]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/gm;
 
 /**
  * Return text that is the buffer parsed

frontend/src/components/v2/SecretInput/SecretInput.tsx

@@ -0,0 +1,93 @@
+/* eslint-disable react/no-danger */
+import { HTMLAttributes } from "react";
+import ContentEditable from "react-contenteditable";
+import sanitizeHtml from "sanitize-html";
+
+import { useToggle } from "@app/hooks";
+
+const REGEX = /\${([^}]+)}/g;
+const stripSpanTags = (str: string) => str.replace(/<\/?span[^>]*>/g, "");
+const replaceContentWithDot = (str: string) => {
+  let finalStr = "";
+  let isHtml = false;
+  for (let i = 0; i < str.length; i += 1) {
+    const char = str.at(i);
+
+    if (char === "<" || char === ">") {
+      isHtml = char === "<";
+      finalStr += char;
+    } else if (!isHtml && char !== "\n") {
+      finalStr += "&#8226;";
+    } else {
+      finalStr += char;
+    }
+  }
+  return finalStr;
+};
+
+const syntaxHighlight = (orgContent?: string | null, isVisible?: boolean) => {
+  if (orgContent === "") return "EMPTY";
+  if (!orgContent) return "missing";
+  if (!isVisible) return replaceContentWithDot(orgContent);
+  const content = stripSpanTags(orgContent);
+  const newContent = content.replace(
+    REGEX,
+    (_a, b) =>
+      `<span class="ph-no-capture text-yellow">&#36;&#123;<span class="ph-no-capture text-yello-200/80">${b}</span>&#125;</span>`
+  );
+
+  return newContent;
+};
+
+const sanitizeConf = {
+  allowedTags: ["div", "span", "br", "p"]
+};
+
+type Props = Omit<HTMLAttributes<HTMLDivElement>, "onChange" | "onBlur"> & {
+  value?: string | null;
+  isVisible?: boolean;
+  isDisabled?: boolean;
+  onChange?: (val: string, html: string) => void;
+  onBlur?: (sanitizedHtml: string) => void;
+};
+
+export const SecretInput = ({
+  value,
+  isVisible,
+  onChange,
+  onBlur,
+  isDisabled,
+  ...props
+}: Props) => {
+  const [isSecretFocused, setIsSecretFocused] = useToggle();
+
+  return (
+    <div
+      className="thin-scrollbar relative overflow-y-auto overflow-x-hidden"
+      style={{ maxHeight: `${21 * 7}px` }}
+    >
+      <div
+        dangerouslySetInnerHTML={{
+          __html: syntaxHighlight(value, isVisible || isSecretFocused)
+        }}
+        className={`absolute top-0 left-0 z-0 h-full w-full text-ellipsis whitespace-pre-line break-all ${!value && value !== "" && "text-red-600 italic"}`}
+      />
+      <ContentEditable
+        className="relative z-10 h-full w-full text-ellipsis whitespace-pre-line  break-all text-transparent caret-white outline-none"
+        role="textbox"
+        onChange={(evt) => {
+          if (onChange) onChange(evt.currentTarget.innerText.trim(), evt.currentTarget.innerHTML);
+        }}
+        onFocus={() => setIsSecretFocused.on()}
+        disabled={isDisabled}
+        spellCheck={false}
+        onBlur={(evt) => {
+          if (onBlur) onBlur(sanitizeHtml(evt.currentTarget.innerHTML || "", sanitizeConf));
+          setIsSecretFocused.off();
+        }}
+        html={isVisible || isSecretFocused ? value || "" : syntaxHighlight(value, false)}
+        {...props}
+      />
+    </div>
+  );
+};

frontend/src/components/v2/SecretInput/index.tsx

@@ -0,0 +1 @@
+export { SecretInput } from "./SecretInput";

frontend/src/components/v2/Table/Table.stories.tsx

@@ -52,7 +52,7 @@ export const Loading: Story = {
           </Tr>
         </THead>
         <TBody>
-          <TableSkeleton columns={3} key="story-book-table" />
+          <TableSkeleton columns={3} innerKey="story-book-table" />
         </TBody>
       </Table>
     </TableContainer>

frontend/src/components/v2/Table/Table.tsx

@@ -33,10 +33,7 @@ export type TableProps = {
 
 export const Table = ({ children, className }: TableProps): JSX.Element => (
   <table
-    className={twMerge(
-      "w-full bg-mineshaft-800 p-2 text-left text-sm text-gray-300",
-      className
-    )}
+    className={twMerge("w-full bg-mineshaft-800 p-2 text-left text-sm text-gray-300", className)}
   >
     {children}
   </table>
@@ -58,11 +55,24 @@ export const THead = ({ children, className }: THeadProps): JSX.Element => (
 export type TrProps = {
   children: ReactNode;
   className?: string;
+  isHoverable?: boolean;
+  isSelectable?: boolean;
 } & HTMLAttributes<HTMLTableRowElement>;
 
-export const Tr = ({ children, className, ...props }: TrProps): JSX.Element => (
+export const Tr = ({
+  children,
+  className,
+  isHoverable,
+  isSelectable,
+  ...props
+}: TrProps): JSX.Element => (
   <tr
-    className={twMerge("border border-solid border-mineshaft-700 cursor-default", className)}
+    className={twMerge(
+      "cursor-default border border-solid border-mineshaft-700",
+      isHoverable && "hover:bg-mineshaft-600",
+      isSelectable && "cursor-pointer",
+      className
+    )}
     {...props}
   >
     {children}
@@ -76,7 +86,14 @@ export type ThProps = {
 };
 
 export const Th = ({ children, className }: ThProps): JSX.Element => (
-  <th className={twMerge("bg-mineshaft-800 px-5 pt-4 pb-3.5 font-semibold border-b-2 border-mineshaft-600", className)}>{children}</th>
+  <th
+    className={twMerge(
+      "border-b-2 border-mineshaft-600 bg-mineshaft-800 px-5 pt-4 pb-3.5 font-semibold",
+      className
+    )}
+  >
+    {children}
+  </th>
 );
 
 // table body
@@ -106,15 +123,15 @@ export type TBodyLoader = {
   columns: number;
   className?: string;
   // unique key for mapping
-  key: string;
+  innerKey: string;
 };
 
-export const TableSkeleton = ({ rows = 3, columns, key, className }: TBodyLoader): JSX.Element => (
+export const TableSkeleton = ({ rows = 3, columns, innerKey, className }: TBodyLoader): JSX.Element => (
   <>
     {Array.apply(0, Array(rows)).map((_x, i) => (
-      <Tr key={`${key}-skeleton-rows-${i + 1}`}>
+      <Tr key={`${innerKey}-skeleton-rows-${i + 1}`}>
         {Array.apply(0, Array(columns)).map((_y, j) => (
-          <Td key={`${key}-skeleton-rows-${i + 1}-column-${j + 1}`}>
+          <Td key={`${innerKey}-skeleton-rows-${i + 1}-column-${j + 1}`}>
             <Skeleton className={className} />
           </Td>
         ))}

frontend/src/components/v2/Tooltip/Tooltip.tsx

@@ -23,7 +23,7 @@ export const Tooltip = ({
   ...props
 }: TooltipProps) => (
   <TooltipPrimitive.Root
-    delayDuration={150}
+    delayDuration={50}
     open={isOpen}
     defaultOpen={defaultOpen}
     onOpenChange={onOpenChange}

frontend/src/components/v2/index.tsx

@@ -4,7 +4,7 @@ export * from "./Checkbox";
 export * from "./DeleteActionModal";
 export * from "./Drawer";
 export * from "./Dropdown";
-export * from "./EmailServiceSetupModal"
+export * from "./EmailServiceSetupModal";
 export * from "./EmptyState";
 export * from "./FormControl";
 export * from "./HoverCardv2";
@@ -13,6 +13,7 @@ export * from "./Input";
 export * from "./Menu";
 export * from "./Modal";
 export * from "./Popoverv2";
+export * from "./SecretInput";
 export * from "./Select";
 export * from "./Skeleton";
 export * from "./Spinner";

frontend/src/hooks/api/secretFolders/index.tsx

@@ -1,6 +1,7 @@
 export {
   useCreateFolder,
   useDeleteFolder,
+  useGetFoldersByEnv,
   useGetProjectFolders,
   useGetProjectFoldersBatch,
   useUpdateFolder

frontend/src/hooks/api/secretFolders/queries.tsx

@@ -1,4 +1,4 @@
-import { useCallback } from "react";
+import { useCallback, useMemo } from "react";
 import { useMutation, useQueries, useQuery, useQueryClient } from "@tanstack/react-query";
 
 import { apiRequest } from "@app/config/request";
@@ -9,6 +9,7 @@ import {
   DeleteFolderDTO,
   GetProjectFoldersBatchDTO,
   GetProjectFoldersDTO,
+  TGetFoldersByEnvDTO,
   TSecretFolder,
   UpdateFolderDTO
 } from "./types";
@@ -62,6 +63,48 @@ export const useGetProjectFolders = ({
     )
   });
 
+export const useGetFoldersByEnv = ({
+  parentFolderPath,
+  workspaceId,
+  environments,
+  parentFolderId
+}: TGetFoldersByEnvDTO) => {
+  const folders = useQueries({
+    queries: environments.map((env) => ({
+      queryKey: queryKeys.getSecretFolders(workspaceId, env, parentFolderPath || parentFolderId),
+      queryFn: async () => fetchProjectFolders(workspaceId, env, parentFolderId, parentFolderPath),
+      enabled: Boolean(workspaceId) && Boolean(env)
+    }))
+  });
+
+  const folderNames = useMemo(() => {
+    const names = new Set<string>();
+    folders?.forEach(({ data }) => {
+      data?.folders.forEach(({ name }) => {
+        names.add(name);
+      });
+    });
+    return [...names];
+  }, [(folders || []).map((folder) => folder.data)]);
+
+  const isFolderPresentInEnv = useCallback(
+    (name: string, env: string) => {
+      const selectedEnvIndex = environments.indexOf(env);
+      if (selectedEnvIndex !== -1) {
+        return Boolean(
+          folders?.[selectedEnvIndex]?.data?.folders?.find(
+            ({ name: folderName }) => folderName === name
+          )
+        );
+      }
+      return false;
+    },
+    [(folders || []).map((folder) => folder.data)]
+  );
+
+  return { folders, folderNames, isFolderPresentInEnv };
+};
+
 export const useGetProjectFoldersBatch = ({
   folders = [],
   isPaused,

frontend/src/hooks/api/secretFolders/types.ts

@@ -17,6 +17,13 @@ export type GetProjectFoldersBatchDTO = {
   parentFolderPath?: string;
 };
 
+export type TGetFoldersByEnvDTO = {
+  environments: string[];
+  workspaceId: string;
+  parentFolderPath?: string;
+  parentFolderId?: string;
+};
+
 export type CreateFolderDTO = {
   workspaceId: string;
   environment: string;

frontend/src/hooks/api/secrets/index.ts

@@ -1,6 +1,7 @@
+export { useCreateSecretV3, useDeleteSecretV3, useUpdateSecretV3 } from "./mutations";
 export {
   useBatchSecretsOp,
   useGetProjectSecrets,
-  useGetProjectSecretsByKey,
+  useGetProjectSecretsAllEnv,
   useGetSecretVersion
 } from "./queries";

frontend/src/hooks/api/secrets/mutations.tsx

@@ -0,0 +1,172 @@
+import crypto from "crypto";
+
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+
+import {
+  decryptAssymmetric,
+  encryptSymmetric
+} from "@app/components/utilities/cryptography/crypto";
+import { apiRequest } from "@app/config/request";
+
+import { secretKeys } from "./queries";
+import { TCreateSecretsV3DTO, TDeleteSecretsV3DTO, TUpdateSecretsV3DTO } from "./types";
+
+const encryptSecret = (randomBytes: string, key: string, value?: string, comment?: string) => {
+  // encrypt key
+  const {
+    ciphertext: secretKeyCiphertext,
+    iv: secretKeyIV,
+    tag: secretKeyTag
+  } = encryptSymmetric({
+    plaintext: key,
+    key: randomBytes
+  });
+
+  // encrypt value
+  const {
+    ciphertext: secretValueCiphertext,
+    iv: secretValueIV,
+    tag: secretValueTag
+  } = encryptSymmetric({
+    plaintext: value ?? "",
+    key: randomBytes
+  });
+
+  // encrypt comment
+  const {
+    ciphertext: secretCommentCiphertext,
+    iv: secretCommentIV,
+    tag: secretCommentTag
+  } = encryptSymmetric({
+    plaintext: comment ?? "",
+    key: randomBytes
+  });
+
+  return {
+    secretKeyCiphertext,
+    secretKeyIV,
+    secretKeyTag,
+    secretValueCiphertext,
+    secretValueIV,
+    secretValueTag,
+    secretCommentCiphertext,
+    secretCommentIV,
+    secretCommentTag
+  };
+};
+
+export const useCreateSecretV3 = () => {
+  const queryClient = useQueryClient();
+  return useMutation<{}, {}, TCreateSecretsV3DTO>({
+    mutationFn: async ({
+      secretPath = "/",
+      type,
+      environment,
+      workspaceId,
+      secretName,
+      secretValue,
+      latestFileKey,
+      secretComment
+    }) => {
+      const PRIVATE_KEY = localStorage.getItem("PRIVATE_KEY") as string;
+
+      const randomBytes = latestFileKey
+        ? decryptAssymmetric({
+            ciphertext: latestFileKey.encryptedKey,
+            nonce: latestFileKey.nonce,
+            publicKey: latestFileKey.sender.publicKey,
+            privateKey: PRIVATE_KEY
+          })
+        : crypto.randomBytes(16).toString("hex");
+
+      const reqBody = {
+        workspaceId,
+        environment,
+        type,
+        secretPath,
+        ...encryptSecret(randomBytes, secretName, secretValue, secretComment)
+      };
+      const { data } = await apiRequest.post(`/api/v3/secrets/${secretName}`, reqBody);
+      return data;
+    },
+    onSuccess: (_, { workspaceId, environment, secretPath }) => {
+      queryClient.invalidateQueries(
+        secretKeys.getProjectSecret(workspaceId, environment, secretPath)
+      );
+    }
+  });
+};
+
+export const useUpdateSecretV3 = () => {
+  const queryClient = useQueryClient();
+  return useMutation<{}, {}, TUpdateSecretsV3DTO>({
+    mutationFn: async ({
+      secretPath = "/",
+      type,
+      environment,
+      workspaceId,
+      secretName,
+      secretValue,
+      latestFileKey
+    }) => {
+      const PRIVATE_KEY = localStorage.getItem("PRIVATE_KEY") as string;
+
+      const randomBytes = latestFileKey
+        ? decryptAssymmetric({
+            ciphertext: latestFileKey.encryptedKey,
+            nonce: latestFileKey.nonce,
+            publicKey: latestFileKey.sender.publicKey,
+            privateKey: PRIVATE_KEY
+          })
+        : crypto.randomBytes(16).toString("hex");
+      const { secretValueIV, secretValueTag, secretValueCiphertext } = encryptSecret(
+        randomBytes,
+        secretName,
+        secretValue,
+        ""
+      );
+
+      const reqBody = {
+        workspaceId,
+        environment,
+        type,
+        secretPath,
+        secretValueIV,
+        secretValueTag,
+        secretValueCiphertext
+      };
+      const { data } = await apiRequest.patch(`/api/v3/secrets/${secretName}`, reqBody);
+      return data;
+    },
+    onSuccess: (_, { workspaceId, environment, secretPath }) => {
+      queryClient.invalidateQueries(
+        secretKeys.getProjectSecret(workspaceId, environment, secretPath)
+      );
+    }
+  });
+};
+
+export const useDeleteSecretV3 = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation<{}, {}, TDeleteSecretsV3DTO>({
+    mutationFn: async ({ secretPath = "/", type, environment, workspaceId, secretName }) => {
+      const reqBody = {
+        workspaceId,
+        environment,
+        type,
+        secretPath
+      };
+
+      const { data } = await apiRequest.delete(`/api/v3/secrets/${secretName}`, {
+        data: reqBody
+      });
+      return data;
+    },
+    onSuccess: (_, { workspaceId, environment, secretPath }) => {
+      queryClient.invalidateQueries(
+        secretKeys.getProjectSecret(workspaceId, environment, secretPath)
+      );
+    }
+  });
+};

frontend/src/hooks/api/secrets/queries.tsx

@@ -1,6 +1,6 @@
 /* eslint-disable no-param-reassign */
-import { useCallback } from "react";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useCallback, useMemo } from "react";
+import { useMutation, useQueries, useQuery, useQueryClient } from "@tanstack/react-query";
 
 import {
   decryptAssymmetric,
@@ -15,7 +15,8 @@ import {
   EncryptedSecret,
   EncryptedSecretVersion,
   GetProjectSecretsDTO,
-  GetSecretVersionsDTO
+  GetSecretVersionsDTO,
+  TGetProjectSecretsAllEnvDTO
 } from "./types";
 
 export const secretKeys = {
@@ -37,40 +38,15 @@ const fetchProjectEncryptedSecrets = async (
   folderId?: string,
   secretPath?: string
 ) => {
-  if (typeof env === "string") {
-    const { data } = await apiRequest.get<{ secrets: EncryptedSecret[] }>("/api/v2/secrets", {
-      params: {
-        environment: env,
-        workspaceId,
-        folderId: folderId || undefined,
-        secretPath
-      }
-    });
-    return data.secrets;
-  }
-
-  if (typeof env === "object") {
-    let allEnvData: any = [];
-
-    // eslint-disable-next-line no-restricted-syntax
-    for (const envPoint of env) {
-      // eslint-disable-next-line no-await-in-loop
-      const { data } = await apiRequest.get<{ secrets: EncryptedSecret[] }>("/api/v2/secrets", {
-        params: {
-          environment: envPoint,
-          workspaceId,
-          folderId,
-          secretPath
-        }
-      });
-      allEnvData = allEnvData.concat(data.secrets);
+  const { data } = await apiRequest.get<{ secrets: EncryptedSecret[] }>("/api/v2/secrets", {
+    params: {
+      environment: env,
+      workspaceId,
+      folderId: folderId || undefined,
+      secretPath
     }
-
-    return allEnvData;
-    // eslint-disable-next-line no-else-return
-  } else {
-    return null;
-  }
+  });
+  return data.secrets;
 };
 
 export const useGetProjectSecrets = ({
@@ -160,22 +136,19 @@ export const useGetProjectSecrets = ({
     )
   });
 
-export const useGetProjectSecretsByKey = ({
+export const useGetProjectSecretsAllEnv = ({
   workspaceId,
-  env,
+  envs,
   decryptFileKey,
-  isPaused,
   folderId,
   secretPath
-}: GetProjectSecretsDTO) =>
-  useQuery({
-    // wait for all values to be available
-    enabled: Boolean(decryptFileKey && workspaceId && env) && !isPaused,
-    // right now secretpath is passed as folderid as only this is used in overview
-    queryKey: secretKeys.getProjectSecret(workspaceId, env, secretPath),
-    queryFn: () => fetchProjectEncryptedSecrets(workspaceId, env, folderId, secretPath),
-    select: useCallback(
-      (data: EncryptedSecret[]) => {
+}: TGetProjectSecretsAllEnvDTO) => {
+  const secrets = useQueries({
+    queries: envs.map((env) => ({
+      queryKey: secretKeys.getProjectSecret(workspaceId, env, secretPath || folderId),
+      enabled: Boolean(decryptFileKey && workspaceId && env),
+      queryFn: () => fetchProjectEncryptedSecrets(workspaceId, env, folderId, secretPath),
+      select: (data: EncryptedSecret[]) => {
         const PRIVATE_KEY = localStorage.getItem("PRIVATE_KEY") as string;
         const latestKey = decryptFileKey;
         const key = decryptAssymmetric({
@@ -185,12 +158,11 @@ export const useGetProjectSecretsByKey = ({
           privateKey: PRIVATE_KEY
         });
 
-        const sharedSecrets: Record<string, DecryptedSecret[]> = {};
+        const sharedSecrets: Record<string, DecryptedSecret> = {};
         const personalSecrets: Record<string, { id: string; value: string }> = {};
         // this used for add-only mode in dashboard
         // type won't be there thus only one key is shown
         const duplicateSecretKey: Record<string, boolean> = {};
-        const uniqSecKeys: Record<string, boolean> = {};
         data.forEach((encSecret: EncryptedSecret) => {
           const secretKey = decryptSymmetric({
             ciphertext: encSecret.secretKeyCiphertext,
@@ -198,7 +170,6 @@ export const useGetProjectSecretsByKey = ({
             tag: encSecret.secretKeyTag,
             key
           });
-          if (!uniqSecKeys?.[secretKey]) uniqSecKeys[secretKey] = true;
 
           const secretValue = decryptSymmetric({
             ciphertext: encSecret.secretValueCiphertext,
@@ -226,35 +197,65 @@ export const useGetProjectSecretsByKey = ({
           };
 
           if (encSecret.type === "personal") {
-            personalSecrets[`${decryptedSecret.key}-${decryptedSecret.env}`] = {
+            personalSecrets[decryptedSecret.key] = {
               id: encSecret._id,
               value: secretValue
             };
           } else {
-            if (!duplicateSecretKey?.[`${decryptedSecret.key}-${decryptedSecret.env}`]) {
-              if (!sharedSecrets?.[secretKey]) sharedSecrets[secretKey] = [];
-              sharedSecrets[secretKey].push(decryptedSecret);
+            if (!duplicateSecretKey?.[decryptedSecret.key]) {
+              sharedSecrets[decryptedSecret.key] = decryptedSecret;
             }
-            duplicateSecretKey[`${decryptedSecret.key}-${decryptedSecret.env}`] = true;
+            duplicateSecretKey[decryptedSecret.key] = true;
           }
         });
-        Object.keys(sharedSecrets).forEach((secName) => {
-          sharedSecrets[secName].forEach((val) => {
-            const dupKey = `${val.key}-${val.env}`;
-            if (personalSecrets?.[dupKey]) {
-              val.idOverride = personalSecrets[dupKey].id;
-              val.valueOverride = personalSecrets[dupKey].value;
-              val.overrideAction = "modified";
-            }
-          });
-        });
 
-        return { secrets: sharedSecrets, uniqueSecCount: Object.keys(uniqSecKeys).length };
-      },
-      [decryptFileKey]
-    )
+        Object.keys(sharedSecrets).forEach((val) => {
+          if (personalSecrets?.[val]) {
+            sharedSecrets[val].idOverride = personalSecrets[val].id;
+            sharedSecrets[val].valueOverride = personalSecrets[val].value;
+            sharedSecrets[val].overrideAction = "modified";
+          }
+        });
+        return sharedSecrets;
+      }
+    }))
   });
 
+  const secKeys = useMemo(() => {
+    const keys = new Set<string>();
+    secrets?.forEach(({ data }) => {
+      // TODO(akhilmhdh): find out why this is unknown
+      Object.keys(data || {}).forEach((key) => keys.add(key));
+    });
+    return [...keys];
+  }, [(secrets || []).map((sec) => sec.data)]);
+
+  const getEnvSecretKeyCount = useCallback(
+    (env: string) => {
+      const selectedEnvIndex = envs.indexOf(env);
+      if (selectedEnvIndex !== -1) {
+        return Object.keys(secrets[selectedEnvIndex]?.data || {}).length;
+      }
+      return 0;
+    },
+    [(secrets || []).map((sec) => sec.data)]
+  );
+
+  const getSecretByKey = useCallback(
+    (env: string, key: string) => {
+      const selectedEnvIndex = envs.indexOf(env);
+      if (selectedEnvIndex !== -1) {
+        const sec = secrets[selectedEnvIndex]?.data?.[key];
+        return sec;
+      }
+      return undefined;
+    },
+    [(secrets || []).map((sec) => sec.data)]
+  );
+
+  return { data: secrets, secKeys, getSecretByKey, getEnvSecretKeyCount };
+};
+
 const fetchEncryptedSecretVersion = async (secretId: string, offset: number, limit: number) => {
   const { data } = await apiRequest.get<{ secretVersions: EncryptedSecretVersion[] }>(
     `/api/v1/secret/${secretId}/secret-versions`,

frontend/src/hooks/api/secrets/types.ts

@@ -103,9 +103,47 @@ export type GetProjectSecretsDTO = {
   onSuccess?: (data: DecryptedSecret[]) => void;
 };
 
+export type TGetProjectSecretsAllEnvDTO = {
+  workspaceId: string;
+  envs: string[];
+  decryptFileKey: UserWsKeyPair;
+  folderId?: string;
+  secretPath?: string;
+  isPaused?: boolean;
+};
+
 export type GetSecretVersionsDTO = {
   secretId: string;
   limit: number;
   offset: number;
   decryptFileKey: UserWsKeyPair;
 };
+
+export type TCreateSecretsV3DTO = {
+  latestFileKey: UserWsKeyPair;
+  secretName: string;
+  secretValue: string;
+  secretComment: string;
+  secretPath: string;
+  workspaceId: string;
+  environment: string;
+  type: string;
+};
+
+export type TUpdateSecretsV3DTO = {
+  latestFileKey: UserWsKeyPair;
+  workspaceId: string;
+  environment: string;
+  type: string;
+  secretPath: string;
+  secretName: string;
+  secretValue: string;
+};
+
+export type TDeleteSecretsV3DTO = {
+  workspaceId: string;
+  environment: string;
+  type: string;
+  secretPath: string;
+  secretName: string;
+};

frontend/src/layouts/AppLayout/AppLayout.tsx

@@ -13,7 +13,18 @@ import { useTranslation } from "react-i18next";
 import Link from "next/link";
 import { useRouter } from "next/router";
 import { faGithub, faSlack } from "@fortawesome/free-brands-svg-icons";
-import { faAngleDown, faArrowLeft, faArrowUpRightFromSquare, faBook, faCheck, faEnvelope, faInfinity, faMobile, faPlus, faQuestion } from "@fortawesome/free-solid-svg-icons";
+import {
+  faAngleDown,
+  faArrowLeft,
+  faArrowUpRightFromSquare,
+  faBook,
+  faCheck,
+  faEnvelope,
+  faInfinity,
+  faMobile,
+  faPlus,
+  faQuestion
+} from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { yupResolver } from "@hookform/resolvers/yup";
 import { DropdownMenuTrigger } from "@radix-ui/react-dropdown-menu";
@@ -41,7 +52,14 @@ import {
 } from "@app/components/v2";
 import { useOrganization, useSubscription, useUser, useWorkspace } from "@app/context";
 import { usePopUp } from "@app/hooks";
-import { fetchOrgUsers, useAddUserToWs, useCreateWorkspace, useGetOrgTrialUrl, useLogoutUser, useUploadWsKey } from "@app/hooks/api";
+import {
+  fetchOrgUsers,
+  useAddUserToWs,
+  useCreateWorkspace,
+  useGetOrgTrialUrl,
+  useLogoutUser,
+  useUploadWsKey
+} from "@app/hooks/api";
 
 interface LayoutProps {
   children: React.ReactNode;
@@ -89,7 +107,9 @@ export const AppLayout = ({ children }: LayoutProps) => {
   const { subscription } = useSubscription();
   // const [ isLearningNoteOpen, setIsLearningNoteOpen ] = useState(true);
 
-  const isAddingProjectsAllowed = subscription?.workspaceLimit ? (subscription.workspacesUsed < subscription.workspaceLimit) : true;
+  const isAddingProjectsAllowed = subscription?.workspaceLimit
+    ? subscription.workspacesUsed < subscription.workspaceLimit
+    : true;
 
   const createWs = useCreateWorkspace();
   const uploadWsKey = useUploadWsKey();
@@ -110,22 +130,22 @@ export const AppLayout = ({ children }: LayoutProps) => {
 
   const { t } = useTranslation();
 
-	useEffect(() => {
-		const handleRouteChange = () => {
-			(window).Intercom("update");
-		};
-		
-		router.events.on("routeChangeComplete", handleRouteChange);
-		
-		return () => {
-		  router.events.off("routeChangeComplete", handleRouteChange);
-		};
-	}, []);
+  useEffect(() => {
+    const handleRouteChange = () => {
+      window.Intercom("update");
+    };
+
+    router.events.on("routeChangeComplete", handleRouteChange);
+
+    return () => {
+      router.events.off("routeChangeComplete", handleRouteChange);
+    };
+  }, []);
 
   const logout = useLogoutUser();
   const logOutUser = async () => {
     try {
-      console.log("Logging out...")
+      console.log("Logging out...");
       await logout.mutateAsync();
       localStorage.removeItem("protectedKey");
       localStorage.removeItem("protectedKeyIV");
@@ -145,27 +165,30 @@ export const AppLayout = ({ children }: LayoutProps) => {
 
   const changeOrg = async (orgId) => {
     localStorage.setItem("orgData.id", orgId);
-    router.push(`/org/${orgId}/overview`)
-  }
+    router.push(`/org/${orgId}/overview`);
+  };
 
   // TODO(akhilmhdh): This entire logic will be rechecked and will try to avoid
   // Placing the localstorage as much as possible
   // Wait till tony integrates the azure and its launched
   useEffect(() => {
-
     // Put a user in an org if they're not in one yet
     const putUserInOrg = async () => {
       if (tempLocalStorage("orgData.id") === "") {
         localStorage.setItem("orgData.id", orgs[0]?._id);
       }
 
-      if (currentOrg && (
-        (workspaces?.length === 0 && router.asPath.includes("project")) 
-        || router.asPath.includes("/project/undefined")
-        || (!orgs?.map(org => org._id)?.includes(router.query.id) && !router.asPath.includes("project") && !router.asPath.includes("personal") && !router.asPath.includes("integration"))
-      )) {
+      if (
+        currentOrg &&
+        ((workspaces?.length === 0 && router.asPath.includes("project")) ||
+          router.asPath.includes("/project/undefined") ||
+          (!orgs?.map((org) => org._id)?.includes(router.query.id) &&
+            !router.asPath.includes("project") &&
+            !router.asPath.includes("personal") &&
+            !router.asPath.includes("integration")))
+      ) {
         router.push(`/org/${currentOrg?._id}/overview`);
-      } 
+      }
       // else if (!router.asPath.includes("org") && !router.asPath.includes("project") && !router.asPath.includes("integrations") && !router.asPath.includes("personal-settings")) {
 
       //   const pathSegments = router.asPath.split("/").filter((segment) => segment.length > 0);
@@ -233,7 +256,7 @@ export const AppLayout = ({ children }: LayoutProps) => {
       }
       createNotification({ text: "Workspace created", type: "success" });
       handlePopUpClose("addNewWs");
-      router.push(`/project/${newWorkspaceId}/secrets`);
+      router.push(`/project/${newWorkspaceId}/secrets/overview`);
     } catch (err) {
       console.error(err);
       createNotification({ text: "Failed to create workspace", type: "error" });
@@ -244,190 +267,235 @@ export const AppLayout = ({ children }: LayoutProps) => {
     <>
       <div className="dark hidden h-screen w-full flex-col overflow-x-hidden md:flex">
         <div className="flex flex-grow flex-col overflow-y-hidden md:flex-row">
-          <aside className="w-full border-r border-mineshaft-600 bg-gradient-to-tr from-mineshaft-700 via-mineshaft-800 to-mineshaft-900 md:w-60 dark">
+          <aside className="dark w-full border-r border-mineshaft-600 bg-gradient-to-tr from-mineshaft-700 via-mineshaft-800 to-mineshaft-900 md:w-60">
             <nav className="items-between flex h-full flex-col justify-between overflow-y-auto dark:[color-scheme:dark]">
               <div>
-                {!router.asPath.includes("personal") && <div className="h-12 px-3 flex items-center pt-6 cursor-default">
-                  {(router.asPath.includes("project") || router.asPath.includes("integrations")) && <Link href={`/org/${currentOrg?._id}/overview`}><div className="pl-1 pr-2 text-mineshaft-400 hover:text-mineshaft-100 duration-200">
-                    <FontAwesomeIcon icon={faArrowLeft} />
-                  </div></Link>}
-                  <DropdownMenu>
-                    <DropdownMenuTrigger asChild className="data-[state=open]:bg-mineshaft-600">
-                      <div className="mr-auto flex items-center hover:bg-mineshaft-600 py-1.5 pl-1.5 pr-2 rounded-md">
-                        <div className="w-5 h-5 rounded-md bg-primary flex justify-center items-center text-sm">{currentOrg?.name.charAt(0)}</div>
-                        <div className="pl-3 text-mineshaft-100 text-sm">{currentOrg?.name} <FontAwesomeIcon icon={faAngleDown} className="text-xs pl-1 pt-1 text-mineshaft-300" /></div>
-                      </div>
-                    </DropdownMenuTrigger>
-                    <DropdownMenuContent align="start" className="p-1">
-                      <div className="text-xs text-mineshaft-400 px-2 py-1">{user?.email}</div>
-                      {orgs?.map(org => <DropdownMenuItem key={org._id}>
-                          <Button
-                            onClick={() => changeOrg(org?._id)}
-                            variant="plain"
-                            colorSchema="secondary"
-                            size="xs"
-                            className="w-full flex items-center justify-start p-0 font-normal"
-                            leftIcon={currentOrg._id === org._id && <FontAwesomeIcon icon={faCheck} className="mr-3 text-primary"/>}
-                          >
-                            <div className="w-full flex justify-between items-center">{org.name}</div>
-                          </Button>
-                        </DropdownMenuItem>
-                      )}
-                      <div className="h-1 mt-1 border-t border-mineshaft-600"/>
-                      <button
-                        type="button"
-                        onClick={logOutUser}
-                        className="w-full"
-                      >
-                        <DropdownMenuItem>Log Out</DropdownMenuItem>
-                      </button>
-                    </DropdownMenuContent>
-                  </DropdownMenu>
-                  <DropdownMenu>
-                    <DropdownMenuTrigger asChild className="hover:bg-primary-400 hover:text-black data-[state=open]:text-black data-[state=open]:bg-primary-400 p-1">
-                      <div className="child w-6 h-6 rounded-full bg-mineshaft hover:bg-mineshaft-500 pr-1 text-xs text-mineshaft-300 flex justify-center items-center">
-                        {user?.firstName?.charAt(0)}{user?.lastName && user?.lastName?.charAt(0)}
-                      </div>
-                    </DropdownMenuTrigger>
-                    <DropdownMenuContent align="start" className="p-1">
-                      <div className="text-xs text-mineshaft-400 px-2 py-1">{user?.email}</div>
-                      <Link href="/personal-settings"><DropdownMenuItem>Personal Settings</DropdownMenuItem></Link>
-                      <a
-                        href="https://infisical.com/docs/documentation/getting-started/introduction"
-                        target="_blank"
-                        rel="noopener noreferrer"
-                        className="w-full mt-3 text-sm text-mineshaft-300 font-normal leading-[1.2rem] hover:text-mineshaft-100"
-                      >
-                        <DropdownMenuItem>Documentation<FontAwesomeIcon icon={faArrowUpRightFromSquare} className="pl-1.5 text-xxs mb-[0.06rem]" /></DropdownMenuItem>
-                      </a>
-                      <a
-                        href="https://infisical.com/slack"
-                        target="_blank"
-                        rel="noopener noreferrer"
-                        className="w-full mt-3 text-sm text-mineshaft-300 font-normal leading-[1.2rem] hover:text-mineshaft-100"
-                      >
-                        <DropdownMenuItem>Join Slack Community<FontAwesomeIcon icon={faArrowUpRightFromSquare} className="pl-1.5 text-xxs mb-[0.06rem]" /></DropdownMenuItem>
-                      </a>
-                      <div className="h-1 mt-1 border-t border-mineshaft-600"/>
-                      <button
-                        type="button"
-                        onClick={logOutUser}
-                        className="w-full"
-                      >
-                        <DropdownMenuItem>Log Out</DropdownMenuItem>
-                      </button>
-                    </DropdownMenuContent>
-                  </DropdownMenu>
-                </div>}
-                {!router.asPath.includes("org") && (!router.asPath.includes("personal") && currentWorkspace ? (
-                  <div className="mt-5 mb-4 w-full p-3">
-                    <p className="ml-1.5 mb-1 text-xs font-semibold uppercase text-gray-400">
-                      Project
-                    </p>
-                    <Select
-                      defaultValue={currentWorkspace?._id}
-                      value={currentWorkspace?._id}
-                      className="w-full truncate bg-mineshaft-600 py-2.5 font-medium"
-                      onValueChange={(value) => {
-                        router.push(`/project/${value}/secrets`);
-                        localStorage.setItem("projectData.id", value);
-                      }}
-                      position="popper"
-                      dropdownContainerClassName="text-bunker-200 bg-mineshaft-800 border border-mineshaft-600 z-50 max-h-96 border-gray-700"
-                    >
-                      <div className='h-full no-scrollbar no-scrollbar::-webkit-scrollbar'>
-                        {workspaces
-                        .filter((ws) => ws.organization === currentOrg?._id)
-                        .map(({ _id, name }) => (
-                          <SelectItem
-                            key={`ws-layout-list-${_id}`}
-                            value={_id}
-                            className={`${currentWorkspace?._id === _id && "bg-mineshaft-600"}`}
-                          >
-                            {name}
-                          </SelectItem>
+                {!router.asPath.includes("personal") && (
+                  <div className="flex h-12 cursor-default items-center px-3 pt-6">
+                    {(router.asPath.includes("project") ||
+                      router.asPath.includes("integrations")) && (
+                      <Link href={`/org/${currentOrg?._id}/overview`}>
+                        <div className="pl-1 pr-2 text-mineshaft-400 duration-200 hover:text-mineshaft-100">
+                          <FontAwesomeIcon icon={faArrowLeft} />
+                        </div>
+                      </Link>
+                    )}
+                    <DropdownMenu>
+                      <DropdownMenuTrigger asChild className="data-[state=open]:bg-mineshaft-600">
+                        <div className="mr-auto flex items-center rounded-md py-1.5 pl-1.5 pr-2 hover:bg-mineshaft-600">
+                          <div className="flex h-5 w-5 items-center justify-center rounded-md bg-primary text-sm">
+                            {currentOrg?.name.charAt(0)}
+                          </div>
+                          <div className="pl-3 text-sm text-mineshaft-100">
+                            {currentOrg?.name}{" "}
+                            <FontAwesomeIcon
+                              icon={faAngleDown}
+                              className="pl-1 pt-1 text-xs text-mineshaft-300"
+                            />
+                          </div>
+                        </div>
+                      </DropdownMenuTrigger>
+                      <DropdownMenuContent align="start" className="p-1">
+                        <div className="px-2 py-1 text-xs text-mineshaft-400">{user?.email}</div>
+                        {orgs?.map((org) => (
+                          <DropdownMenuItem key={org._id}>
+                            <Button
+                              onClick={() => changeOrg(org?._id)}
+                              variant="plain"
+                              colorSchema="secondary"
+                              size="xs"
+                              className="flex w-full items-center justify-start p-0 font-normal"
+                              leftIcon={
+                                currentOrg._id === org._id && (
+                                  <FontAwesomeIcon icon={faCheck} className="mr-3 text-primary" />
+                                )
+                              }
+                            >
+                              <div className="flex w-full items-center justify-between">
+                                {org.name}
+                              </div>
+                            </Button>
+                          </DropdownMenuItem>
                         ))}
-                      </div>
-                      <hr className="mt-1 mb-1 h-px border-0 bg-gray-700" />
-                      <div className="w-full">
-                        <Button
-                          className="w-full bg-mineshaft-700 py-2 text-bunker-200"
-                          colorSchema="primary"
-                          variant="outline_bg"
-                          size="sm"
-                          onClick={() => {
-                            if (isAddingProjectsAllowed) {
-                              handlePopUpOpen("addNewWs")
-                            } else {
-                              handlePopUpOpen("upgradePlan");
-                            }
-                          }}
-                          leftIcon={<FontAwesomeIcon icon={faPlus} />}
+                        <div className="mt-1 h-1 border-t border-mineshaft-600" />
+                        <button type="button" onClick={logOutUser} className="w-full">
+                          <DropdownMenuItem>Log Out</DropdownMenuItem>
+                        </button>
+                      </DropdownMenuContent>
+                    </DropdownMenu>
+                    <DropdownMenu>
+                      <DropdownMenuTrigger
+                        asChild
+                        className="p-1 hover:bg-primary-400 hover:text-black data-[state=open]:bg-primary-400 data-[state=open]:text-black"
+                      >
+                        <div className="child flex h-6 w-6 items-center justify-center rounded-full bg-mineshaft pr-1 text-xs text-mineshaft-300 hover:bg-mineshaft-500">
+                          {user?.firstName?.charAt(0)}
+                          {user?.lastName && user?.lastName?.charAt(0)}
+                        </div>
+                      </DropdownMenuTrigger>
+                      <DropdownMenuContent align="start" className="p-1">
+                        <div className="px-2 py-1 text-xs text-mineshaft-400">{user?.email}</div>
+                        <Link href="/personal-settings">
+                          <DropdownMenuItem>Personal Settings</DropdownMenuItem>
+                        </Link>
+                        <a
+                          href="https://infisical.com/docs/documentation/getting-started/introduction"
+                          target="_blank"
+                          rel="noopener noreferrer"
+                          className="mt-3 w-full text-sm font-normal leading-[1.2rem] text-mineshaft-300 hover:text-mineshaft-100"
                         >
-                          Add Project
-                        </Button>
-                      </div>
-                    </Select>
+                          <DropdownMenuItem>
+                            Documentation
+                            <FontAwesomeIcon
+                              icon={faArrowUpRightFromSquare}
+                              className="mb-[0.06rem] pl-1.5 text-xxs"
+                            />
+                          </DropdownMenuItem>
+                        </a>
+                        <a
+                          href="https://infisical.com/slack"
+                          target="_blank"
+                          rel="noopener noreferrer"
+                          className="mt-3 w-full text-sm font-normal leading-[1.2rem] text-mineshaft-300 hover:text-mineshaft-100"
+                        >
+                          <DropdownMenuItem>
+                            Join Slack Community
+                            <FontAwesomeIcon
+                              icon={faArrowUpRightFromSquare}
+                              className="mb-[0.06rem] pl-1.5 text-xxs"
+                            />
+                          </DropdownMenuItem>
+                        </a>
+                        <div className="mt-1 h-1 border-t border-mineshaft-600" />
+                        <button type="button" onClick={logOutUser} className="w-full">
+                          <DropdownMenuItem>Log Out</DropdownMenuItem>
+                        </button>
+                      </DropdownMenuContent>
+                    </DropdownMenu>
                   </div>
-                ) : <Link href={`/org/${currentOrg?._id}/overview`}><div className="pr-2 my-6 flex justify-center items-center text-mineshaft-300 hover:text-mineshaft-100 cursor-default text-sm">
-                  <FontAwesomeIcon icon={faArrowLeft} className="pr-3"/>
-                  Back to organization
-                </div></Link>)}
+                )}
+                {!router.asPath.includes("org") &&
+                  (!router.asPath.includes("personal") && currentWorkspace ? (
+                    <div className="mt-5 mb-4 w-full p-3">
+                      <p className="ml-1.5 mb-1 text-xs font-semibold uppercase text-gray-400">
+                        Project
+                      </p>
+                      <Select
+                        defaultValue={currentWorkspace?._id}
+                        value={currentWorkspace?._id}
+                        className="w-full truncate bg-mineshaft-600 py-2.5 font-medium"
+                        onValueChange={(value) => {
+                          router.push(`/project/${value}/secrets/overview`);
+                          localStorage.setItem("projectData.id", value);
+                        }}
+                        position="popper"
+                        dropdownContainerClassName="text-bunker-200 bg-mineshaft-800 border border-mineshaft-600 z-50 max-h-96 border-gray-700"
+                      >
+                        <div className="no-scrollbar::-webkit-scrollbar h-full no-scrollbar">
+                          {workspaces
+                            .filter((ws) => ws.organization === currentOrg?._id)
+                            .map(({ _id, name }) => (
+                              <SelectItem
+                                key={`ws-layout-list-${_id}`}
+                                value={_id}
+                                className={`${currentWorkspace?._id === _id && "bg-mineshaft-600"}`}
+                              >
+                                {name}
+                              </SelectItem>
+                            ))}
+                        </div>
+                        <hr className="mt-1 mb-1 h-px border-0 bg-gray-700" />
+                        <div className="w-full">
+                          <Button
+                            className="w-full bg-mineshaft-700 py-2 text-bunker-200"
+                            colorSchema="primary"
+                            variant="outline_bg"
+                            size="sm"
+                            onClick={() => {
+                              if (isAddingProjectsAllowed) {
+                                handlePopUpOpen("addNewWs");
+                              } else {
+                                handlePopUpOpen("upgradePlan");
+                              }
+                            }}
+                            leftIcon={<FontAwesomeIcon icon={faPlus} />}
+                          >
+                            Add Project
+                          </Button>
+                        </div>
+                      </Select>
+                    </div>
+                  ) : (
+                    <Link href={`/org/${currentOrg?._id}/overview`}>
+                      <div className="my-6 flex cursor-default items-center justify-center pr-2 text-sm text-mineshaft-300 hover:text-mineshaft-100">
+                        <FontAwesomeIcon icon={faArrowLeft} className="pr-3" />
+                        Back to organization
+                      </div>
+                    </Link>
+                  ))}
                 <div className={`px-1 ${!router.asPath.includes("personal") ? "block" : "hidden"}`}>
-                  {((router.asPath.includes("project") || router.asPath.includes("integrations")) && currentWorkspace) ? <Menu>
-                    <Link href={`/project/${currentWorkspace?._id}/secrets`} passHref>
-                      <a>
-                        <MenuItem
-                          isSelected={router.asPath.includes(`/project/${currentWorkspace?._id}/secrets`)}
-                          icon="system-outline-90-lock-closed"
-                        >
-                          {t("nav.menu.secrets")}
-                        </MenuItem>
-                      </a>
-                    </Link>
-                    <Link href={`/project/${currentWorkspace?._id}/members`} passHref>
-                      <a>
-                        <MenuItem
-                          isSelected={router.asPath === `/project/${currentWorkspace?._id}/members`}
-                          icon="system-outline-96-groups"
-                        >
-                          {t("nav.menu.members")}
-                        </MenuItem>
-                      </a>
-                    </Link>
-                    <Link href={`/integrations/${currentWorkspace?._id}`} passHref>
-                      <a>
-                        <MenuItem
-                          isSelected={router.asPath === `/integrations/${currentWorkspace?._id}`}
-                          icon="system-outline-82-extension"
-                        >
-                          {t("nav.menu.integrations")}
-                        </MenuItem>
-                      </a>
-                    </Link>
-                    <Link href={`/project/${currentWorkspace?._id}/allowlist`} passHref>
-                      <a>
-                        <MenuItem
-                          isSelected={
-                            router.asPath === `/project/${currentWorkspace?._id}/allowlist`
-                          }
-                          icon="system-outline-126-verified"
-                        >
-                          IP Allowlist
-                        </MenuItem>
-                      </a>
-                    </Link>
-                    <Link href={`/project/${currentWorkspace?._id}/audit-logs`} passHref>
-                      <a>
-                        <MenuItem
-                          isSelected={router.asPath === `/project/${currentWorkspace?._id}/audit-logs`}
-                          icon="system-outline-168-view-headline"
-                        >
-                          Audit Logs
-                        </MenuItem>
-                      </a>
-                    </Link>
-                    {/* <Link href={`/project/${currentWorkspace?._id}/secret-scanning`} passHref>
+                  {(router.asPath.includes("project") || router.asPath.includes("integrations")) &&
+                  currentWorkspace ? (
+                    <Menu>
+                      <Link href={`/project/${currentWorkspace?._id}/secrets/overview`} passHref>
+                        <a>
+                          <MenuItem
+                            isSelected={router.asPath.includes(
+                              `/project/${currentWorkspace?._id}/secrets/overview`
+                            )}
+                            icon="system-outline-90-lock-closed"
+                          >
+                            {t("nav.menu.secrets")}
+                          </MenuItem>
+                        </a>
+                      </Link>
+                      <Link href={`/project/${currentWorkspace?._id}/members`} passHref>
+                        <a>
+                          <MenuItem
+                            isSelected={
+                              router.asPath === `/project/${currentWorkspace?._id}/members`
+                            }
+                            icon="system-outline-96-groups"
+                          >
+                            {t("nav.menu.members")}
+                          </MenuItem>
+                        </a>
+                      </Link>
+                      <Link href={`/integrations/${currentWorkspace?._id}`} passHref>
+                        <a>
+                          <MenuItem
+                            isSelected={router.asPath === `/integrations/${currentWorkspace?._id}`}
+                            icon="system-outline-82-extension"
+                          >
+                            {t("nav.menu.integrations")}
+                          </MenuItem>
+                        </a>
+                      </Link>
+                      <Link href={`/project/${currentWorkspace?._id}/allowlist`} passHref>
+                        <a>
+                          <MenuItem
+                            isSelected={
+                              router.asPath === `/project/${currentWorkspace?._id}/allowlist`
+                            }
+                            icon="system-outline-126-verified"
+                          >
+                            IP Allowlist
+                          </MenuItem>
+                        </a>
+                      </Link>
+                      <Link href={`/project/${currentWorkspace?._id}/audit-logs`} passHref>
+                        <a>
+                          <MenuItem
+                            isSelected={
+                              router.asPath === `/project/${currentWorkspace?._id}/audit-logs`
+                            }
+                            icon="system-outline-168-view-headline"
+                          >
+                            Audit Logs
+                          </MenuItem>
+                        </a>
+                      </Link>
+                      {/* <Link href={`/project/${currentWorkspace?._id}/secret-scanning`} passHref>
                       <a>
                         <MenuItem
                           isSelected={router.asPath === `/project/${currentWorkspace?._id}/secret-scanning`}
@@ -438,20 +506,21 @@ export const AppLayout = ({ children }: LayoutProps) => {
                         </MenuItem>
                       </a>
                     </Link> */}
-                    <Link href={`/project/${currentWorkspace?._id}/settings`} passHref>
-                      <a>
-                        <MenuItem
-                          isSelected={
-                            router.asPath === `/project/${currentWorkspace?._id}/settings`
-                          }
-                          icon="system-outline-109-slider-toggle-settings"
-                        >
-                          {t("nav.menu.project-settings")}
-                        </MenuItem>
-                      </a>
-                    </Link>
-                  </Menu>
-                  : <Menu className="mt-4">
+                      <Link href={`/project/${currentWorkspace?._id}/settings`} passHref>
+                        <a>
+                          <MenuItem
+                            isSelected={
+                              router.asPath === `/project/${currentWorkspace?._id}/settings`
+                            }
+                            icon="system-outline-109-slider-toggle-settings"
+                          >
+                            {t("nav.menu.project-settings")}
+                          </MenuItem>
+                        </a>
+                      </Link>
+                    </Menu>
+                  ) : (
+                    <Menu className="mt-4">
                       <Link href={`/org/${currentOrg?._id}/overview`} passHref>
                         <a>
                           <MenuItem
@@ -462,7 +531,7 @@ export const AppLayout = ({ children }: LayoutProps) => {
                           </MenuItem>
                         </a>
                       </Link>
-                      {/* {workspaces.map(project => <Link key={project._id} href={`/project/${project?._id}/secrets`} passHref>
+                      {/* {workspaces.map(project => <Link key={project._id} href={`/project/${project?._id}/secrets/overview`} passHref>
                         <a>
                           <SubMenuItem
                             isSelected={false}
@@ -508,20 +577,25 @@ export const AppLayout = ({ children }: LayoutProps) => {
                       <Link href={`/org/${currentOrg?._id}/settings`} passHref>
                         <a>
                           <MenuItem
-                            isSelected={
-                              router.asPath === `/org/${currentOrg?._id}/settings`
-                            }
+                            isSelected={router.asPath === `/org/${currentOrg?._id}/settings`}
                             icon="system-outline-109-slider-toggle-settings"
                           >
                             Organization Settings
                           </MenuItem>
                         </a>
                       </Link>
-                  </Menu>}
+                    </Menu>
+                  )}
                 </div>
               </div>
-              <div className={`relative mt-10 ${subscription && subscription.slug === "starter" && !subscription.has_used_trial ? "mb-2" : "mb-4"} w-full px-3 text-mineshaft-400 cursor-default text-sm flex flex-col items-center`}>
-              {/*   <div className={`${isLearningNoteOpen ? "block" : "hidden"} z-0 absolute h-60 w-[9.9rem] ${router.asPath.includes("org") ? "bottom-[8.4rem]" : "bottom-[5.4rem]"} bg-mineshaft-900 border border-mineshaft-600 mb-4 rounded-md opacity-30`}/>
+              <div
+                className={`relative mt-10 ${
+                  subscription && subscription.slug === "starter" && !subscription.has_used_trial
+                    ? "mb-2"
+                    : "mb-4"
+                } flex w-full cursor-default flex-col items-center px-3 text-sm text-mineshaft-400`}
+              >
+                {/*   <div className={`${isLearningNoteOpen ? "block" : "hidden"} z-0 absolute h-60 w-[9.9rem] ${router.asPath.includes("org") ? "bottom-[8.4rem]" : "bottom-[5.4rem]"} bg-mineshaft-900 border border-mineshaft-600 mb-4 rounded-md opacity-30`}/>
                 <div className={`${isLearningNoteOpen ? "block" : "hidden"} z-0 absolute h-60 w-[10.7rem] ${router.asPath.includes("org") ? "bottom-[8.15rem]" : "bottom-[5.15rem]"} bg-mineshaft-900 border border-mineshaft-600 mb-4 rounded-md opacity-50`}/>
                 <div className={`${isLearningNoteOpen ? "block" : "hidden"} z-0 absolute h-60 w-[11.5rem] ${router.asPath.includes("org") ? "bottom-[7.9rem]" : "bottom-[4.9rem]"} bg-mineshaft-900 border border-mineshaft-600 mb-4 rounded-md opacity-70`}/>
                 <div className={`${isLearningNoteOpen ? "block" : "hidden"} z-0 absolute h-60 w-[12.3rem] ${router.asPath.includes("org") ? "bottom-[7.65rem]" : "bottom-[4.65rem]"} bg-mineshaft-900 border border-mineshaft-600 mb-4 rounded-md opacity-90`}/>
@@ -549,22 +623,24 @@ export const AppLayout = ({ children }: LayoutProps) => {
                     </a>
                   </div>
                 </div> */}
-                {router.asPath.includes("org") && <div
-                  onKeyDown={() => null}
-                  role="button"
-                  tabIndex={0}
-                  onClick={() => router.push(`/org/${router.query.id}/members?action=invite`)}
-                  className="w-full"
-                >
-                  <div className="hover:text-mineshaft-200 duration-200 mb-3 pl-5 w-full">
-                    <FontAwesomeIcon icon={faPlus} className="mr-3"/>
-                    Invite people
+                {router.asPath.includes("org") && (
+                  <div
+                    onKeyDown={() => null}
+                    role="button"
+                    tabIndex={0}
+                    onClick={() => router.push(`/org/${router.query.id}/members?action=invite`)}
+                    className="w-full"
+                  >
+                    <div className="mb-3 w-full pl-5 duration-200 hover:text-mineshaft-200">
+                      <FontAwesomeIcon icon={faPlus} className="mr-3" />
+                      Invite people
+                    </div>
                   </div>
-                </div>}
+                )}
                 <DropdownMenu>
                   <DropdownMenuTrigger asChild>
-                    <div className="hover:text-mineshaft-200 duration-200 mb-2 pl-5 w-full">
-                      <FontAwesomeIcon icon={faQuestion} className="px-[0.1rem] mr-3"/>
+                    <div className="mb-2 w-full pl-5 duration-200 hover:text-mineshaft-200">
+                      <FontAwesomeIcon icon={faQuestion} className="mr-3 px-[0.1rem]" />
                       Help & Support
                     </div>
                   </DropdownMenuTrigger>
@@ -586,28 +662,33 @@ export const AppLayout = ({ children }: LayoutProps) => {
                     ))}
                   </DropdownMenuContent>
                 </DropdownMenu>
-                {subscription && subscription.slug === "starter" && !subscription.has_used_trial && (
-                  <button 
-                    type="button"
-                    onClick={async () => {
-                      if (!subscription || !currentOrg) return;
-              
-                      // direct user to start pro trial
-                      const url = await mutateAsync({
-                        orgId: currentOrg._id,
-                        success_url: window.location.href
-                      });
-                      
-                      window.location.href = url;
-                    }}
-                    className="w-full mt-1.5"
-                  >
-                    <div className="hover:text-primary-400 text-mineshaft-300 duration-200 flex justify-left items-center py-1 bg-mineshaft-600 rounded-md hover:bg-mineshaft-500 mb-1.5 mt-1.5 pl-4 w-full">
-                      <FontAwesomeIcon icon={faInfinity} className="mr-3 ml-0.5 py-2 text-primary"/>
-                      Start Free Pro Trial
-                    </div>
-                  </button>
-                )}
+                {subscription &&
+                  subscription.slug === "starter" &&
+                  !subscription.has_used_trial && (
+                    <button
+                      type="button"
+                      onClick={async () => {
+                        if (!subscription || !currentOrg) return;
+
+                        // direct user to start pro trial
+                        const url = await mutateAsync({
+                          orgId: currentOrg._id,
+                          success_url: window.location.href
+                        });
+
+                        window.location.href = url;
+                      }}
+                      className="mt-1.5 w-full"
+                    >
+                      <div className="justify-left mb-1.5 mt-1.5 flex w-full items-center rounded-md bg-mineshaft-600 py-1 pl-4 text-mineshaft-300 duration-200 hover:bg-mineshaft-500 hover:text-primary-400">
+                        <FontAwesomeIcon
+                          icon={faInfinity}
+                          className="mr-3 ml-0.5 py-2 text-primary"
+                        />
+                        Start Free Pro Trial
+                      </div>
+                    </button>
+                  )}
               </div>
             </nav>
           </aside>

frontend/src/pages/integrations/windmill/authorize.tsx

@@ -0,0 +1,65 @@
+import { useState } from "react";
+import { useRouter } from "next/router";
+
+import { Button, Card, CardTitle, FormControl, Input } from "../../../components/v2";
+import saveIntegrationAccessToken from "../../api/integrations/saveIntegrationAccessToken";
+
+
+export default function WindmillCreateIntegrationPage() {
+  const router = useRouter();
+  const [apiKey, setApiKey] = useState("");
+  const [apiKeyErrorText, setApiKeyErrorText] = useState("");
+  const [isLoading, setIsLoading] = useState(false);
+  
+  const handleButtonClick = async () => {
+    try {
+      setApiKeyErrorText("");
+      if (apiKey.length === 0) {
+        setApiKeyErrorText("API Key cannot be blank");
+        return;
+      }
+  
+      setIsLoading(true);
+  
+      const integrationAuth = await saveIntegrationAccessToken({
+        workspaceId: localStorage.getItem("projectData.id"),
+        integration: "windmill",
+        accessToken: apiKey,
+        accessId: null,
+        url: null,
+        namespace: null
+      });
+  
+      setIsLoading(false);
+  
+      router.push(`/integrations/windmill/create?integrationAuthId=${integrationAuth._id}`);
+    } catch (err) {
+      console.error(err);
+    }
+  };
+
+  return (
+      <div className="flex h-full w-full items-center justify-center">
+        <Card className="max-w-md rounded-md p-8">
+          <CardTitle className="text-center">Windmill Integration</CardTitle>
+          <FormControl
+            label="Windmill Access Token"
+            errorText={apiKeyErrorText}
+            isError={apiKeyErrorText !== "" ?? false}
+          >
+            <Input placeholder="" value={apiKey} onChange={(e) => setApiKey(e.target.value)} />
+          </FormControl>
+          <Button
+            onClick={handleButtonClick}
+            color="mineshaft"
+            className="mt-4"
+            isLoading={isLoading}
+          >
+            Connect to Windmill
+          </Button>
+        </Card>
+      </div>
+    );
+}
+
+WindmillCreateIntegrationPage.requireAuth = true;

frontend/src/pages/integrations/windmill/create.tsx

@@ -0,0 +1,156 @@
+import { useEffect, useState } from "react";
+import { useRouter } from "next/router";
+import queryString from "query-string";
+
+import {
+  Button,
+  Card,
+  CardTitle,
+  FormControl,
+  Input,
+  Select,
+  SelectItem
+} from "../../../components/v2";
+import {
+  useGetIntegrationAuthApps,
+  useGetIntegrationAuthById
+} from "../../../hooks/api/integrationAuth";
+import { useGetWorkspaceById } from "../../../hooks/api/workspace";
+import createIntegration from "../../api/integrations/createIntegration";
+
+export default function WindmillCreateIntegrationPage() {
+  const router = useRouter();
+
+  const { integrationAuthId } = queryString.parse(router.asPath.split("?")[1]);
+
+  const { data: workspace } = useGetWorkspaceById(localStorage.getItem("projectData.id") ?? "");
+  const { data: integrationAuth } = useGetIntegrationAuthById((integrationAuthId as string) ?? "");
+  const { data: integrationAuthApps } = useGetIntegrationAuthApps({
+    integrationAuthId: (integrationAuthId as string) ?? ""
+  });
+
+  const [selectedSourceEnvironment, setSelectedSourceEnvironment] = useState("");
+  const [secretPath, setSecretPath] = useState("/");
+  const [targetApp, setTargetApp] = useState("");
+
+  const [isLoading, setIsLoading] = useState(false);
+
+  useEffect(() => {
+    if (workspace) {
+      setSelectedSourceEnvironment(workspace.environments[0].slug);
+    }
+  }, [workspace]);
+
+  useEffect(() => {
+    if (integrationAuthApps) {
+      if (integrationAuthApps.length > 0) {
+        setTargetApp(integrationAuthApps[0].name);
+      } else {
+        setTargetApp("none");
+      }
+    }
+  }, [integrationAuthApps]);
+
+  const handleButtonClick = async () => {
+    try {
+      if (!integrationAuth?._id) return;
+
+      setIsLoading(true);
+
+      await createIntegration({
+        integrationAuthId: integrationAuth?._id,
+        isActive: true,
+        app: targetApp,
+        appId:
+          integrationAuthApps?.find((integrationAuthApp) => integrationAuthApp.name === targetApp)
+            ?.appId ?? null,
+        sourceEnvironment: selectedSourceEnvironment,
+        targetEnvironment: null,
+        targetEnvironmentId: null,
+        targetService: null,
+        targetServiceId: null,
+        owner: null,
+        path: null,
+        region: null,
+        secretPath
+      });
+
+      setIsLoading(false);
+
+      router.push(`/integrations/${localStorage.getItem("projectData.id")}`);
+    } catch (err) {
+      console.error(err);
+    }
+  };
+
+  return integrationAuth &&
+    workspace &&
+    selectedSourceEnvironment &&
+    integrationAuthApps &&
+    targetApp ? (
+    <div className="flex h-full w-full items-center justify-center">
+      <Card className="max-w-md rounded-md p-8">
+        <CardTitle className="text-center">Windmill Integration</CardTitle>
+        <FormControl label="Project Environment" className="mt-4">
+          <Select
+            value={selectedSourceEnvironment}
+            onValueChange={(val) => setSelectedSourceEnvironment(val)}
+            className="w-full border border-mineshaft-500"
+          >
+            {workspace?.environments.map((sourceEnvironment) => (
+              <SelectItem
+                value={sourceEnvironment.slug}
+                key={`source-environment-${sourceEnvironment.slug}`}
+              >
+                {sourceEnvironment.name}
+              </SelectItem>
+            ))}
+          </Select>
+        </FormControl>
+        <FormControl label="Secrets Path">
+          <Input
+            value={secretPath}
+            onChange={(evt) => setSecretPath(evt.target.value)}
+            placeholder="Provide a path, default is /"
+          />
+        </FormControl>
+        <FormControl label="Windmill Workspace" className="mt-4">
+          <Select
+            value={targetApp}
+            onValueChange={(val) => setTargetApp(val)}
+            className="w-full border border-mineshaft-500"
+            isDisabled={integrationAuthApps.length === 0}
+          >
+            {integrationAuthApps.length > 0 ? (
+              integrationAuthApps.map((integrationAuthApp) => (
+                <SelectItem
+                  value={integrationAuthApp.name}
+                  key={`target-environment-${integrationAuthApp.name}`}
+                >
+                  {integrationAuthApp.name}
+                </SelectItem>
+              ))
+            ) : (
+              <SelectItem value="none" key="target-app-none">
+                No projects found
+              </SelectItem>
+            )}
+          </Select>
+        </FormControl>
+        <Button
+          onClick={handleButtonClick}
+          color="mineshaft"
+          className="mt-4"
+          isLoading={isLoading}
+          isDisabled={integrationAuthApps.length === 0}
+        >
+          Create Integration
+        </Button>
+      </Card>
+    </div>
+  ) : (
+    <div />
+  );
+}
+
+WindmillCreateIntegrationPage.requireAuth = true;

frontend/src/pages/org/[id]/overview/index.tsx

@@ -1,4 +1,3 @@
-
 import crypto from "crypto";
 
 import { useEffect, useState } from "react";
@@ -9,14 +8,31 @@ import { useRouter } from "next/router";
 import { IconProp } from "@fortawesome/fontawesome-svg-core";
 import { faSlack } from "@fortawesome/free-brands-svg-icons";
 import { faFolderOpen } from "@fortawesome/free-regular-svg-icons";
-import { faArrowRight, faCheckCircle, faHandPeace, faMagnifyingGlass, faNetworkWired, faPlug, faPlus, faUserPlus } from "@fortawesome/free-solid-svg-icons";
+import {
+  faArrowRight,
+  faCheckCircle,
+  faHandPeace,
+  faMagnifyingGlass,
+  faNetworkWired,
+  faPlug,
+  faPlus,
+  faUserPlus
+} from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { yupResolver } from "@hookform/resolvers/yup";
 import * as yup from "yup";
 
 import { useNotificationContext } from "@app/components/context/Notifications/NotificationProvider";
 import onboardingCheck from "@app/components/utilities/checks/OnboardingCheck";
-import { Button, Checkbox, FormControl, Input, Modal, ModalContent, UpgradePlanModal } from "@app/components/v2";
+import {
+  Button,
+  Checkbox,
+  FormControl,
+  Input,
+  Modal,
+  ModalContent,
+  UpgradePlanModal
+} from "@app/components/v2";
 import { TabsObject } from "@app/components/v2/Tabs";
 import { useSubscription, useUser, useWorkspace } from "@app/context";
 import { fetchOrgUsers, useAddUserToWs, useCreateWorkspace, useUploadWsKey } from "@app/hooks/api";
@@ -25,11 +41,14 @@ import { usePopUp } from "@app/hooks/usePopUp";
 import { encryptAssymmetric } from "../../../../components/utilities/cryptography/crypto";
 import registerUserAction from "../../../api/userActions/registerUserAction";
 
-const features = [{
-  "_id": 0,
-  "name": "Kubernetes Operator",
-  "description": "Pull secrets into your Kubernetes containers and automatically redeploy upon secret changes."
-}]
+const features = [
+  {
+    _id: 0,
+    name: "Kubernetes Operator",
+    description:
+      "Pull secrets into your Kubernetes containers and automatically redeploy upon secret changes."
+  }
+];
 
 type ItemProps = {
   text: string;
@@ -58,7 +77,11 @@ const learningItem = ({
         className={`w-full ${complete && "opacity-30 duration-200 hover:opacity-100"}`}
         href={link}
       >
-        <div className={`${complete ? "bg-gradient-to-r from-primary-500/70 p-[0.07rem]" : ""} mb-3 rounded-md`}>
+        <div
+          className={`${
+            complete ? "bg-gradient-to-r from-primary-500/70 p-[0.07rem]" : ""
+          } mb-3 rounded-md`}
+        >
           <div
             onKeyDown={() => null}
             role="button"
@@ -70,7 +93,11 @@ const learningItem = ({
                 });
               }
             }}
-            className={`group relative flex h-[5.5rem] w-full items-center justify-between overflow-hidden rounded-md border ${complete? "bg-gradient-to-r from-[#0e1f01] to-mineshaft-700 border-mineshaft-900 cursor-default" : "bg-mineshaft-800 hover:bg-mineshaft-700 border-mineshaft-600 shadow-xl cursor-pointer"} duration-200 text-mineshaft-100`}
+            className={`group relative flex h-[5.5rem] w-full items-center justify-between overflow-hidden rounded-md border ${
+              complete
+                ? "cursor-default border-mineshaft-900 bg-gradient-to-r from-[#0e1f01] to-mineshaft-700"
+                : "cursor-pointer border-mineshaft-600 bg-mineshaft-800 shadow-xl hover:bg-mineshaft-700"
+            } text-mineshaft-100 duration-200`}
           >
             <div className="mr-4 flex flex-row items-center">
               <FontAwesomeIcon icon={icon} className="mx-2 w-16 text-4xl" />
@@ -148,7 +175,11 @@ const learningItemSquare = ({
       className={`w-full ${complete && "opacity-30 duration-200 hover:opacity-100"}`}
       href={link}
     >
-      <div className={`${complete ? "bg-gradient-to-r from-primary-500/70 p-[0.07rem]" : ""} rounded-md w-full`}>
+      <div
+        className={`${
+          complete ? "bg-gradient-to-r from-primary-500/70 p-[0.07rem]" : ""
+        } w-full rounded-md`}
+      >
         <div
           onKeyDown={() => null}
           role="button"
@@ -160,23 +191,32 @@ const learningItemSquare = ({
               });
             }
           }}
-          className={`group relative flex w-full items-center justify-between overflow-hidden rounded-md border ${complete? "bg-gradient-to-r from-[#0e1f01] to-mineshaft-700 border-mineshaft-900 cursor-default" : "bg-mineshaft-800 hover:bg-mineshaft-700 border-mineshaft-600 shadow-xl cursor-pointer"} duration-200 text-mineshaft-100`}
+          className={`group relative flex w-full items-center justify-between overflow-hidden rounded-md border ${
+            complete
+              ? "cursor-default border-mineshaft-900 bg-gradient-to-r from-[#0e1f01] to-mineshaft-700"
+              : "cursor-pointer border-mineshaft-600 bg-mineshaft-800 shadow-xl hover:bg-mineshaft-700"
+          } text-mineshaft-100 duration-200`}
         >
-          <div className="flex flex-col items-center w-full px-6 py-4">
-            <div className="flex flex-row items-start justify-between w-full">
-              <FontAwesomeIcon icon={icon} className="w-16 text-5xl text-mineshaft-200 group-hover:text-mineshaft-100 duration-100 pt-2" />
+          <div className="flex w-full flex-col items-center px-6 py-4">
+            <div className="flex w-full flex-row items-start justify-between">
+              <FontAwesomeIcon
+                icon={icon}
+                className="w-16 pt-2 text-5xl text-mineshaft-200 duration-100 group-hover:text-mineshaft-100"
+              />
               {complete && (
                 <div className="absolute left-14 top-12 flex h-7 w-7 items-center justify-center rounded-full bg-bunker-500 p-2 group-hover:bg-mineshaft-700">
                   <FontAwesomeIcon icon={faCheckCircle} className="h-5 w-5 text-4xl text-primary" />
                 </div>
               )}
               <div
-                className={`text-right text-sm font-normal text-mineshaft-300 ${complete ? "text-primary font-semibold" : ""}`}
+                className={`text-right text-sm font-normal text-mineshaft-300 ${
+                  complete ? "font-semibold text-primary" : ""
+                }`}
               >
                 {complete ? "Complete!" : `About ${time}`}
               </div>
             </div>
-            <div className="flex flex-col items-start justify-start w-full pt-4">
+            <div className="flex w-full flex-col items-start justify-start pt-4">
               <div className="mt-0.5 text-lg font-medium">{text}</div>
               <div className="text-sm font-normal text-mineshaft-300">{subText}</div>
             </div>
@@ -202,11 +242,14 @@ export default function Organization() {
   const router = useRouter();
 
   const { workspaces } = useWorkspace();
-  const orgWorkspaces = workspaces?.filter(workspace => workspace.organization === localStorage.getItem("orgData.id")) || []
+  const orgWorkspaces =
+    workspaces?.filter(
+      (workspace) => workspace.organization === localStorage.getItem("orgData.id")
+    ) || [];
   const currentOrg = String(router.query.id);
   const { createNotification } = useNotificationContext();
   const addWsUser = useAddUserToWs();
-  
+
   const { popUp, handlePopUpOpen, handlePopUpClose, handlePopUpToggle } = usePopUp([
     "addNewWs",
     "upgradePlan"
@@ -269,7 +312,7 @@ export default function Organization() {
       }
       createNotification({ text: "Workspace created", type: "success" });
       handlePopUpClose("addNewWs");
-      router.push(`/project/${newWorkspaceId}/secrets`);
+      router.push(`/project/${newWorkspaceId}/secrets/overview`);
     } catch (err) {
       console.error(err);
       createNotification({ text: "Failed to create workspace", type: "error" });
@@ -278,7 +321,9 @@ export default function Organization() {
 
   const { subscription } = useSubscription();
 
-  const isAddingProjectsAllowed = subscription?.workspaceLimit ? (subscription.workspacesUsed < subscription.workspaceLimit) : true;
+  const isAddingProjectsAllowed = subscription?.workspaceLimit
+    ? subscription.workspacesUsed < subscription.workspaceLimit
+    : true;
 
   useEffect(() => {
     onboardingCheck({
@@ -290,16 +335,16 @@ export default function Organization() {
   }, []);
 
   return (
-    <div className="flex max-w-7xl mx-auto flex-col justify-start bg-bunker-800 md:h-screen">
+    <div className="mx-auto flex max-w-7xl flex-col justify-start bg-bunker-800 md:h-screen">
       <Head>
         <title>{t("common.head-title", { title: t("settings.members.title") })}</title>
         <link rel="icon" href="/infisical.ico" />
       </Head>
-      <div className="flex flex-col items-start justify-start px-6 py-6 pb-0 text-3xl mb-4">
+      <div className="mb-4 flex flex-col items-start justify-start px-6 py-6 pb-0 text-3xl">
         <p className="mr-4 font-semibold text-white">Projects</p>
-        <div className="w-full flex flex-row mt-6">
+        <div className="mt-6 flex w-full flex-row">
           <Input
-            className="h-[2.3rem] text-sm bg-mineshaft-800 placeholder-mineshaft-50 duration-200 focus:bg-mineshaft-700/80"
+            className="h-[2.3rem] bg-mineshaft-800 text-sm placeholder-mineshaft-50 duration-200 focus:bg-mineshaft-700/80"
             placeholder="Search by project name..."
             value={searchFilter}
             onChange={(e) => setSearchFilter(e.target.value)}
@@ -310,7 +355,7 @@ export default function Organization() {
             leftIcon={<FontAwesomeIcon icon={faPlus} />}
             onClick={() => {
               if (isAddingProjectsAllowed) {
-                handlePopUpOpen("addNewWs")
+                handlePopUpOpen("addNewWs");
               } else {
                 handlePopUpOpen("upgradePlan");
               }
@@ -320,120 +365,169 @@ export default function Organization() {
             Add New Project
           </Button>
         </div>
-        <div className="mt-4 w-full grid gap-4 grid-cols-1 lg:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4">
-          {orgWorkspaces.filter(ws => ws?.name?.toLowerCase().includes(searchFilter.toLowerCase())).map(workspace => <div key={workspace._id} className="h-40 min-w-72 rounded-md bg-mineshaft-800 border border-mineshaft-600 p-4 flex flex-col justify-between">
-            <div className="text-lg text-mineshaft-100 mt-0">{workspace.name}</div>
-            <div className="text-sm text-mineshaft-300 mt-0 pb-6">{(workspace.environments?.length || 0)} environments</div>
-            <button type="button" onClick={() => {
-              router.push(`/project/${workspace._id}/secrets`);
-              localStorage.setItem("projectData.id", workspace._id);
-            }}>
-                <div className="group cursor-default ml-auto hover:bg-primary-800/20 text-sm text-mineshaft-300 hover:text-mineshaft-200 bg-mineshaft-900 py-2 px-4 rounded-full w-max border border-mineshaft-600 hover:border-primary-500/80">Explore <FontAwesomeIcon icon={faArrowRight} className="pl-1.5 pr-0.5 group-hover:pl-2 group-hover:pr-0 duration-200" /></div>
-            </button>
-          </div>)}
+        <div className="mt-4 grid w-full grid-cols-1 gap-4 lg:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4">
+          {orgWorkspaces
+            .filter((ws) => ws?.name?.toLowerCase().includes(searchFilter.toLowerCase()))
+            .map((workspace) => (
+              <div
+                key={workspace._id}
+                className="min-w-72 flex h-40 flex-col justify-between rounded-md border border-mineshaft-600 bg-mineshaft-800 p-4"
+              >
+                <div className="mt-0 text-lg text-mineshaft-100">{workspace.name}</div>
+                <div className="mt-0 pb-6 text-sm text-mineshaft-300">
+                  {workspace.environments?.length || 0} environments
+                </div>
+                <button
+                  type="button"
+                  onClick={() => {
+                    router.push(`/project/${workspace._id}/secrets/overview`);
+                    localStorage.setItem("projectData.id", workspace._id);
+                  }}
+                >
+                  <div className="group ml-auto w-max cursor-default rounded-full border border-mineshaft-600 bg-mineshaft-900 py-2 px-4 text-sm text-mineshaft-300 hover:border-primary-500/80 hover:bg-primary-800/20 hover:text-mineshaft-200">
+                    Explore{" "}
+                    <FontAwesomeIcon
+                      icon={faArrowRight}
+                      className="pl-1.5 pr-0.5 duration-200 group-hover:pl-2 group-hover:pr-0"
+                    />
+                  </div>
+                </button>
+              </div>
+            ))}
         </div>
-        {orgWorkspaces.length === 0 && ( 
-          <div className="w-full rounded-md bg-mineshaft-800 border border-mineshaft-700 px-4 py-6 text-mineshaft-300 text-base">
-            <FontAwesomeIcon icon={faFolderOpen} className="w-full text-center text-5xl mb-4 mt-2 text-mineshaft-400" />
+        {orgWorkspaces.length === 0 && (
+          <div className="w-full rounded-md border border-mineshaft-700 bg-mineshaft-800 px-4 py-6 text-base text-mineshaft-300">
+            <FontAwesomeIcon
+              icon={faFolderOpen}
+              className="mb-4 mt-2 w-full text-center text-5xl text-mineshaft-400"
+            />
             <div className="text-center font-light">
-              You are not part of any projects in this organization yet. When you are, they will appear
-              here.
+              You are not part of any projects in this organization yet. When you are, they will
+              appear here.
             </div>
             <div className="mt-0.5 text-center font-light">
-              Create a new project, or ask other organization members to give you necessary permissions.
+              Create a new project, or ask other organization members to give you necessary
+              permissions.
             </div>
           </div>
         )}
       </div>
-      {((new Date()).getTime() - (new Date(user?.createdAt)).getTime()) < 30 * 24 * 60 * 60 * 1000 && <div className="flex flex-col items-start justify-start px-6 py-6 pb-0 text-3xl mb-4">
-        <p className="mr-4 font-semibold text-white mb-4">Onboarding Guide</p>
-        <div className="grid grid-cols-1 lg:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4 gap-3 w-full mb-3">
-          {learningItemSquare({
-            text: "Watch Infisical demo",
-            subText: "Set up Infisical in 3 min.",
-            complete: hasUserClickedIntro,
-            icon: faHandPeace,
-            time: "3 min",
-            userAction: "intro_cta_clicked",
-            link: "https://www.youtube.com/watch?v=PK23097-25I"
-          })}
-          {orgWorkspaces.length !== 0 && learningItemSquare({
-            text: "Add your secrets",
-            subText: "Drop a .env file or type your secrets.",
-            complete: hasUserPushedSecrets,
-            icon: faPlus,
-            time: "1 min",
-            userAction: "first_time_secrets_pushed",
-            link: `/project/${orgWorkspaces[0]?._id}/secrets`
-          })}
-          {learningItemSquare({
-            text: "Invite your teammates",
-            subText: "Infisical is better used as a team.",
-            complete: usersInOrg,
-            icon: faUserPlus,
-            time: "2 min",
-            link: `/org/${router.query.id}/members?action=invite`
-          })}
-          <div className="block xl:hidden 2xl:block">{learningItemSquare({
-            text: "Join Infisical Slack",
-            subText: "Have any questions? Ask us!",
-            complete: hasUserClickedSlack,
-            icon: faSlack,
-            time: "1 min",
-            userAction: "slack_cta_clicked",
-            link: "https://infisical.com/slack"
-          })}</div>
-        </div>
-        {orgWorkspaces.length !== 0 && <div className="group text-mineshaft-100 relative mb-3 flex h-full w-full cursor-default flex-col items-center justify-between overflow-hidden rounded-md border border-mineshaft-600 bg-mineshaft-800 pl-2 pr-2 pt-4 pb-2 shadow-xl duration-200">
-          <div className="mb-4 flex w-full flex-row items-center pr-4">
-            <div className="mr-4 flex w-full flex-row items-center">
-              <FontAwesomeIcon icon={faNetworkWired} className="mx-2 w-16 text-4xl" />
-              {false && (
-                <div className="absolute left-12 top-10 flex h-7 w-7 items-center justify-center rounded-full bg-bunker-500 p-2 group-hover:bg-mineshaft-700">
-                  <FontAwesomeIcon icon={faCheckCircle} className="h-5 w-5 text-4xl text-green" />
-                </div>
-              )}
-              <div className="flex flex-col items-start pl-0.5">
-                <div className="mt-0.5 text-xl font-semibold">Inject secrets locally</div>
-                <div className="text-sm font-normal">
-                  Replace .env files with a more secure and efficient alternative.
-                </div>
-              </div>
-            </div>
-            <div className={`w-28 pr-4 text-right text-sm font-semibold ${false && "text-green"}`}>
-              About 2 min
+      {new Date().getTime() - new Date(user?.createdAt).getTime() < 30 * 24 * 60 * 60 * 1000 && (
+        <div className="mb-4 flex flex-col items-start justify-start px-6 py-6 pb-0 text-3xl">
+          <p className="mr-4 mb-4 font-semibold text-white">Onboarding Guide</p>
+          <div className="mb-3 grid w-full grid-cols-1 gap-3 lg:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4">
+            {learningItemSquare({
+              text: "Watch Infisical demo",
+              subText: "Set up Infisical in 3 min.",
+              complete: hasUserClickedIntro,
+              icon: faHandPeace,
+              time: "3 min",
+              userAction: "intro_cta_clicked",
+              link: "https://www.youtube.com/watch?v=PK23097-25I"
+            })}
+            {orgWorkspaces.length !== 0 &&
+              learningItemSquare({
+                text: "Add your secrets",
+                subText: "Drop a .env file or type your secrets.",
+                complete: hasUserPushedSecrets,
+                icon: faPlus,
+                time: "1 min",
+                userAction: "first_time_secrets_pushed",
+                link: `/project/${orgWorkspaces[0]?._id}/secrets/overview`
+              })}
+            {learningItemSquare({
+              text: "Invite your teammates",
+              subText: "Infisical is better used as a team.",
+              complete: usersInOrg,
+              icon: faUserPlus,
+              time: "2 min",
+              link: `/org/${router.query.id}/members?action=invite`
+            })}
+            <div className="block xl:hidden 2xl:block">
+              {learningItemSquare({
+                text: "Join Infisical Slack",
+                subText: "Have any questions? Ask us!",
+                complete: hasUserClickedSlack,
+                icon: faSlack,
+                time: "1 min",
+                userAction: "slack_cta_clicked",
+                link: "https://infisical.com/slack"
+              })}
             </div>
           </div>
-          <TabsObject />
-          {false && <div className="absolute bottom-0 left-0 h-1 w-full bg-green" />}
-        </div>}
-        {orgWorkspaces.length !== 0 && learningItem({
-          text: "Integrate Infisical with your infrastructure",
-          subText: "Connect Infisical to various 3rd party services and platforms.",
-          complete: false,
-          icon: faPlug,
-          time: "15 min",
-          link: "https://infisical.com/docs/integrations/overview"
-        })}
-      </div>}
-      <div className="flex flex-col items-start justify-start px-6 py-6 pb-0 text-3xl mb-4 pb-6">
-        <p className="mr-4 font-semibold text-white">Explore More</p>
-        <div className="mt-4 w-full grid grid-flow-dense gap-4" style={{ gridTemplateColumns: "repeat(auto-fill, minmax(256px, 4fr))" }}>
-          {features.map(feature => <div key={feature._id} className="h-44 w-96 rounded-md bg-mineshaft-800 border border-mineshaft-600 p-4 flex flex-col justify-between">
-            <div className="text-lg text-mineshaft-100 mt-0">{feature.name}</div>
-            <div className="text-[15px] font-light text-mineshaft-300 mb-4 mt-2">{feature.description}</div>
-            <div className="w-full flex items-center">
-              <div className="text-mineshaft-300 text-[15px] font-light">Setup time: 20 min</div>
-              <a
-                target="_blank"
-                rel="noopener noreferrer"
-                className="group cursor-default ml-auto hover:bg-primary-800/20 text-sm text-mineshaft-300 hover:text-mineshaft-200 bg-mineshaft-900 py-2 px-4 rounded-full w-max border border-mineshaft-600 hover:border-primary-500/80"
-                href="https://infisical.com/docs/documentation/getting-started/kubernetes"
-              >
-                Learn more <FontAwesomeIcon icon={faArrowRight} className="pl-1.5 pr-0.5 group-hover:pl-2 group-hover:pr-0 duration-200"/>
-              </a>
+          {orgWorkspaces.length !== 0 && (
+            <div className="group relative mb-3 flex h-full w-full cursor-default flex-col items-center justify-between overflow-hidden rounded-md border border-mineshaft-600 bg-mineshaft-800 pl-2 pr-2 pt-4 pb-2 text-mineshaft-100 shadow-xl duration-200">
+              <div className="mb-4 flex w-full flex-row items-center pr-4">
+                <div className="mr-4 flex w-full flex-row items-center">
+                  <FontAwesomeIcon icon={faNetworkWired} className="mx-2 w-16 text-4xl" />
+                  {false && (
+                    <div className="absolute left-12 top-10 flex h-7 w-7 items-center justify-center rounded-full bg-bunker-500 p-2 group-hover:bg-mineshaft-700">
+                      <FontAwesomeIcon
+                        icon={faCheckCircle}
+                        className="h-5 w-5 text-4xl text-green"
+                      />
+                    </div>
+                  )}
+                  <div className="flex flex-col items-start pl-0.5">
+                    <div className="mt-0.5 text-xl font-semibold">Inject secrets locally</div>
+                    <div className="text-sm font-normal">
+                      Replace .env files with a more secure and efficient alternative.
+                    </div>
+                  </div>
+                </div>
+                <div
+                  className={`w-28 pr-4 text-right text-sm font-semibold ${false && "text-green"}`}
+                >
+                  About 2 min
+                </div>
+              </div>
+              <TabsObject />
+              {false && <div className="absolute bottom-0 left-0 h-1 w-full bg-green" />}
             </div>
-          </div>)}
+          )}
+          {orgWorkspaces.length !== 0 &&
+            learningItem({
+              text: "Integrate Infisical with your infrastructure",
+              subText: "Connect Infisical to various 3rd party services and platforms.",
+              complete: false,
+              icon: faPlug,
+              time: "15 min",
+              link: "https://infisical.com/docs/integrations/overview"
+            })}
+        </div>
+      )}
+      <div className="mb-4 flex flex-col items-start justify-start px-6 py-6 pb-0 pb-6 text-3xl">
+        <p className="mr-4 font-semibold text-white">Explore More</p>
+        <div
+          className="mt-4 grid w-full grid-flow-dense gap-4"
+          style={{ gridTemplateColumns: "repeat(auto-fill, minmax(256px, 4fr))" }}
+        >
+          {features.map((feature) => (
+            <div
+              key={feature._id}
+              className="flex h-44 w-96 flex-col justify-between rounded-md border border-mineshaft-600 bg-mineshaft-800 p-4"
+            >
+              <div className="mt-0 text-lg text-mineshaft-100">{feature.name}</div>
+              <div className="mb-4 mt-2 text-[15px] font-light text-mineshaft-300">
+                {feature.description}
+              </div>
+              <div className="flex w-full items-center">
+                <div className="text-[15px] font-light text-mineshaft-300">Setup time: 20 min</div>
+                <a
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  className="group ml-auto w-max cursor-default rounded-full border border-mineshaft-600 bg-mineshaft-900 py-2 px-4 text-sm text-mineshaft-300 hover:border-primary-500/80 hover:bg-primary-800/20 hover:text-mineshaft-200"
+                  href="https://infisical.com/docs/documentation/getting-started/kubernetes"
+                >
+                  Learn more{" "}
+                  <FontAwesomeIcon
+                    icon={faArrowRight}
+                    className="pl-1.5 pr-0.5 duration-200 group-hover:pl-2 group-hover:pr-0"
+                  />
+                </a>
+              </div>
+            </div>
+          ))}
         </div>
       </div>
       <Modal

frontend/src/pages/project/[id]/secrets/[env].tsx

@@ -1,16 +1,10 @@
 import { useTranslation } from "react-i18next";
 import Head from "next/head";
-import { useRouter } from "next/router";
 
 import { DashboardPage } from "@app/views/DashboardPage";
-import { DashboardEnvOverview } from "@app/views/DashboardPage/DashboardEnvOverview";
 
 const Dashboard = () => {
   const { t } = useTranslation();
-  const router = useRouter();
-
-  const queryEnv = router.query.env as string;
-  const isOverviewMode = !queryEnv;
 
   return (
     <>
@@ -22,7 +16,7 @@ const Dashboard = () => {
         <meta name="og:description" content={String(t("dashboard.og-description"))} />
       </Head>
       <div className="h-full">
-        {isOverviewMode ? <DashboardEnvOverview /> : <DashboardPage envFromTop={queryEnv} />}
+        <DashboardPage />
       </div>
     </>
   );

frontend/src/pages/project/[id]/secrets/overview.tsx

@@ -0,0 +1,27 @@
+import { useTranslation } from "react-i18next";
+import Head from "next/head";
+
+import { SecretOverviewPage } from "@app/views/SecretOverviewPage";
+
+const Dashboard = () => {
+  const { t } = useTranslation();
+
+  return (
+    <>
+      <Head>
+        <title>{t("common.head-title", { title: t("dashboard.title") })}</title>
+        <link rel="icon" href="/infisical.ico" />
+        <meta property="og:image" content="/images/message.png" />
+        <meta property="og:title" content={String(t("dashboard.og-title"))} />
+        <meta name="og:description" content={String(t("dashboard.og-description"))} />
+      </Head>
+      <div className="h-full">
+        <SecretOverviewPage />
+      </div>
+    </>
+  );
+};
+
+export default Dashboard;
+
+Dashboard.requireAuth = true;

frontend/src/styles/globals.css

@@ -13,6 +13,11 @@
   .flex-3 {
     flex-grow: 3;
   }
+
+  .min-table-row {
+    width: 1%;
+    white-space: nowrap;
+  }
 }
 
 @layer components {
@@ -40,7 +45,7 @@
 
   .breadcrumb::after,
   .breadcrumb::before {
-    content: '';
+    content: "";
     height: 60%;
     width: 100%;
     z-index: -1;
@@ -58,18 +63,32 @@
   }
 
   .breadcrumb::after {
-    left: 5px;
-    bottom: -3px;
+    left: 4px;
+    bottom: -2.5px;
     transform: skew(-30deg);
   }
 
   .breadcrumb::before {
-    left: 5px;
-    top: -3px;
+    left: 4px;
+    top: -2.5px;
     transform: skew(30deg);
   }
+
+  .thin-scrollbar::-webkit-scrollbar {
+    width: 0.25rem;
+    background-color: transparent;
+  }
+
+  .thin-scrollbar::-webkit-scrollbar-thumb {
+    background-color: gray;
+  }
+
+  .thin-scrollbar {
+    scrollbar-width: thin;
+    scrollbar-color: gray transparent;
+  }
 }
 
-@import '@fontsource/inter/400.css';
-@import '@fontsource/inter/500.css';
-@import '@fontsource/inter/700.css';
+@import "@fontsource/inter/400.css";
+@import "@fontsource/inter/500.css";
+@import "@fontsource/inter/700.css";

frontend/src/views/DashboardPage/DashboardEnvOverview.tsx

@@ -1,326 +0,0 @@
-import { useEffect, useMemo, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { useRouter } from "next/router";
-import { faFolderOpen, faKey, faMagnifyingGlass } from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-
-import NavHeader from "@app/components/navigation/NavHeader";
-import { Button, Input, TableContainer, Tooltip } from "@app/components/v2";
-import { useOrganization, useWorkspace } from "@app/context";
-import {
-  useGetProjectFoldersBatch,
-  useGetProjectSecretsByKey,
-  useGetUserWsEnvironments,
-  useGetUserWsKey
-} from "@app/hooks/api";
-
-import { EnvComparisonRow } from "./components/EnvComparisonRow";
-import { FolderComparisonRow } from "./components/EnvComparisonRow/FolderComparisonRow";
-
-export const DashboardEnvOverview = () => {
-  const { t } = useTranslation();
-  const router = useRouter();
-
-  const { currentWorkspace, isLoading } = useWorkspace();
-  const { currentOrg } = useOrganization();
-  const workspaceId = currentWorkspace?._id as string;
-  const { data: latestFileKey } = useGetUserWsKey(workspaceId);
-  const [searchFilter, setSearchFilter] = useState("");
-  const secretPath = router.query?.secretPath as string;
-
-  useEffect(() => {
-    if (!isLoading && !workspaceId && router.isReady) {
-      router.push(`/org/${currentOrg?._id}/overview`);
-    }
-  }, [isLoading, workspaceId, router.isReady]);
-
-  const { data: wsEnv, isLoading: isEnvListLoading } = useGetUserWsEnvironments({
-    workspaceId
-  });
-
-  const userAvailableEnvs = wsEnv?.filter(({ isReadDenied }) => !isReadDenied);
-
-  const { data: secrets, isLoading: isSecretsLoading } = useGetProjectSecretsByKey({
-    workspaceId,
-    env: userAvailableEnvs?.map((env) => env.slug) ?? [],
-    decryptFileKey: latestFileKey!,
-    isPaused: false,
-    secretPath
-  });
-
-  const folders = useGetProjectFoldersBatch({
-    folders:
-      userAvailableEnvs?.map((env) => ({
-        environment: env.slug,
-        workspaceId
-      })) ?? [],
-    parentFolderPath: secretPath
-  });
-
-  const foldersGroupedByEnv = useMemo(() => {
-    const res: Record<string, Record<string, boolean>> = {};
-    folders.forEach(({ data }) => {
-      data?.folders
-        ?.filter(({ name }) => name.toLowerCase().includes(searchFilter))
-        ?.forEach((folder) => {
-          if (!res?.[folder.name]) res[folder.name] = {};
-          res[folder.name][data.environment] = true;
-        });
-    });
-    return res;
-  }, [folders, userAvailableEnvs, searchFilter]);
-
-  const numSecretsMissingPerEnv = useMemo(() => {
-    // first get all sec in the env then subtract with total to get missing ones
-    const secPerEnvMissing: Record<string, number> = Object.fromEntries(
-      (userAvailableEnvs || [])?.map(({ slug }) => [slug, 0])
-    );
-    Object.keys(secrets?.secrets || {}).forEach((key) =>
-      secrets?.secrets?.[key].forEach((val) => {
-        secPerEnvMissing[val.env] += 1;
-      })
-    );
-    Object.keys(secPerEnvMissing).forEach((k) => {
-      secPerEnvMissing[k] = (secrets?.uniqueSecCount || 0) - secPerEnvMissing[k];
-    });
-    return secPerEnvMissing;
-  }, [secrets, userAvailableEnvs]);
-
-  const onExploreEnv = (slug: string) => {
-    const query: Record<string, string> = { ...router.query, env: slug };
-    delete query.secretPath;
-    // the dir return will have the present directory folder id
-    // use that when clicking on explore to redirect user to there
-    const envFolder = folders.find(({ data }) => slug === data?.environment);
-    const dir = envFolder?.data?.dir?.pop();
-    if (dir) {
-      query.folderId = dir.id;
-    }
-
-    router.push({
-      pathname: router.pathname,
-      query
-    });
-  };
-
-  const onFolderClick = (path: string) => {
-    router.push({
-      pathname: router.pathname,
-      query: {
-        ...router.query,
-        secretPath: `${router.query?.secretPath || ""}/${path}`
-      }
-    });
-  };
-
-  const onFolderCrumbClick = (index: number) => {
-    const newSecPath = secretPath.split("/").filter(Boolean).slice(0, index).join("/");
-    const query = { ...router.query, secretPath: `/${newSecPath}` } as Record<string, string>;
-    // root condition
-    if (index === 0) delete query.secretPath;
-    router.push({
-      pathname: router.pathname,
-      query
-    });
-  };
-
-  if (isSecretsLoading || isEnvListLoading) {
-    return (
-      <div className="container mx-auto flex h-screen w-full items-center justify-center px-8 text-mineshaft-50 dark:[color-scheme:dark]">
-        <img src="/images/loading/loading.gif" height={70} width={120} alt="loading animation" />
-      </div>
-    );
-  }
-
-  const filteredSecrets = Object.keys(secrets?.secrets || {})?.filter((secret: any) =>
-    secret.toUpperCase().includes(searchFilter.toUpperCase())
-  );
-  // when secrets is not loading and secrets list is empty
-  const isDashboardSecretEmpty = !isSecretsLoading && !filteredSecrets?.length;
-  const isFoldersEmtpy =
-    !folders.some(({ isLoading: isFolderLoading }) => isFolderLoading) &&
-    !Object.keys(foldersGroupedByEnv).length;
-  const isDashboardEmpty = isFoldersEmtpy && isDashboardSecretEmpty;
-
-  return (
-    <div className="container mx-auto max-w-full px-6 text-mineshaft-50 dark:[color-scheme:dark]">
-      <div className="relative right-5 ml-4">
-        <NavHeader pageName={t("dashboard.title")} isProjectRelated />
-      </div>
-      <div className="mt-6">
-        <p className="text-3xl font-semibold text-bunker-100">Secrets Overview</p>
-        <p className="text-md text-bunker-300">
-          Inject your secrets using
-          <a
-            className="mx-1 text-primary/80 hover:text-primary"
-            href="https://infisical.com/docs/cli/overview"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            Infisical CLI
-          </a>
-          or
-          <a
-            className="mx-1 text-primary/80 hover:text-primary"
-            href="https://infisical.com/docs/sdks/overview"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            Infisical SDKs
-          </a>
-        </p>
-      </div>
-      <div className="mt-8 flex items-center justify-between">
-        <div className="flex items-center space-x-2">
-          <div
-            className="breadcrumb relative z-20 border-solid border-mineshaft-600 bg-mineshaft-800 hover:bg-mineshaft-600 py-1 pl-5 pr-2 text-sm"
-            onClick={() => onFolderCrumbClick(0)}
-            onKeyDown={() => null}
-            role="button"
-            tabIndex={0}
-          >
-            <FontAwesomeIcon icon={faFolderOpen} className="text-primary" />
-          </div>
-          {(secretPath || "")
-            .split("/")
-            .filter(Boolean)
-            .map((path, index, arr) => (
-              <div
-                key={`secret-path-${index + 1}`}
-                className={`breadcrumb relative z-20 ${
-                  index + 1 === arr.length ? "cursor-default" : "cursor-pointer"
-                } border-solid border-mineshaft-600 py-1 pl-5 pr-2 text-sm text-mineshaft-200`}
-                onClick={() => onFolderCrumbClick(index + 1)}
-                onKeyDown={() => null}
-                role="button"
-                tabIndex={0}
-              >
-                {path}
-              </div>
-            ))}
-        </div>
-        <div className="w-80">
-          <Input
-            className="h-[2.3rem] bg-mineshaft-800 placeholder-mineshaft-50 duration-200 focus:bg-mineshaft-700/80"
-            placeholder="Search by secret/folder name..."
-            value={searchFilter}
-            onChange={(e) => setSearchFilter(e.target.value)}
-            leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
-          />
-        </div>
-      </div>
-      <div className="overflow-y-auto">
-        <div className="sticky top-0 mt-3 flex h-10 min-w-[60.3rem] flex-row rounded-md border border-mineshaft-600 bg-mineshaft-800">
-          <div className="sticky top-0 flex w-10 items-center justify-center border-none px-4">
-            <div className="w-10 text-center text-xs text-transparent">{0}</div>
-          </div>
-          <div className="sticky top-0 border-none">
-            <div className="relative flex h-full w-full min-w-[200px] items-center justify-start lg:min-w-[220px] xl:min-w-[250px]">
-              <div className="text-sm font-medium ">Secret</div>
-            </div>
-          </div>
-          {numSecretsMissingPerEnv &&
-            userAvailableEnvs?.map((env) => {
-              return (
-                <div
-                  key={`header-${env.slug}`}
-                  className="flex w-full min-w-[11rem] flex-row items-center rounded-md border-none bg-mineshaft-800"
-                >
-                  <div className="flex w-full flex-row justify-center text-center text-sm font-medium text-bunker-200/[.99]">
-                    {env.name}
-                    {numSecretsMissingPerEnv[env.slug] > 0 && (
-                      <div className="mt-0.5 ml-2.5 flex h-[1.1rem] w-[1.1rem] cursor-default items-center justify-center rounded-sm border border-red-400 bg-red text-xs text-bunker-100">
-                        <Tooltip
-                          content={`${
-                            numSecretsMissingPerEnv[env.slug]
-                          } secrets missing compared to other environments`}
-                        >
-                          <span className="text-bunker-100">
-                            {numSecretsMissingPerEnv[env.slug]}
-                          </span>
-                        </Tooltip>
-                      </div>
-                    )}
-                  </div>
-                </div>
-              );
-            })}
-        </div>
-        <div
-          className={`${
-            isDashboardEmpty ? "" : ""
-          } no-scrollbar::-webkit-scrollbar mt-3 flex h-full max-h-[calc(100vh-370px)] w-full min-w-[60.3rem] flex-grow flex-row items-start justify-center overflow-x-hidden rounded-md border border-mineshaft-600 no-scrollbar`}
-        >
-          {!isDashboardEmpty && (
-            <TableContainer className="border-none">
-              <table className="secret-table relative w-full bg-mineshaft-900">
-                <tbody className="max-h-screen overflow-y-auto">
-                  {Object.keys(foldersGroupedByEnv || {}).map((folderName, index) => (
-                    <FolderComparisonRow
-                      key={`${folderName}-${index + 1}`}
-                      folderName={folderName}
-                      userAvailableEnvs={userAvailableEnvs}
-                      folderInEnv={foldersGroupedByEnv[folderName]}
-                      onClick={onFolderClick}
-                    />
-                  ))}
-                  {Object.keys(secrets?.secrets || {})
-                    ?.filter((secret: any) =>
-                      secret.toUpperCase().includes(searchFilter.toUpperCase())
-                    )
-                    .map((key) => (
-                      <EnvComparisonRow
-                        key={`row-${key}`}
-                        secrets={secrets?.secrets?.[key]}
-                        isReadOnly
-                        isSecretValueHidden
-                        userAvailableEnvs={userAvailableEnvs}
-                      />
-                    ))}
-                </tbody>
-              </table>
-            </TableContainer>
-          )}
-          {isDashboardEmpty && (
-            <div className="flex h-40 w-full flex-row rounded-md">
-              <div className="flex w-full min-w-[11rem] flex-col items-center justify-center rounded-md border-none bg-mineshaft-800 text-bunker-300">
-                <FontAwesomeIcon icon={faKey} className="mb-4 text-4xl" />
-                <span className="mb-1">No secrets/folders found.</span>
-                <span>To add more secrets you can explore any environment.</span>
-              </div>
-            </div>
-          )}
-        </div>
-        <div className="group mt-4 flex min-w-[60.3rem] flex-row items-center">
-          <div className="flex h-10 w-10 items-center justify-center border-none px-4">
-            <div className="w-10 text-center text-xs text-transparent">0</div>
-          </div>
-          <div className="flex min-w-[200px] flex-row items-center justify-between lg:min-w-[220px] xl:min-w-[250px]">
-            <span className="text-transparent">0</span>
-            <button type="button" className="mr-2 text-transparent">
-              1
-            </button>
-          </div>
-          {userAvailableEnvs?.map((env) => {
-            return (
-              <div
-                key={`button-${env.slug}`}
-                className="mx-2 mb-1 flex h-10 w-full min-w-[11rem] flex-row items-center justify-center border-none"
-              >
-                <Button
-                  onClick={() => onExploreEnv(env.slug)}
-                  variant="outline_bg"
-                  colorSchema="primary"
-                  isFullWidth
-                  className="h-10"
-                >
-                  Explore {env.name}
-                </Button>
-              </div>
-            );
-          })}
-        </div>
-      </div>
-    </div>
-  );
-};

frontend/src/views/DashboardPage/DashboardPage.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import { FormProvider, useFieldArray, useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { useRouter } from "next/router";
@@ -30,7 +30,11 @@ import {
 } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { yupResolver } from "@hookform/resolvers/yup";
-import { DropdownMenu, DropdownMenuContent, DropdownMenuTrigger } from "@radix-ui/react-dropdown-menu";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuTrigger
+} from "@radix-ui/react-dropdown-menu";
 import { useQueryClient } from "@tanstack/react-query";
 
 import { useNotificationContext } from "@app/components/context/Notifications/NotificationProvider";
@@ -119,12 +123,13 @@ type TDeleteSecretImport = { environment: string; secretPath: string };
  * Instead when user delete we raise a flag so if user decides to go back to toggle personal before saving
  * They will get it back
  */
-export const DashboardPage = ({ envFromTop }: { envFromTop: string }) => {
+export const DashboardPage = () => {
   const { subscription } = useSubscription();
   const { t } = useTranslation();
   const router = useRouter();
   const { createNotification } = useNotificationContext();
   const queryClient = useQueryClient();
+  const envQuery = router.query.env as string;
 
   const secretContainer = useRef<HTMLDivElement | null>(null);
   const { popUp, handlePopUpOpen, handlePopUpToggle, handlePopUpClose } = usePopUp([
@@ -172,8 +177,8 @@ export const DashboardPage = ({ envFromTop }: { envFromTop: string }) => {
     onSuccess: (data) => {
       // get an env with one of the access available
       const env = data.find(({ isReadDenied, isWriteDenied }) => !isWriteDenied || !isReadDenied);
-      if (env && data?.map((wsenv) => wsenv.slug).includes(envFromTop)) {
-        setSelectedEnv(data?.filter((dp) => dp.slug === envFromTop)[0]);
+      if (env && data?.map((wsenv) => wsenv.slug).includes(envQuery)) {
+        setSelectedEnv(data?.filter((dp) => dp.slug === envQuery)[0]);
       }
     }
   });
@@ -293,11 +298,12 @@ export const DashboardPage = ({ envFromTop }: { envFromTop: string }) => {
   });
 
   const {
+    register,
     control,
     handleSubmit,
     getValues,
     setValue,
-    formState: { isSubmitting, isDirty },
+    formState: { isSubmitting, isDirty, errors },
     reset
   } = method;
   const { fields, prepend, append, remove } = useFieldArray({ control, name: "secrets" });
@@ -461,9 +467,9 @@ export const DashboardPage = ({ envFromTop }: { envFromTop: string }) => {
     }
   };
 
-  const onDrawerOpen = (dto: TSecretDetailsOpen) => {
-    handlePopUpOpen("secretDetails", dto);
-  };
+  const onDrawerOpen = useCallback((id: string | undefined, index: number) => {
+    handlePopUpOpen("secretDetails", { id, index } as TSecretDetailsOpen);
+  }, []);
 
   const onEnvChange = (slug: string) => {
     if (hasUnsavedChanges) {
@@ -480,17 +486,27 @@ export const DashboardPage = ({ envFromTop }: { envFromTop: string }) => {
     });
   };
 
+  const handleDownloadSecret = () => {
+    const secretsFromImport: { key: string; value: string; comment: string }[] = [];
+    importedSecrets?.forEach(({ secrets: impSec }) => {
+      impSec.forEach((el) => {
+        secretsFromImport.push({ key: el.key, value: el.value, comment: el.comment });
+      });
+    });
+    downloadSecret(getValues("secrets"), secretsFromImport, selectedEnv?.slug);
+  };
+
   // record all deleted ids
   // This will make final deletion easier
-  const onSecretDelete = (index: number, id?: string, overrideId?: string) => {
+  const onSecretDelete = useCallback((index: number, id?: string, overrideId?: string) => {
     if (id) deletedSecretIds.current.push(id);
     if (overrideId) deletedSecretIds.current.push(overrideId);
     remove(index);
     // just the case if this is called from drawer
     handlePopUpClose("secretDetails");
-  };
+  }, []);
 
-  const onCreateWsTag = async (tagName: string) => {
+  const onCreateWsTag = useCallback(async (tagName: string) => {
     try {
       await createWsTag({
         workspaceID: workspaceId,
@@ -509,10 +525,11 @@ export const DashboardPage = ({ envFromTop }: { envFromTop: string }) => {
         type: "error"
       });
     }
-  };
+  }, []);
 
-  const handleFolderOpen = (id: string) => {
+  const handleFolderOpen = useCallback((id: string) => {
     setSearchFilter("");
+    console.log(router.query);
     router.push({
       pathname: router.pathname,
       query: {
@@ -520,10 +537,11 @@ export const DashboardPage = ({ envFromTop }: { envFromTop: string }) => {
         folderId: id
       }
     });
-  };
+  }, []);
 
   const isEditFolder = Boolean(popUp?.folderForm?.data);
 
+  // FOLDER SECTION
   const handleFolderCreate = async (name: string) => {
     try {
       await createFolder({
@@ -546,7 +564,7 @@ export const DashboardPage = ({ envFromTop }: { envFromTop: string }) => {
     }
   };
 
-  const handleFolderUpdate = async (name: string) => {
+  const handleFolderUpdate = useCallback(async (name: string) => {
     const { id } = popUp?.folderForm?.data as TDeleteFolderForm;
     try {
       await updateFolder({
@@ -567,9 +585,9 @@ export const DashboardPage = ({ envFromTop }: { envFromTop: string }) => {
         type: "error"
       });
     }
-  };
+  }, []);
 
-  const handleFolderDelete = async () => {
+  const handleFolderDelete = useCallback(async () => {
     const { id } = popUp?.deleteFolder?.data as TDeleteFolderForm;
     try {
       deleteFolder({
@@ -589,8 +607,9 @@ export const DashboardPage = ({ envFromTop }: { envFromTop: string }) => {
         type: "error"
       });
     }
-  };
+  }, []);
 
+  // SECRET IMPORT SECTION
   const handleSecretImportCreate = async (env: string, secretPath: string) => {
     try {
       await createSecretImport({
@@ -664,6 +683,25 @@ export const DashboardPage = ({ envFromTop }: { envFromTop: string }) => {
     }
   };
 
+  // OPTIMIZATION HOOKS PURELY FOR PERFORMANCE AND TO AVOID RE-RENDERING
+  const handleCreateTagModalOpen = useCallback(() => handlePopUpOpen("addTag"), []);
+  const handleFolderCreatePopUpOpen = useCallback(
+    (id: string, name: string) => handlePopUpOpen("folderForm", { id, name }),
+    []
+  );
+  const handleFolderDeletePopUpOpen = useCallback(
+    (id: string, name: string) => handlePopUpOpen("deleteFolder", { id, name }),
+    []
+  );
+  const handleSecretImportDelPopUpOpen = useCallback(
+    (impSecEnv: string, impSecPath: string) =>
+      handlePopUpOpen("deleteSecretImport", {
+        environment: impSecEnv,
+        secretPath: impSecPath
+      }),
+    []
+  );
+
   // when secrets is not loading and secrets list is empty
   const isDashboardSecretEmpty = !isSecretsLoading && !fields?.length;
 
@@ -693,259 +731,259 @@ export const DashboardPage = ({ envFromTop }: { envFromTop: string }) => {
 
   return (
     <div className="container mx-auto h-full px-6 text-mineshaft-50 dark:[color-scheme:dark]">
-      <FormProvider {...method}>
-        <form autoComplete="off" className="h-full">
-          {/* breadcrumb row */}
-          <div className="relative right-6 -top-2 mb-2 ml-6">
-            <NavHeader
-              pageName={t("dashboard.title")}
-              currentEnv={
-                userAvailableEnvs?.filter((envir) => envir.slug === envFromTop)[0].name || ""
-              }
-              isFolderMode
-              folders={folderData?.dir}
-              isProjectRelated
-              userAvailableEnvs={userAvailableEnvs}
-              onEnvChange={onEnvChange}
+      <form autoComplete="off" className="h-full">
+        {/* breadcrumb row */}
+        <div className="relative right-6 -top-2 mb-2 ml-6">
+          <NavHeader
+            pageName={t("dashboard.title")}
+            currentEnv={userAvailableEnvs?.filter((envir) => envir.slug === envQuery)[0].name || ""}
+            isFolderMode
+            folders={folderData?.dir}
+            isProjectRelated
+            userAvailableEnvs={userAvailableEnvs}
+            onEnvChange={onEnvChange}
+          />
+        </div>
+        <div className="mb-4">
+          <h6 className="text-2xl">{isRollbackMode ? "Secret Snapshot" : ""}</h6>
+          {isRollbackMode && Boolean(snapshotSecret) && (
+            <Tag colorSchema="green">
+              {new Date(snapshotSecret?.createdAt || "").toLocaleString()}
+            </Tag>
+          )}
+        </div>
+        {/* Environment, search and other action row */}
+        <div className="flex items-center justify-between space-x-2">
+          <div className="flex max-w-lg flex-grow space-x-2">
+            <Input
+              className="h-[2.3rem] bg-mineshaft-800 placeholder-mineshaft-50 duration-200 focus:bg-mineshaft-700/80"
+              placeholder="Search by folder name, key name, comment..."
+              value={searchFilter}
+              onChange={(e) => setSearchFilter(e.target.value)}
+              leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
             />
           </div>
-          <div className="mb-4">
-            <h6 className="text-2xl">{isRollbackMode ? "Secret Snapshot" : ""}</h6>
-            {isRollbackMode && Boolean(snapshotSecret) && (
-              <Tag colorSchema="green">
-                {new Date(snapshotSecret?.createdAt || "").toLocaleString()}
-              </Tag>
-            )}
-          </div>
-          {/* Environment, search and other action row */}
-          <div className="flex items-center justify-between space-x-2">
-            <div className="flex max-w-lg flex-grow space-x-2">
-              <Input
-                className="h-[2.3rem] bg-mineshaft-800 placeholder-mineshaft-50 duration-200 focus:bg-mineshaft-700/80"
-                placeholder="Search by folder name, key name, comment..."
-                value={searchFilter}
-                onChange={(e) => setSearchFilter(e.target.value)}
-                leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
-              />
+          <div className="flex items-center space-x-2">
+            <div>
+              <Popover>
+                <PopoverTrigger asChild>
+                  <IconButton ariaLabel="download" variant="outline_bg">
+                    <FontAwesomeIcon icon={faDownload} />
+                  </IconButton>
+                </PopoverTrigger>
+                <PopoverContent
+                  className="w-auto border border-mineshaft-600 bg-mineshaft-800 p-1"
+                  hideCloseBtn
+                >
+                  <div className="flex flex-col space-y-2">
+                    <Button
+                      onClick={handleDownloadSecret}
+                      colorSchema="primary"
+                      variant="outline_bg"
+                      className="h-8 bg-bunker-700"
+                    >
+                      Download as .env
+                    </Button>
+                  </div>
+                </PopoverContent>
+              </Popover>
             </div>
-            <div className="flex items-center space-x-2">
-              <div>
-                <Popover>
-                  <PopoverTrigger asChild>
-                    <IconButton ariaLabel="download" variant="outline_bg">
-                      <FontAwesomeIcon icon={faDownload} />
-                    </IconButton>
-                  </PopoverTrigger>
-                  <PopoverContent
-                    className="w-auto border border-mineshaft-600 bg-mineshaft-800 p-1"
-                    hideCloseBtn
-                  >
-                    <div className="flex flex-col space-y-2">
-                      <Button
-                        onClick={() => downloadSecret(getValues("secrets"), selectedEnv?.slug)}
-                        colorSchema="primary"
-                        variant="outline_bg"
-                        className="h-8 bg-bunker-700"
-                      >
-                        Download as .env
-                      </Button>
-                    </div>
-                  </PopoverContent>
-                </Popover>
-              </div>
-              <div>
-                <Tooltip content={isSecretValueHidden ? "Reveal Secrets" : "Hide secrets"}>
-                  <IconButton
-                    ariaLabel="reveal"
-                    variant="outline_bg"
-                    onClick={() => setIsSecretValueHidden.toggle()}
-                  >
-                    <FontAwesomeIcon icon={isSecretValueHidden ? faEye : faEyeSlash} />
-                  </IconButton>
-                </Tooltip>
-              </div>
-              <div className="block xl:hidden">
-                <Tooltip content="Point-in-time Recovery">
-                  <IconButton
-                    ariaLabel="recovery"
-                    variant="outline_bg"
-                    onClick={() => handlePopUpOpen("secretSnapshots")}
-                  >
-                    <FontAwesomeIcon icon={faCodeCommit} />
-                  </IconButton>
-                </Tooltip>
-              </div>
-              <div className="hidden xl:block">
-                <Button
+            <div>
+              <Tooltip content={isSecretValueHidden ? "Reveal Secrets" : "Hide secrets"}>
+                <IconButton
+                  ariaLabel="reveal"
                   variant="outline_bg"
-                  onClick={() => {
-                    if (subscription && subscription.pitRecovery) {
-                      handlePopUpOpen("secretSnapshots");
-                      return;
-                    }
-
-                    handlePopUpOpen("upgradePlan");
-                  }}
-                  leftIcon={<FontAwesomeIcon icon={faCodeCommit} />}
-                  isLoading={isLoadingSnapshotCount}
-                  isDisabled={!canDoRollback}
-                  className="h-10"
+                  onClick={() => setIsSecretValueHidden.toggle()}
                 >
-                  {snapshotCount} Commits
-                </Button>
-              </div>
-              {!isReadOnly && !isRollbackMode && (
-                <div className="flex flex-row items-center justify-center">
-                  <button 
-                    type="button"
-                    onClick={() => {
-                      if (!(isReadOnly || isRollbackMode)) {
-                        if (secretContainer.current) {
-                          secretContainer.current.scroll({
-                            top: 0,
-                            behavior: "smooth"
-                          });
-                        }
-                        prepend(DEFAULT_SECRET_VALUE, { shouldFocus: false });
-                        setSearchFilter("");
-                      }
-                    }}
-                    className="font-semibold bg-mineshaft-600 border border-mineshaft-500 p-2 rounded-l-md text-sm text-mineshaft-300 cursor-pointer hover:bg-primary/[0.1] hover:border-primary/40 pr-4 duration-200"
-                  >
-                    <FontAwesomeIcon icon={faPlus} className="px-2"/>Add Secret
-                  </button>
-                  <DropdownMenu>
-                    <DropdownMenuTrigger asChild className="data-[state=open]:bg-mineshaft-600">
-                      <div className="bg-mineshaft-600 border border-mineshaft-500 p-2 rounded-r-md text-sm text-mineshaft-300 cursor-pointer hover:bg-primary/[0.1] hover:border-primary/40 duration-200">
-                        <FontAwesomeIcon icon={faAngleDown} className="pr-2 pl-1.5"/>
-                      </div>
-                    </DropdownMenuTrigger>
-                    <DropdownMenuContent align="end" className="mt-1 z-[60] left-20 w-[10.8rem]">
-                      <div className="bg-mineshaft-800 p-1 border border-mineshaft-600 rounded-md">
-                        <div className="w-full pb-1">
-                          <Button
-                            leftIcon={<FontAwesomeIcon icon={faFolderPlus} />}
-                            onClick={() => handlePopUpOpen("folderForm")}
-                            isDisabled={isReadOnly || isRollbackMode}
-                            variant="outline_bg"
-                            className="h-10"
-                            isFullWidth
-                          >
-                            Add Folder
-                          </Button>
-                        </div>
-                        <div className="w-full">
-                          <Button
-                            leftIcon={<FontAwesomeIcon icon={faFileImport} />}
-                            onClick={() => handlePopUpOpen("addSecretImport")}
-                            isDisabled={isReadOnly || isRollbackMode}
-                            variant="outline_bg"
-                            className="h-10"
-                            isFullWidth
-                          >
-                            Add Import
-                          </Button>
-                        </div>
-                      </div>
-                    </DropdownMenuContent>
-                  </DropdownMenu>
-                </div>
-              )}
-              {isRollbackMode && (
-                <Button
-                  variant="star"
-                  leftIcon={<FontAwesomeIcon icon={faArrowLeft} />}
-                  onClick={() => {
-                    setSnaphotId(null);
-                    reset({ ...secrets, isSnapshotMode: false });
-                  }}
-                  className="h-10"
+                  <FontAwesomeIcon icon={isSecretValueHidden ? faEye : faEyeSlash} />
+                </IconButton>
+              </Tooltip>
+            </div>
+            <div className="block xl:hidden">
+              <Tooltip content="Point-in-time Recovery">
+                <IconButton
+                  ariaLabel="recovery"
+                  variant="outline_bg"
+                  onClick={() => handlePopUpOpen("secretSnapshots")}
                 >
-                  Go back
-                </Button>
-              )}
+                  <FontAwesomeIcon icon={faCodeCommit} />
+                </IconButton>
+              </Tooltip>
+            </div>
+            <div className="hidden xl:block">
               <Button
-                isDisabled={isSubmitDisabled}
-                isLoading={isSubmitting}
-                leftIcon={<FontAwesomeIcon icon={isRollbackMode ? faClockRotateLeft : faCheck} />}
-                onClick={handleSubmit(onSaveSecret)}
-                className="h-10 text-black"
-                color="primary"
-                variant="solid"
+                variant="outline_bg"
+                onClick={() => {
+                  if (subscription && subscription.pitRecovery) {
+                    handlePopUpOpen("secretSnapshots");
+                    return;
+                  }
+
+                  handlePopUpOpen("upgradePlan");
+                }}
+                leftIcon={<FontAwesomeIcon icon={faCodeCommit} />}
+                isLoading={isLoadingSnapshotCount}
+                isDisabled={!canDoRollback}
+                className="h-10"
               >
-                {isRollbackMode ? "Rollback" : "Save Changes"}
+                {snapshotCount} Commits
               </Button>
             </div>
-          </div>
-          <div
-            className={`${
-              isEmptyPage ? "flex flex-col items-center justify-center" : ""
-            } no-scrollbar::-webkit-scrollbar mt-3 h-3/4 overflow-x-hidden overflow-y-scroll no-scrollbar`}
-            ref={secretContainer}
-          >
-            {!isEmptyPage && (
-              <DndContext
-                onDragEnd={handleDragEnd}
-                sensors={sensors}
-                collisionDetection={closestCenter}
-                modifiers={[restrictToVerticalAxis]}
-              >
-                <TableContainer className="no-scrollbar::-webkit-scrollbar max-h-[calc(100%-120px)] no-scrollbar">
-                  <table className="secret-table relative">
-                    <SecretTableHeader sortDir={sortDir} onSort={onSortSecrets} />
-                    <tbody className="max-h-96 overflow-y-auto">
-                      <SecretImportSection
-                        onSecretImportDelete={(impSecEnv, impSecPath) =>
-                          handlePopUpOpen("deleteSecretImport", {
-                            environment: impSecEnv,
-                            secretPath: impSecPath
-                          })
-                        }
-                        secrets={secrets?.secrets}
-                        importedSecrets={importedSecrets}
-                        items={items}
-                      />
-                      <FolderSection
-                        onFolderOpen={handleFolderOpen}
-                        onFolderUpdate={(id, name) => handlePopUpOpen("folderForm", { id, name })}
-                        onFolderDelete={(id, name) => handlePopUpOpen("deleteFolder", { id, name })}
-                        folders={folderList}
-                        search={searchFilter}
-                      />
-                      {fields.map(({ id, _id }, index) => (
-                        <SecretInputRow
-                          key={id}
-                          isReadOnly={isReadOnly}
-                          isRollbackMode={isRollbackMode}
-                          isAddOnly={isAddOnly}
-                          index={index}
-                          searchTerm={searchFilter}
-                          onSecretDelete={onSecretDelete}
-                          onRowExpand={() => onDrawerOpen({ id: _id as string, index })}
-                          isSecretValueHidden={isSecretValueHidden}
-                          wsTags={wsTags}
-                          onCreateTagOpen={() => handlePopUpOpen("addTag")}
-                        />
-                      ))}
-                      {!isReadOnly && !isRollbackMode && (
-                        <tr>
-                          <td colSpan={3} className="hover:bg-mineshaft-700">
-                            <button
-                              type="button"
-                              className="flex h-8 w-full cursor-default items-center justify-start pl-12 font-normal text-bunker-300"
-                              onClick={onAppendSecret}
-                            >
-                              <FontAwesomeIcon icon={faPlus} />
-                              <span className="ml-2 w-20">Add Secret</span>
-                            </button>
-                          </td>
-                        </tr>
-                      )}
-                    </tbody>
-                  </table>
-                </TableContainer>
-              </DndContext>
+            {!isReadOnly && !isRollbackMode && (
+              <div className="flex flex-row items-center justify-center">
+                <button
+                  type="button"
+                  onClick={() => {
+                    if (!(isReadOnly || isRollbackMode)) {
+                      if (secretContainer.current) {
+                        secretContainer.current.scroll({
+                          top: 0,
+                          behavior: "smooth"
+                        });
+                      }
+                      prepend(DEFAULT_SECRET_VALUE, { shouldFocus: false });
+                      setSearchFilter("");
+                    }
+                  }}
+                  className="cursor-pointer rounded-l-md border border-mineshaft-500 bg-mineshaft-600 p-2 pr-4 text-sm font-semibold text-mineshaft-300 duration-200 hover:border-primary/40 hover:bg-primary/[0.1]"
+                >
+                  <FontAwesomeIcon icon={faPlus} className="px-2" />
+                  Add Secret
+                </button>
+                <DropdownMenu>
+                  <DropdownMenuTrigger asChild className="data-[state=open]:bg-mineshaft-600">
+                    <div className="cursor-pointer rounded-r-md border border-mineshaft-500 bg-mineshaft-600 p-2 text-sm text-mineshaft-300 duration-200 hover:border-primary/40 hover:bg-primary/[0.1]">
+                      <FontAwesomeIcon icon={faAngleDown} className="pr-2 pl-1.5" />
+                    </div>
+                  </DropdownMenuTrigger>
+                  <DropdownMenuContent align="end" className="left-20 z-[60] mt-1 w-[10.8rem]">
+                    <div className="rounded-md border border-mineshaft-600 bg-mineshaft-800 p-1">
+                      <div className="w-full pb-1">
+                        <Button
+                          leftIcon={<FontAwesomeIcon icon={faFolderPlus} />}
+                          onClick={() => handlePopUpOpen("folderForm")}
+                          isDisabled={isReadOnly || isRollbackMode}
+                          variant="outline_bg"
+                          className="h-10"
+                          isFullWidth
+                        >
+                          Add Folder
+                        </Button>
+                      </div>
+                      <div className="w-full">
+                        <Button
+                          leftIcon={<FontAwesomeIcon icon={faFileImport} />}
+                          onClick={() => handlePopUpOpen("addSecretImport")}
+                          isDisabled={isReadOnly || isRollbackMode}
+                          variant="outline_bg"
+                          className="h-10"
+                          isFullWidth
+                        >
+                          Add Import
+                        </Button>
+                      </div>
+                    </div>
+                  </DropdownMenuContent>
+                </DropdownMenu>
+              </div>
             )}
+            {isRollbackMode && (
+              <Button
+                variant="star"
+                leftIcon={<FontAwesomeIcon icon={faArrowLeft} />}
+                onClick={() => {
+                  setSnaphotId(null);
+                  reset({ ...secrets, isSnapshotMode: false });
+                }}
+                className="h-10"
+              >
+                Go back
+              </Button>
+            )}
+            <Button
+              isDisabled={isSubmitDisabled}
+              isLoading={isSubmitting}
+              leftIcon={<FontAwesomeIcon icon={isRollbackMode ? faClockRotateLeft : faCheck} />}
+              onClick={handleSubmit(onSaveSecret)}
+              className="h-10 text-black"
+              color="primary"
+              variant="solid"
+            >
+              {isRollbackMode ? "Rollback" : "Save Changes"}
+            </Button>
+          </div>
+        </div>
+        <div
+          className={`${
+            isEmptyPage ? "flex flex-col items-center justify-center" : ""
+          } no-scrollbar::-webkit-scrollbar mt-3 h-3/4 overflow-x-hidden overflow-y-scroll no-scrollbar`}
+          ref={secretContainer}
+        >
+          {!isEmptyPage && (
+            <DndContext
+              onDragEnd={handleDragEnd}
+              sensors={sensors}
+              collisionDetection={closestCenter}
+              modifiers={[restrictToVerticalAxis]}
+            >
+              <TableContainer className="no-scrollbar::-webkit-scrollbar max-h-[calc(100%-120px)] no-scrollbar">
+                <table className="secret-table relative">
+                  <SecretTableHeader sortDir={sortDir} onSort={onSortSecrets} />
+                  <tbody className="max-h-96 overflow-y-auto">
+                    <SecretImportSection
+                      onSecretImportDelete={handleSecretImportDelPopUpOpen}
+                      secrets={secrets?.secrets}
+                      importedSecrets={importedSecrets}
+                      items={items}
+                    />
+                    <FolderSection
+                      onFolderOpen={handleFolderOpen}
+                      onFolderUpdate={handleFolderCreatePopUpOpen}
+                      onFolderDelete={handleFolderDeletePopUpOpen}
+                      folders={folderList}
+                      search={searchFilter}
+                    />
+                    {fields.map(({ id, _id }, index) => (
+                      <SecretInputRow
+                        key={id}
+                        secUniqId={_id}
+                        isReadOnly={isReadOnly}
+                        isRollbackMode={isRollbackMode}
+                        isAddOnly={isAddOnly}
+                        index={index}
+                        searchTerm={searchFilter}
+                        onSecretDelete={onSecretDelete}
+                        isKeyError={Boolean(errors?.secrets?.[index]?.key?.message)}
+                        keyError={errors?.secrets?.[index]?.key?.message}
+                        onRowExpand={onDrawerOpen}
+                        isSecretValueHidden={isSecretValueHidden}
+                        wsTags={wsTags}
+                        onCreateTagOpen={handleCreateTagModalOpen}
+                        register={register}
+                        control={control}
+                        setValue={setValue}
+                      />
+                    ))}
+                    {!isReadOnly && !isRollbackMode && (
+                      <tr>
+                        <td colSpan={3} className="hover:bg-mineshaft-700">
+                          <button
+                            type="button"
+                            className="flex h-8 w-full cursor-default items-center justify-start pl-12 font-normal text-bunker-300"
+                            onClick={onAppendSecret}
+                          >
+                            <FontAwesomeIcon icon={faPlus} />
+                            <span className="ml-2 w-20">Add Secret</span>
+                          </button>
+                        </td>
+                      </tr>
+                    )}
+                  </tbody>
+                </table>
+              </TableContainer>
+            </DndContext>
+          )}
+          <FormProvider {...method}>
             <PitDrawer
               isDrawerOpen={popUp?.secretSnapshots?.isOpen}
               onOpenChange={(isOpen) => handlePopUpToggle("secretSnapshots", isOpen)}
@@ -966,120 +1004,121 @@ export const DashboardPage = ({ envFromTop }: { envFromTop: string }) => {
               index={(popUp?.secretDetails?.data as TSecretDetailsOpen)?.index}
               onEnvCompare={(key) => handlePopUpOpen("compareSecrets", key)}
             />
-            <SecretDropzone
-              isSmaller={!isEmptyPage}
-              onParsedEnv={handleUploadedEnv}
-              onAddNewSecret={onAppendSecret}
-            />
-          </div>
-          {/* secrets table and drawers, modals */}
-        </form>
-        {/* Create a new tag modal */}
-        <Modal
-          isOpen={popUp?.addTag?.isOpen}
-          onOpenChange={(open) => {
-            handlePopUpToggle("addTag", open);
-          }}
+          </FormProvider>
+
+          <SecretDropzone
+            isSmaller={!isEmptyPage}
+            onParsedEnv={handleUploadedEnv}
+            onAddNewSecret={onAppendSecret}
+          />
+        </div>
+        {/* secrets table and drawers, modals */}
+      </form>
+      {/* Create a new tag modal */}
+      <Modal
+        isOpen={popUp?.addTag?.isOpen}
+        onOpenChange={(open) => {
+          handlePopUpToggle("addTag", open);
+        }}
+      >
+        <ModalContent
+          title="Create tag"
+          subTitle="Specify your tag name, and the slug will be created automatically."
         >
-          <ModalContent
-            title="Create tag"
-            subTitle="Specify your tag name, and the slug will be created automatically."
-          >
-            <CreateTagModal onCreateTag={onCreateWsTag} />
-          </ModalContent>
-        </Modal>
-        {/* Uploaded env override or not confirmation modal */}
-        <Modal
-          isOpen={popUp?.uploadedSecOpts?.isOpen}
-          onOpenChange={(open) => handlePopUpToggle("uploadedSecOpts", open)}
+          <CreateTagModal onCreateTag={onCreateWsTag} />
+        </ModalContent>
+      </Modal>
+      {/* Uploaded env override or not confirmation modal */}
+      <Modal
+        isOpen={popUp?.uploadedSecOpts?.isOpen}
+        onOpenChange={(open) => handlePopUpToggle("uploadedSecOpts", open)}
+      >
+        <ModalContent
+          title="Duplicate Secrets"
+          footerContent={[
+            <Button
+              key="keep-old-btn"
+              className="mr-4"
+              onClick={() => handlePopUpClose("uploadedSecOpts")}
+            >
+              Keep old
+            </Button>,
+            <Button colorSchema="danger" key="overwrite-btn" onClick={onOverwriteSecrets}>
+              Overwrite
+            </Button>
+          ]}
         >
-          <ModalContent
-            title="Duplicate Secrets"
-            footerContent={[
-              <Button
-                key="keep-old-btn"
-                className="mr-4"
-                onClick={() => handlePopUpClose("uploadedSecOpts")}
-              >
-                Keep old
-              </Button>,
-              <Button colorSchema="danger" key="overwrite-btn" onClick={onOverwriteSecrets}>
-                Overwrite
-              </Button>
-            ]}
-          >
-            <div className="flex flex-col space-y-2 text-gray-300">
-              <div>Your file contains following duplicate secrets</div>
-              <div className="text-sm text-gray-400">
-                {Object.keys((popUp?.uploadedSecOpts?.data as TSecOverwriteOpt)?.secrets || {})
-                  ?.map((key) => key)
-                  .join(", ")}
-              </div>
-              <div>Are you sure you want to overwrite these secrets?</div>
+          <div className="flex flex-col space-y-2 text-gray-300">
+            <div>Your file contains following duplicate secrets</div>
+            <div className="text-sm text-gray-400">
+              {Object.keys((popUp?.uploadedSecOpts?.data as TSecOverwriteOpt)?.secrets || {})
+                ?.map((key) => key)
+                .join(", ")}
             </div>
-          </ModalContent>
-        </Modal>
-        <Modal
-          isOpen={popUp?.folderForm?.isOpen}
-          onOpenChange={(isOpen) => handlePopUpToggle("folderForm", isOpen)}
+            <div>Are you sure you want to overwrite these secrets?</div>
+          </div>
+        </ModalContent>
+      </Modal>
+      <Modal
+        isOpen={popUp?.folderForm?.isOpen}
+        onOpenChange={(isOpen) => handlePopUpToggle("folderForm", isOpen)}
+      >
+        <ModalContent title={isEditFolder ? "Edit Folder" : "Create Folder"}>
+          <FolderForm
+            isEdit={isEditFolder}
+            onUpdateFolder={handleFolderUpdate}
+            onCreateFolder={handleFolderCreate}
+            defaultFolderName={(popUp?.folderForm?.data as TEditFolderForm)?.name}
+          />
+        </ModalContent>
+      </Modal>
+      <Modal
+        isOpen={popUp?.addSecretImport?.isOpen}
+        onOpenChange={(isOpen) => handlePopUpToggle("addSecretImport", isOpen)}
+      >
+        <ModalContent
+          title="Add Secret Link"
+          subTitle="To inherit secrets from another environment or folder"
         >
-          <ModalContent title={isEditFolder ? "Edit Folder" : "Create Folder"}>
-            <FolderForm
-              isEdit={isEditFolder}
-              onUpdateFolder={handleFolderUpdate}
-              onCreateFolder={handleFolderCreate}
-              defaultFolderName={(popUp?.folderForm?.data as TEditFolderForm)?.name}
-            />
-          </ModalContent>
-        </Modal>
-        <Modal
-          isOpen={popUp?.addSecretImport?.isOpen}
-          onOpenChange={(isOpen) => handlePopUpToggle("addSecretImport", isOpen)}
+          <SecretImportForm
+            environments={currentWorkspace?.environments}
+            onCreate={handleSecretImportCreate}
+          />
+        </ModalContent>
+      </Modal>
+      <DeleteActionModal
+        isOpen={popUp.deleteFolder.isOpen}
+        deleteKey={(popUp.deleteFolder?.data as TDeleteFolderForm)?.name}
+        title="Do you want to delete this folder?"
+        onChange={(isOpen) => handlePopUpToggle("deleteFolder", isOpen)}
+        onDeleteApproved={handleFolderDelete}
+      />
+      <DeleteActionModal
+        isOpen={popUp.deleteSecretImport.isOpen}
+        deleteKey="unlink"
+        title="Do you want to remove this secret import?"
+        subTitle={`This will unlink secrets from environment ${
+          (popUp.deleteSecretImport?.data as TDeleteSecretImport)?.environment
+        } of path ${(popUp.deleteSecretImport?.data as TDeleteSecretImport)?.secretPath}?`}
+        onChange={(isOpen) => handlePopUpToggle("deleteSecretImport", isOpen)}
+        onDeleteApproved={handleSecretImportDelete}
+      />
+      <Modal
+        isOpen={popUp?.compareSecrets?.isOpen}
+        onOpenChange={(open) => handlePopUpToggle("compareSecrets", open)}
+      >
+        <ModalContent
+          title={popUp?.compareSecrets?.data as string}
+          subTitle="Below is the comparison of secret values across available environments"
+          overlayClassName="z-[90]"
         >
-          <ModalContent
-            title="Add Secret Link"
-            subTitle="To inherit secrets from another environment or folder"
-          >
-            <SecretImportForm
-              environments={currentWorkspace?.environments}
-              onCreate={handleSecretImportCreate}
-            />
-          </ModalContent>
-        </Modal>
-        <DeleteActionModal
-          isOpen={popUp.deleteFolder.isOpen}
-          deleteKey={(popUp.deleteFolder?.data as TDeleteFolderForm)?.name}
-          title="Do you want to delete this folder?"
-          onChange={(isOpen) => handlePopUpToggle("deleteFolder", isOpen)}
-          onDeleteApproved={handleFolderDelete}
-        />
-        <DeleteActionModal
-          isOpen={popUp.deleteSecretImport.isOpen}
-          deleteKey="unlink"
-          title="Do you want to remove this secret import?"
-          subTitle={`This will unlink secrets from environment ${
-            (popUp.deleteSecretImport?.data as TDeleteSecretImport)?.environment
-          } of path ${(popUp.deleteSecretImport?.data as TDeleteSecretImport)?.secretPath}?`}
-          onChange={(isOpen) => handlePopUpToggle("deleteSecretImport", isOpen)}
-          onDeleteApproved={handleSecretImportDelete}
-        />
-        <Modal
-          isOpen={popUp?.compareSecrets?.isOpen}
-          onOpenChange={(open) => handlePopUpToggle("compareSecrets", open)}
-        >
-          <ModalContent
-            title={popUp?.compareSecrets?.data as string}
-            subTitle="Below is the comparison of secret values across available environments"
-            overlayClassName="z-[90]"
-          >
-            <CompareSecret
-              workspaceId={workspaceId}
-              envs={userAvailableEnvs || []}
-              secretKey={popUp?.compareSecrets?.data as string}
-            />
-          </ModalContent>
-        </Modal>
-      </FormProvider>
+          <CompareSecret
+            workspaceId={workspaceId}
+            envs={userAvailableEnvs || []}
+            secretKey={popUp?.compareSecrets?.data as string}
+          />
+        </ModalContent>
+      </Modal>
       {subscription && (
         <UpgradePlanModal
           isOpen={popUp.upgradePlan.isOpen}

frontend/src/views/DashboardPage/DashboardPage.utils.ts

@@ -75,12 +75,29 @@ export type FormData = yup.InferType<typeof schema>;
 export type TSecretDetailsOpen = { index: number; id: string };
 export type TSecOverwriteOpt = { secrets: Record<string, { comments: string[]; value: string }> };
 
-export const downloadSecret = (secrets: FormData["secrets"] = [], env: string = "unknown") => {
-  const finalSecret = secrets.map(({ key, value, valueOverride, overrideAction, comment }) => ({
-    key,
-    value: overrideAction && overrideAction !== SecretActionType.Deleted ? valueOverride : value,
-    comment
-  }));
+export const downloadSecret = (
+  secrets: FormData["secrets"] = [],
+  importedSecrets: { key: string; value?: string; comment?: string }[] = [],
+  env: string = "unknown"
+) => {
+  const importSecPos: Record<string, number> = {};
+  importedSecrets.forEach((el, index) => {
+    importSecPos[el.key] = index;
+  });
+  const finalSecret = [...importedSecrets];
+  secrets.forEach(({ key, value, valueOverride, overrideAction, comment }) => {
+    const newValue = {
+      key,
+      value: overrideAction && overrideAction !== SecretActionType.Deleted ? valueOverride : value,
+      comment
+    };
+    // can also be zero thus failing
+    if (typeof importSecPos?.[key] === "undefined") {
+      finalSecret.push(newValue);
+    } else {
+      finalSecret[importSecPos[key]] = newValue;
+    }
+  });
 
   let file = "";
   finalSecret.forEach(({ key, value, comment }) => {

frontend/src/views/DashboardPage/components/EnvComparisonRow/EnvComparisonRow.tsx

@@ -1,135 +0,0 @@
-/* eslint-disable react/jsx-no-useless-fragment */
-import { useCallback, useRef, useState } from "react";
-import { faEye, faEyeSlash, faKey, faMinus } from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-
-import { useSyntaxHighlight } from "@app/hooks";
-import { useToggle } from "@app/hooks/useToggle";
-
-type Props = {
-  secrets: any[] | undefined;
-  // permission and external state's that decided to hide or show
-  isReadOnly?: boolean;
-  isSecretValueHidden: boolean;
-  userAvailableEnvs?: any[];
-};
-
-const SEC_VAL_LINE_HEIGHT = 21;
-const MAX_MULTI_LINE = 6;
-
-const DashboardInput = ({
-  isOverridden,
-  isSecretValueHidden,
-  secret,
-  isReadOnly = true
-}: {
-  isOverridden: boolean;
-  isSecretValueHidden: boolean;
-  isReadOnly?: boolean;
-  secret?: any;
-}): JSX.Element => {
-  const ref = useRef<HTMLElement | null>(null);
-  const [isFocused, setIsFocused] = useToggle();
-  const syntaxHighlight = useSyntaxHighlight();
-
-  const value = isOverridden ? secret.valueOverride : secret?.value;
-  const multilineExpandUnit = ((value?.match(/\n/g)?.length || 0) + 1) * SEC_VAL_LINE_HEIGHT;
-  const maxMultilineHeight = Math.min(multilineExpandUnit, 21 * MAX_MULTI_LINE);
-
-  return (
-    <td
-      key={`row-${secret?.key || ""}--`}
-      className={`flex w-full cursor-default flex-row ${
-        !(secret?.value || secret?.value === "") ? "bg-red-800/10" : "bg-mineshaft-900/30"
-      }`}
-    >
-      <div className="group relative flex w-full flex-col whitespace-pre px-1.5 pt-1.5">
-        <textarea
-          readOnly={isReadOnly}
-          value={value}
-          className="ph-no-capture min-w-16 duration-50 peer z-20 w-full resize-none overflow-auto text-ellipsis bg-transparent px-2  font-mono text-sm text-transparent caret-white outline-none no-scrollbar"
-          style={{ height: `${maxMultilineHeight}px` }}
-          spellCheck="false"
-          onBlur={() => setIsFocused.off()}
-          onFocus={() => setIsFocused.on()}
-          onInput={(el) => {
-            if (ref.current) {
-              ref.current.scrollTop = el.currentTarget.scrollTop;
-              ref.current.scrollLeft = el.currentTarget.scrollLeft;
-            }
-          }}
-          onScroll={(el) => {
-            if (ref.current) {
-              ref.current.scrollTop = el.currentTarget.scrollTop;
-              ref.current.scrollLeft = el.currentTarget.scrollLeft;
-            }
-          }}
-        />
-        <pre className="whitespace-pre-wrap break-words">
-          <code
-            ref={ref}
-            className={`absolute top-1.5 left-3.5 z-10 overflow-auto font-mono text-sm transition-all no-scrollbar ${
-              isOverridden && "text-primary-300"
-            } ${
-              (value || "") === "" && "text-mineshaft-400"
-            }`}
-            style={{ height: `${maxMultilineHeight}px`, width: "calc(100% - 12px)" }}
-          >
-            {value === undefined ? (
-              <span className="cursor-default font-sans text-xs italic text-red-500/80">
-                <FontAwesomeIcon icon={faMinus} className="mt-1" />
-              </span>
-            ) : (
-              syntaxHighlight(value || "", isSecretValueHidden ? !isFocused : isSecretValueHidden)
-            )}
-          </code>
-        </pre>
-      </div>
-    </td>
-  );
-};
-
-export const EnvComparisonRow = ({
-  secrets,
-  isSecretValueHidden,
-  isReadOnly,
-  userAvailableEnvs
-}: Props): JSX.Element => {
-  const [areValuesHiddenThisRow, setAreValuesHiddenThisRow] = useState(true);
-
-  const getSecretByEnv = useCallback(
-    (secEnv: string, secs?: any[]) => secs?.find(({ env }) => env === secEnv),
-    []
-  );
-
-  return (
-    <tr className="group flex min-w-full flex-row hover:bg-mineshaft-800">
-      <td className="flex w-10 justify-center border-none px-4">
-        <div className="flex h-8 w-10 items-center justify-center text-center text-xs text-bunker-400">
-          <FontAwesomeIcon icon={faKey} />
-        </div>
-      </td>
-      <td className="flex min-w-[200px] flex-row justify-between lg:min-w-[220px] xl:min-w-[250px]">
-        <div className="flex h-8 cursor-default flex-row items-center justify-center truncate">
-          {secrets![0].key || ""}
-        </div>
-        <button
-          type="button"
-          className="invisible mr-1 ml-2 text-bunker-400 hover:text-bunker-300 group-hover:visible"
-          onClick={() => setAreValuesHiddenThisRow(!areValuesHiddenThisRow)}
-        >
-          <FontAwesomeIcon icon={areValuesHiddenThisRow ? faEye : faEyeSlash} />
-        </button>
-      </td>
-      {userAvailableEnvs?.map(({ slug }) => (
-        <DashboardInput
-          isReadOnly={isReadOnly}
-          key={`row-${secrets![0].key || ""}-${slug}`}
-          isOverridden={false}
-          secret={getSecretByEnv(slug, secrets)}
-          isSecretValueHidden={areValuesHiddenThisRow && isSecretValueHidden}
-        />
-      ))}
-    </tr>
-  );
-};

frontend/src/views/DashboardPage/components/EnvComparisonRow/FolderComparisonRow.tsx

@@ -1,42 +0,0 @@
-import { faCheck, faFolder, faXmark } from "@fortawesome/free-solid-svg-icons";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-
-type Props = {
-  folderInEnv: Record<string, boolean>;
-  userAvailableEnvs?: Array<{ slug: string; name: string }>;
-  folderName: string;
-  onClick: (folderName: string) => void;
-};
-
-export const FolderComparisonRow = ({
-  folderInEnv = {},
-  userAvailableEnvs = [],
-  folderName,
-  onClick
-}: Props) => (
-  <tr
-    className="group flex min-w-full cursor-pointer flex-row items-center hover:bg-mineshaft-800"
-    onClick={() => onClick(folderName)}
-  >
-    <td className="flex h-10 w-10  items-center justify-center border-none px-4">
-      <div className="w-10 text-center text-xs text-bunker-400">
-        <FontAwesomeIcon icon={faFolder} className="text-primary-700" />
-      </div>
-    </td>
-    <td className="flex h-full min-w-[200px] flex-row items-center justify-between lg:min-w-[200px] xl:min-w-[250px]">
-      <div className="flex h-8 flex-row items-center truncate">{folderName}</div>
-    </td>
-    {userAvailableEnvs?.map(({ slug }) => (
-      <td
-        className={`flex h-10 w-full cursor-default flex-row items-center justify-center ${
-          folderInEnv[slug]
-            ? "bg-mineshaft-900/30 text-green-500/80"
-            : "bg-red-800/10 text-red-500/80"
-        }`}
-        key={`${folderName}-${slug}`}
-      >
-        <FontAwesomeIcon icon={folderInEnv[slug] ? faCheck : faXmark} />
-      </td>
-    ))}
-  </tr>
-);

frontend/src/views/DashboardPage/components/EnvComparisonRow/index.tsx

@@ -1 +0,0 @@
-export { EnvComparisonRow } from "./EnvComparisonRow";

frontend/src/views/DashboardPage/components/FolderSection/FolderSection.tsx

@@ -1,3 +1,4 @@
+import { memo } from "react";
 import { faEdit, faFolder, faXmark } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
@@ -11,70 +12,74 @@ type Props = {
   onFolderOpen: (folderId: string) => void;
 };
 
-export const FolderSection = ({
-  onFolderUpdate: handleFolderUpdate,
-  onFolderDelete: handleFolderDelete,
-  onFolderOpen: handleFolderOpen,
-  search = "",
-  folders = []
-}: Props) => {
-  return (
-    <>
-      {folders
-        .filter(({ name }) => name.toLowerCase().includes(search.toLowerCase()))
-        .map(({ id, name }) => (
-          <tr
-            key={id}
-            className="group flex cursor-default flex-row items-center hover:bg-mineshaft-700"
-          >
-            <td className="ml-0.5 flex h-10 w-10 items-center justify-center border-none px-4">
-              <FontAwesomeIcon icon={faFolder} className="text-primary-700" />
-            </td>
-            <td
-              colSpan={2}
-              className="relative flex w-full min-w-[220px] items-center justify-between overflow-hidden text-ellipsis lg:min-w-[240px] xl:min-w-[280px]"
-              style={{ paddingTop: "0", paddingBottom: "0" }}
+export const FolderSection = memo(
+  ({
+    onFolderUpdate: handleFolderUpdate,
+    onFolderDelete: handleFolderDelete,
+    onFolderOpen: handleFolderOpen,
+    search = "",
+    folders = []
+  }: Props) => {
+    return (
+      <>
+        {folders
+          .filter(({ name }) => name.toLowerCase().includes(search.toLowerCase()))
+          .map(({ id, name }) => (
+            <tr
+              key={id}
+              className="group flex cursor-default flex-row items-center hover:bg-mineshaft-700"
             >
-              <div
-                className="flex-grow cursor-default p-2"
-                onKeyDown={() => null}
-                tabIndex={0}
-                role="button"
-                onClick={() => handleFolderOpen(id)}
+              <td className="ml-0.5 flex h-10 w-10 items-center justify-center border-none px-4">
+                <FontAwesomeIcon icon={faFolder} className="text-yellow-700" />
+              </td>
+              <td
+                colSpan={2}
+                className="relative flex w-full min-w-[220px] items-center justify-between overflow-hidden text-ellipsis lg:min-w-[240px] xl:min-w-[280px]"
+                style={{ paddingTop: "0", paddingBottom: "0" }}
               >
-                {name}
-              </div>
-              <div className="duration-0 flex h-10 w-16 items-center justify-end space-x-2.5 overflow-hidden border-l border-mineshaft-600 transition-all">
-                <div className="opacity-0 group-hover:opacity-100">
-                  <Tooltip content="Settings" className="capitalize">
-                    <IconButton
-                      size="md"
-                      colorSchema="primary"
-                      variant="plain"
-                      onClick={() => handleFolderUpdate(id, name)}
-                      ariaLabel="expand"
-                    >
-                      <FontAwesomeIcon icon={faEdit} />
-                    </IconButton>
-                  </Tooltip>
+                <div
+                  className="flex-grow cursor-default p-2"
+                  onKeyDown={() => null}
+                  tabIndex={0}
+                  role="button"
+                  onClick={() => handleFolderOpen(id)}
+                >
+                  {name}
                 </div>
-                <div className="opacity-0 group-hover:opacity-100">
-                  <Tooltip content="Delete" className="capitalize">
-                    <IconButton
-                      size="md"
-                      variant="plain"
-                      colorSchema="danger"
-                      ariaLabel="delete"
-                      onClick={() => handleFolderDelete(id, name)}
-                    >
-                      <FontAwesomeIcon icon={faXmark} size="lg" />
-                    </IconButton>
-                  </Tooltip>
+                <div className="duration-0 flex h-10 w-16 items-center justify-end space-x-2.5 overflow-hidden border-l border-mineshaft-600 transition-all">
+                  <div className="opacity-0 group-hover:opacity-100">
+                    <Tooltip content="Settings" className="capitalize">
+                      <IconButton
+                        size="md"
+                        colorSchema="primary"
+                        variant="plain"
+                        onClick={() => handleFolderUpdate(id, name)}
+                        ariaLabel="expand"
+                      >
+                        <FontAwesomeIcon icon={faEdit} />
+                      </IconButton>
+                    </Tooltip>
+                  </div>
+                  <div className="opacity-0 group-hover:opacity-100">
+                    <Tooltip content="Delete" className="capitalize">
+                      <IconButton
+                        size="md"
+                        variant="plain"
+                        colorSchema="danger"
+                        ariaLabel="delete"
+                        onClick={() => handleFolderDelete(id, name)}
+                      >
+                        <FontAwesomeIcon icon={faXmark} size="lg" />
+                      </IconButton>
+                    </Tooltip>
+                  </div>
                 </div>
-              </div>
-            </td>
-          </tr>
-        ))}
-    </>
-  );
-};
+              </td>
+            </tr>
+          ))}
+      </>
+    );
+  }
+);
+
+FolderSection.displayName = "FolderSection";

frontend/src/views/DashboardPage/components/SecretImportSection/SecretImportItem.tsx

@@ -9,7 +9,7 @@ import {
 } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
-import { EmptyState, IconButton, TableContainer, Tooltip } from "@app/components/v2";
+import { EmptyState, IconButton, SecretInput, TableContainer, Tooltip } from "@app/components/v2";
 import { useWorkspace } from "@app/context";
 import { useToggle } from "@app/hooks/useToggle";
 
@@ -26,7 +26,7 @@ export const EnvFolderIcon = ({ env, secretPath }: { env: string; secretPath: st
     <div style={{ minWidth: "96px" }}>{env || "-"}</div>
     {secretPath && (
       <div className="inline-flex items-center space-x-2 border-l border-mineshaft-600 pl-2">
-        <FontAwesomeIcon icon={faFolder} size="lg" className="text-primary-700" />
+        <FontAwesomeIcon icon={faFolder} className="text-green-700 text-md" />
         <span>{secretPath}</span>
       </div>
     )}
@@ -66,7 +66,7 @@ export const SecretImportItem = ({
         onClick={() => setIsExpanded.toggle()}
       >
         <td className="ml-0.5 flex h-10 w-10 items-center justify-center border-none px-4">
-          <FontAwesomeIcon icon={faFileImport} className="text-primary-700" />
+          <FontAwesomeIcon icon={faFileImport} className="text-green-700" />
         </td>
         <td
           colSpan={2}
@@ -138,7 +138,7 @@ export const SecretImportItem = ({
                           {key}
                         </td>
                         <td className="h-10" style={{ padding: "0.25rem 1rem" }}>
-                          {value}
+                          <SecretInput value={value} isDisabled isVisible />
                         </td>
                         <td className="h-10" style={{ padding: "0.25rem 1rem" }}>
                           <EnvFolderIcon env={overriden?.env} secretPath={overriden?.secretPath} />

frontend/src/views/DashboardPage/components/SecretImportSection/SecretImportSection.tsx

@@ -1,3 +1,4 @@
+import { memo } from "react";
 import { SortableContext, verticalListSortingStrategy } from "@dnd-kit/sortable";
 
 import { useWorkspace } from "@app/context";
@@ -62,32 +63,31 @@ type Props = {
   items: { id: string; environment: string; secretPath: string }[];
 };
 
-export const SecretImportSection = ({
-  secrets = [],
-  importedSecrets = [],
-  onSecretImportDelete,
-  items = []
-}: Props) => {
-  const { currentWorkspace } = useWorkspace();
-  const environments = currentWorkspace?.environments || [];
+export const SecretImportSection = memo(
+  ({ secrets = [], importedSecrets = [], onSecretImportDelete, items = [] }: Props) => {
+    const { currentWorkspace } = useWorkspace();
+    const environments = currentWorkspace?.environments || [];
 
-  return (
-    <SortableContext items={items} strategy={verticalListSortingStrategy}>
-      {items.map(({ secretPath: impSecPath, environment: importSecEnv, id }) => (
-        <SecretImportItem
-          key={id}
-          importedEnv={importSecEnv}
-          importedSecrets={computeImportedSecretRows(
-            importSecEnv,
-            impSecPath,
-            importedSecrets,
-            secrets,
-            environments
-          )}
-          onDelete={onSecretImportDelete}
-          importedSecPath={impSecPath}
-        />
-      ))}
-    </SortableContext>
-  );
-};
+    return (
+      <SortableContext items={items} strategy={verticalListSortingStrategy}>
+        {items.map(({ secretPath: impSecPath, environment: importSecEnv, id }) => (
+          <SecretImportItem
+            key={id}
+            importedEnv={importSecEnv}
+            importedSecrets={computeImportedSecretRows(
+              importSecEnv,
+              impSecPath,
+              importedSecrets,
+              secrets,
+              environments
+            )}
+            onDelete={onSecretImportDelete}
+            importedSecPath={impSecPath}
+          />
+        ))}
+      </SortableContext>
+    );
+  }
+);
+
+SecretImportSection.displayName = "SecretImportSection";

frontend/src/views/DashboardPage/components/SecretInputRow/MaskedInput.tsx

@@ -1,107 +0,0 @@
-import { useRef } from "react";
-import { Controller, useFormContext, useWatch } from "react-hook-form";
-
-import { useSyntaxHighlight, useToggle } from "@app/hooks";
-
-import { FormData } from "../../DashboardPage.utils";
-
-type Props = {
-  isReadOnly?: boolean;
-  isSecretValueHidden?: boolean;
-  isOverridden?: boolean;
-  index: number;
-};
-
-const SEC_VAL_LINE_HEIGHT = 21;
-const MAX_MULTI_LINE = 6;
-
-export const MaskedInput = ({ isReadOnly, isSecretValueHidden, index, isOverridden }: Props) => {
-  const { control } = useFormContext<FormData>();
-  const ref = useRef<HTMLElement | null>(null);
-  const [isFocused, setIsFocused] = useToggle();
-  const syntaxHighlight = useSyntaxHighlight();
-
-  const secretValue = useWatch({ control, name: `secrets.${index}.value` });
-  const secretValueOverride = useWatch({ control, name: `secrets.${index}.valueOverride` });
-  const value = isOverridden ? secretValueOverride : secretValue;
-
-  const multilineExpandUnit = ((value?.match(/\n/g)?.length || 0) + 1) * SEC_VAL_LINE_HEIGHT;
-  const maxMultilineHeight = Math.min(multilineExpandUnit, 21 * MAX_MULTI_LINE);
-
-  return (
-    <div className="group relative flex w-full flex-col whitespace-pre px-1.5 pt-1.5">
-      {isOverridden ? (
-        <Controller
-          control={control}
-          name={`secrets.${index}.valueOverride`}
-          render={({ field }) => (
-            <textarea
-              key={`secrets.${index}.valueOverride`}
-              {...field}
-              readOnly={isReadOnly}
-              className="ph-no-capture min-w-16 duration-50 peer z-20 w-full resize-none overflow-auto text-ellipsis bg-transparent px-2  font-mono text-sm text-transparent caret-white outline-none no-scrollbar"
-              style={{ height: `${maxMultilineHeight}px` }}
-              spellCheck="false"
-              onBlur={() => setIsFocused.off()}
-              onFocus={() => setIsFocused.on()}
-              onInput={(el) => {
-                if (ref.current) {
-                  ref.current.scrollTop = el.currentTarget.scrollTop;
-                  ref.current.scrollLeft = el.currentTarget.scrollLeft;
-                }
-              }}
-              onScroll={(el) => {
-                if (ref.current) {
-                  ref.current.scrollTop = el.currentTarget.scrollTop;
-                  ref.current.scrollLeft = el.currentTarget.scrollLeft;
-                }
-              }}
-            />
-          )}
-        />
-      ) : (
-        <Controller
-          control={control}
-          name={`secrets.${index}.value`}
-          key={`secrets.${index}.value`}
-          render={({ field }) => (
-            <textarea
-              {...field}
-              readOnly={isReadOnly}
-              className="ph-no-capture min-w-16 duration-50 peer z-20 w-full resize-none overflow-auto text-ellipsis bg-transparent px-2 font-mono text-sm text-transparent caret-white outline-none no-scrollbar"
-              style={{ height: `${maxMultilineHeight}px` }}
-              spellCheck="false"
-              onBlur={() => setIsFocused.off()}
-              onFocus={() => setIsFocused.on()}
-              onInput={(el) => {
-                if (ref.current) {
-                  ref.current.scrollTop = el.currentTarget.scrollTop;
-                  ref.current.scrollLeft = el.currentTarget.scrollLeft;
-                }
-              }}
-              onScroll={(el) => {
-                if (ref.current) {
-                  ref.current.scrollTop = el.currentTarget.scrollTop;
-                  ref.current.scrollLeft = el.currentTarget.scrollLeft;
-                }
-              }}
-            />
-          )}
-        />
-      )}
-      <pre className="whitespace-pre-wrap break-words">
-        <code
-          ref={ref}
-          className={`absolute top-1.5 left-3.5 z-10 w-full overflow-auto font-mono text-sm transition-all no-scrollbar ${
-            isOverridden && "text-primary-300"
-          } ${
-            (value || "") === "" && "text-mineshaft-400"
-          }`}
-          style={{ height: `${maxMultilineHeight}px`, width: "calc(100% - 12px)" }}
-        >
-          {syntaxHighlight(value || "", isSecretValueHidden ? !isFocused : isSecretValueHidden)}
-        </code>
-      </pre>
-    </div>
-  );
-};

frontend/src/views/DashboardPage/components/SecretInputRow/SecretInputRow.tsx

@@ -1,6 +1,13 @@
 /* eslint-disable react/jsx-no-useless-fragment */
-import { memo, useEffect, useRef } from "react";
-import { Controller, useFieldArray, useFormContext, useWatch } from "react-hook-form";
+import { memo, useEffect, useRef, useState } from "react";
+import {
+  Control,
+  Controller,
+  useFieldArray,
+  UseFormRegister,
+  UseFormSetValue,
+  useWatch
+} from "react-hook-form";
 import {
   faCheck,
   faCodeBranch,
@@ -28,6 +35,7 @@ import {
   Popover,
   PopoverContent,
   PopoverTrigger,
+  SecretInput,
   Tag,
   TextArea,
   Tooltip
@@ -36,24 +44,6 @@ import { useToggle } from "@app/hooks";
 import { WsTag } from "@app/hooks/api/types";
 
 import { FormData, SecretActionType } from "../../DashboardPage.utils";
-import { MaskedInput } from "./MaskedInput";
-
-type Props = {
-  index: number;
-  // permission and external state's that decided to hide or show
-  isReadOnly?: boolean;
-  isAddOnly?: boolean;
-  isRollbackMode?: boolean;
-  isSecretValueHidden: boolean;
-  searchTerm: string;
-  // to record the ids of deleted ones
-  onSecretDelete: (index: number, id?: string, overrideId?: string) => void;
-  // sidebar control props
-  onRowExpand: () => void;
-  // tag props
-  wsTags?: WsTag[];
-  onCreateTagOpen: () => void;
-};
 
 const tagColors = [
   { bg: "bg-[#f1c40f]/40", text: "text-[#fcf0c3]/70" },
@@ -66,6 +56,31 @@ const tagColors = [
   { bg: "bg-[#332FD0]/40", text: "text-[#DFF6FF]/70" }
 ];
 
+type Props = {
+  index: number;
+  // backend generated unique id
+  secUniqId?: string;
+  // permission and external state's that decided to hide or show
+  isReadOnly?: boolean;
+  isAddOnly?: boolean;
+  isRollbackMode?: boolean;
+  isSecretValueHidden: boolean;
+  searchTerm: string;
+  // to record the ids of deleted ones
+  onSecretDelete: (index: number, id?: string, overrideId?: string) => void;
+  // sidebar control props
+  onRowExpand: (secId: string | undefined, index: number) => void;
+  // tag props
+  wsTags?: WsTag[];
+  onCreateTagOpen: () => void;
+  // rhf specific functions, dont put this using useFormContext. This is passed as props to avoid re-rendering
+  control: Control<FormData>;
+  register: UseFormRegister<FormData>;
+  setValue: UseFormSetValue<FormData>;
+  isKeyError?: boolean;
+  keyError?: string;
+};
+
 export const SecretInputRow = memo(
   ({
     index,
@@ -77,10 +92,15 @@ export const SecretInputRow = memo(
     wsTags,
     onCreateTagOpen,
     onSecretDelete,
-    searchTerm
+    searchTerm,
+    control,
+    register,
+    setValue,
+    isKeyError,
+    keyError,
+    secUniqId
   }: Props): JSX.Element => {
     const isKeySubDisabled = useRef<boolean>(false);
-    const { register, setValue, control } = useFormContext<FormData>();
     // comment management in a row
     const {
       fields: secretTags,
@@ -89,28 +109,40 @@ export const SecretInputRow = memo(
     } = useFieldArray({ control, name: `secrets.${index}.tags` });
 
     // to get details on a secret
-    const overrideAction = useWatch({ control, name: `secrets.${index}.overrideAction` });
-    const idOverride = useWatch({ control, name: `secrets.${index}.idOverride` });
-    const secComment = useWatch({ control, name: `secrets.${index}.comment` });
+    const overrideAction = useWatch({
+      control,
+      name: `secrets.${index}.overrideAction`,
+      exact: true
+    });
+    const idOverride = useWatch({ control, name: `secrets.${index}.idOverride`, exact: true });
+    const secComment = useWatch({ control, name: `secrets.${index}.comment`, exact: true });
     const hasComment = Boolean(secComment);
     const secKey = useWatch({
       control,
       name: `secrets.${index}.key`,
-      disabled: isKeySubDisabled.current
+      disabled: isKeySubDisabled.current,
+      exact: true
     });
     const secValue = useWatch({
       control,
       name: `secrets.${index}.value`,
-      disabled: isKeySubDisabled.current
+      disabled: isKeySubDisabled.current,
+      exact: true
     });
     const secValueOverride = useWatch({
       control,
       name: `secrets.${index}.valueOverride`,
-      disabled: isKeySubDisabled.current
-    })
-    const secId = useWatch({ control, name: `secrets.${index}._id` });
+      disabled: isKeySubDisabled.current,
+      exact: true
+    });
+    // when secret is override by personal values
+    const isOverridden =
+      overrideAction === SecretActionType.Created || overrideAction === SecretActionType.Modified;
+    const [editorRef, setEditorRef] = useState(isOverridden ? secValueOverride : secValue);
 
-    const tags = useWatch({ control, name: `secrets.${index}.tags`, defaultValue: [] }) || [];
+    const secId = useWatch({ control, name: `secrets.${index}._id`, exact: true });
+    const tags =
+      useWatch({ control, name: `secrets.${index}.tags`, exact: true, defaultValue: [] }) || [];
     const selectedTagIds = tags.reduce<Record<string, boolean>>(
       (prev, curr) => ({ ...prev, [curr.slug]: true }),
       {}
@@ -126,15 +158,15 @@ export const SecretInputRow = memo(
       return () => clearTimeout(timer);
     }, [isInviteLinkCopied]);
 
+    useEffect(() => {
+      setEditorRef(isOverridden ? secValueOverride : secValue);
+    }, [isOverridden]);
+
     const copyTokenToClipboard = () => {
       navigator.clipboard.writeText((secValueOverride || secValue) as string);
       setInviteLinkCopied.on();
     };
 
-    // when secret is override by personal values
-    const isOverridden =
-      overrideAction === SecretActionType.Created || overrideAction === SecretActionType.Modified;
-
     const onSecretOverride = () => {
       if (isOverridden) {
         // when user created a new override but then removes
@@ -193,10 +225,10 @@ export const SecretInputRow = memo(
           control={control}
           defaultValue=""
           name={`secrets.${index}.key`}
-          render={({ fieldState: { error }, field }) => (
-            <HoverCard openDelay={0} open={error?.message ? undefined : false}>
+          render={({ field }) => (
+            <HoverCard openDelay={0} open={isKeyError ? undefined : false}>
               <HoverCardTrigger asChild>
-                <td className={cx(error?.message ? "rounded ring ring-red/50" : null)}>
+                <td className={cx(isKeyError ? "rounded ring ring-red/50" : null)}>
                   <div className="relative flex w-full min-w-[220px] items-center justify-end lg:min-w-[240px] xl:min-w-[280px]">
                     <Input
                       autoComplete="off"
@@ -220,21 +252,70 @@ export const SecretInputRow = memo(
                   <div>
                     <FontAwesomeIcon icon={faInfoCircle} className="text-red" />
                   </div>
-                  <div className="text-sm">{error?.message}</div>
+                  <div className="text-sm">{keyError}</div>
                 </div>
               </HoverCardContent>
             </HoverCard>
           )}
         />
-        <td className="flex w-full flex-grow flex-row border-r border-none border-red">
-          <MaskedInput
-            isReadOnly={
-              isReadOnly || isRollbackMode || (isOverridden ? isAddOnly : shouldBeBlockedInAddOnly)
-            }
-            isOverridden={isOverridden}
-            isSecretValueHidden={isSecretValueHidden}
-            index={index}
-          />
+        <td
+          className="flex w-full flex-grow flex-row border-r border-none border-red"
+          style={{ padding: "0.5rem 0 0.5rem 1rem" }}
+        >
+          <div className="w-full">
+            {isOverridden ? (
+              <Controller
+                control={control}
+                name={`secrets.${index}.valueOverride`}
+                render={({ field: { onChange, onBlur } }) => (
+                  <SecretInput
+                    key={`secrets.${index}.valueOverride`}
+                    isDisabled={
+                      isReadOnly ||
+                      isRollbackMode ||
+                      (isOverridden ? isAddOnly : shouldBeBlockedInAddOnly)
+                    }
+                    value={editorRef}
+                    isVisible={!isSecretValueHidden}
+                    onChange={(val, html) => {
+                      console.log(val);
+                      onChange(val);
+                      setEditorRef(html);
+                    }}
+                    onBlur={(html) => {
+                      setEditorRef(html);
+                      onBlur();
+                    }}
+                  />
+                )}
+              />
+            ) : (
+              <Controller
+                control={control}
+                name={`secrets.${index}.value`}
+                render={({ field: { onBlur, onChange } }) => (
+                  <SecretInput
+                    key={`secrets.${index}.value`}
+                    isVisible={!isSecretValueHidden}
+                    isDisabled={
+                      isReadOnly ||
+                      isRollbackMode ||
+                      (isOverridden ? isAddOnly : shouldBeBlockedInAddOnly)
+                    }
+                    onChange={(val, html) => {
+                      onChange(val);
+                      setEditorRef(html);
+                    }}
+                    value={editorRef}
+                    onBlur={(html) => {
+                      setEditorRef(html);
+                      onBlur();
+                    }}
+                  />
+                )}
+              />
+            )}
+          </div>
         </td>
         <td className="min-w-sm flex">
           <div className="flex h-8 items-center pl-2">
@@ -251,7 +332,7 @@ export const SecretInputRow = memo(
                 {slug}
               </Tag>
             ))}
-            <div className="w-0 group-hover:w-6 overflow-hidden">
+            <div className="w-0 overflow-hidden group-hover:w-6">
               <Tooltip content="Copy value">
                 <IconButton
                   variant="plain"
@@ -396,7 +477,7 @@ export const SecretInputRow = memo(
                       size="lg"
                       colorSchema="primary"
                       variant="plain"
-                      onClick={onRowExpand}
+                      onClick={() => onRowExpand(secUniqId, index)}
                       ariaLabel="expand"
                     >
                       <FontAwesomeIcon icon={faEllipsis} />

frontend/src/views/IntegrationsPage/IntegrationPage.utils.tsx

@@ -110,6 +110,9 @@ export const redirectForProviderAuth = (integrationOption: TCloudIntegration) =>
       case "northflank":
         link = `${window.location.origin}/integrations/northflank/authorize`;
         break;
+      case "windmill":
+        link = `${window.location.origin}/integrations/windmill/authorize`;
+        break;
       default:
         break;
     }

frontend/src/views/Org/MembersPage/components/OrgIncidentContactsTable/OrgIncidentContactsTable.tsx

@@ -53,7 +53,7 @@ export const OrgIncidentContactsTable = ({
   isLoading
 }: Props) => {
   const [searchContact, setSearchContact] = useState("");
-  const {data: serverDetails } = useFetchServerStatus()
+  const { data: serverDetails } = useFetchServerStatus();
   const { handlePopUpToggle, popUp, handlePopUpOpen, handlePopUpClose } = usePopUp([
     "addContact",
     "removeContact",
@@ -98,7 +98,7 @@ export const OrgIncidentContactsTable = ({
           <Button
             leftIcon={<FontAwesomeIcon icon={faPlus} />}
             onClick={() => {
-              if (serverDetails?.emailConfigured){
+              if (serverDetails?.emailConfigured) {
                 handlePopUpOpen("addContact");
               } else {
                 handlePopUpOpen("setUpEmail");
@@ -119,7 +119,7 @@ export const OrgIncidentContactsTable = ({
               </Tr>
             </THead>
             <TBody>
-              {isLoading && <TableSkeleton columns={2} key="incident-contact" />}
+              {isLoading && <TableSkeleton columns={2} innerKey="incident-contact" />}
               {filteredContacts?.map(({ email }) => (
                 <Tr key={email}>
                   <Td className="w-full">{email}</Td>

frontend/src/views/Org/MembersPage/components/OrgMembersTable/OrgMembersTable.tsx

@@ -1,7 +1,14 @@
 import { Dispatch, SetStateAction, useEffect, useMemo, useState } from "react";
 import { Controller, useForm } from "react-hook-form";
 import { useRouter } from "next/router";
-import { faCheck, faCopy, faMagnifyingGlass, faPlus, faTrash, faUsers } from "@fortawesome/free-solid-svg-icons";
+import {
+  faCheck,
+  faCopy,
+  faMagnifyingGlass,
+  faPlus,
+  faTrash,
+  faUsers
+} from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { yupResolver } from "@hookform/resolvers/yup";
 import * as yup from "yup";
@@ -10,7 +17,8 @@ import { useNotificationContext } from "@app/components/context/Notifications/No
 import {
   Button,
   DeleteActionModal,
-  EmailServiceSetupModal,  EmptyState,
+  EmailServiceSetupModal,
+  EmptyState,
   FormControl,
   IconButton,
   Input,
@@ -29,7 +37,7 @@ import {
   Tr,
   UpgradePlanModal
 } from "@app/components/v2";
-import { useOrganization , useWorkspace } from "@app/context";
+import { useOrganization, useWorkspace } from "@app/context";
 import { usePopUp, useToggle } from "@app/hooks";
 import { useGetSSOConfig } from "@app/hooks/api";
 import { useFetchServerStatus } from "@app/hooks/api/serverDetails";
@@ -47,8 +55,8 @@ type Props = {
   onGrantAccess: (userId: string, publicKey: string) => Promise<void>;
   // the current user id to block remove org button
   userId: string;
-  completeInviteLink: string | undefined,
-  setCompleteInviteLink: Dispatch<SetStateAction<string | undefined>>
+  completeInviteLink: string | undefined;
+  setCompleteInviteLink: Dispatch<SetStateAction<string | undefined>>;
 };
 
 const addMemberFormSchema = yup.object({
@@ -76,7 +84,7 @@ export const OrgMembersTable = ({
   const { currentOrg } = useOrganization();
   const { data: ssoConfig, isLoading: isLoadingSSOConfig } = useGetSSOConfig(currentOrg?._id ?? "");
   const [searchMemberFilter, setSearchMemberFilter] = useState("");
-  const {data: serverDetails } = useFetchServerStatus()
+  const { data: serverDetails } = useFetchServerStatus();
   const { workspaces } = useWorkspace();
   const [isInviteLinkCopied, setInviteLinkCopied] = useToggle(false);
   const { handlePopUpToggle, popUp, handlePopUpOpen, handlePopUpClose } = usePopUp([
@@ -85,7 +93,7 @@ export const OrgMembersTable = ({
     "upgradePlan",
     "setUpEmail"
   ] as const);
-  
+
   useEffect(() => {
     if (router.query.action === "invite") {
       handlePopUpOpen("addMember");
@@ -101,11 +109,11 @@ export const OrgMembersTable = ({
 
   const onAddMember = async ({ email }: TAddMemberForm) => {
     await onInviteMember(email);
-      if (serverDetails?.emailConfigured){
-        handlePopUpClose("addMember");
-      }
-      
-      reset();
+    if (serverDetails?.emailConfigured) {
+      handlePopUpClose("addMember");
+    }
+
+    reset();
   };
 
   const onRemoveOrgMemberApproved = async () => {
@@ -118,7 +126,7 @@ export const OrgMembersTable = ({
     () => members.find(({ user }) => userId === user?._id)?.role === "owner",
     [userId, members]
   );
-  
+
   const filterdUser = useMemo(
     () =>
       members.filter(
@@ -163,10 +171,10 @@ export const OrgMembersTable = ({
                 text: "You cannot invite users when SAML SSO is configured for your organization",
                 type: "error"
               });
-              
+
               return;
             }
-            
+
             if (isMoreUserNotAllowed) {
               handlePopUpOpen("upgradePlan");
             } else {
@@ -190,7 +198,7 @@ export const OrgMembersTable = ({
               </Tr>
             </THead>
             <TBody>
-              {isLoading && <TableSkeleton columns={5} key="org-members" />}
+              {isLoading && <TableSkeleton columns={5} innerKey="org-members" />}
               {!isLoading &&
                 filterdUser.map(({ user, inviteEmail, role, _id: orgMembershipId, status }) => {
                   const name = user ? `${user.firstName} ${user.lastName}` : "-";
@@ -219,11 +227,17 @@ export const OrgMembersTable = ({
                             <SelectItem value="member">member</SelectItem>
                           </Select>
                         )}
-                        {((status === "invited" || status === "verified") && serverDetails?.emailConfigured) && (
-                          <Button className='w-40' colorSchema="primary" variant="outline_bg" onClick={() => onInviteMember(email)}>
-                            Resend Invite
-                          </Button>
-                        )}
+                        {(status === "invited" || status === "verified") &&
+                          serverDetails?.emailConfigured && (
+                            <Button
+                              className="w-40"
+                              colorSchema="primary"
+                              variant="outline_bg"
+                              onClick={() => onInviteMember(email)}
+                            >
+                              Resend Invite
+                            </Button>
+                          )}
                         {status === "completed" && (
                           <Button
                             colorSchema="secondary"
@@ -241,18 +255,33 @@ export const OrgMembersTable = ({
                             </Tag>
                           ))
                         ) : (
-                          <div className='flex flex-row'>
-                            {((status === "invited" || status === "verified") && serverDetails?.emailConfigured) 
-                            ? <Tag colorSchema="red">This user hasn&apos;t accepted the invite yet</Tag>
-                            : <Tag colorSchema="red">This user isn&apos;t part of any projects yet</Tag>}
-                            {router.query.id !== "undefined" && !((status === "invited" || status === "verified") && serverDetails?.emailConfigured) && <button 
-                              type="button"
-                              onClick={() => router.push(`/project/${workspaces[0]?._id}/members`)}
-                              className='text-sm bg-mineshaft w-max px-1.5 py-0.5 hover:bg-primary duration-200 hover:text-black cursor-pointer rounded-sm'
-                            >
-                              <FontAwesomeIcon icon={faPlus} className="mr-1" />
-                              Add to projects
-                            </button>}
+                          <div className="flex flex-row">
+                            {(status === "invited" || status === "verified") &&
+                            serverDetails?.emailConfigured ? (
+                              <Tag colorSchema="red">
+                                This user hasn&apos;t accepted the invite yet
+                              </Tag>
+                            ) : (
+                              <Tag colorSchema="red">
+                                This user isn&apos;t part of any projects yet
+                              </Tag>
+                            )}
+                            {router.query.id !== "undefined" &&
+                              !(
+                                (status === "invited" || status === "verified") &&
+                                serverDetails?.emailConfigured
+                              ) && (
+                                <button
+                                  type="button"
+                                  onClick={() =>
+                                    router.push(`/project/${workspaces[0]?._id}/members`)
+                                  }
+                                  className="w-max cursor-pointer rounded-sm bg-mineshaft px-1.5 py-0.5 text-sm duration-200 hover:bg-primary hover:text-black"
+                                >
+                                  <FontAwesomeIcon icon={faPlus} className="mr-1" />
+                                  Add to projects
+                                </button>
+                              )}
                           </div>
                         )}
                       </Td>
@@ -282,67 +311,73 @@ export const OrgMembersTable = ({
         isOpen={popUp?.addMember?.isOpen}
         onOpenChange={(isOpen) => {
           handlePopUpToggle("addMember", isOpen);
-          setCompleteInviteLink(undefined) 
+          setCompleteInviteLink(undefined);
         }}
       >
         <ModalContent
           title={`Invite others to ${orgName}`}
           subTitle={
             <div>
-              {!completeInviteLink && <div>
-                An invite is specific to an email address and expires after 1 day.
-                <br />
-                For security reasons, you will need to separately add members to projects.
-              </div>}
-              {completeInviteLink && "This Infisical instance does not have a email provider setup. Please share this invite link with the invitee manually"}
+              {!completeInviteLink && (
+                <div>
+                  An invite is specific to an email address and expires after 1 day.
+                  <br />
+                  For security reasons, you will need to separately add members to projects.
+                </div>
+              )}
+              {completeInviteLink &&
+                "This Infisical instance does not have a email provider setup. Please share this invite link with the invitee manually"}
             </div>
           }
         >
-          {!completeInviteLink && <form onSubmit={handleSubmit(onAddMember)} >
-            <Controller
-              control={control}
-              defaultValue=""
-              name="email"
-              render={({ field, fieldState: { error } }) => (
-                <FormControl label="Email" isError={Boolean(error)} errorText={error?.message}>
-                  <Input {...field} />
-                </FormControl>
-              )}
-            />
-            <div className="mt-8 flex items-center">
-              <Button
-                className="mr-4"
-                size="sm"
-                type="submit"
-                isLoading={isSubmitting}
-                isDisabled={isSubmitting}
-              >
-                Add Member
-              </Button>
-              <Button
-                colorSchema="secondary"
-                variant="plain"
-                onClick={() => handlePopUpClose("addMember")}
-              >
-                Cancel
-              </Button>
-            </div>
-          </form>}
-          {
-            completeInviteLink && 
+          {!completeInviteLink && (
+            <form onSubmit={handleSubmit(onAddMember)}>
+              <Controller
+                control={control}
+                defaultValue=""
+                name="email"
+                render={({ field, fieldState: { error } }) => (
+                  <FormControl label="Email" isError={Boolean(error)} errorText={error?.message}>
+                    <Input {...field} />
+                  </FormControl>
+                )}
+              />
+              <div className="mt-8 flex items-center">
+                <Button
+                  className="mr-4"
+                  size="sm"
+                  type="submit"
+                  isLoading={isSubmitting}
+                  isDisabled={isSubmitting}
+                >
+                  Add Member
+                </Button>
+                <Button
+                  colorSchema="secondary"
+                  variant="plain"
+                  onClick={() => handlePopUpClose("addMember")}
+                >
+                  Cancel
+                </Button>
+              </div>
+            </form>
+          )}
+          {completeInviteLink && (
             <div className="mt-2 mb-3 mr-2 flex items-center justify-end rounded-md bg-white/[0.07] p-2 text-base text-gray-400">
-            <p className="mr-4 break-all">{completeInviteLink}</p>
-            <IconButton
-              ariaLabel="copy icon"
-              colorSchema="secondary"
-              className="group relative"
-              onClick={copyTokenToClipboard}
-            >
-              <FontAwesomeIcon icon={isInviteLinkCopied ? faCheck : faCopy} />
-              <span className="absolute -left-8 -top-20 hidden w-28 translate-y-full rounded-md bg-bunker-800 py-2 pl-3 text-center text-sm text-gray-400 group-hover:flex group-hover:animate-fadeIn">click to copy</span>
-            </IconButton>
-          </div>
-          }
+              <p className="mr-4 break-all">{completeInviteLink}</p>
+              <IconButton
+                ariaLabel="copy icon"
+                colorSchema="secondary"
+                className="group relative"
+                onClick={copyTokenToClipboard}
+              >
+                <FontAwesomeIcon icon={isInviteLinkCopied ? faCheck : faCopy} />
+                <span className="absolute -left-8 -top-20 hidden w-28 translate-y-full rounded-md bg-bunker-800 py-2 pl-3 text-center text-sm text-gray-400 group-hover:flex group-hover:animate-fadeIn">
+                  click to copy
+                </span>
+              </IconButton>
+            </div>
+          )}
         </ModalContent>
       </Modal>
       <DeleteActionModal
@@ -363,4 +398,4 @@ export const OrgMembersTable = ({
       />
     </div>
   );
-};
+};

frontend/src/views/Org/MembersPage/components/OrgServiceAccountsTable/OrgServiceAccountsTable.tsx

@@ -1,14 +1,15 @@
-import { useEffect, useMemo,useState } from "react";
-import { Controller,useForm } from "react-hook-form";
+import { useEffect, useMemo, useState } from "react";
+import { Controller, useForm } from "react-hook-form";
 import { useRouter } from "next/router";
-import { 
-    faCheck, 
-    faCopy, 
-    faMagnifyingGlass, 
-    faPencil,
-    faPlus, 
-    faServer, 
-    faTrash} from "@fortawesome/free-solid-svg-icons";
+import {
+  faCheck,
+  faCopy,
+  faMagnifyingGlass,
+  faPencil,
+  faPlus,
+  faServer,
+  faTrash
+} from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { yupResolver } from "@hookform/resolvers/yup";
 import * as yup from "yup";
@@ -37,9 +38,10 @@ import {
 import { useOrganization, useWorkspace } from "@app/context";
 import { usePopUp, useToggle } from "@app/hooks";
 import {
-    useCreateServiceAccount,
-    useDeleteServiceAccount,
-    useGetServiceAccounts} from "@app/hooks/api";
+  useCreateServiceAccount,
+  useDeleteServiceAccount,
+  useGetServiceAccounts
+} from "@app/hooks/api";
 
 const serviceAccountExpiration = [
   { label: "1 Day", value: 86400 },
@@ -51,317 +53,315 @@ const serviceAccountExpiration = [
 ];
 
 const addServiceAccountFormSchema = yup.object({
-    name: yup.string().required().label("Name").trim(),
-    expiresIn: yup.string().required().label("Service Account Expiration")
+  name: yup.string().required().label("Name").trim(),
+  expiresIn: yup.string().required().label("Service Account Expiration")
 });
 
 type TAddServiceAccountForm = yup.InferType<typeof addServiceAccountFormSchema>;
 
 export const OrgServiceAccountsTable = () => {
-    const router = useRouter();
-    const { currentOrg } = useOrganization();
-    const { currentWorkspace } = useWorkspace();
-    
-    const orgId = currentOrg?._id || "";
-    const [step, setStep] = useState(0);
-    const [isAccessKeyCopied, setIsAccessKeyCopied] = useToggle(false);
-    const [isPublicKeyCopied, setIsPublicKeyCopied] = useToggle(false);
-    const [isPrivateKeyCopied, setIsPrivateKeyCopied] = useToggle(false);
-    const [accessKey, setAccessKey] = useState("");
-    const [publicKey, setPublicKey] = useState("");
-    const [privateKey, setPrivateKey] = useState("");
-    const [searchServiceAccountFilter, setSearchServiceAccountFilter] = useState("");
-    const { handlePopUpToggle, popUp, handlePopUpOpen, handlePopUpClose } = usePopUp([
-        "addServiceAccount",
-        "removeServiceAccount",
-    ] as const);
+  const router = useRouter();
+  const { currentOrg } = useOrganization();
+  const { currentWorkspace } = useWorkspace();
 
-    const { data: serviceAccounts = [], isLoading: isServiceAccountsLoading } = useGetServiceAccounts(orgId);
-    
-    const createServiceAccount = useCreateServiceAccount();
-    const removeServiceAccount = useDeleteServiceAccount();
-    
-    useEffect(() => {
-        let timer: NodeJS.Timeout;
-        if (isAccessKeyCopied) {
-            timer = setTimeout(() => setIsAccessKeyCopied.off(), 2000);
-        }
+  const orgId = currentOrg?._id || "";
+  const [step, setStep] = useState(0);
+  const [isAccessKeyCopied, setIsAccessKeyCopied] = useToggle(false);
+  const [isPublicKeyCopied, setIsPublicKeyCopied] = useToggle(false);
+  const [isPrivateKeyCopied, setIsPrivateKeyCopied] = useToggle(false);
+  const [accessKey, setAccessKey] = useState("");
+  const [publicKey, setPublicKey] = useState("");
+  const [privateKey, setPrivateKey] = useState("");
+  const [searchServiceAccountFilter, setSearchServiceAccountFilter] = useState("");
+  const { handlePopUpToggle, popUp, handlePopUpOpen, handlePopUpClose } = usePopUp([
+    "addServiceAccount",
+    "removeServiceAccount"
+  ] as const);
 
-        if (isPublicKeyCopied) {
-            timer = setTimeout(() => setIsPublicKeyCopied.off(), 2000);
-        }
+  const { data: serviceAccounts = [], isLoading: isServiceAccountsLoading } =
+    useGetServiceAccounts(orgId);
 
-        if (isPrivateKeyCopied) {
-            timer = setTimeout(() => setIsPrivateKeyCopied.off(), 2000);
-        }
+  const createServiceAccount = useCreateServiceAccount();
+  const removeServiceAccount = useDeleteServiceAccount();
 
-        return () => clearTimeout(timer);
-    }, [isAccessKeyCopied, isPublicKeyCopied, isPrivateKeyCopied]);
-
-    const {
-        control,
-        handleSubmit,
-        reset,
-        formState: { isSubmitting }
-    } = useForm<TAddServiceAccountForm>({ resolver: yupResolver(addServiceAccountFormSchema) });
-    
-    const onAddServiceAccount = async ({ name, expiresIn }: TAddServiceAccountForm) => {
-        if (!currentOrg?._id) return;
-
-        const keyPair = generateKeyPair();
-        setPublicKey(keyPair.publicKey);
-        setPrivateKey(keyPair.privateKey);
-        
-        const serviceAccountDetails = await createServiceAccount.mutateAsync({
-            name,
-            organizationId: currentOrg?._id,
-            publicKey: keyPair.publicKey,
-            expiresIn: Number(expiresIn)
-        });
-        
-        setAccessKey(serviceAccountDetails.serviceAccountAccessKey);
-
-        setStep(1);
-        reset();
+  useEffect(() => {
+    let timer: NodeJS.Timeout;
+    if (isAccessKeyCopied) {
+      timer = setTimeout(() => setIsAccessKeyCopied.off(), 2000);
     }
-    
-    const onRemoveServiceAccount = async () => {
-        const serviceAccountId = (popUp?.removeServiceAccount?.data as { _id: string })?._id;
-        await removeServiceAccount.mutateAsync(serviceAccountId);
-        handlePopUpClose("removeServiceAccount");
+
+    if (isPublicKeyCopied) {
+      timer = setTimeout(() => setIsPublicKeyCopied.off(), 2000);
     }
-    
-    const filteredServiceAccounts = useMemo(
-        () =>
-            serviceAccounts.filter(
-                ({ name }) =>
-                    name.toLowerCase().includes(searchServiceAccountFilter)
-            ),
-        [serviceAccounts, searchServiceAccountFilter]
-    );
-    
-    const renderStep = (stepToRender: number) => {
-        switch (stepToRender) {
-            case 0:
-                return (
-                   <form onSubmit={handleSubmit(onAddServiceAccount)}>
-                        <Controller
-                            control={control}
-                            defaultValue=""
-                            name="name"
-                            render={({ field, fieldState: { error } }) => (
-                                <FormControl label="Name" isError={Boolean(error)} errorText={error?.message}>
-                                <Input {...field} />
-                                </FormControl>
-                            )}
-                        />
-                        <Controller
-                            control={control}
-                            name="expiresIn"
-                            defaultValue={String(serviceAccountExpiration?.[0]?.value)}
-                            render={({ field: { onChange, ...field }, fieldState: { error } }) => {
-                                return (
-                                    <FormControl
-                                        label="Expiration"
-                                        errorText={error?.message}
-                                        isError={Boolean(error)}
-                                    >
-                                        <Select
-                                            defaultValue={field.value}
-                                            {...field}
-                                            onValueChange={(e) => onChange(e)}
-                                            className="w-full"
-                                        >
-                                        {serviceAccountExpiration.map(({ label, value }) => (
-                                            <SelectItem value={String(value)} key={label}>
-                                                {label}
-                                            </SelectItem>
-                                        ))}
-                                        </Select>
-                                    </FormControl>
-                                );
-                            }}
-                        />
-                        <div className="mt-8 flex items-center">
-                            <Button
-                                className="mr-4"
-                                size="sm"
-                                type="submit"
-                                isLoading={isSubmitting}
-                                isDisabled={isSubmitting}
-                            >
-                                Create Service Account
-                            </Button>
-                            <Button
-                                colorSchema="secondary"
-                                variant="plain"
-                                onClick={() => handlePopUpClose("addServiceAccount")}
-                            >
-                                Cancel
-                            </Button>
-                        </div>
-                    </form> 
-                );
-            case 1:
-                return (
-                    <>
-                        <p>Access Key</p>
-                        <div className="flex items-center justify-end rounded-md p-2 text-base text-gray-400 bg-white/[0.07]">
-                            <p className="mr-4 break-all">{accessKey}</p>
-                            <IconButton
-                                ariaLabel="copy icon"
-                                colorSchema="secondary"
-                                className="group relative"
-                                onClick={() => {
-                                    navigator.clipboard.writeText(accessKey);
-                                    setIsAccessKeyCopied.on();
-                                }}
-                            >
-                                <FontAwesomeIcon icon={isAccessKeyCopied ? faCheck : faCopy} />
-                                <span className="absolute -left-8 -top-20 hidden w-28 translate-y-full rounded-md bg-bunker-800 py-2 pl-3 text-center text-sm text-gray-400 group-hover:flex group-hover:animate-fadeIn">
-                                    Copy
-                                </span>
-                            </IconButton>
-                        </div>
-                        <p className="mt-4">Public Key</p>
-                        <div className="flex items-center justify-end rounded-md p-2 text-base text-gray-400 bg-white/[0.07]">
-                            <p className="mr-4 break-all">{publicKey}</p>
-                            <IconButton
-                                ariaLabel="copy icon"
-                                colorSchema="secondary"
-                                className="group relative"
-                                onClick={() => {
-                                    navigator.clipboard.writeText(publicKey);
-                                    setIsPublicKeyCopied.on();
-                                }}
-                            >
-                                <FontAwesomeIcon icon={isPublicKeyCopied ? faCheck : faCopy} />
-                                <span className="absolute -left-8 -top-20 hidden w-28 translate-y-full rounded-md bg-bunker-800 py-2 pl-3 text-center text-sm text-gray-400 group-hover:flex group-hover:animate-fadeIn">
-                                    Copy
-                                </span>
-                            </IconButton>
-                        </div>
-                        <p className="mt-4">Private Key</p>
-                        <div className="flex items-center justify-end rounded-md p-2 text-base text-gray-400 bg-white/[0.07]">
-                            <p className="mr-4 break-all">{privateKey}</p>
-                            <IconButton
-                                ariaLabel="copy icon"
-                                colorSchema="secondary"
-                                className="group relative"
-                                onClick={() => {
-                                    navigator.clipboard.writeText(privateKey);
-                                    setIsPrivateKeyCopied.on();
-                                }}
-                            >
-                                <FontAwesomeIcon icon={isPrivateKeyCopied ? faCheck : faCopy} />
-                                <span className="absolute -left-8 -top-20 hidden w-28 translate-y-full rounded-md bg-bunker-800 py-2 pl-3 text-center text-sm text-gray-400 group-hover:flex group-hover:animate-fadeIn">
-                                    Copy
-                                </span>
-                            </IconButton>
-                        </div>
-                        
-                    </>
-                );
-            default:
-                return <div />
-        }
+
+    if (isPrivateKeyCopied) {
+      timer = setTimeout(() => setIsPrivateKeyCopied.off(), 2000);
     }
-    
-    return (
-        <div className="w-full">
-            <div className="mb-4 flex">
-                <div className="mr-4 flex-1">
-                    <Input 
-                        value={searchServiceAccountFilter}
-                        onChange={(e) => setSearchServiceAccountFilter(e.target.value)}
-                        leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
-                        placeholder="Search service accounts..."
-                    />
-                </div>
-                <Button
-                    leftIcon={<FontAwesomeIcon icon={faPlus} />}
-                    onClick={() => {
-                        setStep(0);
-                        reset();
-                        handlePopUpOpen("addServiceAccount");
-                    }}
-                >
-                    Add Service Account
-                </Button>
-            </div>
-            <TableContainer>
-                <Table>
-                    <THead>
-                        <Th>Name</Th>
-                        <Th className="w-full">Valid Until</Th>
-                        <Th aria-label="actions" />
-                    </THead>
-                    <TBody>
-                        {isServiceAccountsLoading && <TableSkeleton columns={5} key="org-service-accounts" />}
-                        {!isServiceAccountsLoading && (
-                            filteredServiceAccounts.map(({
-                                name, 
-                                expiresAt, 
-                                _id: serviceAccountId 
-                            }) => {
-                                return (
-                                    <Tr key={`org-service-account-${serviceAccountId}`}>
-                                        <Td>{name}</Td>
-                                        <Td>{new Date(expiresAt).toUTCString()}</Td>
-                                        <Td>
-                                            <div className="flex">
-                                                <IconButton
-                                                    ariaLabel="edit"
-                                                    colorSchema="secondary"
-                                                    onClick={() => {
-                                                        if (currentWorkspace?._id) {
-                                                            router.push(`/settings/org/${currentWorkspace._id}/service-accounts/${serviceAccountId}`);
-                                                        }
-                                                    }}
-                                                    className="mr-2"
-                                                >
-                                                    <FontAwesomeIcon icon={faPencil} />
-                                                </IconButton>
-                                                <IconButton
-                                                    ariaLabel="delete"
-                                                    colorSchema="danger"
-                                                    onClick={() => handlePopUpOpen("removeServiceAccount", { _id: serviceAccountId })}
-                                                >
-                                                    <FontAwesomeIcon icon={faTrash} />
-                                                </IconButton>
-                                            </div>
-                                        </Td>
-                                    </Tr>
-                                );
-                            })
-                        )}
-                    </TBody>
-                </Table>
-                {!isServiceAccountsLoading && filteredServiceAccounts?.length === 0 && (
-                    <EmptyState title="No service accounts found" icon={faServer} />
-                )}
-            </TableContainer>
-            <Modal
-                isOpen={popUp?.addServiceAccount?.isOpen}
-                onOpenChange={(isOpen) => {
-                    handlePopUpToggle("addServiceAccount", isOpen);
-                    reset();
-                }}
-            >
-                <ModalContent
-                    title="Add Service Account"
-                    subTitle="A service account represents a machine identity such as a VM or application client."
-                >
-                    {renderStep(step)}
-                </ModalContent>
-            </Modal>
-            <DeleteActionModal
-                isOpen={popUp.removeServiceAccount.isOpen}
-                deleteKey="remove"
-                title="Do you want to remove this service account from the org?"
-                onChange={(isOpen) => handlePopUpToggle("removeServiceAccount", isOpen)}
-                onDeleteApproved={onRemoveServiceAccount}
+
+    return () => clearTimeout(timer);
+  }, [isAccessKeyCopied, isPublicKeyCopied, isPrivateKeyCopied]);
+
+  const {
+    control,
+    handleSubmit,
+    reset,
+    formState: { isSubmitting }
+  } = useForm<TAddServiceAccountForm>({ resolver: yupResolver(addServiceAccountFormSchema) });
+
+  const onAddServiceAccount = async ({ name, expiresIn }: TAddServiceAccountForm) => {
+    if (!currentOrg?._id) return;
+
+    const keyPair = generateKeyPair();
+    setPublicKey(keyPair.publicKey);
+    setPrivateKey(keyPair.privateKey);
+
+    const serviceAccountDetails = await createServiceAccount.mutateAsync({
+      name,
+      organizationId: currentOrg?._id,
+      publicKey: keyPair.publicKey,
+      expiresIn: Number(expiresIn)
+    });
+
+    setAccessKey(serviceAccountDetails.serviceAccountAccessKey);
+
+    setStep(1);
+    reset();
+  };
+
+  const onRemoveServiceAccount = async () => {
+    const serviceAccountId = (popUp?.removeServiceAccount?.data as { _id: string })?._id;
+    await removeServiceAccount.mutateAsync(serviceAccountId);
+    handlePopUpClose("removeServiceAccount");
+  };
+
+  const filteredServiceAccounts = useMemo(
+    () =>
+      serviceAccounts.filter(({ name }) => name.toLowerCase().includes(searchServiceAccountFilter)),
+    [serviceAccounts, searchServiceAccountFilter]
+  );
+
+  const renderStep = (stepToRender: number) => {
+    switch (stepToRender) {
+      case 0:
+        return (
+          <form onSubmit={handleSubmit(onAddServiceAccount)}>
+            <Controller
+              control={control}
+              defaultValue=""
+              name="name"
+              render={({ field, fieldState: { error } }) => (
+                <FormControl label="Name" isError={Boolean(error)} errorText={error?.message}>
+                  <Input {...field} />
+                </FormControl>
+              )}
             />
+            <Controller
+              control={control}
+              name="expiresIn"
+              defaultValue={String(serviceAccountExpiration?.[0]?.value)}
+              render={({ field: { onChange, ...field }, fieldState: { error } }) => {
+                return (
+                  <FormControl
+                    label="Expiration"
+                    errorText={error?.message}
+                    isError={Boolean(error)}
+                  >
+                    <Select
+                      defaultValue={field.value}
+                      {...field}
+                      onValueChange={(e) => onChange(e)}
+                      className="w-full"
+                    >
+                      {serviceAccountExpiration.map(({ label, value }) => (
+                        <SelectItem value={String(value)} key={label}>
+                          {label}
+                        </SelectItem>
+                      ))}
+                    </Select>
+                  </FormControl>
+                );
+              }}
+            />
+            <div className="mt-8 flex items-center">
+              <Button
+                className="mr-4"
+                size="sm"
+                type="submit"
+                isLoading={isSubmitting}
+                isDisabled={isSubmitting}
+              >
+                Create Service Account
+              </Button>
+              <Button
+                colorSchema="secondary"
+                variant="plain"
+                onClick={() => handlePopUpClose("addServiceAccount")}
+              >
+                Cancel
+              </Button>
+            </div>
+          </form>
+        );
+      case 1:
+        return (
+          <>
+            <p>Access Key</p>
+            <div className="flex items-center justify-end rounded-md bg-white/[0.07] p-2 text-base text-gray-400">
+              <p className="mr-4 break-all">{accessKey}</p>
+              <IconButton
+                ariaLabel="copy icon"
+                colorSchema="secondary"
+                className="group relative"
+                onClick={() => {
+                  navigator.clipboard.writeText(accessKey);
+                  setIsAccessKeyCopied.on();
+                }}
+              >
+                <FontAwesomeIcon icon={isAccessKeyCopied ? faCheck : faCopy} />
+                <span className="absolute -left-8 -top-20 hidden w-28 translate-y-full rounded-md bg-bunker-800 py-2 pl-3 text-center text-sm text-gray-400 group-hover:flex group-hover:animate-fadeIn">
+                  Copy
+                </span>
+              </IconButton>
+            </div>
+            <p className="mt-4">Public Key</p>
+            <div className="flex items-center justify-end rounded-md bg-white/[0.07] p-2 text-base text-gray-400">
+              <p className="mr-4 break-all">{publicKey}</p>
+              <IconButton
+                ariaLabel="copy icon"
+                colorSchema="secondary"
+                className="group relative"
+                onClick={() => {
+                  navigator.clipboard.writeText(publicKey);
+                  setIsPublicKeyCopied.on();
+                }}
+              >
+                <FontAwesomeIcon icon={isPublicKeyCopied ? faCheck : faCopy} />
+                <span className="absolute -left-8 -top-20 hidden w-28 translate-y-full rounded-md bg-bunker-800 py-2 pl-3 text-center text-sm text-gray-400 group-hover:flex group-hover:animate-fadeIn">
+                  Copy
+                </span>
+              </IconButton>
+            </div>
+            <p className="mt-4">Private Key</p>
+            <div className="flex items-center justify-end rounded-md bg-white/[0.07] p-2 text-base text-gray-400">
+              <p className="mr-4 break-all">{privateKey}</p>
+              <IconButton
+                ariaLabel="copy icon"
+                colorSchema="secondary"
+                className="group relative"
+                onClick={() => {
+                  navigator.clipboard.writeText(privateKey);
+                  setIsPrivateKeyCopied.on();
+                }}
+              >
+                <FontAwesomeIcon icon={isPrivateKeyCopied ? faCheck : faCopy} />
+                <span className="absolute -left-8 -top-20 hidden w-28 translate-y-full rounded-md bg-bunker-800 py-2 pl-3 text-center text-sm text-gray-400 group-hover:flex group-hover:animate-fadeIn">
+                  Copy
+                </span>
+              </IconButton>
+            </div>
+          </>
+        );
+      default:
+        return <div />;
+    }
+  };
+
+  return (
+    <div className="w-full">
+      <div className="mb-4 flex">
+        <div className="mr-4 flex-1">
+          <Input
+            value={searchServiceAccountFilter}
+            onChange={(e) => setSearchServiceAccountFilter(e.target.value)}
+            leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
+            placeholder="Search service accounts..."
+          />
         </div>
-    );
-}
+        <Button
+          leftIcon={<FontAwesomeIcon icon={faPlus} />}
+          onClick={() => {
+            setStep(0);
+            reset();
+            handlePopUpOpen("addServiceAccount");
+          }}
+        >
+          Add Service Account
+        </Button>
+      </div>
+      <TableContainer>
+        <Table>
+          <THead>
+            <Th>Name</Th>
+            <Th className="w-full">Valid Until</Th>
+            <Th aria-label="actions" />
+          </THead>
+          <TBody>
+            {isServiceAccountsLoading && (
+              <TableSkeleton columns={5} innerKey="org-service-accounts" />
+            )}
+            {!isServiceAccountsLoading &&
+              filteredServiceAccounts.map(({ name, expiresAt, _id: serviceAccountId }) => {
+                return (
+                  <Tr key={`org-service-account-${serviceAccountId}`}>
+                    <Td>{name}</Td>
+                    <Td>{new Date(expiresAt).toUTCString()}</Td>
+                    <Td>
+                      <div className="flex">
+                        <IconButton
+                          ariaLabel="edit"
+                          colorSchema="secondary"
+                          onClick={() => {
+                            if (currentWorkspace?._id) {
+                              router.push(
+                                `/settings/org/${currentWorkspace._id}/service-accounts/${serviceAccountId}`
+                              );
+                            }
+                          }}
+                          className="mr-2"
+                        >
+                          <FontAwesomeIcon icon={faPencil} />
+                        </IconButton>
+                        <IconButton
+                          ariaLabel="delete"
+                          colorSchema="danger"
+                          onClick={() =>
+                            handlePopUpOpen("removeServiceAccount", { _id: serviceAccountId })
+                          }
+                        >
+                          <FontAwesomeIcon icon={faTrash} />
+                        </IconButton>
+                      </div>
+                    </Td>
+                  </Tr>
+                );
+              })}
+          </TBody>
+        </Table>
+        {!isServiceAccountsLoading && filteredServiceAccounts?.length === 0 && (
+          <EmptyState title="No service accounts found" icon={faServer} />
+        )}
+      </TableContainer>
+      <Modal
+        isOpen={popUp?.addServiceAccount?.isOpen}
+        onOpenChange={(isOpen) => {
+          handlePopUpToggle("addServiceAccount", isOpen);
+          reset();
+        }}
+      >
+        <ModalContent
+          title="Add Service Account"
+          subTitle="A service account represents a machine identity such as a VM or application client."
+        >
+          {renderStep(step)}
+        </ModalContent>
+      </Modal>
+      <DeleteActionModal
+        isOpen={popUp.removeServiceAccount.isOpen}
+        deleteKey="remove"
+        title="Do you want to remove this service account from the org?"
+        onChange={(isOpen) => handlePopUpToggle("removeServiceAccount", isOpen)}
+        onDeleteApproved={onRemoveServiceAccount}
+      />
+    </div>
+  );
+};

frontend/src/views/Project/IPAllowListPage/components/IPAllowlistTable.tsx

@@ -138,7 +138,7 @@ export const IPAllowlistTable = ({
                                 </Tr>
                             );
                         })}
-                        {isLoading && <TableSkeleton columns={4} key="ip-access-ranges" />}
+                        {isLoading && <TableSkeleton innerKey="ip-access-table" columns={4} key="ip-access-ranges" />}
                         {!isLoading && data && data?.length === 0 && (
                             <Tr>
                                 <Td colSpan={5}>

frontend/src/views/SecretOverviewPage/SecretOverviewPage.tsx

@@ -0,0 +1,348 @@
+import { useEffect, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { useRouter } from "next/router";
+import { faMagnifyingGlass } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+
+import { useNotificationContext } from "@app/components/context/Notifications/NotificationProvider";
+import NavHeader from "@app/components/navigation/NavHeader";
+import {
+  Button,
+  Input,
+  Table,
+  TableContainer,
+  TableSkeleton,
+  TBody,
+  Td,
+  Th,
+  THead,
+  Tooltip,
+  Tr
+} from "@app/components/v2";
+import { useOrganization, useWorkspace } from "@app/context";
+import {
+  useCreateSecretV3,
+  useDeleteSecretV3,
+  useGetFoldersByEnv,
+  useGetProjectSecretsAllEnv,
+  useGetUserWsEnvironments,
+  useGetUserWsKey,
+  useUpdateSecretV3
+} from "@app/hooks/api";
+
+import { FolderBreadCrumbs } from "./components/FolderBreadCrumbs";
+import { SecretOverviewFolderRow } from "./components/SecretOverviewFolderRow";
+import { SecretOverviewTableRow } from "./components/SecretOverviewTableRow";
+
+export const SecretOverviewPage = () => {
+  const { t } = useTranslation();
+  const { createNotification } = useNotificationContext();
+  const router = useRouter();
+
+  // this is to set expandable table width
+  // coz when overflow the table goes to the right
+  const parentTableRef = useRef<HTMLTableElement>(null);
+  const [expandableTableWidth, setExpandableTableWidth] = useState(0);
+
+  useEffect(() => {
+    const handleParentTableWidthResize = () => {
+      setExpandableTableWidth(parentTableRef.current?.clientWidth || 0);
+    };
+
+    window.addEventListener("resize", handleParentTableWidthResize);
+    return () => window.removeEventListener("resize", handleParentTableWidthResize);
+  }, []);
+
+  useEffect(() => {
+    if (parentTableRef.current) {
+      setExpandableTableWidth(parentTableRef.current.clientWidth);
+    }
+  }, [parentTableRef.current]);
+
+  const { currentWorkspace, isLoading: isWorkspaceLoading } = useWorkspace();
+  const { currentOrg } = useOrganization();
+  const workspaceId = currentWorkspace?._id as string;
+  const { data: latestFileKey } = useGetUserWsKey(workspaceId);
+  const [searchFilter, setSearchFilter] = useState("");
+  const secretPath = router.query?.secretPath as string;
+
+  useEffect(() => {
+    if (!isWorkspaceLoading && !workspaceId && router.isReady) {
+      router.push(`/org/${currentOrg?._id}/overview`);
+    }
+  }, [isWorkspaceLoading, workspaceId, router.isReady]);
+
+  const { data: wsEnv, isLoading: isEnvListLoading } = useGetUserWsEnvironments({
+    workspaceId
+  });
+
+  const userAvailableEnvs = wsEnv?.filter(({ isReadDenied }) => !isReadDenied) || [];
+
+  const {
+    data: secrets,
+    getSecretByKey,
+    secKeys,
+    getEnvSecretKeyCount
+  } = useGetProjectSecretsAllEnv({
+    workspaceId,
+    envs: userAvailableEnvs.map(({ slug }) => slug),
+    secretPath,
+    decryptFileKey: latestFileKey!
+  });
+  const { folders, folderNames, isFolderPresentInEnv } = useGetFoldersByEnv({
+    workspaceId,
+    environments: userAvailableEnvs.map(({ slug }) => slug),
+    parentFolderPath: secretPath
+  });
+
+  const { mutateAsync: createSecretV3 } = useCreateSecretV3();
+  const { mutateAsync: updateSecretV3 } = useUpdateSecretV3();
+  const { mutateAsync: deleteSecretV3 } = useDeleteSecretV3();
+
+  const handleSecretCreate = async (env: string, key: string, value: string) => {
+    try {
+      await createSecretV3({
+        environment: env,
+        workspaceId,
+        secretPath,
+        secretName: key,
+        secretValue: value,
+        secretComment: "",
+        type: "shared",
+        latestFileKey: latestFileKey!
+      });
+      createNotification({
+        type: "success",
+        text: "Successfully created secret"
+      });
+    } catch (error) {
+      console.log(error);
+      createNotification({
+        type: "error",
+        text: "Failed to create secret"
+      });
+    }
+  };
+
+  const handleSecretUpdate = async (env: string, key: string, value: string) => {
+    try {
+      await updateSecretV3({
+        environment: env,
+        workspaceId,
+        secretPath,
+        secretName: key,
+        secretValue: value,
+        type: "shared",
+        latestFileKey: latestFileKey!
+      });
+      createNotification({
+        type: "success",
+        text: "Successfully updated secret"
+      });
+    } catch (error) {
+      console.log(error);
+      createNotification({
+        type: "error",
+        text: "Failed to update secret"
+      });
+    }
+  };
+
+  const handleSecretDelete = async (env: string, key: string) => {
+    try {
+      await deleteSecretV3({
+        environment: env,
+        workspaceId,
+        secretPath,
+        secretName: key,
+        type: "shared"
+      });
+      createNotification({
+        type: "success",
+        text: "Successfully deleted secret"
+      });
+    } catch (error) {
+      console.log(error);
+      createNotification({
+        type: "error",
+        text: "Failed to delete secret"
+      });
+    }
+  };
+
+  const handleResetSearch = () => setSearchFilter("");
+
+  const handleFolderClick = (path: string) => {
+    router.push({
+      pathname: router.pathname,
+      query: {
+        ...router.query,
+        secretPath: `${router.query?.secretPath || ""}/${path}`
+      }
+    });
+  };
+
+  const handleExploreEnvClick = (slug: string) => {
+    const query: Record<string, string> = { ...router.query, env: slug };
+    delete query.secretPath;
+    // the dir return will have the present directory folder id
+    // use that when clicking on explore to redirect user to there
+    const envIndex = userAvailableEnvs.findIndex((el) => slug === el.slug);
+    if (envIndex !== -1) {
+      const envFolder = folders?.[envIndex];
+      const dir = envFolder?.data?.dir?.pop();
+      if (dir) {
+        query.folderId = dir.id;
+      }
+
+      router.push({
+        pathname: "/project/[id]/secrets/[env]",
+        query
+      });
+    }
+  };
+
+  if (isEnvListLoading) {
+    return (
+      <div className="container mx-auto flex h-screen w-full items-center justify-center px-8 text-mineshaft-50 dark:[color-scheme:dark]">
+        <img src="/images/loading/loading.gif" height={70} width={120} alt="loading animation" />
+      </div>
+    );
+  }
+
+  const isTableLoading =
+    folders?.some(({ isLoading }) => isLoading) && secrets?.some(({ isLoading }) => isLoading);
+
+  const filteredSecretNames = secKeys?.filter((name) =>
+    name.toUpperCase().includes(searchFilter.toUpperCase())
+  );
+  const filteredFolderNames = folderNames?.filter((name) =>
+    name.toLowerCase().includes(searchFilter.toLowerCase())
+  );
+
+  return (
+    <div className="container mx-auto px-6 text-mineshaft-50 dark:[color-scheme:dark]">
+      <div className="relative right-5 ml-4">
+        <NavHeader pageName={t("dashboard.title")} isProjectRelated />
+      </div>
+      <div className="mt-6">
+        <p className="text-3xl font-semibold text-bunker-100">Secrets Overview</p>
+        <p className="text-md text-bunker-300">
+          Inject your secrets using
+          <a
+            className="mx-1 text-primary/80 hover:text-primary"
+            href="https://infisical.com/docs/cli/overview"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            Infisical CLI
+          </a>
+          or
+          <a
+            className="mx-1 text-primary/80 hover:text-primary"
+            href="https://infisical.com/docs/sdks/overview"
+            target="_blank"
+            rel="noopener noreferrer"
+          >
+            Infisical SDKs
+          </a>
+        </p>
+      </div>
+      <div className="mt-8 flex items-center justify-between">
+        <FolderBreadCrumbs secretPath={secretPath} onResetSearch={handleResetSearch} />
+        <div className="w-80">
+          <Input
+            className="h-[2.3rem] bg-mineshaft-800 placeholder-mineshaft-50 duration-200 focus:bg-mineshaft-700/80"
+            placeholder="Search by secret/folder name..."
+            value={searchFilter}
+            onChange={(e) => setSearchFilter(e.target.value)}
+            leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
+          />
+        </div>
+      </div>
+      <div className="thin-scrollbar mt-4 max-h-[calc(100vh-250px)] overflow-y-auto" ref={parentTableRef}>
+        <TableContainer className="sticky top-0">
+          <Table>
+            <THead className="sticky top-0">
+              <Tr>
+                <Th className="sticky left-0 z-10 min-w-[20rem] bg-clip-padding">Name</Th>
+                {userAvailableEnvs?.map(({ name, slug }, index) => {
+                  const envSecKeyCount = getEnvSecretKeyCount(slug);
+                  const missingKeyCount = secKeys.length - envSecKeyCount;
+                  return (
+                    <Th
+                      className="min-table-row min-w-[11rem] text-center"
+                      key={`secret-overview-${name}-${index + 1}`}
+                    >
+                      <div className="flex items-center justify-center">
+                        {name}
+                        {missingKeyCount > 0 && (
+                          <Tooltip
+                            className="max-w-none lowercase"
+                            content={`${missingKeyCount} secrets missing\n compared to other environments`}
+                          >
+                            <div className="ml-2 h-[1.1rem] font-medium flex cursor-default items-center justify-center rounded-sm bg-red-600 border border-red-400 p-1 text-xs text-bunker-100">
+                              <span className="text-bunker-100">{missingKeyCount}</span>
+                            </div>
+                          </Tooltip>
+                        )}
+                      </div>
+                    </Th>
+                  );
+                })}
+              </Tr>
+            </THead>
+            <TBody>
+              {isTableLoading && (
+                <TableSkeleton
+                  columns={userAvailableEnvs.length + 1}
+                  innerKey="secret-overview-loading"
+                  rows={5}
+                  className="bg-mineshaft-700"
+                />
+              )}
+              {filteredFolderNames.map((folderName, index) => (
+                <SecretOverviewFolderRow
+                  folderName={folderName}
+                  isFolderPresentInEnv={isFolderPresentInEnv}
+                  environments={userAvailableEnvs}
+                  key={`overview-${folderName}-${index + 1}`}
+                  onClick={handleFolderClick}
+                />
+              ))}
+              {filteredSecretNames.map((key, index) => (
+                <SecretOverviewTableRow
+                  onSecretCreate={handleSecretCreate}
+                  onSecretDelete={handleSecretDelete}
+                  onSecretUpdate={handleSecretUpdate}
+                  key={`overview-${key}-${index + 1}`}
+                  environments={userAvailableEnvs}
+                  secretKey={key}
+                  getSecretByKey={getSecretByKey}
+                  expandableColWidth={expandableTableWidth}
+                />
+              ))}
+              <Tr>
+                <Td className="fixed left-0 z-10 border-x border-mineshaft-700 bg-mineshaft-800 bg-clip-padding" />
+                {userAvailableEnvs.map(({ name, slug }) => (
+                  <Td key={`explore-${name}-btn`} className=" border-x border-mineshaft-700">
+                    <div className="flex items-center justify-center">
+                      <Button
+                        size="xs"
+                        variant="outline_bg"
+                        isFullWidth
+                        onClick={() => handleExploreEnvClick(slug)}
+                      >
+                        Explore
+                      </Button>
+                    </div>
+                  </Td>
+                ))}
+              </Tr>
+            </TBody>
+          </Table>
+        </TableContainer>
+      </div>
+    </div>
+  );
+};

frontend/src/views/SecretOverviewPage/components/FolderBreadCrumbs/FolderBreadCrumbs.tsx

@@ -0,0 +1,57 @@
+import { useRouter } from "next/router";
+import { faFolderOpen } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+
+type Props = {
+  secretPath: string;
+  onResetSearch: () => void;
+};
+
+export const FolderBreadCrumbs = ({ secretPath = "/", onResetSearch }: Props) => {
+  const router = useRouter();
+
+  const onFolderCrumbClick = (index: number) => {
+    const newSecPath = secretPath.split("/").filter(Boolean).slice(0, index).join("/");
+    if (secretPath === `/${newSecPath}`) return;
+    const query = { ...router.query, secretPath: `/${newSecPath}` } as Record<string, string>;
+    // root condition
+    if (index === 0) delete query.secretPath;
+    router
+      .push({
+        pathname: router.pathname,
+        query
+      })
+      .then(() => onResetSearch());
+  };
+
+  return (
+    <div className="flex items-center space-x-2">
+      <div
+        className="breadcrumb relative z-20 border-solid border-mineshaft-600 bg-mineshaft-800 py-1 pl-5 pr-2 text-sm hover:bg-mineshaft-600"
+        onClick={() => onFolderCrumbClick(0)}
+        onKeyDown={() => null}
+        role="button"
+        tabIndex={0}
+      >
+        <FontAwesomeIcon icon={faFolderOpen} className="text-primary-700" />
+      </div>
+      {(secretPath || "")
+        .split("/")
+        .filter(Boolean)
+        .map((path, index, arr) => (
+          <div
+            key={`secret-path-${index + 1}`}
+            className={`breadcrumb relative z-20 ${
+              index + 1 === arr.length ? "cursor-default" : "cursor-pointer"
+            } border-solid border-mineshaft-600 py-1 pl-5 pr-2 text-sm text-mineshaft-200`}
+            onClick={() => onFolderCrumbClick(index + 1)}
+            onKeyDown={() => null}
+            role="button"
+            tabIndex={0}
+          >
+            {path}
+          </div>
+        ))}
+    </div>
+  );
+};

frontend/src/views/SecretOverviewPage/components/FolderBreadCrumbs/index.tsx

@@ -0,0 +1 @@
+export { FolderBreadCrumbs } from "./FolderBreadCrumbs";

frontend/src/views/SecretOverviewPage/components/SecretOverviewFolderRow/SecretOverviewFolderRow.tsx

@@ -0,0 +1,48 @@
+import { faCheck, faFolder, faXmark } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { twMerge } from "tailwind-merge";
+
+import { Td, Tr } from "@app/components/v2";
+
+type Props = {
+  folderName: string;
+  environments: { name: string; slug: string }[];
+  isFolderPresentInEnv: (name: string, env: string) => boolean;
+  onClick: (path: string) => void;
+};
+
+export const SecretOverviewFolderRow = ({
+  folderName,
+  environments = [],
+  isFolderPresentInEnv,
+  onClick
+}: Props) => {
+  return (
+    <Tr isHoverable isSelectable className="group" onClick={() => onClick(folderName)}>
+      <Td className="sticky left-0 z-10 border-x border-mineshaft-700 bg-mineshaft-800 bg-clip-padding py-2.5 group-hover:bg-mineshaft-700">
+        <div className="flex items-center space-x-5">
+          <div className="text-yellow-700">
+            <FontAwesomeIcon icon={faFolder} />
+          </div>
+          <div>{folderName}</div>
+        </div>
+      </Td>
+      {environments.map(({ slug }, i) => {
+        const isPresent = isFolderPresentInEnv(folderName, slug);
+        return (
+          <Td
+            key={`sec-overview-${slug}-${i + 1}-folder`}
+            className={twMerge(
+              "border-x border-mineshaft-700 py-3 group-hover:bg-mineshaft-700",
+              isPresent ? "text-green-600" : "text-red-600"
+            )}
+          >
+            <div className="flex justify-center">
+              <FontAwesomeIcon icon={isPresent ? faCheck : faXmark} />
+            </div>
+          </Td>
+        );
+      })}
+    </Tr>
+  );
+};

frontend/src/views/SecretOverviewPage/components/SecretOverviewFolderRow/index.tsx

@@ -0,0 +1 @@
+export { SecretOverviewFolderRow } from "./SecretOverviewFolderRow";

frontend/src/views/SecretOverviewPage/components/SecretOverviewTableRow/SecretEditRow.tsx

@@ -0,0 +1,171 @@
+import { useRef } from "react";
+import { Controller, useForm } from "react-hook-form";
+import { faCheck, faCopy, faTrash, faXmark } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+
+import { useNotificationContext } from "@app/components/context/Notifications/NotificationProvider";
+import { IconButton, SecretInput, Tooltip } from "@app/components/v2";
+import { useToggle } from "@app/hooks";
+
+type Props = {
+  defaultValue?: string | null;
+  secretName: string;
+  isCreatable?: boolean;
+  isVisible?: boolean;
+  environment: string;
+  onSecretCreate: (env: string, key: string, value: string) => Promise<void>;
+  onSecretUpdate: (env: string, key: string, value: string) => Promise<void>;
+  onSecretDelete: (env: string, key: string) => Promise<void>;
+};
+
+export const SecretEditRow = ({
+  defaultValue,
+  isCreatable,
+  onSecretUpdate,
+  secretName,
+  onSecretCreate,
+  onSecretDelete,
+  environment,
+  isVisible
+}: Props) => {
+  const {
+    handleSubmit,
+    control,
+    reset,
+    getValues,
+    formState: { isDirty, isSubmitting }
+  } = useForm({
+    values: {
+      value: defaultValue
+    }
+  });
+  const editorRef = useRef(defaultValue);
+  const [isDeleting, setIsDeleting] = useToggle();
+  const { createNotification } = useNotificationContext();
+
+  const handleFormReset = () => {
+    reset();
+    const val = getValues();
+    editorRef.current = val.value;
+  };
+
+  const handleCopySecretToClipboard = async () => {
+    const { value } = getValues();
+    if (value) {
+      try {
+        await window.navigator.clipboard.writeText(value);
+        createNotification({ type: "success", text: "Copied secret to clipboard" });
+      } catch (error) {
+        console.log(error);
+        createNotification({ type: "error", text: "Failed to copy secret to clipboard" });
+      }
+    }
+  };
+
+  const handleFormSubmit = async ({ value }: { value?: string | null }) => {
+    if ((value || value === "") && secretName) {
+      if (isCreatable) {
+        await onSecretCreate(environment, secretName, value);
+      } else {
+        await onSecretUpdate(environment, secretName, value);
+      }
+    }
+    reset({ value });
+  };
+
+  const handleDeleteSecret = async () => {
+    setIsDeleting.on();
+    try {
+      await onSecretDelete(environment, secretName);
+      reset({ value: undefined });
+      editorRef.current = undefined;
+    } finally {
+      setIsDeleting.off();
+    }
+  };
+
+  return (
+    <div className="group flex w-full cursor-text items-start space-x-2 items-center">
+      <div className="flex-grow border-r border-r-mineshaft-600 pr-2 pl-1">
+        <Controller
+          control={control}
+          name="value"
+          render={({ field: { onChange, onBlur } }) => (
+            <SecretInput
+              value={editorRef.current}
+              onChange={(val, html) => {
+                onChange(val);
+                editorRef.current = html;
+              }}
+              onBlur={(html) => {
+                editorRef.current = html;
+                onBlur();
+              }}
+              isVisible={isVisible}
+            />
+          )}
+        />
+      </div>
+      <div className="flex w-16 justify-center space-x-3 pl-2 transition-all">
+        {isDirty ? (
+          <>
+            <div>
+              <Tooltip content="save">
+                <IconButton
+                  variant="plain"
+                  ariaLabel="submit-value"
+                  className="h-full"
+                  isDisabled={isSubmitting}
+                  onClick={handleSubmit(handleFormSubmit)}
+                >
+                  <FontAwesomeIcon icon={faCheck} />
+                </IconButton>
+              </Tooltip>
+            </div>
+            <div>
+              <Tooltip content="cancel">
+                <IconButton
+                  variant="plain"
+                  ariaLabel="reset-value"
+                  className="h-full"
+                  onClick={handleFormReset}
+                  isDisabled={isSubmitting}
+                >
+                  <FontAwesomeIcon icon={faXmark} />
+                </IconButton>
+              </Tooltip>
+            </div>
+          </>
+        ) : (
+          <>
+            <div className="opacity-0 group-hover:opacity-100">
+              <Tooltip content="Copy Secret">
+                <IconButton
+                  ariaLabel="copy-value"
+                  onClick={handleCopySecretToClipboard}
+                  variant="plain"
+                  className="h-full"
+                >
+                  <FontAwesomeIcon icon={faCopy} />
+                </IconButton>
+              </Tooltip>
+            </div>
+            <div className="opacity-0 group-hover:opacity-100">
+              <Tooltip content="Delete">
+                <IconButton
+                  variant="plain"
+                  ariaLabel="delete-value"
+                  className="h-full"
+                  onClick={handleDeleteSecret}
+                  isDisabled={isDeleting}
+                >
+                  <FontAwesomeIcon icon={faTrash} />
+                </IconButton>
+              </Tooltip>
+            </div>
+          </>
+        )}
+      </div>
+    </div>
+  );
+};

frontend/src/views/SecretOverviewPage/components/SecretOverviewTableRow/SecretOverviewTableRow.tsx

@@ -0,0 +1,147 @@
+import { faCircle } from "@fortawesome/free-regular-svg-icons";
+import { faAngleDown, faCheck, faEye, faEyeSlash, faKey, faXmark } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { twMerge } from "tailwind-merge";
+
+import { Button, TableContainer, Td, Tooltip, Tr } from "@app/components/v2";
+import { useToggle } from "@app/hooks";
+import { DecryptedSecret } from "@app/hooks/api/secrets/types";
+
+import { SecretEditRow } from "./SecretEditRow";
+
+type Props = {
+  secretKey: string;
+  environments: { name: string; slug: string }[];
+  expandableColWidth: number;
+  getSecretByKey: (slug: string, key: string) => DecryptedSecret | undefined;
+  onSecretCreate: (env: string, key: string, value: string) => Promise<void>;
+  onSecretUpdate: (env: string, key: string, value: string) => Promise<void>;
+  onSecretDelete: (env: string, key: string) => Promise<void>;
+};
+
+export const SecretOverviewTableRow = ({
+  secretKey,
+  environments = [],
+  getSecretByKey,
+  onSecretUpdate,
+  onSecretCreate,
+  onSecretDelete,
+  expandableColWidth
+}: Props) => {
+  const [isFormExpanded, setIsFormExpanded] = useToggle();
+  const totalCols = environments.length + 1; // secret key row
+  const [isSecretVisible, setIsSecretVisible] = useToggle();
+
+  return (
+    <>
+      <Tr isHoverable isSelectable onClick={() => setIsFormExpanded.toggle()} className="group">
+        <Td className={`sticky left-0 py-0 px-0 z-10 bg-mineshaft-800 bg-clip-padding group-hover:bg-mineshaft-700 ${isFormExpanded && "border-t-2 border-mineshaft-500"}`}>
+          <div className="w-full h-full border-x border-mineshaft-700 py-2.5 px-5">
+            <div className="flex items-center space-x-5">
+              <div className="text-blue-300/70">
+                <FontAwesomeIcon icon={isFormExpanded ? faAngleDown : faKey} />
+              </div>
+              <div>{secretKey}</div>
+            </div>
+          </div>
+        </Td>
+        {environments.map(({ slug }, i) => {
+          const secret = getSecretByKey(slug, secretKey);
+          const isSecretPresent = Boolean(secret);
+          const isSecretEmpty = secret?.value === "";
+          return (
+            <Td
+              key={`sec-overview-${slug}-${i + 1}-value`}
+              className={twMerge(
+                "py-0 px-0 group-hover:bg-mineshaft-700",
+                isFormExpanded && "border-t-2 border-mineshaft-500",
+                isSecretPresent && !isSecretEmpty ? "text-green-600" : "",
+                isSecretPresent && isSecretEmpty ? "text-yellow" : "",
+                !isSecretPresent && !isSecretEmpty ? "text-red-600" : ""
+              )}
+            >
+              <div className="w-full h-full py-[0.85rem] px-5 border-r border-mineshaft-600">
+                <div className="flex justify-center">
+                  {!isSecretEmpty && <FontAwesomeIcon icon={isSecretPresent ? faCheck : faXmark} />}
+                  {isSecretEmpty && <Tooltip content="Empty value">
+                    <FontAwesomeIcon icon={faCircle} />
+                  </Tooltip>}
+                </div>
+              </div>
+            </Td>
+          );
+        })}
+      </Tr>
+      {isFormExpanded && (
+        <Tr>
+          <Td colSpan={totalCols} className={`px-0 py-0 ${isFormExpanded && "border-b-2 border-mineshaft-500"}`}>
+            <div
+              className="bg-bunker-600 p-2"
+              style={{
+                width: `calc(${expandableColWidth}px - 0.4rem)`,
+                // position: "sticky",
+                // left: "1.25rem",
+                // right: "1.25rem"
+              }}
+            >
+              <TableContainer>
+                <table className="secret-table">
+                  <thead>
+                    <tr className="h-10 border-b-2 border-mineshaft-600">
+                      <th
+                        style={{ padding: "0.5rem 1rem" }}
+                        className="min-table-row min-w-[11rem]"
+                      >
+                        Environment
+                      </th>
+                      <th style={{ padding: "0.5rem 1rem" }} className="border-none">Value</th>
+                      <div className="absolute top-0 right-0 w-min ml-auto mt-1 mr-1">
+                        <Button
+                          variant="outline_bg"
+                          className="p-1"
+                          leftIcon={<FontAwesomeIcon icon={isSecretVisible ? faEyeSlash : faEye} />}
+                          onClick={() => setIsSecretVisible.toggle()}
+                        >
+                          {isSecretVisible ? "Hide Values" : "Reveal Values"}
+                        </Button>
+                      </div>
+                    </tr>
+                  </thead>
+                  <tbody className="border-t-2 border-mineshaft-600">
+                    {environments.map(({ name, slug }) => {
+                      const secret = getSecretByKey(slug, secretKey);
+                      const isCreatable = !secret;
+
+                      return (
+                        <tr
+                          key={`secret-expanded-${slug}-${secretKey}`}
+                          className="hover:bg-mineshaft-700"
+                        >
+                          <td className="flex" style={{ padding: "0.25rem 1rem" }}>
+                            <div className="flex h-8 items-center">{name}</div>
+                          </td>
+                          <td className="h-8 col-span-2 w-full">
+                            <SecretEditRow
+                              isVisible={isSecretVisible}
+                              secretName={secretKey}
+                              defaultValue={secret?.value}
+                              isCreatable={isCreatable}
+                              onSecretDelete={onSecretDelete}
+                              onSecretCreate={onSecretCreate}
+                              onSecretUpdate={onSecretUpdate}
+                              environment={slug}
+                            />
+                          </td>
+                        </tr>
+                      );
+                    })}
+                  </tbody>
+                </table>
+              </TableContainer>
+            </div>
+          </Td>
+        </Tr>
+      )}
+    </>
+  );
+};

frontend/src/views/SecretOverviewPage/components/SecretOverviewTableRow/index.tsx

@@ -0,0 +1 @@
+export { SecretOverviewTableRow } from "./SecretOverviewTableRow";

frontend/src/views/SecretOverviewPage/index.tsx

@@ -0,0 +1 @@
+export { SecretOverviewPage } from "./SecretOverviewPage";

frontend/src/views/SecretScanning/components/SecretScanningLogsTable.tsx

@@ -10,90 +10,94 @@ import {
   Td,
   Th,
   THead,
-  Tr} from "@app/components/v2";
+  Tr
+} from "@app/components/v2";
 import timeSince from "@app/ee/utilities/timeSince";
-import getRisksByOrganization, { GitRisks } from "@app/pages/api/secret-scanning/getRisksByOrganization";
+import getRisksByOrganization, {
+  GitRisks
+} from "@app/pages/api/secret-scanning/getRisksByOrganization";
 
 import { RiskStatusSelection } from "./RiskStatusSelection";
 
 export const SecretScanningLogsTable = () => {
-    const [isLoading, setIsLoading] = useState(false);
-    const [gitRisks, setGitRisks] = useState<GitRisks[]>([]);
+  const [isLoading, setIsLoading] = useState(false);
+  const [gitRisks, setGitRisks] = useState<GitRisks[]>([]);
 
-    useEffect(() => {
-        const fetchRisks = async () => {
-            setIsLoading(true);
-            const risks = await getRisksByOrganization(String(localStorage.getItem("orgData.id")))
-            setGitRisks(risks);
-            setIsLoading(false);
-        }
+  useEffect(() => {
+    const fetchRisks = async () => {
+      setIsLoading(true);
+      const risks = await getRisksByOrganization(String(localStorage.getItem("orgData.id")));
+      setGitRisks(risks);
+      setIsLoading(false);
+    };
 
-        fetchRisks();
-    },[])
+    fetchRisks();
+  }, []);
 
-
-    return (
-        <TableContainer className="mt-8">
-            <Table>
-              <THead>
-                <Tr>
-                  <Th className="flex-1">Date</Th>
-                  <Th className="flex-1">Secret Type</Th>
-                  <Th className="flex-1">View Risk</Th>
-                  <Th className="flex-1">Info</Th>
-                  <Th className="flex-1">Status</Th>
-                  <Th className="flex-1">Action</Th>
-                  <Th className="w-5" />
+  return (
+    <TableContainer className="mt-8">
+      <Table>
+        <THead>
+          <Tr>
+            <Th className="flex-1">Date</Th>
+            <Th className="flex-1">Secret Type</Th>
+            <Th className="flex-1">View Risk</Th>
+            <Th className="flex-1">Info</Th>
+            <Th className="flex-1">Status</Th>
+            <Th className="flex-1">Action</Th>
+            <Th className="w-5" />
+          </Tr>
+        </THead>
+        <TBody>
+          {!isLoading &&
+            gitRisks &&
+            gitRisks?.map((risk) => {
+              return (
+                <Tr key={risk.ruleID} className="h-10">
+                  <Td>{timeSince(new Date(risk.createdAt))}</Td>
+                  <Td>{risk.ruleID}</Td>
+                  <Td>
+                    <a
+                      href={`https://github.com/${risk.repositoryFullName}/blob/${risk.commit}/${risk.file}#L${risk.startLine}-L${risk.endLine}`}
+                      target="_blank"
+                      className="text-red-500"
+                      rel="noreferrer"
+                    >
+                      View Exposed Secret
+                    </a>
+                  </Td>
+                  <Td>
+                    <div className="font-bold">
+                      <a href={`https://github.com/${risk.repositoryFullName}`}>
+                        {risk.repositoryFullName}
+                      </a>
+                    </div>
+                    <div className="text-xs">
+                      <span>{risk.file}</span>
+                      <br />
+                      <br />
+                      <span className="font-bold">{risk.author}</span>
+                      <br />
+                      <span>{risk.email}</span>
+                    </div>
+                  </Td>
+                  <Td>{risk.isResolved ? "Resolved" : "Needs Attention"}</Td>
+                  <Td>
+                    <RiskStatusSelection riskId={risk._id} currentSelection={risk.status} />
+                  </Td>
                 </Tr>
-              </THead>
-              <TBody>
-                {!isLoading && gitRisks && gitRisks?.map((risk) => {
-                    return (
-                        <Tr key={risk.ruleID} className="h-10">
-                            <Td>{timeSince(new Date(risk.createdAt))}</Td>
-                            <Td>{risk.ruleID}</Td>
-                            <Td>
-                                <a
-                                    href={`https://github.com/${risk.repositoryFullName}/blob/${risk.commit}/${risk.file}#L${risk.startLine}-L${risk.endLine}`}
-                                    target="_blank"
-                                    className="text-red-500" rel="noreferrer"
-                                >
-                                View Exposed Secret
-                                </a>
-                            </Td>
-                            <Td>
-                                <div className="font-bold">
-                                    <a href={`https://github.com/${risk.repositoryFullName}`}>
-                                        {risk.repositoryFullName}
-                                    </a>
-                                </div>
-                                <div className="text-xs">
-                                    <span>{risk.file}</span><br/>
-                                    <br/>
-                                    <span className="font-bold">{risk.author}</span><br/>
-                                    <span>{risk.email}</span>
-                                </div>    
-                            </Td>
-                            <Td>{risk.isResolved ? "Resolved" : "Needs Attention"}</Td>
-                            <Td>
-                                <RiskStatusSelection riskId={risk._id} currentSelection={risk.status}/>
-                            </Td>
-                        </Tr>
-                    );
-                })}
-                {isLoading && <TableSkeleton columns={7} key="gitRisks" />}
-                {!isLoading && gitRisks && gitRisks?.length === 0 && (
-                    <Tr>
-                        <Td colSpan={7}>
-                            <EmptyState 
-                                title="No risks detected." 
-                                icon={faCheck}
-                            />
-                        </Td>
-                    </Tr>
-                )}
-              </TBody>
-            </Table>
-        </TableContainer>
-    );
-}
+              );
+            })}
+          {isLoading && <TableSkeleton columns={7} innerKey="gitRisks" />}
+          {!isLoading && gitRisks && gitRisks?.length === 0 && (
+            <Tr>
+              <Td colSpan={7}>
+                <EmptyState title="No risks detected." icon={faCheck} />
+              </Td>
+            </Tr>
+          )}
+        </TBody>
+      </Table>
+    </TableContainer>
+  );
+};

frontend/src/views/Settings/BillingSettingsPage/components/BillingCloudTab/CurrentPlanSection.tsx

@@ -1,4 +1,4 @@
-import { faCircleCheck, faCircleXmark,faFileInvoice } from "@fortawesome/free-solid-svg-icons";
+import { faCircleCheck, faCircleXmark, faFileInvoice } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 import {
@@ -10,78 +10,63 @@ import {
   Td,
   Th,
   THead,
-  Tr} from "@app/components/v2";
+  Tr
+} from "@app/components/v2";
 import { useOrganization } from "@app/context";
-import { 
-    useGetOrgPlanTable
-} from "@app/hooks/api";
+import { useGetOrgPlanTable } from "@app/hooks/api";
 
 export const CurrentPlanSection = () => {
-    const { currentOrg } = useOrganization();
-    const { data, isLoading } = useGetOrgPlanTable(currentOrg?._id ?? "");
-    
-    const displayCell = (value: null | number | string | boolean) => {
-        if (value === null) return "-";
-        
-        if (typeof value === "boolean") {
-            if (value) return (
-                <FontAwesomeIcon 
-                    icon={faCircleCheck}
-                    color='#2ecc71'
-                />
-            );
+  const { currentOrg } = useOrganization();
+  const { data, isLoading } = useGetOrgPlanTable(currentOrg?._id ?? "");
 
-            return (
-                <FontAwesomeIcon 
-                    icon={faCircleXmark}
-                    color='#e74c3c'
-                />
-            );
-        }
-        
-        return value;
+  const displayCell = (value: null | number | string | boolean) => {
+    if (value === null) return "-";
+
+    if (typeof value === "boolean") {
+      if (value) return <FontAwesomeIcon icon={faCircleCheck} color="#2ecc71" />;
+
+      return <FontAwesomeIcon icon={faCircleXmark} color="#e74c3c" />;
     }
 
-    return (
-        <div className="p-4 bg-mineshaft-900 mb-6 rounded-lg border border-mineshaft-600">
-            <h2 className="text-xl font-semibold flex-1 text-white mb-8">Current Usage</h2>
-            <TableContainer className="mt-4">
-                <Table>
-                <THead>
-                    <Tr>
-                    <Th className="w-1/3">Feature</Th>
-                    <Th className="w-1/3">Allowed</Th>
-                    <Th className="w-1/3">Used</Th>
-                    </Tr>
-                </THead>
-                <TBody>
-                    {!isLoading && data && data?.rows?.length > 0 && data.rows.map(({
-                        name,
-                        allowed,
-                        used
-                    }) => {
-                        return (
-                           <Tr key={`current-plan-row-${name}`} className="h-12">
-                                <Td>{name}</Td>
-                                <Td>{displayCell(allowed)}</Td>
-                                <Td>{used}</Td>
-                            </Tr> 
-                        );
-                    })}
-                    {isLoading && <TableSkeleton columns={5} key="invoices" />}
-                    {!isLoading && data && data?.rows?.length === 0 && (
-                        <Tr>
-                            <Td colSpan={3}>
-                                <EmptyState 
-                                    title="No plan details found" 
-                                    icon={faFileInvoice}
-                                />
-                            </Td>
-                        </Tr>
-                    )}
-                </TBody>
-                </Table>
-            </TableContainer> 
-        </div>
-    );
-}
+    return value;
+  };
+
+  return (
+    <div className="mb-6 rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
+      <h2 className="mb-8 flex-1 text-xl font-semibold text-white">Current Usage</h2>
+      <TableContainer className="mt-4">
+        <Table>
+          <THead>
+            <Tr>
+              <Th className="w-1/3">Feature</Th>
+              <Th className="w-1/3">Allowed</Th>
+              <Th className="w-1/3">Used</Th>
+            </Tr>
+          </THead>
+          <TBody>
+            {!isLoading &&
+              data &&
+              data?.rows?.length > 0 &&
+              data.rows.map(({ name, allowed, used }) => {
+                return (
+                  <Tr key={`current-plan-row-${name}`} className="h-12">
+                    <Td>{name}</Td>
+                    <Td>{displayCell(allowed)}</Td>
+                    <Td>{used}</Td>
+                  </Tr>
+                );
+              })}
+            {isLoading && <TableSkeleton columns={5} innerKey="invoices" />}
+            {!isLoading && data && data?.rows?.length === 0 && (
+              <Tr>
+                <Td colSpan={3}>
+                  <EmptyState title="No plan details found" icon={faFileInvoice} />
+                </Td>
+              </Tr>
+            )}
+          </TBody>
+        </Table>
+      </TableContainer>
+    </div>
+  );
+};

frontend/src/views/Settings/BillingSettingsPage/components/BillingCloudTab/ManagePlansTable.tsx

@@ -1,4 +1,4 @@
-import { faCircleCheck, faCircleXmark,faFileInvoice } from "@fortawesome/free-solid-svg-icons";
+import { faCircleCheck, faCircleXmark, faFileInvoice } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 import {
@@ -11,166 +11,129 @@ import {
   Td,
   Th,
   THead,
-  Tr,
+  Tr
 } from "@app/components/v2";
-import { useOrganization,useSubscription  } from "@app/context";
-import { 
-    useCreateCustomerPortalSession,
-    useGetOrgPlansTable} from "@app/hooks/api";
+import { useOrganization, useSubscription } from "@app/context";
+import { useCreateCustomerPortalSession, useGetOrgPlansTable } from "@app/hooks/api";
 
 type Props = {
-    billingCycle: "monthly" | "yearly"
-}
+  billingCycle: "monthly" | "yearly";
+};
 
-export const ManagePlansTable = ({
+export const ManagePlansTable = ({ billingCycle }: Props) => {
+  const { currentOrg } = useOrganization();
+  const { subscription } = useSubscription();
+  const { data: tableData, isLoading: isTableDataLoading } = useGetOrgPlansTable({
+    organizationId: currentOrg?._id ?? "",
     billingCycle
-}: Props) => {
-    const { currentOrg } = useOrganization();
-    const { subscription } = useSubscription();
-    const { data: tableData, isLoading: isTableDataLoading } = useGetOrgPlansTable({
-        organizationId: currentOrg?._id ?? "",
-        billingCycle
-    });
-    const createCustomerPortalSession = useCreateCustomerPortalSession();
+  });
+  const createCustomerPortalSession = useCreateCustomerPortalSession();
 
-    const displayCell = (value: null | number | string | boolean) => {
-        if (value === null) return "Unlimited";
-        
-        if (typeof value === "boolean") {
-            if (value) return (
-                <FontAwesomeIcon 
-                    icon={faCircleCheck}
-                    color='#2ecc71'
-                />
-            );
+  const displayCell = (value: null | number | string | boolean) => {
+    if (value === null) return "Unlimited";
 
-            return (
-                <FontAwesomeIcon 
-                    icon={faCircleXmark}
-                    color='#e74c3c'
-                />
-            );
-        }
-        
-        return value;
+    if (typeof value === "boolean") {
+      if (value) return <FontAwesomeIcon icon={faCircleCheck} color="#2ecc71" />;
+
+      return <FontAwesomeIcon icon={faCircleXmark} color="#e74c3c" />;
     }
 
-    return (
-        <TableContainer>
-            <Table>
-                <THead>
-                    {subscription && !isTableDataLoading && tableData && (
-                        <Tr>
-                            <Th className="">Feature / Limit</Th>
-                            {tableData.head.map(({
-                                name,
-                                priceLine
-                            }) => {
-                                return (
-                                    <Th 
-                                        key={`plans-feature-head-${billingCycle}-${name}`}
-                                        className="text-center flex-1"
-                                    >
-                                        <p>{name}</p>
-                                        <p>{priceLine}</p>
-                                    </Th>
-                                );
-                            })}
-                        </Tr>
-                    )}
-                </THead>
-                <TBody>
-                    {subscription && !isTableDataLoading && tableData && tableData.rows.map(({
-                        name,
-                        starter,
-                        team,
-                        pro,
-                        enterprise
-                    }) => {
-                        return (
-                            <Tr className="h-12" key={`plans-feature-row-${billingCycle}-${name}`}>
-                                <Td>{displayCell(name)}</Td>
-                                <Td className="text-center">
-                                    {displayCell(starter)}
-                                </Td>
-                                <Td className="text-center">
-                                    {displayCell(team)}
-                                </Td>
-                                <Td className="text-center">
-                                    {displayCell(pro)}
-                                </Td>
-                                <Td className="text-center">
-                                    {displayCell(enterprise)}
-                                </Td>
-                            </Tr>
-                        );
-                    })}
-                    {isTableDataLoading && <TableSkeleton columns={5} key="cloud-products" />}
-                    {!isTableDataLoading && tableData?.rows.length === 0 && (
-                        <Tr>
-                            <Td colSpan={5}>
-                                <EmptyState 
-                                    title="No cloud product details found" 
-                                    icon={faFileInvoice}
-                                />
-                            </Td>
-                        </Tr>
-                    )}
-                    {subscription && !isTableDataLoading && tableData && (
-                        <Tr className="h-12">
-                            <Td />
-                            {tableData.head.map(({
-                                slug,
-                                tier
-                            }) => {
-                                
-                                const isCurrentPlan = slug === subscription.slug;
-                                let subscriptionText = "Upgrade";
-                                
-                                if (subscription.tier > tier) {
-                                   subscriptionText = "Downgrade"
-                                }
-                                
-                                if (tier === 3) {
-                                   subscriptionText = "Contact sales"
-                                }
+    return value;
+  };
 
-                                return isCurrentPlan ? (
-                                    <Td>
-                                        <Button 
-                                            colorSchema="secondary"
-                                            className="w-full"
-                                            isDisabled
-                                        >
-                                            Current
-                                        </Button>
-                                    </Td>
-                                ) : (
-                                    <Td>
-                                        <Button 
-                                            onClick={async () => {
-                                                if (!currentOrg?._id) return;
-                                                
-                                                if (tier !== 3) {
-                                                    const { url } = await createCustomerPortalSession.mutateAsync(currentOrg._id);
-                                                    window.location.href = url;
-                                                    return;
-                                                }
-                                                
-                                                window.location.href = "https://infisical.com/scheduledemo";
-                                            }}
-                                            color="mineshaft"
-                                            className="w-full"
-                                        >
-                                            {subscriptionText}
-                                        </Button>
-                                    </Td>
-                                );
-                            })}
-                        </Tr>
-                    )}
-                </TBody>
-            </Table>
-        </TableContainer>
-    );
-}
+  return (
+    <TableContainer>
+      <Table>
+        <THead>
+          {subscription && !isTableDataLoading && tableData && (
+            <Tr>
+              <Th className="">Feature / Limit</Th>
+              {tableData.head.map(({ name, priceLine }) => {
+                return (
+                  <Th
+                    key={`plans-feature-head-${billingCycle}-${name}`}
+                    className="flex-1 text-center"
+                  >
+                    <p>{name}</p>
+                    <p>{priceLine}</p>
+                  </Th>
+                );
+              })}
+            </Tr>
+          )}
+        </THead>
+        <TBody>
+          {subscription &&
+            !isTableDataLoading &&
+            tableData &&
+            tableData.rows.map(({ name, starter, team, pro, enterprise }) => {
+              return (
+                <Tr className="h-12" key={`plans-feature-row-${billingCycle}-${name}`}>
+                  <Td>{displayCell(name)}</Td>
+                  <Td className="text-center">{displayCell(starter)}</Td>
+                  <Td className="text-center">{displayCell(team)}</Td>
+                  <Td className="text-center">{displayCell(pro)}</Td>
+                  <Td className="text-center">{displayCell(enterprise)}</Td>
+                </Tr>
+              );
+            })}
+          {isTableDataLoading && <TableSkeleton columns={5} innerKey="cloud-products" />}
+          {!isTableDataLoading && tableData?.rows.length === 0 && (
+            <Tr>
+              <Td colSpan={5}>
+                <EmptyState title="No cloud product details found" icon={faFileInvoice} />
+              </Td>
+            </Tr>
+          )}
+          {subscription && !isTableDataLoading && tableData && (
+            <Tr className="h-12">
+              <Td />
+              {tableData.head.map(({ slug, tier }) => {
+                const isCurrentPlan = slug === subscription.slug;
+                let subscriptionText = "Upgrade";
+
+                if (subscription.tier > tier) {
+                  subscriptionText = "Downgrade";
+                }
+
+                if (tier === 3) {
+                  subscriptionText = "Contact sales";
+                }
+
+                return isCurrentPlan ? (
+                  <Td>
+                    <Button colorSchema="secondary" className="w-full" isDisabled>
+                      Current
+                    </Button>
+                  </Td>
+                ) : (
+                  <Td>
+                    <Button
+                      onClick={async () => {
+                        if (!currentOrg?._id) return;
+
+                        if (tier !== 3) {
+                          const { url } = await createCustomerPortalSession.mutateAsync(
+                            currentOrg._id
+                          );
+                          window.location.href = url;
+                          return;
+                        }
+
+                        window.location.href = "https://infisical.com/scheduledemo";
+                      }}
+                      color="mineshaft"
+                      className="w-full"
+                    >
+                      {subscriptionText}
+                    </Button>
+                  </Td>
+                );
+              })}
+            </Tr>
+          )}
+        </TBody>
+      </Table>
+    </TableContainer>
+  );
+};

frontend/src/views/Settings/BillingSettingsPage/components/BillingDetailsTab/PmtMethodsTable.tsx

@@ -14,78 +14,68 @@ import {
   Tr
 } from "@app/components/v2";
 import { useOrganization } from "@app/context";
-import { 
-    useDeleteOrgPmtMethod,
-    useGetOrgPmtMethods
-} from "@app/hooks/api";
+import { useDeleteOrgPmtMethod, useGetOrgPmtMethods } from "@app/hooks/api";
 
 export const PmtMethodsTable = () => {
-    const { currentOrg } = useOrganization();
-    const { data, isLoading } = useGetOrgPmtMethods(currentOrg?._id ?? "");
-    const deleteOrgPmtMethod = useDeleteOrgPmtMethod();
+  const { currentOrg } = useOrganization();
+  const { data, isLoading } = useGetOrgPmtMethods(currentOrg?._id ?? "");
+  const deleteOrgPmtMethod = useDeleteOrgPmtMethod();
 
-    const handleDeletePmtMethodBtnClick = async (pmtMethodId: string) => {
-        if (!currentOrg?._id) return;
-        await deleteOrgPmtMethod.mutateAsync({
-            organizationId: currentOrg._id,
-            pmtMethodId
-        });
-    }
+  const handleDeletePmtMethodBtnClick = async (pmtMethodId: string) => {
+    if (!currentOrg?._id) return;
+    await deleteOrgPmtMethod.mutateAsync({
+      organizationId: currentOrg._id,
+      pmtMethodId
+    });
+  };
 
-    return (
-        <TableContainer className="mt-4">
-            <Table>
-              <THead>
-                <Tr>
-                  <Th className="flex-1">Brand</Th>
-                  <Th className="flex-1">Type</Th>
-                  <Th className="flex-1">Last 4 Digits</Th>
-                  <Th className="flex-1">Expiration</Th>
-                  <Th className="w-5" />
-                </Tr>
-              </THead>
-              <TBody>
-                {!isLoading && data && data?.length > 0 && data.map(({
-                    _id,
-                    brand,
-                    exp_month,
-                    exp_year,
-                    funding,
-                    last4
-                }) => (
-                    <Tr key={`pmt-method-${_id}`} className="h-10">
-                        <Td>{brand.charAt(0).toUpperCase() + brand.slice(1)}</Td>
-                        <Td>{funding.charAt(0).toUpperCase() + funding.slice(1)}</Td>
-                        <Td>{last4}</Td>
-                        <Td>{`${exp_month}/${exp_year}`}</Td>
-                        <Td>
-                            <IconButton
-                                onClick={async () => {
-                                    await handleDeletePmtMethodBtnClick(_id);
-                                }}
-                                size="lg"
-                                colorSchema="danger"
-                                variant="plain"
-                                ariaLabel="update"
-                            >
-                                <FontAwesomeIcon icon={faXmark} />
-                            </IconButton>
-                        </Td>
-                    </Tr>
-                ))}
-                {isLoading && <TableSkeleton columns={5} key="pmt-methods" />}
-                {!isLoading && data && data?.length === 0 && (
-                    <Tr>
-                        <Td colSpan={5}>
-                            <EmptyState 
-                                title="No payment methods on file" 
-                                icon={faCreditCard}
-                            />
-                        </Td>
-                    </Tr>
-                )}
-              </TBody>
-            </Table>
-        </TableContainer>
-    );
-}
+  return (
+    <TableContainer className="mt-4">
+      <Table>
+        <THead>
+          <Tr>
+            <Th className="flex-1">Brand</Th>
+            <Th className="flex-1">Type</Th>
+            <Th className="flex-1">Last 4 Digits</Th>
+            <Th className="flex-1">Expiration</Th>
+            <Th className="w-5" />
+          </Tr>
+        </THead>
+        <TBody>
+          {!isLoading &&
+            data &&
+            data?.length > 0 &&
+            data.map(({ _id, brand, exp_month, exp_year, funding, last4 }) => (
+              <Tr key={`pmt-method-${_id}`} className="h-10">
+                <Td>{brand.charAt(0).toUpperCase() + brand.slice(1)}</Td>
+                <Td>{funding.charAt(0).toUpperCase() + funding.slice(1)}</Td>
+                <Td>{last4}</Td>
+                <Td>{`${exp_month}/${exp_year}`}</Td>
+                <Td>
+                  <IconButton
+                    onClick={async () => {
+                      await handleDeletePmtMethodBtnClick(_id);
+                    }}
+                    size="lg"
+                    colorSchema="danger"
+                    variant="plain"
+                    ariaLabel="update"
+                  >
+                    <FontAwesomeIcon icon={faXmark} />
+                  </IconButton>
+                </Td>
+              </Tr>
+            ))}
+          {isLoading && <TableSkeleton columns={5} innerKey="pmt-methods" />}
+          {!isLoading && data && data?.length === 0 && (
+            <Tr>
+              <Td colSpan={5}>
+                <EmptyState title="No payment methods on file" icon={faCreditCard} />
+              </Td>
+            </Tr>
+          )}
+        </TBody>
+      </Table>
+    </TableContainer>
+  );
+};

frontend/src/views/Settings/BillingSettingsPage/components/BillingDetailsTab/TaxIDTable.tsx

@@ -1,4 +1,4 @@
-import { faFileInvoice,faXmark } from "@fortawesome/free-solid-svg-icons";
+import { faFileInvoice, faXmark } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 import {
@@ -11,127 +11,120 @@ import {
   Td,
   Th,
   THead,
-  Tr,
+  Tr
 } from "@app/components/v2";
 import { useOrganization } from "@app/context";
-import { 
-    useDeleteOrgTaxId,
-    useGetOrgTaxIds
-} from "@app/hooks/api";
+import { useDeleteOrgTaxId, useGetOrgTaxIds } from "@app/hooks/api";
 
 const taxIDTypeLabelMap: { [key: string]: string } = {
-  "au_abn": "Australia ABN",
-  "au_arn": "Australia ARN",
-  "bg_uic": "Bulgaria UIC",
-  "br_cnpj": "Brazil CNPJ",
-  "br_cpf": "Brazil CPF",
-  "ca_bn": "Canada BN",
-  "ca_gst_hst": "Canada GST/HST",
-  "ca_pst_bc": "Canada PST BC",
-  "ca_pst_mb": "Canada PST MB",
-  "ca_pst_sk": "Canada PST SK",
-  "ca_qst": "Canada QST",
-  "ch_vat": "Switzerland VAT",
-  "cl_tin": "Chile TIN",
-  "eg_tin": "Egypt TIN",
-  "es_cif": "Spain CIF",
-  "eu_oss_vat": "EU OSS VAT",
-  "eu_vat": "EU VAT",
-  "gb_vat": "GB VAT",
-  "ge_vat": "Georgia VAT",
-  "hk_br": "Hong Kong BR",
-  "hu_tin": "Hungary TIN",
-  "id_npwp": "Indonesia NPWP",
-  "il_vat": "Israel VAT",
-  "in_gst": "India GST",
-  "is_vat": "Iceland VAT",
-  "jp_cn": "Japan CN",
-  "jp_rn": "Japan RN",
-  "jp_trn": "Japan TRN",
-  "ke_pin": "Kenya PIN",
-  "kr_brn": "South Korea BRN",
-  "li_uid": "Liechtenstein UID",
-  "mx_rfc": "Mexico RFC",
-  "my_frp": "Malaysia FRP",
-  "my_itn": "Malaysia ITN",
-  "my_sst": "Malaysia SST",
-  "no_vat": "Norway VAT",
-  "nz_gst": "New Zealand GST",
-  "ph_tin": "Philippines TIN",
-  "ru_inn": "Russia INN",
-  "ru_kpp": "Russia KPP",
-  "sa_vat": "Saudi Arabia VAT",
-  "sg_gst": "Singapore GST",
-  "sg_uen": "Singapore UEN",
-  "si_tin": "Slovenia TIN",
-  "th_vat": "Thailand VAT",
-  "tr_tin": "Turkey TIN",
-  "tw_vat": "Taiwan VAT",
-  "ua_vat": "Ukraine VAT",
-  "us_ein": "US EIN",
-  "za_vat": "South Africa VAT"
+  au_abn: "Australia ABN",
+  au_arn: "Australia ARN",
+  bg_uic: "Bulgaria UIC",
+  br_cnpj: "Brazil CNPJ",
+  br_cpf: "Brazil CPF",
+  ca_bn: "Canada BN",
+  ca_gst_hst: "Canada GST/HST",
+  ca_pst_bc: "Canada PST BC",
+  ca_pst_mb: "Canada PST MB",
+  ca_pst_sk: "Canada PST SK",
+  ca_qst: "Canada QST",
+  ch_vat: "Switzerland VAT",
+  cl_tin: "Chile TIN",
+  eg_tin: "Egypt TIN",
+  es_cif: "Spain CIF",
+  eu_oss_vat: "EU OSS VAT",
+  eu_vat: "EU VAT",
+  gb_vat: "GB VAT",
+  ge_vat: "Georgia VAT",
+  hk_br: "Hong Kong BR",
+  hu_tin: "Hungary TIN",
+  id_npwp: "Indonesia NPWP",
+  il_vat: "Israel VAT",
+  in_gst: "India GST",
+  is_vat: "Iceland VAT",
+  jp_cn: "Japan CN",
+  jp_rn: "Japan RN",
+  jp_trn: "Japan TRN",
+  ke_pin: "Kenya PIN",
+  kr_brn: "South Korea BRN",
+  li_uid: "Liechtenstein UID",
+  mx_rfc: "Mexico RFC",
+  my_frp: "Malaysia FRP",
+  my_itn: "Malaysia ITN",
+  my_sst: "Malaysia SST",
+  no_vat: "Norway VAT",
+  nz_gst: "New Zealand GST",
+  ph_tin: "Philippines TIN",
+  ru_inn: "Russia INN",
+  ru_kpp: "Russia KPP",
+  sa_vat: "Saudi Arabia VAT",
+  sg_gst: "Singapore GST",
+  sg_uen: "Singapore UEN",
+  si_tin: "Slovenia TIN",
+  th_vat: "Thailand VAT",
+  tr_tin: "Turkey TIN",
+  tw_vat: "Taiwan VAT",
+  ua_vat: "Ukraine VAT",
+  us_ein: "US EIN",
+  za_vat: "South Africa VAT"
 };
 
 export const TaxIDTable = () => {
-    const { currentOrg } = useOrganization();
-    const { data, isLoading } = useGetOrgTaxIds(currentOrg?._id ?? "");
-    const deleteOrgTaxId = useDeleteOrgTaxId();
+  const { currentOrg } = useOrganization();
+  const { data, isLoading } = useGetOrgTaxIds(currentOrg?._id ?? "");
+  const deleteOrgTaxId = useDeleteOrgTaxId();
 
-    const handleDeleteTaxIdBtnClick = async (taxId: string) => {
-        if (!currentOrg?._id) return;
-        await deleteOrgTaxId.mutateAsync({
-            organizationId: currentOrg._id,
-            taxId
-        });
-    }
+  const handleDeleteTaxIdBtnClick = async (taxId: string) => {
+    if (!currentOrg?._id) return;
+    await deleteOrgTaxId.mutateAsync({
+      organizationId: currentOrg._id,
+      taxId
+    });
+  };
 
-    return (
-        <TableContainer className="mt-4">
-            <Table>
-                <THead>
-                    <Tr>
-                        <Th className="flex-1">Type</Th>
-                        <Th className="flex-1">Value</Th>
-                        <Th className="w-5" />
-                    </Tr>
-                </THead>
-                <TBody>
-                    {!isLoading && data && data?.length > 0 && data.map(({
-                        _id,
-                        type,
-                        value
-                    }) => (
-                        <Tr key={`tax-id-${_id}`} className="h-10">
-                            <Td>{taxIDTypeLabelMap[type]}</Td>
-                            <Td>{value}</Td>
-                            <Td>
-                                <IconButton
-                                    onClick={async () => {
-                                        await handleDeleteTaxIdBtnClick(_id);
-                                    }}
-                                    size="lg"
-                                    colorSchema="danger"
-                                    variant="plain"
-                                    ariaLabel="update"
-                                >
-                                    <FontAwesomeIcon icon={faXmark} />
-                                </IconButton>
-                            </Td>
-                        </Tr>
-                    ))}
-                    {isLoading && <TableSkeleton columns={3} key="tax-ids" />}
-                    {!isLoading && data && data?.length === 0 && (
-                        <Tr>
-                            <Td colSpan={5}>
-                                <EmptyState 
-                                    title="No Tax IDs on file" 
-                                    icon={faFileInvoice}
-                                />
-                            </Td>
-                        </Tr>
-                    )}
-                </TBody>
-            </Table>
-        </TableContainer>
-    );
-}
+  return (
+    <TableContainer className="mt-4">
+      <Table>
+        <THead>
+          <Tr>
+            <Th className="flex-1">Type</Th>
+            <Th className="flex-1">Value</Th>
+            <Th className="w-5" />
+          </Tr>
+        </THead>
+        <TBody>
+          {!isLoading &&
+            data &&
+            data?.length > 0 &&
+            data.map(({ _id, type, value }) => (
+              <Tr key={`tax-id-${_id}`} className="h-10">
+                <Td>{taxIDTypeLabelMap[type]}</Td>
+                <Td>{value}</Td>
+                <Td>
+                  <IconButton
+                    onClick={async () => {
+                      await handleDeleteTaxIdBtnClick(_id);
+                    }}
+                    size="lg"
+                    colorSchema="danger"
+                    variant="plain"
+                    ariaLabel="update"
+                  >
+                    <FontAwesomeIcon icon={faXmark} />
+                  </IconButton>
+                </Td>
+              </Tr>
+            ))}
+          {isLoading && <TableSkeleton columns={3} innerKey="tax-ids" />}
+          {!isLoading && data && data?.length === 0 && (
+            <Tr>
+              <Td colSpan={5}>
+                <EmptyState title="No Tax IDs on file" icon={faFileInvoice} />
+              </Td>
+            </Tr>
+          )}
+        </TBody>
+      </Table>
+    </TableContainer>
+  );
+};

frontend/src/views/Settings/BillingSettingsPage/components/BillingReceiptsTab/InvoicesTable.tsx

@@ -14,76 +14,67 @@ import {
   Tr
 } from "@app/components/v2";
 import { useOrganization } from "@app/context";
-import { 
-    useGetOrgInvoices
-} from "@app/hooks/api";
+import { useGetOrgInvoices } from "@app/hooks/api";
 
 export const InvoicesTable = () => {
-    const { currentOrg } = useOrganization();
-    const { data, isLoading } = useGetOrgInvoices(currentOrg?._id ?? "");
-    return (
-        <TableContainer className="mt-8">
-            <Table>
-              <THead>
-                <Tr>
-                  <Th className="flex-1">Invoice #</Th>
-                  <Th className="flex-1">Date</Th>
-                  <Th className="flex-1">Status</Th>
-                  <Th className="flex-1">Amount</Th>
-                  <Th className="w-5" />
+  const { currentOrg } = useOrganization();
+  const { data, isLoading } = useGetOrgInvoices(currentOrg?._id ?? "");
+  return (
+    <TableContainer className="mt-8">
+      <Table>
+        <THead>
+          <Tr>
+            <Th className="flex-1">Invoice #</Th>
+            <Th className="flex-1">Date</Th>
+            <Th className="flex-1">Status</Th>
+            <Th className="flex-1">Amount</Th>
+            <Th className="w-5" />
+          </Tr>
+        </THead>
+        <TBody>
+          {!isLoading &&
+            data &&
+            data?.length > 0 &&
+            data.map(({ _id, created, paid, number, total, invoice_pdf }) => {
+              const formattedTotal = (Math.floor(total) / 100).toLocaleString("en-US", {
+                style: "currency",
+                currency: "USD"
+              });
+              const createdDate = new Date(created * 1000);
+              const day: number = createdDate.getDate();
+              const month: number = createdDate.getMonth() + 1;
+              const year: number = createdDate.getFullYear();
+              const formattedDate: string = `${day}/${month}/${year}`;
+
+              return (
+                <Tr key={`invoice-${_id}`} className="h-10">
+                  <Td>{number}</Td>
+                  <Td>{formattedDate}</Td>
+                  <Td>{paid ? "Paid" : "Not Paid"}</Td>
+                  <Td>{formattedTotal}</Td>
+                  <Td>
+                    <IconButton
+                      onClick={async () => window.open(invoice_pdf)}
+                      size="lg"
+                      variant="plain"
+                      ariaLabel="update"
+                    >
+                      <FontAwesomeIcon icon={faDownload} />
+                    </IconButton>
+                  </Td>
                 </Tr>
-              </THead>
-              <TBody>
-                {!isLoading && data && data?.length > 0 && data.map(({
-                    _id,
-                    created,
-                    paid,
-                    number,
-                    total,
-                    invoice_pdf
-                }) => {
-                    const formattedTotal = (Math.floor(total) / 100).toLocaleString("en-US", {
-                        style: "currency",
-                        currency: "USD",
-                    });
-                    const createdDate = new Date(created * 1000);
-                    const day: number = createdDate.getDate();
-                    const month: number = createdDate.getMonth() + 1;
-                    const year: number = createdDate.getFullYear();
-                    const formattedDate: string = `${day}/${month}/${year}`;
-                    
-                    return (
-                        <Tr key={`invoice-${_id}`} className="h-10">
-                            <Td>{number}</Td>
-                            <Td>{formattedDate}</Td>
-                            <Td>{paid ? "Paid" : "Not Paid"}</Td>
-                            <Td>{formattedTotal}</Td>
-                            <Td>
-                                <IconButton
-                                    onClick={async () => window.open(invoice_pdf)}
-                                    size="lg"
-                                    variant="plain"
-                                    ariaLabel="update"
-                                >
-                                    <FontAwesomeIcon icon={faDownload} />
-                                </IconButton>
-                            </Td>
-                        </Tr>
-                    );
-                })}
-                {isLoading && <TableSkeleton columns={5} key="invoices" />}
-                {!isLoading && data && data?.length === 0 && (
-                    <Tr>
-                        <Td colSpan={5}>
-                            <EmptyState 
-                                title="No invoices on file" 
-                                icon={faFileInvoice}
-                            />
-                        </Td>
-                    </Tr>
-                )}
-              </TBody>
-            </Table>
-        </TableContainer>
-    );
-}
+              );
+            })}
+          {isLoading && <TableSkeleton columns={5} innerKey="invoices" />}
+          {!isLoading && data && data?.length === 0 && (
+            <Tr>
+              <Td colSpan={5}>
+                <EmptyState title="No invoices on file" icon={faFileInvoice} />
+              </Td>
+            </Tr>
+          )}
+        </TBody>
+      </Table>
+    </TableContainer>
+  );
+};

frontend/src/views/Settings/CreateServiceAccountPage/components/SAProjectLevelPermissionsTable/SAProjectLevelPermissionsTable.tsx

@@ -1,407 +1,412 @@
 import { useState } from "react";
-import { Controller,useForm } from "react-hook-form";
-import {
-    faKey,
-    faMagnifyingGlass,
-    faPlus,
-    faTrash} from "@fortawesome/free-solid-svg-icons";
+import { Controller, useForm } from "react-hook-form";
+import { faKey, faMagnifyingGlass, faPlus, faTrash } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { yupResolver } from "@hookform/resolvers/yup";
 import * as yup from "yup";
 
-import { 
-    decryptAssymmetric,
-    encryptAssymmetric,
-    verifyPrivateKey} from "@app/components/utilities/cryptography/crypto";
 import {
-    Button,
-    Checkbox,
-    DeleteActionModal,
-    EmptyState,
-    FormControl,
-    IconButton,
-    Input,
-    Modal,
-    ModalClose,
-    ModalContent,
-    Select,
-    SelectItem,
-    Table,
-    TableContainer,
-    TableSkeleton,
-    TBody,
-    Td,
-    Th,
-    THead,
-    Tr} from "@app/components/v2";
+  decryptAssymmetric,
+  encryptAssymmetric,
+  verifyPrivateKey
+} from "@app/components/utilities/cryptography/crypto";
+import {
+  Button,
+  Checkbox,
+  DeleteActionModal,
+  EmptyState,
+  FormControl,
+  IconButton,
+  Input,
+  Modal,
+  ModalClose,
+  ModalContent,
+  Select,
+  SelectItem,
+  Table,
+  TableContainer,
+  TableSkeleton,
+  TBody,
+  Td,
+  Th,
+  THead,
+  Tr
+} from "@app/components/v2";
 import { usePopUp } from "@app/hooks";
 import {
-    useCreateServiceAccountProjectLevelPermission,
-    useDeleteServiceAccountProjectLevelPermission,
-    useGetServiceAccountById,
-    useGetServiceAccountProjectLevelPermissions,
-    useGetUserWorkspaces
+  useCreateServiceAccountProjectLevelPermission,
+  useDeleteServiceAccountProjectLevelPermission,
+  useGetServiceAccountById,
+  useGetServiceAccountProjectLevelPermissions,
+  useGetUserWorkspaces
 } from "@app/hooks/api";
 import getLatestFileKey from "@app/pages/api/workspace/getLatestFileKey";
 
 const createProjectLevelPermissionSchema = yup.object({
-    privateKey: yup.string().required().label("Private Key"),
-    workspace: yup.string().required().label("Workspace"),
-    environment: yup.string().required().label("Environment"),
-    permissions: yup.object().shape({
-        read: yup.boolean().required(),
-        write: yup.boolean().required()
-    }).defined().required()
+  privateKey: yup.string().required().label("Private Key"),
+  workspace: yup.string().required().label("Workspace"),
+  environment: yup.string().required().label("Environment"),
+  permissions: yup
+    .object()
+    .shape({
+      read: yup.boolean().required(),
+      write: yup.boolean().required()
+    })
+    .defined()
+    .required()
 });
 
 type CreateProjectLevelPermissionForm = yup.InferType<typeof createProjectLevelPermissionSchema>;
 
 type Props = {
-    serviceAccountId: string;
-}
+  serviceAccountId: string;
+};
 
-export const SAProjectLevelPermissionsTable = ({
-    serviceAccountId
-}: Props): JSX.Element => {
-    const { data: serviceAccount } = useGetServiceAccountById(serviceAccountId);
-    const { data: userWorkspaces, isLoading: isUserWorkspacesLoading } = useGetUserWorkspaces();
-    const [searchPermissions, setSearchPermissions] = useState("");
+export const SAProjectLevelPermissionsTable = ({ serviceAccountId }: Props): JSX.Element => {
+  const { data: serviceAccount } = useGetServiceAccountById(serviceAccountId);
+  const { data: userWorkspaces, isLoading: isUserWorkspacesLoading } = useGetUserWorkspaces();
+  const [searchPermissions, setSearchPermissions] = useState("");
 
-    const { data: serviceAccountWorkspacePermissions, isLoading: isPermissionsLoading } = useGetServiceAccountProjectLevelPermissions(serviceAccountId);
-    
-    const createServiceAccountProjectLevelPermission = useCreateServiceAccountProjectLevelPermission();
-    const deleteServiceAccountProjectLevelPermission = useDeleteServiceAccountProjectLevelPermission();
+  const { data: serviceAccountWorkspacePermissions, isLoading: isPermissionsLoading } =
+    useGetServiceAccountProjectLevelPermissions(serviceAccountId);
 
-    const { handlePopUpToggle, popUp, handlePopUpOpen, handlePopUpClose } = usePopUp([
-        "addProjectLevelPermission",
-        "removeProjectLevelPermission",
-    ] as const);
-    
-    const [, setSelectedWorkspace] = useState<undefined | string>(undefined);
+  const createServiceAccountProjectLevelPermission =
+    useCreateServiceAccountProjectLevelPermission();
+  const deleteServiceAccountProjectLevelPermission =
+    useDeleteServiceAccountProjectLevelPermission();
 
-    const {
-        control,
-        handleSubmit,
-        reset,
-        formState: { isSubmitting }
-    } = useForm<CreateProjectLevelPermissionForm>({ resolver: yupResolver(createProjectLevelPermissionSchema) })
+  const { handlePopUpToggle, popUp, handlePopUpOpen, handlePopUpClose } = usePopUp([
+    "addProjectLevelPermission",
+    "removeProjectLevelPermission"
+  ] as const);
 
-    const onAddProjectLevelPermission = async ({
-        privateKey,
-        workspace,
-        environment,
-        permissions: { read, write }
-    }: CreateProjectLevelPermissionForm) => {
-        
-        // TODO: clean up / modularize this function
-        
-        if (!serviceAccount) return;
-        
-        const { latestKey } = await getLatestFileKey({
-            workspaceId: workspace
-        });
+  const [, setSelectedWorkspace] = useState<undefined | string>(undefined);
 
-        verifyPrivateKey({
-            privateKey,
-            publicKey: serviceAccount.publicKey
-        });
-        
-        const PRIVATE_KEY = localStorage.getItem("PRIVATE_KEY") as string;
+  const {
+    control,
+    handleSubmit,
+    reset,
+    formState: { isSubmitting }
+  } = useForm<CreateProjectLevelPermissionForm>({
+    resolver: yupResolver(createProjectLevelPermissionSchema)
+  });
 
-        const key = decryptAssymmetric({
-            ciphertext: latestKey.encryptedKey,
-            nonce: latestKey.nonce,
-            publicKey: latestKey.sender.publicKey,
-            privateKey: PRIVATE_KEY
-        });
-        
-        const { ciphertext, nonce } = encryptAssymmetric({
-            plaintext: key,
-            publicKey: serviceAccount.publicKey,
-            privateKey
-        });
-        
-        await createServiceAccountProjectLevelPermission.mutateAsync({
-            serviceAccountId,
-            workspaceId: workspace,
-            environment,
-            read,
-            write,
-            encryptedKey: ciphertext,
-            nonce
-        });
-        handlePopUpClose("addProjectLevelPermission");
-    }
-    
-    const onRemoveProjectLevelPermission = async () => {
-        const serviceAccountWorkspacePermissionId = (popUp?.removeProjectLevelPermission?.data as { _id: string })?._id;
-        await deleteServiceAccountProjectLevelPermission.mutateAsync({
-           serviceAccountId,
-           serviceAccountWorkspacePermissionId
-        });
-        handlePopUpClose("removeProjectLevelPermission");
-    }
+  const onAddProjectLevelPermission = async ({
+    privateKey,
+    workspace,
+    environment,
+    permissions: { read, write }
+  }: CreateProjectLevelPermissionForm) => {
+    // TODO: clean up / modularize this function
 
-    return (
-        <div className="w-full bg-white/5 p-6">
-            <p className="mb-4 text-xl font-semibold">Project-Level Permissions</p>
-            <div className="mb-4 flex">
-                <div className="mr-4 flex-1">
-                    <Input 
-                        value={searchPermissions}
-                        onChange={(e) => setSearchPermissions(e.target.value)}
-                        leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
-                        placeholder="Search service account project-level permissions..."
-                    />
-                </div>
-                <Button
-                    leftIcon={<FontAwesomeIcon icon={faPlus} />}
-                    onClick={() => {
-                        handlePopUpOpen("addProjectLevelPermission")
-                        reset();
-                    }}
-                >
-                    Add Permission
-                </Button>
-            </div>
-            <TableContainer>
-                <Table>
-                    <THead>
-                        <Tr>
-                            <Th>Project</Th>
-                            <Th>Environment</Th>
-                            <Th>Read</Th>
-                            <Th>Write</Th>
-                            <Th aria-label="actions" />
-                        </Tr>
-                    </THead>
-                    <TBody>
-                        {isPermissionsLoading && <TableSkeleton columns={6} key="service-account-project-level-permissions" />}
-                        {!isPermissionsLoading && serviceAccountWorkspacePermissions && (
-                            serviceAccountWorkspacePermissions.map(({
-                                _id,
-                                workspace,
-                                environment,
-                                read,
-                                write
-                            }) => {
-                                const environmentName = (workspace.environments.find((env) => env.slug === environment))?.name;
-                                return (
-                                    <Tr key={`service-account-project-level-permission-${_id}`} className="w-full">
-                                        <Td>{workspace.name}</Td>
-                                        <Td>{environmentName}</Td>
-                                        <Td>
-                                            <Checkbox
-                                                id="isReadPermissionEnabled"
-                                                isChecked={read}
-                                                isDisabled
-                                             >{/**/}</Checkbox>
-                                        </Td>
-                                        <Td>
-                                            <Checkbox
-                                                id="isWritePermissionEnabled"
-                                                isChecked={write}
-                                                isDisabled
-                                             >{/**/}</Checkbox>
-                                        </Td>
-                                        <Td>
-                                            <IconButton
-                                                ariaLabel="delete"
-                                                colorSchema="danger"
-                                                onClick={() => handlePopUpOpen("removeProjectLevelPermission", { _id })}
-                                            >
-                                                <FontAwesomeIcon icon={faTrash} />
-                                            </IconButton>
-                                        </Td>
-                                    </Tr>
-                                );
-                            })
-                        )}
-                        {!isPermissionsLoading && serviceAccountWorkspacePermissions?.length === 0 && (
-                            <Tr>
-                                <Td colSpan={7} className="py-6 text-center text-bunker-400">
-                                    <EmptyState title="No permissions found" icon={faKey} />
-                                </Td>
-                            </Tr>
-                        )}
-                    </TBody>
-                </Table>
-            </TableContainer>
-            <Modal
-                isOpen={popUp?.addProjectLevelPermission?.isOpen}
-                onOpenChange={(isOpen) => {
-                    handlePopUpToggle("addProjectLevelPermission", isOpen);
-                }}
-            >
-                <ModalContent
-                    title="Add a Project-Level Permission"
-                    subTitle="The service account will be granted scoped access to the specified project and environment"
-                >
-                    <form onSubmit={handleSubmit(onAddProjectLevelPermission)}>
-                        {!isUserWorkspacesLoading && userWorkspaces && (
-                            <>
-                                <Controller
-                                    control={control}
-                                    defaultValue=""
-                                    name="privateKey"
-                                    render={({ field, fieldState: { error } }) => (
-                                        <FormControl
-                                            label="Service Account Private Key"
-                                            isError={Boolean(error)}
-                                            errorText={error?.message}
-                                        >
-                                            <Input {...field} />
-                                        </FormControl>
-                                    )}
-                                />
-                                <Controller
-                                    control={control}
-                                    name="workspace"
-                                    defaultValue={String(userWorkspaces?.[0]?._id)}
-                                    render={({ field: { onChange, ...field }, fieldState: { error } }) => (
-                                        <FormControl
-                                            label="Project"
-                                            errorText={error?.message}
-                                        >
-                                            <Select
-                                                defaultValue={field.value}
-                                                {...field}
-                                                onValueChange={(e) => {
-                                                    onChange(e);
-                                                    setSelectedWorkspace(e);
-                                                }}
-                                                className="w-full border border-mine-shaft-500"
-                                            >
-                                                {userWorkspaces && userWorkspaces.length > 0 ? (
-                                                    userWorkspaces.map((userWorkspace) => {
-                                                        return (
-                                                            <SelectItem value={userWorkspace._id} key={`project-${userWorkspace._id}`}>
-                                                                {userWorkspace.name}
-                                                            </SelectItem>
-                                                        );
-                                                    })
-                                                ) : (
-                                                    <SelectItem value="none" key="target-app-none">
-                                                        No projects found
-                                                    </SelectItem>
-                                                )}
-                                            </Select>
-                                        </FormControl>
-                                    )}
-                                />
-                                <Controller
-                                    control={control}
-                                    name="environment"
-                                    defaultValue={String(userWorkspaces?.[0]?.environments?.[0]?.slug)}
-                                    render={({ field: { onChange, ...field } }) => {
-                                        /* eslint-disable-next-line no-underscore-dangle */
-                                        const environments = userWorkspaces?.find((userWorkspace) => userWorkspace._id === control?._formValues?.workspace)?.environments ?? [];
-                                        return (
-                                            <FormControl
-                                                label="Environment"
-                                                className="mt-4"
-                                            >
-                                                <Select
-                                                    defaultValue={field.value}
-                                                    {...field}
-                                                    onValueChange={(e) => onChange(e)}
-                                                    className="w-full border border-mine-shaft-500"
-                                                >
-                                                    {environments.length > 0 ? (
-                                                        environments.map((environment) => {
-                                                            return (
-                                                                <SelectItem value={environment.slug} key={`environment-${environment.slug}`}>
-                                                                    {environment.name}
-                                                                </SelectItem>
-                                                            );
-                                                        })
-                                                    ) : (
-                                                        <SelectItem value="none" key="target-app-none">
-                                                            No environments found
-                                                        </SelectItem>
-                                                    )}
-                                                </Select>
-                                            </FormControl>
-                                        );
-                                    }}
-                                />
-                            </>
-                        )}
-                        <Controller 
-                            control={control}
-                            name="permissions"
-                            defaultValue={{
-                                read: true,
-                                write: false
-                            }}
-                            render={({ field: { onChange, value }, fieldState: { error }}) => { 
-                                const options = [
-                                    {
-                                        label: "Read (default)",
-                                        value: "read"
-                                    }, 
-                                    {
-                                        label: "Write",
-                                        value: "write"
-                                    }
-                                ];
-                                
-                                return (
-                                    <FormControl
-                                        label="Permissions"
-                                        errorText={error?.message}
-                                        isError={Boolean(error)}
-                                    >
-                                        <>
-                                            {options.map(({ label, value: optionValue }) => {
-                                                return (
-                                                    <Checkbox
-                                                        id={value[optionValue]}
-                                                        key={optionValue}
-                                                        className="data-[state=checked]:bg-primary"
-                                                        isChecked={value[optionValue]}
-                                                        isDisabled={optionValue === "read"}
-                                                        onCheckedChange={(state) => {
-                                                            onChange({
-                                                                ...value,
-                                                                [optionValue]: state
-                                                            });
-                                                        }}
-                                                    >
-                                                        {label}
-                                                    </Checkbox>
-                                                );
-                                            })}
-                                        </>
-                                    </FormControl>
-                                );
-                            }}
-                        />
-                        <div className="mt-8 flex items-center">
-                            <Button
-                                className="mr-4"
-                                type="submit"
-                                isDisabled={isSubmitting}
-                                isLoading={isSubmitting}
-                            >
-                                Create
-                            </Button>
-                            <ModalClose asChild>
-                            <Button variant="plain" colorSchema="secondary">
-                                Cancel
-                            </Button>
-                            </ModalClose>
-                        </div>
-                    </form>
-                </ModalContent>
-            </Modal>
-            <DeleteActionModal
-                isOpen={popUp.removeProjectLevelPermission.isOpen}
-                deleteKey="remove"
-                title="Do you want to remove this permission from the service account?"
-                onChange={(isOpen) => handlePopUpToggle("removeProjectLevelPermission", isOpen)}
-                onDeleteApproved={onRemoveProjectLevelPermission}
-            />
+    if (!serviceAccount) return;
+
+    const { latestKey } = await getLatestFileKey({
+      workspaceId: workspace
+    });
+
+    verifyPrivateKey({
+      privateKey,
+      publicKey: serviceAccount.publicKey
+    });
+
+    const PRIVATE_KEY = localStorage.getItem("PRIVATE_KEY") as string;
+
+    const key = decryptAssymmetric({
+      ciphertext: latestKey.encryptedKey,
+      nonce: latestKey.nonce,
+      publicKey: latestKey.sender.publicKey,
+      privateKey: PRIVATE_KEY
+    });
+
+    const { ciphertext, nonce } = encryptAssymmetric({
+      plaintext: key,
+      publicKey: serviceAccount.publicKey,
+      privateKey
+    });
+
+    await createServiceAccountProjectLevelPermission.mutateAsync({
+      serviceAccountId,
+      workspaceId: workspace,
+      environment,
+      read,
+      write,
+      encryptedKey: ciphertext,
+      nonce
+    });
+    handlePopUpClose("addProjectLevelPermission");
+  };
+
+  const onRemoveProjectLevelPermission = async () => {
+    const serviceAccountWorkspacePermissionId = (
+      popUp?.removeProjectLevelPermission?.data as { _id: string }
+    )?._id;
+    await deleteServiceAccountProjectLevelPermission.mutateAsync({
+      serviceAccountId,
+      serviceAccountWorkspacePermissionId
+    });
+    handlePopUpClose("removeProjectLevelPermission");
+  };
+
+  return (
+    <div className="w-full bg-white/5 p-6">
+      <p className="mb-4 text-xl font-semibold">Project-Level Permissions</p>
+      <div className="mb-4 flex">
+        <div className="mr-4 flex-1">
+          <Input
+            value={searchPermissions}
+            onChange={(e) => setSearchPermissions(e.target.value)}
+            leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
+            placeholder="Search service account project-level permissions..."
+          />
         </div>
-    );
-}
+        <Button
+          leftIcon={<FontAwesomeIcon icon={faPlus} />}
+          onClick={() => {
+            handlePopUpOpen("addProjectLevelPermission");
+            reset();
+          }}
+        >
+          Add Permission
+        </Button>
+      </div>
+      <TableContainer>
+        <Table>
+          <THead>
+            <Tr>
+              <Th>Project</Th>
+              <Th>Environment</Th>
+              <Th>Read</Th>
+              <Th>Write</Th>
+              <Th aria-label="actions" />
+            </Tr>
+          </THead>
+          <TBody>
+            {isPermissionsLoading && (
+              <TableSkeleton columns={6} innerKey="service-account-project-level-permissions" />
+            )}
+            {!isPermissionsLoading &&
+              serviceAccountWorkspacePermissions &&
+              serviceAccountWorkspacePermissions.map(
+                ({ _id, workspace, environment, read, write }) => {
+                  const environmentName = workspace.environments.find(
+                    (env) => env.slug === environment
+                  )?.name;
+                  return (
+                    <Tr key={`service-account-project-level-permission-${_id}`} className="w-full">
+                      <Td>{workspace.name}</Td>
+                      <Td>{environmentName}</Td>
+                      <Td>
+                        <Checkbox id="isReadPermissionEnabled" isChecked={read} isDisabled>
+                          {/**/}
+                        </Checkbox>
+                      </Td>
+                      <Td>
+                        <Checkbox id="isWritePermissionEnabled" isChecked={write} isDisabled>
+                          {/**/}
+                        </Checkbox>
+                      </Td>
+                      <Td>
+                        <IconButton
+                          ariaLabel="delete"
+                          colorSchema="danger"
+                          onClick={() => handlePopUpOpen("removeProjectLevelPermission", { _id })}
+                        >
+                          <FontAwesomeIcon icon={faTrash} />
+                        </IconButton>
+                      </Td>
+                    </Tr>
+                  );
+                }
+              )}
+            {!isPermissionsLoading && serviceAccountWorkspacePermissions?.length === 0 && (
+              <Tr>
+                <Td colSpan={7} className="py-6 text-center text-bunker-400">
+                  <EmptyState title="No permissions found" icon={faKey} />
+                </Td>
+              </Tr>
+            )}
+          </TBody>
+        </Table>
+      </TableContainer>
+      <Modal
+        isOpen={popUp?.addProjectLevelPermission?.isOpen}
+        onOpenChange={(isOpen) => {
+          handlePopUpToggle("addProjectLevelPermission", isOpen);
+        }}
+      >
+        <ModalContent
+          title="Add a Project-Level Permission"
+          subTitle="The service account will be granted scoped access to the specified project and environment"
+        >
+          <form onSubmit={handleSubmit(onAddProjectLevelPermission)}>
+            {!isUserWorkspacesLoading && userWorkspaces && (
+              <>
+                <Controller
+                  control={control}
+                  defaultValue=""
+                  name="privateKey"
+                  render={({ field, fieldState: { error } }) => (
+                    <FormControl
+                      label="Service Account Private Key"
+                      isError={Boolean(error)}
+                      errorText={error?.message}
+                    >
+                      <Input {...field} />
+                    </FormControl>
+                  )}
+                />
+                <Controller
+                  control={control}
+                  name="workspace"
+                  defaultValue={String(userWorkspaces?.[0]?._id)}
+                  render={({ field: { onChange, ...field }, fieldState: { error } }) => (
+                    <FormControl label="Project" errorText={error?.message}>
+                      <Select
+                        defaultValue={field.value}
+                        {...field}
+                        onValueChange={(e) => {
+                          onChange(e);
+                          setSelectedWorkspace(e);
+                        }}
+                        className="border-mine-shaft-500 w-full border"
+                      >
+                        {userWorkspaces && userWorkspaces.length > 0 ? (
+                          userWorkspaces.map((userWorkspace) => {
+                            return (
+                              <SelectItem
+                                value={userWorkspace._id}
+                                key={`project-${userWorkspace._id}`}
+                              >
+                                {userWorkspace.name}
+                              </SelectItem>
+                            );
+                          })
+                        ) : (
+                          <SelectItem value="none" key="target-app-none">
+                            No projects found
+                          </SelectItem>
+                        )}
+                      </Select>
+                    </FormControl>
+                  )}
+                />
+                <Controller
+                  control={control}
+                  name="environment"
+                  defaultValue={String(userWorkspaces?.[0]?.environments?.[0]?.slug)}
+                  render={({ field: { onChange, ...field } }) => {
+                    const environments =
+                      userWorkspaces?.find(
+                        /* eslint-disable-next-line no-underscore-dangle */
+                        (userWorkspace) => userWorkspace._id === control?._formValues?.workspace
+                      )?.environments ?? [];
+                    return (
+                      <FormControl label="Environment" className="mt-4">
+                        <Select
+                          defaultValue={field.value}
+                          {...field}
+                          onValueChange={(e) => onChange(e)}
+                          className="border-mine-shaft-500 w-full border"
+                        >
+                          {environments.length > 0 ? (
+                            environments.map((environment) => {
+                              return (
+                                <SelectItem
+                                  value={environment.slug}
+                                  key={`environment-${environment.slug}`}
+                                >
+                                  {environment.name}
+                                </SelectItem>
+                              );
+                            })
+                          ) : (
+                            <SelectItem value="none" key="target-app-none">
+                              No environments found
+                            </SelectItem>
+                          )}
+                        </Select>
+                      </FormControl>
+                    );
+                  }}
+                />
+              </>
+            )}
+            <Controller
+              control={control}
+              name="permissions"
+              defaultValue={{
+                read: true,
+                write: false
+              }}
+              render={({ field: { onChange, value }, fieldState: { error } }) => {
+                const options = [
+                  {
+                    label: "Read (default)",
+                    value: "read"
+                  },
+                  {
+                    label: "Write",
+                    value: "write"
+                  }
+                ];
+
+                return (
+                  <FormControl
+                    label="Permissions"
+                    errorText={error?.message}
+                    isError={Boolean(error)}
+                  >
+                    <>
+                      {options.map(({ label, value: optionValue }) => {
+                        return (
+                          <Checkbox
+                            id={value[optionValue]}
+                            key={optionValue}
+                            className="data-[state=checked]:bg-primary"
+                            isChecked={value[optionValue]}
+                            isDisabled={optionValue === "read"}
+                            onCheckedChange={(state) => {
+                              onChange({
+                                ...value,
+                                [optionValue]: state
+                              });
+                            }}
+                          >
+                            {label}
+                          </Checkbox>
+                        );
+                      })}
+                    </>
+                  </FormControl>
+                );
+              }}
+            />
+            <div className="mt-8 flex items-center">
+              <Button
+                className="mr-4"
+                type="submit"
+                isDisabled={isSubmitting}
+                isLoading={isSubmitting}
+              >
+                Create
+              </Button>
+              <ModalClose asChild>
+                <Button variant="plain" colorSchema="secondary">
+                  Cancel
+                </Button>
+              </ModalClose>
+            </div>
+          </form>
+        </ModalContent>
+      </Modal>
+      <DeleteActionModal
+        isOpen={popUp.removeProjectLevelPermission.isOpen}
+        deleteKey="remove"
+        title="Do you want to remove this permission from the service account?"
+        onChange={(isOpen) => handlePopUpToggle("removeProjectLevelPermission", isOpen)}
+        onDeleteApproved={onRemoveProjectLevelPermission}
+      />
+    </div>
+  );
+};

frontend/src/views/Settings/OrgSettingsPage/components/OrgIncidentContactsSection/OrgIncidentContactsTable.tsx

@@ -1,9 +1,5 @@
 import { useState } from "react";
-import {
-  faContactBook,
-  faMagnifyingGlass,
-  faTrash
-} from "@fortawesome/free-solid-svg-icons";
+import { faContactBook, faMagnifyingGlass, faTrash } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 import { useNotificationContext } from "@app/components/context/Notifications/NotificationProvider";
@@ -23,13 +19,11 @@ import {
 } from "@app/components/v2";
 import { useOrganization } from "@app/context";
 import { usePopUp } from "@app/hooks";
-import {
-    useDeleteIncidentContact,
-    useGetOrgIncidentContact} from "@app/hooks/api";
+import { useDeleteIncidentContact, useGetOrgIncidentContact } from "@app/hooks/api";
 
 export const OrgIncidentContactsTable = () => {
-    const { createNotification } = useNotificationContext();
-    const { currentOrg } = useOrganization();
+  const { createNotification } = useNotificationContext();
+  const { currentOrg } = useOrganization();
   const { data: contacts, isLoading } = useGetOrgIncidentContact(currentOrg?._id ?? "");
   const [searchContact, setSearchContact] = useState("");
   const { handlePopUpToggle, popUp, handlePopUpOpen, handlePopUpClose } = usePopUp([
@@ -40,71 +34,71 @@ export const OrgIncidentContactsTable = () => {
 
   const onRemoveIncidentContact = async () => {
     try {
-        const incidentContactEmail = (popUp?.removeContact?.data as { email: string })?.email;
-        
-        if (!currentOrg?._id) return;
-        await mutateAsync({ 
-            orgId: currentOrg._id, 
-            email: incidentContactEmail
-        });
+      const incidentContactEmail = (popUp?.removeContact?.data as { email: string })?.email;
 
-        createNotification({
-            text: "Successfully removed incident contact",
-            type: "success"
-        });
-        
-        handlePopUpClose("removeContact");
+      if (!currentOrg?._id) return;
+      await mutateAsync({
+        orgId: currentOrg._id,
+        email: incidentContactEmail
+      });
+
+      createNotification({
+        text: "Successfully removed incident contact",
+        type: "success"
+      });
+
+      handlePopUpClose("removeContact");
     } catch (err) {
-        console.error(err);
-        createNotification({
-            text: "Failed to remove incident contact",
-            type: "error"
-        });
+      console.error(err);
+      createNotification({
+        text: "Failed to remove incident contact",
+        type: "error"
+      });
     }
   };
 
-  const filteredContacts = contacts ? contacts.filter(({ email }) =>
-    email.toLocaleLowerCase().includes(searchContact)
-  ) : [];
+  const filteredContacts = contacts
+    ? contacts.filter(({ email }) => email.toLocaleLowerCase().includes(searchContact))
+    : [];
 
   return (
     <div>
-        <Input
-            value={searchContact}
-            onChange={(e) => setSearchContact(e.target.value)}
-            leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
-            placeholder="Search incident contact by email..."
-        />
-        <TableContainer className="mt-4">
-          <Table>
-            <THead>
-              <Tr>
-                <Th>Email</Th>
-                <Th aria-label="actions" />
+      <Input
+        value={searchContact}
+        onChange={(e) => setSearchContact(e.target.value)}
+        leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
+        placeholder="Search incident contact by email..."
+      />
+      <TableContainer className="mt-4">
+        <Table>
+          <THead>
+            <Tr>
+              <Th>Email</Th>
+              <Th aria-label="actions" />
+            </Tr>
+          </THead>
+          <TBody>
+            {isLoading && <TableSkeleton columns={2} innerKey="incident-contact" />}
+            {filteredContacts?.map(({ email }) => (
+              <Tr key={email}>
+                <Td className="w-full">{email}</Td>
+                <Td className="mr-4">
+                  <IconButton
+                    ariaLabel="delete"
+                    colorSchema="danger"
+                    onClick={() => handlePopUpOpen("removeContact", { email })}
+                  >
+                    <FontAwesomeIcon icon={faTrash} />
+                  </IconButton>
+                </Td>
               </Tr>
-            </THead>
-            <TBody>
-              {isLoading && <TableSkeleton columns={2} key="incident-contact" />}
-              {filteredContacts?.map(({ email }) => (
-                <Tr key={email}>
-                  <Td className="w-full">{email}</Td>
-                  <Td className="mr-4">
-                    <IconButton
-                      ariaLabel="delete"
-                      colorSchema="danger"
-                      onClick={() => handlePopUpOpen("removeContact", { email })}
-                    >
-                      <FontAwesomeIcon icon={faTrash} />
-                    </IconButton>
-                  </Td>
-                </Tr>
-              ))}
-            </TBody>
-          </Table>
-          {filteredContacts?.length === 0 && !isLoading && (
-            <EmptyState title="No incident contacts found" icon={faContactBook} />
-          )}
-        </TableContainer>
+            ))}
+          </TBody>
+        </Table>
+        {filteredContacts?.length === 0 && !isLoading && (
+          <EmptyState title="No incident contacts found" icon={faContactBook} />
+        )}
+      </TableContainer>
       <DeleteActionModal
         isOpen={popUp.removeContact.isOpen}
         deleteKey="remove"

frontend/src/views/Settings/OrgSettingsPage/components/OrgServiceAccountsTable/OrgServiceAccountsTable.tsx

@@ -1,17 +1,14 @@
-import { useEffect, useMemo,useState } from "react";
-import { 
-    // Controller,
-    // useForm 
-} from "react-hook-form";
+import { useEffect, useMemo, useState } from "react";
 import { useRouter } from "next/router";
-import { 
-    faCheck, 
-    faCopy, 
-    faMagnifyingGlass, 
-    faPencil,
-    faPlus, 
-    faServer, 
-    faTrash} from "@fortawesome/free-solid-svg-icons";
+import {
+  faCheck,
+  faCopy,
+  faMagnifyingGlass,
+  faPencil,
+  faPlus,
+  faServer,
+  faTrash
+} from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 // import { yupResolver } from "@hookform/resolvers/yup";
@@ -21,13 +18,13 @@ import {
   Button,
   DeleteActionModal,
   EmptyState,
-//   FormControl,
+  //   FormControl,
   IconButton,
   Input,
   Modal,
   ModalContent,
-//   Select,
-//   SelectItem,
+  //   Select,
+  //   SelectItem,
   Table,
   TableContainer,
   TableSkeleton,
@@ -40,11 +37,15 @@ import {
 import { useOrganization, useWorkspace } from "@app/context";
 import { usePopUp, useToggle } from "@app/hooks";
 import {
-    // useCreateServiceAccount,
-    useDeleteServiceAccount,
-    useGetServiceAccounts
+  // useCreateServiceAccount,
+  useDeleteServiceAccount,
+  useGetServiceAccounts
 } from "@app/hooks/api";
 
+import // Controller,
+// useForm
+"react-hook-form";
+
 // const serviceAccountExpiration = [
 //   { label: "1 Day", value: 86400 },
 //   { label: "7 Days", value: 604800 },
@@ -62,314 +63,312 @@ import {
 // type TAddServiceAccountForm = yup.InferType<typeof addServiceAccountFormSchema>;
 
 export const OrgServiceAccountsTable = () => {
-    const router = useRouter();
-    const { currentOrg } = useOrganization();
-    const { currentWorkspace } = useWorkspace();
-    
-    const orgId = currentOrg?._id || "";
-    const [step, setStep] = useState(0);
-    const [isAccessKeyCopied, setIsAccessKeyCopied] = useToggle(false);
-    const [isPublicKeyCopied, setIsPublicKeyCopied] = useToggle(false);
-    const [isPrivateKeyCopied, setIsPrivateKeyCopied] = useToggle(false);
-    const [accessKey] = useState("");
-    const [publicKey] = useState("");
-    const [privateKey] = useState("");
-    const [searchServiceAccountFilter, setSearchServiceAccountFilter] = useState("");
-    const { handlePopUpToggle, popUp, handlePopUpOpen, handlePopUpClose } = usePopUp([
-        "addServiceAccount",
-        "removeServiceAccount",
-    ] as const);
+  const router = useRouter();
+  const { currentOrg } = useOrganization();
+  const { currentWorkspace } = useWorkspace();
 
-    const { data: serviceAccounts = [], isLoading: isServiceAccountsLoading } = useGetServiceAccounts(orgId);
-    
-    // const createServiceAccount = useCreateServiceAccount();
-    const removeServiceAccount = useDeleteServiceAccount();
-    
-    useEffect(() => {
-        let timer: NodeJS.Timeout;
-        if (isAccessKeyCopied) {
-            timer = setTimeout(() => setIsAccessKeyCopied.off(), 2000);
-        }
+  const orgId = currentOrg?._id || "";
+  const [step, setStep] = useState(0);
+  const [isAccessKeyCopied, setIsAccessKeyCopied] = useToggle(false);
+  const [isPublicKeyCopied, setIsPublicKeyCopied] = useToggle(false);
+  const [isPrivateKeyCopied, setIsPrivateKeyCopied] = useToggle(false);
+  const [accessKey] = useState("");
+  const [publicKey] = useState("");
+  const [privateKey] = useState("");
+  const [searchServiceAccountFilter, setSearchServiceAccountFilter] = useState("");
+  const { handlePopUpToggle, popUp, handlePopUpOpen, handlePopUpClose } = usePopUp([
+    "addServiceAccount",
+    "removeServiceAccount"
+  ] as const);
 
-        if (isPublicKeyCopied) {
-            timer = setTimeout(() => setIsPublicKeyCopied.off(), 2000);
-        }
+  const { data: serviceAccounts = [], isLoading: isServiceAccountsLoading } =
+    useGetServiceAccounts(orgId);
 
-        if (isPrivateKeyCopied) {
-            timer = setTimeout(() => setIsPrivateKeyCopied.off(), 2000);
-        }
+  // const createServiceAccount = useCreateServiceAccount();
+  const removeServiceAccount = useDeleteServiceAccount();
 
-        return () => clearTimeout(timer);
-    }, [isAccessKeyCopied, isPublicKeyCopied, isPrivateKeyCopied]);
-
-    // const {
-    //     control,
-    //     handleSubmit,
-    //     reset,
-    //     formState: { isSubmitting }
-    // } = useForm<TAddServiceAccountForm>({ resolver: yupResolver(addServiceAccountFormSchema) });
-    
-    // const onAddServiceAccount = async ({ name, expiresIn }: TAddServiceAccountForm) => {
-    //     if (!currentOrg?._id) return;
-
-    //     const keyPair = generateKeyPair();
-    //     setPublicKey(keyPair.publicKey);
-    //     setPrivateKey(keyPair.privateKey);
-        
-    //     const serviceAccountDetails = await createServiceAccount.mutateAsync({
-    //         name,
-    //         organizationId: currentOrg?._id,
-    //         publicKey: keyPair.publicKey,
-    //         expiresIn: Number(expiresIn)
-    //     });
-        
-    //     setAccessKey(serviceAccountDetails.serviceAccountAccessKey);
-
-    //     setStep(1);
-    //     reset();
-    // }
-    
-    const onRemoveServiceAccount = async () => {
-        const serviceAccountId = (popUp?.removeServiceAccount?.data as { _id: string })?._id;
-        await removeServiceAccount.mutateAsync(serviceAccountId);
-        handlePopUpClose("removeServiceAccount");
+  useEffect(() => {
+    let timer: NodeJS.Timeout;
+    if (isAccessKeyCopied) {
+      timer = setTimeout(() => setIsAccessKeyCopied.off(), 2000);
     }
-    
-    const filteredServiceAccounts = useMemo(
-        () =>
-            serviceAccounts.filter(
-                ({ name }) =>
-                    name.toLowerCase().includes(searchServiceAccountFilter)
-            ),
-        [serviceAccounts, searchServiceAccountFilter]
-    );
-    
-    const renderStep = (stepToRender: number) => {
-        switch (stepToRender) {
-            case 0:
-                return (
-                    <div>
-                        We are currently revising the service account mechanism. In the meantime,
-                        please use service tokens or API key to fetch secrets via API request.
-                    </div>
-                //    <form onSubmit={handleSubmit(onAddServiceAccount)}>
-                //         <Controller
-                //             control={control}
-                //             defaultValue=""
-                //             name="name"
-                //             render={({ field, fieldState: { error } }) => (
-                //                 <FormControl label="Name" isError={Boolean(error)} errorText={error?.message}>
-                //                 <Input {...field} />
-                //                 </FormControl>
-                //             )}
-                //         />
-                //         <Controller
-                //             control={control}
-                //             name="expiresIn"
-                //             defaultValue={String(serviceAccountExpiration?.[0]?.value)}
-                //             render={({ field: { onChange, ...field }, fieldState: { error } }) => {
-                //                 return (
-                //                     <FormControl
-                //                         label="Expiration"
-                //                         errorText={error?.message}
-                //                         isError={Boolean(error)}
-                //                     >
-                //                         <Select
-                //                             defaultValue={field.value}
-                //                             {...field}
-                //                             onValueChange={(e) => onChange(e)}
-                //                             className="w-full"
-                //                         >
-                //                         {serviceAccountExpiration.map(({ label, value }) => (
-                //                             <SelectItem value={String(value)} key={label}>
-                //                                 {label}
-                //                             </SelectItem>
-                //                         ))}
-                //                         </Select>
-                //                     </FormControl>
-                //                 );
-                //             }}
-                //         />
-                //         <div className="mt-8 flex items-center">
-                //             <Button
-                //                 className="mr-4"
-                //                 size="sm"
-                //                 type="submit"
-                //                 isLoading={isSubmitting}
-                //                 isDisabled={isSubmitting}
-                //             >
-                //                 Create Service Account
-                //             </Button>
-                //             <Button
-                //                 colorSchema="secondary"
-                //                 variant="plain"
-                //                 onClick={() => handlePopUpClose("addServiceAccount")}
-                //             >
-                //                 Cancel
-                //             </Button>
-                //         </div>
-                //     </form> 
-                );
-            case 1:
-                return (
-                    <>
-                        <p>Access Key</p>
-                        <div className="flex items-center justify-end rounded-md p-2 text-base text-gray-400 bg-white/[0.07]">
-                            <p className="mr-4 break-all">{accessKey}</p>
-                            <IconButton
-                                ariaLabel="copy icon"
-                                colorSchema="secondary"
-                                className="group relative"
-                                onClick={() => {
-                                    navigator.clipboard.writeText(accessKey);
-                                    setIsAccessKeyCopied.on();
-                                }}
-                            >
-                                <FontAwesomeIcon icon={isAccessKeyCopied ? faCheck : faCopy} />
-                                <span className="absolute -left-8 -top-20 hidden w-28 translate-y-full rounded-md bg-bunker-800 py-2 pl-3 text-center text-sm text-gray-400 group-hover:flex group-hover:animate-fadeIn">
-                                    Copy
-                                </span>
-                            </IconButton>
-                        </div>
-                        <p className="mt-4">Public Key</p>
-                        <div className="flex items-center justify-end rounded-md p-2 text-base text-gray-400 bg-white/[0.07]">
-                            <p className="mr-4 break-all">{publicKey}</p>
-                            <IconButton
-                                ariaLabel="copy icon"
-                                colorSchema="secondary"
-                                className="group relative"
-                                onClick={() => {
-                                    navigator.clipboard.writeText(publicKey);
-                                    setIsPublicKeyCopied.on();
-                                }}
-                            >
-                                <FontAwesomeIcon icon={isPublicKeyCopied ? faCheck : faCopy} />
-                                <span className="absolute -left-8 -top-20 hidden w-28 translate-y-full rounded-md bg-bunker-800 py-2 pl-3 text-center text-sm text-gray-400 group-hover:flex group-hover:animate-fadeIn">
-                                    Copy
-                                </span>
-                            </IconButton>
-                        </div>
-                        <p className="mt-4">Private Key</p>
-                        <div className="flex items-center justify-end rounded-md p-2 text-base text-gray-400 bg-white/[0.07]">
-                            <p className="mr-4 break-all">{privateKey}</p>
-                            <IconButton
-                                ariaLabel="copy icon"
-                                colorSchema="secondary"
-                                className="group relative"
-                                onClick={() => {
-                                    navigator.clipboard.writeText(privateKey);
-                                    setIsPrivateKeyCopied.on();
-                                }}
-                            >
-                                <FontAwesomeIcon icon={isPrivateKeyCopied ? faCheck : faCopy} />
-                                <span className="absolute -left-8 -top-20 hidden w-28 translate-y-full rounded-md bg-bunker-800 py-2 pl-3 text-center text-sm text-gray-400 group-hover:flex group-hover:animate-fadeIn">
-                                    Copy
-                                </span>
-                            </IconButton>
-                        </div>
-                        
-                    </>
-                );
-            default:
-                return <div />
-        }
+
+    if (isPublicKeyCopied) {
+      timer = setTimeout(() => setIsPublicKeyCopied.off(), 2000);
     }
-    
-    return (
-        <div className="w-full">
-            <div className="flex justify-between mb-4">
-                <p className="text-xl font-semibold text-mineshaft-100">Service Accounts</p>
-                <Button
-                    colorSchema="secondary"
-                    leftIcon={<FontAwesomeIcon icon={faPlus} />}
-                    onClick={() => {
-                        setStep(0);
-                        // reset();
-                        handlePopUpOpen("addServiceAccount");
-                    }}
-                >
-                    Add Service Account
-                </Button>
-            </div>
-            <Input 
-                value={searchServiceAccountFilter}
-                onChange={(e) => setSearchServiceAccountFilter(e.target.value)}
-                leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
-                placeholder="Search service accounts..."
-            />
-            <TableContainer className="mt-4">
-                <Table>
-                    <THead>
-                        <Th>Name</Th>
-                        <Th className="w-full">Valid Until</Th>
-                        <Th aria-label="actions" />
-                    </THead>
-                    <TBody>
-                        {isServiceAccountsLoading && <TableSkeleton columns={5} key="org-service-accounts" />}
-                        {!isServiceAccountsLoading && (
-                            filteredServiceAccounts.map(({
-                                name, 
-                                expiresAt, 
-                                _id: serviceAccountId 
-                            }) => {
-                                return (
-                                    <Tr key={`org-service-account-${serviceAccountId}`}>
-                                        <Td>{name}</Td>
-                                        <Td>{new Date(expiresAt).toUTCString()}</Td>
-                                        <Td>
-                                            <div className="flex">
-                                                <IconButton
-                                                    ariaLabel="edit"
-                                                    colorSchema="secondary"
-                                                    onClick={() => {
-                                                        if (currentWorkspace?._id) {
-                                                            router.push(`/settings/org/${currentWorkspace._id}/service-accounts/${serviceAccountId}`);
-                                                        }
-                                                    }}
-                                                    className="mr-2"
-                                                >
-                                                    <FontAwesomeIcon icon={faPencil} />
-                                                </IconButton>
-                                                <IconButton
-                                                    ariaLabel="delete"
-                                                    colorSchema="danger"
-                                                    onClick={() => handlePopUpOpen("removeServiceAccount", { _id: serviceAccountId })}
-                                                >
-                                                    <FontAwesomeIcon icon={faTrash} />
-                                                </IconButton>
-                                            </div>
-                                        </Td>
-                                    </Tr>
-                                );
-                            })
-                        )}
-                    </TBody>
-                </Table>
-                {!isServiceAccountsLoading && filteredServiceAccounts?.length === 0 && (
-                    <EmptyState title="No service accounts found" icon={faServer} />
-                )}
-            </TableContainer>
-            <Modal
-                isOpen={popUp?.addServiceAccount?.isOpen}
-                onOpenChange={(isOpen) => {
-                    handlePopUpToggle("addServiceAccount", isOpen);
-                    // reset();
+
+    if (isPrivateKeyCopied) {
+      timer = setTimeout(() => setIsPrivateKeyCopied.off(), 2000);
+    }
+
+    return () => clearTimeout(timer);
+  }, [isAccessKeyCopied, isPublicKeyCopied, isPrivateKeyCopied]);
+
+  // const {
+  //     control,
+  //     handleSubmit,
+  //     reset,
+  //     formState: { isSubmitting }
+  // } = useForm<TAddServiceAccountForm>({ resolver: yupResolver(addServiceAccountFormSchema) });
+
+  // const onAddServiceAccount = async ({ name, expiresIn }: TAddServiceAccountForm) => {
+  //     if (!currentOrg?._id) return;
+
+  //     const keyPair = generateKeyPair();
+  //     setPublicKey(keyPair.publicKey);
+  //     setPrivateKey(keyPair.privateKey);
+
+  //     const serviceAccountDetails = await createServiceAccount.mutateAsync({
+  //         name,
+  //         organizationId: currentOrg?._id,
+  //         publicKey: keyPair.publicKey,
+  //         expiresIn: Number(expiresIn)
+  //     });
+
+  //     setAccessKey(serviceAccountDetails.serviceAccountAccessKey);
+
+  //     setStep(1);
+  //     reset();
+  // }
+
+  const onRemoveServiceAccount = async () => {
+    const serviceAccountId = (popUp?.removeServiceAccount?.data as { _id: string })?._id;
+    await removeServiceAccount.mutateAsync(serviceAccountId);
+    handlePopUpClose("removeServiceAccount");
+  };
+
+  const filteredServiceAccounts = useMemo(
+    () =>
+      serviceAccounts.filter(({ name }) => name.toLowerCase().includes(searchServiceAccountFilter)),
+    [serviceAccounts, searchServiceAccountFilter]
+  );
+
+  const renderStep = (stepToRender: number) => {
+    switch (stepToRender) {
+      case 0:
+        return (
+          <div>
+            We are currently revising the service account mechanism. In the meantime, please use
+            service tokens or API key to fetch secrets via API request.
+          </div>
+          //    <form onSubmit={handleSubmit(onAddServiceAccount)}>
+          //         <Controller
+          //             control={control}
+          //             defaultValue=""
+          //             name="name"
+          //             render={({ field, fieldState: { error } }) => (
+          //                 <FormControl label="Name" isError={Boolean(error)} errorText={error?.message}>
+          //                 <Input {...field} />
+          //                 </FormControl>
+          //             )}
+          //         />
+          //         <Controller
+          //             control={control}
+          //             name="expiresIn"
+          //             defaultValue={String(serviceAccountExpiration?.[0]?.value)}
+          //             render={({ field: { onChange, ...field }, fieldState: { error } }) => {
+          //                 return (
+          //                     <FormControl
+          //                         label="Expiration"
+          //                         errorText={error?.message}
+          //                         isError={Boolean(error)}
+          //                     >
+          //                         <Select
+          //                             defaultValue={field.value}
+          //                             {...field}
+          //                             onValueChange={(e) => onChange(e)}
+          //                             className="w-full"
+          //                         >
+          //                         {serviceAccountExpiration.map(({ label, value }) => (
+          //                             <SelectItem value={String(value)} key={label}>
+          //                                 {label}
+          //                             </SelectItem>
+          //                         ))}
+          //                         </Select>
+          //                     </FormControl>
+          //                 );
+          //             }}
+          //         />
+          //         <div className="mt-8 flex items-center">
+          //             <Button
+          //                 className="mr-4"
+          //                 size="sm"
+          //                 type="submit"
+          //                 isLoading={isSubmitting}
+          //                 isDisabled={isSubmitting}
+          //             >
+          //                 Create Service Account
+          //             </Button>
+          //             <Button
+          //                 colorSchema="secondary"
+          //                 variant="plain"
+          //                 onClick={() => handlePopUpClose("addServiceAccount")}
+          //             >
+          //                 Cancel
+          //             </Button>
+          //         </div>
+          //     </form>
+        );
+      case 1:
+        return (
+          <>
+            <p>Access Key</p>
+            <div className="flex items-center justify-end rounded-md bg-white/[0.07] p-2 text-base text-gray-400">
+              <p className="mr-4 break-all">{accessKey}</p>
+              <IconButton
+                ariaLabel="copy icon"
+                colorSchema="secondary"
+                className="group relative"
+                onClick={() => {
+                  navigator.clipboard.writeText(accessKey);
+                  setIsAccessKeyCopied.on();
                 }}
-            >
-                <ModalContent
-                    title="Add Service Account"
-                    subTitle="A service account represents a machine identity such as a VM or application client."
-                >
-                    {renderStep(step)}
-                </ModalContent>
-            </Modal>
-            <DeleteActionModal
-                isOpen={popUp.removeServiceAccount.isOpen}
-                deleteKey="remove"
-                title="Do you want to remove this service account from the org?"
-                onChange={(isOpen) => handlePopUpToggle("removeServiceAccount", isOpen)}
-                onDeleteApproved={onRemoveServiceAccount}
-            />
-        </div>
-    );
-}
+              >
+                <FontAwesomeIcon icon={isAccessKeyCopied ? faCheck : faCopy} />
+                <span className="absolute -left-8 -top-20 hidden w-28 translate-y-full rounded-md bg-bunker-800 py-2 pl-3 text-center text-sm text-gray-400 group-hover:flex group-hover:animate-fadeIn">
+                  Copy
+                </span>
+              </IconButton>
+            </div>
+            <p className="mt-4">Public Key</p>
+            <div className="flex items-center justify-end rounded-md bg-white/[0.07] p-2 text-base text-gray-400">
+              <p className="mr-4 break-all">{publicKey}</p>
+              <IconButton
+                ariaLabel="copy icon"
+                colorSchema="secondary"
+                className="group relative"
+                onClick={() => {
+                  navigator.clipboard.writeText(publicKey);
+                  setIsPublicKeyCopied.on();
+                }}
+              >
+                <FontAwesomeIcon icon={isPublicKeyCopied ? faCheck : faCopy} />
+                <span className="absolute -left-8 -top-20 hidden w-28 translate-y-full rounded-md bg-bunker-800 py-2 pl-3 text-center text-sm text-gray-400 group-hover:flex group-hover:animate-fadeIn">
+                  Copy
+                </span>
+              </IconButton>
+            </div>
+            <p className="mt-4">Private Key</p>
+            <div className="flex items-center justify-end rounded-md bg-white/[0.07] p-2 text-base text-gray-400">
+              <p className="mr-4 break-all">{privateKey}</p>
+              <IconButton
+                ariaLabel="copy icon"
+                colorSchema="secondary"
+                className="group relative"
+                onClick={() => {
+                  navigator.clipboard.writeText(privateKey);
+                  setIsPrivateKeyCopied.on();
+                }}
+              >
+                <FontAwesomeIcon icon={isPrivateKeyCopied ? faCheck : faCopy} />
+                <span className="absolute -left-8 -top-20 hidden w-28 translate-y-full rounded-md bg-bunker-800 py-2 pl-3 text-center text-sm text-gray-400 group-hover:flex group-hover:animate-fadeIn">
+                  Copy
+                </span>
+              </IconButton>
+            </div>
+          </>
+        );
+      default:
+        return <div />;
+    }
+  };
+
+  return (
+    <div className="w-full">
+      <div className="mb-4 flex justify-between">
+        <p className="text-xl font-semibold text-mineshaft-100">Service Accounts</p>
+        <Button
+          colorSchema="secondary"
+          leftIcon={<FontAwesomeIcon icon={faPlus} />}
+          onClick={() => {
+            setStep(0);
+            // reset();
+            handlePopUpOpen("addServiceAccount");
+          }}
+        >
+          Add Service Account
+        </Button>
+      </div>
+      <Input
+        value={searchServiceAccountFilter}
+        onChange={(e) => setSearchServiceAccountFilter(e.target.value)}
+        leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
+        placeholder="Search service accounts..."
+      />
+      <TableContainer className="mt-4">
+        <Table>
+          <THead>
+            <Th>Name</Th>
+            <Th className="w-full">Valid Until</Th>
+            <Th aria-label="actions" />
+          </THead>
+          <TBody>
+            {isServiceAccountsLoading && (
+              <TableSkeleton columns={5} innerKey="org-service-accounts" />
+            )}
+            {!isServiceAccountsLoading &&
+              filteredServiceAccounts.map(({ name, expiresAt, _id: serviceAccountId }) => {
+                return (
+                  <Tr key={`org-service-account-${serviceAccountId}`}>
+                    <Td>{name}</Td>
+                    <Td>{new Date(expiresAt).toUTCString()}</Td>
+                    <Td>
+                      <div className="flex">
+                        <IconButton
+                          ariaLabel="edit"
+                          colorSchema="secondary"
+                          onClick={() => {
+                            if (currentWorkspace?._id) {
+                              router.push(
+                                `/settings/org/${currentWorkspace._id}/service-accounts/${serviceAccountId}`
+                              );
+                            }
+                          }}
+                          className="mr-2"
+                        >
+                          <FontAwesomeIcon icon={faPencil} />
+                        </IconButton>
+                        <IconButton
+                          ariaLabel="delete"
+                          colorSchema="danger"
+                          onClick={() =>
+                            handlePopUpOpen("removeServiceAccount", { _id: serviceAccountId })
+                          }
+                        >
+                          <FontAwesomeIcon icon={faTrash} />
+                        </IconButton>
+                      </div>
+                    </Td>
+                  </Tr>
+                );
+              })}
+          </TBody>
+        </Table>
+        {!isServiceAccountsLoading && filteredServiceAccounts?.length === 0 && (
+          <EmptyState title="No service accounts found" icon={faServer} />
+        )}
+      </TableContainer>
+      <Modal
+        isOpen={popUp?.addServiceAccount?.isOpen}
+        onOpenChange={(isOpen) => {
+          handlePopUpToggle("addServiceAccount", isOpen);
+          // reset();
+        }}
+      >
+        <ModalContent
+          title="Add Service Account"
+          subTitle="A service account represents a machine identity such as a VM or application client."
+        >
+          {renderStep(step)}
+        </ModalContent>
+      </Modal>
+      <DeleteActionModal
+        isOpen={popUp.removeServiceAccount.isOpen}
+        deleteKey="remove"
+        title="Do you want to remove this service account from the org?"
+        onChange={(isOpen) => handlePopUpToggle("removeServiceAccount", isOpen)}
+        onDeleteApproved={onRemoveServiceAccount}
+      />
+    </div>
+  );
+};

frontend/src/views/Settings/PersonalSettingsPage/APIKeySection/APIKeyTable.tsx

@@ -1,4 +1,4 @@
-import { faKey,faXmark } from "@fortawesome/free-solid-svg-icons";
+import { faKey, faXmark } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
 import { useNotificationContext } from "@app/components/context/Notifications/NotificationProvider";
@@ -14,99 +14,91 @@ import {
   THead,
   Tr
 } from "@app/components/v2";
-import {
-    useDeleteAPIKey,
-    useGetMyAPIKeys} from "@app/hooks/api";
+import { useDeleteAPIKey, useGetMyAPIKeys } from "@app/hooks/api";
 
 export const APIKeyTable = () => {
-    const { createNotification } = useNotificationContext();
-    const { data, isLoading } = useGetMyAPIKeys();
-    const { mutateAsync } = useDeleteAPIKey();
+  const { createNotification } = useNotificationContext();
+  const { data, isLoading } = useGetMyAPIKeys();
+  const { mutateAsync } = useDeleteAPIKey();
 
-    const handleDeleteAPIKeyDataClick = async (apiKeyDataId: string) => {
-        try {
-            await mutateAsync(apiKeyDataId);
-            createNotification({
-                text: "Successfully deleted API key",
-                type: "success"
-            });
-        } catch (err) {
-            console.error(err);
-            createNotification({
-                text: "Failed to delete API key",
-                type: "error"
-            });
-        }
+  const handleDeleteAPIKeyDataClick = async (apiKeyDataId: string) => {
+    try {
+      await mutateAsync(apiKeyDataId);
+      createNotification({
+        text: "Successfully deleted API key",
+        type: "success"
+      });
+    } catch (err) {
+      console.error(err);
+      createNotification({
+        text: "Failed to delete API key",
+        type: "error"
+      });
     }
-    
-    const formatDate = (dateToFormat: string) => {
-        const date = new Date(dateToFormat);
-        const year = date.getFullYear();
-        const month = date.getMonth() + 1;
-        const day = date.getDate();
-        
-        const formattedDate = `${day}/${month}/${year}`;
-        
-        return formattedDate;
-    }
-    
-    return (
-        <div>
-            <TableContainer className="">
-                <Table>
-                    <THead>
-                        <Tr>
-                            <Th className="flex-1">Name</Th>
-                            <Th className="flex-1">Last active</Th>
-                            <Th className="flex-1">Created</Th>
-                            <Th className="flex-1">Expiration</Th>
-                            <Th className="w-5" />
-                        </Tr>
-                    </THead>
-                    <TBody>
-                        {isLoading && <TableSkeleton columns={4} key="api-keys" />}
-                        {!isLoading && data && data.length > 0 && data.map(({
-                            _id,
-                            name,
-                            createdAt,
-                            expiresAt,
-                            lastUsed
-                        }) => {
-                            return (
-                                <Tr className="h-10" key={`api-key-${_id}`}>
-                                    <Td>{name}</Td>
-                                    <Td>{formatDate(lastUsed)}</Td>
-                                    <Td>{formatDate(createdAt)}</Td>
-                                    <Td>{formatDate(expiresAt)}</Td>
-                                    <Td>
-                                        <IconButton
-                                            onClick={async () => {
-                                                await handleDeleteAPIKeyDataClick(_id);
-                                            }}
-                                            size="lg"
-                                            colorSchema="danger"
-                                            variant="plain"
-                                            ariaLabel="update"
-                                        >
-                                            <FontAwesomeIcon icon={faXmark} />
-                                        </IconButton>
-                                    </Td>
-                                </Tr>
-                            );
-                        })}
-                        {!isLoading && data && data?.length === 0 && (
-                            <Tr>
-                                <Td colSpan={5}>
-                                    <EmptyState 
-                                        title="No API Keys on file" 
-                                        icon={faKey}
-                                    />
-                                </Td>
-                            </Tr>
-                        )}
-                    </TBody>
-                </Table>
-            </TableContainer>
-        </div>
-    );
-}
+  };
+
+  const formatDate = (dateToFormat: string) => {
+    const date = new Date(dateToFormat);
+    const year = date.getFullYear();
+    const month = date.getMonth() + 1;
+    const day = date.getDate();
+
+    const formattedDate = `${day}/${month}/${year}`;
+
+    return formattedDate;
+  };
+
+  return (
+    <div>
+      <TableContainer className="">
+        <Table>
+          <THead>
+            <Tr>
+              <Th className="flex-1">Name</Th>
+              <Th className="flex-1">Last active</Th>
+              <Th className="flex-1">Created</Th>
+              <Th className="flex-1">Expiration</Th>
+              <Th className="w-5" />
+            </Tr>
+          </THead>
+          <TBody>
+            {isLoading && <TableSkeleton columns={4} innerKey="api-keys" />}
+            {!isLoading &&
+              data &&
+              data.length > 0 &&
+              data.map(({ _id, name, createdAt, expiresAt, lastUsed }) => {
+                return (
+                  <Tr className="h-10" key={`api-key-${_id}`}>
+                    <Td>{name}</Td>
+                    <Td>{formatDate(lastUsed)}</Td>
+                    <Td>{formatDate(createdAt)}</Td>
+                    <Td>{formatDate(expiresAt)}</Td>
+                    <Td>
+                      <IconButton
+                        onClick={async () => {
+                          await handleDeleteAPIKeyDataClick(_id);
+                        }}
+                        size="lg"
+                        colorSchema="danger"
+                        variant="plain"
+                        ariaLabel="update"
+                      >
+                        <FontAwesomeIcon icon={faXmark} />
+                      </IconButton>
+                    </Td>
+                  </Tr>
+                );
+              })}
+            {!isLoading && data && data?.length === 0 && (
+              <Tr>
+                <Td colSpan={5}>
+                  <EmptyState title="No API Keys on file" icon={faKey} />
+                </Td>
+              </Tr>
+            )}
+          </TBody>
+        </Table>
+      </TableContainer>
+    </div>
+  );
+};

frontend/src/views/Settings/PersonalSettingsPage/SessionsSection/SessionsTable.tsx

@@ -14,61 +14,54 @@ import {
 import { useGetMySessions } from "@app/hooks/api";
 
 export const SessionsTable = () => {
-    const { data, isLoading } = useGetMySessions();
+  const { data, isLoading } = useGetMySessions();
 
-    const formatDate = (dateToFormat: string) => {
-        const date = new Date(dateToFormat);
-        const year = date.getFullYear();
-        const month = date.getMonth() + 1;
-        const day = date.getDate();
-        
-        const formattedDate = `${day}/${month}/${year}`;
-        
-        return formattedDate;
-    }
-    
-    return (
-        <TableContainer className="mt-4">
-            <Table>
-                <THead>
-                    <Tr>
-                        <Th>Created</Th>
-                        <Th>Last active</Th>
-                        <Th>IP address</Th>
-                        <Th>Device</Th>
-                    </Tr> 
-                </THead>
-                <TBody>
-                    {isLoading && <TableSkeleton columns={4} key="sesssions" />}
-                    {!isLoading && data && data.length > 0 && data.map(({
-                        _id,
-                        createdAt,
-                        lastUsed,
-                        ip,
-                        userAgent
-                    }) => {
-                        return (
-                            <Tr className="h-10" key={`session-${_id}`}>
-                                <Td>{formatDate(createdAt)}</Td>
-                                <Td>{formatDate(lastUsed)}</Td>
-                                <Td>{ip}</Td>
-                                <Td>{userAgent}</Td>
-                            </Tr>
-                        );
-                    })}
-                    {!isLoading && data && data?.length === 0 && (
-                        <Tr>
-                            <Td colSpan={4}>
-                                <EmptyState 
-                                    title="No sessions on file" 
-                                    icon={faServer}
-                                />
-                            </Td>
-                        </Tr>
-                    )}
-                </TBody>
-            </Table>
-        
-        </TableContainer>
-    );
-}
+  const formatDate = (dateToFormat: string) => {
+    const date = new Date(dateToFormat);
+    const year = date.getFullYear();
+    const month = date.getMonth() + 1;
+    const day = date.getDate();
+
+    const formattedDate = `${day}/${month}/${year}`;
+
+    return formattedDate;
+  };
+
+  return (
+    <TableContainer className="mt-4">
+      <Table>
+        <THead>
+          <Tr>
+            <Th>Created</Th>
+            <Th>Last active</Th>
+            <Th>IP address</Th>
+            <Th>Device</Th>
+          </Tr>
+        </THead>
+        <TBody>
+          {isLoading && <TableSkeleton columns={4} innerKey="sesssions" />}
+          {!isLoading &&
+            data &&
+            data.length > 0 &&
+            data.map(({ _id, createdAt, lastUsed, ip, userAgent }) => {
+              return (
+                <Tr className="h-10" key={`session-${_id}`}>
+                  <Td>{formatDate(createdAt)}</Td>
+                  <Td>{formatDate(lastUsed)}</Td>
+                  <Td>{ip}</Td>
+                  <Td>{userAgent}</Td>
+                </Tr>
+              );
+            })}
+          {!isLoading && data && data?.length === 0 && (
+            <Tr>
+              <Td colSpan={4}>
+                <EmptyState title="No sessions on file" icon={faServer} />
+              </Td>
+            </Tr>
+          )}
+        </TBody>
+      </Table>
+    </TableContainer>
+  );
+};

frontend/src/views/Settings/ProjectSettingsPage/components/EnvironmentSection/EnvironmentTable.tsx

@@ -11,79 +11,79 @@ import {
   Td,
   Th,
   THead,
-  Tr,
+  Tr
 } from "@app/components/v2";
 import { useWorkspace } from "@app/context";
 import { UsePopUpState } from "@app/hooks/usePopUp";
 
 type Props = {
-    handlePopUpOpen: (
-        popUpName: keyof UsePopUpState<["updateEnv", "deleteEnv", "upgradePlan"]>,
-        {
-            name,
-            slug
-        }: {
-            name: string;
-            slug: string;
-        }
-    ) => void;
+  handlePopUpOpen: (
+    popUpName: keyof UsePopUpState<["updateEnv", "deleteEnv", "upgradePlan"]>,
+    {
+      name,
+      slug
+    }: {
+      name: string;
+      slug: string;
+    }
+  ) => void;
 };
 
-export const EnvironmentTable = ({
-    handlePopUpOpen
-}: Props) => {
-    const { currentWorkspace, isLoading } = useWorkspace();
-    return (
-        <TableContainer>
-            <Table>
-                <THead>
-                    <Tr>
-                    <Th>Name</Th>
-                    <Th>Slug</Th>
-                    <Th aria-label="button" />
-                    </Tr>
-                </THead>
-                <TBody>
-                    {isLoading && <TableSkeleton columns={3} key="project-envs" />}
-                    {!isLoading && currentWorkspace && currentWorkspace.environments.map(({ name, slug }) => (
-                        <Tr key={name}>
-                            <Td>{name}</Td>
-                            <Td>{slug}</Td>
-                            <Td className="flex items-center justify-end">
-                                <IconButton
-                                    className="mr-3 py-2"
-                                    onClick={() => {
-                                        handlePopUpOpen("updateEnv", { name, slug });
-                                    }}
-                                    colorSchema="primary"
-                                    variant="plain"
-                                    ariaLabel="update"
-                                >
-                                    <FontAwesomeIcon icon={faPencil} />
-                                </IconButton>
-                                <IconButton
-                                    onClick={() => {
-                                        handlePopUpOpen("deleteEnv", { name, slug });
-                                    }}
-                                    size="lg"
-                                    colorSchema="danger"
-                                    variant="plain"
-                                    ariaLabel="update"
-                                >
-                                    <FontAwesomeIcon icon={faXmark} />
-                                </IconButton>
-                            </Td>
-                        </Tr>
-                    ))}
-                    {!isLoading && currentWorkspace && currentWorkspace.environments?.length === 0 && (
-                    <Tr>
-                        <Td colSpan={3}>
-                            <EmptyState title="No environments found" />
-                        </Td>
-                    </Tr>
-                    )}
-                </TBody>
-            </Table>
-        </TableContainer>
-    );
-}
+export const EnvironmentTable = ({ handlePopUpOpen }: Props) => {
+  const { currentWorkspace, isLoading } = useWorkspace();
+  return (
+    <TableContainer>
+      <Table>
+        <THead>
+          <Tr>
+            <Th>Name</Th>
+            <Th>Slug</Th>
+            <Th aria-label="button" />
+          </Tr>
+        </THead>
+        <TBody>
+          {isLoading && <TableSkeleton columns={3} innerKey="project-envs" />}
+          {!isLoading &&
+            currentWorkspace &&
+            currentWorkspace.environments.map(({ name, slug }) => (
+              <Tr key={name}>
+                <Td>{name}</Td>
+                <Td>{slug}</Td>
+                <Td className="flex items-center justify-end">
+                  <IconButton
+                    className="mr-3 py-2"
+                    onClick={() => {
+                      handlePopUpOpen("updateEnv", { name, slug });
+                    }}
+                    colorSchema="primary"
+                    variant="plain"
+                    ariaLabel="update"
+                  >
+                    <FontAwesomeIcon icon={faPencil} />
+                  </IconButton>
+                  <IconButton
+                    onClick={() => {
+                      handlePopUpOpen("deleteEnv", { name, slug });
+                    }}
+                    size="lg"
+                    colorSchema="danger"
+                    variant="plain"
+                    ariaLabel="update"
+                  >
+                    <FontAwesomeIcon icon={faXmark} />
+                  </IconButton>
+                </Td>
+              </Tr>
+            ))}
+          {!isLoading && currentWorkspace && currentWorkspace.environments?.length === 0 && (
+            <Tr>
+              <Td colSpan={3}>
+                <EmptyState title="No environments found" />
+              </Td>
+            </Tr>
+          )}
+        </TBody>
+      </Table>
+    </TableContainer>
+  );
+};

frontend/src/views/Settings/ProjectSettingsPage/components/SecretTagsSection/SecretTagsTable.tsx

@@ -18,65 +18,65 @@ import { useGetWsTags } from "@app/hooks/api";
 import { UsePopUpState } from "@app/hooks/usePopUp";
 
 type Props = {
-    handlePopUpOpen: (
-      popUpName: keyof UsePopUpState<["deleteTagConfirmation"]>,
-      {
-        name,
-        id
-      }: {
-        name: string;
-        id: string;
-      }
-    ) => void;
+  handlePopUpOpen: (
+    popUpName: keyof UsePopUpState<["deleteTagConfirmation"]>,
+    {
+      name,
+      id
+    }: {
+      name: string;
+      id: string;
+    }
+  ) => void;
 };
 
-export const SecretTagsTable = ({
-   handlePopUpOpen 
-}: Props) => {
-    const { currentWorkspace }= useWorkspace();
-    const { data, isLoading } = useGetWsTags(currentWorkspace?._id ?? "");
+export const SecretTagsTable = ({ handlePopUpOpen }: Props) => {
+  const { currentWorkspace } = useWorkspace();
+  const { data, isLoading } = useGetWsTags(currentWorkspace?._id ?? "");
 
-    return (
-        <TableContainer className="mt-4">
-        <Table>
-          <THead>
-            <Tr>
-              <Th>Tag</Th>
-              <Th>Slug</Th>
-              <Th aria-label="button" />
-            </Tr>
-          </THead>
-          <TBody>
-            {isLoading && <TableSkeleton columns={3} key="secret-tags" />}
-            {!isLoading && data && data.map(({ _id, name, slug }) => (
-                <Tr key={name}>
-                  <Td>{name}</Td>
-                  <Td>{slug}</Td>
-                  <Td className="flex items-center justify-end">
-                    <IconButton
-                      onClick={() =>
-                        handlePopUpOpen("deleteTagConfirmation", {
-                          name,
-                          id: _id
-                        })
-                      }
-                      colorSchema="danger"
-                      ariaLabel="update"
-                    >
-                      <FontAwesomeIcon icon={faTrashCan} />
-                    </IconButton>
-                  </Td>
-                </Tr>
-              ))}
-            {!isLoading && data && data?.length === 0 && (
-              <Tr>
-                <Td colSpan={3}>
-                  <EmptyState title="No secret tags found" icon={faTags} />
+  return (
+    <TableContainer className="mt-4">
+      <Table>
+        <THead>
+          <Tr>
+            <Th>Tag</Th>
+            <Th>Slug</Th>
+            <Th aria-label="button" />
+          </Tr>
+        </THead>
+        <TBody>
+          {isLoading && <TableSkeleton columns={3} innerKey="secret-tags" />}
+          {!isLoading &&
+            data &&
+            data.map(({ _id, name, slug }) => (
+              <Tr key={name}>
+                <Td>{name}</Td>
+                <Td>{slug}</Td>
+                <Td className="flex items-center justify-end">
+                  <IconButton
+                    onClick={() =>
+                      handlePopUpOpen("deleteTagConfirmation", {
+                        name,
+                        id: _id
+                      })
+                    }
+                    colorSchema="danger"
+                    ariaLabel="update"
+                  >
+                    <FontAwesomeIcon icon={faTrashCan} />
+                  </IconButton>
                 </Td>
               </Tr>
-            )}
-          </TBody>
-        </Table>
-      </TableContainer>
-    );
-}
+            ))}
+          {!isLoading && data && data?.length === 0 && (
+            <Tr>
+              <Td colSpan={3}>
+                <EmptyState title="No secret tags found" icon={faTags} />
+              </Td>
+            </Tr>
+          )}
+        </TBody>
+      </Table>
+    </TableContainer>
+  );
+};

frontend/src/views/Settings/ProjectSettingsPage/components/ServiceTokenSection/ServiceTokenTable.tsx

@@ -48,7 +48,7 @@ export const ServiceTokenTable = ({ handlePopUpOpen }: Props) => {
           </Tr>
         </THead>
         <TBody>
-          {isLoading && <TableSkeleton columns={4} key="project-service-tokens" />}
+          {isLoading && <TableSkeleton columns={4} innerKey="project-service-tokens" />}
           {!isLoading &&
             data &&
             data.map((row) => (

frontend/src/views/Settings/ProjectSettingsPage/components/WebhooksTab/WebhooksTab.tsx

@@ -160,7 +160,7 @@ export const WebhooksTab = () => {
               </Tr>
             </THead>
             <TBody>
-              {isWebhooksLoading && <TableSkeleton columns={5} key="webhooks-loading" />}
+              {isWebhooksLoading && <TableSkeleton columns={5} innerKey="webhooks-loading" />}
               {!isWebhooksLoading && webhooks && webhooks?.length === 0 && (
                 <Tr>
                   <Td colSpan={5}>