From 6eadadec736e5d8f4f686959496447fd33607a2b Mon Sep 17 00:00:00 2001
From: Benny Joo <sldisek783@gmail.com>
Date: Tue, 3 Dec 2024 15:32:56 -0500
Subject: [PATCH] fix: remove duplicate header in attributes page (#17985)

---
 .../attributes/[id]/edit/page.tsx             |  17 +--
 .../organizations/attributes/create/page.tsx  |  17 +--
 .../attributes/attributes-create-view.tsx     |   4 +-
 .../attributes/attributes-edit-view.tsx       |   4 +-
 .../attributes/attributes-list-view.tsx       | 117 +++++++-----------
 5 files changed, 54 insertions(+), 105 deletions(-)

diff --git a/apps/web/app/settings/(settings-layout)/organizations/attributes/[id]/edit/page.tsx b/apps/web/app/settings/(settings-layout)/organizations/attributes/[id]/edit/page.tsx
index 4e039d80c8..955d365d78 100644
--- a/apps/web/app/settings/(settings-layout)/organizations/attributes/[id]/edit/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/organizations/attributes/[id]/edit/page.tsx
@@ -1,8 +1,6 @@
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata } from "app/_utils";
 
 import OrgAttributesEditPage from "@calcom/ee/organizations/pages/settings/attributes/attributes-edit-view";
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
-import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
 export const generateMetadata = async () =>
   await _generateMetadata(
@@ -10,15 +8,4 @@ export const generateMetadata = async () =>
     (t) => t("edit_attribute_description")
   );
 
-const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
-
-  return (
-    <SettingsHeader title={t("attribute")} description={t("edit_attribute_description")}>
-      <OrgAttributesEditPage />
-    </SettingsHeader>
-  );
-};
-
-export default Page;
+export default OrgAttributesEditPage;
diff --git a/apps/web/app/settings/(settings-layout)/organizations/attributes/create/page.tsx b/apps/web/app/settings/(settings-layout)/organizations/attributes/create/page.tsx
index f6dbec3f36..5a982ff92c 100644
--- a/apps/web/app/settings/(settings-layout)/organizations/attributes/create/page.tsx
+++ b/apps/web/app/settings/(settings-layout)/organizations/attributes/create/page.tsx
@@ -1,8 +1,6 @@
-import { _generateMetadata, getFixedT } from "app/_utils";
+import { _generateMetadata } from "app/_utils";
 
 import OrgAttributesCreatePage from "@calcom/ee/organizations/pages/settings/attributes/attributes-create-view";
-import { getServerSessionForAppDir } from "@calcom/features/auth/lib/get-server-session-for-app-dir";
-import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 
 export const generateMetadata = async () =>
   await _generateMetadata(
@@ -10,15 +8,4 @@ export const generateMetadata = async () =>
     (t) => t("create_attribute_description")
   );
 
-const Page = async () => {
-  const session = await getServerSessionForAppDir();
-  const t = await getFixedT(session?.user.locale || "en");
-
-  return (
-    <SettingsHeader title={t("attribute")} description={t("create_attribute_description")}>
-      <OrgAttributesCreatePage />
-    </SettingsHeader>
-  );
-};
-
-export default Page;
+export default OrgAttributesCreatePage;
diff --git a/packages/features/ee/organizations/pages/settings/attributes/attributes-create-view.tsx b/packages/features/ee/organizations/pages/settings/attributes/attributes-create-view.tsx
index 16f8518c95..3e361eeff4 100644
--- a/packages/features/ee/organizations/pages/settings/attributes/attributes-create-view.tsx
+++ b/packages/features/ee/organizations/pages/settings/attributes/attributes-create-view.tsx
@@ -1,7 +1,6 @@
 "use client";
 
 import { useRouter } from "next/navigation";
-import React from "react";
 import { useFormContext } from "react-hook-form";
 import { z } from "zod";
 
@@ -32,7 +31,6 @@ function CreateAttributesPage() {
       showToast(err.message, "error");
     },
   });
-  const { t } = useLocale();
 
   return (
     <>
@@ -73,7 +71,7 @@ function CreateAttributeHeader(props: { isPending: boolean }) {
             <span className="sr-only">{t("back_to_attributes")}</span>
           </Button>
           <div className="font-cal text-cal flex space-x-1 text-xl font-semibold leading-none">
-            <h1 className="text-emphasis">{meta.title || "Attribute"}</h1>
+            <h1 className="text-emphasis">{meta.title || t("attribute")}</h1>
             {watchedTitle && (
               <>
                 <span className="text-subtle">/</span> <span className="text-emphasis">{watchedTitle}</span>
diff --git a/packages/features/ee/organizations/pages/settings/attributes/attributes-edit-view.tsx b/packages/features/ee/organizations/pages/settings/attributes/attributes-edit-view.tsx
index 60a5daa9f4..64136c9c46 100644
--- a/packages/features/ee/organizations/pages/settings/attributes/attributes-edit-view.tsx
+++ b/packages/features/ee/organizations/pages/settings/attributes/attributes-edit-view.tsx
@@ -92,7 +92,7 @@ function EditAttributeHeader(props: { isPending: boolean }) {
             <span className="sr-only">{t("back_to_attributes")}</span>
           </Button>
           <div className="font-cal text-cal flex space-x-1 text-xl font-semibold leading-none">
-            <h1 className="text-emphasis">{meta.title || "Attribute"}</h1>
+            <h1 className="text-emphasis">{meta.title || t("attribute")}</h1>
             {watchedTitle && (
               <>
                 <span className="text-subtle">/</span> <span className="text-emphasis">{watchedTitle}</span>
@@ -101,7 +101,7 @@ function EditAttributeHeader(props: { isPending: boolean }) {
           </div>
         </div>
         <Button type="submit" data-testid="create-attribute-button" loading={props.isPending}>
-          Save
+          {t("save")}
         </Button>
       </div>
     </>
diff --git a/packages/features/ee/organizations/pages/settings/attributes/attributes-list-view.tsx b/packages/features/ee/organizations/pages/settings/attributes/attributes-list-view.tsx
index 408c9f9701..9a72871cb5 100644
--- a/packages/features/ee/organizations/pages/settings/attributes/attributes-list-view.tsx
+++ b/packages/features/ee/organizations/pages/settings/attributes/attributes-list-view.tsx
@@ -130,80 +130,57 @@ function OrganizationAttributesPage() {
   }
 
   return (
-    <>
-      <ListAttributeHeader />
-      <LicenseRequired>
-        <div className="border-subtle bg-default flex flex-col gap-4 rounded-lg border p-6">
-          {data && data?.length > 0 ? (
-            <>
-              <h2 className="text-emphasis text-base font-semibold leading-none">{t("custom")}</h2>
-              <li className="border-subtle bg-default divide-subtle flex flex-col divide-y rounded-lg border">
-                {data?.map((attribute) => (
-                  <AttributeItem
-                    setAttributeToDelete={setAttributeToDelete}
-                    attribute={attribute}
-                    key={attribute.id}
-                  />
-                ))}
-              </li>
-              <Button
-                className="w-fit"
-                StartIcon="plus"
-                color="minimal"
-                href="/settings/organizations/attributes/create">
-                {t("add")}
-              </Button>
-            </>
-          ) : (
-            <div className="flex w-full flex-col items-center justify-center p-14">
-              <div className="bg-emphasis text-emphasis flex h-16 w-16 items-center justify-center rounded-full p-2">
-                <Icon name="tags" />
-              </div>
-              <h2 className="font-cal text-emphasis mt-6 text-xl font-semibold leading-none">
-                {t("add_attributes")}
-              </h2>
-
-              <p className="text-emphasis mt-3 text-sm font-normal leading-none">
-                {t("add_attributes_description")}
-              </p>
-              <Button
-                className="mt-8"
-                StartIcon="plus"
-                color="secondary"
-                href="/settings/organizations/attributes/create">
-                {t("new_attribute")}
-              </Button>
+    <LicenseRequired>
+      <div className="border-subtle bg-default flex flex-col gap-4 rounded-lg border p-6">
+        {data && data?.length > 0 ? (
+          <>
+            <h2 className="text-emphasis text-base font-semibold leading-none">{t("custom")}</h2>
+            <li className="border-subtle bg-default divide-subtle flex flex-col divide-y rounded-lg border">
+              {data?.map((attribute) => (
+                <AttributeItem
+                  setAttributeToDelete={setAttributeToDelete}
+                  attribute={attribute}
+                  key={attribute.id}
+                />
+              ))}
+            </li>
+            <Button
+              className="w-fit"
+              StartIcon="plus"
+              color="minimal"
+              href="/settings/organizations/attributes/create">
+              {t("add")}
+            </Button>
+          </>
+        ) : (
+          <div className="flex w-full flex-col items-center justify-center p-14">
+            <div className="bg-emphasis text-emphasis flex h-16 w-16 items-center justify-center rounded-full p-2">
+              <Icon name="tags" />
             </div>
-          )}
-        </div>
-        {attributeToDelete && (
-          <DeleteAttributeModal
-            attributeToDelete={attributeToDelete}
-            setAttributeToDelete={setAttributeToDelete}
-          />
-        )}
-      </LicenseRequired>
-    </>
-  );
-}
+            <h2 className="font-cal text-emphasis mt-6 text-xl font-semibold leading-none">
+              {t("add_attributes")}
+            </h2>
 
-function ListAttributeHeader() {
-  const { meta } = useMeta();
-  const { t } = useLocale();
-
-  return (
-    <>
-      <div className="min-h-6 mb-6 mt-6 flex flex-grow items-center justify-between lg:mt-12">
-        <div className="flex items-center gap-4 ">
-          <div className="flex flex-col space-y-1 ">
-            <h1 className="text-emphasis font-cal text-xl font-semibold leading-none">
-              {meta.title || t("attributes")}
-            </h1>
-            <p className="text-subtle text-sm">{meta.description || t("attribute_meta_description")}</p>
+            <p className="text-emphasis mt-3 text-sm font-normal leading-none">
+              {t("add_attributes_description")}
+            </p>
+            <Button
+              className="mt-8"
+              StartIcon="plus"
+              color="secondary"
+              href="/settings/organizations/attributes/create">
+              {t("new_attribute")}
+            </Button>
           </div>
-        </div>
+        )}
       </div>
-    </>
+      {attributeToDelete && (
+        <DeleteAttributeModal
+          attributeToDelete={attributeToDelete}
+          setAttributeToDelete={setAttributeToDelete}
+        />
+      )}
+    </LicenseRequired>
   );
 }