'',
},
+ noMargin: {
+ type: Boolean,
+ default: false,
+ },
},
computed: {
hasHeader() {
diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/js/SpaceService.js b/webapp/portlet/src/main/webapp/vue-apps/common/js/SpaceService.js
index de4450bf3de..d84c2f14b38 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/common/js/SpaceService.js
+++ b/webapp/portlet/src/main/webapp/vue-apps/common/js/SpaceService.js
@@ -162,64 +162,6 @@ export function getSpaceByGroupSuffix(groupSuffix, expand) {
});
}
-export function getSpaceApplications(spaceId) {
- return fetch(`${eXo.env.portal.context}/${eXo.env.portal.rest}/v1/social/spaces/${spaceId}/applications`, {
- method: 'GET',
- credentials: 'include',
- }).then(resp => {
- if (!resp || !resp.ok) {
- throw new Error('Response code indicates a server error', resp);
- } else {
- return resp.json();
- }
- });
-}
-
-export function getSpaceApplicationsChoices() {
- return fetch(`${eXo.env.portal.context}/${eXo.env.portal.rest}/v1/social/spaces/applications`, {
- method: 'GET',
- credentials: 'include',
- }).then(resp => {
- if (!resp || !resp.ok) {
- throw new Error('Response code indicates a server error', resp);
- } else {
- return resp.json();
- }
- });
-}
-
-export function removeSpacesApplication(appName) {
- return fetch(`${eXo.env.portal.context}/${eXo.env.portal.rest}/v1/social/spaces/applications/${appName}`, {
- method: 'DELETE',
- credentials: 'include',
- }).then(resp => {
- if (!resp || !resp.ok) {
- throw new Error('Response code indicates a server error', resp);
- }
- });
-}
-
-export function addSpacesApplication(application) {
- return fetch(`${eXo.env.portal.context}/${eXo.env.portal.rest}/v1/social/spaces/applications`, {
- method: 'POST',
- credentials: 'include',
- headers: {
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify({
- applicationName: application.applicationName,
- contentId: application.contentId,
- description: application.description,
- displayName: application.displayName || application.applicationName,
- id: application.id,
- }),
- }).then(resp => {
- if (!resp || !resp.ok) {
- throw new Error('Response code indicates a server error', resp);
- }
- });
-}
-
export function restoreSpaceHomeLayout(spaceId) {
return fetch(`${eXo.env.portal.context}/${eXo.env.portal.rest}/v1/social/spaces/layout/home/${spaceId}`, {
credentials: 'include',
@@ -554,62 +496,6 @@ export function removePublisher(spacePrettyName, username) {
});
}
-export function addApplication(spaceId, appId) {
- return fetch(`${eXo.env.portal.context}/${eXo.env.portal.rest}/v1/social/spaces/${spaceId}/applications`, {
- method: 'POST',
- credentials: 'include',
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded',
- },
- body: `appId=${appId}`,
- }).then(resp => {
- if (!resp || !resp.ok) {
- throw new Error('Response code indicates a server error', resp);
- }
- });
-}
-
-export function removeApplication(spaceId, appId) {
- return fetch(`${eXo.env.portal.context}/${eXo.env.portal.rest}/v1/social/spaces/${spaceId}/applications/${appId}`, {
- method: 'DELETE',
- credentials: 'include',
- }).then(resp => {
- if (!resp || !resp.ok) {
- throw new Error('Response code indicates a server error', resp);
- }
- });
-}
-
-export function moveApplicationUp(spaceId, appId) {
- return fetch(`${eXo.env.portal.context}/${eXo.env.portal.rest}/v1/social/spaces/${spaceId}/applications/${appId}`, {
- method: 'PUT',
- credentials: 'include',
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded',
- },
- body: 'transition=-1',
- }).then(resp => {
- if (!resp || !resp.ok) {
- throw new Error('Response code indicates a server error', resp);
- }
- });
-}
-
-export function moveApplicationDown(spaceId, appId) {
- return fetch(`${eXo.env.portal.context}/${eXo.env.portal.rest}/v1/social/spaces/${spaceId}/applications/${appId}`, {
- method: 'PUT',
- credentials: 'include',
- headers: {
- 'Content-Type': 'application/x-www-form-urlencoded',
- },
- body: 'transition=1',
- }).then(resp => {
- if (!resp || !resp.ok) {
- throw new Error('Response code indicates a server error', resp);
- }
- });
-}
-
export function removeMember(spacePrettyName, username) {
const id = `${spacePrettyName}:${username}:member`;
return fetch(`${eXo.env.portal.context}/${eXo.env.portal.rest}/v1/social/spacesMemberships/${id}`, {
diff --git a/webapp/portlet/src/main/webapp/vue-apps/component-image-crop/components/ImageCropDrawer.vue b/webapp/portlet/src/main/webapp/vue-apps/component-image-crop/components/ImageCropDrawer.vue
index 0982af3e12a..01b906da99e 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/component-image-crop/components/ImageCropDrawer.vue
+++ b/webapp/portlet/src/main/webapp/vue-apps/component-image-crop/components/ImageCropDrawer.vue
@@ -29,7 +29,7 @@
{{ $t(title) }}
-
+
-
-
-
- fas fa-camera
-
-
-
-
-
\ No newline at end of file
diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/SpaceSettingFormDrawer.vue b/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/SpaceSettingFormDrawer.vue
deleted file mode 100644
index db211a3f215..00000000000
--- a/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/SpaceSettingFormDrawer.vue
+++ /dev/null
@@ -1,278 +0,0 @@
-
-
-
-
- {{ $t('SpaceSettings.general') }}
-
-
-
-
-
-
-
-
-
- {{ $t('SpaceSettings.button.cancel') }}
-
-
-
- mdi-check-all
-
- {{ $t('SpaceSettings.button.updateSpace') }}
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $t('SpaceSettings.general') }}
-
-
-
-
- fa-edit
-
-
-
-
-
-
-
-
-
-
diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/SpaceSettings.vue b/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/SpaceSettings.vue
index b53dcf17203..d8ebbbff108 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/SpaceSettings.vue
+++ b/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/SpaceSettings.vue
@@ -1,41 +1,26 @@
-
-
-
+
+
+
+
+
-
+
-
\ No newline at end of file
diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/form/SpaceSettingAvatar.vue b/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/form/SpaceSettingAvatar.vue
new file mode 100644
index 00000000000..3873aa82aa1
--- /dev/null
+++ b/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/form/SpaceSettingAvatar.vue
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/form/SpaceSettingBanner.vue b/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/form/SpaceSettingBanner.vue
new file mode 100644
index 00000000000..58ffe4a7532
--- /dev/null
+++ b/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/form/SpaceSettingBanner.vue
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/main/SpaceSettingAccess.vue b/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/main/SpaceSettingAccess.vue
new file mode 100644
index 00000000000..96c044d2902
--- /dev/null
+++ b/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/main/SpaceSettingAccess.vue
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+ {{ $t('SpaceSettings.accessAndVisibility') }}
+
+
+
+
+ fa-edit
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/main/SpaceSettingOverview.vue b/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/main/SpaceSettingOverview.vue
new file mode 100644
index 00000000000..317ed68eea3
--- /dev/null
+++ b/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/main/SpaceSettingOverview.vue
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+ {{ $t('SpaceSettings.overview') }}
+
+
+
+
+ fa-caret-right
+
+
+
+
+
+
+
diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/main/SpaceSettingRoles.vue b/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/main/SpaceSettingRoles.vue
new file mode 100644
index 00000000000..b4ca4ea1a58
--- /dev/null
+++ b/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/main/SpaceSettingRoles.vue
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+ {{ $t('SpaceSettings.roles') }}
+
+
+
+
+ fa-caret-right
+
+
+
+
+
+
+
diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/section/SpaceSettingOverviewSection.vue b/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/section/SpaceSettingOverviewSection.vue
new file mode 100644
index 00000000000..6fa44c9a2e1
--- /dev/null
+++ b/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/section/SpaceSettingOverviewSection.vue
@@ -0,0 +1,160 @@
+
+
+
+
+
+
+
+ {{ $vuetify.rtl && 'fa-arrow-right' || 'fa-arrow-left' }}
+
+
+
+
+
+
+ {{ $t('SpaceSettings.overview') }}
+
+
+
+
+
+
+
+
+
+
+ {{ $t('SpaceSettings.button.cancel') }}
+
+
+ {{ $t('SpaceSettings.button.updateSpace') }}
+
+
+
+
+
+
diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/section/SpaceSettingRolesSection.vue b/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/section/SpaceSettingRolesSection.vue
new file mode 100644
index 00000000000..3a56d846735
--- /dev/null
+++ b/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/section/SpaceSettingRolesSection.vue
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+ {{ $vuetify.rtl && 'fa-arrow-right' || 'fa-arrow-left' }}
+
+
+
+
+
+
+ {{ $t('SpaceSettings.roles') }}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/initComponents.js b/webapp/portlet/src/main/webapp/vue-apps/space-settings/initComponents.js
index c9e54a70a5b..d306c37b33d 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/space-settings/initComponents.js
+++ b/webapp/portlet/src/main/webapp/vue-apps/space-settings/initComponents.js
@@ -1,13 +1,30 @@
import SpaceSettings from './components/SpaceSettings.vue';
-import SpaceSettingGeneral from './components/SpaceSettingGeneral.vue';
-import SpaceSettingFormDrawer from './components/SpaceSettingFormDrawer.vue';
-import SpaceSettingAvatar from './components/SpaceSettingAvatar.vue';
+
+import SpaceSettingOverview from './components/main/SpaceSettingOverview.vue';
+import SpaceSettingRoles from './components/main/SpaceSettingRoles.vue';
+import SpaceSettingAccess from './components/main/SpaceSettingAccess.vue';
+
+import SpaceSettingOverviewSection from './components/section/SpaceSettingOverviewSection.vue';
+import SpaceSettingRolesSection from './components/section/SpaceSettingRolesSection.vue';
+
+import SpaceSettingAccessDrawer from './components/drawer/SpaceSettingAccessDrawer.vue';
+
+import SpaceSettingAvatar from './components/form/SpaceSettingAvatar.vue';
+import SpaceSettingBanner from './components/form/SpaceSettingBanner.vue';
const components = {
'space-settings': SpaceSettings,
- 'space-setting-general': SpaceSettingGeneral,
+ 'space-setting-overview': SpaceSettingOverview,
+ 'space-setting-roles': SpaceSettingRoles,
+ 'space-setting-access': SpaceSettingAccess,
+
+ 'space-setting-overview-section': SpaceSettingOverviewSection,
+ 'space-setting-roles-section': SpaceSettingRolesSection,
+
+ 'space-setting-access-drawer': SpaceSettingAccessDrawer,
+
'space-setting-avatar': SpaceSettingAvatar,
- 'space-setting-form-drawer': SpaceSettingFormDrawer,
+ 'space-setting-banner': SpaceSettingBanner,
};
for (const key in components) {
diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/main.js b/webapp/portlet/src/main/webapp/vue-apps/space-settings/main.js
index ec29ba31d0a..97407dc455b 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/space-settings/main.js
+++ b/webapp/portlet/src/main/webapp/vue-apps/space-settings/main.js
@@ -23,10 +23,75 @@ const appId = 'SpaceSettings';
export function init() {
exoi18n.loadLanguageAsync(lang, url).then(i18n =>
Vue.createApp({
- mounted() {
- document.dispatchEvent(new CustomEvent('hideTopBarLoading'));
- },
template: '',
+ data: {
+ spaceId: eXo.env.portal.spaceId,
+ space: null,
+ activeSection: null,
+ },
+ computed: {
+ isOverviewSection() {
+ return this.activeSection === 'overview';
+ },
+ isRolesSection() {
+ return this.activeSection === 'roles';
+ },
+ isAllSections() {
+ return !this.activeSection;
+ },
+ },
+ watch: {
+ activeSection() {
+ if (this.$root.isAllSections) {
+ window.history.replaceState('', window.document.title, window.location.href.split('#')[0]);
+ } else {
+ window.history.replaceState('', window.document.title, `${window.location.href.split('#')[0]}#${this.$root.activeSection}`);
+ }
+ this.$root.$emit('close-alert-message');
+ },
+ },
+ created() {
+ this.init();
+ document.addEventListener('hideSettingsApps', this.showSection);
+ document.addEventListener('showSettingsApps', this.showMain);
+ this.$root.$on('space-settings-updated', this.handleSpaceUpdated);
+ },
+ beforeDestroy() {
+ document.removeEventListener('hideSettingsApps', this.showSection);
+ document.removeEventListener('showSettingsApps', this.showMain);
+ this.$root.$off('space-settings-updated', this.handleSpaceUpdated);
+ },
+ methods: {
+ async init() {
+ if (window.location.hash === '#overview') {
+ this.$root.activeSection = 'overview';
+ } else if (window.location.hash === '#roles') {
+ this.$root.activeSection = 'roles';
+ }
+ await this.refreshSpace();
+ document.dispatchEvent(new CustomEvent('hideTopBarLoading'));
+ this.$applicationLoaded();
+ },
+ async handleSpaceUpdated() {
+ const oldPrettyName = this.space.prettyName;
+ await this.refreshSpace();
+ if (oldPrettyName !== this.space.prettyName) {
+ window.history.replaceState('', window.document.title, window.location.href.replaceAll(oldPrettyName, this.space.prettyName));
+ }
+ document.dispatchEvent(new CustomEvent('space-settings-updated', {detail: this.space}));
+ },
+ async refreshSpace() {
+ if (this.spaceId) {
+ this.space = await this.$spaceService.getSpaceById(this.spaceId, Date.now());
+ }
+ },
+ showSection(event) {
+ this.activeSection = event?.detail;
+ },
+ showMain() {
+ this.activeSection = null;
+ },
+ },
i18n,
vuetify: Vue.prototype.vuetifyOptions,
}, `#${appId}`, 'Space Settings')
diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-top-bannerlogo/main.js b/webapp/portlet/src/main/webapp/vue-apps/space-top-bannerlogo/main.js
index d42e52b0043..8c0977400fc 100644
--- a/webapp/portlet/src/main/webapp/vue-apps/space-top-bannerlogo/main.js
+++ b/webapp/portlet/src/main/webapp/vue-apps/space-top-bannerlogo/main.js
@@ -18,23 +18,21 @@ export function init(params) {
exoi18n.loadLanguageAsync(lang, url).then(i18n => {
// init Vue app when locale resources are ready
popover = Vue.createApp({
- data: function() {
- return {
- spaceId: params.id,
- isFavorite: params.isFavorite,
- muted: params.muted === 'true',
- isMember: params.isMember,
- logoPath: params.logoPath,
- portalPath: params.portalPath,
- imageClass: params.imageClass,
- logoTitle: decodeURIComponent(params.logoTitle || ''),
- titleClass: params.titleClass,
- membersNumber: params.membersNumber,
- spaceDescription: decodeURIComponent(params.spaceDescription || ''),
- managers: params.managers,
- homePath: params.homePath,
- };
- },
+ data: () => ({
+ spaceId: params.id,
+ isFavorite: params.isFavorite,
+ muted: params.muted === 'true',
+ isMember: params.isMember,
+ logoPath: params.logoPath,
+ portalPath: params.portalPath,
+ imageClass: params.imageClass,
+ logoTitle: decodeURIComponent(params.logoTitle || ''),
+ titleClass: params.titleClass,
+ membersNumber: params.membersNumber,
+ spaceDescription: decodeURIComponent(params.spaceDescription || ''),
+ managers: params.managers,
+ homePath: params.homePath,
+ }),
template: ``,
+ created() {
+ document.addEventListener('space-settings-updated', this.refreshSpaceSettings);
+ },
+ methods: {
+ refreshSpaceSettings(event) {
+ const space = event?.detail;
+ if (space) {
+ params.logoTitle = space.displayName;
+ params.spaceDescription = space.description;
+ params.logoPath = space.avatarUrl;
+ params.portalPath = `${eXo.env.portal.context}/g/${space.groupId.replaceAll('/', ':')}/${space.prettyName}`;
+ init(params);
+ }
+ }
+ },
i18n,
vuetify,
}, `#${appId}`, 'social-portlet');