Skip to content

fix(context-menu): use parent privacy on fork #8447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 14, 2024
Merged

fix(context-menu): use parent privacy on fork #8447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a02495c
fix(context-menu): use parent privacy on fork
danilowoz May 13, 2024
b098a4f
fix type
danilowoz May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 95 additions & 17 deletions packages/app/src/app/graphql/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4551,7 +4551,11 @@ export type SandboxFragmentDashboardFragment = {
color: string | null;
iconUrl: string | null;
} | null;
collection: { __typename?: 'Collection'; path: string } | null;
collection: {
__typename?: 'Collection';
path: string;
id: any | null;
} | null;
permissions: {
__typename?: 'SandboxProtectionSettings';
preventSandboxLeaving: boolean;
Expand Down Expand Up @@ -4610,7 +4614,11 @@ export type RepoFragmentDashboardFragment = {
color: string | null;
iconUrl: string | null;
} | null;
collection: { __typename?: 'Collection'; path: string } | null;
collection: {
__typename?: 'Collection';
path: string;
id: any | null;
} | null;
permissions: {
__typename?: 'SandboxProtectionSettings';
preventSandboxLeaving: boolean;
Expand Down Expand Up @@ -4676,7 +4684,11 @@ export type TemplateFragmentDashboardFragment = {
color: string | null;
iconUrl: string | null;
} | null;
collection: { __typename?: 'Collection'; path: string } | null;
collection: {
__typename?: 'Collection';
path: string;
id: any | null;
} | null;
permissions: {
__typename?: 'SandboxProtectionSettings';
preventSandboxLeaving: boolean;
Expand Down Expand Up @@ -5133,7 +5145,11 @@ export type AddToFolderMutation = {
color: string | null;
iconUrl: string | null;
} | null;
collection: { __typename?: 'Collection'; path: string } | null;
collection: {
__typename?: 'Collection';
path: string;
id: any | null;
} | null;
permissions: {
__typename?: 'SandboxProtectionSettings';
preventSandboxLeaving: boolean;
Expand Down Expand Up @@ -5182,7 +5198,11 @@ export type MoveToTrashMutation = {
color: string | null;
iconUrl: string | null;
} | null;
collection: { __typename?: 'Collection'; path: string } | null;
collection: {
__typename?: 'Collection';
path: string;
id: any | null;
} | null;
permissions: {
__typename?: 'SandboxProtectionSettings';
preventSandboxLeaving: boolean;
Expand Down Expand Up @@ -5232,7 +5252,11 @@ export type ChangePrivacyMutation = {
color: string | null;
iconUrl: string | null;
} | null;
collection: { __typename?: 'Collection'; path: string } | null;
collection: {
__typename?: 'Collection';
path: string;
id: any | null;
} | null;
permissions: {
__typename?: 'SandboxProtectionSettings';
preventSandboxLeaving: boolean;
Expand Down Expand Up @@ -5282,7 +5306,11 @@ export type ChangeFrozenMutation = {
color: string | null;
iconUrl: string | null;
} | null;
collection: { __typename?: 'Collection'; path: string } | null;
collection: {
__typename?: 'Collection';
path: string;
id: any | null;
} | null;
permissions: {
__typename?: 'SandboxProtectionSettings';
preventSandboxLeaving: boolean;
Expand Down Expand Up @@ -5332,7 +5360,11 @@ export type _RenameSandboxMutation = {
color: string | null;
iconUrl: string | null;
} | null;
collection: { __typename?: 'Collection'; path: string } | null;
collection: {
__typename?: 'Collection';
path: string;
id: any | null;
} | null;
permissions: {
__typename?: 'SandboxProtectionSettings';
preventSandboxLeaving: boolean;
Expand Down Expand Up @@ -5753,6 +5785,16 @@ export type SetTeamMetadataMutation = {
ubbBeta: boolean;
friendOfCsb: boolean;
};
limits: {
__typename?: 'TeamLimits';
includedPublicSandboxes: number;
includedPrivateSandboxes: number;
};
usage: {
__typename?: 'TeamUsage';
publicSandboxesQuantity: number;
privateSandboxesQuantity: number;
};
};
};

Expand Down Expand Up @@ -5809,7 +5851,11 @@ export type RecentlyDeletedTeamSandboxesQuery = {
color: string | null;
iconUrl: string | null;
} | null;
collection: { __typename?: 'Collection'; path: string } | null;
collection: {
__typename?: 'Collection';
path: string;
id: any | null;
} | null;
permissions: {
__typename?: 'SandboxProtectionSettings';
preventSandboxLeaving: boolean;
Expand Down Expand Up @@ -5873,7 +5919,11 @@ export type SandboxesByPathQuery = {
color: string | null;
iconUrl: string | null;
} | null;
collection: { __typename?: 'Collection'; path: string } | null;
collection: {
__typename?: 'Collection';
path: string;
id: any | null;
} | null;
permissions: {
__typename?: 'SandboxProtectionSettings';
preventSandboxLeaving: boolean;
Expand Down Expand Up @@ -5929,7 +5979,11 @@ export type TeamDraftsQuery = {
color: string | null;
iconUrl: string | null;
} | null;
collection: { __typename?: 'Collection'; path: string } | null;
collection: {
__typename?: 'Collection';
path: string;
id: any | null;
} | null;
permissions: {
__typename?: 'SandboxProtectionSettings';
preventSandboxLeaving: boolean;
Expand Down Expand Up @@ -6018,7 +6072,11 @@ export type GetTeamReposQuery = {
color: string | null;
iconUrl: string | null;
} | null;
collection: { __typename?: 'Collection'; path: string } | null;
collection: {
__typename?: 'Collection';
path: string;
id: any | null;
} | null;
permissions: {
__typename?: 'SandboxProtectionSettings';
preventSandboxLeaving: boolean;
Expand Down Expand Up @@ -6092,7 +6150,11 @@ export type TeamTemplatesQuery = {
color: string | null;
iconUrl: string | null;
} | null;
collection: { __typename?: 'Collection'; path: string } | null;
collection: {
__typename?: 'Collection';
path: string;
id: any | null;
} | null;
permissions: {
__typename?: 'SandboxProtectionSettings';
preventSandboxLeaving: boolean;
Expand Down Expand Up @@ -6216,7 +6278,11 @@ export type _SearchTeamSandboxesQuery = {
color: string | null;
iconUrl: string | null;
} | null;
collection: { __typename?: 'Collection'; path: string } | null;
collection: {
__typename?: 'Collection';
path: string;
id: any | null;
} | null;
permissions: {
__typename?: 'SandboxProtectionSettings';
preventSandboxLeaving: boolean;
Expand Down Expand Up @@ -6270,7 +6336,11 @@ export type RecentlyAccessedSandboxesQuery = {
color: string | null;
iconUrl: string | null;
} | null;
collection: { __typename?: 'Collection'; path: string } | null;
collection: {
__typename?: 'Collection';
path: string;
id: any | null;
} | null;
permissions: {
__typename?: 'SandboxProtectionSettings';
preventSandboxLeaving: boolean;
Expand Down Expand Up @@ -6353,7 +6423,11 @@ export type SharedWithMeSandboxesQuery = {
color: string | null;
iconUrl: string | null;
} | null;
collection: { __typename?: 'Collection'; path: string } | null;
collection: {
__typename?: 'Collection';
path: string;
id: any | null;
} | null;
permissions: {
__typename?: 'SandboxProtectionSettings';
preventSandboxLeaving: boolean;
Expand Down Expand Up @@ -6943,7 +7017,11 @@ export type TeamSidebarDataQuery = {
color: string | null;
iconUrl: string | null;
} | null;
collection: { __typename?: 'Collection'; path: string } | null;
collection: {
__typename?: 'Collection';
path: string;
id: any | null;
} | null;
permissions: {
__typename?: 'SandboxProtectionSettings';
preventSandboxLeaving: boolean;
Expand Down
1 change: 1 addition & 0 deletions packages/app/src/app/overmind/effects/gql/dashboard/fragments.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export const sandboxFragmentDashboard = gql`

collection {
path
id
}

authorId
Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/app/overmind/namespaces/editor/actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,7 @@ export const forkExternalSandbox = async (
customVMTier?: number;
redirectAfterFork?: boolean;
body?: {
collectionId: string;
collectionId?: string;
alias?: string;
v2?: boolean;
title?: string;
Expand Down
4 changes: 4 additions & 0 deletions packages/app/src/app/pages/Dashboard/Components/Selection/ContextMenus/SandboxMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,10 @@ export const SandboxMenu: React.FC<SandboxMenuProps> = ({
openInNewWindow: true,
hasBetaEditorExperiment,
redirectAfterFork: true,
body: {
privacy: sandbox.draft ? 2 : (sandbox.privacy as 2 | 1 | 0),
collectionId: sandbox.draft ? undefined : sandbox.collection.id,
},
});
}}
disabled={restrictedFork}
Expand Down