From efd34f49c9a5e40fcbef98f56076a1f273dd45f8 Mon Sep 17 00:00:00 2001
From: musharaf-nocodb <musharaf@nocodb.com>
Date: Mon, 11 Dec 2023 15:56:56 +0530
Subject: [PATCH] fix : fixed date list

---
 .../smartsheet/column/DateOptions.vue          |  2 +-
 .../pages/Dashboard/Grid/Column/index.ts       | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/DateOptions.vue b/packages/nc-gui/components/smartsheet/column/DateOptions.vue
index 181894fb5e..62ca5d99e7 100644
--- a/packages/nc-gui/components/smartsheet/column/DateOptions.vue
+++ b/packages/nc-gui/components/smartsheet/column/DateOptions.vue
@@ -19,7 +19,7 @@ if (!vModel.value.meta?.date_format) {
 <template>
   <a-form-item :label="$t('labels.dateFormat')">
     <a-select v-model:value="vModel.meta.date_format" class="nc-date-select" dropdown-class-name="nc-dropdown-date-format">
-      <a-select-option v-for="(format, i) of [...dateMonthFormats, ...dateFormats]" :key="i" :value="format">
+      <a-select-option v-for="(format, i) of [ ...dateFormats,...dateMonthFormats,]" :key="i" :value="format">
         <div class="flex gap-2 justify-between items-center" :data-testid="`nc-date-select-${format}`">
           {{ format }}
           <component
diff --git a/tests/playwright/pages/Dashboard/Grid/Column/index.ts b/tests/playwright/pages/Dashboard/Grid/Column/index.ts
index 9fdd1f37e2..461eb0ba4b 100644
--- a/tests/playwright/pages/Dashboard/Grid/Column/index.ts
+++ b/tests/playwright/pages/Dashboard/Grid/Column/index.ts
@@ -112,11 +112,16 @@ export class ColumnPageObject extends BasePage {
         await this.get().locator('.nc-time-select').click();
         await this.rootPage.locator('.ant-select-item').locator(`[data-testid="nc-time-${timeFormat}"]`).click();
         break;
-      case 'Date':
+      case 'Date': {
         // Date Format
         await this.get().locator('.nc-date-select').click();
-        await this.rootPage.locator('.ant-select-item').locator(`[data-testid="nc-date-select-${dateFormat}"]`).click();
+        const result = this.rootPage
+          .locator('.rc-virtual-list-holder-inner')
+          .locator(`[data-testid="nc-date-select-${dateFormat}"]`);
+        await result.scrollIntoViewIfNeeded();
+        await result.click();
         break;
+      }
       case 'Formula':
         await this.get().locator('.nc-formula-input').fill(formula);
         break;
@@ -306,11 +311,16 @@ export class ColumnPageObject extends BasePage {
           })
           .click();
         break;
-      case 'Date':
+      case 'Date': {
         // Date Format
         await this.get().locator('.nc-date-select').click();
-        await this.rootPage.locator('.ant-select-item').locator(`[data-testid="nc-date-select-${dateFormat}"]`).click();
+        const result = this.rootPage
+          .locator('.rc-virtual-list-holder-inner')
+          .locator(`[data-testid="nc-date-select-${dateFormat}"]`);
+        await result.scrollIntoViewIfNeeded();
+        await result.click();
         break;
+      }
       case 'DateTime':
         // Date Format
         await this.get().locator('.nc-date-select').click();