From 0d8655486aa678da6c5d12d55e3935ae2cad10d3 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Wed, 29 Mar 2023 10:15:51 +0530 Subject: [PATCH 1/3] fix(gui): map correct rollup icon Signed-off-by: Pranav C --- .../components/smartsheet/header/VirtualCellIcon.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts b/packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts index 6d75d2d022..0e596d8621 100644 --- a/packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts +++ b/packages/nc-gui/components/smartsheet/header/VirtualCellIcon.ts @@ -52,13 +52,13 @@ const renderIcon = (column: ColumnType, relationColumn?: ColumnType) => { case UITypes.Rollup: switch ((relationColumn?.colOptions as LinkToAnotherRecordType)?.type) { case RelationTypes.MANY_TO_MANY: - return { icon: iconMap, color: 'text-accent' } + return { icon: iconMap.rollup, color: 'text-accent' } case RelationTypes.HAS_MANY: - return { icon: iconMap, color: 'text-yellow-500' } + return { icon: iconMap.rollup, color: 'text-yellow-500' } case RelationTypes.BELONGS_TO: - return { icon: iconMap, color: 'text-sky-500' } + return { icon: iconMap.rollup, color: 'text-sky-500' } } - return { icon: iconMap, color: 'text-grey' } + return { icon: iconMap.rollup, color: 'text-grey' } case UITypes.Count: return { icon: CountIcon, color: 'text-grey' } } From f232c264f1486632b736a4772a089699723f64e5 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Wed, 29 Mar 2023 10:17:27 +0530 Subject: [PATCH 2/3] fix(gui): number column width correction Signed-off-by: Pranav C --- packages/nc-gui/components/smartsheet/Grid.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nc-gui/components/smartsheet/Grid.vue b/packages/nc-gui/components/smartsheet/Grid.vue index 792fd17e9a..922b792fe1 100644 --- a/packages/nc-gui/components/smartsheet/Grid.vue +++ b/packages/nc-gui/components/smartsheet/Grid.vue @@ -789,7 +789,7 @@ const closeAddColumnDropdown = () => { :data-testid="`grid-row-${rowIndex}`" > -
+
Date: Wed, 29 Mar 2023 13:03:47 +0530 Subject: [PATCH 3/3] fix: icon correction and language menu shadow Signed-off-by: Pranav C --- .../smartsheet/toolbar/ShareView.vue | 2 +- packages/nc-gui/components/webhook/Editor.vue | 19 ++++++++++--------- .../pages/[projectType]/[projectId]/index.vue | 10 ++++------ packages/nc-gui/utils/iconUtils.ts | 2 +- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/packages/nc-gui/components/smartsheet/toolbar/ShareView.vue b/packages/nc-gui/components/smartsheet/toolbar/ShareView.vue index 534dc1daa9..e7b91c5cc2 100644 --- a/packages/nc-gui/components/smartsheet/toolbar/ShareView.vue +++ b/packages/nc-gui/components/smartsheet/toolbar/ShareView.vue @@ -272,7 +272,7 @@ const copyIframeCode = async () => { >
{{ sharedViewUrl }}
- + diff --git a/packages/nc-gui/components/webhook/Editor.vue b/packages/nc-gui/components/webhook/Editor.vue index 03c41fcbb5..cfe5f0df88 100644 --- a/packages/nc-gui/components/webhook/Editor.vue +++ b/packages/nc-gui/components/webhook/Editor.vue @@ -697,15 +697,16 @@ onMounted(async () => {
- Use context variable data to refer the record under consideration - - - - - - +
+ Use context variable data to refer the record under consideration + + + + + +
diff --git a/packages/nc-gui/pages/[projectType]/[projectId]/index.vue b/packages/nc-gui/pages/[projectType]/[projectId]/index.vue index 8907f3cfad..64729b1ef9 100644 --- a/packages/nc-gui/pages/[projectType]/[projectId]/index.vue +++ b/packages/nc-gui/pages/[projectType]/[projectId]/index.vue @@ -509,11 +509,7 @@ useEventListener(document, 'keydown', async (e: KeyboardEvent) => { - +