From 60163b03fc06e8591ed9548c187ef7eb7507c6e1 Mon Sep 17 00:00:00 2001
From: musharaf-nocodb <musharaf@nocodb.com>
Date: Mon, 11 Dec 2023 16:25:45 +0530
Subject: [PATCH] fix : revert date options

---
 .../components/smartsheet/column/DateOptions.vue     |  2 +-
 .../playwright/pages/Dashboard/Grid/Column/index.ts  | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/column/DateOptions.vue b/packages/nc-gui/components/smartsheet/column/DateOptions.vue
index 62ca5d99e7..181894fb5e 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 [ ...dateFormats,...dateMonthFormats,]" :key="i" :value="format">
+      <a-select-option v-for="(format, i) of [...dateMonthFormats, ...dateFormats]" :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 461eb0ba4b..600ef15f13 100644
--- a/tests/playwright/pages/Dashboard/Grid/Column/index.ts
+++ b/tests/playwright/pages/Dashboard/Grid/Column/index.ts
@@ -115,11 +115,7 @@ export class ColumnPageObject extends BasePage {
       case 'Date': {
         // Date Format
         await this.get().locator('.nc-date-select').click();
-        const result = this.rootPage
-          .locator('.rc-virtual-list-holder-inner')
-          .locator(`[data-testid="nc-date-select-${dateFormat}"]`);
-        await result.scrollIntoViewIfNeeded();
-        await result.click();
+        await this.rootPage.locator('.ant-select-item').locator(`[data-testid="nc-date-select-${dateFormat}"]`).click();
         break;
       }
       case 'Formula':
@@ -314,11 +310,7 @@ export class ColumnPageObject extends BasePage {
       case 'Date': {
         // Date Format
         await this.get().locator('.nc-date-select').click();
-        const result = this.rootPage
-          .locator('.rc-virtual-list-holder-inner')
-          .locator(`[data-testid="nc-date-select-${dateFormat}"]`);
-        await result.scrollIntoViewIfNeeded();
-        await result.click();
+        await this.rootPage.locator('.ant-select-item').locator(`[data-testid="nc-date-select-${dateFormat}"]`).click();
         break;
       }
       case 'DateTime':