diff --git a/.github/workflows/publish-api-docs.yml b/.github/workflows/publish-api-docs.yml index e54cd12976..47860cdd7f 100644 --- a/.github/workflows/publish-api-docs.yml +++ b/.github/workflows/publish-api-docs.yml @@ -4,7 +4,7 @@ on: push: branches: [ master ] paths: - - "scripts/sdk/swagger.json" + - "packages/nocodb/src/schema/swagger.json" release: types: [ published ] @@ -22,7 +22,7 @@ jobs: env: API_TOKEN_GITHUB: ${{ secrets.GH_TOKEN }} with: - source_file: 'scripts/sdk/swagger.json' + source_file: 'packages/nocodb/src/schema/swagger.json' destination_repo: 'nocodb/noco-apis-doc' destination_folder: 'src' user_email: 'oof1lab@gmail.com' @@ -34,7 +34,7 @@ jobs: env: API_TOKEN_GITHUB: ${{ secrets.GH_TOKEN }} with: - source_file: 'scripts/sdk/swagger.json' + source_file: 'packages/nocodb/src/schema/swagger.json' destination_repo: 'nocodb/noco-apis-doc' destination_folder: 'meta-src' user_email: 'oof1lab@gmail.com' diff --git a/packages/nc-gui/components.d.ts b/packages/nc-gui/components.d.ts index afd6d25ed1..e3914200e0 100644 --- a/packages/nc-gui/components.d.ts +++ b/packages/nc-gui/components.d.ts @@ -252,8 +252,12 @@ declare module '@vue/runtime-core' { NcIconsRowHeightMedium: typeof import('~icons/nc-icons/row-height-medium')['default'] NcIconsRowHeightShort: typeof import('~icons/nc-icons/row-height-short')['default'] NcIconsRowHeightTall: typeof import('~icons/nc-icons/row-height-tall')['default'] + PhChatTextThin: typeof import('~icons/ph/chat-text-thin')['default'] PhCloudLightningDuotone: typeof import('~icons/ph/cloud-lightning-duotone')['default'] + PhCloudLightningThin: typeof import('~icons/ph/cloud-lightning-thin')['default'] PhFileCsv: typeof import('~icons/ph/file-csv')['default'] + PhUserPlusThin: typeof import('~icons/ph/user-plus-thin')['default'] + PhUsersThreeThin: typeof import('~icons/ph/users-three-thin')['default'] RiLineHeight: typeof import('~icons/ri/line-height')['default'] RiTeamFill: typeof import('~icons/ri/team-fill')['default'] RouterLink: typeof import('vue-router')['RouterLink'] diff --git a/packages/nc-gui/components/account/ResetPassword.vue b/packages/nc-gui/components/account/ResetPassword.vue index 804196f102..dc3d17fb55 100644 --- a/packages/nc-gui/components/account/ResetPassword.vue +++ b/packages/nc-gui/components/account/ResetPassword.vue @@ -54,7 +54,7 @@ const passwordChange = async () => { message.success(t('msg.success.passwordChanged')) - signOut() + await signOut() navigateTo('/signin') } diff --git a/packages/nc-gui/components/general/MiniSidebar.vue b/packages/nc-gui/components/general/MiniSidebar.vue index d023994430..50c73fefd0 100644 --- a/packages/nc-gui/components/general/MiniSidebar.vue +++ b/packages/nc-gui/components/general/MiniSidebar.vue @@ -11,8 +11,8 @@ const route = useRoute() const email = computed(() => user.value?.email ?? '---') -const logout = () => { - signOut() +const logout = async () => { + await signOut() navigateTo('/signin') } diff --git a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue index ee08312749..cf7404f03e 100644 --- a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue +++ b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue @@ -232,7 +232,10 @@ useEventListener('keydown', (e: KeyboardEvent) => { v-model:value="formState" /> - + diff --git a/packages/nc-gui/components/smartsheet/column/SpecificDBTypeOptions.vue b/packages/nc-gui/components/smartsheet/column/SpecificDBTypeOptions.vue index cbfa30088c..04d85e1bdb 100644 --- a/packages/nc-gui/components/smartsheet/column/SpecificDBTypeOptions.vue +++ b/packages/nc-gui/components/smartsheet/column/SpecificDBTypeOptions.vue @@ -1,3 +1,3 @@ diff --git a/packages/nc-gui/components/smartsheet/header/Cell.vue b/packages/nc-gui/components/smartsheet/header/Cell.vue index 6cb89e6438..f07c76fd18 100644 --- a/packages/nc-gui/components/smartsheet/header/Cell.vue +++ b/packages/nc-gui/components/smartsheet/header/Cell.vue @@ -7,6 +7,7 @@ interface Props { required?: boolean | number hideMenu?: boolean } + const props = defineProps() const hideMenu = toRef(props, 'hideMenu') @@ -34,6 +35,12 @@ const closeAddColumnDropdown = () => { columnOrder.value = null editColumnDropdown.value = false } + +const openHeaderMenu = () => { + if (!isForm.value && isUIAllowed('edit-column')) { + editColumnDropdown.value = true + } +}