Skip to content

Prevent show access requests for workspaces guest #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 21, 2023
Merged

Prevent show access requests for workspaces guest #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions web-app/packages/admin-lib/src/modules/project/views/ProjectSettingsView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
:projectName="projectName"
:asAdmin="asAdmin"
:show-settings="true"
:show-access-requests="true"
>
<!-- TODO: V3_UPGRADE [MERGIN-EXT] - change settingsAccess to settings.access -->
<template #permissions="{ settings, keyProp, saveProject }">
Expand Down
8 changes: 6 additions & 2 deletions web-app/packages/app/src/modules/project/views/ProjectSettingsView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
:projectName="projectName"
:asAdmin="asAdmin"
:show-settings="projectStore.isProjectOwner"
:show-access-requests="userStore.isGlobalWorkspaceAdmin"
>
<!-- TODO: V3_UPGRADE [MERGIN-EXT] - change settingsAccess to settings.access -->
<template #permissions="{ settings, keyProp, saveProject }">
Expand All @@ -26,7 +27,8 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
import {
ProjectSettingsViewTemplate,
ProjectPermissionsTemplate,
useProjectStore
useProjectStore,
useUserStore
} from '@mergin/lib'
import { defineComponent } from 'vue'

Expand All @@ -46,9 +48,11 @@ export default defineComponent({
},
setup(_props) {
const projectStore = useProjectStore()
const userStore = useUserStore()

return {
projectStore
projectStore,
userStore
}
}
})
Expand Down
10 changes: 7 additions & 3 deletions web-app/packages/lib/src/modules/project/views/ProjectSettingsViewTemplate.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
:key-prop="key"
:save-project="saveProject"
></slot>
<project-access-requests />
<project-access-requests v-if="showAccessRequests" />
<v-layout class="public-private-zone">
<v-container>
<v-row>
Expand Down Expand Up @@ -65,7 +65,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
<script lang="ts">
import debounce from 'lodash/debounce'
import { mapActions, mapState } from 'pinia'
import { defineComponent } from 'vue'
import { PropType, defineComponent } from 'vue'

import { getErrorMessage } from '@/common/error_utils'
import ConfirmDialog from '@/modules/dialog/components/ConfirmDialog.vue'
Expand All @@ -87,7 +87,11 @@ export default defineComponent({
type: Boolean,
default: false
},
showSettings: Boolean
showSettings: Boolean,
showAccessRequests: {
type: Boolean as PropType<boolean>,
default: false
}
},
data() {
return {
Expand Down