Browse Source

fix : revert date options

pull/7181/head
musharaf-nocodb 1 year ago
parent
commit
60163b03fc
  1. 2
      packages/nc-gui/components/smartsheet/column/DateOptions.vue
  2. 12
      tests/playwright/pages/Dashboard/Grid/Column/index.ts

2
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

12
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':

Loading…
Cancel
Save