Merge branches 'master' and 'master' of https://github.com/codesandbox/codesandbox-client into draft/priceless-diffie

Author: alexnm

packages/app/src/app/components/WorkspaceSetup/steps/Create.tsx

@@ -1,5 +1,6 @@
 import React, { useEffect, useRef, useState } from 'react';
-import { useActions, useAppState } from 'app/overmind';
+import { useActions, useAppState, useEffects } from 'app/overmind';
+import { useHistory } from 'react-router-dom';
 import {
   Stack,
   Button,
@@ -34,6 +35,8 @@ export const Create: React.FC<StepProps> = ({
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<string>('');
   const inputRef = useRef<HTMLInputElement>(null);
+  const [disableButton, setDisableButton] = useState(false);
+  const [loadingButton, setLoadingButton] = useState(false);
 
   const urlWorkspaceId = getQueryParam('workspace');
   const teamIsAlreadyCreated = !!urlWorkspaceId;
@@ -143,6 +146,7 @@ export const Create: React.FC<StepProps> = ({
                 defaultValue={teamIsAlreadyCreated ? activeTeamInfo.name : ''}
                 onChange={handleInput}
                 ref={inputRef}
+                disabled={disableButton || loading}
               />
 
               {error && (
@@ -157,26 +161,145 @@ export const Create: React.FC<StepProps> = ({
           </Stack>
 
           <Button
-            loading={loading}
-            disabled={loading || !!error}
+            loading={loadingButton || loading}
+            disabled={disableButton || loading || !!error}
             type="submit"
             size="large"
             autoWidth
           >
             Next
           </Button>
         </Stack>
+
+        <JoinWorkspace
+          onStart={() => setLoadingButton(true)}
+          onDidFinish={() => setLoadingButton(false)}
+          onDidFindWorkspace={() => setDisableButton(true)}
+          onRejectWorkspace={() => setDisableButton(false)}
+        />
+
         <Link
           href={docsUrl('/learn/plans/workspace')}
           target="_blank"
           rel="noreferrer"
         >
-          <Stack gap={1} align="center">
+          <Stack gap={2} align="center">
             <Text>More about teams and workspaces</Text>
-            <Icon name="external" size={16} />
+            <Icon name="external" size={14} />
           </Stack>
         </Link>
       </Stack>
     </AnimatedStep>
   );
 };
+
+const JoinWorkspace: React.FC<{
+  onDidFindWorkspace: () => void;
+  onRejectWorkspace: () => void;
+  onStart: () => void;
+  onDidFinish: () => void;
+}> = ({ onDidFindWorkspace, onStart, onDidFinish, onRejectWorkspace }) => {
+  const [hidden, setHidden] = useState(true);
+  const effects = useEffects();
+  const actions = useActions();
+  const [eligibleWorkspace, setEligibleWorkspace] = useState<{
+    id: string;
+    name: string;
+  }>(null);
+  const history = useHistory();
+  const [loading, setLoading] = useState(false);
+
+  useEffect(() => {
+    onStart();
+
+    effects.gql.queries
+      .getEligibleWorkspaces({})
+      .then(result => {
+        const hasEligibleWorkspace = result.me.eligibleWorkspaces.length > 0;
+        if (hasEligibleWorkspace) {
+          onDidFindWorkspace();
+          setEligibleWorkspace(result.me.eligibleWorkspaces[0]);
+        }
+      })
+      .catch(e => {})
+      .finally(() => {
+        onDidFinish();
+      });
+  }, []);
+
+  const joinWorkspace = () => {
+    setLoading(true);
+    effects.gql.mutations
+      .joinEligibleWorkspace({
+        workspaceId: eligibleWorkspace.id,
+      })
+      .then(async () => {
+        await actions.setActiveTeam({ id: eligibleWorkspace.id });
+        await actions.dashboard.getTeams();
+
+        history.push(`/dashboard/recent?workspace=${eligibleWorkspace.id}`);
+      });
+  };
+
+  if (eligibleWorkspace && hidden) {
+    return (
+      <>
+        <Text css={{ textAlign: 'center' }}>or</Text>
+        <Stack
+          direction="vertical"
+          css={{
+            background: '#1A1A1A',
+            padding: 18,
+            marginLeft: -18,
+            marginRight: -18,
+            borderRadius: 4,
+          }}
+        >
+          <Text
+            margin={0}
+            as="h1"
+            color="#fff"
+            weight="medium"
+            fontFamily="everett"
+            size={24}
+          >
+            You have been invited to join the {eligibleWorkspace.name} workspace
+          </Text>
+          <p>
+            Your email matches the domain of the {eligibleWorkspace.name}{' '}
+            workspace.
+          </p>
+
+          <Stack gap={4} css={{ marginTop: 32 }}>
+            <Button
+              autoWidth
+              loading={loading}
+              type="submit"
+              size="large"
+              onClick={joinWorkspace}
+              css={{ flex: 1 }}
+            >
+              Join workspace
+            </Button>
+
+            <Button
+              autoWidth
+              type="submit"
+              size="large"
+              css={{ flex: 1 }}
+              variant="secondary"
+              onClick={() => {
+                setHidden(false);
+                onRejectWorkspace();
+              }}
+            >
+              Reject
+            </Button>
+          </Stack>
+        </Stack>
+      </>
+    );
+  }
+
+  return null;
+};

packages/app/src/app/components/dashboard/InputText.tsx

@@ -16,7 +16,7 @@ const StyledInput = styled.input<{ isInvalid?: boolean }>`
 
   ${props => (props.isInvalid ? 'outline: 1px solid #EB5E5E;' : '')}
 
-  &:hover {
+  &:hover:not(:disabled) {
     box-shadow: 0 0 0 2px #e5e5e51a;
   }
 

packages/app/src/app/graphql/types.ts

@@ -155,8 +155,24 @@ export type RootQueryType = {
    * ```
    */
   recentTeamsByRepository: Array<TeamPreview>;
-  /** Get a sandbox */
+  /**
+   * Get a sandbox by its (short) ID
+   *
+   * Requires the current user have read authorization (or that the sandbox is public). Otherwise
+   * returns an error (`"unauthorized"`).
+   */
   sandbox: Maybe<Sandbox>;
+  /**
+   * Returns a sandbox's team ID if the current user is eligible to join that workspace
+   *
+   * This query is designed for use in 404 experience where the current user does not have access
+   * to the resource but *might* have access if they accept an open invitation to its workspace.
+   * Returns null if no such open invitation exists, or an error if no user is authenticated.
+   *
+   * For a list of all workspaces the user is eligible to join, see `query eligibleWorkspaces`.
+   * The ID returned by this query can be used in `mutation joinEligibleWorkspace`.
+   */
+  sandboxEligibleWorkspace: Maybe<TeamPreview>;
   /** A team from an invite token */
   teamByToken: Maybe<TeamPreview>;
 };
@@ -227,6 +243,10 @@ export type RootQueryTypeSandboxArgs = {
   sandboxId: Scalars['ID'];
 };
 
+export type RootQueryTypeSandboxEligibleWorkspaceArgs = {
+  sandboxId: Scalars['ID'];
+};
+
 export type RootQueryTypeTeamByTokenArgs = {
   inviteToken: Scalars['String'];
 };
@@ -496,7 +516,11 @@ export type TeamLimits = {
   includedDrafts: Scalars['Int'];
   /** Number of workspace members included with the team's subscription, including add-ons */
   includedMembers: Scalars['Int'];
-  /** Number of sandboxes included with the team's subscription, including add-ons */
+  /** Number of included private browser sandboxes with the team's subscription */
+  includedPrivateSandboxes: Scalars['Int'];
+  /** Number of included public browser sandboxes with the team's subscription */
+  includedPublicSandboxes: Scalars['Int'];
+  /** DEPRECATED: Number of sandboxes included with the team's subscription */
   includedSandboxes: Scalars['Int'];
   /** Storage (in GB) included with the team's subscription, including add-ons */
   includedStorage: Scalars['Int'];
@@ -2173,12 +2197,14 @@ export type RootMutationTypeAddSandboxesToAlbumArgs = {
 
 export type RootMutationTypeAddToCollectionArgs = {
   collectionPath: Scalars['String'];
+  privacy: InputMaybe<Scalars['Int']>;
   sandboxIds: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
   teamId: InputMaybe<Scalars['UUID4']>;
 };
 
 export type RootMutationTypeAddToCollectionOrTeamArgs = {
   collectionPath: InputMaybe<Scalars['String']>;
+  privacy: InputMaybe<Scalars['Int']>;
   sandboxIds: InputMaybe<Array<InputMaybe<Scalars['ID']>>>;
   teamId: InputMaybe<Scalars['UUID4']>;
 };
@@ -5683,6 +5709,15 @@ export type SetTeamMetadataMutation = {
   };
 };
 
+export type JoinEligibleWorkspaceMutationVariables = Exact<{
+  workspaceId: Scalars['ID'];
+}>;
+
+export type JoinEligibleWorkspaceMutation = {
+  __typename?: 'RootMutationType';
+  joinEligibleWorkspace: { __typename?: 'Team'; id: any };
+};
+
 export type RecentlyDeletedTeamSandboxesQueryVariables = Exact<{
   teamId: Scalars['UUID4'];
 }>;
@@ -6630,6 +6665,24 @@ export type GetSandboxWithTemplateQuery = {
   } | null;
 };
 
+export type GetEligibleWorkspacesQueryVariables = Exact<{
+  [key: string]: never;
+}>;
+
+export type GetEligibleWorkspacesQuery = {
+  __typename?: 'RootQueryType';
+  me: {
+    __typename?: 'CurrentUser';
+    eligibleWorkspaces: Array<{
+      __typename?: 'TeamPreview';
+      id: any;
+      avatarUrl: string | null;
+      name: string;
+      shortid: string;
+    }>;
+  } | null;
+};
+
 export type RecentNotificationFragment = {
   __typename?: 'Notification';
   id: any;

packages/app/src/app/overmind/effects/gql/dashboard/mutations.ts

@@ -63,6 +63,8 @@ import {
   UpdateUsageSubscriptionMutation,
   SetTeamMetadataMutation,
   SetTeamMetadataMutationVariables,
+  JoinEligibleWorkspaceMutation,
+  JoinEligibleWorkspaceMutationVariables,
 } from 'app/graphql/types';
 import { gql, Query } from 'overmind-graphql';
 
@@ -490,3 +492,14 @@ export const setTeamMetadata: Query<
   }
   ${teamFragmentDashboard}
 `;
+
+export const joinEligibleWorkspace: Query<
+  JoinEligibleWorkspaceMutation,
+  JoinEligibleWorkspaceMutationVariables
+> = gql`
+  mutation JoinEligibleWorkspace($workspaceId: ID!) {
+    joinEligibleWorkspace(workspaceId: $workspaceId) {
+      id
+    }
+  }
+`;

packages/app/src/app/overmind/effects/gql/dashboard/queries.ts

@@ -41,6 +41,8 @@ import {
   GetFullGitHubOrganizationReposQueryVariables,
   GetSandboxWithTemplateQuery,
   GetSandboxWithTemplateQueryVariables,
+  GetEligibleWorkspacesQuery,
+  GetEligibleWorkspacesQueryVariables,
 } from 'app/graphql/types';
 import { gql, Query } from 'overmind-graphql';
 
@@ -399,3 +401,19 @@ export const getSandboxWithTemplate: Query<
     }
   }
 `;
+
+export const getEligibleWorkspaces: Query<
+  GetEligibleWorkspacesQuery,
+  GetEligibleWorkspacesQueryVariables
+> = gql`
+  query GetEligibleWorkspaces {
+    me {
+      eligibleWorkspaces {
+        id
+        avatarUrl
+        name
+        shortid
+      }
+    }
+  }
+`;