Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion apps/web/src/api-clients/add-ons/favorite/schema/list.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list';
import type { FavoriteModel } from '@/api-clients/add-ons/favorite/schema/model';

import type { FavoriteType } from '@/common/modules/favorites/favorite-button/type';
import type { FavoriteType } from '@/common/modules/user-config/favorite/favorite-button/type';

export interface FavoriteListParameters {
type: FavoriteType;
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/api-clients/add-ons/favorite/schema/model.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { UserConfigModel } from '@/api-clients/config/user-config/schema/model';

import type { FavoriteType } from '@/common/modules/favorites/favorite-button/type';
import type { FavoriteType } from '@/common/modules/user-config/favorite/favorite-button/type';

export type FavoriteModel = UserConfigModel<{
workspace_id: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const useUserConfigApi = () => {
delete: SpaceConnector.clientV2.config.userConfig.delete<UserConfigDeleteParameters>,
get: <T = Record<string, any>>(params: UserConfigGetParameters) => SpaceConnector.clientV2.config.userConfig.get<UserConfigGetParameters, UserConfigModel<T>>(params),
list: <T = Record<string, any>>(params: UserConfigListParameters) => SpaceConnector.clientV2.config.userConfig.list<UserConfigListParameters, ListResponse<UserConfigModel<T>>>(params),
set: SpaceConnector.clientV2.config.userConfig.set<UserConfigSetParameters, UserConfigModel>,
set: <T = Record<string, any>>(params: UserConfigSetParameters) => SpaceConnector.clientV2.config.userConfig.set<UserConfigSetParameters, UserConfigModel<T>>(params),
};

return {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { SpaceConnector } from '@cloudforet/core-lib/space-connector';

import type { ListResponse } from '@/api-clients/_common/schema/api-verbs/list';
import type { UserProfileConfirmEmailParameters } from '@/api-clients/identity/user-profile/schema/api-verbs/confirm-email';
import type { UserProfileConfirmMfaParameters } from '@/api-clients/identity/user-profile/schema/api-verbs/confirm-mfa';
import type { UserProfileDisableMfaParameters } from '@/api-clients/identity/user-profile/schema/api-verbs/disable-mfa';
Expand All @@ -10,7 +11,7 @@ import type { UserProfileUpdateParameters } from '@/api-clients/identity/user-pr
import type { UserProfileUpdatePasswordParameters } from '@/api-clients/identity/user-profile/schema/api-verbs/update-password';
import type { UserProfileVerifyEmailParameters } from '@/api-clients/identity/user-profile/schema/api-verbs/verify-email';
import type { UserModel } from '@/api-clients/identity/user/schema/model';

import type { WorkspaceModel } from '@/api-clients/identity/workspace/schema/model';


export const useUserProfileApi = () => {
Expand All @@ -23,7 +24,7 @@ export const useUserProfileApi = () => {
disableMfa: SpaceConnector.clientV2.identity.userProfile.disableMfa<UserProfileDisableMfaParameters, UserModel>,
enableMfa: SpaceConnector.clientV2.identity.userProfile.enableMfa<UserProfileEnableMfaParameters, UserModel>,
confirmMfa: SpaceConnector.clientV2.identity.userProfile.confirmMfa<UserProfileConfirmMfaParameters, UserModel>,
getWorkspaces: SpaceConnector.clientV2.identity.userProfile.getWorkspaces<UserProfileGetWorkspacesParameters, any>,
getWorkspaces: SpaceConnector.clientV2.identity.userProfile.getWorkspaces<UserProfileGetWorkspacesParameters, ListResponse<WorkspaceModel>>,
getWorkspaceGroups: SpaceConnector.clientV2.identity.userProfile.getWorkspaceGroups<UserProfileGetWorkspacesParameters, any>,
};

Expand Down

This file was deleted.

9 changes: 3 additions & 6 deletions apps/web/src/common/modules/navigations/gnb/GNBToolbox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,11 @@ import type { MenuId } from '@/lib/menu/config';
import { MENU_ID } from '@/lib/menu/config';

import { useBreadcrumbs } from '@/common/composables/breadcrumbs';
import FavoriteButton from '@/common/modules/favorites/favorite-button/FavoriteButton.vue';
import { useFavoriteStore } from '@/common/modules/favorites/favorite-button/store/favorite-store';
import { FAVORITE_TYPE } from '@/common/modules/favorites/favorite-button/type';
import type { FavoriteOptions } from '@/common/modules/favorites/favorite-button/type';
import { useGnbStore } from '@/common/modules/navigations/stores/gnb-store';
import type { Breadcrumb } from '@/common/modules/page-layouts/type';
import FavoriteButton from '@/common/modules/user-config/favorite/favorite-button/FavoriteButton.vue';
import { FAVORITE_TYPE } from '@/common/modules/user-config/favorite/favorite-button/type';
import type { FavoriteOptions } from '@/common/modules/user-config/favorite/favorite-button/type';

import { LANDING_ROUTE } from '@/services/landing/routes/route-constant';
import { MY_PAGE_ROUTE } from '@/services/my-page/routes/route-constant';
Expand All @@ -38,7 +37,6 @@ const userWorkspaceStore = useUserWorkspaceStore();
const userWorkspaceGetters = userWorkspaceStore.getters;
const gnbStore = useGnbStore();
const gnbGetters = gnbStore.getters;
const favoriteStore = useFavoriteStore();
const appContextStore = useAppContextStore();
const appContextGetters = appContextStore.getters;

Expand Down Expand Up @@ -112,7 +110,6 @@ const handleClickBreadcrumbsDropdownItem = (item: MenuItem) => {

watch(() => state.selectedMenuId, async (selectedMenuId) => {
await gnbStore.initState();
await favoriteStore.fetchFavorite();

if (selectedMenuId === MENU_ID.COST_ANALYSIS) {
await gnbStore.fetchCostQuerySet();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import type { MenuId } from '@/lib/menu/config';
import BetaMark from '@/common/components/marks/BetaMark.vue';
import NewMark from '@/common/components/marks/NewMark.vue';
import UpdateMark from '@/common/components/marks/UpdateMark.vue';
import FavoriteButton from '@/common/modules/favorites/favorite-button/FavoriteButton.vue';
import { FAVORITE_TYPE } from '@/common/modules/favorites/favorite-button/type';
import type { LSBIcon, LSBItem } from '@/common/modules/navigations/lsb/type';
import FavoriteButton from '@/common/modules/user-config/favorite/favorite-button/FavoriteButton.vue';
import { FAVORITE_TYPE } from '@/common/modules/user-config/favorite/favorite-button/type';

interface Props {
item: LSBItem;
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/common/modules/navigations/lsb/type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import type { MenuItem } from '@cloudforet/mirinae/types/controls/context-menu/t

import type { MenuId } from '@/lib/menu/config';

import type { FavoriteOptions } from '@/common/modules/favorites/favorite-button/type';
import type { FavoriteOptions } from '@/common/modules/user-config/favorite/favorite-button/type';


export const MENU_ITEM_TYPE = {
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/common/modules/navigations/new-lsb/LSBItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import { PTreeNode } from '@cloudforet/mirinae';
import BetaMark from '@/common/components/marks/BetaMark.vue';
import NewMark from '@/common/components/marks/NewMark.vue';
import UpdateMark from '@/common/components/marks/UpdateMark.vue';
import FavoriteButton from '@/common/modules/favorites/favorite-button/FavoriteButton.vue';
import { FAVORITE_TYPE } from '@/common/modules/favorites/favorite-button/type';
import type { LSBItemProps } from '@/common/modules/navigations/new-lsb/type';
import FavoriteButton from '@/common/modules/user-config/favorite/favorite-button/FavoriteButton.vue';
import { FAVORITE_TYPE } from '@/common/modules/user-config/favorite/favorite-button/type';

const props = withDefaults(defineProps<LSBItemProps>(), {
icon: undefined,
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/common/modules/navigations/new-lsb/type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { Location, Route } from 'vue-router';

import type { TreeNodeDisplayType, TreeNodeIcon, TreeNodeLink } from '@cloudforet/mirinae/types/data-display/tree/new-tree/type';

import type { FavoriteOptions } from '@/common/modules/favorites/favorite-button/type';
import type { FavoriteOptions } from '@/common/modules/user-config/favorite/favorite-button/type';

export type HighlightTagType = 'new' | 'beta' | 'update';
export type LSBRouterPredicate = (to: Location, currentRoute: Route) => boolean;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import type { CostDataSourceReferenceMap } from '@/store/reference/cost-data-sou
import { useUserStore } from '@/store/user/user-store';

import ErrorHandler from '@/common/composables/error/errorHandler';
import type { FavoriteOptions } from '@/common/modules/favorites/favorite-button/type';
import type { Breadcrumb } from '@/common/modules/page-layouts/type';
import type { FavoriteOptions } from '@/common/modules/user-config/favorite/favorite-button/type';

interface GnbStoreState {
breadcrumbs: Breadcrumb[];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ import {

import { i18n } from '@/translations';

import FavoriteButton from '@/common/modules/favorites/favorite-button/FavoriteButton.vue';
import type { FavoriteType } from '@/common/modules/favorites/favorite-button/type';
import { FAVORITE_TYPE } from '@/common/modules/favorites/favorite-button/type';
import type { SuggestionItem } from '@/common/modules/navigations/top-bar/modules/top-bar-search/config';
import type { FocusingDirection } from '@/common/modules/navigations/top-bar/modules/top-bar-search/type';
import type {
FavoriteMenuItem,
} from '@/common/modules/navigations/top-bar/modules/top-bar-toolset/modules/top-bar-favorite/modules/TopBarFavoriteContextMenu.vue';
import FavoriteButton from '@/common/modules/user-config/favorite/favorite-button/FavoriteButton.vue';
import type { FavoriteType } from '@/common/modules/user-config/favorite/favorite-button/type';
import { FAVORITE_TYPE } from '@/common/modules/user-config/favorite/favorite-button/type';

import { gray, indigo, peacock } from '@/styles/colors';

Expand Down
Loading
Loading