improvement: address requested changes

This commit is contained in:
Scott Wilson
2024-11-12 16:11:47 -08:00
parent ddcf5b576b
commit 1f2b0443cc
5 changed files with 16 additions and 17 deletions
@@ -11,7 +11,7 @@ import { SecretType } from "@app/hooks/api/types";
import Button from "../basic/buttons/Button"; import Button from "../basic/buttons/Button";
import Error from "../basic/Error"; import Error from "../basic/Error";
import { createNotification } from "../notifications"; import { createNotification } from "../notifications";
import { parseDotEnv } from "../utilities/parseDotEnv"; import { parseDotEnv } from "../utilities/parseSecrets";
import guidGenerator from "../utilities/randomId"; import guidGenerator from "../utilities/randomId";
interface DropZoneProps { interface DropZoneProps {
@@ -1,11 +0,0 @@
export const parseJson = (src: ArrayBuffer | string) => {
const file = src.toString();
const formatedData: Record<string, string> = JSON.parse(file);
const env: Record<string, { value: string; comments: string[] }> = {};
Object.keys(formatedData).forEach((key) => {
if (typeof formatedData[key] === "string") {
env[key] = { value: formatedData[key], comments: [] };
}
});
return env;
};
@@ -65,3 +65,15 @@ export function parseDotEnv(src: ArrayBuffer | string) {
return object; return object;
} }
export const parseJson = (src: ArrayBuffer | string) => {
const file = src.toString();
const formatedData: Record<string, string> = JSON.parse(file);
const env: Record<string, { value: string; comments: string[] }> = {};
Object.keys(formatedData).forEach((key) => {
if (typeof formatedData[key] === "string") {
env[key] = { value: formatedData[key], comments: [] };
}
});
return env;
};
@@ -6,8 +6,7 @@ import { zodResolver } from "@hookform/resolvers/zod";
import { z } from "zod"; import { z } from "zod";
import { ProjectPermissionCan } from "@app/components/permissions"; import { ProjectPermissionCan } from "@app/components/permissions";
import { parseDotEnv } from "@app/components/utilities/parseDotEnv"; import { parseDotEnv, parseJson } from "@app/components/utilities/parseSecrets";
import { parseJson } from "@app/components/utilities/parseJson";
import { import {
Button, Button,
FormControl, FormControl,
@@ -111,7 +110,7 @@ export const PasteSecretEnvModal = ({
variant="star" variant="star"
size={isSmaller ? "xs" : "sm"} size={isSmaller ? "xs" : "sm"}
> >
Paste Secret Values Paste Secrets
</Button> </Button>
)} )}
</ProjectPermissionCan> </ProjectPermissionCan>
@@ -9,8 +9,7 @@ import { twMerge } from "tailwind-merge";
import { createNotification } from "@app/components/notifications"; import { createNotification } from "@app/components/notifications";
import { ProjectPermissionCan } from "@app/components/permissions"; import { ProjectPermissionCan } from "@app/components/permissions";
// TODO:(akhilmhdh) convert all the util functions like this into a lib folder grouped by functionality // TODO:(akhilmhdh) convert all the util functions like this into a lib folder grouped by functionality
import { parseDotEnv } from "@app/components/utilities/parseDotEnv"; import { parseDotEnv, parseJson } from "@app/components/utilities/parseSecrets";
import { parseJson } from "@app/components/utilities/parseJson";
import { Button, Modal, ModalContent } from "@app/components/v2"; import { Button, Modal, ModalContent } from "@app/components/v2";
import { ProjectPermissionActions, ProjectPermissionSub } from "@app/context"; import { ProjectPermissionActions, ProjectPermissionSub } from "@app/context";
import { usePopUp, useToggle } from "@app/hooks"; import { usePopUp, useToggle } from "@app/hooks";