Browse Source

fix: rerender user invite modal, content correction

Signed-off-by: Pranav C <pranavxc@gmail.com>
pull/4134/head
Pranav C 2 years ago
parent
commit
de6cbe0a65
  1. 19
      packages/nc-gui/components/account/UserList.vue
  2. 937
      packages/nocodb-sdk/src/lib/Api.ts

19
packages/nc-gui/components/account/UserList.vue

@ -22,6 +22,8 @@ const currentLimit = $ref(10)
const showUserModal = ref(false) const showUserModal = ref(false)
const userMadalKey = ref(0)
const searchText = ref<string>('') const searchText = ref<string>('')
const pagination = reactive({ const pagination = reactive({
@ -67,8 +69,7 @@ const deleteUser = async (userId: string) => {
Modal.confirm({ Modal.confirm({
title: 'Are you sure you want to delete this user?', title: 'Are you sure you want to delete this user?',
type: 'warn', type: 'warn',
content: content: 'On deleting, user will remove from organization and any sync source(Airtable) created by user will get removed',
'On deleting, user will remove from from organization and any sync source(Airtable) created by user will get removed',
onOk: async () => { onOk: async () => {
try { try {
await api.orgUsers.delete(userId) await api.orgUsers.delete(userId)
@ -138,7 +139,17 @@ const copyPasswordResetUrl = async (user: User) => {
</a-input-search> </a-input-search>
<div class="flex-grow"></div> <div class="flex-grow"></div>
<MdiReload class="cursor-pointer" @click="loadUsers" /> <MdiReload class="cursor-pointer" @click="loadUsers" />
<a-button data-cy="nc-super-user-invite" size="small" type="primary" @click="showUserModal = true"> <a-button
data-cy="nc-super-user-invite"
size="small"
type="primary"
@click="
() => {
showUserModal = true
userMadalKey++
}
"
>
<div class="flex items-center gap-1"> <div class="flex items-center gap-1">
<MdiAdd /> <MdiAdd />
Invite new user Invite new user
@ -253,7 +264,7 @@ const copyPasswordResetUrl = async (user: User) => {
</a-table-column> </a-table-column>
</a-table> </a-table>
<LazyAccountUsersModal :show="showUserModal" @closed="showUserModal = false" @reload="loadUsers" /> <LazyAccountUsersModal :key="userMadalKey" :show="showUserModal" @closed="showUserModal = false" @reload="loadUsers" />
</div> </div>
</div> </div>
</template> </template>

937
packages/nocodb-sdk/src/lib/Api.ts

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save