From 99f892ffc454028ec60ac537c4a68069035027e8 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Tue, 23 Jul 2024 08:14:45 -0400 Subject: [PATCH 1/6] Supporting verbatimModuleSyntax for the vue3 branch, add import type enforcement eslint rule. --- client/.eslintrc.js | 1 + 1 file changed, 1 insertion(+) diff --git a/client/.eslintrc.js b/client/.eslintrc.js index 8a7dd383bd66..3e93c8c624b1 100644 --- a/client/.eslintrc.js +++ b/client/.eslintrc.js @@ -134,6 +134,7 @@ module.exports = { "@typescript-eslint/ban-ts-comment": "warn", "@typescript-eslint/no-explicit-any": "warn", // TODO: re-enable this "@typescript-eslint/no-unused-vars": ["error", { argsIgnorePattern: "_.+", varsIgnorePattern: "_.+" }], + "@typescript-eslint/consistent-type-imports": "error", }, parser: "@typescript-eslint/parser", parserOptions: { From 317085cc54e1893bd32be7a6b039be6455c0aaa1 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Tue, 23 Jul 2024 08:28:04 -0400 Subject: [PATCH 2/6] Adjsut consistent-type-imports to use the inline style. --- client/.eslintrc.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/client/.eslintrc.js b/client/.eslintrc.js index 3e93c8c624b1..f384fd61fc2f 100644 --- a/client/.eslintrc.js +++ b/client/.eslintrc.js @@ -134,7 +134,10 @@ module.exports = { "@typescript-eslint/ban-ts-comment": "warn", "@typescript-eslint/no-explicit-any": "warn", // TODO: re-enable this "@typescript-eslint/no-unused-vars": ["error", { argsIgnorePattern: "_.+", varsIgnorePattern: "_.+" }], - "@typescript-eslint/consistent-type-imports": "error", + "@typescript-eslint/consistent-type-imports": [ + "error", + { prefer: "type-imports", fixStyle: "inline-type-imports" }, + ], }, parser: "@typescript-eslint/parser", parserOptions: { From f87e605f86de25c8c6b6629eb7e58d9d8d03fd46 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Tue, 23 Jul 2024 08:19:29 -0400 Subject: [PATCH 3/6] Apply import type fixes --- client/src/api/configTemplates.ts | 2 +- client/src/api/datasetCollections.ts | 2 +- client/src/api/datasets.ts | 6 +++--- client/src/api/groups.ts | 2 +- client/src/api/histories.archived.ts | 2 +- client/src/api/histories.export.ts | 3 +-- client/src/api/index.ts | 2 +- client/src/api/invocations.ts | 2 +- client/src/api/jobs.ts | 2 +- client/src/api/objectStores.ts | 2 +- client/src/api/remoteFiles.ts | 2 +- client/src/api/schema/__mocks__/fetcher.ts | 2 +- client/src/api/schema/fetcher.ts | 5 ++--- client/src/api/tags.ts | 2 +- client/src/api/workflows.ts | 2 +- .../components/Common/ExportRDMForm.test.ts | 4 ++-- .../src/components/Common/FilterMenu.test.ts | 2 +- ...PersistentTaskProgressMonitorAlert.test.ts | 4 ++-- .../Common/models/exportRecordModel.ts | 2 +- .../Common/models/testData/exportData.ts | 2 +- .../ConfigTemplates/InstanceForm.test.ts | 2 +- .../ConfigTemplates/formUtil.test.ts | 2 +- .../components/ConfigTemplates/formUtil.ts | 18 ++++++++--------- .../ConfigTemplates/test_fixtures.ts | 6 +++--- .../DatasetInformation.test.ts | 2 +- client/src/components/Datatypes/model.ts | 2 +- .../src/components/Datatypes/test_fixtures.ts | 3 +-- .../FileSources/Instances/instance.ts | 2 +- .../FileSources/Instances/services.ts | 2 +- .../FilesDialog/FilesDialog.test.ts | 7 +++---- .../src/components/FilesDialog/testingData.ts | 2 +- .../src/components/FilesDialog/utilities.ts | 4 ++-- .../FormSelectMany/FormSelectMany.test.ts | 4 ++-- .../Elements/FormSelectMany/useHighlight.ts | 2 +- .../worker/__mocks__/selectMany.ts | 2 +- .../FormSelectMany/worker/filterOptions.ts | 2 +- .../FormSelectMany/worker/selectMany.d.ts | 2 +- .../FormSelectMany/worker/selectManyMain.ts | 4 ++-- .../src/components/Grid/configs/adminForms.ts | 2 +- .../components/Grid/configs/adminGroups.ts | 2 +- .../components/Grid/configs/adminQuotas.ts | 2 +- .../src/components/Grid/configs/adminRoles.ts | 2 +- .../src/components/Grid/configs/adminUsers.ts | 4 ++-- .../src/components/Grid/configs/histories.ts | 2 +- .../Grid/configs/historiesPublished.ts | 2 +- .../Grid/configs/historiesShared.ts | 2 +- .../components/Grid/configs/invocations.ts | 4 ++-- .../Grid/configs/invocationsHistory.ts | 4 ++-- .../Grid/configs/invocationsWorkflow.ts | 4 ++-- client/src/components/Grid/configs/pages.ts | 2 +- .../components/Grid/configs/pagesPublished.ts | 2 +- client/src/components/Grid/configs/types.ts | 6 +++--- .../components/Grid/configs/visualizations.ts | 2 +- .../Grid/configs/visualizationsPublished.ts | 2 +- .../HistoryArchiveExportSelector.test.ts | 2 +- .../Archiving/HistoryArchiveWizard.test.ts | 2 +- .../Content/Dataset/DatasetDownload.test.ts | 4 ++-- .../History/Content/model/stateTypes.d.ts | 2 +- .../History/Content/model/states.ts | 2 +- .../HistoryOperations/SelectionStatus.test.ts | 2 +- .../History/Export/HistoryExport.test.ts | 4 ++-- .../JobParameters/JobParameters.test.ts | 2 +- .../Libraries/LibraryFolder/LibraryFolder.vue | 2 +- .../components/Login/ChangePassword.test.ts | 2 +- .../src/components/Login/RegisterForm.test.ts | 2 +- .../Markdown/Elements/handlesMappingJobs.ts | 2 +- .../Notifications/NotificationActions.test.ts | 4 ++-- .../components/Notifications/test-utils.ts | 12 +++++------ .../ObjectStore/Instances/CreateForm.test.ts | 4 ++-- .../ObjectStore/Instances/UpgradeForm.test.ts | 4 ++-- .../ObjectStore/Instances/instance.ts | 4 ++-- .../ObjectStore/Instances/services.ts | 2 +- .../components/ObjectStore/Instances/types.ts | 2 +- .../components/ObjectStore/Templates/types.ts | 2 +- client/src/components/ObjectStore/types.ts | 2 +- .../object-permission-composables.ts | 2 +- client/src/components/Popper/usePopper.ts | 3 +-- client/src/components/Tool/helpForumUrls.ts | 4 ++-- .../User/DiskUsage/DiskUsageSummary.test.ts | 2 +- .../Management/Cleanup/categories.ts | 2 +- .../Cleanup/model/CleanableSummary.ts | 2 +- .../Cleanup/model/CleanupCategory.ts | 2 +- .../Cleanup/model/CleanupOperation.ts | 6 +++--- .../Management/Cleanup/model/CleanupResult.ts | 4 ++-- .../User/DiskUsage/Quota/model/QuotaUsage.ts | 2 +- .../User/DiskUsage/Quota/services.ts | 2 +- .../Visualizations/Charts/BarChart.test.ts | 2 +- .../Visualizations/Charts/formatters.ts | 2 +- .../User/DiskUsage/Visualizations/util.ts | 2 +- .../Workflow/Editor/Actions/actions.test.ts | 2 +- .../Workflow/Editor/Actions/cloneStep.ts | 2 +- .../Workflow/Editor/Actions/commentActions.ts | 10 +++++----- .../Workflow/Editor/Actions/mockData.ts | 6 +++--- .../Workflow/Editor/Actions/stepActions.ts | 8 ++++---- .../Editor/Actions/workflowActions.ts | 6 +++--- .../Editor/Comments/WorkflowComment.test.ts | 4 ++-- .../Workflow/Editor/NodeOutput.test.ts | 2 +- .../Workflow/Editor/Tools/useToolLogic.ts | 2 +- .../Workflow/Editor/composables/d3Zoom.ts | 7 +++---- .../Editor/composables/multiSelect.ts | 2 +- .../Editor/composables/relativePosition.ts | 2 +- .../composables/useDefaultStepPosition.ts | 6 +++--- .../Editor/composables/useNodePosition.ts | 2 +- .../Editor/composables/useStepProps.ts | 2 +- .../Editor/composables/useTerminal.ts | 4 ++-- .../Editor/composables/useUniqueLabelError.ts | 2 +- .../Editor/composables/viewportBoundingBox.ts | 2 +- .../Workflow/Editor/modules/canvasDraw.ts | 14 ++++++------- .../Workflow/Editor/modules/layout.ts | 2 +- .../Workflow/Editor/modules/linting.ts | 8 ++++---- .../Workflow/Editor/modules/parameters.ts | 2 +- .../Workflow/Editor/modules/terminals.test.ts | 8 +++++++- .../Workflow/Editor/modules/terminals.ts | 20 +++++++++---------- .../Workflow/Editor/modules/zoomLevels.ts | 2 +- .../Workflow/Editor/test_fixtures.ts | 4 ++-- .../Export/InvocationExportPluginCard.test.ts | 2 +- .../BioComputeObjectExportPlugin.ts | 2 +- .../Export/Plugins/DefaultFileExportPlugin.ts | 2 +- .../Export/Plugins/ROCrateExportPlugin.ts | 2 +- .../Workflow/Invocation/Export/model.ts | 4 ++-- .../src/components/Workflow/redirectPath.ts | 2 +- .../WorkflowInvocationState.test.ts | 2 +- .../WorkflowInvocationState/util.ts | 2 +- .../Notifications/BroadcastsList.test.ts | 2 +- .../Notifications/NotificationForm.test.ts | 2 +- client/src/composables/datasetPermissions.ts | 5 ++--- client/src/composables/datatypes.ts | 3 +-- client/src/composables/datatypesMapper.ts | 5 ++--- client/src/composables/fileSources.ts | 2 +- client/src/composables/filter/filter.d.ts | 4 ++-- client/src/composables/hashedUserId.ts | 2 +- client/src/composables/keyedCache.ts | 4 ++-- .../persistentProgressMonitor.test.ts | 6 +++--- .../composables/persistentProgressMonitor.ts | 2 +- client/src/composables/route.ts | 2 +- .../sensors/animationFrameResizeObserver.ts | 3 +-- .../sensors/animationFrameScroll.ts | 3 +-- client/src/composables/shortTermStorage.ts | 2 +- client/src/composables/toast.ts | 3 ++- client/src/composables/useActiveElement.ts | 2 +- client/src/composables/useInvocationGraph.ts | 4 ++-- client/src/composables/userLocalStorage.ts | 2 +- client/src/stores/broadcastsStore.ts | 2 +- .../stores/collectionAttributesStore.test.ts | 2 +- .../src/stores/collectionAttributesStore.ts | 2 +- .../stores/collectionElementsStore.test.ts | 4 ++-- client/src/stores/collectionElementsStore.ts | 3 +-- client/src/stores/configTemplatesUtil.ts | 2 +- client/src/stores/datasetExtraFilesStore.ts | 2 +- client/src/stores/datasetStore.ts | 2 +- client/src/stores/datatypesMapperStore.ts | 2 +- client/src/stores/fileSourceInstancesStore.ts | 2 +- client/src/stores/fileSourceTemplatesStore.ts | 2 +- client/src/stores/historyItemsStore.ts | 2 +- client/src/stores/historyStore.ts | 12 +++++------ client/src/stores/notificationsStore.ts | 4 +++- .../src/stores/objectStoreInstancesStore.ts | 2 +- client/src/stores/objectStoreStore.ts | 2 +- .../src/stores/objectStoreTemplatesStore.ts | 2 +- client/src/stores/toolStore.ts | 4 ++-- client/src/stores/undoRedoStore/index.ts | 2 +- client/src/stores/userStore.ts | 2 +- .../stores/workflowConnectionStore.test.ts | 12 +++++++---- .../stores/workflowEditorCommentStore.test.ts | 4 ++-- .../src/stores/workflowEditorCommentStore.ts | 6 +++--- client/src/stores/workflowEditorStateStore.ts | 7 +++---- .../src/stores/workflowEditorToolbarStore.ts | 4 ++-- client/src/stores/workflowStepStore.test.ts | 3 +-- client/src/stores/workflowStepStore.ts | 2 +- client/src/stores/workflowStore.ts | 2 +- client/src/utils/filtering.ts | 2 +- client/src/utils/navigation/schema.ts | 3 +-- 172 files changed, 286 insertions(+), 288 deletions(-) diff --git a/client/src/api/configTemplates.ts b/client/src/api/configTemplates.ts index 16c4369c4589..b3060169b736 100644 --- a/client/src/api/configTemplates.ts +++ b/client/src/api/configTemplates.ts @@ -1,4 +1,4 @@ -import type { components } from "@/api/schema/schema"; +import { type components } from "@/api/schema/schema"; export type Instance = | components["schemas"]["UserFileSourceModel"] diff --git a/client/src/api/datasetCollections.ts b/client/src/api/datasetCollections.ts index 2c6ee67c3c6a..bc788a35f030 100644 --- a/client/src/api/datasetCollections.ts +++ b/client/src/api/datasetCollections.ts @@ -1,4 +1,4 @@ -import { CollectionEntry, DCESummary, HDCADetailed, HDCASummary, isHDCA } from "@/api"; +import { type CollectionEntry, type DCESummary, type HDCADetailed, type HDCASummary, isHDCA } from "@/api"; import { fetcher } from "@/api/schema"; const DEFAULT_LIMIT = 50; diff --git a/client/src/api/datasets.ts b/client/src/api/datasets.ts index c6096ea18f65..c6f4e8a9465a 100644 --- a/client/src/api/datasets.ts +++ b/client/src/api/datasets.ts @@ -1,8 +1,8 @@ import axios from "axios"; -import type { FetchArgType } from "openapi-typescript-fetch"; +import { type FetchArgType } from "openapi-typescript-fetch"; -import { HDADetailed } from "@/api"; -import { components, fetcher } from "@/api/schema"; +import { type HDADetailed } from "@/api"; +import { type components, fetcher } from "@/api/schema"; import { withPrefix } from "@/utils/redirect"; export const datasetsFetcher = fetcher.path("/api/datasets").method("get").create(); diff --git a/client/src/api/groups.ts b/client/src/api/groups.ts index e795ccfdbf47..6def92076885 100644 --- a/client/src/api/groups.ts +++ b/client/src/api/groups.ts @@ -1,6 +1,6 @@ import axios from "axios"; -import { components, fetcher } from "@/api/schema"; +import { type components, fetcher } from "@/api/schema"; type GroupModel = components["schemas"]["GroupModel"]; export async function getAllGroups(): Promise { diff --git a/client/src/api/histories.archived.ts b/client/src/api/histories.archived.ts index 518ab55a72a7..9109c2d97e95 100644 --- a/client/src/api/histories.archived.ts +++ b/client/src/api/histories.archived.ts @@ -1,4 +1,4 @@ -import type { FetchArgType } from "openapi-typescript-fetch"; +import { type FetchArgType } from "openapi-typescript-fetch"; import { type components, fetcher } from "@/api/schema"; diff --git a/client/src/api/histories.export.ts b/client/src/api/histories.export.ts index 8a8e11f6a8be..40d19f026077 100644 --- a/client/src/api/histories.export.ts +++ b/client/src/api/histories.export.ts @@ -1,5 +1,4 @@ -import type { components } from "@/api/schema"; -import { fetcher } from "@/api/schema"; +import { type components, fetcher } from "@/api/schema"; import { type ExportRecord, ExportRecordModel, diff --git a/client/src/api/index.ts b/client/src/api/index.ts index 718fa099a45a..b27d9746a0f3 100644 --- a/client/src/api/index.ts +++ b/client/src/api/index.ts @@ -1,6 +1,6 @@ /** Contains type alias and definitions related to Galaxy API models. */ -import { components } from "@/api/schema"; +import { type components } from "@/api/schema"; /** * Contains minimal information about a History. diff --git a/client/src/api/invocations.ts b/client/src/api/invocations.ts index 2196f9a9254e..22a7c7854c0d 100644 --- a/client/src/api/invocations.ts +++ b/client/src/api/invocations.ts @@ -2,7 +2,7 @@ import axios from "axios"; import { getAppRoot } from "@/onload"; -import { ApiResponse, components, fetcher } from "./schema"; +import { type ApiResponse, type components, fetcher } from "./schema"; export type WorkflowInvocationElementView = components["schemas"]["WorkflowInvocationElementView"]; export type WorkflowInvocationCollectionView = components["schemas"]["WorkflowInvocationCollectionView"]; diff --git a/client/src/api/jobs.ts b/client/src/api/jobs.ts index 289a440e0fd9..ccc4023e9e66 100644 --- a/client/src/api/jobs.ts +++ b/client/src/api/jobs.ts @@ -1,4 +1,4 @@ -import { components, fetcher } from "@/api/schema"; +import { type components, fetcher } from "@/api/schema"; export type JobDestinationParams = components["schemas"]["JobDestinationParams"]; diff --git a/client/src/api/objectStores.ts b/client/src/api/objectStores.ts index b6c1f6c59f7d..8380b03e3086 100644 --- a/client/src/api/objectStores.ts +++ b/client/src/api/objectStores.ts @@ -1,5 +1,5 @@ import { fetcher } from "@/api/schema"; -import type { components } from "@/api/schema/schema"; +import { type components } from "@/api/schema/schema"; export type UserConcreteObjectStore = components["schemas"]["UserConcreteObjectStoreModel"]; diff --git a/client/src/api/remoteFiles.ts b/client/src/api/remoteFiles.ts index ff149655c037..b9efeeb3eb6c 100644 --- a/client/src/api/remoteFiles.ts +++ b/client/src/api/remoteFiles.ts @@ -1,4 +1,4 @@ -import type { components } from "@/api/schema"; +import { type components } from "@/api/schema"; import { fetcher } from "@/api/schema/fetcher"; /** The browsing mode: diff --git a/client/src/api/schema/__mocks__/fetcher.ts b/client/src/api/schema/__mocks__/fetcher.ts index 56c8a56ed3ef..ffb5b7e2fd1a 100644 --- a/client/src/api/schema/__mocks__/fetcher.ts +++ b/client/src/api/schema/__mocks__/fetcher.ts @@ -1,4 +1,4 @@ -import type { paths } from "@/api/schema"; +import { type paths } from "@/api/schema"; jest.mock("@/api/schema", () => ({ fetcher: mockFetcher, diff --git a/client/src/api/schema/fetcher.ts b/client/src/api/schema/fetcher.ts index bb60436dd4f3..61599f4d2a8b 100644 --- a/client/src/api/schema/fetcher.ts +++ b/client/src/api/schema/fetcher.ts @@ -1,10 +1,9 @@ -import type { ApiResponse, Middleware } from "openapi-typescript-fetch"; -import { Fetcher } from "openapi-typescript-fetch"; +import { ApiResponse, Fetcher, type Middleware } from "openapi-typescript-fetch"; import { getAppRoot } from "@/onload/loadConfig"; import { rethrowSimple } from "@/utils/simple-error"; -import type { paths } from "./schema"; +import { type paths } from "./schema"; export { ApiResponse }; diff --git a/client/src/api/tags.ts b/client/src/api/tags.ts index fe68ca0da137..34e9c70b8d36 100644 --- a/client/src/api/tags.ts +++ b/client/src/api/tags.ts @@ -1,4 +1,4 @@ -import { components, fetcher } from "@/api/schema"; +import { type components, fetcher } from "@/api/schema"; type TaggableItemClass = components["schemas"]["TaggableItemClass"]; diff --git a/client/src/api/workflows.ts b/client/src/api/workflows.ts index d040f139cdfc..4d676cefcc94 100644 --- a/client/src/api/workflows.ts +++ b/client/src/api/workflows.ts @@ -1,4 +1,4 @@ -import { components, fetcher } from "@/api/schema"; +import { type components, fetcher } from "@/api/schema"; export type StoredWorkflowDetailed = components["schemas"]["StoredWorkflowDetailed"]; diff --git a/client/src/components/Common/ExportRDMForm.test.ts b/client/src/components/Common/ExportRDMForm.test.ts index 1f53d7cc1a99..ed0bfd1c38f1 100644 --- a/client/src/components/Common/ExportRDMForm.test.ts +++ b/client/src/components/Common/ExportRDMForm.test.ts @@ -1,8 +1,8 @@ import { getLocalVue } from "@tests/jest/helpers"; -import { mount, Wrapper } from "@vue/test-utils"; +import { mount, type Wrapper } from "@vue/test-utils"; import flushPromises from "flush-promises"; -import { type BrowsableFilesSourcePlugin, CreatedEntry } from "@/api/remoteFiles"; +import { type BrowsableFilesSourcePlugin, type CreatedEntry } from "@/api/remoteFiles"; import { mockFetcher } from "@/api/schema/__mocks__"; import ExportRDMForm from "./ExportRDMForm.vue"; diff --git a/client/src/components/Common/FilterMenu.test.ts b/client/src/components/Common/FilterMenu.test.ts index ee14d18a73d3..bab978663fcb 100644 --- a/client/src/components/Common/FilterMenu.test.ts +++ b/client/src/components/Common/FilterMenu.test.ts @@ -1,6 +1,6 @@ import { createTestingPinia } from "@pinia/testing"; import { getLocalVue } from "@tests/jest/helpers"; -import { mount, Wrapper } from "@vue/test-utils"; +import { mount, type Wrapper } from "@vue/test-utils"; import { HistoryFilters } from "@/components/History/HistoryFilters"; import { WorkflowFilters } from "@/components/Workflow/List/WorkflowFilters"; diff --git a/client/src/components/Common/PersistentTaskProgressMonitorAlert.test.ts b/client/src/components/Common/PersistentTaskProgressMonitorAlert.test.ts index f9e63f915c39..5a956d4888c2 100644 --- a/client/src/components/Common/PersistentTaskProgressMonitorAlert.test.ts +++ b/client/src/components/Common/PersistentTaskProgressMonitorAlert.test.ts @@ -1,10 +1,10 @@ import { shallowMount } from "@vue/test-utils"; import { type PropType, ref } from "vue"; -import { TaskMonitor } from "@/composables/genericTaskMonitor"; +import { type TaskMonitor } from "@/composables/genericTaskMonitor"; import { type MonitoringData, - MonitoringRequest, + type MonitoringRequest, usePersistentProgressTaskMonitor, } from "@/composables/persistentProgressMonitor"; diff --git a/client/src/components/Common/models/exportRecordModel.ts b/client/src/components/Common/models/exportRecordModel.ts index 2b02536fbfee..2e008237f594 100644 --- a/client/src/components/Common/models/exportRecordModel.ts +++ b/client/src/components/Common/models/exportRecordModel.ts @@ -1,6 +1,6 @@ import { formatDistanceToNow, parseISO } from "date-fns"; -import type { components } from "@/api/schema"; +import { type components } from "@/api/schema"; type ExportObjectRequestMetadata = components["schemas"]["ExportObjectRequestMetadata"]; diff --git a/client/src/components/Common/models/testData/exportData.ts b/client/src/components/Common/models/testData/exportData.ts index 665e51b70e94..22aa78bd9079 100644 --- a/client/src/components/Common/models/testData/exportData.ts +++ b/client/src/components/Common/models/testData/exportData.ts @@ -1,4 +1,4 @@ -import type { components } from "@/api/schema"; +import { type components } from "@/api/schema"; import { ExportRecordModel } from "@/components/Common/models/exportRecordModel"; type ObjectExportTaskResponse = components["schemas"]["ObjectExportTaskResponse"]; diff --git a/client/src/components/ConfigTemplates/InstanceForm.test.ts b/client/src/components/ConfigTemplates/InstanceForm.test.ts index 30189e068d54..f11499ae445c 100644 --- a/client/src/components/ConfigTemplates/InstanceForm.test.ts +++ b/client/src/components/ConfigTemplates/InstanceForm.test.ts @@ -1,7 +1,7 @@ import { shallowMount } from "@vue/test-utils"; import { getLocalVue } from "tests/jest/helpers"; -import { FormEntry } from "./formUtil"; +import { type FormEntry } from "./formUtil"; import InstanceForm from "./InstanceForm.vue"; diff --git a/client/src/components/ConfigTemplates/formUtil.test.ts b/client/src/components/ConfigTemplates/formUtil.test.ts index e95caf3d95f5..dd5b412d30ea 100644 --- a/client/src/components/ConfigTemplates/formUtil.test.ts +++ b/client/src/components/ConfigTemplates/formUtil.test.ts @@ -1,4 +1,4 @@ -import { TemplateVariable } from "@/api/configTemplates"; +import { type TemplateVariable } from "@/api/configTemplates"; import { createTemplateForm, templateVariableFormEntry, upgradeForm } from "./formUtil"; import { diff --git a/client/src/components/ConfigTemplates/formUtil.ts b/client/src/components/ConfigTemplates/formUtil.ts index 2fa06a8abb2a..bf7479ff92b8 100644 --- a/client/src/components/ConfigTemplates/formUtil.ts +++ b/client/src/components/ConfigTemplates/formUtil.ts @@ -1,12 +1,12 @@ -import type { - Instance, - PluginStatus, - SecretData, - TemplateSecret, - TemplateSummary, - TemplateVariable, - VariableData, - VariableValueType, +import { + type Instance, + type PluginStatus, + type SecretData, + type TemplateSecret, + type TemplateSummary, + type TemplateVariable, + type VariableData, + type VariableValueType, } from "@/api/configTemplates"; import { markup } from "@/components/ObjectStore/configurationMarkdown"; diff --git a/client/src/components/ConfigTemplates/test_fixtures.ts b/client/src/components/ConfigTemplates/test_fixtures.ts index f29e8d5bd598..eefa29a90f61 100644 --- a/client/src/components/ConfigTemplates/test_fixtures.ts +++ b/client/src/components/ConfigTemplates/test_fixtures.ts @@ -1,6 +1,6 @@ -import type { FileSourceTemplateSummary } from "@/api/fileSources"; -import type { UserConcreteObjectStore } from "@/components/ObjectStore/Instances/types"; -import type { ObjectStoreTemplateSummary } from "@/components/ObjectStore/Templates/types"; +import { type FileSourceTemplateSummary } from "@/api/fileSources"; +import { type UserConcreteObjectStore } from "@/components/ObjectStore/Instances/types"; +import { type ObjectStoreTemplateSummary } from "@/components/ObjectStore/Templates/types"; export const STANDARD_OBJECT_STORE_TEMPLATE: ObjectStoreTemplateSummary = { type: "aws_s3", diff --git a/client/src/components/DatasetInformation/DatasetInformation.test.ts b/client/src/components/DatasetInformation/DatasetInformation.test.ts index 1ef0379d7ae8..74964e8034e7 100644 --- a/client/src/components/DatasetInformation/DatasetInformation.test.ts +++ b/client/src/components/DatasetInformation/DatasetInformation.test.ts @@ -1,5 +1,5 @@ import { getLocalVue } from "@tests/jest/helpers"; -import { mount, Wrapper } from "@vue/test-utils"; +import { mount, type Wrapper } from "@vue/test-utils"; import axios from "axios"; import MockAdapter from "axios-mock-adapter"; import { format, parseISO } from "date-fns"; diff --git a/client/src/components/Datatypes/model.ts b/client/src/components/Datatypes/model.ts index 797d0349e199..77826b73fc13 100644 --- a/client/src/components/Datatypes/model.ts +++ b/client/src/components/Datatypes/model.ts @@ -1,4 +1,4 @@ -import type { components } from "@/api/schema"; +import { type components } from "@/api/schema"; export type DatatypesCombinedMap = components["schemas"]["DatatypesCombinedMap"]; diff --git a/client/src/components/Datatypes/test_fixtures.ts b/client/src/components/Datatypes/test_fixtures.ts index f8f1e9f2c5f7..803954b132dc 100644 --- a/client/src/components/Datatypes/test_fixtures.ts +++ b/client/src/components/Datatypes/test_fixtures.ts @@ -2,8 +2,7 @@ import DatatypesJson from "@tests/test-data/json/datatypes.json"; import DatatypesMappingJson from "@tests/test-data/json/datatypes.mapping.json"; -import type { DatatypesCombinedMap } from "./model"; -import { DatatypesMapperModel } from "./model"; +import { type DatatypesCombinedMap, DatatypesMapperModel } from "./model"; export const typesAndMappingResponse: DatatypesCombinedMap = { datatypes: DatatypesJson, diff --git a/client/src/components/FileSources/Instances/instance.ts b/client/src/components/FileSources/Instances/instance.ts index 26755846ae53..b5e656853963 100644 --- a/client/src/components/FileSources/Instances/instance.ts +++ b/client/src/components/FileSources/Instances/instance.ts @@ -1,6 +1,6 @@ import { computed, type Ref } from "vue"; -import type { FileSourceTemplateSummary, UserFileSourceModel } from "@/api/fileSources"; +import { type FileSourceTemplateSummary, type UserFileSourceModel } from "@/api/fileSources"; import { useFileSourceInstancesStore } from "@/stores/fileSourceInstancesStore"; import { useFileSourceTemplatesStore } from "@/stores/fileSourceTemplatesStore"; diff --git a/client/src/components/FileSources/Instances/services.ts b/client/src/components/FileSources/Instances/services.ts index 357e792f9f22..11b122bfb037 100644 --- a/client/src/components/FileSources/Instances/services.ts +++ b/client/src/components/FileSources/Instances/services.ts @@ -1,4 +1,4 @@ -import type { UserFileSourceModel } from "@/api/fileSources"; +import { type UserFileSourceModel } from "@/api/fileSources"; import { fetcher } from "@/api/schema/fetcher"; export const create = fetcher.path("/api/file_source_instances").method("post").create(); diff --git a/client/src/components/FilesDialog/FilesDialog.test.ts b/client/src/components/FilesDialog/FilesDialog.test.ts index d826f977a5aa..29fe22e8129e 100644 --- a/client/src/components/FilesDialog/FilesDialog.test.ts +++ b/client/src/components/FilesDialog/FilesDialog.test.ts @@ -1,11 +1,10 @@ import { createTestingPinia } from "@pinia/testing"; -import { mount, Wrapper } from "@vue/test-utils"; +import { mount, type Wrapper } from "@vue/test-utils"; import flushPromises from "flush-promises"; import { getLocalVue } from "tests/jest/helpers"; import { mockFetcher } from "@/api/schema/__mocks__"; -import type { SelectionItem } from "@/components/SelectionDialog/selectionTypes"; -import { SELECTION_STATES } from "@/components/SelectionDialog/selectionTypes"; +import { SELECTION_STATES, type SelectionItem } from "@/components/SelectionDialog/selectionTypes"; /** * The following imports mock a remote file resource directory structure, @@ -27,6 +26,7 @@ import { SELECTION_STATES } from "@/components/SelectionDialog/selectionTypes"; * |-- file1 * |-- file2 */ +import { type RemoteFilesList } from "./testingData"; import { directory1RecursiveResponse, directory1Response, @@ -34,7 +34,6 @@ import { directoryId, ftpId, pdbResponse, - RemoteFilesList, rootId, rootResponse, someErrorText, diff --git a/client/src/components/FilesDialog/testingData.ts b/client/src/components/FilesDialog/testingData.ts index ab943342238e..6ccb350675f3 100644 --- a/client/src/components/FilesDialog/testingData.ts +++ b/client/src/components/FilesDialog/testingData.ts @@ -1,4 +1,4 @@ -import { BrowsableFilesSourcePlugin } from "@/api/remoteFiles"; +import { type BrowsableFilesSourcePlugin } from "@/api/remoteFiles"; export const ftpId = "_ftp"; export const rootId = "pdb-gzip"; diff --git a/client/src/components/FilesDialog/utilities.ts b/client/src/components/FilesDialog/utilities.ts index 68f1dfd76eac..f300d10349c6 100644 --- a/client/src/components/FilesDialog/utilities.ts +++ b/client/src/components/FilesDialog/utilities.ts @@ -1,6 +1,6 @@ -import type { BrowsableFilesSourcePlugin } from "@/api/remoteFiles"; +import { type BrowsableFilesSourcePlugin } from "@/api/remoteFiles"; -import type { SelectionItem } from "../SelectionDialog/selectionTypes"; +import { type SelectionItem } from "../SelectionDialog/selectionTypes"; export const isSubPath = (originPath: string, destinationPath: string) => { return subPathCondition(ensureTrailingSlash(originPath), ensureTrailingSlash(destinationPath)); diff --git a/client/src/components/Form/Elements/FormSelectMany/FormSelectMany.test.ts b/client/src/components/Form/Elements/FormSelectMany/FormSelectMany.test.ts index 12f36bdf55ef..1f59b74a2b85 100644 --- a/client/src/components/Form/Elements/FormSelectMany/FormSelectMany.test.ts +++ b/client/src/components/Form/Elements/FormSelectMany/FormSelectMany.test.ts @@ -3,9 +3,9 @@ import "./worker/__mocks__/selectMany"; import { createTestingPinia } from "@pinia/testing"; import { getLocalVue } from "@tests/jest/helpers"; import { mount } from "@vue/test-utils"; -import { PropType } from "vue"; +import { type PropType } from "vue"; -import type { SelectOption } from "./worker/selectMany"; +import { type SelectOption } from "./worker/selectMany"; import FormSelectMany from "./FormSelectMany.vue"; diff --git a/client/src/components/Form/Elements/FormSelectMany/useHighlight.ts b/client/src/components/Form/Elements/FormSelectMany/useHighlight.ts index 8feb91eef706..c2c576e7601d 100644 --- a/client/src/components/Form/Elements/FormSelectMany/useHighlight.ts +++ b/client/src/components/Form/Elements/FormSelectMany/useHighlight.ts @@ -2,7 +2,7 @@ import { type Ref, ref, watch } from "vue"; import { assertDefined } from "@/utils/assertions"; -import type { SelectOption } from "./worker/selectMany"; +import { type SelectOption } from "./worker/selectMany"; /** * Handles logic required for highlighting options diff --git a/client/src/components/Form/Elements/FormSelectMany/worker/__mocks__/selectMany.ts b/client/src/components/Form/Elements/FormSelectMany/worker/__mocks__/selectMany.ts index d040fb824da8..a635e2bb63aa 100644 --- a/client/src/components/Form/Elements/FormSelectMany/worker/__mocks__/selectMany.ts +++ b/client/src/components/Form/Elements/FormSelectMany/worker/__mocks__/selectMany.ts @@ -1,6 +1,6 @@ import { reactive, ref, watch } from "vue"; -import type { SelectOption, useSelectMany as UseSelectMany } from "../selectMany"; +import { type SelectOption, type useSelectMany as UseSelectMany } from "../selectMany"; import { main } from "../selectManyMain"; jest.mock("@/components/Form/Elements/FormSelectMany/worker/selectMany", () => ({ diff --git a/client/src/components/Form/Elements/FormSelectMany/worker/filterOptions.ts b/client/src/components/Form/Elements/FormSelectMany/worker/filterOptions.ts index 6c3c26f3a38c..add5e9bb244d 100644 --- a/client/src/components/Form/Elements/FormSelectMany/worker/filterOptions.ts +++ b/client/src/components/Form/Elements/FormSelectMany/worker/filterOptions.ts @@ -1,4 +1,4 @@ -import { SelectOption } from "./selectMany"; +import { type SelectOption } from "./selectMany"; export function filterOptions(options: SelectOption[], filter: string | RegExp, caseSensitive: boolean) { let filteredSelectOptions; diff --git a/client/src/components/Form/Elements/FormSelectMany/worker/selectMany.d.ts b/client/src/components/Form/Elements/FormSelectMany/worker/selectMany.d.ts index 3f3ebf146dde..c81eeb97e348 100644 --- a/client/src/components/Form/Elements/FormSelectMany/worker/selectMany.d.ts +++ b/client/src/components/Form/Elements/FormSelectMany/worker/selectMany.d.ts @@ -1,4 +1,4 @@ -import type { Ref } from "vue"; +import { type Ref } from "vue"; export type SelectValue = Record | string | number | null; diff --git a/client/src/components/Form/Elements/FormSelectMany/worker/selectManyMain.ts b/client/src/components/Form/Elements/FormSelectMany/worker/selectManyMain.ts index 0a35d9e04223..83e818ced7fa 100644 --- a/client/src/components/Form/Elements/FormSelectMany/worker/selectManyMain.ts +++ b/client/src/components/Form/Elements/FormSelectMany/worker/selectManyMain.ts @@ -1,7 +1,7 @@ -import type { UnwrapNestedRefs } from "vue"; +import { type UnwrapNestedRefs } from "vue"; import { filterOptions } from "./filterOptions"; -import type { SelectOption, SelectValue, UseSelectManyOptions, UseSelectManyReturn } from "./selectMany"; +import { type SelectOption, type SelectValue, type UseSelectManyOptions, type UseSelectManyReturn } from "./selectMany"; export function main(options: UnwrapNestedRefs): UnwrapNestedRefs { const unselectedOptionsFiltered: SelectOption[] = []; diff --git a/client/src/components/Grid/configs/adminForms.ts b/client/src/components/Grid/configs/adminForms.ts index a94e16fc308d..6288c78faba0 100644 --- a/client/src/components/Grid/configs/adminForms.ts +++ b/client/src/components/Grid/configs/adminForms.ts @@ -8,7 +8,7 @@ import _l from "@/utils/localization"; import { withPrefix } from "@/utils/redirect"; import { errorMessageAsString } from "@/utils/simple-error"; -import type { ActionArray, FieldArray, GridConfig } from "./types"; +import { type ActionArray, type FieldArray, type GridConfig } from "./types"; const { emit } = useEventBus("grid-router-push"); diff --git a/client/src/components/Grid/configs/adminGroups.ts b/client/src/components/Grid/configs/adminGroups.ts index e4f143d997b0..5b0df57c2c2d 100644 --- a/client/src/components/Grid/configs/adminGroups.ts +++ b/client/src/components/Grid/configs/adminGroups.ts @@ -8,7 +8,7 @@ import _l from "@/utils/localization"; import { withPrefix } from "@/utils/redirect"; import { errorMessageAsString } from "@/utils/simple-error"; -import type { ActionArray, FieldArray, GridConfig } from "./types"; +import { type ActionArray, type FieldArray, type GridConfig } from "./types"; const { emit } = useEventBus("grid-router-push"); diff --git a/client/src/components/Grid/configs/adminQuotas.ts b/client/src/components/Grid/configs/adminQuotas.ts index 67f0d6162fac..8b3b31fd81bb 100644 --- a/client/src/components/Grid/configs/adminQuotas.ts +++ b/client/src/components/Grid/configs/adminQuotas.ts @@ -8,7 +8,7 @@ import _l from "@/utils/localization"; import { withPrefix } from "@/utils/redirect"; import { errorMessageAsString } from "@/utils/simple-error"; -import type { ActionArray, FieldArray, GridConfig } from "./types"; +import { type ActionArray, type FieldArray, type GridConfig } from "./types"; const { emit } = useEventBus("grid-router-push"); diff --git a/client/src/components/Grid/configs/adminRoles.ts b/client/src/components/Grid/configs/adminRoles.ts index fe913e7fc41e..9e8946ddc46a 100644 --- a/client/src/components/Grid/configs/adminRoles.ts +++ b/client/src/components/Grid/configs/adminRoles.ts @@ -8,7 +8,7 @@ import _l from "@/utils/localization"; import { withPrefix } from "@/utils/redirect"; import { errorMessageAsString } from "@/utils/simple-error"; -import type { ActionArray, FieldArray, GridConfig } from "./types"; +import { type ActionArray, type FieldArray, type GridConfig } from "./types"; const { emit } = useEventBus("grid-router-push"); diff --git a/client/src/components/Grid/configs/adminUsers.ts b/client/src/components/Grid/configs/adminUsers.ts index 50accb257125..03e92bb7d218 100644 --- a/client/src/components/Grid/configs/adminUsers.ts +++ b/client/src/components/Grid/configs/adminUsers.ts @@ -15,13 +15,13 @@ import { useEventBus } from "@vueuse/core"; import axios from "axios"; import { createApiKey, deleteUser, recalculateDiskUsageByUserId, sendActivationEmail, undeleteUser } from "@/api/users"; -import type { GalaxyConfiguration } from "@/stores/configurationStore"; +import { type GalaxyConfiguration } from "@/stores/configurationStore"; import Filtering, { contains, equals, toBool, type ValidFilter } from "@/utils/filtering"; import _l from "@/utils/localization"; import { withPrefix } from "@/utils/redirect"; import { errorMessageAsString } from "@/utils/simple-error"; -import type { ActionArray, FieldArray, GridConfig } from "./types"; +import { type ActionArray, type FieldArray, type GridConfig } from "./types"; const { emit } = useEventBus("grid-router-push"); diff --git a/client/src/components/Grid/configs/histories.ts b/client/src/components/Grid/configs/histories.ts index 70a865c21f1e..2c34d2b5a7e3 100644 --- a/client/src/components/Grid/configs/histories.ts +++ b/client/src/components/Grid/configs/histories.ts @@ -17,7 +17,7 @@ import Filtering, { contains, equals, expandNameTag, toBool, type ValidFilter } import _l from "@/utils/localization"; import { errorMessageAsString, rethrowSimple } from "@/utils/simple-error"; -import type { ActionArray, BatchOperationArray, FieldArray, GridConfig } from "./types"; +import { type ActionArray, type BatchOperationArray, type FieldArray, type GridConfig } from "./types"; const { emit } = useEventBus("grid-router-push"); diff --git a/client/src/components/Grid/configs/historiesPublished.ts b/client/src/components/Grid/configs/historiesPublished.ts index 5abfd9a388dd..6e0d95a54bcc 100644 --- a/client/src/components/Grid/configs/historiesPublished.ts +++ b/client/src/components/Grid/configs/historiesPublished.ts @@ -5,7 +5,7 @@ import { historiesFetcher } from "@/api/histories"; import Filtering, { contains, expandNameTag, type ValidFilter } from "@/utils/filtering"; import _l from "@/utils/localization"; -import type { FieldArray, GridConfig } from "./types"; +import { type FieldArray, type GridConfig } from "./types"; const { emit } = useEventBus("grid-router-push"); diff --git a/client/src/components/Grid/configs/historiesShared.ts b/client/src/components/Grid/configs/historiesShared.ts index d045f5279bc7..83fbd70b4f54 100644 --- a/client/src/components/Grid/configs/historiesShared.ts +++ b/client/src/components/Grid/configs/historiesShared.ts @@ -7,7 +7,7 @@ import Filtering, { contains, expandNameTag, type ValidFilter } from "@/utils/fi import _l from "@/utils/localization"; import { rethrowSimple } from "@/utils/simple-error"; -import type { FieldArray, GridConfig } from "./types"; +import { type FieldArray, type GridConfig } from "./types"; const { emit } = useEventBus("grid-router-push"); diff --git a/client/src/components/Grid/configs/invocations.ts b/client/src/components/Grid/configs/invocations.ts index f81b1be2d8ce..93d2ccb061a2 100644 --- a/client/src/components/Grid/configs/invocations.ts +++ b/client/src/components/Grid/configs/invocations.ts @@ -2,12 +2,12 @@ import { faPlay, faPlus } from "@fortawesome/free-solid-svg-icons"; import { useEventBus } from "@vueuse/core"; import { invocationsFetcher, type WorkflowInvocation } from "@/api/invocations"; -import type { StoredWorkflowDetailed } from "@/api/workflows"; +import { type StoredWorkflowDetailed } from "@/api/workflows"; import { useHistoryStore } from "@/stores/historyStore"; import { useWorkflowStore } from "@/stores/workflowStore"; import _l from "@/utils/localization"; -import type { ActionArray, FieldArray, GridConfig } from "./types"; +import { type ActionArray, type FieldArray, type GridConfig } from "./types"; const { emit } = useEventBus("grid-router-push"); diff --git a/client/src/components/Grid/configs/invocationsHistory.ts b/client/src/components/Grid/configs/invocationsHistory.ts index 0369b01193f4..ec3b4e9e1c00 100644 --- a/client/src/components/Grid/configs/invocationsHistory.ts +++ b/client/src/components/Grid/configs/invocationsHistory.ts @@ -2,12 +2,12 @@ import { faArrowLeft, faPlay } from "@fortawesome/free-solid-svg-icons"; import { useEventBus } from "@vueuse/core"; import { invocationsFetcher, type WorkflowInvocation } from "@/api/invocations"; -import type { StoredWorkflowDetailed } from "@/api/workflows"; +import { type StoredWorkflowDetailed } from "@/api/workflows"; import { useUserStore } from "@/stores/userStore"; import { useWorkflowStore } from "@/stores/workflowStore"; import _l from "@/utils/localization"; -import type { ActionArray, FieldArray, GridConfig } from "./types"; +import { type ActionArray, type FieldArray, type GridConfig } from "./types"; const { emit } = useEventBus("grid-router-push"); diff --git a/client/src/components/Grid/configs/invocationsWorkflow.ts b/client/src/components/Grid/configs/invocationsWorkflow.ts index 3cad8d66cc0e..27b3eba3c76f 100644 --- a/client/src/components/Grid/configs/invocationsWorkflow.ts +++ b/client/src/components/Grid/configs/invocationsWorkflow.ts @@ -2,13 +2,13 @@ import { faArrowLeft, faEye, faPlay } from "@fortawesome/free-solid-svg-icons"; import { useEventBus } from "@vueuse/core"; import { invocationsFetcher, type WorkflowInvocation } from "@/api/invocations"; -import type { StoredWorkflowDetailed } from "@/api/workflows"; +import { type StoredWorkflowDetailed } from "@/api/workflows"; import { useHistoryStore } from "@/stores/historyStore"; import { useUserStore } from "@/stores/userStore"; import { useWorkflowStore } from "@/stores/workflowStore"; import _l from "@/utils/localization"; -import type { ActionArray, FieldArray, GridConfig } from "./types"; +import { type ActionArray, type FieldArray, type GridConfig } from "./types"; const { emit } = useEventBus("grid-router-push"); diff --git a/client/src/components/Grid/configs/pages.ts b/client/src/components/Grid/configs/pages.ts index 4aa803d0d6c1..82585162a266 100644 --- a/client/src/components/Grid/configs/pages.ts +++ b/client/src/components/Grid/configs/pages.ts @@ -6,7 +6,7 @@ import Filtering, { contains, equals, toBool, type ValidFilter } from "@/utils/f import _l from "@/utils/localization"; import { errorMessageAsString } from "@/utils/simple-error"; -import type { ActionArray, FieldArray, GridConfig } from "./types"; +import { type ActionArray, type FieldArray, type GridConfig } from "./types"; const { emit } = useEventBus("grid-router-push"); diff --git a/client/src/components/Grid/configs/pagesPublished.ts b/client/src/components/Grid/configs/pagesPublished.ts index 615eb9c31696..db8d08239ca1 100644 --- a/client/src/components/Grid/configs/pagesPublished.ts +++ b/client/src/components/Grid/configs/pagesPublished.ts @@ -4,7 +4,7 @@ import { useEventBus } from "@vueuse/core"; import { fetcher } from "@/api/schema"; import Filtering, { contains, type ValidFilter } from "@/utils/filtering"; -import type { ActionArray, FieldArray, GridConfig } from "./types"; +import { type ActionArray, type FieldArray, type GridConfig } from "./types"; const { emit } = useEventBus("grid-router-push"); diff --git a/client/src/components/Grid/configs/types.ts b/client/src/components/Grid/configs/types.ts index 01c60be4228f..613d019294b9 100644 --- a/client/src/components/Grid/configs/types.ts +++ b/client/src/components/Grid/configs/types.ts @@ -1,7 +1,7 @@ -import { IconDefinition } from "@fortawesome/fontawesome-svg-core"; +import { type IconDefinition } from "@fortawesome/fontawesome-svg-core"; -import type { GalaxyConfiguration } from "@/stores/configurationStore"; -import Filtering from "@/utils/filtering"; +import { type GalaxyConfiguration } from "@/stores/configurationStore"; +import type Filtering from "@/utils/filtering"; export interface Action { title: string; diff --git a/client/src/components/Grid/configs/visualizations.ts b/client/src/components/Grid/configs/visualizations.ts index 08d657b89dbd..62271f98b27a 100644 --- a/client/src/components/Grid/configs/visualizations.ts +++ b/client/src/components/Grid/configs/visualizations.ts @@ -8,7 +8,7 @@ import Filtering, { contains, equals, expandNameTag, toBool, type ValidFilter } import { withPrefix } from "@/utils/redirect"; import { errorMessageAsString, rethrowSimple } from "@/utils/simple-error"; -import type { ActionArray, FieldArray, GridConfig } from "./types"; +import { type ActionArray, type FieldArray, type GridConfig } from "./types"; const { emit } = useEventBus("grid-router-push"); diff --git a/client/src/components/Grid/configs/visualizationsPublished.ts b/client/src/components/Grid/configs/visualizationsPublished.ts index b8888ffeb535..6ad67df8f007 100644 --- a/client/src/components/Grid/configs/visualizationsPublished.ts +++ b/client/src/components/Grid/configs/visualizationsPublished.ts @@ -4,7 +4,7 @@ import { fetcher } from "@/api/schema"; import Filtering, { contains, expandNameTag, type ValidFilter } from "@/utils/filtering"; import { withPrefix } from "@/utils/redirect"; -import type { FieldArray, GridConfig } from "./types"; +import { type FieldArray, type GridConfig } from "./types"; /** * Api endpoint handlers diff --git a/client/src/components/History/Archiving/HistoryArchiveExportSelector.test.ts b/client/src/components/History/Archiving/HistoryArchiveExportSelector.test.ts index 715482d64ef5..859c604c8b9d 100644 --- a/client/src/components/History/Archiving/HistoryArchiveExportSelector.test.ts +++ b/client/src/components/History/Archiving/HistoryArchiveExportSelector.test.ts @@ -5,7 +5,7 @@ import { BFormCheckbox } from "bootstrap-vue"; import flushPromises from "flush-promises"; import { getLocalVue } from "tests/jest/helpers"; -import type { HistorySummary } from "@/api"; +import { type HistorySummary } from "@/api"; import { mockFetcher } from "@/api/schema/__mocks__"; import { FAILED_FILE_SOURCE_STORE_RESPONSE, diff --git a/client/src/components/History/Archiving/HistoryArchiveWizard.test.ts b/client/src/components/History/Archiving/HistoryArchiveWizard.test.ts index 83e5015db61b..2176d6d093b6 100644 --- a/client/src/components/History/Archiving/HistoryArchiveWizard.test.ts +++ b/client/src/components/History/Archiving/HistoryArchiveWizard.test.ts @@ -4,7 +4,7 @@ import flushPromises from "flush-promises"; import { setActivePinia } from "pinia"; import { getLocalVue } from "tests/jest/helpers"; -import type { HistorySummary } from "@/api"; +import { type HistorySummary } from "@/api"; import { mockFetcher } from "@/api/schema/__mocks__"; import { useHistoryStore } from "@/stores/historyStore"; diff --git a/client/src/components/History/Content/Dataset/DatasetDownload.test.ts b/client/src/components/History/Content/Dataset/DatasetDownload.test.ts index 2a1f1127e582..f70377e6ad57 100644 --- a/client/src/components/History/Content/Dataset/DatasetDownload.test.ts +++ b/client/src/components/History/Content/Dataset/DatasetDownload.test.ts @@ -1,6 +1,6 @@ import { getLocalVue } from "@tests/jest/helpers"; -import { mount, Wrapper } from "@vue/test-utils"; -import Vue from "vue"; +import { mount, type Wrapper } from "@vue/test-utils"; +import type Vue from "vue"; import DatasetDownload from "./DatasetDownload.vue"; diff --git a/client/src/components/History/Content/model/stateTypes.d.ts b/client/src/components/History/Content/model/stateTypes.d.ts index 368690474bd9..0562390f5557 100644 --- a/client/src/components/History/Content/model/stateTypes.d.ts +++ b/client/src/components/History/Content/model/stateTypes.d.ts @@ -1,4 +1,4 @@ -import { STATES } from "./states"; +import { type STATES } from "./states"; export type State = { status: string; diff --git a/client/src/components/History/Content/model/states.ts b/client/src/components/History/Content/model/states.ts index b24664e9a1ec..5a201ed9b085 100644 --- a/client/src/components/History/Content/model/states.ts +++ b/client/src/components/History/Content/model/states.ts @@ -1,4 +1,4 @@ -import type { components } from "@/api/schema"; +import { type components } from "@/api/schema"; type DatasetState = components["schemas"]["DatasetState"]; // The 'failed' state is for the collection job state summary, not a dataset state. diff --git a/client/src/components/History/CurrentHistory/HistoryOperations/SelectionStatus.test.ts b/client/src/components/History/CurrentHistory/HistoryOperations/SelectionStatus.test.ts index 91ec80f8055d..d127185d0ae1 100644 --- a/client/src/components/History/CurrentHistory/HistoryOperations/SelectionStatus.test.ts +++ b/client/src/components/History/CurrentHistory/HistoryOperations/SelectionStatus.test.ts @@ -1,4 +1,4 @@ -import { shallowMount, Wrapper } from "@vue/test-utils"; +import { shallowMount, type Wrapper } from "@vue/test-utils"; import flushPromises from "flush-promises"; import { getLocalVue } from "tests/jest/helpers"; diff --git a/client/src/components/History/Export/HistoryExport.test.ts b/client/src/components/History/Export/HistoryExport.test.ts index c2659cf1f32b..58ac31cf562e 100644 --- a/client/src/components/History/Export/HistoryExport.test.ts +++ b/client/src/components/History/Export/HistoryExport.test.ts @@ -6,9 +6,9 @@ import MockAdapter from "axios-mock-adapter"; import flushPromises from "flush-promises"; import { setActivePinia } from "pinia"; -import type { HistorySummary } from "@/api"; +import { type HistorySummary } from "@/api"; import { fetchHistoryExportRecords } from "@/api/histories.export"; -import type { FilesSourcePlugin } from "@/api/remoteFiles"; +import { type FilesSourcePlugin } from "@/api/remoteFiles"; import { mockFetcher } from "@/api/schema/__mocks__"; import { EXPIRED_STS_DOWNLOAD_RECORD, diff --git a/client/src/components/JobParameters/JobParameters.test.ts b/client/src/components/JobParameters/JobParameters.test.ts index 5a1887356e1a..72256723c463 100644 --- a/client/src/components/JobParameters/JobParameters.test.ts +++ b/client/src/components/JobParameters/JobParameters.test.ts @@ -1,4 +1,4 @@ -import { mount, Wrapper } from "@vue/test-utils"; +import { mount, type Wrapper } from "@vue/test-utils"; import axios from "axios"; import MockAdapter from "axios-mock-adapter"; import flushPromises from "flush-promises"; diff --git a/client/src/components/Libraries/LibraryFolder/LibraryFolder.vue b/client/src/components/Libraries/LibraryFolder/LibraryFolder.vue index 8224ae89b030..c08ff48449b6 100644 --- a/client/src/components/Libraries/LibraryFolder/LibraryFolder.vue +++ b/client/src/components/Libraries/LibraryFolder/LibraryFolder.vue @@ -1,7 +1,7 @@