Merge branch 'main' into fix-glossary-import-export-permissions-27487

Author: aniruddhaadak80

openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/DataQuality/Profiler.spec.ts

@@ -74,8 +74,10 @@ const validateProfilerAccessForRole = async (
 
   expect(profilerResponse.status()).toBe(200);
 
+  // TODO: Reduce timeout once the latency issue is fixed
   const listColumnApiCall = page.waitForResponse(
-    '/api/v1/tables/name/*/columns?*'
+    '/api/v1/tables/name/*/columns?*',
+    { timeout: 150_000 }
   );
   await page
     .getByRole('tab', {

openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/Table.spec.ts

@@ -725,7 +725,7 @@ test.describe('Large Table Column Search & Copy Link', () => {
             ) &&
           response.url().includes('profile') &&
           response.request().method() === 'GET',
-        { timeout: 90_000 }
+        { timeout: 150_000 } // TODO: Reduce timeout once the latency issue is fixed
       ),
       page.goto(clipboardText),
     ]);

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

@@ -2046,7 +2046,8 @@ Object.entries(entities).forEach(([key, EntityClass]) => {
         // Since the test iterates through all 17 types of custom property and
         // performs multiple actions for each, we need to increase the timeout
         // to avoid premature test failure
-        test.setTimeout(600000);
+        // TODO: Reduce timeout once the latency issue is fixed
+        test.setTimeout(960000);
         const { apiContext, afterAction } = await getApiContext(page);
 
         await prepareCustomProperty(apiContext);

openmetadata-ui/src/main/resources/ui/playwright/e2e/VersionPages/EntityVersionPages.spec.ts

@@ -39,25 +39,26 @@ import {
 } from '../../utils/common';
 import { getEntityDataTypeDisplayPatch } from '../../utils/entity';
 
-const entities = [
-  new ApiEndpointClass(),
-  new TableClass(),
-  new StoredProcedureClass(),
-  new DashboardClass(),
-  new PipelineClass(),
-  new TopicClass(),
-  new MlModelClass(),
-  new ContainerClass(),
-  new SearchIndexClass(),
-  new DashboardDataModelClass(),
-  new DirectoryClass(),
-  new FileClass(),
-  new SpreadsheetClass(),
-  new WorksheetClass(),
+let adminUser: UserClass;
+
+const entityClasses = [
+  ApiEndpointClass,
+  TableClass,
+  StoredProcedureClass,
+  DashboardClass,
+  PipelineClass,
+  TopicClass,
+  MlModelClass,
+  ContainerClass,
+  SearchIndexClass,
+  DashboardDataModelClass,
+  DirectoryClass,
+  FileClass,
+  SpreadsheetClass,
+  WorksheetClass,
 ];
 
-// use the admin user to login
-const adminUser = new UserClass();
+let entities: InstanceType<(typeof entityClasses)[number]>[];
 
 const test = base.extend<{ page: Page }>({
   page: async ({ browser }, use) => {
@@ -72,6 +73,9 @@ test.describe('Entity Version pages', () => {
   test.beforeAll('Setup pre-requests', async ({ browser }) => {
     test.slow();
 
+    adminUser = new UserClass();
+    entities = entityClasses.map((EntityClass) => new EntityClass());
+
     const { apiContext, afterAction } = await performAdminLogin(browser);
     await adminUser.create(apiContext);
     await adminUser.setAdminRole(apiContext);
@@ -148,10 +152,14 @@ test.describe('Entity Version pages', () => {
     await afterAction();
   });
 
-  entities.forEach((entity) => {
-    test(`${entity.getType()}`, async ({ page }) => {
+  entityClasses.forEach((EntityClass) => {
+    test(`${new EntityClass().getType()}`, async ({ page }) => {
       test.slow();
 
+      const entity = entities.find(
+        (e) => e instanceof EntityClass
+      ) as InstanceType<typeof EntityClass>;
+
       const { apiContext } = await getApiContext(page);
       await entity.visitEntityPage(page);
 
@@ -162,8 +170,7 @@ test.describe('Entity Version pages', () => {
       ).toFixed(1)}`;
       const versionDetailResponse = page.waitForResponse(
         (response) =>
-          response.url().includes(`/versions/${setupPatchVersion}`) &&
-          response.status() === 200
+          response.url().includes('/versions') && response.status() === 200
       );
       await page.locator('[data-testid="version-button"]').click();
       await versionDetailResponse;

openmetadata-ui/src/main/resources/ui/playwright/e2e/nightly/ServiceIngestion.spec.ts

@@ -478,7 +478,7 @@ test.describe.serial(
         async (route) => {
           // Mock the pipelineStatus endpoint to simulate high latency
           // eslint-disable-next-line playwright/no-wait-for-timeout
-          await page.waitForTimeout(8000);
+          await page.waitForTimeout(5000);
           await route.continue();
         }
       );

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

@@ -1123,7 +1123,8 @@ export const verifyTableColumnCustomPropertyPersistence = async ({
           ) &&
         response.url().includes('profile') &&
         response.request().method() === 'GET',
-      { timeout: 90_000 }
+      // TODO: Reduce timeout once the latency issue is fixed
+      { timeout: 150_000 }
     );
 
   // 1. Navigate and Open Column Detail Panel

openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.component.tsx

@@ -159,6 +159,7 @@ export const DataAssetsHeader = ({
   const [isAutoPilotTriggering, setIsAutoPilotTriggering] = useState(false);
   const { entityRules } = useEntityRules(entityType);
   const [dataContract, setDataContract] = useState<DataContract>();
+  const [isRequestDataAccessOpen, setIsRequestDataAccessOpen] = useState(false);
 
   const fetchDataContract = async (entityId: string) => {
     try {
@@ -586,6 +587,25 @@ export const DataAssetsHeader = ({
     permissions.Trigger,
   ]);
 
+  const requestDataAccessButton = useMemo(() => {
+    if (
+      !tableClassBase.getShowRequestDataAccess() ||
+      SERVICE_TYPES.includes(entityType) ||
+      deleted
+    ) {
+      return null;
+    }
+
+    return (
+      <Button
+        className="source-url-button font-semibold"
+        data-testid="request-data-access-button"
+        onClick={() => setIsRequestDataAccessOpen(true)}>
+        {t('label.request-data-access')}
+      </Button>
+    );
+  }, [entityType, deleted]);
+
   useEffect(() => {
     if (dataAsset.id) {
       fetchDataContract(dataAsset.id);
@@ -687,6 +707,7 @@ export const DataAssetsHeader = ({
                       </Typography.Link>
                     </Tooltip>
                   )}
+                  {requestDataAccessButton}
                   <ManageButton
                     isAsyncDelete
                     afterDeleteAction={afterDeleteAction}
@@ -895,6 +916,14 @@ export const DataAssetsHeader = ({
           onClose={handleCloseAnnouncementDrawer}
         />
       )}
+
+      {tableClassBase.getRequestDataAccessDrawer(
+        isRequestDataAccessOpen,
+        () => setIsRequestDataAccessOpen(false),
+        dataAsset.fullyQualifiedName ?? '',
+        getEntityName(dataAsset),
+        entityType
+      )}
     </>
   );
 };

openmetadata-ui/src/main/resources/ui/src/components/DataAssets/DataAssetsHeader/DataAssetsHeader.test.tsx

@@ -185,6 +185,8 @@ jest.mock('../../../utils/TableClassBase', () => ({
   getAlertEnableStatus: jest
     .fn()
     .mockImplementation(() => mockIsAlertSupported),
+  getShowRequestDataAccess: jest.fn().mockImplementation(() => false),
+  getRequestDataAccessDrawer: jest.fn().mockImplementation(() => null),
 }));
 
 jest.mock('../../../rest/lineageAPI', () => ({
@@ -606,6 +608,14 @@ describe('DataAssetsHeader component', () => {
     expect(button).toBeEnabled();
   });
 
+  it('should not render the request data access button on OSS', () => {
+    render(<DataAssetsHeader {...mockProps} />);
+
+    expect(
+      screen.queryByTestId('request-data-access-button')
+    ).not.toBeInTheDocument();
+  });
+
   describe('dataContractLatestResultButton', () => {
     const mockGetDataContractStatusIcon =
       getDataContractStatusIcon as jest.Mock;

openmetadata-ui/src/main/resources/ui/src/locale/languages/ar-sa.json

@@ -1721,6 +1721,7 @@
     "reposition": "إعادة تموضع",
     "repository-url": "Repository URL",
     "request": "طلب",
+    "request-data-access": "طلب الوصول إلى البيانات",
     "request-method": "طريقة الطلب",
     "request-schema-field": "حقل مخطط الطلب",
     "request-tag-plural": "طلب وسوم",

openmetadata-ui/src/main/resources/ui/src/locale/languages/de-de.json

@@ -1721,6 +1721,7 @@
     "reposition": "Neu positionieren",
     "repository-url": "Repository-URL",
     "request": "Anfrage",
+    "request-data-access": "Datenzugriff anfordern",
     "request-method": "Anfrage Methode",
     "request-schema-field": "Anfrage Feld Schema",
     "request-tag-plural": "Tag-Anfragen",