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
17 changes: 16 additions & 1 deletion backend/visitran/adapters/duckdb/seed.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

from visitran.adapters.duckdb.connection import DuckDbConnection
from visitran.adapters.seed import BaseSeed
from visitran.errors import SeedFailureException


class DuckDbSeed(BaseSeed):
Expand All @@ -21,6 +22,20 @@ def execute(self) -> None:
Overiding the base execute method to use the duckdb inbuild method
"""

if self.db_connection is None:
raise SeedFailureException(
seed_file_name=self.csv_file_name,
error_message="Database connection is not available. Please check your connection settings.",
)

# The drop SQL query will drop the table if it is only exists !
# Constructing SQL statement for CSV schema in target adapters
self.db_connection.insert_csv_records(abs_path=self.abs_path, table_name=self.destination_table_name)
try:
self.db_connection.insert_csv_records(abs_path=self.abs_path, table_name=self.destination_table_name)
except SeedFailureException:
raise
except Exception as err:
raise SeedFailureException(
seed_file_name=self.csv_file_name,
error_message=f'Failed to seed table "{self.destination_table_name}": {err}',
)
72 changes: 4 additions & 68 deletions frontend/src/base/components/environment/NewEnv.jsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
import { useState, useEffect, useCallback, useMemo } from "react";
import { useState, useEffect, useCallback } from "react";
import Cookies from "js-cookie";
import { Button, Divider, Modal, Space } from "antd";
import PropTypes from "prop-types";
import isEqual from "lodash/isEqual.js";

import { useAxiosPrivate } from "../../../service/axios-service";
import { orgStore } from "../../../store/org-store";
import { generateKey } from "../../../common/helpers";
import {
fetchAllConnections,
fetchProjectByConnection,
fetchSingleEnvironment,
updateEnvironmentApi,
createEnvironmentApi,
Expand All @@ -19,12 +17,11 @@
revealConnectionCredentials,
revealEnvironmentCredentials,
} from "./environment-api-service";
import encryptionService from "../../../service/encryption-service";

Check warning on line 20 in frontend/src/base/components/environment/NewEnv.jsx

View workflow job for this annotation

GitHub Actions / ESLint & Prettier check

There should be no empty line within import group

import "./environment.css";
import EnvGeneralSection from "./EnvGeneralSection";

Check warning on line 23 in frontend/src/base/components/environment/NewEnv.jsx

View workflow job for this annotation

GitHub Actions / ESLint & Prettier check

Unable to resolve path to module './EnvGeneralSection'
import EnvCustomDataSection from "./EnvCustomDataSection";
import { CreateConnection } from "./CreateConnection";

Check warning on line 24 in frontend/src/base/components/environment/NewEnv.jsx

View workflow job for this annotation

GitHub Actions / ESLint & Prettier check

Unable to resolve path to module './CreateConnection'
import { useNotificationService } from "../../../service/notification-service";

const NewEnv = ({
Expand All @@ -41,7 +38,6 @@

const [isModalOpen, setIsModalOpen] = useState(false);
const [connectionList, setConnectionList] = useState([]);
const [customData, setCustomData] = useState([]);
const [connection, setConnection] = useState({ id: "" });
const [connectionDataSource, setConnectionDataSource] = useState(null);
const [connectionSchema, setConnectionSchema] = useState({});
Expand All @@ -53,13 +49,11 @@
const [connType, setConnType] = useState("url");
const [connectionDetailsUpdated, setConnectionDetailsUpdated] =
useState(false);
const [projListDep, setProjListDep] = useState([]);
const [connectDetailBackup, setConnectDetailBackup] = useState({});
const [initialPrefillData, setInitialPrefillData] = useState({
name: "",
description: "",
deployment_type: "",
custom_data: [],
});
const [activeUpdateBtn, setActiveUpdateBtn] = useState(false);
const [isEncryptionLoading, setIsEncryptionLoading] = useState(true);
Expand Down Expand Up @@ -109,7 +103,6 @@
description: "",
deployment_type: "",
});
setCustomData([]);
setInputFields({});
setConnection({ id: "" });
setConnectionDataSource(null);
Expand All @@ -121,7 +114,6 @@
name: "",
description: "",
deployment_type: "",
custom_data: [],
});
setConnectDetailBackup({});
setIsCredentialsRevealed(false);
Expand All @@ -135,7 +127,6 @@
description: "",
deployment_type: "",
});
setCustomData([]);
setInputFields({});
setConnection({ id: "" });
setConnectionDataSource(null);
Expand All @@ -147,7 +138,6 @@
name: "",
description: "",
deployment_type: "",
custom_data: [],
});
setConnectDetailBackup({});
setIsCredentialsRevealed(false);
Expand Down Expand Up @@ -278,40 +268,27 @@
[selectedOrgId]
);

const getProjectDependency = useCallback(async () => {
try {
const data = await fetchProjectByConnection(axiosRef, selectedOrgId, id);
setProjListDep(data);
} catch (error) {
console.error(error);
notify({ error });
}
}, [id, selectedOrgId]);

useEffect(() => {
getAllConnections();
}, [getAllConnections]);

const getSingleEnvironmentDetails = useCallback(async () => {
try {
const data = await fetchSingleEnvironment(axiosRef, selectedOrgId, id);
const { connection, name, description, custom_data, deployment_type } =
data;
const { connection, name, description, deployment_type } = data;
const connDetail = data.connection_details;

setEnvNameDescInfo({ name, description, deployment_type });
setInitialPrefillData({
name,
description,
deployment_type,
custom_data,
});
setConnectDetailBackup({ connection_details: connDetail });
setConnType(
connDetail?.connection_type ? connDetail?.connection_type : "host"
);
setConnection({ id: connection.id });
setCustomData(Array.isArray(custom_data) ? custom_data : []);

// Process connection details to handle JSON objects for textarea fields
const processedConnDetail = { ...connDetail };
Expand All @@ -338,14 +315,13 @@
useEffect(() => {
if (id) {
getSingleEnvironmentDetails();
getProjectDependency();
} else {
setConnection({ id: "" });
setEnvNameDescInfo({ name: "", description: "", deployment_type: "" });
setConnectionDataSource(null);
setConnectionSchema({});
}
}, [id, getSingleEnvironmentDetails, getProjectDependency]);
}, [id, getSingleEnvironmentDetails]);

const handleEnvNameDesChange = (value, name) => {
setEnvNameDescInfo((prev) => ({ ...prev, [name]: value }));
Expand Down Expand Up @@ -453,29 +429,6 @@
connectionDataSource,
]);

const AddnewEntry = () => {
const singleData = { source_schema: "", destination_schema: "" };
setCustomData((prev) => [...prev, { id: generateKey(), ...singleData }]);
};

const handleCustomFieldChange = (value, name, rowId) => {
setCustomData((prev) =>
prev.map((item) =>
item.id === rowId ? { ...item, [name]: value } : item
)
);
};

const disabledAddCustomBtn = useMemo(() => {
return customData.some(
(item) => !item.source_schema || !item.destination_schema
);
}, [customData]);

const handleDelete = (rowId) => {
setCustomData((prev) => prev.filter((el) => el.id !== rowId));
};

const updateEnvironment = async () => {
try {
// Prepare environment data
Expand All @@ -488,7 +441,6 @@
connection_type: connType,
}),
},
custom_data: customData,
};

// Encrypt sensitive fields if encryption service is available
Expand Down Expand Up @@ -542,7 +494,6 @@
connection_type: connType,
}),
},
custom_data: customData,
};

// Encrypt sensitive fields if encryption service is available
Expand Down Expand Up @@ -577,7 +528,6 @@
message: "Environment Created Successfully",
});
setEnvNameDescInfo({ name: "", description: "", deployment_type: "" });
setCustomData([]);
setConnection({ id: "" });
}
} catch (error) {
Expand All @@ -597,10 +547,9 @@
name: envNameDescInfo.name,
description: envNameDescInfo.description,
deployment_type: envNameDescInfo.deployment_type,
custom_data: customData,
});
setActiveUpdateBtn(!res);
}, [envNameDescInfo, customData, initialPrefillData]);
}, [envNameDescInfo, initialPrefillData]);

useEffect(() => {
const res = isEqual(connectDetailBackup, {
Expand Down Expand Up @@ -641,19 +590,6 @@

<Divider className="divider-modal" />

<EnvCustomDataSection
actionState={actionState}
customData={customData}
AddnewEntry={AddnewEntry}
handleCustomFieldChange={handleCustomFieldChange}
disabledAddCustomBtn={disabledAddCustomBtn}
handleDelete={handleDelete}
projListDep={projListDep}
id={id}
/>

<Divider className="divider-modal" />

<div className="envBtnWrap">
<Space>
<Button onClick={() => setIsEnvModalOpen(false)}>Cancel</Button>
Expand Down
42 changes: 27 additions & 15 deletions frontend/src/ide/editor/no-code-model/no-code-model.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ import {
OpenTab,
} from "../../../base/icons/index.js";
import { SpinnerLoader } from "../../../widgets/spinner_loader/index.js";
import { CopyableCell } from "../../../widgets/copyable-cell/index.js";
import "./no-code-model.css";
import "reactflow/dist/style.css";
import { useNotificationService } from "../../../service/notification-service.js";
Expand Down Expand Up @@ -743,6 +744,7 @@ function NoCodeModel({ nodeData }) {
})
.catch((error) => {
notify({ error });
setIsLoading(false);
handleModalClose();
})
.finally(() => {
Expand Down Expand Up @@ -1362,23 +1364,33 @@ function NoCodeModel({ nodeData }) {
? JSON.stringify(text)
: text;

const formattedValue =
displayValue === null || displayValue === undefined
? ""
: ["Boolean", "boolean"].includes(dataType)
? String(displayValue)
: dataType === "Number"
? formatNumber(displayValue)
: displayValue;

const alignClass =
dataType === "Number"
? "flex-justify-right"
: ["Boolean", "boolean"].includes(dataType)
? "flex-justify-center"
: "";

return (
<span
className={`column-title
${formCol(isFormulaColumn, isAlias)} ${
dataType === "Number"
? "flex-justify-right"
: ["Boolean", "boolean"].includes(dataType)
? "flex-justify-center"
: ""
}`}
<CopyableCell
value={formattedValue}
className={`column-title ${formCol(
isFormulaColumn,
isAlias,
isWindowColumn
)} ${alignClass}`}
>
{["Boolean", "boolean"].includes(dataType)
? String(displayValue)
: dataType === "Number"
? formatNumber(displayValue)
: displayValue}
</span>
{formattedValue}
</CopyableCell>
);
},
};
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/service/notification-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function NotificationProvider({ children }) {
if (errorData && typeof errorData.error_message === "string") {
const text = errorData.error_message;
if (errorData.is_markdown) {
finalMessage = "";
finalMessage = "Failed";
const formatted = text.replace(/\n/g, " \n");
finalDescription = formatted;
type = errorData?.severity?.toLowerCase() || "error";
Expand Down
26 changes: 26 additions & 0 deletions frontend/src/widgets/copyable-cell/copyable-cell.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/* Copyable Cell - hover tooltip with copy for table cells */

.copyable-cell-text {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
cursor: default;
}

/* Tooltip content layout */
.copyable-cell-tooltip {
display: flex;
align-items: flex-start;
gap: 8px;
font-family: var(--font-family);
}

.copyable-cell-tooltip-text {
flex: 1;
min-width: 0;
word-break: break-word;
white-space: pre-wrap;
user-select: text;
font-size: 12px;
line-height: 1.5;
}
Loading
Loading