Skip to content
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.

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

#8387 Spaces/User admin list edit quota batch actions - Followup #8438

Merged
merged 4 commits into from
Feb 15, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ We've added the batch edit quota functionality to the admin panel for users pers

https://github.com/owncloud/web/pull/8387
https://github.com/owncloud/web/pull/8430
https://github.com/owncloud/web/pull/8438
https://github.com/owncloud/web/issues/8417
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<quota-modal
v-if="quotaModalIsOpen"
:cancel="closeQuotaModal"
:spaces="[resources[0]]"
:spaces="resources"
@space-quota-updated="spaceQuotaUpdated"
/>
<oc-list id="oc-spaces-actions-sidebar" class-name="oc-mt-s">
Expand Down
2 changes: 1 addition & 1 deletion packages/web-app-admin-settings/src/views/Spaces.vue
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ export default defineComponent({
const { sideBarOpen, sideBarActivePanel } = useSideBar()

const loadResourcesEventToken = ref(null)
const updateQuotaForSpaceEventToken = ref(null)
const updateQuotaForSpaceEventToken = null
const template = ref(null)
const listHeaderPosition = ref(0)
const selectedSpaces = ref([])
Expand Down
11 changes: 6 additions & 5 deletions packages/web-app-admin-settings/src/views/Users.vue
Original file line number Diff line number Diff line change
Expand Up @@ -219,11 +219,12 @@ export default defineComponent({
watch(selectedUserIds, async () => {
sideBarLoading.value = true
// Load additional user data
const requests = []
unref(selectedUsers).forEach((user) => {
requests.push(loadAdditionalUserDataTask.perform(user))
})
await Promise.all(requests)
const requests = unref(selectedUsers).map((user) => loadAdditionalUserDataTask.perform(user))
const results = await Promise.allSettled<Array<unknown>>(requests)
const failedRequests = results.filter((result) => result.status === 'rejected')
if (failedRequests.length > 0) {
console.error('Failed to load additional user data', failedRequests)
}

if (unref(selectedUsers).length === 1) {
loadedUser.value = unref(selectedUsers)[0]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<quota-modal
v-if="quotaModalIsOpen"
:cancel="closeQuotaModal"
:spaces="quotaModalSelectedSpace"
:spaces="quotaModalSelectedSpaces"
/>
<readme-content-modal
v-if="readmeContentModalIsOpen"
Expand Down Expand Up @@ -74,7 +74,7 @@ export default defineComponent({
},

computed: {
quotaModalSelectedSpace() {
quotaModalSelectedSpaces() {
return [this.$data.$_editQuota_selectedSpace]
},
quotaModalIsOpen() {
Expand Down
6 changes: 5 additions & 1 deletion packages/web-pkg/src/components/Spaces/QuotaModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,11 @@ export default defineComponent({
}
},
mounted() {
this.selectedOption = this.spaces[0].spaceQuota.total || 0
if (!this.spaces.length) {
this.selectedOption = 0
return
}
this.selectedOption = this.spaces[0].spaceQuota?.total || 0
},
methods: {
...mapActions(['showMessage']),
Expand Down
54 changes: 26 additions & 28 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.