From 2ed36da07047507a2a051aa6bed1f0fad379731d Mon Sep 17 00:00:00 2001 From: McKayla Washburn Date: Fri, 16 Aug 2024 15:20:52 +0000 Subject: [PATCH] fix: always show upload and scratch in create template gallery --- .../CreateTemplateGalleryPage.test.tsx} | 6 +-- .../CreateTemplateGalleryPage.tsx} | 21 +++------- ...CreateTemplateGalleryPageView.stories.tsx} | 10 ++--- .../CreateTemplateGalleryPageView.tsx} | 9 ++--- .../StarterTemplates.tsx | 0 .../StarterTemplatesPageView.tsx | 38 ------------------- site/src/router.tsx | 6 +-- 7 files changed, 20 insertions(+), 70 deletions(-) rename site/src/pages/{CreateTemplatesGalleryPage/StarterTemplatesPage.test.tsx => CreateTemplateGalleryPage/CreateTemplateGalleryPage.test.tsx} (86%) rename site/src/pages/{CreateTemplatesGalleryPage/CreateTemplatesGalleryPage.tsx => CreateTemplateGalleryPage/CreateTemplateGalleryPage.tsx} (60%) rename site/src/pages/{CreateTemplatesGalleryPage/StarterTemplatesPageView.stories.tsx => CreateTemplateGalleryPage/CreateTemplateGalleryPageView.stories.tsx} (69%) rename site/src/pages/{CreateTemplatesGalleryPage/CreateTemplatesPageView.tsx => CreateTemplateGalleryPage/CreateTemplateGalleryPageView.tsx} (95%) rename site/src/pages/{CreateTemplatesGalleryPage => CreateTemplateGalleryPage}/StarterTemplates.tsx (100%) delete mode 100644 site/src/pages/CreateTemplatesGalleryPage/StarterTemplatesPageView.tsx diff --git a/site/src/pages/CreateTemplatesGalleryPage/StarterTemplatesPage.test.tsx b/site/src/pages/CreateTemplateGalleryPage/CreateTemplateGalleryPage.test.tsx similarity index 86% rename from site/src/pages/CreateTemplatesGalleryPage/StarterTemplatesPage.test.tsx rename to site/src/pages/CreateTemplateGalleryPage/CreateTemplateGalleryPage.test.tsx index c3625ab49484a..49c007724aecf 100644 --- a/site/src/pages/CreateTemplatesGalleryPage/StarterTemplatesPage.test.tsx +++ b/site/src/pages/CreateTemplateGalleryPage/CreateTemplateGalleryPage.test.tsx @@ -8,11 +8,11 @@ import { MockTemplateExample2, } from "testHelpers/entities"; import { server } from "testHelpers/server"; -import StarterTemplatesPage from "./CreateTemplatesGalleryPage"; +import CreateTemplateGalleryPage from "./CreateTemplateGalleryPage"; test("does not display the scratch template", async () => { server.use( - http.get("api/v2/organizations/:organizationId/templates/examples", () => { + http.get("api/v2/templates/examples", () => { return HttpResponse.json([ MockTemplateExample, MockTemplateExample2, @@ -36,7 +36,7 @@ test("does not display the scratch template", async () => { children: [ { path: "/starter-templates", - element: , + element: , }, ], }, diff --git a/site/src/pages/CreateTemplatesGalleryPage/CreateTemplatesGalleryPage.tsx b/site/src/pages/CreateTemplateGalleryPage/CreateTemplateGalleryPage.tsx similarity index 60% rename from site/src/pages/CreateTemplatesGalleryPage/CreateTemplatesGalleryPage.tsx rename to site/src/pages/CreateTemplateGalleryPage/CreateTemplateGalleryPage.tsx index 86200a3378c6b..695dd3bfdfc75 100644 --- a/site/src/pages/CreateTemplatesGalleryPage/CreateTemplatesGalleryPage.tsx +++ b/site/src/pages/CreateTemplateGalleryPage/CreateTemplateGalleryPage.tsx @@ -1,39 +1,28 @@ import { templateExamples } from "api/queries/templates"; import type { TemplateExample } from "api/typesGenerated"; -import { useDashboard } from "modules/dashboard/useDashboard"; import type { FC } from "react"; import { Helmet } from "react-helmet-async"; import { useQuery } from "react-query"; import { pageTitle } from "utils/page"; import { getTemplatesByTag } from "utils/starterTemplates"; -import { CreateTemplatesPageView } from "./CreateTemplatesPageView"; -import { StarterTemplatesPageView } from "./StarterTemplatesPageView"; +import { CreateTemplateGalleryPageView } from "./CreateTemplateGalleryPageView"; const CreateTemplatesGalleryPage: FC = () => { - const { experiments } = useDashboard(); const templateExamplesQuery = useQuery(templateExamples()); const starterTemplatesByTag = templateExamplesQuery.data ? // Currently, the scratch template should not be displayed on the starter templates page. getTemplatesByTag(removeScratchExample(templateExamplesQuery.data)) : undefined; - const multiOrgExperimentEnabled = experiments.includes("multi-organization"); return ( <> {pageTitle("Create a Template")} - {multiOrgExperimentEnabled ? ( - - ) : ( - - )} + ); }; diff --git a/site/src/pages/CreateTemplatesGalleryPage/StarterTemplatesPageView.stories.tsx b/site/src/pages/CreateTemplateGalleryPage/CreateTemplateGalleryPageView.stories.tsx similarity index 69% rename from site/src/pages/CreateTemplatesGalleryPage/StarterTemplatesPageView.stories.tsx rename to site/src/pages/CreateTemplateGalleryPage/CreateTemplateGalleryPageView.stories.tsx index 6f8dca2596ad8..4db1d58e8e20e 100644 --- a/site/src/pages/CreateTemplatesGalleryPage/StarterTemplatesPageView.stories.tsx +++ b/site/src/pages/CreateTemplateGalleryPage/CreateTemplateGalleryPageView.stories.tsx @@ -6,16 +6,16 @@ import { mockApiError, } from "testHelpers/entities"; import { getTemplatesByTag } from "utils/starterTemplates"; -import { StarterTemplatesPageView } from "./StarterTemplatesPageView"; +import { CreateTemplateGalleryPageView } from "./CreateTemplateGalleryPageView"; -const meta: Meta = { - title: "pages/StarterTemplatesPage", +const meta: Meta = { + title: "pages/CreateTemplateGalleryPage", parameters: { chromatic }, - component: StarterTemplatesPageView, + component: CreateTemplateGalleryPageView, }; export default meta; -type Story = StoryObj; +type Story = StoryObj; export const Example: Story = { args: { diff --git a/site/src/pages/CreateTemplatesGalleryPage/CreateTemplatesPageView.tsx b/site/src/pages/CreateTemplateGalleryPage/CreateTemplateGalleryPageView.tsx similarity index 95% rename from site/src/pages/CreateTemplatesGalleryPage/CreateTemplatesPageView.tsx rename to site/src/pages/CreateTemplateGalleryPage/CreateTemplateGalleryPageView.tsx index 644a2cd80bb35..d34054e9be764 100644 --- a/site/src/pages/CreateTemplatesGalleryPage/CreateTemplatesPageView.tsx +++ b/site/src/pages/CreateTemplateGalleryPage/CreateTemplateGalleryPageView.tsx @@ -13,15 +13,14 @@ import { Link as RouterLink } from "react-router-dom"; import type { StarterTemplatesByTag } from "utils/starterTemplates"; import { StarterTemplates } from "./StarterTemplates"; -export interface CreateTemplatePageViewProps { +export interface CreateTemplateGalleryPageViewProps { starterTemplatesByTag?: StarterTemplatesByTag; error?: unknown; } -export const CreateTemplatesPageView: FC = ({ - starterTemplatesByTag, - error, -}) => { +export const CreateTemplateGalleryPageView: FC< + CreateTemplateGalleryPageViewProps +> = ({ starterTemplatesByTag, error }) => { return ( diff --git a/site/src/pages/CreateTemplatesGalleryPage/StarterTemplates.tsx b/site/src/pages/CreateTemplateGalleryPage/StarterTemplates.tsx similarity index 100% rename from site/src/pages/CreateTemplatesGalleryPage/StarterTemplates.tsx rename to site/src/pages/CreateTemplateGalleryPage/StarterTemplates.tsx diff --git a/site/src/pages/CreateTemplatesGalleryPage/StarterTemplatesPageView.tsx b/site/src/pages/CreateTemplatesGalleryPage/StarterTemplatesPageView.tsx deleted file mode 100644 index 40dcb599e1bd0..0000000000000 --- a/site/src/pages/CreateTemplatesGalleryPage/StarterTemplatesPageView.tsx +++ /dev/null @@ -1,38 +0,0 @@ -import { ErrorAlert } from "components/Alert/ErrorAlert"; -import { Loader } from "components/Loader/Loader"; -import { Margins } from "components/Margins/Margins"; -import { - PageHeader, - PageHeaderSubtitle, - PageHeaderTitle, -} from "components/PageHeader/PageHeader"; -import type { FC } from "react"; -import type { StarterTemplatesByTag } from "utils/starterTemplates"; -import { StarterTemplates } from "./StarterTemplates"; - -export interface StarterTemplatesPageViewProps { - starterTemplatesByTag?: StarterTemplatesByTag; - error?: unknown; -} - -export const StarterTemplatesPageView: FC = ({ - starterTemplatesByTag, - error, -}) => { - return ( - - - Starter Templates - - Import a built-in template to start developing in the cloud - - - - {Boolean(error) && } - - {Boolean(!starterTemplatesByTag) && } - - - - ); -}; diff --git a/site/src/router.tsx b/site/src/router.tsx index 3513738ab99bc..b55bcc89c12d7 100644 --- a/site/src/router.tsx +++ b/site/src/router.tsx @@ -169,8 +169,8 @@ const TemplateVersionPage = lazy( const TemplateVersionEditorPage = lazy( () => import("./pages/TemplateVersionEditorPage/TemplateVersionEditorPage"), ); -const CreateTemplatesGalleryPage = lazy( - () => import("./pages/CreateTemplatesGalleryPage/CreateTemplatesGalleryPage"), +const CreateTemplateGalleryPage = lazy( + () => import("./pages/CreateTemplateGalleryPage/CreateTemplateGalleryPage"), ); const StarterTemplatePage = lazy( () => import("pages/StarterTemplatePage/StarterTemplatePage"), @@ -353,7 +353,7 @@ export const router = createBrowserRouter( } /> - } /> + } /> } /> pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy