From 09e621539ea2941e1f94c5d8045bfa4b85824f63 Mon Sep 17 00:00:00 2001
From: Sheen Capadngan <sheensantoscapadngan@gmail.com>
Date: Wed, 4 Sep 2024 23:54:19 +0800
Subject: [PATCH] misc: finalized labels

---
 .../secret-approval-request/secret-approval-request-fns.ts  | 1 -
 frontend/src/hooks/api/workflowIntegrations/types.ts        | 2 +-
 .../AddWorkflowIntegrationForm.tsx                          | 6 +-----
 .../OrgWorkflowIntegrationTab/IntegrationFormDetails.tsx    | 2 +-
 .../OrgWorkflowIntegrationTab/SlackIntegrationForm.tsx      | 6 +++---
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/backend/src/ee/services/secret-approval-request/secret-approval-request-fns.ts b/backend/src/ee/services/secret-approval-request/secret-approval-request-fns.ts
index 466b4b94f..5a0c64b20 100644
--- a/backend/src/ee/services/secret-approval-request/secret-approval-request-fns.ts
+++ b/backend/src/ee/services/secret-approval-request/secret-approval-request-fns.ts
@@ -39,7 +39,6 @@ export const triggerSecretApprovalSlackNotif = async ({
   environment,
   secretPath
 }: TTriggerSecretApprovalSlackNotif) => {
-  // construct message here
   const appCfg = getConfig();
   const project = await projectDAL.findProjectWithOrg(projectId);
   const user = await userDAL.findById(secretApprovalRequest.committerUserId);
diff --git a/frontend/src/hooks/api/workflowIntegrations/types.ts b/frontend/src/hooks/api/workflowIntegrations/types.ts
index 9342af9f7..6d8820f2e 100644
--- a/frontend/src/hooks/api/workflowIntegrations/types.ts
+++ b/frontend/src/hooks/api/workflowIntegrations/types.ts
@@ -1,5 +1,5 @@
 export enum WorkflowIntegrationPlatform {
-  SLACK = "slack"
+  SLACK = "Slack"
 }
 
 export type SlackIntegration = {
diff --git a/frontend/src/views/Settings/OrgSettingsPage/components/OrgWorkflowIntegrationTab/AddWorkflowIntegrationForm.tsx b/frontend/src/views/Settings/OrgSettingsPage/components/OrgWorkflowIntegrationTab/AddWorkflowIntegrationForm.tsx
index 63182dda1..e31147599 100644
--- a/frontend/src/views/Settings/OrgSettingsPage/components/OrgWorkflowIntegrationTab/AddWorkflowIntegrationForm.tsx
+++ b/frontend/src/views/Settings/OrgSettingsPage/components/OrgWorkflowIntegrationTab/AddWorkflowIntegrationForm.tsx
@@ -38,11 +38,7 @@ export const AddWorkflowIntegrationForm = ({ isOpen, onToggle }: Props) => {
 
   return (
     <Modal isOpen={isOpen} onOpenChange={(state) => handleFormReset(state)}>
-      <ModalContent
-        title="Add a workflow integration"
-        subTitle="Configure a workflow integration"
-        className="my-4"
-      >
+      <ModalContent title={`Add a ${selectedPlatform ?? "workflow"} integration`} className="my-4">
         <AnimatePresence exitBeforeEnter>
           {wizardStep === WizardSteps.SelectPlatform && (
             <motion.div
diff --git a/frontend/src/views/Settings/OrgSettingsPage/components/OrgWorkflowIntegrationTab/IntegrationFormDetails.tsx b/frontend/src/views/Settings/OrgSettingsPage/components/OrgWorkflowIntegrationTab/IntegrationFormDetails.tsx
index fce1edb92..aef48deb1 100644
--- a/frontend/src/views/Settings/OrgSettingsPage/components/OrgWorkflowIntegrationTab/IntegrationFormDetails.tsx
+++ b/frontend/src/views/Settings/OrgSettingsPage/components/OrgWorkflowIntegrationTab/IntegrationFormDetails.tsx
@@ -13,7 +13,7 @@ type Props = {
 export const IntegrationFormDetails = ({ isOpen, id, onOpenChange, workflowPlatform }: Props) => {
   return (
     <Modal isOpen={isOpen} onOpenChange={onOpenChange}>
-      <ModalContent title="Workflow integration details">
+      <ModalContent title={`${WorkflowIntegrationPlatform.SLACK} integration`}>
         {workflowPlatform === WorkflowIntegrationPlatform.SLACK && (
           <SlackIntegrationForm id={id} onClose={() => onOpenChange(false)} />
         )}
diff --git a/frontend/src/views/Settings/OrgSettingsPage/components/OrgWorkflowIntegrationTab/SlackIntegrationForm.tsx b/frontend/src/views/Settings/OrgSettingsPage/components/OrgWorkflowIntegrationTab/SlackIntegrationForm.tsx
index c72d8aae3..2c17fae59 100644
--- a/frontend/src/views/Settings/OrgSettingsPage/components/OrgWorkflowIntegrationTab/SlackIntegrationForm.tsx
+++ b/frontend/src/views/Settings/OrgSettingsPage/components/OrgWorkflowIntegrationTab/SlackIntegrationForm.tsx
@@ -89,7 +89,7 @@ export const SlackIntegrationForm = ({ id, onClose }: Props) => {
         control={control}
         name="slug"
         render={({ field, fieldState: { error } }) => (
-          <FormControl label="Alias" errorText={error?.message} isError={Boolean(error)}>
+          <FormControl label="Alias" isRequired errorText={error?.message} isError={Boolean(error)}>
             <Input placeholder="" {...field} />
           </FormControl>
         )}
@@ -104,13 +104,13 @@ export const SlackIntegrationForm = ({ id, onClose }: Props) => {
         )}
       />
       {slackIntegration && (
-        <FormControl label="Slack workspace">
+        <FormControl label="Connected Slack workspace">
           <Input value={slackIntegration?.teamName} isReadOnly className="bg-white/[0.07]" />
         </FormControl>
       )}
       <div className="mt-6 flex items-center space-x-4">
         <Button type="submit" isLoading={isSubmitting || isConnectLoading} isDisabled={!isDirty}>
-          {slackIntegration ? "Save" : "Connect"}
+          {slackIntegration ? "Save" : "Connect Slack"}
         </Button>
         <Button variant="outline_bg" onClick={onClose}>
           Cancel