Skip to content

Commit 608a4a5

Browse files
authored
Various fixes for nuxt3 migration (baserow#4604)
1 parent 7e2406d commit 608a4a5

File tree

43 files changed

+511
-539
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+511
-539
lines changed

enterprise/web-frontend/modules/baserow_enterprise/components/crudTable/fields/HighestPaidRoleField.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export default {
4646
},
4747
roles() {
4848
// filters out role not for Team subject and not for workspace level
49-
return this.workspace ? this.workspace._.roles : []
49+
return this.workspace?._.roles || []
5050
},
5151
showBillable() {
5252
return this.$hasPermission(

enterprise/web-frontend/modules/baserow_enterprise/components/member-roles/MemberRolesModal.vue

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<Modal @show="onShow" @hidden="hideError">
2+
<Modal ref="modal" @show="onShow" @hidden="hideError">
33
<Error v-if="error.visible" :error="error"></Error>
44
<Tabs
55
v-else
@@ -20,7 +20,9 @@
2020
scope-type="application"
2121
@invite-members="inviteDatabaseMembers"
2222
@invite-teams="inviteDatabaseTeams"
23-
@role-updated="updateRole(databaseRoleAssignments, ...arguments)"
23+
@role-updated="
24+
(ra, role) => updateRole(databaseRoleAssignments, ra, role)
25+
"
2426
/>
2527
</Tab>
2628
<Tab
@@ -36,7 +38,9 @@
3638
scope-type="database_table"
3739
@invite-members="inviteTableMembers"
3840
@invite-teams="inviteTableTeams"
39-
@role-updated="updateRole(tableRoleAssignments, ...arguments)"
41+
@role-updated="
42+
(ra, role) => updateRole(tableRoleAssignments, ra, role)
43+
"
4044
/>
4145
</Tab>
4246
<Tab
@@ -52,7 +56,9 @@
5256
scope-type="database_view"
5357
@invite-members="inviteViewMembers"
5458
@invite-teams="inviteViewTeams"
55-
@role-updated="updateRole(viewRoleAssignments, ...arguments)"
59+
@role-updated="
60+
(ra, role) => updateRole(viewRoleAssignments, ra, role)
61+
"
5662
/>
5763
</Tab>
5864
</Tabs>
@@ -313,8 +319,10 @@ export default {
313319
}
314320
315321
try {
322+
const subjectId =
323+
roleAssignment.subject?.id ?? roleAssignment.subject_id
316324
await RoleAssignmentsService(this.$client).assignRole(
317-
roleAssignment.subject.id,
325+
subjectId,
318326
roleAssignment.subject_type,
319327
this.workspace.id,
320328
roleAssignment.scope_id,

enterprise/web-frontend/modules/baserow_enterprise/components/member-roles/RoleSelector.vue

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<template>
22
<div>
33
<span v-if="disabled">
4-
{{ value.name }}
4+
{{ currentValue.name }}
55
</span>
66
<a
77
v-else
88
ref="editRoleContextLink"
99
@click="$refs.editRoleContext.toggle($refs.editRoleContextLink)"
1010
>
11-
{{ value.name }}
11+
{{ currentValue.name }}
1212
<i class="iconoir-nav-arrow-down"></i>
1313
</a>
1414
<EditRoleContext
1515
ref="editRoleContext"
16-
:subject="value"
16+
:subject="currentValue"
1717
:roles="roles"
1818
:allow-removing-role="allowRemovingRole"
1919
:workspace="workspace"
@@ -29,12 +29,16 @@ import EditRoleContext from '@baserow/modules/core/components/settings/members/E
2929
3030
export default {
3131
name: 'RoleSelector',
32-
emits: ['delete', 'input'],
32+
emits: ['delete', 'input', 'update:modelValue'],
3333
components: { EditRoleContext },
3434
props: {
3535
value: {
3636
type: Object,
37-
default: () => ({}),
37+
default: undefined,
38+
},
39+
modelValue: {
40+
type: Object,
41+
default: undefined,
3842
},
3943
roles: {
4044
type: Array,
@@ -53,10 +57,16 @@ export default {
5357
required: true,
5458
},
5559
},
60+
computed: {
61+
currentValue() {
62+
return this.modelValue !== undefined ? this.modelValue : this.value || {}
63+
},
64+
},
5665
methods: {
5766
roleUpdated({ uid }) {
5867
const role = this.roles.find((role) => role.uid === uid)
5968
this.$emit('input', role)
69+
this.$emit('update:modelValue', role)
6070
},
6171
},
6272
}

enterprise/web-frontend/modules/baserow_enterprise/components/rbac/SelectMembersList.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<List
2020
class="margin-top-2 select-members-list__items"
2121
:items="usersFiltered"
22+
:selected-items="usersSelected"
2223
:attributes="['email']"
2324
selectable
2425
@selected="userSelected"

enterprise/web-frontend/modules/baserow_enterprise/components/rbac/SelectTeamsList.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<List
2020
class="margin-top-2 select-teams-list__items"
2121
:items="teamsFiltered"
22+
:selected-items="teamsSelected"
2223
:attributes="[]"
2324
selectable
2425
@selected="teamSelected"

premium/web-frontend/modules/baserow_premium/components/field/GenerateAIValuesModal.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ export default {
177177
const { data: viewsData } = await ViewService(this.$client).fetchAll(
178178
this.table.id
179179
)
180-
viewsData.forEach((v) => populateView(v))
180+
viewsData.forEach((v) => populateView(v, this.$registry))
181181
this.views = viewsData
182182
} catch (error) {
183183
this.handleError(error, 'views')

premium/web-frontend/modules/baserow_premium/components/views/PremiumViewOptions.vue

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
:disabled="!hasPremiumFeatures"
1313
@input="update('show_logo', !$event)"
1414
>
15-
<img src="@baserow/modules/core/static/img/baserow-icon.svg?url" />
15+
<img
16+
class="switch__icon"
17+
src="@baserow/modules/core/static/img/baserow-icon.svg?url"
18+
/>
1619
<span>
1720
{{ $t('shareLinkOptions.baserowLogo.label') }}
1821
</span>
@@ -39,7 +42,7 @@
3942
:disabled="!hasPremiumFeatures"
4043
@input="update('allow_public_export', $event)"
4144
>
42-
<i class="iconoir iconoir-share-ios"></i>
45+
<i class="switch__icon iconoir-share-ios"></i>
4346
<span>
4447
{{ $t('shareLinkOptions.allowPublicExportLabel') }}
4548
</span>

premium/web-frontend/modules/baserow_premium/components/views/form/FormViewModeSurvey.vue

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,13 @@ export default {
173173
174174
this.questionIndex++
175175
},
176-
validateAndNext(fieldIndex) {
176+
async validateAndNext(fieldIndex) {
177+
const activeElement = document.activeElement
178+
if (activeElement && activeElement !== document.body) {
179+
activeElement.blur()
180+
}
181+
await this.$nextTick()
182+
177183
const field = this.visibleFieldsWithoutHiddenViaQueryParam[fieldIndex]
178184
field._.touched = true
179185

web-frontend/config/nuxt.config.base.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,4 +107,9 @@ export default defineNuxtConfig({
107107
experimental: {
108108
appManifest: process.env.NODE_ENV !== 'development',
109109
},
110+
vue: {
111+
compilerOptions: {
112+
comments: false,
113+
},
114+
},
110115
})

web-frontend/justfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ ci-test:
105105
# Update Jest snapshots
106106
[group('3 - testing')]
107107
update-snapshots:
108-
yarn run jest --updateSnapshot
108+
yarn test --update
109109

110110
# =============================================================================
111111
# Development

0 commit comments

Comments
 (0)