chore: updates for PR review

jaaydenh · jaaydenh · commit 2a35fe284baa · 2025-04-15T19:14:44.000Z
diff --git a/site/src/components/MultiSelectCombobox/MultiSelectCombobox.tsx b/site/src/components/MultiSelectCombobox/MultiSelectCombobox.tsx
@@ -205,12 +205,9 @@ export const MultiSelectCombobox = forwardRef<
 		const [isLoading, setIsLoading] = useState(false);
 		const dropdownRef = useRef<HTMLDivElement>(null);
 
-		const [selected, setSelected] = useState<Option[]>(() => {
-			if (arrayDefaultOptions && arrayDefaultOptions.length > 0) {
-				return arrayDefaultOptions;
-			}
-			return [];
-		});
+		const [selected, setSelected] = useState<Option[]>(
+			arrayDefaultOptions ?? [],
+		);
 		const [options, setOptions] = useState<GroupOption>(
 			transitionToGroupOption(arrayDefaultOptions, groupBy),
 		);
diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageExperimental.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageExperimental.tsx
@@ -180,6 +180,7 @@ const CreateWorkspacePageExperimental: FC = () => {
 				<title>{pageTitle(title)}</title>
 			</Helmet>
 			{!currentResponse ||
+			!templateQuery.data ||
 			isLoadingFormData ||
 			isLoadingExternalAuth ||
 			autoCreateReady ? (
@@ -199,7 +200,7 @@ const CreateWorkspacePageExperimental: FC = () => {
 						autoCreateWorkspaceMutation.error
 					}
 					resetMutation={createWorkspaceMutation.reset}
-					template={templateQuery.data ?? ({} as Template)}
+					template={templateQuery.data}
 					versionId={realizedVersionId}
 					externalAuth={externalAuth ?? []}
 					externalAuthPollingState={externalAuthPollingState}
