Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Schema tab UI update #37420

Merged
merged 34 commits into from
Nov 26, 2024
Merged
Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
f90acb8
fix: eslint warnings in schema
albinAppsmith Nov 15, 2024
3403c8f
fix: changed schema location
albinAppsmith Nov 15, 2024
6d77b2e
fix: import issue getPluginActionDevuggerState in schema
albinAppsmith Nov 15, 2024
08db299
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
albinAppsmith Nov 15, 2024
3f7e26b
fix: added status-display
albinAppsmith Nov 15, 2024
f9923da
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
albinAppsmith Nov 17, 2024
c58f5d9
fix: New changes to schema UI
albinAppsmith Nov 18, 2024
ed9d135
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
albinAppsmith Nov 18, 2024
2c66b80
feat: added cant show UI for schema tab
albinAppsmith Nov 18, 2024
28c3d2f
fix: datasource selector change created
albinAppsmith Nov 18, 2024
8604801
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
albinAppsmith Nov 18, 2024
65afaaf
feat: added custom error message for schema connection error
albinAppsmith Nov 19, 2024
4e0a8b8
feat: extracted datasource navigation to hook
albinAppsmith Nov 19, 2024
4f0d719
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
albinAppsmith Nov 19, 2024
4e125b3
fix: package and workflow navigation
albinAppsmith Nov 19, 2024
0fdcb14
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
albinAppsmith Nov 19, 2024
b817e29
feat: Added menu field
albinAppsmith Nov 19, 2024
7d4286e
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
albinAppsmith Nov 19, 2024
ee41a3a
fix: reduc form destroy false added for unmount
albinAppsmith Nov 19, 2024
f0a6c72
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
albinAppsmith Nov 19, 2024
5396b7a
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
albinAppsmith Nov 20, 2024
6b53a5e
feat: search added for columns in schema
albinAppsmith Nov 20, 2024
c01fe4d
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
albinAppsmith Nov 20, 2024
15596a7
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
albinAppsmith Nov 20, 2024
a731955
fix: Paddings and copy changes
albinAppsmith Nov 20, 2024
f1d12e7
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
albinAppsmith Nov 21, 2024
3ea41c5
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
albinAppsmith Nov 21, 2024
21f86a4
fix: schema cypress fix
albinAppsmith Nov 21, 2024
bf226ea
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
albinAppsmith Nov 22, 2024
c8e00b7
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
albinAppsmith Nov 25, 2024
52240c5
fix: updated code as per code review
albinAppsmith Nov 25, 2024
e2370b0
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
albinAppsmith Nov 25, 2024
0e7bc51
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
albinAppsmith Nov 26, 2024
c38fc99
fix: Moved useGoToDatasource to non CE folder
albinAppsmith Nov 26, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ describe(
"public.users",
);
dataSources.SelectTableFromPreviewSchemaList("public.users");
dataSources.VerifyColumnSchemaOnQueryEditor("id", 1);
dataSources.VerifyColumnSchemaOnQueryEditor("id", 0);
},
);

Expand Down
4 changes: 2 additions & 2 deletions app/client/cypress/support/Pages/DataSources.ts
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ export class DataSources {
"')]/ancestor::div[@class='form-config-top']/following-sibling::div//div[contains(@class, 'rc-select-multiple')]";
private _datasourceSchemaRefreshBtn = ".datasourceStructure-refresh";
private _datasourceStructureHeader = ".datasourceStructure-header";
_datasourceSchemaColumn = ".t--datasource-column";
_datasourceSchemaColumn = ".t--datasource-column .t--field-name";
_datasourceStructureSearchInput = ".datasourceStructure-search input";
_jsModeSortingControl = ".t--actionConfiguration\\.formData\\.sortBy\\.data";
public _queryEditorCollapsibleIcon = ".collapsible-icon";
Expand Down Expand Up @@ -296,7 +296,7 @@ export class DataSources {
_imgFireStoreLogo = "//img[contains(@src, 'firestore.svg')]";
_dsVirtuosoElement = `div .t--schema-virtuoso-container`;
private _dsVirtuosoList = `[data-test-id="virtuoso-item-list"]`;
private _dsSchemaContainer = `[data-testid="datasource-schema-container"]`;
private _dsSchemaContainer = `[data-testid="t--datasource-schema-container"]`;
private _dsVirtuosoElementTable = (targetTableName: string) =>
`${this._dsSchemaEntityItem}[data-testid='t--entity-item-${targetTableName}']`;
private _dsPageTabListItem = (buttonText: string) =>
Expand Down
1 change: 1 addition & 0 deletions app/client/src/IDE/Components/BottomView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ const ViewWrapper = styled.div`
& {
.ads-v2-tabs__list {
padding: var(--ads-v2-spaces-1) var(--ads-v2-spaces-7);
padding-left: var(--ads-v2-spaces-3);
}
}

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import React from "react";
import { Flex, Link } from "@appsmith/ads";
import { getAssetUrl } from "ee/utils/airgapHelpers";
import { EntityIcon } from "pages/Editor/Explorer/ExplorerIcons";
import { useSelector } from "react-redux";
import {
getPluginIdFromDatasourceId,
getPluginImages,
} from "ee/selectors/entitiesSelector";
import { useDataSourceNavigation } from "ee/PluginActionEditor/hooks/useDataSourceNavigation";

interface iProps {
type: "link" | "trigger";
datasourceId: string;
datasourceName: string;
}

const CurrentDataSource = ({ datasourceId, datasourceName, type }: iProps) => {
const { pluginId, pluginImages } = useSelector((state) => ({
pluginId: getPluginIdFromDatasourceId(state, datasourceId),
pluginImages: getPluginImages(state),
}));

const { goToDatasource } = useDataSourceNavigation();

const datasourceIcon = pluginId ? pluginImages?.[pluginId] : undefined;

const content = (
<Flex
alignItems="center"
gap="spaces-2"
justifyContent={type === "link" ? "center" : "start"}
>
<EntityIcon height="16px" width="16px">
<img alt="entityIcon" src={getAssetUrl(datasourceIcon)} />
</EntityIcon>
{datasourceName}
</Flex>
);

return type === "link" ? (
<Link onClick={() => goToDatasource(datasourceId)}>{content}</Link>
) : (
content
);
};

export { CurrentDataSource };
Loading
Loading