Revert persona (#18681)

* Revert "feat: persona based customisation for glossary and glossary term pages (#18454)"

This reverts commit 6fa76ec.

* Revert "chore(ui): move persona as top level settings (#18171)"

This reverts commit 737c076.

* fix tests

* fix playwright

openmetadata-service/src/test/java/org/openmetadata/service/resources/docstore/DocStoreResourceTest.java

@@ -291,7 +291,7 @@ void post_validKnowledgePanels_as_admin_200_OK(TestInfo test) throws IOException
 
     page =
         new Page()
-            .withPageType(PageType.GLOSSARY_TERM)
+            .withPageType(PageType.GLOSSARY_TERM_LANDING_PAGE)
             .withKnowledgePanels(
                 List.of(activityFeed.getEntityReference(), myData.getEntityReference()));
     fqn =

openmetadata-spec/src/main/resources/json/schema/entity/teams/persona.json

@@ -38,10 +38,6 @@
       "description": "Link to the resource corresponding to this entity.",
       "$ref": "../../type/basic.json#/definitions/href"
     },
-    "uiCustomization": {
-      "description": "Reference to the UI customization configuration.",
-      "$ref": "../../type/entityReference.json"
-    },
     "users": {
       "description": "Users that are assigned a persona.",
       "$ref": "../../type/entityReferenceList.json",

openmetadata-spec/src/main/resources/json/schema/system/ui/page.json

@@ -12,19 +12,19 @@
       "type": "string",
       "enum": [
         "LandingPage",
-        "Table",
-        "StoredProcedure",
-        "Database",
-        "DatabaseSchema",
-        "Topic",
-        "Pipeline",
-        "Dashboard",
-        "DashboardDataModel",
-        "Container",
-        "SearchIndex",
-        "Glossary",
-        "GlossaryTerm",
-        "Domain"
+        "TableLandingPage",
+        "StoredProcedureLandingPage",
+        "DatabaseLandingPage",
+        "DatabaseSchemaLandingPage",
+        "TopicLandingPage",
+        "PipelineLandingPage",
+        "DashboardLandingPage",
+        "DashboardDataModelLandingPage",
+        "ContainerLandingPage",
+        "SearchIndexLandingPage",
+        "GlossaryLandingPage",
+        "GlossaryTermLandingPage",
+        "DomainLandingPage"
       ]
     }
   },
@@ -41,12 +41,6 @@
       "description": "Configuration for the Knowledge Panel.",
       "type": "object"
     },
-    "tabs": {
-      "description": "Tabs included in this page.",
-      "type": "array",
-      "items": { "$ref": "tab.json" },
-      "default": []
-    },
     "persona": {
       "description": "Persona this page belongs to.",
       "$ref": "../../type/entityReference.json"

openmetadata-ui/src/main/resources/ui/playwright/constant/settings.ts

@@ -149,7 +149,10 @@ export const SETTINGS_OPTIONS_PATH = {
     GlobalSettingsMenuCategory.MEMBERS,
     `${GlobalSettingsMenuCategory.MEMBERS}.${GlobalSettingOptions.ADMINS}`,
   ],
-  [GlobalSettingOptions.PERSONA]: [GlobalSettingOptions.PERSONA],
+  [GlobalSettingOptions.PERSONA]: [
+    GlobalSettingsMenuCategory.MEMBERS,
+    `${GlobalSettingsMenuCategory.MEMBERS}.${GlobalSettingOptions.PERSONA}`,
+  ],
 
   // Access Control
 
@@ -164,6 +167,10 @@ export const SETTINGS_OPTIONS_PATH = {
 
   // Open-metadata
 
+  [GlobalSettingOptions.CUSTOMIZE_LANDING_PAGE]: [
+    GlobalSettingsMenuCategory.PREFERENCES,
+    `${GlobalSettingsMenuCategory.PREFERENCES}.${GlobalSettingOptions.CUSTOMIZE_LANDING_PAGE}`,
+  ],
   [GlobalSettingOptions.EMAIL]: [
     GlobalSettingsMenuCategory.PREFERENCES,
     `${GlobalSettingsMenuCategory.PREFERENCES}.${GlobalSettingOptions.EMAIL}`,

openmetadata-ui/src/main/resources/ui/playwright/e2e/Flow/CustomizeLandingPage.spec.ts

@@ -14,7 +14,7 @@ import { expect, Page, test as base } from '@playwright/test';
 import { PersonaClass } from '../../support/persona/PersonaClass';
 import { UserClass } from '../../support/user/UserClass';
 import { performAdminLogin } from '../../utils/admin';
-import { redirectToHomePage, toastNotification } from '../../utils/common';
+import { redirectToHomePage } from '../../utils/common';
 import {
   checkAllDefaultWidgets,
   navigateToCustomizeLandingPage,
@@ -239,7 +239,11 @@ test.describe('Customize Landing Page Flow', () => {
           .click();
 
         // Verify the toast notification
-        await toastNotification(adminPage, 'Page layout updated successfully.');
+        const toastNotification = adminPage.locator('.Toastify__toast-body');
+
+        await expect(toastNotification).toContainText(
+          'Page layout updated successfully.'
+        );
 
         // Check if all widgets are present after resetting the layout
         await checkAllDefaultWidgets(adminPage, true);

openmetadata-ui/src/main/resources/ui/playwright/e2e/Flow/PersonaFlow.spec.ts

@@ -102,7 +102,15 @@ test.describe.serial('Persona operations', () => {
     // Verify created persona details
 
     await expect(
-      page.getByTestId(`persona-details-card-${PERSONA_DETAILS.name}`)
+      page
+        .getByTestId('persona-details-card')
+        .getByText(PERSONA_DETAILS.displayName)
+    ).toBeVisible();
+
+    await expect(
+      page
+        .getByTestId('persona-details-card')
+        .getByText(PERSONA_DETAILS.description)
     ).toBeVisible();
 
     const personaResponse = page.waitForResponse(
@@ -112,7 +120,8 @@ test.describe.serial('Persona operations', () => {
     );
 
     await page
-      .getByTestId(`persona-details-card-${PERSONA_DETAILS.name}`)
+      .locator('[data-testid="persona-details-card"]')
+      .getByText(PERSONA_DETAILS.displayName)
       .click();
 
     await personaResponse;
@@ -144,7 +153,8 @@ test.describe.serial('Persona operations', () => {
     page,
   }) => {
     await page
-      .getByTestId(`persona-details-card-${PERSONA_DETAILS.name}`)
+      .locator('[data-testid="persona-details-card"]')
+      .getByText(PERSONA_DETAILS.displayName)
       .click();
 
     await page.getByTestId('edit-description').click();
@@ -170,7 +180,9 @@ test.describe.serial('Persona operations', () => {
 
   test('Persona rename flow should work properly', async ({ page }) => {
     await page
-      .getByTestId(`persona-details-card-${PERSONA_DETAILS.name}`)
+      .locator('[data-testid="persona-details-card"]')
+      .getByText(PERSONA_DETAILS.displayName)
+
       .click();
 
     await updatePersonaDisplayName({ page, displayName: 'Test Persona' });
@@ -191,7 +203,8 @@ test.describe.serial('Persona operations', () => {
 
   test('Remove users in persona should work properly', async ({ page }) => {
     await page
-      .getByTestId(`persona-details-card-${PERSONA_DETAILS.name}`)
+      .locator('[data-testid="persona-details-card"]')
+      .getByText(PERSONA_DETAILS.displayName)
       .click();
 
     await page
@@ -218,7 +231,8 @@ test.describe.serial('Persona operations', () => {
 
   test('Delete persona should work properly', async ({ page }) => {
     await page
-      .getByTestId(`persona-details-card-${PERSONA_DETAILS.name}`)
+      .locator('[data-testid="persona-details-card"]')
+      .getByText(PERSONA_DETAILS.displayName)
       .click();
 
     await page.click('[data-testid="manage-button"]');

openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Glossary.spec.ts

@@ -259,7 +259,7 @@ test.describe('Glossary tests', () => {
           type: 'Users',
         });
 
-        await assignTag(page, 'PersonalData.Personal', 'Add', 'tabs');
+        await assignTag(page, 'PersonalData.Personal');
       });
 
       await test.step('Update Glossary Term', async () => {
@@ -288,7 +288,7 @@ test.describe('Glossary tests', () => {
           page,
           'PersonalData.Personal',
           'Add',
-          'glossary-term'
+          'panel-container'
         );
       });
     } finally {

openmetadata-ui/src/main/resources/ui/playwright/utils/customizeLandingPage.ts

@@ -24,20 +24,20 @@ export const navigateToCustomizeLandingPage = async (
 ) => {
   const getPersonas = page.waitForResponse('/api/v1/personas*');
 
-  await settingClick(page, GlobalSettingOptions.PERSONA);
+  await settingClick(page, GlobalSettingOptions.CUSTOMIZE_LANDING_PAGE);
 
   await getPersonas;
 
   const getCustomPageDataResponse = page.waitForResponse(
-    `/api/v1/docStore/name/persona.${encodeURIComponent(personaName)}`
+    `/api/v1/docStore/name/persona.${encodeURIComponent(
+      personaName
+    )}.Page.LandingPage`
   );
 
   // Navigate to the customize landing page
-  await page.getByTestId(`persona-details-card-${personaName}`).click();
-
-  await page.getByRole('tab', { name: 'Customize UI' }).click();
-
-  await page.getByTestId('LandingPage').click();
+  await page.click(
+    `[data-testid="persona-details-card-${personaName}"] [data-testid="customize-page-button"]`
+  );
 
   expect((await getCustomPageDataResponse).status()).toBe(
     customPageDataResponse

openmetadata-ui/src/main/resources/ui/playwright/utils/entity.ts

@@ -353,11 +353,10 @@ export const updateDescription = async (
 export const assignTag = async (
   page: Page,
   tag: string,
-  action: 'Add' | 'Edit' = 'Add',
-  parentId = 'entity-right-panel'
+  action: 'Add' | 'Edit' = 'Add'
 ) => {
   await page
-    .getByTestId(parentId)
+    .getByTestId('entity-right-panel')
     .getByTestId('tags-container')
     .getByTestId(action === 'Add' ? 'add-tag' : 'edit-button')
     .click();
@@ -380,7 +379,7 @@ export const assignTag = async (
 
   await expect(
     page
-      .getByTestId(parentId)
+      .getByTestId('entity-right-panel')
       .getByTestId('tags-container')
       .getByTestId(`tag-${tag}`)
   ).toBeVisible();