GEN-658: Update the ingestion schedular with new design

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

@@ -55,8 +55,11 @@ test(
 
       await page.getByTestId('add-ingestion-button').click();
       await page.getByTestId('select-all-test-cases').click();
-      await page.getByTestId('cron-type').getByText('Hour').click();
-      await page.getByTitle('Day').click();
+
+      await expect(
+        page.getByTestId('cron-type').getByText('Day')
+      ).toBeAttached();
+
       await page.getByTestId('deploy-button').click();
 
       await expect(page.getByTestId('view-service-button')).toBeVisible();

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

@@ -61,8 +61,15 @@ test.describe.serial('Data Insight Report Application', () => {
     await page.click('[data-testid="install-application"]');
     await page.click('[data-testid="save-button"]');
     await page.click('[data-testid="submit-btn"]');
-    await page.click('[data-testid="cron-type"]');
-    await page.click('[data-value="5"]');
+
+    await expect(
+      page.getByTestId('cron-type').getByText('Week')
+    ).toBeAttached();
+
+    await page
+      .locator('#schedular-form_dow .week-selector-buttons')
+      .getByText('F')
+      .click();
     await page.click('[data-testid="deploy-button"]');
 
     await toastNotification(page, 'Application installed successfully');
@@ -79,7 +86,10 @@ test.describe.serial('Data Insight Report Application', () => {
 
     await page.click('[data-testid="edit-button"]');
     await page.click('[data-testid="cron-type"]');
-    await page.click('[data-value="3"]');
+    await page
+      .locator('#schedular-form_dow .week-selector-buttons')
+      .getByText('W')
+      .click();
     await page.click('[data-testid="hour-options"]');
     await page.click('[title="01"]');
     await page.click('.ant-modal-body [data-testid="deploy-button"]');

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

@@ -89,8 +89,11 @@ test('Search Index Application', async ({ page }) => {
 
   await test.step('Edit application', async () => {
     await page.click('[data-testid="edit-button"]');
-    await page.click('[data-testid="cron-type"]');
-    await page.click('.rc-virtual-list [title="None"]');
+    await page.waitForSelector('[data-testid="schedular-card-container"]');
+    await page
+      .getByTestId('schedular-card-container')
+      .getByText('On Demand')
+      .click();
 
     const deployResponse = page.waitForResponse('/api/v1/apps/*');
     await page.click('.ant-modal-body [data-testid="deploy-button"]');
@@ -157,10 +160,13 @@ test('Search Index Application', async ({ page }) => {
     await page.click('[data-testid="install-application"]');
     await page.click('[data-testid="save-button"]');
     await page.click('[data-testid="submit-btn"]');
-    await page.click('[data-testid="cron-type"]');
-    await page.click('.rc-virtual-list [title="None"]');
+    await page.waitForSelector('[data-testid="schedular-card-container"]');
+    await page
+      .getByTestId('schedular-card-container')
+      .getByText('On Demand')
+      .click();
 
-    expect(await page.innerText('[data-testid="cron-type"]')).toContain('None');
+    await expect(page.locator('[data-testid="cron-type"]')).not.toBeVisible();
 
     const installApplicationResponse = page.waitForResponse('api/v1/apps');
     await page.click('[data-testid="deploy-button"]');

openmetadata-ui/src/main/resources/ui/playwright/support/entity/ingestion/ServiceBaseClass.ts

@@ -203,11 +203,39 @@ class ServiceBaseClass {
   }
 
   async scheduleIngestion(page: Page) {
-    // Schedule & Deploy
-    await page.waitForSelector('[data-testid="cron-type"]');
     await page.click('[data-testid="cron-type"]');
-    await page.waitForSelector('.ant-select-item-option-content');
-    await page.click('.ant-select-item-option-content:has-text("None")');
+    await page.click('.ant-select-item-option-content:has-text("Custom")');
+    // Check validation error thrown for a cron that is too frequent
+    // i.e. having interval less than 1 hour
+    await page.locator('#schedular-form_cron').fill('* * * 2 6');
+    await page.click('[data-testid="deploy-button"]');
+
+    await expect(
+      page.getByText(
+        'Cron schedule too frequent. Please choose at least 1-hour intervals.'
+      )
+    ).toBeAttached();
+
+    // Check validation error thrown for a cron that is invalid
+    await page.locator('#schedular-form_cron').clear();
+    await page.click('[data-testid="deploy-button"]');
+    await page.locator('#schedular-form_cron').fill('* * * 2 ');
+
+    await expect(
+      page.getByText(
+        'Error: Expression has only 4 parts. At least 5 parts are required.'
+      )
+    ).toBeAttached();
+
+    await page.locator('#schedular-form_cron').clear();
+
+    await page.waitForSelector('[data-testid="schedular-card-container"]');
+    await page
+      .getByTestId('schedular-card-container')
+      .getByText('On Demand')
+      .click();
+
+    await expect(page.locator('[data-testid="cron-type"]')).not.toBeVisible();
 
     const deployPipelinePromise = page.waitForRequest(
       `/api/v1/services/ingestionPipelines/deploy/**`
@@ -240,7 +268,7 @@ class ServiceBaseClass {
       .then((res) => res.json());
 
     const workflowData = response.data.filter(
-      (d) => d.pipelineType === ingestionType
+      (d: { pipelineType: string }) => d.pipelineType === ingestionType
     )[0];
 
     const oneHourBefore = Date.now() - 86400000;
@@ -315,6 +343,11 @@ class ServiceBaseClass {
     await page.click('[data-testid="submit-btn"]');
 
     // select schedule
+    await page.waitForSelector('[data-testid="schedular-card-container"]');
+    await page
+      .getByTestId('schedular-card-container')
+      .getByText('Schedule', { exact: true })
+      .click();
     await page.click('[data-testid="cron-type"]');
     await page
       .locator('.ant-select-item-option-content', { hasText: 'Hour' })
@@ -365,7 +398,10 @@ class ServiceBaseClass {
     await page.click('[data-testid="submit-btn"]');
     await page.click('[data-testid="cron-type"]');
     await page.click('.ant-select-item-option-content:has-text("Week")');
-    await page.click('[data-value="6"]');
+    await page
+      .locator('#schedular-form_dow .week-selector-buttons')
+      .getByText('W')
+      .click();
     await page.click('[data-testid="hour-options"]');
     await page.click('#hour-select_list + .rc-virtual-list [title="05"]');
     await page.click('[data-testid="minute-options"]');
@@ -379,7 +415,7 @@ class ServiceBaseClass {
       'At 05:05 AM'
     );
     await expect(page.getByTestId('schedule-secondary-details')).toHaveText(
-      'Only on saturday'
+      'Only on wednesday'
     );
 
     // click and edit pipeline schedule for Custom
@@ -388,16 +424,18 @@ class ServiceBaseClass {
     await page.click('[data-testid="submit-btn"]');
     await page.click('[data-testid="cron-type"]');
     await page.click('.ant-select-item-option-content:has-text("Custom")');
-    await page.fill('#cron', '* * * 2 6');
+
+    // Schedule & Deploy
+    await page.locator('#schedular-form_cron').fill('0 * * 2 6');
 
     await page.click('[data-testid="deploy-button"]');
     await page.click('[data-testid="view-service-button"]');
 
     await expect(page.getByTestId('schedule-primary-details')).toHaveText(
-      'Every minute'
+      'Every hour'
     );
     await expect(page.getByTestId('schedule-secondary-details')).toHaveText(
-      'Every hour, only on saturday, only in february'
+      'Only on saturday, only in february'
     );
   }
 

openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/AddDataQualityTest.interface.ts

@@ -43,7 +43,7 @@ export interface TestSuiteIngestionProps {
 }
 
 export type TestSuiteIngestionDataType = {
-  repeatFrequency: string;
+  cron?: string;
   enableDebugLog?: boolean;
   testCases?: string[];
   name?: string;

openmetadata-ui/src/main/resources/ui/src/components/DataQuality/AddDataQualityTest/TestSuiteIngestion.tsx

@@ -41,7 +41,6 @@ import {
   updateIngestionPipeline,
 } from '../../../rest/ingestionPipelineAPI';
 import {
-  getIngestionFrequency,
   getNameFromFQN,
   replaceAllSpacialCharWith_,
   Transi18next,
@@ -51,7 +50,6 @@ import { getScheduleOptionsFromSchedules } from '../../../utils/ScheduleUtils';
 import { getIngestionName } from '../../../utils/ServiceUtils';
 import { generateUUID } from '../../../utils/StringsUtils';
 import { showErrorToast } from '../../../utils/ToastUtils';
-import { getWeekCron } from '../../common/CronEditor/CronEditor.constant';
 import SuccessScreen from '../../common/SuccessScreen/SuccessScreen';
 import DeployIngestionLoaderModal from '../../Modals/DeployIngestionLoaderModal/DeployIngestionLoaderModal';
 import {
@@ -117,15 +115,11 @@ const TestSuiteIngestion: React.FC<TestSuiteIngestionProps> = ({
     );
   }, [ingestionData, showDeployButton]);
 
-  const initialFormData: TestSuiteIngestionDataType = useMemo(() => {
+  const initialFormData = useMemo(() => {
     const testCases = ingestionPipeline?.sourceConfig.config?.testCases;
 
     return {
-      repeatFrequency:
-        ingestionPipeline?.airflowConfig.scheduleInterval ??
-        (config?.enable
-          ? getWeekCron({ hour: 0, min: 0, dow: 0 })
-          : getIngestionFrequency(PipelineType.TestSuite)),
+      cron: ingestionPipeline?.airflowConfig.scheduleInterval,
       enableDebugLog: ingestionPipeline?.loggerLevel === LogLevels.Debug,
       testCases,
       name: ingestionPipeline?.displayName,
@@ -171,9 +165,7 @@ const TestSuiteIngestion: React.FC<TestSuiteIngestionProps> = ({
 
     const ingestionPayload: CreateIngestionPipeline = {
       airflowConfig: {
-        scheduleInterval: isEmpty(data.repeatFrequency)
-          ? undefined
-          : data.repeatFrequency,
+        scheduleInterval: data.cron,
       },
       displayName: updatedName,
       name: generateUUID(),
@@ -211,9 +203,7 @@ const TestSuiteIngestion: React.FC<TestSuiteIngestionProps> = ({
       displayName: data.name ?? ingestionPipeline.displayName,
       airflowConfig: {
         ...ingestionPipeline?.airflowConfig,
-        scheduleInterval: isEmpty(data.repeatFrequency)
-          ? undefined
-          : data.repeatFrequency,
+        scheduleInterval: data.cron,
       },
       loggerLevel: data.enableDebugLog ? LogLevels.Debug : LogLevels.Info,
       sourceConfig: {