Mar 22, 2024 · Mar 22, 2024 · Mar 22, 2024
diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePage.test.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePage.test.tsx
    );
  });

  it("optional external auth is optional", async () => {
    jest
      .spyOn(API, "getWorkspaceQuota")
      .mockResolvedValueOnce(MockWorkspaceQuota);
    jest
      .spyOn(API, "getUsers")
      .mockResolvedValueOnce({ users: [MockUser], count: 1 });
    jest.spyOn(API, "createWorkspace").mockResolvedValueOnce(MockWorkspace);
    jest
      .spyOn(API, "getTemplateVersionExternalAuth")
      .mockResolvedValue([
        { ...MockTemplateVersionExternalAuthGithub, optional: true },
      ]);

    renderCreateWorkspacePage();
    await waitForLoaderToBeRemoved();

    const nameField = await screen.findByLabelText(nameLabelText);
    // have to use fireEvent b/c userEvent isn't cleaning up properly between tests
    fireEvent.change(nameField, {
      target: { value: "test" },
    });

    // Ensure we're not logged in
    await screen.findByText("Login with GitHub");

    const submitButton = screen.getByText(createWorkspaceText);
    await userEvent.click(submitButton);

    await waitFor(() =>
      expect(API.createWorkspace).toBeCalledWith(
        MockUser.organization_ids[0],
        MockUser.id,
        expect.objectContaining({
          ...MockWorkspaceRequest,
        }),
      ),
    );
  });

  it("auto create a workspace if uses mode=auto", async () => {
    const param = "first_parameter";
    const paramValue = "It works!";
diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.stories.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.stories.tsx
    template: MockTemplate,
    parameters: [],
    externalAuth: [],
    hasAllRequiredExternalAuth: true,
    mode: "form",
    permissions: {
      createWorkspaceForUser: true,
        optional: true,
      },
    ],
    hasAllRequiredExternalAuth: false,
  },
 };

        optional: true,
      },
    ],
    hasAllRequiredExternalAuth: false,
  },
 };

diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageView.tsx
  externalAuth,
  externalAuthPollingState,
  startPollingExternalAuth,
  hasAllRequiredExternalAuth,
  parameters,
  autofillParameters,
  permissions,
  onCancel,
 }) => {
  const [owner, setOwner] = useState(defaultOwner);
  const requiresExternalAuth = externalAuth.some((auth) => !auth.authenticated);
  const [suggestedName, setSuggestedName] = useState(() =>
    generateWorkspaceName(),
  );
      }),
      enableReinitialize: true,
      onSubmit: (request) => {
        if (requiresExternalAuth) {
        if (!hasAllRequiredExternalAuth) {
          return;
        }

    [autofillParameters],
  );

  const hasAllRequiredExternalAuth = externalAuth.every(
    (auth) => auth.optional || auth.authenticated,
  );

  return (
    <Margins size="medium">
      <PageHeader actions={<Button onClick={onCancel}>Cancel</Button>}>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -233,6 +233,46 @@ describe("CreateWorkspacePage", () => {
		);
		});

		it("optional external auth is optional", async () => {
		jest
		.spyOn(API, "getWorkspaceQuota")
		.mockResolvedValueOnce(MockWorkspaceQuota);
		jest
		.spyOn(API, "getUsers")
		.mockResolvedValueOnce({ users: [MockUser], count: 1 });
		jest.spyOn(API, "createWorkspace").mockResolvedValueOnce(MockWorkspace);
		jest
		.spyOn(API, "getTemplateVersionExternalAuth")
		.mockResolvedValue([
		{ ...MockTemplateVersionExternalAuthGithub, optional: true },
		]);

		renderCreateWorkspacePage();
		await waitForLoaderToBeRemoved();

		const nameField = await screen.findByLabelText(nameLabelText);
		// have to use fireEvent b/c userEvent isn't cleaning up properly between tests
		fireEvent.change(nameField, {
		target: { value: "test" },
		});

		// Ensure we're not logged in
		await screen.findByText("Login with GitHub");

		const submitButton = screen.getByText(createWorkspaceText);
		await userEvent.click(submitButton);

		await waitFor(() =>
		expect(API.createWorkspace).toBeCalledWith(
		MockUser.organization_ids[0],
		MockUser.id,
		expect.objectContaining({
		...MockWorkspaceRequest,
		}),
		),
		);
		});

		it("auto create a workspace if uses mode=auto", async () => {
		const param = "first_parameter";
		const paramValue = "It works!";
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,6 +21,7 @@ const meta: Meta<typeof CreateWorkspacePageView> = {
		template: MockTemplate,
		parameters: [],
		externalAuth: [],
		hasAllRequiredExternalAuth: true,
		mode: "form",
		permissions: {
		createWorkspaceForUser: true,
Expand DownExpand Up		@@ -134,6 +135,7 @@ export const ExternalAuth: Story = {
		optional: true,
		},
		],
		hasAllRequiredExternalAuth: false,
		},
		};

Expand All		@@ -159,6 +161,7 @@ export const ExternalAuthError: Story = {
		optional: true,
		},
		],
		hasAllRequiredExternalAuth: false,
		},
		};

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -84,6 +84,7 @@ export const CreateWorkspacePageView: FC<CreateWorkspacePageViewProps> = ({
		externalAuth,
		externalAuthPollingState,
		startPollingExternalAuth,
		hasAllRequiredExternalAuth,
		parameters,
		autofillParameters,
		permissions,
Expand All		@@ -92,7 +93,6 @@ export const CreateWorkspacePageView: FC<CreateWorkspacePageViewProps> = ({
		onCancel,
		}) => {
		const [owner, setOwner] = useState(defaultOwner);
		const requiresExternalAuth = externalAuth.some((auth) => !auth.authenticated);
		const [suggestedName, setSuggestedName] = useState(() =>
		generateWorkspaceName(),
		);
Expand All		@@ -117,7 +117,7 @@ export const CreateWorkspacePageView: FC<CreateWorkspacePageViewProps> = ({
		}),
		enableReinitialize: true,
		onSubmit: (request) => {
		if (requiresExternalAuth) {
		if (!hasAllRequiredExternalAuth) {
		return;
		}

Expand All		@@ -144,10 +144,6 @@ export const CreateWorkspacePageView: FC<CreateWorkspacePageViewProps> = ({
		[autofillParameters],
		);

		const hasAllRequiredExternalAuth = externalAuth.every(
		(auth) => auth.optional \|\| auth.authenticated,
		);

		return (
		<Margins size="medium">
		<PageHeader actions={<Button onClick={onCancel}>Cancel</Button>}>
Expand Down