awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: lowercase and remove truncate for button

Browse Source
This commit is contained in:
Salman
2024-03-12 03:42:38 +05:30
parent db9f21be87
commit 3f0c4f0ca9
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/layouts/AppLayout/AppLayout.tsx
View File

@@ -28,6 +28,7 @@ import {
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { yupResolver } from "@hookform/resolvers/yup"; import { yupResolver } from "@hookform/resolvers/yup";
import { DropdownMenuTrigger } from "@radix-ui/react-dropdown-menu"; import { DropdownMenuTrigger } from "@radix-ui/react-dropdown-menu";
import { twMerge } from "tailwind-merge";
import * as yup from "yup"; import * as yup from "yup";
import { useNotificationContext } from "@app/components/context/Notifications/NotificationProvider"; import { useNotificationContext } from "@app/components/context/Notifications/NotificationProvider";
@@ -99,7 +100,7 @@ const supportOptions = [
]; ];
const formSchema = yup.object({ const formSchema = yup.object({
name: yup.string().required().label("Project Name").trim().max(64, "Too long, Maximum length is 64 characters"), name: yup.string().required().label("Project Name").trim().max(64, "Too long, maximum length is 64 characters"),
addMembers: yup.bool().required().label("Add Members") addMembers: yup.bool().required().label("Add Members")
}); });
@@ -441,9 +442,10 @@ export const AppLayout = ({ children }: LayoutProps) => {
<SelectItem <SelectItem
key={`ws-layout-list-${id}`} key={`ws-layout-list-${id}`}
value={id} value={id}
className={`${ className={twMerge(
currentWorkspace?.id === id && "bg-mineshaft-600" currentWorkspace?.id === id && "bg-mineshaft-600",
} truncate`} "truncate"
)}
> >
{name} {name}
</SelectItem> </SelectItem>

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

@@ -453,7 +453,7 @@ const LearningItemSquare = ({
}; };
const formSchema = yup.object({ const formSchema = yup.object({
name: yup.string().required().label("Project Name").trim().max(64, "Too long, Maximum length is 64 characters"), name: yup.string().required().label("Project Name").trim().max(64, "Too long, maximum length is 64 characters"),
addMembers: yup.bool().required().label("Add Members") addMembers: yup.bool().required().label("Add Members")
}); });

2
frontend/src/views/Settings/OrgSettingsPage/components/OrgDeleteSection/OrgDeleteSection.tsx
View File

@@ -55,7 +55,7 @@ export const OrgDeleteSection = () => {
onClick={() => handlePopUpOpen("deleteOrg")} onClick={() => handlePopUpOpen("deleteOrg")}
isDisabled={Boolean(membership && membership.role !== "admin")} isDisabled={Boolean(membership && membership.role !== "admin")}
> >
<p className="max-w-[180px] truncate">Delete {currentOrg?.name}</p> {`Delete ${currentOrg?.name}`}
</Button> </Button>
<DeleteActionModal <DeleteActionModal
isOpen={popUp.deleteOrg.isOpen} isOpen={popUp.deleteOrg.isOpen}

2
frontend/src/views/Settings/OrgSettingsPage/components/OrgNameChangeSection/OrgNameChangeSection.tsx
View File

@@ -14,7 +14,7 @@ const formSchema = yup.object({
.string() .string()
.required() .required()
.label("Organization Name") .label("Organization Name")
.max(64, "Too long, Maximum length is 64 characters") .max(64, "Too long, maximum length is 64 characters")
}); });
type FormData = yup.InferType<typeof formSchema>; type FormData = yup.InferType<typeof formSchema>;

2
frontend/src/views/Settings/ProjectSettingsPage/components/ProjectNameChangeSection/ProjectNameChangeSection.tsx
View File

@@ -13,7 +13,7 @@ import { useToggle } from "@app/hooks";
import { useRenameWorkspace } from "@app/hooks/api"; import { useRenameWorkspace } from "@app/hooks/api";
const formSchema = yup.object({ const formSchema = yup.object({
name: yup.string().required().label("Project Name").max(64, "Too long, Maximum length is 64 characters"), name: yup.string().required().label("Project Name").max(64, "Too long, maximum length is 64 characters"),
}); });
type FormData = yup.InferType<typeof formSchema>; type FormData = yup.InferType<typeof formSchema>;