mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-08 07:27:43 +00:00
fix: more label changes
This commit is contained in:
@@ -21,7 +21,7 @@ export const SettingsPage = () => {
|
|||||||
<div className="w-full max-w-8xl">
|
<div className="w-full max-w-8xl">
|
||||||
<PageHeader
|
<PageHeader
|
||||||
scope={isSubOrganization ? "namespace" : "org"}
|
scope={isSubOrganization ? "namespace" : "org"}
|
||||||
description="Configure organization-wide settings"
|
description={`Configure ${isSubOrganization ? "sub-" : ""}organization-wide settings`}
|
||||||
title={isSubOrganization ? "Sub-Organization Settings" : "Organization Settings"}
|
title={isSubOrganization ? "Sub-Organization Settings" : "Organization Settings"}
|
||||||
>
|
>
|
||||||
{isSubOrganization && (
|
{isSubOrganization && (
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ const OrgConfigSection = ({
|
|||||||
resolver: zodResolver(orgConfigFormSchema)
|
resolver: zodResolver(orgConfigFormSchema)
|
||||||
});
|
});
|
||||||
|
|
||||||
const { currentOrg } = useOrganization();
|
const { currentOrg, isSubOrganization } = useOrganization();
|
||||||
const { mutateAsync: setupOrgKmip } = useSetupOrgKmip(currentOrg.id);
|
const { mutateAsync: setupOrgKmip } = useSetupOrgKmip(currentOrg.id);
|
||||||
|
|
||||||
const onFormSubmit = async (formData: TKmipOrgConfigForm) => {
|
const onFormSubmit = async (formData: TKmipOrgConfigForm) => {
|
||||||
@@ -175,7 +175,10 @@ const OrgConfigSection = ({
|
|||||||
)}
|
)}
|
||||||
{!isKmipConfigLoading && !kmipConfig && (
|
{!isKmipConfigLoading && !kmipConfig && (
|
||||||
<div className="mt-2">
|
<div className="mt-2">
|
||||||
<div>KMIP has not yet been configured for the organization.</div>
|
<div>
|
||||||
|
KMIP has not yet been configured for the {isSubOrganization ? "sub-" : ""}
|
||||||
|
organization.
|
||||||
|
</div>
|
||||||
<Button
|
<Button
|
||||||
className="mt-2"
|
className="mt-2"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
|
|||||||
+2
-2
@@ -32,7 +32,7 @@ import { UpdateExternalKmsForm } from "./UpdateExternalKmsForm";
|
|||||||
|
|
||||||
export const OrgEncryptionTab = withPermission(
|
export const OrgEncryptionTab = withPermission(
|
||||||
() => {
|
() => {
|
||||||
const { currentOrg } = useOrganization();
|
const { currentOrg, isSubOrganization } = useOrganization();
|
||||||
const { subscription } = useSubscription();
|
const { subscription } = useSubscription();
|
||||||
const orgId = currentOrg?.id || "";
|
const orgId = currentOrg?.id || "";
|
||||||
const { popUp, handlePopUpOpen, handlePopUpToggle } = usePopUp([
|
const { popUp, handlePopUpOpen, handlePopUpToggle } = usePopUp([
|
||||||
@@ -86,7 +86,7 @@ export const OrgEncryptionTab = withPermission(
|
|||||||
</OrgPermissionCan>
|
</OrgPermissionCan>
|
||||||
</div>
|
</div>
|
||||||
<p className="mb-4 text-gray-400">
|
<p className="mb-4 text-gray-400">
|
||||||
Encrypt your organization's data with external KMS.
|
Encrypt your {isSubOrganization ? "sub-" : ""}organization's data with external KMS.
|
||||||
</p>
|
</p>
|
||||||
<TableContainer>
|
<TableContainer>
|
||||||
<Table>
|
<Table>
|
||||||
|
|||||||
+1
-1
@@ -60,7 +60,7 @@ export const SubOrgNameChangeSection = (): JSX.Element => {
|
|||||||
return (
|
return (
|
||||||
<form onSubmit={handleSubmit(onFormSubmit)} className="py-4">
|
<form onSubmit={handleSubmit(onFormSubmit)} className="py-4">
|
||||||
<div>
|
<div>
|
||||||
<h2 className="text-md mb-2 text-mineshaft-100">Organization Name</h2>
|
<h2 className="text-md mb-2 text-mineshaft-100">Sub-Organization Name</h2>
|
||||||
<Controller
|
<Controller
|
||||||
defaultValue=""
|
defaultValue=""
|
||||||
render={({ field, fieldState: { error } }) => (
|
render={({ field, fieldState: { error } }) => (
|
||||||
|
|||||||
Reference in New Issue
Block a user