From b80165e6a4e9935f5bb4ff0cdc7bee9f083cd31d Mon Sep 17 00:00:00 2001
From: Roman Pominov <rpominov+github@gmail.com>
Date: Wed, 9 Nov 2022 13:06:34 +0400
Subject: [PATCH] Pages small improvements (#428)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Fixes #424
- Fixes #405
- Removed the "pages" feature-flag — enabled it without a flag
---
 .../features/sidebar-left/lib/header.tsx      |  10 +-
 .../sidebar-left/panels/pages/pages.tsx       |  35 +++---
 .../sidebar-left/panels/pages/settings.tsx    | 109 +++++++++++++-----
 .../features/sidebar-left/sidebar-left.tsx    |   2 -
 .../app/routes/rest/pages.$projectId.ts       |  16 ++-
 .../app/shared/feature-flags/flags.ts         |   1 -
 packages/design-system/src/index.ts           |   1 +
 packages/project/src/db/build.ts              |   2 +-
 8 files changed, 125 insertions(+), 51 deletions(-)

diff --git a/apps/designer/app/designer/features/sidebar-left/lib/header.tsx b/apps/designer/app/designer/features/sidebar-left/lib/header.tsx
index 5bfc9f0e31..48d5b9cdaf 100644
--- a/apps/designer/app/designer/features/sidebar-left/lib/header.tsx
+++ b/apps/designer/app/designer/features/sidebar-left/lib/header.tsx
@@ -1,4 +1,4 @@
-import { Flex, IconButton, Text } from "@webstudio-is/design-system";
+import { Flex, IconButton, Text, Tooltip } from "@webstudio-is/design-system";
 import { Separator } from "@webstudio-is/design-system";
 import { CrossIcon } from "@webstudio-is/icons";
 
@@ -24,7 +24,9 @@ export const Header = ({ title, suffix }: HeaderProps) => {
 };
 
 export const CloseButton = ({ onClick }: { onClick: () => void }) => (
-  <IconButton onClick={onClick} size="2" aria-label="Close">
-    <CrossIcon />
-  </IconButton>
+  <Tooltip content="Close panel" side="bottom" align="end">
+    <IconButton onClick={onClick} size="2" aria-label="Close panel">
+      <CrossIcon />
+    </IconButton>
+  </Tooltip>
 );
diff --git a/apps/designer/app/designer/features/sidebar-left/panels/pages/pages.tsx b/apps/designer/app/designer/features/sidebar-left/panels/pages/pages.tsx
index e3c2b9e8e6..2ae389aaae 100644
--- a/apps/designer/app/designer/features/sidebar-left/panels/pages/pages.tsx
+++ b/apps/designer/app/designer/features/sidebar-left/panels/pages/pages.tsx
@@ -6,6 +6,7 @@ import {
   type TreeItemRenderProps,
   styled,
   Flex,
+  Tooltip,
 } from "@webstudio-is/design-system";
 import { type Publish } from "~/shared/pubsub";
 import {
@@ -119,13 +120,19 @@ const PagesPanel = ({
                 {isEditing ? (
                   <ChevronRightIcon />
                 ) : (
-                  <MenuButton
-                    aria-label="Page settings"
-                    isParentSelected={isSelected}
-                    onClick={() => onEdit(props.itemData.id)}
+                  <Tooltip
+                    content="Open page settings"
+                    side="left"
+                    disableHoverableContent
                   >
-                    <MenuIcon />
-                  </MenuButton>
+                    <MenuButton
+                      aria-label="Open page settings"
+                      isParentSelected={isSelected}
+                      onClick={() => onEdit(props.itemData.id)}
+                    >
+                      <MenuIcon />
+                    </MenuButton>
+                  </Tooltip>
                 )}
               </Flex>
             )
@@ -153,13 +160,15 @@ const PagesPanel = ({
         suffix={
           <>
             {onCreateNewPage && (
-              <IconButton
-                size="2"
-                onClick={() => onCreateNewPage()}
-                aria-label="New Page"
-              >
-                <NewPageIcon />
-              </IconButton>
+              <Tooltip content="New page" side="bottom">
+                <IconButton
+                  size="2"
+                  onClick={() => onCreateNewPage()}
+                  aria-label="New page"
+                >
+                  <NewPageIcon />
+                </IconButton>
+              </Tooltip>
             )}
             {onClose && <CloseButton onClick={onClose} />}
           </>
diff --git a/apps/designer/app/designer/features/sidebar-left/panels/pages/settings.tsx b/apps/designer/app/designer/features/sidebar-left/panels/pages/settings.tsx
index ec91f817ef..bf7cc891cf 100644
--- a/apps/designer/app/designer/features/sidebar-left/panels/pages/settings.tsx
+++ b/apps/designer/app/designer/features/sidebar-left/panels/pages/settings.tsx
@@ -3,10 +3,12 @@ import {
   Button,
   Box,
   Label,
+  TextArea,
   TextField,
   styled,
   Flex,
   InputErrorsTooltip,
+  Tooltip,
 } from "@webstudio-is/design-system";
 import { useFetcher } from "@remix-run/react";
 import { ChevronDoubleLeftIcon, TrashIcon } from "@webstudio-is/icons";
@@ -37,9 +39,20 @@ const Group = styled(Flex, {
   defaultVariants: { direction: "column" },
 });
 
-const fieldNames = ["name", "path"] as const;
+const fieldNames = ["name", "path", "title", "description"] as const;
 type FieldName = typeof fieldNames[number];
-type EditablePage = Pick<Page, FieldName>;
+type FormPage = Pick<Page, "name" | "path" | "title"> & {
+  description: string;
+};
+
+const toFormPage = (page: Page): FormPage => {
+  return {
+    name: page.name,
+    path: page.path,
+    title: page.title,
+    description: page.meta.description ?? "",
+  };
+};
 
 const FormFields = ({
   disabled,
@@ -48,10 +61,10 @@ const FormFields = ({
   fieldErrors,
 }: {
   disabled?: boolean;
-  values: EditablePage;
+  values: FormPage;
   onChange: <Name extends FieldName>(event: {
     field: Name;
-    value: EditablePage[Name];
+    value: FormPage[Name];
   }) => void;
   fieldErrors: ZodError["formErrors"]["fieldErrors"];
 }) => {
@@ -89,6 +102,36 @@ const FormFields = ({
           />
         </InputErrorsTooltip>
       </Group>
+      <Group>
+        <Label htmlFor={fieldIds.title}>Title</Label>
+        <InputErrorsTooltip errors={fieldErrors.title}>
+          <TextField
+            state={fieldErrors.title && "invalid"}
+            id={fieldIds.title}
+            name="title"
+            disabled={disabled}
+            value={values?.title}
+            onChange={(event) => {
+              onChange({ field: "title", value: event.target.value });
+            }}
+          />
+        </InputErrorsTooltip>
+      </Group>
+      <Group>
+        <Label htmlFor={fieldIds.description}>Description</Label>
+        <InputErrorsTooltip errors={fieldErrors.description}>
+          <TextArea
+            state={fieldErrors.description && "invalid"}
+            id={fieldIds.description}
+            name="description"
+            disabled={disabled}
+            value={values?.description}
+            onChange={(event) => {
+              onChange({ field: "description", value: event.target.value });
+            }}
+          />
+        </InputErrorsTooltip>
+      </Group>
     </>
   );
 };
@@ -117,7 +160,12 @@ export const NewPageSettings = ({
     fieldNames,
   });
 
-  const [values, setValues] = useState<EditablePage>({ name: "", path: "" });
+  const [values, setValues] = useState<FormPage>({
+    name: "",
+    path: "",
+    title: "",
+    description: "",
+  });
 
   const handleSubmit = () => {
     fetcher.submit(values, {
@@ -158,9 +206,11 @@ const NewPageSettingsView = ({
         title="New Page Settings"
         suffix={
           onClose && (
-            <IconButton size="2" onClick={onClose} aria-label="Cancel">
-              <ChevronDoubleLeftIcon />
-            </IconButton>
+            <Tooltip content="Cancel" side="bottom" align="end">
+              <IconButton size="2" onClick={onClose} aria-label="Cancel">
+                <ChevronDoubleLeftIcon />
+              </IconButton>
+            </Tooltip>
           )
         }
       />
@@ -183,7 +233,7 @@ const NewPageSettingsView = ({
   );
 };
 
-const toFormData = (page: Partial<EditablePage> & { id: string }): FormData => {
+const toFormData = (page: Partial<FormPage> & { id: string }): FormData => {
   const formData = new FormData();
   for (const [key, value] of Object.entries(page)) {
     // @todo: handle "meta"
@@ -212,10 +262,8 @@ export const PageSettings = ({
   const [pages] = usePages();
   const page = pages && projectUtils.pages.findById(pages, pageId);
 
-  const [unsavedValues, setUnsavedValues] = useState<Partial<EditablePage>>({});
-  const [submittedValues, setSubmittedValues] = useState<Partial<EditablePage>>(
-    {}
-  );
+  const [unsavedValues, setUnsavedValues] = useState<Partial<FormPage>>({});
+  const [submittedValues, setSubmittedValues] = useState<Partial<FormPage>>({});
 
   const { fieldErrors, resetFieldError } = useFetcherErrors({
     fetcher,
@@ -223,10 +271,7 @@ export const PageSettings = ({
   });
 
   const handleChange = useCallback(
-    <Name extends FieldName>(event: {
-      field: Name;
-      value: EditablePage[Name];
-    }) => {
+    <Name extends FieldName>(event: { field: Name; value: FormPage[Name] }) => {
       resetFieldError(event.field);
       setUnsavedValues((values) => ({ ...values, [event.field]: event.value }));
     },
@@ -304,7 +349,7 @@ export const PageSettings = ({
       onClose={onClose}
       onDelete={hanldeDelete}
       fieldErrors={fieldErrors}
-      values={{ ...page, ...submittedValues, ...unsavedValues }}
+      values={{ ...toFormPage(page), ...submittedValues, ...unsavedValues }}
       onChange={handleChange}
     />
   );
@@ -327,18 +372,26 @@ const PageSettingsView = ({
         suffix={
           <>
             {isHomePage === false && (
-              <IconButton size="2" onClick={onDelete} aria-label="Delete page">
-                <TrashIcon />
-              </IconButton>
+              <Tooltip content="Delete page" side="bottom">
+                <IconButton
+                  size="2"
+                  onClick={onDelete}
+                  aria-label="Delete page"
+                >
+                  <TrashIcon />
+                </IconButton>
+              </Tooltip>
             )}
             {onClose && (
-              <IconButton
-                size="2"
-                onClick={onClose}
-                aria-label="Close page settings"
-              >
-                <ChevronDoubleLeftIcon />
-              </IconButton>
+              <Tooltip content="Close page settings" side="bottom" align="end">
+                <IconButton
+                  size="2"
+                  onClick={onClose}
+                  aria-label="Close page settings"
+                >
+                  <ChevronDoubleLeftIcon />
+                </IconButton>
+              </Tooltip>
             )}
           </>
         }
diff --git a/apps/designer/app/designer/features/sidebar-left/sidebar-left.tsx b/apps/designer/app/designer/features/sidebar-left/sidebar-left.tsx
index 4d567a6151..2e6c0abb29 100644
--- a/apps/designer/app/designer/features/sidebar-left/sidebar-left.tsx
+++ b/apps/designer/app/designer/features/sidebar-left/sidebar-left.tsx
@@ -38,8 +38,6 @@ export const SidebarLeft = ({ publish }: SidebarLeftProps) => {
       switch (panel) {
         case "assets":
           return isFeatureEnabled("assets");
-        case "pages":
-          return isFeatureEnabled("pages");
         case "navigator":
           return clientSettings.navigatorLayout === "docked";
       }
diff --git a/apps/designer/app/routes/rest/pages.$projectId.ts b/apps/designer/app/routes/rest/pages.$projectId.ts
index 9b23253750..e5dc2c9d18 100644
--- a/apps/designer/app/routes/rest/pages.$projectId.ts
+++ b/apps/designer/app/routes/rest/pages.$projectId.ts
@@ -33,6 +33,8 @@ const commonPageInput = {
       (path) => /^[-_a-z0-9\\/]*$/.test(path),
       "Only a-z, 0-9, -, _ and / are allowed"
     ),
+  title: z.string().optional(),
+  description: z.string().optional(),
 } as const;
 
 const CreatePageInput = zfd.formData(commonPageInput);
@@ -45,7 +47,11 @@ const handlePut = async (
   if (result.success === false) {
     return { status: "error", errors: result.error.formErrors };
   }
-  const data = result.data;
+  const { description, ...restData } = result.data;
+  const data = {
+    ...restData,
+    meta: description !== undefined ? { description } : undefined,
+  };
 
   const devBuild = await db.build.loadByProjectId(projectId, "dev");
 
@@ -69,6 +75,8 @@ const EditPageInput = zfd.formData({
   id: z.string(),
   name: z.optional(commonPageInput.name),
   path: z.optional(commonPageInput.path),
+  title: z.optional(commonPageInput.title),
+  description: z.optional(commonPageInput.description),
 });
 
 const handlePost = async (
@@ -79,7 +87,11 @@ const handlePost = async (
   if (result.success === false) {
     return { status: "error", errors: result.error.formErrors };
   }
-  const { id, ...data } = result.data;
+  const { id, description, ...restData } = result.data;
+  const data = {
+    ...restData,
+    meta: description !== undefined ? { description } : undefined,
+  };
 
   const devBuild = await db.build.loadByProjectId(projectId, "dev");
 
diff --git a/apps/designer/app/shared/feature-flags/flags.ts b/apps/designer/app/shared/feature-flags/flags.ts
index cdbf11dacf..12dd85ea82 100644
--- a/apps/designer/app/shared/feature-flags/flags.ts
+++ b/apps/designer/app/shared/feature-flags/flags.ts
@@ -1,4 +1,3 @@
 export const assets = false;
 export const fonts = false;
 export const example = false;
-export const pages = false;
diff --git a/packages/design-system/src/index.ts b/packages/design-system/src/index.ts
index 4f5d0e30ae..a158012adc 100644
--- a/packages/design-system/src/index.ts
+++ b/packages/design-system/src/index.ts
@@ -11,6 +11,7 @@ export * as ToggleGroup from "./components/toggle-group";
 export * from "./components/progress-radial";
 export * from "./components/select";
 export * from "./components/text-field";
+export * from "./components/text-area";
 export { SearchField } from "./components/search-field";
 export { Flex } from "./components/flex";
 export { Image } from "./components/image";
diff --git a/packages/project/src/db/build.ts b/packages/project/src/db/build.ts
index 4338a2c5f2..b87a67151d 100644
--- a/packages/project/src/db/build.ts
+++ b/packages/project/src/db/build.ts
@@ -120,7 +120,7 @@ export const editPage = async (
       name: data.name ?? currentPage.name,
       path: data.path ?? currentPage.path,
       title: data.title ?? currentPage.title,
-      meta: data.meta ?? currentPage.meta,
+      meta: { ...currentPage.meta, ...data.meta },
     };
 
     return {