mirror of
https://github.com/nocodb/nocodb.git
synced 2026-04-30 12:16:41 +00:00
feat: Improved UI (#6222)
* feat: Improved ui (#6156) * refactor: revert Signed-off-by: Pranav C <pranavxc@gmail.com> feat: shared base Signed-off-by: Pranav C <pranavxc@gmail.com> fix: remove duplicate import statement Signed-off-by: Pranav C <pranavxc@gmail.com> fix: disable starred & license menu Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: fix airtable wait issue Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: enable mysql in ci Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: fix checkbox order for sqlite Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: disable quick tests Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: fix dbType env variable for CI Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: workspace API access error fix Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: enable SQLite CI CD Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: use DB_TYPE env variable Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: enable SQLite UT Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: isHub cleanup Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: add check for EE Timezone spec Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> chore: cleanup Signed-off-by: Pranav C <pranavxc@gmail.com> chore: cleanup Signed-off-by: Pranav C <pranavxc@gmail.com> test: EE check fix Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> chore: test correction Signed-off-by: Pranav C <pranavxc@gmail.com> chore: sync latest changes Signed-off-by: Pranav C <pranavxc@gmail.com> test: set EE=false Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> test: set NC Edition to community in workflow file Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> chore: update sdk build command Signed-off-by: Pranav C <pranavxc@gmail.com> refactor: i18n and other changes Signed-off-by: Pranav C <pranavxc@gmail.com> feat: new ui Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: sync tests Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: lint Signed-off-by: Pranav C <pranavxc@gmail.com> * fix: shared view/base related bugs Signed-off-by: Pranav C <pranavxc@gmail.com> * test: checkbox verification sort order fix Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: fix sqlite reset Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: enable selfhosted runners Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * docs: table ops (draft) Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * Docs: screenshots for table-operations.md * refactor: introduce missing buttons Signed-off-by: Pranav C <pranavxc@gmail.com> * fix: get all fields Signed-off-by: Pranav C <pranavxc@gmail.com> * test: UT fix- new data API response Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: EE is false Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: webhook lookup as string in CE Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * fix: include created_at and updated_at Signed-off-by: Pranav C <pranavxc@gmail.com> * test: fix UT newDataAPI response for PG Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * fix: separate api for webhook related plugins Signed-off-by: Pranav C <pranavxc@gmail.com> * test: msyql filter corrections Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: mysql group by test corrections Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: fix datatype for rating field in groupby spec for pg Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: kanban datatype correction Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: column edit for mysql- rating field Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: misc fixes Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: enable 4 workers Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: enable 2 workers per shard only Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * docs: table CRUD * Rename table-operations.md to table-crud.md * Create column-crud.md * docs: row CRUD * Rename row.md to row-crud.md * docs: project crud * docs: toolbar (skeleton) * refactor: single page UI and bug fixes Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: sync tests playwright Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: add missing dependency Signed-off-by: Pranav C <pranavxc@gmail.com> * feat: single page ui, test corrections Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: tests Signed-off-by: Pranav C <pranavxc@gmail.com> * test: project rename test correction Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: remove only Signed-off-by: Pranav C <pranavxc@gmail.com> * test: remove wrong import statement Signed-off-by: Pranav C <pranavxc@gmail.com> * fix: delete option not visible in project context menu Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: move ws access within isEE() Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: fix groupby * test: groupby fix Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * docs: signup & landing page * docs: project crud * docs: project-crud misc * docs: toolbar fields * docs: toolbar / filters * docs: toolbar / group by * docs: toolbar / sort * docs: toolbar / row height * docs: filters additional options * docs: file re-order Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * docs: add links to column types * docs: code snippets * docs: links * docs: lookup * docs: rollup * docs: formula * docs: primary key * docs: display value * docs: development setup * docs: swagger * fix(nc-gui): encodeURIComponent for row id - closes: #6202 * docs: language * docs: expanded record * docs: import airtable * docs: airtable * docs: webhook * docs: revert file rename Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * docs: account settings * docs: audit * docs: meta management * docs: project settings * docs: shared base * docs: shared view * docs: meta sync * docs: team-auth * docs: views * docs: fix URL * docs: URL corrections * fix: shared base, view related bugs Signed-off-by: Pranav C <pranavxc@gmail.com> * test: EE check for WSaccess Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * test: exclude EE tests Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> * fix: missing project delete closes #6215 Signed-off-by: Pranav C <pranavxc@gmail.com> * fix: merge existing project meta if found closes #6216 Signed-off-by: Pranav C <pranavxc@gmail.com> * fix: merge existing project meta if found closes #6216 Signed-off-by: Pranav C <pranavxc@gmail.com> --------- Signed-off-by: Pranav C <pranavxc@gmail.com> Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> Co-authored-by: Raju Udava <86527202+dstala@users.noreply.github.com> Co-authored-by: DarkPhoenix2704 <anbarasun123@gmail.com> Co-authored-by: Wing-Kam Wong <wingkwong.code@gmail.com> * refactor: docs and other bug fixes Signed-off-by: Pranav C <pranavxc@gmail.com> * feat: populate default project on super admin signup Signed-off-by: Pranav C <pranavxc@gmail.com> * fix: include created project details in signup response if avail, missing Dockerfile Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: use custom function for resolving ts path aliases Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: add missing generate script Signed-off-by: Pranav C <pranavxc@gmail.com> * chore: webpack build correction - ts path resolve Signed-off-by: Pranav C <pranavxc@gmail.com> --------- Signed-off-by: Pranav C <pranavxc@gmail.com> Signed-off-by: Raju Udava <86527202+dstala@users.noreply.github.com> Co-authored-by: mertmit <mertmit99@gmail.com> Co-authored-by: Raju Udava <86527202+dstala@users.noreply.github.com> Co-authored-by: DarkPhoenix2704 <anbarasun123@gmail.com> Co-authored-by: Wing-Kam Wong <wingkwong.code@gmail.com>
This commit is contained in:
Pranav C
@@ -3,6 +3,7 @@ import type { Input } from 'ant-design-vue'
|
||||
import type { ProjectUserReqType } from 'nocodb-sdk'
|
||||
import {
|
||||
Form,
|
||||
ProjectRole,
|
||||
computed,
|
||||
emailValidator,
|
||||
extractSdkResponseErrorMsg,
|
||||
@@ -20,20 +21,13 @@ import {
|
||||
useNuxtApp,
|
||||
useProject,
|
||||
} from '#imports'
|
||||
import type { User } from '~/lib'
|
||||
import { ProjectRole } from '~/lib'
|
||||
import type { User, Users } from '#imports'
|
||||
|
||||
interface Props {
|
||||
show: boolean
|
||||
selectedUser?: User | null
|
||||
}
|
||||
|
||||
interface Users {
|
||||
emails?: string
|
||||
role: ProjectRole
|
||||
invitationToken?: string
|
||||
}
|
||||
|
||||
const { show, selectedUser } = defineProps<Props>()
|
||||
|
||||
const emit = defineEmits(['closed', 'reload'])
|
||||
@@ -48,9 +42,9 @@ const { $api, $e } = useNuxtApp()
|
||||
|
||||
const { copy } = useCopy()
|
||||
|
||||
const { dashboardUrl } = $(useDashboard())
|
||||
const { dashboardUrl } = useDashboard()
|
||||
|
||||
let usersData = $ref<Users>({ emails: undefined, role: ProjectRole.Viewer, invitationToken: undefined })
|
||||
const usersData = ref<Users>({ emails: undefined, role: ProjectRole.Viewer, invitationToken: undefined })
|
||||
|
||||
const formRef = ref()
|
||||
|
||||
@@ -62,23 +56,23 @@ const validators = computed(() => {
|
||||
}
|
||||
})
|
||||
|
||||
const { validateInfos } = useForm(usersData, validators)
|
||||
const { validateInfos } = useForm(usersData.value, validators)
|
||||
|
||||
onMounted(() => {
|
||||
if (!usersData.emails && selectedUser?.email) {
|
||||
usersData.emails = selectedUser.email
|
||||
if (!usersData.value.emails && selectedUser?.email) {
|
||||
usersData.value.emails = selectedUser.email
|
||||
// todo: types not matching, probably a bug here?
|
||||
usersData.role = selectedUser.roles as any
|
||||
usersData.value.role = selectedUser.roles as any
|
||||
}
|
||||
})
|
||||
|
||||
const close = () => {
|
||||
emit('closed')
|
||||
usersData = { role: ProjectRole.Viewer }
|
||||
usersData.value = { role: ProjectRole.Viewer }
|
||||
}
|
||||
|
||||
const saveUser = async () => {
|
||||
$e('a:user:invite', { role: usersData.role })
|
||||
$e('a:user:invite', { role: usersData.value.role })
|
||||
|
||||
if (!project.value.id) return
|
||||
|
||||
@@ -87,7 +81,7 @@ const saveUser = async () => {
|
||||
try {
|
||||
if (selectedUser?.id) {
|
||||
await $api.auth.projectUserUpdate(project.value.id, selectedUser.id, {
|
||||
roles: usersData.role,
|
||||
roles: usersData.value.role as ProjectRole,
|
||||
email: selectedUser.email,
|
||||
project_id: project.value.id,
|
||||
projectName: project.value.title,
|
||||
@@ -95,13 +89,13 @@ const saveUser = async () => {
|
||||
close()
|
||||
} else {
|
||||
const res = await $api.auth.projectUserAdd(project.value.id, {
|
||||
roles: usersData.role,
|
||||
email: usersData.emails,
|
||||
roles: usersData.value.role,
|
||||
email: usersData.value.emails,
|
||||
} 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
|
||||
usersData.value.invitationToken = res?.invite_token
|
||||
}
|
||||
emit('reload')
|
||||
|
||||
@@ -113,12 +107,14 @@ const saveUser = async () => {
|
||||
}
|
||||
}
|
||||
|
||||
const inviteUrl = $computed(() => (usersData.invitationToken ? `${dashboardUrl}#/signup/${usersData.invitationToken}` : null))
|
||||
const inviteUrl = computed(() =>
|
||||
usersData.value.invitationToken ? `${dashboardUrl.value}#/signup/${usersData.value.invitationToken}` : null,
|
||||
)
|
||||
|
||||
const copyUrl = async () => {
|
||||
if (!inviteUrl) return
|
||||
if (!inviteUrl.value) return
|
||||
try {
|
||||
await copy(inviteUrl)
|
||||
await copy(inviteUrl.value)
|
||||
|
||||
// Copied shareable base url to clipboard!
|
||||
message.success(t('msg.success.shareableURLCopied'))
|
||||
@@ -130,9 +126,9 @@ const copyUrl = async () => {
|
||||
|
||||
const clickInviteMore = () => {
|
||||
$e('c:user:invite-more')
|
||||
usersData.invitationToken = undefined
|
||||
usersData.role = ProjectRole.Viewer
|
||||
usersData.emails = undefined
|
||||
usersData.value.invitationToken = undefined
|
||||
usersData.value.role = ProjectRole.Viewer
|
||||
usersData.value.emails = undefined
|
||||
}
|
||||
|
||||
const emailField = ref<typeof Input>()
|
||||
@@ -160,32 +156,12 @@ watch(
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<a-modal
|
||||
:footer="null"
|
||||
centered
|
||||
:visible="show"
|
||||
:class="{ active: show }"
|
||||
:closable="false"
|
||||
width="max(50vw, 44rem)"
|
||||
wrap-class-name="nc-modal-invite-user-and-share-base"
|
||||
@cancel="close"
|
||||
>
|
||||
<div class="flex flex-col" data-testid="invite-user-and-share-base-modal">
|
||||
<div class="flex flex-row justify-between items-center pb-1.5 mb-2 border-b-1 w-full">
|
||||
<a-typography-title v-if="!isMobileMode" class="select-none" :level="4">
|
||||
{{ $t('activity.share') }}: {{ project.title }}
|
||||
</a-typography-title>
|
||||
|
||||
<a-button
|
||||
type="text"
|
||||
class="!rounded-md mr-1 -mt-1.5"
|
||||
data-testid="invite-user-and-share-base-modal-close-btn"
|
||||
@click="close"
|
||||
>
|
||||
<template #icon>
|
||||
<MaterialSymbolsCloseRounded class="flex mx-auto" />
|
||||
</template>
|
||||
</a-button>
|
||||
<GeneralModal centered :visible="show" @cancel="close">
|
||||
<div class="flex flex-col p-6" data-testid="invite-user-and-share-base-modal">
|
||||
<div class="flex flex-row justify-between items-center pb-1.5 mb-2 border-b-1 border-gray-100 w-full">
|
||||
<div v-if="!isMobileMode" class="select-none font-medium">
|
||||
{{ $t('activity.share') }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="px-2 mt-1.5">
|
||||
@@ -301,6 +277,12 @@ watch(
|
||||
<LazyTabsAuthUserManagementShareBase />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="flex flex-row justify-end gap-x-2 border-t-1 border-gray-100 pt-3">
|
||||
<a-button key="back" class="!rounded-md" @click="cancel">Cancel</a-button>
|
||||
<a-button class="!rounded-md">Manage project access</a-button>
|
||||
<a-button key="submit" class="!rounded-md" type="primary" :loading="loading">Share</a-button>
|
||||
</div>
|
||||
</div>
|
||||
</a-modal>
|
||||
</GeneralModal>
|
||||
</template>
|
||||
|
||||
Reference in New Issue
Block a user