diff --git a/frontend/src/features/clients/stores/clientsStore.js b/frontend/src/features/clients/stores/clientsStore.js
index 7dd09f8..ce9e9a5 100644
--- a/frontend/src/features/clients/stores/clientsStore.js
+++ b/frontend/src/features/clients/stores/clientsStore.js
@@ -25,7 +25,7 @@ export const useClientsStore = defineStore('clients', () => {
});
async function fetchClients() {
- if (!authStore.isAuthenticated || !workspaceStore.activeWorkspaceId) {
+ if (!authStore.isAuthenticated) {
clients.value = [];
error.value = null;
return;
@@ -37,11 +37,13 @@ export const useClientsStore = defineStore('clients', () => {
try {
const response = await client.get('/api/clients', {
params: {
- workspaceId: workspaceStore.activeWorkspaceId,
+ workspaceId: workspaceStore.activeWorkspaceId ?? undefined,
},
});
- clients.value = response.data ?? [];
+ clients.value = (response.data ?? []).filter(candidate =>
+ workspaceStore.isWorkspaceVisible(candidate.workspaceId)
+ );
} catch (fetchError) {
console.error('Failed to fetch clients:', fetchError);
clients.value = [];
@@ -153,9 +155,9 @@ export const useClientsStore = defineStore('clients', () => {
}
watch(
- () => [authStore.isAuthenticated, workspaceStore.activeWorkspaceId],
- async ([isAuthenticated, workspaceId]) => {
- if (!isAuthenticated || !workspaceId) {
+ () => [authStore.isAuthenticated, workspaceStore.workspaceScopeKey],
+ async ([isAuthenticated]) => {
+ if (!isAuthenticated) {
clients.value = [];
error.value = null;
return;
diff --git a/frontend/src/features/content/stores/contentItemDetailStore.js b/frontend/src/features/content/stores/contentItemDetailStore.js
index 7b985cc..f83ac94 100644
--- a/frontend/src/features/content/stores/contentItemDetailStore.js
+++ b/frontend/src/features/content/stores/contentItemDetailStore.js
@@ -24,6 +24,10 @@ export const useContentItemDetailStore = defineStore('content-item-detail', () =
status: false,
});
+ function currentItemWorkspaceId() {
+ return item.value?.workspaceId ?? workspaceStore.activeWorkspaceId;
+ }
+
function reset() {
item.value = null;
revisions.value = [];
@@ -54,7 +58,7 @@ export const useContentItemDetailStore = defineStore('content-item-detail', () =
client.get('/api/approvals', { params: { contentItemId } }),
client.get('/api/notifications', {
params: {
- workspaceId: workspaceStore.activeWorkspaceId,
+ workspaceId: workspaceStore.activeWorkspaceId ?? undefined,
contentItemId,
},
}),
@@ -97,7 +101,7 @@ export const useContentItemDetailStore = defineStore('content-item-detail', () =
const response = await client.post('/api/assets/google-drive', {
...payload,
contentItemId,
- workspaceId: workspaceStore.activeWorkspaceId,
+ workspaceId: currentItemWorkspaceId(),
});
if (response.data) {
assets.value = [...assets.value, response.data];
@@ -131,7 +135,7 @@ export const useContentItemDetailStore = defineStore('content-item-detail', () =
const response = await client.post('/api/comments', {
...payload,
contentItemId,
- workspaceId: workspaceStore.activeWorkspaceId,
+ workspaceId: currentItemWorkspaceId(),
});
if (response.data) {
comments.value = [...comments.value, response.data];
@@ -202,7 +206,7 @@ export const useContentItemDetailStore = defineStore('content-item-detail', () =
async function fetchNotifications(contentItemId) {
const response = await client.get('/api/notifications', {
params: {
- workspaceId: workspaceStore.activeWorkspaceId,
+ workspaceId: currentItemWorkspaceId() ?? undefined,
contentItemId,
},
});
diff --git a/frontend/src/features/content/stores/contentItemsStore.js b/frontend/src/features/content/stores/contentItemsStore.js
index d94c6a5..4274292 100644
--- a/frontend/src/features/content/stores/contentItemsStore.js
+++ b/frontend/src/features/content/stores/contentItemsStore.js
@@ -20,7 +20,7 @@ export const useContentItemsStore = defineStore('content-items', () => {
);
async function fetchContentItems(filters = {}) {
- if (!authStore.isAuthenticated || !workspaceStore.activeWorkspaceId) {
+ if (!authStore.isAuthenticated) {
items.value = [];
error.value = null;
return;
@@ -32,13 +32,15 @@ export const useContentItemsStore = defineStore('content-items', () => {
try {
const response = await client.get('/api/content-items', {
params: {
- workspaceId: workspaceStore.activeWorkspaceId,
+ workspaceId: workspaceStore.activeWorkspaceId ?? undefined,
clientId: filters.clientId,
campaignId: filters.campaignId,
},
});
- items.value = response.data ?? [];
+ items.value = (response.data ?? []).filter(item =>
+ workspaceStore.isWorkspaceVisible(item.workspaceId)
+ );
} catch (fetchError) {
console.error('Failed to fetch content items:', fetchError);
items.value = [];
@@ -86,9 +88,9 @@ export const useContentItemsStore = defineStore('content-items', () => {
}
watch(
- () => [authStore.isAuthenticated, workspaceStore.activeWorkspaceId],
- async ([isAuthenticated, workspaceId]) => {
- if (!isAuthenticated || !workspaceId) {
+ () => [authStore.isAuthenticated, workspaceStore.workspaceScopeKey],
+ async ([isAuthenticated]) => {
+ if (!isAuthenticated) {
items.value = [];
error.value = null;
return;
diff --git a/frontend/src/features/workspaces/stores/workspaceStore.js b/frontend/src/features/workspaces/stores/workspaceStore.js
index 654ad29..f52d506 100644
--- a/frontend/src/features/workspaces/stores/workspaceStore.js
+++ b/frontend/src/features/workspaces/stores/workspaceStore.js
@@ -11,6 +11,7 @@ export const useWorkspaceStore = defineStore('workspace', () => {
const workspaces = ref([]);
const activeWorkspaceId = ref(null);
+ const visibleWorkspaceIds = ref([]);
const isLoading = ref(false);
const isCreating = ref(false);
const isUpdating = ref(false);
@@ -25,11 +26,43 @@ export const useWorkspaceStore = defineStore('workspace', () => {
const activeWorkspace = computed(() =>
workspaces.value.find(workspace => workspace.id === activeWorkspaceId.value) ?? null
);
+ const isAllWorkspacesSelected = computed(() =>
+ activeWorkspaceId.value === null && workspaces.value.length > 1
+ );
+ const visibleWorkspaceCount = computed(() =>
+ activeWorkspaceId.value ? 1 : visibleWorkspaceIds.value.length
+ );
+ const areAllWorkspacesVisible = computed(() =>
+ activeWorkspaceId.value === null &&
+ workspaces.value.length > 1 &&
+ visibleWorkspaceIds.value.length === workspaces.value.length
+ );
+ const visibleWorkspaceIdSet = computed(() => new Set(visibleWorkspaceIds.value));
+ const workspaceScopeKey = computed(() =>
+ activeWorkspaceId.value ?? visibleWorkspaceIds.value.slice().sort().join(',')
+ );
+
+ function allWorkspaceIds() {
+ return workspaces.value.map(workspace => workspace.id);
+ }
+
+ function normalizeVisibleWorkspaces() {
+ const workspaceIds = allWorkspaceIds();
+ const knownWorkspaceIds = new Set(workspaceIds);
+ const nextVisibleWorkspaceIds = visibleWorkspaceIds.value.filter(workspaceId =>
+ knownWorkspaceIds.has(workspaceId)
+ );
+
+ visibleWorkspaceIds.value = nextVisibleWorkspaceIds.length > 0
+ ? nextVisibleWorkspaceIds
+ : workspaceIds;
+ }
async function fetchWorkspaces() {
if (!authStore.isAuthenticated) {
workspaces.value = [];
activeWorkspaceId.value = null;
+ visibleWorkspaceIds.value = [];
error.value = null;
return;
}
@@ -40,9 +73,10 @@ export const useWorkspaceStore = defineStore('workspace', () => {
try {
const response = await client.get('/api/workspaces');
workspaces.value = response.data ?? [];
+ normalizeVisibleWorkspaces();
if (!workspaces.value.some(workspace => workspace.id === activeWorkspaceId.value)) {
- activeWorkspaceId.value = workspaces.value[0]?.id ?? null;
+ activeWorkspaceId.value = workspaces.value.length > 1 ? null : workspaces.value[0]?.id ?? null;
}
organizationStore.setSelectedOrganizationFromWorkspace(activeWorkspace.value);
@@ -75,6 +109,7 @@ export const useWorkspaceStore = defineStore('workspace', () => {
workspaces.value = [...workspaces.value, response.data]
.sort((left, right) => left.name.localeCompare(right.name));
activeWorkspaceId.value = response.data.id;
+ visibleWorkspaceIds.value = [response.data.id];
try {
await client.post('/api/clients', {
@@ -172,10 +207,62 @@ export const useWorkspaceStore = defineStore('workspace', () => {
if (workspaces.value.some(workspace => workspace.id === workspaceId)) {
activeWorkspaceId.value = workspaceId;
+ visibleWorkspaceIds.value = [workspaceId];
organizationStore.setSelectedOrganizationFromWorkspace(activeWorkspace.value);
}
}
+ function setAllWorkspaces() {
+ if (workspaces.value.length > 1) {
+ activeWorkspaceId.value = null;
+ visibleWorkspaceIds.value = allWorkspaceIds();
+ }
+ }
+
+ function isWorkspaceVisible(workspaceId) {
+ if (activeWorkspaceId.value) {
+ return workspaceId === activeWorkspaceId.value;
+ }
+
+ if (visibleWorkspaceIds.value.length === 0) {
+ return true;
+ }
+
+ return visibleWorkspaceIdSet.value.has(workspaceId);
+ }
+
+ function toggleWorkspaceVisibility(workspaceId) {
+ if (!workspaces.value.some(workspace => workspace.id === workspaceId)) {
+ return;
+ }
+
+ const wasFocusedOnSingleWorkspace = Boolean(activeWorkspaceId.value);
+ activeWorkspaceId.value = null;
+ const visibleIds = new Set(
+ wasFocusedOnSingleWorkspace || visibleWorkspaceIds.value.length === 0
+ ? allWorkspaceIds()
+ : visibleWorkspaceIds.value
+ );
+
+ if (visibleIds.has(workspaceId)) {
+ visibleIds.delete(workspaceId);
+ } else {
+ visibleIds.add(workspaceId);
+ }
+
+ if (visibleIds.size === 0) {
+ visibleIds.add(workspaceId);
+ }
+
+ const nextVisibleWorkspaceIds = allWorkspaceIds().filter(id => visibleIds.has(id));
+ if (nextVisibleWorkspaceIds.length === 1) {
+ setActiveWorkspace(nextVisibleWorkspaceIds[0]);
+ return;
+ }
+
+ visibleWorkspaceIds.value = nextVisibleWorkspaceIds;
+ }
+
async function fetchInvites(workspaceId = activeWorkspaceId.value) {
if (!authStore.isAuthenticated || !workspaceId) {
invitesByWorkspace.value = {};
@@ -257,6 +344,7 @@ export const useWorkspaceStore = defineStore('workspace', () => {
if (!isAuthenticated) {
workspaces.value = [];
activeWorkspaceId.value = null;
+ visibleWorkspaceIds.value = [];
error.value = null;
return;
}
@@ -270,6 +358,11 @@ export const useWorkspaceStore = defineStore('workspace', () => {
workspaces,
activeWorkspaceId,
activeWorkspace,
+ visibleWorkspaceIds,
+ isAllWorkspacesSelected,
+ visibleWorkspaceCount,
+ areAllWorkspacesVisible,
+ workspaceScopeKey,
isLoading,
isCreating,
isUpdating,
@@ -288,5 +381,8 @@ export const useWorkspaceStore = defineStore('workspace', () => {
fetchMembers,
inviteMember,
setActiveWorkspace,
+ setAllWorkspaces,
+ isWorkspaceVisible,
+ toggleWorkspaceVisibility,
};
});
diff --git a/frontend/src/layouts/main/WorkspaceSelector.vue b/frontend/src/layouts/main/WorkspaceSelector.vue
index 5f2fcb0..7131c6a 100644
--- a/frontend/src/layouts/main/WorkspaceSelector.vue
+++ b/frontend/src/layouts/main/WorkspaceSelector.vue
@@ -12,6 +12,8 @@
import {
mdiChevronDown,
mdiCogOutline,
+ mdiEyeOffOutline,
+ mdiEyeOutline,
mdiPlus,
mdiSwapHorizontal,
} from '@mdi/js';
@@ -37,6 +39,7 @@
);
});
const canSwitchWorkspaces = computed(() => visibleWorkspaces.value.length > 1);
+ const canSelectAllWorkspaces = computed(() => visibleWorkspaces.value.length > 1);
const canSwitchOrganizations = computed(() => organizationStore.organizations.length > 1);
const switchableOrganizations = computed(() =>
organizationStore.organizations.filter(
@@ -51,8 +54,19 @@
const canOpenWorkspaceMenu = computed(() =>
canSwitchWorkspaces.value || canSwitchOrganizations.value || canManageWorkspaces.value || Boolean(activeOrganization.value)
);
- const activeWorkspaceName = computed(() =>
- workspaceStore.activeWorkspace?.name || t('nav.noWorkspace')
+ const activeWorkspaceName = computed(() => {
+ if (workspaceStore.areAllWorkspacesVisible) {
+ return t('workspaceSelector.allWorkspaces');
+ }
+
+ if (workspaceStore.isAllWorkspacesSelected) {
+ return t('workspaceSelector.multipleWorkspaces');
+ }
+
+ return workspaceStore.activeWorkspace?.name || t('nav.noWorkspace');
+ });
+ const activeWorkspaceLogoUrl = computed(() =>
+ workspaceStore.isAllWorkspacesSelected ? null : workspaceStore.activeWorkspace?.logoUrl
);
const activeOrganizationName = computed(() =>
activeOrganization.value?.name || t('workspaceSelector.noOrganization')
@@ -73,13 +87,30 @@
isOrganizationListOpen.value = false;
}
+ function chooseAllWorkspaces() {
+ workspaceStore.setAllWorkspaces();
+ isWorkspaceMenuOpen.value = false;
+ isOrganizationListOpen.value = false;
+ }
+
+ function toggleWorkspaceVisibility(workspaceId) {
+ workspaceStore.toggleWorkspaceVisibility(workspaceId);
+ }
+
function chooseOrganization(organizationId) {
organizationStore.setSelectedOrganization(organizationId);
const nextWorkspace = workspaceStore.workspaces.find(
workspace => workspace.organizationId === organizationId
);
- workspaceStore.setActiveWorkspace(nextWorkspace?.id ?? null);
+ const organizationWorkspaceCount = workspaceStore.workspaces.filter(
+ workspace => workspace.organizationId === organizationId
+ ).length;
+ if (organizationWorkspaceCount > 1) {
+ workspaceStore.setAllWorkspaces();
+ } else {
+ workspaceStore.setActiveWorkspace(nextWorkspace?.id ?? null);
+ }
isOrganizationListOpen.value = false;
}
@@ -137,7 +168,7 @@
>
{{ activeWorkspaceName }}
@@ -153,11 +184,31 @@
v-if="isWorkspaceMenuOpen"
class="user-menu"
>
+
+