Skip to content

Commit 765e524

Browse files
committed
refactor: separate V1 cloud storage UI elements from V2 data connectors (#3301)
1 parent 8bc208d commit 765e524

File tree

12 files changed

+884
-353
lines changed

12 files changed

+884
-353
lines changed

client/src/features/ProjectPageV2/ProjectPageContent/DataSources/DataSourceCredentialsModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import {
2828
} from "../../../projectsV2/api/projectV2.enhanced-api";
2929
import type { CloudStorageGetRead } from "../../../projectsV2/api/storagesV2.api";
3030
import type { SessionStartCloudStorageConfiguration } from "../../../sessionsV2/startSessionOptionsV2.types";
31-
import CloudStorageSecretsModal from "../../../sessionsV2/CloudStorageSecretsModal";
31+
import CloudStorageSecretsModal from "../../../sessionsV2/DataConnectorSecretsModal";
3232

3333
import useDataSourceConfiguration from "./useDataSourceConfiguration.hook";
3434
import { Loader } from "../../../../components/Loader";

client/src/features/ProjectPageV2/ProjectPageContent/DataSources/DataSourceDisplay.tsx

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ import {
3030
Row,
3131
} from "reactstrap";
3232

33-
import { Loader } from "../../../../components/Loader.tsx";
34-
import AddCloudStorageModal from "../../../project/components/cloudStorage/CloudStorageModal.tsx";
33+
import { Loader } from "../../../../components/Loader";
34+
import DataConnectorModal from "../../../dataConnectorsV2/components/DataConnectorModal";
3535
import {
36-
CloudStorageGetRead,
36+
type CloudStorageGetRead,
3737
useDeleteStoragesV2ByStorageIdMutation,
3838
} from "../../../projectsV2/api/storagesV2.api";
39-
import DataSourceCredentialsModal from "./DataSourceCredentialsModal.tsx";
40-
import { DataSourceView } from "./DataSourceView.tsx";
41-
import { ButtonWithMenuV2 } from "../../../../components/buttons/Button.tsx";
39+
import DataSourceCredentialsModal from "./DataSourceCredentialsModal";
40+
import { DataSourceView } from "./DataSourceView";
41+
import { ButtonWithMenuV2 } from "../../../../components/buttons/Button";
4242

4343
interface DataSourceDeleteModalProps {
4444
storage: CloudStorageGetRead;
@@ -174,12 +174,11 @@ export function DataSourceActions({
174174
isOpen={isDeleteOpen}
175175
toggleModal={toggleDelete}
176176
/>
177-
<AddCloudStorageModal
177+
<DataConnectorModal
178178
currentStorage={storage}
179179
isOpen={isEditOpen}
180180
toggle={toggleEdit}
181181
projectId={projectId}
182-
isV2
183182
/>
184183
</>
185184
);

client/src/features/ProjectPageV2/ProjectPageContent/DataSources/DataSourcesBox.tsx

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
import cx from "classnames";
1919
import { useCallback, useState } from "react";
2020
import { Database, PlusLg } from "react-bootstrap-icons";
21-
import { Loader } from "../../../../components/Loader.tsx";
22-
import AddCloudStorageModal from "../../../project/components/cloudStorage/CloudStorageModal.tsx";
21+
import { Loader } from "../../../../components/Loader";
22+
import DataConnectorModal from "../../../dataConnectorsV2/components/DataConnectorModal";
2323
import { Project } from "../../../projectsV2/api/projectV2.api";
2424
import { useGetStoragesV2Query } from "../../../projectsV2/api/storagesV2.api";
25-
import AccessGuard from "../../utils/AccessGuard.tsx";
25+
import AccessGuard from "../../utils/AccessGuard";
2626
import useProjectAccess from "../../utils/useProjectAccess.hook";
27-
import { DataSourceDisplay } from "./DataSourceDisplay.tsx";
27+
import { DataSourceDisplay } from "./DataSourceDisplay";
2828
import {
2929
Badge,
3030
Button,
@@ -117,12 +117,11 @@ export function DataSourcesDisplay({ project }: { project: Project }) {
117117
</ListGroup>
118118
)}
119119
</CardBody>
120-
<AddCloudStorageModal
120+
<DataConnectorModal
121121
currentStorage={null}
122122
isOpen={isOpen}
123123
toggle={toggle}
124124
projectId={project.id}
125-
isV2
126125
/>
127126
</Card>
128127
);

0 commit comments

Comments
 (0)