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.

Sign up for GitHub

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

Jump to bottom

🪟 🐛 Fixes BulkEditServiceProvider to use filtered streams instead of all streams #21902

Merged
merged 6 commits into from
Feb 6, 2023
Merged

🪟 🐛 Fixes BulkEditServiceProvider to use filtered streams instead of all streams #21902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4138e7c
Fixes BulkEditServiceProvider to use filtered streams instead of all …
YatsukBogdan1 Jan 26, 2023
260f602
Merge branch 'master' into byatsuk/fix-bulk-edit-service-filtered-str…
YatsukBogdan1 Jan 31, 2023
ae0bc18
Fixes CatalogTree streams updating while filtering streams by search …
YatsukBogdan1 Jan 31, 2023
888a6df
Merge branch 'master' into byatsuk/fix-bulk-edit-service-filtered-str…
YatsukBogdan1 Feb 3, 2023
6bc7491
Adds functionality to disable CatalogTreeSearch while bulk adi is active
YatsukBogdan1 Feb 3, 2023
d62af5c
Merge branch 'master' into byatsuk/fix-bulk-edit-service-filtered-str…
YatsukBogdan1 Feb 6, 2023
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
8 changes: 7 additions & 1 deletion airbyte-webapp/src/components/connection/CatalogTree/CatalogTree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ const CatalogTreeComponent: React.FC<React.PropsWithChildren<CatalogTreeProps>>

const [searchString, setSearchString] = useState("");

const onBatchStreamsChanged = useCallback(
(newStreams: SyncSchemaStream[]) =>
onStreamsChanged(streams.map((str) => newStreams.find((newStr) => newStr.id === str.id) ?? str)),
[streams, onStreamsChanged]
);

const onSingleStreamChanged = useCallback(
(newValue: SyncSchemaStream) => onStreamsChanged(streams.map((str) => (str.id === newValue.id ? newValue : str))),
[streams, onStreamsChanged]
Expand Down Expand Up @@ -70,7 +76,7 @@ const CatalogTreeComponent: React.FC<React.PropsWithChildren<CatalogTreeProps>>
);

return (
<BulkEditServiceProvider nodes={streams} update={onStreamsChanged}>
<BulkEditServiceProvider nodes={filteredStreams} update={onBatchStreamsChanged}>
<LoadingBackdrop loading={isLoading}>
{mode !== "readonly" && <CatalogTreeSearch onSearch={setSearchString} />}
<div className={classNames(styles.catalogTreeTable, { [styles.newCatalogTreeTable]: isNewTableDesignEnabled })}>
Expand Down
4 changes: 4 additions & 0 deletions airbyte-webapp/src/components/connection/CatalogTree/CatalogTreeSearch.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import { useIntl } from "react-intl";

import { Input } from "components/ui/Input";

import { useBulkEditService } from "hooks/services/BulkEdit/BulkEditService";

import styles from "./CatalogTreeSearch.module.scss";

interface CatalogTreeSearchProps {
Expand All @@ -11,10 +13,12 @@ interface CatalogTreeSearchProps {

export const CatalogTreeSearch: React.FC<CatalogTreeSearchProps> = ({ onSearch }) => {
const { formatMessage } = useIntl();
const { isActive } = useBulkEditService();

return (
<div className={styles.searchContent}>
<Input
disabled={isActive}
className={styles.searchInput}
placeholder={formatMessage({
id: `form.nameSearch`,
Expand Down