From b7acf202e89f0e6ddfb2b74c1c62256b24b8d852 Mon Sep 17 00:00:00 2001 From: Anbarasu Date: Mon, 24 Jun 2024 11:55:54 +0530 Subject: [PATCH] feat: Field aggregation (#8786) * feat: basic ui for aggregation * feat: update aggregation in ui * feat: aggregation api implementation * feat: attachment aggregation.ts * fix: some changes * fix: rebase * feat: aggregation for links, rollup, ltar, formula, lookup * fix: type errors * fix: move from data-alias controller, service to data-table service, controller * chore: inline docs for aggregations * fix: handle edge cases * fix: ui bugs * feat: working ui aggregation * fix: minor issue * fix: rollup and links fix count * fix: handle ID Column * fix: minor fixes * fix: update aggregation on data change * fix: round to 2 decimal places * fix: stddev computation error replace with stddev_pop * fix: use pg age function * feat: new record layout * fix: shared view aggregations * feat: aggregations based on formula result * fix: temp pagination * feat: ncpagination v2 * feat: ncpagination v2 * fix: playwright tests * fix: pending changes * fix: failing tests * feat: mysql2 aggregations * fix: build * fix: record count * fix: cleanup * fix: disable count aggregation * feat: expiremental sqlite3 aggregation * fix: mysql2 median * fix:minor issues * refactor: rename column to column_query fix: remove default aggregations fix: disable aggregation for specific dbtype and Foreign Key * fix: remove unwanted else case * fix: aggregation not loading * fix: rebase * fix: rebase * fix: pagination fixed height * fix: respect locked mode for aggregations * fix: pagination component * fix: pagination component * fix: replace Math.random --- packages/nc-gui/assets/style.scss | 14 + packages/nc-gui/components/nc/Dropdown.vue | 3 + .../nc-gui/components/nc/PaginationV2.vue | 241 ++++++++++ packages/nc-gui/components/nc/SubMenu.vue | 8 +- .../smartsheet/grid/PaginationV2.vue | 295 ++++++++++++ .../components/smartsheet/grid/Table.vue | 74 ++- .../components/smartsheet/grid/index.vue | 2 + .../nc-gui/components/tabs/Smartsheet.vue | 2 + packages/nc-gui/composables/useData.ts | 11 + packages/nc-gui/composables/useSharedView.ts | 25 ++ .../nc-gui/composables/useViewAggregate.ts | 145 ++++++ packages/nc-gui/composables/useViewColumns.ts | 11 +- packages/nc-gui/context/index.ts | 3 + packages/nc-gui/lang/en.json | 54 +++ packages/nc-gui/utils/aggregationUtils.ts | 133 ++++++ .../nocodb-sdk/src/lib/aggregationHelper.ts | 136 ++++++ packages/nocodb-sdk/src/lib/index.ts | 1 + .../src/controllers/data-table.controller.ts | 15 + .../controllers/public-datas.controller.ts | 18 + packages/nocodb/src/db/BaseModelSqlv2.ts | 112 ++++- packages/nocodb/src/db/aggregation.ts | 202 +++++++++ packages/nocodb/src/db/aggregations/mysql2.ts | 405 +++++++++++++++++ packages/nocodb/src/db/aggregations/pg.ts | 398 ++++++++++++++++ .../nocodb/src/db/aggregations/sqlite3.ts | 423 ++++++++++++++++++ .../src/db/sql-data-mapper/lib/BaseModel.ts | 6 + .../meta/migrations/XcMigrationSourcev2.ts | 4 + .../migrations/v2/nc_052_field_aggregation.ts | 16 + packages/nocodb/src/models/GridViewColumn.ts | 3 + packages/nocodb/src/models/View.ts | 22 +- packages/nocodb/src/schema/swagger-v2.json | 97 +++- packages/nocodb/src/schema/swagger.json | 184 +++++++- .../nocodb/src/services/data-table.service.ts | 40 +- .../src/services/public-datas.service.ts | 45 ++ packages/nocodb/src/utils/acl.ts | 2 + .../pages/Dashboard/Grid/AggregationBar.ts | 11 + .../playwright/pages/Dashboard/Grid/index.ts | 7 +- .../pages/Dashboard/common/Footbar/index.ts | 5 +- 37 files changed, 3157 insertions(+), 16 deletions(-) create mode 100644 packages/nc-gui/components/nc/PaginationV2.vue create mode 100644 packages/nc-gui/components/smartsheet/grid/PaginationV2.vue create mode 100644 packages/nc-gui/composables/useViewAggregate.ts create mode 100644 packages/nc-gui/utils/aggregationUtils.ts create mode 100644 packages/nocodb-sdk/src/lib/aggregationHelper.ts create mode 100644 packages/nocodb/src/db/aggregation.ts create mode 100644 packages/nocodb/src/db/aggregations/mysql2.ts create mode 100644 packages/nocodb/src/db/aggregations/pg.ts create mode 100644 packages/nocodb/src/db/aggregations/sqlite3.ts create mode 100644 packages/nocodb/src/meta/migrations/v2/nc_052_field_aggregation.ts create mode 100644 tests/playwright/pages/Dashboard/Grid/AggregationBar.ts diff --git a/packages/nc-gui/assets/style.scss b/packages/nc-gui/assets/style.scss index 37053961ad..204066dbf9 100644 --- a/packages/nc-gui/assets/style.scss +++ b/packages/nc-gui/assets/style.scss @@ -2,6 +2,20 @@ @import '@vue-flow/core/dist/style.css'; @import '@vue-flow/core/dist/theme-default.css'; +@layer utilities { + @variants responsive { + /* Chrome, Safari and Opera */ + .no-scrollbar::-webkit-scrollbar { + display: none; + } + + .no-scrollbar { + -ms-overflow-style: none; /* IE and Edge */ + scrollbar-width: none; /* Firefox */ + } + } +} + html { overflow: hidden; } diff --git a/packages/nc-gui/components/nc/Dropdown.vue b/packages/nc-gui/components/nc/Dropdown.vue index 956670e756..b4d6718387 100644 --- a/packages/nc-gui/components/nc/Dropdown.vue +++ b/packages/nc-gui/components/nc/Dropdown.vue @@ -4,6 +4,7 @@ const props = withDefaults( trigger?: Array<'click' | 'hover' | 'contextmenu'> visible?: boolean | undefined overlayClassName?: string | undefined + disabled?: boolean placement?: 'bottom' | 'top' | 'bottomLeft' | 'bottomRight' | 'topLeft' | 'topRight' | 'topCenter' | 'bottomCenter' autoClose?: boolean }>(), @@ -11,6 +12,7 @@ const props = withDefaults( trigger: () => ['click'], visible: undefined, placement: 'bottomLeft', + disabled: false, overlayClassName: undefined, autoClose: true, }, @@ -61,6 +63,7 @@ const onVisibleUpdate = (event: any) => {