Fix rebase issue with deleted files

This commit is contained in:
carlosmonastyrski
2025-03-14 08:54:14 -03:00
parent c0de4ae3ee
commit 4f4764dfcd
11 changed files with 40 additions and 19 deletions
@@ -110,7 +110,7 @@ export const useUpdateOrg = () => {
defaultMembershipRoleSlug,
enforceMfa,
selectedMfaMethod,
secretShareSendToAnyone
allowSecretSharingOutsideOrganization
}) => {
return apiRequest.patch(`/api/v1/organization/${orgId}`, {
name,
@@ -120,7 +120,7 @@ export const useUpdateOrg = () => {
defaultMembershipRoleSlug,
enforceMfa,
selectedMfaMethod,
secretShareSendToAnyone
allowSecretSharingOutsideOrganization
});
},
onSuccess: () => {
+2 -2
View File
@@ -15,7 +15,7 @@ export type Organization = {
defaultMembershipRole: string;
enforceMfa: boolean;
selectedMfaMethod?: MfaMethod;
secretShareSendToAnyone?: boolean;
allowSecretSharingOutsideOrganization?: boolean;
};
export type UpdateOrgDTO = {
@@ -27,7 +27,7 @@ export type UpdateOrgDTO = {
defaultMembershipRoleSlug?: string;
enforceMfa?: boolean;
selectedMfaMethod?: MfaMethod;
secretShareSendToAnyone?: boolean;
allowSecretSharingOutsideOrganization?: boolean;
};
export type BillingDetails = {
@@ -101,8 +101,6 @@ export const RolePermissionsSection = ({ roleId }: Props) => {
const onSubmit = async (el: TFormSchema) => {
try {
console.log(el.permissions);
console.log(formRolePermission2API(el.permissions));
await updateRole({
orgId,
id: roleId,
@@ -14,7 +14,7 @@ export const SecretSharingAllowShareToAnyone = () => {
await mutateAsync({
orgId: currentOrg.id,
secretShareSendToAnyone: value
allowSecretSharingOutsideOrganization: value
});
createNotification({
@@ -42,7 +42,7 @@ export const SecretSharingAllowShareToAnyone = () => {
<Switch
id="enable-secret-sharing-outside-org"
onCheckedChange={(value) => handleSecretSharingToggle(value)}
isChecked={currentOrg?.secretShareSendToAnyone ?? false}
isChecked={currentOrg?.allowSecretSharingOutsideOrganization ?? false}
isDisabled={!isAllowed}
/>
)}
@@ -232,7 +232,7 @@ export const ShareSecretForm = ({ isPublic, value }: Props) => {
onValueChange={(e) => onChange(e)}
className="w-full"
>
{currentOrg?.secretShareSendToAnyone && (
{currentOrg?.allowSecretSharingOutsideOrganization && (
<SelectItem value={SecretSharingAccessType.Anyone}>Anyone</SelectItem>
)}
<SelectItem value={SecretSharingAccessType.Organization}>