github
/
nocodb
mirror of https://github.com/nocodb/nocodb
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Merge pull request #4885 from nocodb/fix/null-sort-order 

fix: Set sort order of nulls in postgres
pull/4910/head
Raju Udava 2 years ago committed by GitHub
parent
d030b1c53a 505dbcb1db
commit
b722ab72bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 341 additions and 204 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 349
      packages/nc-gui/components/smartsheet/Grid.vue
  2. 4
      packages/nc-gui/utils/filterUtils.ts
  3. 2
      packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts
  4. 3
      packages/nocodb-sdk/src/lib/sqlUi/MysqlUi.ts
  5. 2
      packages/nocodb-sdk/src/lib/sqlUi/OracleUi.ts
  6. 2
      packages/nocodb-sdk/src/lib/sqlUi/PgUi.ts
  7. 3
      packages/nocodb-sdk/src/lib/sqlUi/SnowflakeUi.ts
  8. 4
      packages/nocodb-sdk/src/lib/sqlUi/SqliteUi.ts
  9. 10
      packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/conditionV2.ts
  10. 41
      packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/sortV2.ts
  11. 19
      tests/playwright/tests/columnCheckbox.spec.ts
  12. 106
      tests/playwright/tests/columnRating.spec.ts

349
packages/nc-gui/components/smartsheet/Grid.vue
Unescape View File

@ -156,8 +156,8 @@ const getContainerScrollForElement = (
relativePos.right + (offset?.right || 0) > 0 relativePos.right + (offset?.right || 0) > 0
? container.scrollLeft + relativePos.right + (offset?.right || 0) ? container.scrollLeft + relativePos.right + (offset?.right || 0)
: relativePos.left - (offset?.left || 0) < 0 : relativePos.left - (offset?.left || 0) < 0
? container.scrollLeft + relativePos.left - (offset?.left || 0) ? container.scrollLeft + relativePos.left - (offset?.left || 0)
: container.scrollLeft : container.scrollLeft
/* /*
* If the element is below the container, scroll down (positive) * If the element is below the container, scroll down (positive)
@ -167,8 +167,8 @@ const getContainerScrollForElement = (
relativePos.bottom + (offset?.bottom || 0) > 0 relativePos.bottom + (offset?.bottom || 0) > 0
? container.scrollTop + relativePos.bottom + (offset?.bottom || 0) ? container.scrollTop + relativePos.bottom + (offset?.bottom || 0)
: relativePos.top - (offset?.top || 0) < 0 : relativePos.top - (offset?.top || 0) < 0
? container.scrollTop + relativePos.top - (offset?.top || 0) ? container.scrollTop + relativePos.top - (offset?.top || 0)
: container.scrollTop : container.scrollTop
return scroll return scroll
} }
@ -418,7 +418,18 @@ async function clearCell(ctx: { row: number; col: number } | null, skipUpdate =
return return
} }
rowObj.row[columnObj.title] = null // handle Checkbox and rating fields in a special way
switch (columnObj.uidt) {
case UITypes.Checkbox:
rowObj.row[columnObj.title] = false
break
case UITypes.Rating:
rowObj.row[columnObj.title] = 0
break
default:
rowObj.row[columnObj.title] = null
break
}
if (!skipUpdate) { if (!skipUpdate) {
// update/save cell value // update/save cell value
@ -661,104 +672,105 @@ const closeAddColumnDropdown = () => {
@contextmenu="showContextMenu" @contextmenu="showContextMenu"
> >
<thead ref="tableHead"> <thead ref="tableHead">
<tr class="nc-grid-header border-1 bg-gray-100 sticky top[-1px]"> <tr class="nc-grid-header border-1 bg-gray-100 sticky top[-1px]">
<th data-testid="grid-id-column"> <th data-testid="grid-id-column">
<div class="w-full h-full bg-gray-100 flex min-w-[70px] pl-5 pr-1 items-center" data-testid="nc-check-all"> <div class="w-full h-full bg-gray-100 flex min-w-[70px] pl-5 pr-1 items-center"
<template v-if="!readOnly"> data-testid="nc-check-all">
<div class="nc-no-label text-gray-500" :class="{ hidden: selectedAllRecords }">#</div> <template v-if="!readOnly">
<div <div class="nc-no-label text-gray-500" :class="{ hidden: selectedAllRecords }">#</div>
:class="{ hidden: !selectedAllRecords, flex: selectedAllRecords }" <div
class="nc-check-all w-full items-center" :class="{ hidden: !selectedAllRecords, flex: selectedAllRecords }"
> class="nc-check-all w-full items-center"
<a-checkbox v-model:checked="selectedAllRecords" /> >
<a-checkbox v-model:checked="selectedAllRecords" />
<span class="flex-1" /> <span class="flex-1" />
</div> </div>
</template> </template>
<template v-else> <template v-else>
<div class="text-gray-500">#</div> <div class="text-gray-500">#</div>
</template> </template>
</div> </div>
</th> </th>
<th <th
v-for="col in fields" v-for="col in fields"
:key="col.title" :key="col.title"
v-xc-ver-resize v-xc-ver-resize
:data-col="col.id" :data-col="col.id"
:data-title="col.title" :data-title="col.title"
@xcresize="onresize(col.id, $event)" @xcresize="onresize(col.id, $event)"
@xcresizing="onXcResizing(col.title, $event)" @xcresizing="onXcResizing(col.title, $event)"
@xcresized="resizingCol = null" @xcresized="resizingCol = null"
> >
<div class="w-full h-full bg-gray-100 flex items-center"> <div class="w-full h-full bg-gray-100 flex items-center">
<LazySmartsheetHeaderVirtualCell v-if="isVirtualCol(col)" :column="col" :hide-menu="readOnly" /> <LazySmartsheetHeaderVirtualCell v-if="isVirtualCol(col)" :column="col" :hide-menu="readOnly" />
<LazySmartsheetHeaderCell v-else :column="col" :hide-menu="readOnly" /> <LazySmartsheetHeaderCell v-else :column="col" :hide-menu="readOnly" />
</div> </div>
</th> </th>
<th <th
v-if="isAddingColumnAllowed" v-if="isAddingColumnAllowed"
v-e="['c:column:add']" v-e="['c:column:add']"
class="cursor-pointer" class="cursor-pointer"
@click.stop="addColumnDropdown = true" @click.stop="addColumnDropdown = true"
>
<a-dropdown
v-model:visible="addColumnDropdown"
:trigger="['click']"
overlay-class-name="nc-dropdown-grid-add-column"
> >
<a-dropdown <div class="h-full w-[60px] flex items-center justify-center">
v-model:visible="addColumnDropdown" <MdiPlus class="text-sm nc-column-add" />
:trigger="['click']" </div>
overlay-class-name="nc-dropdown-grid-add-column"
>
<div class="h-full w-[60px] flex items-center justify-center">
<MdiPlus class="text-sm nc-column-add" />
</div>
<template #overlay> <template #overlay>
<SmartsheetColumnEditOrAddProvider <SmartsheetColumnEditOrAddProvider
v-if="addColumnDropdown" v-if="addColumnDropdown"
:column-position="columnOrder" :column-position="columnOrder"
@submit="closeAddColumnDropdown" @submit="closeAddColumnDropdown"
@cancel="closeAddColumnDropdown" @cancel="closeAddColumnDropdown"
@click.stop @click.stop
@keydown.stop @keydown.stop
/> />
</template> </template>
</a-dropdown> </a-dropdown>
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody ref="tbodyEl"> <tbody ref="tbodyEl">
<LazySmartsheetRow v-for="(row, rowIndex) of data" ref="rowRefs" :key="rowIndex" :row="row"> <LazySmartsheetRow v-for="(row, rowIndex) of data" ref="rowRefs" :key="rowIndex" :row="row">
<template #default="{ state }"> <template #default="{ state }">
<tr class="nc-grid-row" :data-testid="`grid-row-${rowIndex}`"> <tr class="nc-grid-row" :data-testid="`grid-row-${rowIndex}`">
<td key="row-index" class="caption nc-grid-cell pl-5 pr-1" :data-testid="`cell-Id-${rowIndex}`"> <td key="row-index" class="caption nc-grid-cell pl-5 pr-1" :data-testid="`cell-Id-${rowIndex}`">
<div class="items-center flex gap-1 min-w-[55px]"> <div class="items-center flex gap-1 min-w-[55px]">
<div <div
v-if="!readOnly || !isLocked" v-if="!readOnly || !isLocked"
class="nc-row-no text-xs text-gray-500" class="nc-row-no text-xs text-gray-500"
:class="{ toggle: !readOnly, hidden: row.rowMeta.selected }" :class="{ toggle: !readOnly, hidden: row.rowMeta.selected }"
> >
{{ rowIndex + 1 }} {{ rowIndex + 1 }}
</div> </div>
<div <div
v-if="!readOnly" v-if="!readOnly"
:class="{ hidden: !row.rowMeta.selected, flex: row.rowMeta.selected }" :class="{ hidden: !row.rowMeta.selected, flex: row.rowMeta.selected }"
class="nc-row-expand-and-checkbox" class="nc-row-expand-and-checkbox"
> >
<a-checkbox v-model:checked="row.rowMeta.selected" /> <a-checkbox v-model:checked="row.rowMeta.selected" />
</div> </div>
<span class="flex-1" /> <span class="flex-1" />
<div <div
v-if="!readOnly || hasRole('commenter', true) || hasRole('viewer', true)" v-if="!readOnly || hasRole('commenter', true) || hasRole('viewer', true)"
class="nc-expand" class="nc-expand"
:data-testid="`nc-expand-${rowIndex}`" :data-testid="`nc-expand-${rowIndex}`"
:class="{ 'nc-comment': row.rowMeta?.commentCount }" :class="{ 'nc-comment': row.rowMeta?.commentCount }"
> >
<a-spin <a-spin
v-if="row.rowMeta.saving" v-if="row.rowMeta.saving"
class="!flex items-center" class="!flex items-center"
:data-testid="`row-save-spinner-${rowIndex}`" :data-testid="`row-save-spinner-${rowIndex}`"
/> />
<template v-else> <template v-else>
<span <span
v-if="row.rowMeta?.commentCount" v-if="row.rowMeta?.commentCount"
class="py-1 px-3 rounded-full text-xs cursor-pointer select-none transform hover:(scale-110)" class="py-1 px-3 rounded-full text-xs cursor-pointer select-none transform hover:(scale-110)"
@ -767,86 +779,86 @@ const closeAddColumnDropdown = () => {
> >
{{ row.rowMeta.commentCount }} {{ row.rowMeta.commentCount }}
</span> </span>
<div <div
v-else v-else
class="cursor-pointer flex items-center border-1 active:ring rounded p-1 hover:(bg-primary bg-opacity-10)" class="cursor-pointer flex items-center border-1 active:ring rounded p-1 hover:(bg-primary bg-opacity-10)"
> >
<MdiArrowExpand <MdiArrowExpand
v-e="['c:row-expand']" v-e="['c:row-expand']"
class="select-none transform hover:(text-accent scale-120) nc-row-expand" class="select-none transform hover:(text-accent scale-120) nc-row-expand"
@click="expandForm(row, state)" @click="expandForm(row, state)"
/> />
</div> </div>
</template> </template>
</div>
</div> </div>
</td> </div>
<SmartsheetTableDataCell </td>
v-for="(columnObj, colIndex) of fields" <SmartsheetTableDataCell
:key="columnObj.id" v-for="(columnObj, colIndex) of fields"
class="cell relative cursor-pointer nc-grid-cell" :key="columnObj.id"
:class="{ class="cell relative cursor-pointer nc-grid-cell"
:class="{
'active': hasEditPermission && isCellSelected(rowIndex, colIndex), 'active': hasEditPermission && isCellSelected(rowIndex, colIndex),
'nc-required-cell': isColumnRequiredAndNull(columnObj, row.row), 'nc-required-cell': isColumnRequiredAndNull(columnObj, row.row),
}" }"
:data-testid="`cell-${columnObj.title}-${rowIndex}`" :data-testid="`cell-${columnObj.title}-${rowIndex}`"
:data-key="rowIndex + columnObj.id" :data-key="rowIndex + columnObj.id"
:data-col="columnObj.id" :data-col="columnObj.id"
:data-title="columnObj.title" :data-title="columnObj.title"
@mousedown="handleMouseDown($event, rowIndex, colIndex)" @mousedown="handleMouseDown($event, rowIndex, colIndex)"
@mouseover="handleMouseOver(rowIndex, colIndex)" @mouseover="handleMouseOver(rowIndex, colIndex)"
@click="handleCellClick($event, rowIndex, colIndex)" @click="handleCellClick($event, rowIndex, colIndex)"
@dblclick="makeEditable(row, columnObj)" @dblclick="makeEditable(row, columnObj)"
@contextmenu="showContextMenu($event, { row: rowIndex, col: colIndex })" @contextmenu="showContextMenu($event, { row: rowIndex, col: colIndex })"
> >
<div v-if="!switchingTab" class="w-full h-full"> <div v-if="!switchingTab" class="w-full h-full">
<LazySmartsheetVirtualCell <LazySmartsheetVirtualCell
v-if="isVirtualCol(columnObj)" v-if="isVirtualCol(columnObj)"
v-model="row.row[columnObj.title]" v-model="row.row[columnObj.title]"
:column="columnObj" :column="columnObj"
:active="activeCell.col === colIndex && activeCell.row === rowIndex" :active="activeCell.col === colIndex && activeCell.row === rowIndex"
:row="row" :row="row"
:read-only="readOnly" :read-only="readOnly"
@navigate="onNavigate" @navigate="onNavigate"
/> />
<LazySmartsheetCell <LazySmartsheetCell
v-else v-else
v-model="row.row[columnObj.title]" v-model="row.row[columnObj.title]"
:column="columnObj" :column="columnObj"
:edit-enabled=" :edit-enabled="
!!hasEditPermission && !!editEnabled && activeCell.col === colIndex && activeCell.row === rowIndex !!hasEditPermission && !!editEnabled && activeCell.col === colIndex && activeCell.row === rowIndex
" "
:row-index="rowIndex" :row-index="rowIndex"
:active="activeCell.col === colIndex && activeCell.row === rowIndex" :active="activeCell.col === colIndex && activeCell.row === rowIndex"
:read-only="readOnly" :read-only="readOnly"
@update:edit-enabled="editEnabled = $event" @update:edit-enabled="editEnabled = $event"
@save="updateOrSaveRow(row, columnObj.title, state)" @save="updateOrSaveRow(row, columnObj.title, state)"
@navigate="onNavigate" @navigate="onNavigate"
@cancel="editEnabled = false" @cancel="editEnabled = false"
/> />
</div> </div>
</SmartsheetTableDataCell> </SmartsheetTableDataCell>
</tr> </tr>
</template> </template>
</LazySmartsheetRow> </LazySmartsheetRow>
<tr v-if="isAddingEmptyRowAllowed"> <tr v-if="isAddingEmptyRowAllowed">
<td <td
v-e="['c:row:add:grid-bottom']" v-e="['c:row:add:grid-bottom']"
:colspan="visibleColLength + 1" :colspan="visibleColLength + 1"
class="text-left pointer nc-grid-add-new-cell cursor-pointer" class="text-left pointer nc-grid-add-new-cell cursor-pointer"
@click="addEmptyRow()" @click="addEmptyRow()"
> >
<div class="px-2 w-full flex items-center text-gray-500"> <div class="px-2 w-full flex items-center text-gray-500">
<MdiPlus class="text-pint-500 text-xs ml-2 text-primary" /> <MdiPlus class="text-pint-500 text-xs ml-2 text-primary" />
<span class="ml-1"> <span class="ml-1">
{{ $t('activity.addRow') }} {{ $t('activity.addRow') }}
</span> </span>
</div> </div>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -885,7 +897,8 @@ const closeAddColumnDropdown = () => {
</div> </div>
</a-menu-item> </a-menu-item>
<a-menu-item v-if="contextMenuTarget" data-testid="context-menu-item-copy" @click="copyValue(contextMenuTarget)"> <a-menu-item v-if="contextMenuTarget" data-testid="context-menu-item-copy"
@click="copyValue(contextMenuTarget)">
<div v-e="['a:row:copy']" class="nc-project-menu-item"> <div v-e="['a:row:copy']" class="nc-project-menu-item">
<!-- Copy --> <!-- Copy -->
{{ $t('general.copy') }} {{ $t('general.copy') }}

4
packages/nc-gui/utils/filterUtils.ts
Unescape View File

@ -41,13 +41,13 @@ export const comparisonOpList: {
text: 'is empty', text: 'is empty',
value: 'empty', value: 'empty',
ignoreVal: true, ignoreVal: true,
excludedTypes: [UITypes.Checkbox], excludedTypes: [UITypes.Checkbox, UITypes.Rating],
}, },
{ {
text: 'is not empty', text: 'is not empty',
value: 'notempty', value: 'notempty',
ignoreVal: true, ignoreVal: true,
excludedTypes: [UITypes.Checkbox], excludedTypes: [UITypes.Checkbox, UITypes.Rating],
}, },
{ {
text: 'is null', text: 'is null',

2
packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts
Unescape View File

@ -1084,6 +1084,7 @@ export class MssqlUi {
case 'Checkbox': case 'Checkbox':
colProp.dt = 'tinyint'; colProp.dt = 'tinyint';
colProp.dtxp = 1; colProp.dtxp = 1;
colProp.cdf = '0';
break; break;
case 'MultiSelect': case 'MultiSelect':
colProp.dt = 'text'; colProp.dt = 'text';
@ -1150,6 +1151,7 @@ export class MssqlUi {
break; break;
case 'Rating': case 'Rating':
colProp.dt = 'int'; colProp.dt = 'int';
colProp.cdf = '0';
break; break;
case 'Formula': case 'Formula':
colProp.dt = 'varchar'; colProp.dt = 'varchar';

3
packages/nocodb-sdk/src/lib/sqlUi/MysqlUi.ts
Unescape View File

@ -597,7 +597,6 @@ export class MysqlUi {
} }
static onCheckboxChangeAI(col) { static onCheckboxChangeAI(col) {
console.log(col);
if ( if (
col.dt === 'int' || col.dt === 'int' ||
col.dt === 'bigint' || col.dt === 'bigint' ||
@ -977,6 +976,7 @@ export class MysqlUi {
case 'Checkbox': case 'Checkbox':
colProp.dt = 'tinyint'; colProp.dt = 'tinyint';
colProp.dtxp = 1; colProp.dtxp = 1;
colProp.cdf = '0';
break; break;
case 'MultiSelect': case 'MultiSelect':
colProp.dt = 'set'; colProp.dt = 'set';
@ -1049,6 +1049,7 @@ export class MysqlUi {
break; break;
case 'Rating': case 'Rating':
colProp.dt = 'int'; colProp.dt = 'int';
colProp.cdf = '0';
break; break;
case 'Formula': case 'Formula':
colProp.dt = 'varchar'; colProp.dt = 'varchar';

2
packages/nocodb-sdk/src/lib/sqlUi/OracleUi.ts
Unescape View File

@ -824,6 +824,7 @@ export class OracleUi {
case 'Checkbox': case 'Checkbox':
colProp.dt = 'tinyint'; colProp.dt = 'tinyint';
colProp.dtxp = 1; colProp.dtxp = 1;
colProp.cdf = '0';
break; break;
case 'MultiSelect': case 'MultiSelect':
colProp.dt = 'varchar2'; colProp.dt = 'varchar2';
@ -890,6 +891,7 @@ export class OracleUi {
break; break;
case 'Rating': case 'Rating':
colProp.dt = 'integer'; colProp.dt = 'integer';
colProp.cdf = '0';
break; break;
case 'Formula': case 'Formula':
colProp.dt = 'varchar'; colProp.dt = 'varchar';

2
packages/nocodb-sdk/src/lib/sqlUi/PgUi.ts
Unescape View File

@ -1596,6 +1596,7 @@ export class PgUi {
break; break;
case 'Checkbox': case 'Checkbox':
colProp.dt = 'bool'; colProp.dt = 'bool';
colProp.cdf = 'false';
break; break;
case 'MultiSelect': case 'MultiSelect':
colProp.dt = 'text'; colProp.dt = 'text';
@ -1662,6 +1663,7 @@ export class PgUi {
break; break;
case 'Rating': case 'Rating':
colProp.dt = 'smallint'; colProp.dt = 'smallint';
colProp.cdf = '0';
break; break;
case 'Formula': case 'Formula':
colProp.dt = 'character varying'; colProp.dt = 'character varying';

3
packages/nocodb-sdk/src/lib/sqlUi/SnowflakeUi.ts
Unescape View File

@ -688,6 +688,7 @@ export class SnowflakeUi {
break; break;
case 'Checkbox': case 'Checkbox':
colProp.dt = 'BOOLEAN'; colProp.dt = 'BOOLEAN';
colProp.cdf = '0';
break; break;
case 'MultiSelect': case 'MultiSelect':
colProp.dt = 'TEXT'; colProp.dt = 'TEXT';
@ -700,7 +701,6 @@ export class SnowflakeUi {
break; break;
case 'Date': case 'Date':
colProp.dt = 'DATE'; colProp.dt = 'DATE';
break; break;
case 'Year': case 'Year':
colProp.dt = 'INT'; colProp.dt = 'INT';
@ -754,6 +754,7 @@ export class SnowflakeUi {
break; break;
case 'Rating': case 'Rating':
colProp.dt = 'SMALLINT'; colProp.dt = 'SMALLINT';
colProp.cdf = '0';
break; break;
case 'Formula': case 'Formula':
colProp.dt = 'VARCHAR'; colProp.dt = 'VARCHAR';

4
packages/nocodb-sdk/src/lib/sqlUi/SqliteUi.ts
Unescape View File

@ -788,9 +788,8 @@ export class SqliteUi {
colProp.dt = 'text'; colProp.dt = 'text';
break; break;
case 'Checkbox': case 'Checkbox':
// colProp.dt = 'tinyint';
// colProp.dtxp = 1;
colProp.dt = 'boolean'; colProp.dt = 'boolean';
colProp.cdf = '0';
break; break;
case 'MultiSelect': case 'MultiSelect':
colProp.dt = 'text'; colProp.dt = 'text';
@ -857,6 +856,7 @@ export class SqliteUi {
break; break;
case 'Rating': case 'Rating':
colProp.dt = 'integer'; colProp.dt = 'integer';
colProp.cdf = '0';
break; break;
case 'Formula': case 'Formula':
colProp.dt = 'varchar'; colProp.dt = 'varchar';

10
packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/conditionV2.ts
Unescape View File

@ -303,11 +303,11 @@ const parseConditionV2 = async (
} else { } else {
val = val.startsWith('%') || val.endsWith('%') ? val : `%${val}%`; val = val.startsWith('%') || val.endsWith('%') ? val : `%${val}%`;
} }
qb = qb.whereNot( if (qb?.client?.config?.client === 'pg') {
field, qb = qb.whereRaw('??::text not ilike ?', [field, val]);
qb?.client?.config?.client === 'pg' ? 'ilike' : 'like', } else {
val qb = qb.whereNot(field, 'like', val);
); }
break; break;
case 'allof': case 'allof':
case 'anyof': case 'anyof':

41
packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/sortV2.ts
Unescape View File

@ -29,6 +29,9 @@ export default async function sortV2(
const column = await sort.getColumn(); const column = await sort.getColumn();
if (!column) continue; if (!column) continue;
const model = await column.getModel(); const model = await column.getModel();
const nulls = sort.direction === 'desc' ? 'LAST' : 'FIRST';
switch (column.uidt) { switch (column.uidt) {
case UITypes.Rollup: case UITypes.Rollup:
{ {
@ -39,7 +42,7 @@ export default async function sortV2(
}) })
).builder; ).builder;
qb.orderBy(builder, sort.direction || 'asc'); qb.orderBy(builder, sort.direction || 'asc', nulls);
} }
break; break;
case UITypes.Formula: case UITypes.Formula:
@ -55,7 +58,7 @@ export default async function sortV2(
column column
) )
).builder; ).builder;
qb.orderBy(builder, sort.direction || 'asc'); qb.orderBy(builder, sort.direction || 'asc', nulls);
} }
break; break;
case UITypes.Lookup: case UITypes.Lookup:
@ -178,7 +181,7 @@ export default async function sortV2(
break; break;
} }
qb.orderBy(selectQb, sort.direction || 'asc'); qb.orderBy(selectQb, sort.direction || 'asc', nulls);
} }
} }
break; break;
@ -206,7 +209,7 @@ export default async function sortV2(
]) ])
); );
qb.orderBy(selectQb, sort.direction || 'asc'); qb.orderBy(selectQb, sort.direction || 'asc', nulls);
} }
break; break;
case UITypes.SingleSelect: { case UITypes.SingleSelect: {
@ -214,17 +217,23 @@ export default async function sortV2(
if (clientType === 'mysql' || clientType === 'mysql2') { if (clientType === 'mysql' || clientType === 'mysql2') {
qb.orderBy( qb.orderBy(
sanitize(knex.raw('CONCAT(??)', [column.column_name])), sanitize(knex.raw('CONCAT(??)', [column.column_name])),
sort.direction || 'asc' sort.direction || 'asc',
nulls
); );
} else if (clientType === 'mssql') { } else if (clientType === 'mssql') {
qb.orderBy( qb.orderBy(
sanitize( sanitize(
knex.raw('CAST(?? AS VARCHAR(MAX))', [column.column_name]) knex.raw('CAST(?? AS VARCHAR(MAX))', [column.column_name])
), ),
sort.direction || 'asc' sort.direction || 'asc',
nulls
); );
} else { } else {
qb.orderBy(sanitize(column.column_name), sort.direction || 'asc'); qb.orderBy(
sanitize(column.column_name),
sort.direction || 'asc',
nulls
);
} }
break; break;
} }
@ -233,22 +242,32 @@ export default async function sortV2(
if (clientType === 'mysql' || clientType === 'mysql2') { if (clientType === 'mysql' || clientType === 'mysql2') {
qb.orderBy( qb.orderBy(
sanitize(knex.raw('CONCAT(??)', [column.column_name])), sanitize(knex.raw('CONCAT(??)', [column.column_name])),
sort.direction || 'asc' sort.direction || 'asc',
nulls
); );
} else if (clientType === 'mssql') { } else if (clientType === 'mssql') {
qb.orderBy( qb.orderBy(
sanitize( sanitize(
knex.raw('CAST(?? AS VARCHAR(MAX))', [column.column_name]) knex.raw('CAST(?? AS VARCHAR(MAX))', [column.column_name])
), ),
sort.direction || 'asc' sort.direction || 'asc',
nulls
); );
} else { } else {
qb.orderBy(sanitize(column.column_name), sort.direction || 'asc'); qb.orderBy(
sanitize(column.column_name),
sort.direction || 'asc',
nulls
);
} }
break; break;
} }
default: default:
qb.orderBy(sanitize(column.column_name), sort.direction || 'asc'); qb.orderBy(
sanitize(column.column_name),
sort.direction || 'asc',
nulls
);
break; break;
} }
} }

19
tests/playwright/tests/columnCheckbox.spec.ts
Unescape View File

@ -2,7 +2,6 @@ import { test } from '@playwright/test';
import { DashboardPage } from '../pages/Dashboard'; import { DashboardPage } from '../pages/Dashboard';
import setup from '../setup'; import setup from '../setup';
import { ToolbarPage } from '../pages/Dashboard/common/Toolbar'; import { ToolbarPage } from '../pages/Dashboard/common/Toolbar';
import { isPg } from '../setup/db';
test.describe('Checkbox - cell, filter, sort', () => { test.describe('Checkbox - cell, filter, sort', () => {
let dashboard: DashboardPage, toolbar: ToolbarPage; let dashboard: DashboardPage, toolbar: ToolbarPage;
@ -87,10 +86,10 @@ test.describe('Checkbox - cell, filter, sort', () => {
// Filter column // Filter column
await verifyFilter({ opType: 'is checked', result: ['1a', '1c', '1f'] }); await verifyFilter({ opType: 'is checked', result: ['1a', '1c', '1f'] });
await verifyFilter({ opType: 'is not checked', result: ['1b', '1d', '1e'] }); await verifyFilter({ opType: 'is not checked', result: ['1b', '1d', '1e'] });
await verifyFilter({ opType: 'is equal', value: '0', result: ['1b'] }); await verifyFilter({ opType: 'is equal', value: '0', result: ['1b', '1d', '1e'] });
await verifyFilter({ opType: 'is not equal', value: '1', result: ['1b', '1d', '1e'] }); await verifyFilter({ opType: 'is not equal', value: '1', result: ['1b', '1d', '1e'] });
await verifyFilter({ opType: 'is null', result: ['1d', '1e'] }); await verifyFilter({ opType: 'is null', result: [] });
await verifyFilter({ opType: 'is not null', result: ['1a', '1b', '1c', '1f'] }); await verifyFilter({ opType: 'is not null', result: ['1a', '1b', '1c', '1d', '1e', '1f'] });
// Sort column // Sort column
await toolbar.sort.add({ await toolbar.sort.add({
@ -98,11 +97,7 @@ test.describe('Checkbox - cell, filter, sort', () => {
isAscending: true, isAscending: true,
isLocallySaved: false, isLocallySaved: false,
}); });
if (isPg(context)) { await validateRowArray(['1b', '1d', '1e', '1a', '1c', '1f']);
await validateRowArray(['1b', '1a', '1c', '1f', '1d', '1e']);
} else {
await validateRowArray(['1d', '1e', '1b', '1a', '1c', '1f']);
}
await toolbar.sort.reset(); await toolbar.sort.reset();
// sort descending & validate // sort descending & validate
@ -111,11 +106,7 @@ test.describe('Checkbox - cell, filter, sort', () => {
isAscending: false, isAscending: false,
isLocallySaved: false, isLocallySaved: false,
}); });
if (isPg(context)) { await validateRowArray(['1a', '1c', '1f', '1b', '1d', '1e']);
await validateRowArray(['1d', '1e', '1a', '1c', '1f', '1b']);
} else {
await validateRowArray(['1a', '1c', '1f', '1b', '1d', '1e']);
}
await toolbar.sort.reset(); await toolbar.sort.reset();
// wait for 10 seconds // wait for 10 seconds

106
tests/playwright/tests/columnRating.spec.ts
Unescape View File

@ -0,0 +1,106 @@
import { test } from '@playwright/test';
import { DashboardPage } from '../pages/Dashboard';
import setup from '../setup';
import { ToolbarPage } from '../pages/Dashboard/common/Toolbar';
test.describe('Rating - cell, filter, sort', () => {
let dashboard: DashboardPage, toolbar: ToolbarPage;
let context: any;
// define validateRowArray function
async function validateRowArray(value: string[]) {
const length = value.length;
for (let i = 0; i < length; i++) {
await dashboard.grid.cell.verify({
index: i,
columnHeader: 'Title',
value: value[i],
});
}
}
async function verifyFilter(param: { opType: string; value?: string; result: string[] }) {
await toolbar.clickFilter();
await toolbar.filter.add({
columnTitle: 'rating',
opType: param.opType,
value: param.value,
isLocallySaved: false,
});
await toolbar.clickFilter();
// verify filtered rows
await validateRowArray(param.result);
// Reset filter
await toolbar.filter.reset();
}
test.beforeEach(async ({ page }) => {
context = await setup({ page });
dashboard = new DashboardPage(page, context.project);
toolbar = dashboard.grid.toolbar;
});
test('Rating', async () => {
// close 'Team & Auth' tab
await dashboard.closeTab({ title: 'Team & Auth' });
await dashboard.treeView.createTable({ title: 'Sheet1' });
await dashboard.grid.addNewRow({ index: 0, value: '1a' });
await dashboard.grid.addNewRow({ index: 1, value: '1b' });
await dashboard.grid.addNewRow({ index: 2, value: '1c' });
await dashboard.grid.addNewRow({ index: 3, value: '1d' });
await dashboard.grid.addNewRow({ index: 4, value: '1e' });
await dashboard.grid.addNewRow({ index: 5, value: '1f' });
// Create Rating column
await dashboard.grid.column.create({
title: 'rating',
type: 'Rating',
});
// In cell insert
await dashboard.grid.cell.rating.select({ index: 0, columnHeader: 'rating', rating: 2 });
await dashboard.grid.cell.rating.select({ index: 2, columnHeader: 'rating', rating: 1 });
await dashboard.grid.cell.rating.select({ index: 5, columnHeader: 'rating', rating: 0 });
// column values
// 1a : 3
// 1b : 0
// 1c : 2
// 1d : 0
// 1e : 0
// 1f : 1
// Filter column
await verifyFilter({ opType: 'is equal', value: '3', result: ['1a'] });
await verifyFilter({ opType: 'is not equal', value: '3', result: ['1b', '1c', '1d', '1e', '1f'] });
await verifyFilter({ opType: 'is like', value: '2', result: ['1c'] });
await verifyFilter({ opType: 'is not like', value: '2', result: ['1a', '1b', '1d', '1e', '1f'] });
await verifyFilter({ opType: 'is null', result: [] });
await verifyFilter({ opType: 'is not null', result: ['1a', '1b', '1c', '1d', '1e', '1f'] });
// await verifyFilter({ opType: '>', value: '1', result: ['1a', '1c'] });
await verifyFilter({ opType: '>=', value: '1', result: ['1a', '1c', '1f'] });
// await verifyFilter({ opType: '<', value: '1', result: [] });
await verifyFilter({ opType: '<=', value: '1', result: ['1b', '1d', '1e', '1f'] });
// Sort column
await toolbar.sort.add({
columnTitle: 'rating',
isAscending: true,
isLocallySaved: false,
});
await validateRowArray(['1b', '1d', '1e', '1f', '1c', '1a']);
await toolbar.sort.reset();
// sort descending & validate
await toolbar.sort.add({
columnTitle: 'rating',
isAscending: false,
isLocallySaved: false,
});
await validateRowArray(['1a', '1c', '1f', '1b', '1d', '1e']);
await toolbar.sort.reset();
});
});
Write Preview
Loading…
Cancel
Save