Skip to content

feat(release-20250423): merge to master #5812

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
piggggggggy merged 3 commits into from
Apr 23, 2025
Merged

feat(release-20250423): merge to master #5812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d71107
chore: merge master into develop after 2.0.dev352 version tagging
admin-cloudforet Apr 23, 2025
db71038
chore: solve dashboard minor bug
piggggggggy Apr 23, 2025
acb013d
Merge pull request #5811 from piggggggggy/dashboard-minor-bug
piggggggggy Apr 23, 2025
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
12 changes: 8 additions & 4 deletions ...vices/_shared/dashboard/core/composables/mutations/use-dashboard-folder-share-mutation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ export const useDashboardFolderShareMutation = (options: UseDashboardFolderShare
const { publicFolderAPI } = usePublicFolderApi();
const { publicDashboardAPI } = usePublicDashboardApi();
const queryClient = useQueryClient();
const { withSuffix: publicFolderGetQueryKey } = useServiceQueryKey('dashboard', 'public-folder', 'get');
const { withSuffix: publicDashboardGetQueryKey } = useServiceQueryKey('dashboard', 'public-dashboard', 'get');
const { withSuffix: publicFolderGetQueryKeyWithSuffix } = useServiceQueryKey('dashboard', 'public-folder', 'get');
const { withSuffix: publicDashboardGetQueryKeyWithSuffix } = useServiceQueryKey('dashboard', 'public-dashboard', 'get');
const { key: publicFolderListQueryKey } = useServiceQueryKey('dashboard', 'public-folder', 'list');
const { key: publicDashboardListQueryKey } = useServiceQueryKey('dashboard', 'public-dashboard', 'list');
const {
isShared, onSuccess, onError, onSettled,
} = options;
Expand Down Expand Up @@ -54,16 +56,18 @@ export const useDashboardFolderShareMutation = (options: UseDashboardFolderShare
mutationFn: shareFolderFn,
onSuccess: async (data, variables) => {
const _folderId = variables.folder_id;
queryClient.invalidateQueries({ queryKey: publicFolderGetQueryKey(_folderId) });
queryClient.invalidateQueries({ queryKey: publicFolderGetQueryKeyWithSuffix(_folderId) });
if (!isShared.value) {
const _dashboardList = await listPublicDashboard(_folderId);
const _dashboardIds = _dashboardList.results?.map((dashboard) => dashboard.dashboard_id);
if (_dashboardIds) {
await Promise.all(
_dashboardIds.map((dashboardId) => queryClient.invalidateQueries({ queryKey: publicDashboardGetQueryKey(dashboardId) })),
_dashboardIds.map((dashboardId) => queryClient.invalidateQueries({ queryKey: publicDashboardGetQueryKeyWithSuffix(dashboardId) })),
);
}
}
queryClient.invalidateQueries({ queryKey: publicFolderListQueryKey });
queryClient.invalidateQueries({ queryKey: publicDashboardListQueryKey });
if (onSuccess) await onSuccess(data, variables);
},
onError: (error, variables) => {
Expand Down
2 changes: 2 additions & 0 deletions ...src/services/_shared/dashboard/core/composables/mutations/use-dashboard-share-mutation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export const useDashboardShareMutation = (options: UseDashboardShareMutationOpti
const { publicDashboardAPI } = usePublicDashboardApi();
const queryClient = useQueryClient();
const { withSuffix: publicDashboardGetQueryKey } = useServiceQueryKey('dashboard', 'public-dashboard', 'get');
const { key: publicDashboardListQueryKey } = useServiceQueryKey('dashboard', 'public-dashboard', 'list');

const {
isShared, onSuccess, onError, onSettled,
Expand All @@ -37,6 +38,7 @@ export const useDashboardShareMutation = (options: UseDashboardShareMutationOpti
onSuccess: async (data, variables) => {
const _dashboardId = variables.dashboard_id;
queryClient.invalidateQueries({ queryKey: publicDashboardGetQueryKey(_dashboardId) });
queryClient.invalidateQueries({ queryKey: publicDashboardListQueryKey });
if (onSuccess) await onSuccess(data, variables);
},
onError: (error, variables) => {
Expand Down
7 changes: 6 additions & 1 deletion ...rvices/_shared/dashboard/dashboard-detail/contextual-components/DashboardDetailHeader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,12 @@ const state = reactive({
}
return i18n.t('DASHBOARDS.DETAIL.SHARED_TO_WORKSPACES');
}
return i18n.t('DASHBOARDS.DETAIL.SHARED_BY_ADMIN');
if (dashboard.value?.resource_group === RESOURCE_GROUP.DOMAIN) {
return i18n.t('DASHBOARDS.DETAIL.SHARED_BY_ADMIN');
}
if (dashboard.value?.scope === 'PROJECT') {
return i18n.t('DASHBOARDS.DETAIL.SHARED_TO_ALL_PROJECTS');
}
}
if (entryPoint.value === 'PROJECT') {
if (dashboard.value?.resource_group === RESOURCE_GROUP.DOMAIN) return i18n.t('DASHBOARDS.DETAIL.SHARED_BY_ADMIN');
Expand Down
8 changes: 0 additions & 8 deletions apps/web/src/services/dashboards/components/dashboard-main/DashboardBundleShareModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
import { computed, reactive, watch } from 'vue';
import type { TranslateResult } from 'vue-i18n';

import { useQueryClient } from '@tanstack/vue-query';

import {
PDataTable, PI, PButtonModal, PRadioGroup, PRadio, PFieldGroup,
} from '@cloudforet/mirinae';
Expand Down Expand Up @@ -56,14 +54,11 @@ const dashboardTreeControlStore = useDashboardTreeControlStore();
const {
publicDashboardList,
privateDashboardList,
keys: dashboardKeys,
} = useDashboardQuery();
const {
publicFolderList,
privateFolderList,
keys: folderKeys,
} = useDashboardFolderQuery();
const queryClient = useQueryClient();

const queryState = reactive({
publicDashboardItems: computed(() => {
Expand Down Expand Up @@ -189,8 +184,6 @@ const unshareDashboard = () => {
const { mutate: folderShareMutate, isPending: folderLoading } = useDashboardFolderShareMutation({
isShared: computed(() => state.isShared),
onSuccess: () => {
queryClient.invalidateQueries({ queryKey: folderKeys.publicFolderListQueryKey.value });
queryClient.invalidateQueries({ queryKey: dashboardKeys.privateDashboardListQueryKey.value });
if (state.isShared) showSuccessMessage(i18n.t('DASHBOARDS.DETAIL.ALT_S_SHARE_DASHBOARD'), '');
else showSuccessMessage(i18n.t('DASHBOARDS.DETAIL.ALT_S_UNSHARE_DASHBOARD'), '');
},
Expand All @@ -209,7 +202,6 @@ const { mutate: folderShareMutate, isPending: folderLoading } = useDashboardFold
const { mutate: dashboardShareMutate, isPending: dashboardLoading } = useDashboardShareMutation({
isShared: computed(() => state.isShared),
onSuccess: () => {
queryClient.invalidateQueries({ queryKey: dashboardKeys.publicDashboardListQueryKey.value });
if (state.isShared) showSuccessMessage(i18n.t('DASHBOARDS.DETAIL.ALT_S_SHARE_DASHBOARD'), '');
else showSuccessMessage(i18n.t('DASHBOARDS.DETAIL.ALT_S_UNSHARE_DASHBOARD'), '');
},
Expand Down
Loading