Merge branch 'dev' of github.com:jumpserver/luna into dev

Author: ibuler

design-qa.md

@@ -6,8 +6,10 @@
   "exports": {
     ".": "./src/index.ts",
     "./types/component": "./src/types/component.ts",
+    "./types/fileTransfer": "./src/types/fileTransfer.ts",
     "./types/message": "./src/types/message.ts",
     "./types/session": "./src/types/session.ts",
+    "./fileTransferRegistry": "./src/fileTransferRegistry.ts",
     "./useConnectorEndpoint": "./src/useConnectorEndpoint.ts",
     "./useHostBridge": "./src/useHostBridge.ts",
     "./sessionContext": "./src/sessionContext.ts",

packages/connectors-core/package.json

@@ -1,4 +1,4 @@
-import type { FileTransferEndpoint } from "./types";
+import type { FileTransferEndpoint } from "./types/fileTransfer";
 
 const endpoints = new Map<string, FileTransferEndpoint>();
 

ui/shared/file-transfer/registry.ts …nectors-core/src/fileTransferRegistry.tsui/shared/file-transfer/registry.ts renamed to packages/connectors-core/src/fileTransferRegistry.ts ui/shared/file-transfer/registry.ts renamed to packages/connectors-core/src/fileTransferRegistry.ts

@@ -1,5 +1,7 @@
+export * from "./fileTransferRegistry";
 export * from "./sessionContext";
 export * from "./types/component";
+export * from "./types/fileTransfer";
 export * from "./types/message";
 export * from "./types/session";
 export * from "./useConnectorEndpoint";

packages/connectors-core/src/index.ts

@@ -68,7 +68,7 @@ export interface FileTransferCommitInput {
 }
 
 /**
- * Runtime transport supplied by a connector. The global UI transfer store only
+ * Runtime transport supplied by a connector. The host transfer store only
  * knows this interface and never owns connector sockets or credentials.
  */
 export interface FileTransferEndpoint {

ui/shared/file-transfer/types.ts …onnectors-core/src/types/fileTransfer.tsui/shared/file-transfer/types.ts renamed to packages/connectors-core/src/types/fileTransfer.ts ui/shared/file-transfer/types.ts renamed to packages/connectors-core/src/types/fileTransfer.ts

@@ -1,17 +1,17 @@
 <script setup lang="ts">
+import type { FileTransferConflictPolicy, FileTransferTask } from "@jumpserver/connectors-core";
 import type {
   SftpTransferBatchGroup as BatchGroup,
   SftpTransferTargetGroup as TargetGroup,
   SftpTransferTaskFilter as TaskFilter
 } from "#koko/composables/sftp/file-manager/transfer-center/useSftpTransferCenterSelectors";
-import type { FileTransferConflictPolicy, FileTransferTask } from "~/shared/file-transfer/types";
 import SftpTransferBatch from "#koko/components/FileManagement/transfer-center/SftpTransferBatch.vue";
 import {
   sftpTransferConflictError,
   sftpTransferTerminalStatuses,
   useSftpTransferCenterSelectors
 } from "#koko/composables/sftp/file-manager/transfer-center/useSftpTransferCenterSelectors";
-import { useFileTransferStore } from "~/store/modules/fileTransfer";
+import { useFileTransferStore } from "#koko/stores/fileTransfer";
 
 interface FlightPosition {
   id: number;

packages/koko/app/components/FileManagement/SftpTransferCenter.vue

@@ -1,11 +1,11 @@
 <script setup lang="ts">
+import type { FileTransferEndpoint, FileTransferEndpointRef } from "@jumpserver/connectors-core";
 import type { DropdownMenuItem } from "@nuxt/ui";
 import type {
   SftpTransferDropPayload,
   SftpTransferSourcePayload
 } from "#koko/composables/sftp/file-manager/workspaceTypes";
 import type { SftpFileEntry } from "#koko/composables/sftp/useSftpFileManager";
-import type { FileTransferEndpoint, FileTransferEndpointRef } from "~/shared/file-transfer/types";
 import { useDebounceFn } from "@vueuse/core";
 import SftpLocalPaneDialogs from "#koko/components/FileManagement/pane/SftpLocalPaneDialogs.vue";
 import SftpLocalPaneToolbar from "#koko/components/FileManagement/pane/SftpLocalPaneToolbar.vue";

packages/koko/app/components/FileManagement/localPane.vue

@@ -1,11 +1,14 @@
 <script setup lang="ts">
-import type { ConnectorSessionContext } from "@jumpserver/connectors-core";
+import type {
+  ConnectorSessionContext,
+  FileTransferEndpoint,
+  FileTransferEndpointRef
+} from "@jumpserver/connectors-core";
 import type {
   SftpTransferDropPayload,
   SftpTransferSourcePayload
 } from "#koko/composables/sftp/file-manager/workspaceTypes";
 import type { SftpFileEntry } from "#koko/composables/sftp/useSftpFileManager";
-import type { FileTransferEndpoint, FileTransferEndpointRef } from "~/shared/file-transfer/types";
 import SftpPaneContextMenu from "#koko/components/FileManagement/pane/SftpPaneContextMenu.vue";
 import SftpPaneDropOverlay from "#koko/components/FileManagement/pane/SftpPaneDropOverlay.vue";
 import SftpPaneFileTable from "#koko/components/FileManagement/pane/SftpPaneFileTable.vue";

packages/koko/app/components/FileManagement/pane.vue

@@ -1,10 +1,10 @@
 <script setup lang="ts">
+import type { FileTransferConflictPolicy, FileTransferTask } from "@jumpserver/connectors-core";
 import type {
   SftpTransferBatchGroup,
   SftpTransferTargetGroup
 } from "#koko/composables/sftp/file-manager/transfer-center/useSftpTransferCenterSelectors";
 import type { SftpTransferGroupStatus } from "#koko/utils/sftpTransferSummary";
-import type { FileTransferConflictPolicy, FileTransferTask } from "~/shared/file-transfer/types";
 import SftpTransferTarget from "#koko/components/FileManagement/transfer-center/SftpTransferTarget.vue";
 import {
   batchHasFailedTasks,

packages/koko/app/components/FileManagement/transfer-center/SftpTransferBatch.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { FileTransferTask } from "~/shared/file-transfer/types";
+import type { FileTransferTask } from "@jumpserver/connectors-core";
 import prettyBytes from "pretty-bytes";
 
 const props = defineProps<{