feat: pass along organizationId when creating templates

jaaydenh · jaaydenh · commit f959a08e8639 · 2024-07-24T02:00:13.000Z
diff --git a/site/src/modules/templates/TemplateExampleCard/TemplateExampleCard.tsx b/site/src/modules/templates/TemplateExampleCard/TemplateExampleCard.tsx
@@ -10,11 +10,13 @@ import { Pill } from "components/Pill/Pill";
 type TemplateExampleCardProps = HTMLAttributes<HTMLDivElement> & {
   example: TemplateExample;
   activeTag?: string;
+  organizationId?: string;
 };
 
 export const TemplateExampleCard: FC<TemplateExampleCardProps> = ({
   example,
   activeTag,
+  organizationId = "00000000-0000-0000-0000-000000000000",
   ...divProps
 }) => {
   return (
@@ -58,7 +60,7 @@ export const TemplateExampleCard: FC<TemplateExampleCardProps> = ({
         <Button
           component={RouterLink}
           fullWidth
-          to={`/templates/new?exampleId=${example.id}`}
+          to={`/templates/new?exampleId=${example.id}&organizationId=${organizationId}`}
         >
           Use template
         </Button>
diff --git a/site/src/pages/CreateTemplatePage/CreateTemplatePage.tsx b/site/src/pages/CreateTemplatePage/CreateTemplatePage.tsx
@@ -38,6 +38,9 @@ const CreateTemplatePage: FC = () => {
     error: createTemplateMutation.error,
     isCreating: createTemplateMutation.isLoading,
     variablesSectionRef,
+    organizationId:
+      searchParams.get("organizationId") ||
+      "00000000-0000-0000-0000-000000000000",
   };
 
   return (
diff --git a/site/src/pages/CreateTemplatePage/DuplicateTemplateView.tsx b/site/src/pages/CreateTemplatePage/DuplicateTemplateView.tsx
@@ -21,9 +21,10 @@ export const DuplicateTemplateView: FC<CreateTemplatePageViewProps> = ({
   variablesSectionRef,
   error,
   isCreating,
+  organizationId,
 }) => {
   const navigate = useNavigate();
-  const { entitlements, organizationId } = useDashboard();
+  const { entitlements } = useDashboard();
   const [searchParams] = useSearchParams();
   const templateByNameQuery = useQuery(
     templateByName(organizationId, searchParams.get("fromTemplate")!),
diff --git a/site/src/pages/CreateTemplatePage/ImportStarterTemplateView.tsx b/site/src/pages/CreateTemplatePage/ImportStarterTemplateView.tsx
@@ -24,11 +24,12 @@ export const ImportStarterTemplateView: FC<CreateTemplatePageViewProps> = ({
   variablesSectionRef,
   error,
   isCreating,
+  organizationId,
 }) => {
   const navigate = useNavigate();
-  const { entitlements, organizationId } = useDashboard();
+  const { entitlements } = useDashboard();
   const [searchParams] = useSearchParams();
-  const templateExamplesQuery = useQuery(templateExamples(organizationId));
+  const templateExamplesQuery = useQuery(templateExamples());
   const templateExample = templateExamplesQuery.data?.find(
     (e) => e.id === searchParams.get("exampleId")!,
   );
diff --git a/site/src/pages/CreateTemplatePage/UploadTemplateView.tsx b/site/src/pages/CreateTemplatePage/UploadTemplateView.tsx
@@ -18,10 +18,11 @@ export const UploadTemplateView: FC<CreateTemplatePageViewProps> = ({
   variablesSectionRef,
   isCreating,
   error,
+  organizationId,
 }) => {
   const navigate = useNavigate();
 
-  const { entitlements, organizationId } = useDashboard();
+  const { entitlements } = useDashboard();
   const formPermissions = getFormPermissions(entitlements);
 
   const uploadFileMutation = useMutation(uploadFile());
diff --git a/site/src/pages/CreateTemplatePage/types.ts b/site/src/pages/CreateTemplatePage/types.ts
@@ -6,4 +6,5 @@ export type CreateTemplatePageViewProps = {
   variablesSectionRef: React.RefObject<HTMLDivElement>;
   error: unknown;
   isCreating: boolean;
+  organizationId: string;
 };
diff --git a/site/src/pages/CreateTemplatesGalleryPage/CreateTemplatesPageView.tsx b/site/src/pages/CreateTemplatesGalleryPage/CreateTemplatesPageView.tsx
@@ -26,7 +26,8 @@ export const CreateTemplatesPageView: FC<CreateTemplatePageViewProps> = ({
   error,
 }) => {
   const [selectedOrg, setSelectedOrg] = useState<Organization | null>(null);
-  // const { organizationId } = useDashboard();
+  const organizationId =
+    selectedOrg?.id || "00000000-0000-0000-0000-000000000000";
   // TODO: if there is only 1 organization, set the dropdown to the default organizationId
 
   return (
@@ -59,7 +60,7 @@ export const CreateTemplatesPageView: FC<CreateTemplatePageViewProps> = ({
             <Card variant="outlined" sx={{ width: 320 }}>
               <CardActionArea
                 component={RouterLink}
-                to="../templates/new?exampleId=scratch"
+                to={`../templates/new?exampleId=scratch&organizationId=${organizationId}`}
                 sx={{ height: 115, padding: 1 }}
               >
                 <CardContent>
@@ -90,7 +91,7 @@ export const CreateTemplatesPageView: FC<CreateTemplatePageViewProps> = ({
             <Card variant="outlined" sx={{ width: 320 }}>
               <CardActionArea
                 component={RouterLink}
-                to="../templates/new"
+                to={`../templates/new?organizationId=${organizationId}`}
                 sx={{ height: 115, padding: 1 }}
               >
                 <CardContent>
@@ -125,7 +126,10 @@ export const CreateTemplatesPageView: FC<CreateTemplatePageViewProps> = ({
 
         {Boolean(!starterTemplatesByTag) && <Loader />}
 
-        <StarterTemplates starterTemplatesByTag={starterTemplatesByTag} />
+        <StarterTemplates
+          starterTemplatesByTag={starterTemplatesByTag}
+          organizationId={organizationId}
+        />
       </Stack>
     </Margins>
   );
diff --git a/site/src/pages/CreateTemplatesGalleryPage/StarterTemplates.tsx b/site/src/pages/CreateTemplatesGalleryPage/StarterTemplates.tsx
@@ -24,10 +24,12 @@ const selectTags = (starterTemplatesByTag: StarterTemplatesByTag) => {
 
 export interface StarterTemplatesProps {
   starterTemplatesByTag?: StarterTemplatesByTag;
+  organizationId?: string;
 }
 
 export const StarterTemplates: FC<StarterTemplatesProps> = ({
   starterTemplatesByTag,
+  organizationId,
 }) => {
   const [urlParams] = useSearchParams();
   const tags = starterTemplatesByTag
@@ -73,6 +75,7 @@ export const StarterTemplates: FC<StarterTemplatesProps> = ({
               example={example}
               key={example.id}
               activeTag={activeTag}
+              organizationId={organizationId}
             />
           ))}
       </div>
