Skip to content

Commit

Permalink
refactor(navigation): move navigation pages to api package (podman-de…
Browse files Browse the repository at this point in the history
…sktop#7924)

Signed-off-by: axel7083 <[email protected]>
  • Loading branch information
axel7083 authored Jul 3, 2024
1 parent b068f7b commit 407fe7d
Show file tree
Hide file tree
Showing 12 changed files with 14 additions and 13 deletions.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* SPDX-License-Identifier: Apache-2.0
***********************************************************************/

import type { NavigationPage } from '/@/plugin/navigation/navigation-page.js';
import type { NavigationPage } from './navigation-page.js';

export interface NavigationRequest {
page: NavigationPage;
Expand Down
2 changes: 1 addition & 1 deletion packages/main/src/plugin/extension-loader.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ import { beforeAll, beforeEach, describe, expect, test, vi } from 'vitest';
import type { ContributionManager } from '/@/plugin/contribution-manager.js';
import type { KubeGeneratorRegistry } from '/@/plugin/kube-generator-registry.js';
import { NavigationManager } from '/@/plugin/navigation/navigation-manager.js';
import { NavigationPage } from '/@/plugin/navigation/navigation-page.js';
import type { WebviewRegistry } from '/@/plugin/webview/webview-registry.js';
import type { ContributionInfo } from '/@api/contribution-info.js';
import { NavigationPage } from '/@api/navigation-page.js';
import type { WebviewInfo } from '/@api/webview-info.js';

import { getBase64Image } from '../util.js';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import type { ProviderContainerConnection } from '@podman-desktop/api';
import { beforeEach, expect, test, vi } from 'vitest';

import { NavigationPage } from '/@api/navigation-page.js';
import type { WebviewInfo } from '/@api/webview-info.js';

import type { ApiSenderType } from '../api.js';
Expand All @@ -27,7 +28,6 @@ import type { ContributionManager } from '../contribution-manager.js';
import type { ProviderRegistry } from '../provider-registry.js';
import type { WebviewRegistry } from '../webview/webview-registry.js';
import { NavigationManager } from './navigation-manager.js';
import { NavigationPage } from './navigation-page.js';

let navigationManager: TestNavigationManager;

Expand Down
4 changes: 2 additions & 2 deletions packages/main/src/plugin/navigation/navigation-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import type { ProviderContainerConnection } from '@podman-desktop/api';
import type { ApiSenderType } from '/@/plugin/api.js';
import type { ContainerProviderRegistry } from '/@/plugin/container-registry.js';
import type { ContributionManager } from '/@/plugin/contribution-manager.js';
import { NavigationPage } from '/@/plugin/navigation/navigation-page.js';
import type { NavigationRequest } from '/@/plugin/navigation/navigation-request.js';
import { NavigationPage } from '/@api/navigation-page.js';
import type { NavigationRequest } from '/@api/navigation-request.js';

import type { ProviderRegistry } from '../provider-registry.js';
import type { WebviewRegistry } from '../webview/webview-registry.js';
Expand Down
4 changes: 2 additions & 2 deletions packages/main/src/plugin/webview/webview-panel-impl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import type {

import type { ApiSenderType } from '/@/plugin/api.js';
import { Emitter } from '/@/plugin/events/emitter.js';
import { NavigationPage } from '/@api/navigation-page.js';
import type { NavigationRequest } from '/@api/navigation-request.js';

import { NavigationPage } from '../navigation/navigation-page.js';
import type { NavigationRequest } from '../navigation/navigation-request.js';
import type { WebviewImpl } from './webview-impl.js';
import type { WebviewRegistry } from './webview-registry.js';

Expand Down
2 changes: 1 addition & 1 deletion packages/renderer/src/App.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import '@fortawesome/fontawesome-free/css/all.min.css';
import { router } from 'tinro';
import { handleNavigation } from '/@/navigation';
import type { NavigationRequest } from '/@api/navigation-request';
import type { NavigationRequest } from '../../main/src/plugin/navigation/navigation-request';
import AppNavigation from './AppNavigation.svelte';
import Appearance from './lib/appearance/Appearance.svelte';
import ComposeDetails from './lib/compose/ComposeDetails.svelte';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ import ContributionActions from '/@/lib/actions/ContributionActions.svelte';
import { withConfirmation } from '/@/lib/dialogs/messagebox-utils';
import { handleNavigation } from '/@/navigation';
import { exportContainerInfo } from '/@/stores/export-container-store';
import { NavigationPage } from '/@api/navigation-page';
import type { Menu } from '../../../../main/src/plugin/menu-registry';
import { MenuContext } from '../../../../main/src/plugin/menu-registry';
import { NavigationPage } from '../../../../main/src/plugin/navigation/navigation-page';
import FlatMenu from '../ui/FlatMenu.svelte';
import ListItemButtonIcon from '../ui/ListItemButtonIcon.svelte';
import { ContainerGroupInfoTypeUI, type ContainerInfoUI } from './ContainerInfoUI';
Expand Down
2 changes: 1 addition & 1 deletion packages/renderer/src/lib/image/RecommendedRegistry.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { Button } from '@podman-desktop/ui-svelte';
import { handleNavigation } from '/@/navigation';
import { recommendedRegistries } from '/@/stores/recommendedRegistries';
import { NavigationPage } from '/@api/navigation-page';
import { NavigationPage } from '../../../../main/src/plugin/navigation/navigation-page';
import type { RecommendedRegistry } from '../../../../main/src/plugin/recommendations/recommendations-api';
import FeaturedExtensionDownload from '../featured/FeaturedExtensionDownload.svelte';
Expand Down
2 changes: 1 addition & 1 deletion packages/renderer/src/lib/pod/PodColumnName.svelte
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import { handleNavigation } from '/@/navigation';
import { NavigationPage } from '/@api/navigation-page';
import { NavigationPage } from '../../../../main/src/plugin/navigation/navigation-page';
import { PodUtils } from './pod-utils';
import type { PodInfoUI } from './PodInfoUI';
Expand Down
3 changes: 2 additions & 1 deletion packages/renderer/src/navigation.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
import { router } from 'tinro';
import { expect, test, vi } from 'vitest';

import { NavigationPage } from '../../main/src/plugin/navigation/navigation-page';
import { NavigationPage } from '/@api/navigation-page';

import { handleNavigation } from './navigation';

// mock the router
Expand Down
2 changes: 1 addition & 1 deletion packages/renderer/src/navigation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import { router } from 'tinro';

import { NavigationPage } from '../../main/src/plugin/navigation/navigation-page';
import { NavigationPage } from '/@api/navigation-page';

/**
* Navigation hints for setting current page and history (breadcrumbs):
Expand Down

0 comments on commit 407fe7d

Please sign in to comment.