From 67801754c0ac6d1a265bd95308666ec0b04f4999 Mon Sep 17 00:00:00 2001
From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com>
Date: Wed, 13 Mar 2024 21:16:13 +0000
Subject: [PATCH] fix(nc-gui): some browser console warnings
---
packages/nc-gui/components/account/Profile.vue | 2 +-
packages/nc-gui/components/account/Token.vue | 6 +++---
packages/nc-gui/components/account/UserList.vue | 4 ++--
packages/nc-gui/components/nc/Switch.vue | 3 ++-
.../nc-gui/components/project/AccessSettings.vue | 2 +-
packages/nc-gui/components/roles/Selector.vue | 4 ++--
packages/nc-gui/components/smartsheet/Form.vue | 2 +-
.../smartsheet/toolbar/ViewActionMenu.vue | 15 ++++++++++-----
.../components/workspace/CollaboratorsList.vue | 2 +-
.../nc-gui/components/workspace/InviteSection.vue | 2 +-
10 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/packages/nc-gui/components/account/Profile.vue b/packages/nc-gui/components/account/Profile.vue
index 30fbc61c7d..8aeaed23a5 100644
--- a/packages/nc-gui/components/account/Profile.vue
+++ b/packages/nc-gui/components/account/Profile.vue
@@ -94,7 +94,7 @@ const onValidate = async (_: any, valid: boolean) => {
diff --git a/packages/nc-gui/components/account/Token.vue b/packages/nc-gui/components/account/Token.vue
index 9c3d612fb0..70ede150e8 100644
--- a/packages/nc-gui/components/account/Token.vue
+++ b/packages/nc-gui/components/account/Token.vue
@@ -312,17 +312,17 @@ const handleCancel = () => {
class="flex pl-5 py-3 justify-between token items-center border-l-1 border-r-1 border-b-1"
>
-
+
{{ el.description }}
-
+
{{ el.created_by }}
-
+
{{ el.token }}
************************************
diff --git a/packages/nc-gui/components/account/UserList.vue b/packages/nc-gui/components/account/UserList.vue
index 410e23e820..87458a8467 100644
--- a/packages/nc-gui/components/account/UserList.vue
+++ b/packages/nc-gui/components/account/UserList.vue
@@ -239,11 +239,11 @@ const openDeleteModal = (user: UserType) => {
{{ el.email }}
-
+
{{ el.display_name }}
-
+
{{ el.email }}
diff --git a/packages/nc-gui/components/nc/Switch.vue b/packages/nc-gui/components/nc/Switch.vue
index 9f50ce0d38..f5d9af077e 100644
--- a/packages/nc-gui/components/nc/Switch.vue
+++ b/packages/nc-gui/components/nc/Switch.vue
@@ -13,7 +13,8 @@ const onChange = (e: boolean) => {
-
+
+
diff --git a/packages/nc-gui/components/project/AccessSettings.vue b/packages/nc-gui/components/project/AccessSettings.vue
index 9b004a550c..6c5b16f420 100644
--- a/packages/nc-gui/components/project/AccessSettings.vue
+++ b/packages/nc-gui/components/project/AccessSettings.vue
@@ -224,7 +224,7 @@ watch(isInviteModalVisible, () => {
: null
"
:description="false"
- :on-role-change="(role: ProjectRoles) => updateCollaborator(collab, role)"
+ :on-role-change="(role) => updateCollaborator(collab, role as ProjectRoles)"
/>
diff --git a/packages/nc-gui/components/roles/Selector.vue b/packages/nc-gui/components/roles/Selector.vue
index 79308fb1ef..f3ba95290e 100644
--- a/packages/nc-gui/components/roles/Selector.vue
+++ b/packages/nc-gui/components/roles/Selector.vue
@@ -11,7 +11,7 @@ const props = withDefaults(
description?: boolean
inherit?: string
onRoleChange: (role: keyof typeof RoleLabels) => void
- size: 'sm' | 'md' | 'lg'
+ size?: 'sm' | 'md' | 'lg'
}>(),
{
description: true,
@@ -38,7 +38,7 @@ function onChangeRole(val: SelectValue) {
) => {
- if (col.id) {
+ if (col.id && isEditable) {
try {
await $api.dbView.formColumnUpdate(col.id, col)
} catch (e: any) {
diff --git a/packages/nc-gui/components/smartsheet/toolbar/ViewActionMenu.vue b/packages/nc-gui/components/smartsheet/toolbar/ViewActionMenu.vue
index b171b0c9c1..65a0efd5bc 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/ViewActionMenu.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/ViewActionMenu.vue
@@ -3,11 +3,16 @@ import type { TableType, ViewType } from 'nocodb-sdk'
import { ViewTypes } from 'nocodb-sdk'
import { LockType } from '~/lib'
-const props = defineProps<{
- view: ViewType
- table: TableType
- inSidebar: boolean
-}>()
+const props = withDefaults(
+ defineProps<{
+ view: ViewType
+ table: TableType
+ inSidebar?: boolean
+ }>(),
+ {
+ inSidebar: false,
+ },
+)
const emits = defineEmits(['rename', 'closeModal', 'delete'])
diff --git a/packages/nc-gui/components/workspace/CollaboratorsList.vue b/packages/nc-gui/components/workspace/CollaboratorsList.vue
index 4815dcb5df..32292bdd62 100644
--- a/packages/nc-gui/components/workspace/CollaboratorsList.vue
+++ b/packages/nc-gui/components/workspace/CollaboratorsList.vue
@@ -118,7 +118,7 @@ onMounted(async () => {
:roles="accessibleRoles"
:description="false"
class="cursor-pointer"
- :on-role-change="(role: WorkspaceUserRoles) => updateCollaborator(collab, role)"
+ :on-role-change="(role) => updateCollaborator(collab, role as WorkspaceUserRoles)"
/>
diff --git a/packages/nc-gui/components/workspace/InviteSection.vue b/packages/nc-gui/components/workspace/InviteSection.vue
index 0f88e387ed..6b8ab2710d 100644
--- a/packages/nc-gui/components/workspace/InviteSection.vue
+++ b/packages/nc-gui/components/workspace/InviteSection.vue
@@ -242,7 +242,7 @@ const onPaste = (e: ClipboardEvent) => {
class="px-1 min-w-[152px] nc-invite-role-selector"
:role="inviteData.roles"
:roles="allowedRoles"
- :on-role-change="(role: WorkspaceUserRoles) => (inviteData.roles = role)"
+ :on-role-change="(role) => (inviteData.roles = role as WorkspaceUserRoles)"
:description="true"
/>