Merge branch 'develop' into mvp-mobile-layout-and-code-scanner

This commit is contained in:
Daniel Spaude
2023-03-17 12:05:37 +01:00
74 changed files with 579 additions and 211 deletions

View File

@@ -1,5 +1,6 @@
<script setup lang="ts">
import type { Input } from 'ant-design-vue'
import type { ProjectUserReqType } from 'nocodb-sdk'
import {
Form,
computed,
@@ -109,10 +110,11 @@ const saveUser = async () => {
const res = await $api.auth.projectUserAdd(project.value.id, {
roles: usersData.role,
email: usersData.emails,
project_id: project.value.id,
projectName: project.value.title,
})
usersData.invitationToken = res.invite_token
} as ProjectUserReqType)
// for inviting one user, invite_token will only be returned when invitation email fails to send
// for inviting multiple users, invite_token will be returned anyway
usersData.invitationToken = res?.invite_token
}
emit('reload')
@@ -133,7 +135,7 @@ const copyUrl = async () => {
// Copied shareable base url to clipboard!
message.success(t('msg.success.shareableURLCopied'))
} catch (e) {
} catch (e: any) {
message.error(e.message)
}
$e('c:shared-base:copy-url')