Skip to content

Commit

Permalink
fix(graph): remove redux and useState and useContext hook (#23085)
Browse files Browse the repository at this point in the history
<!-- Please make sure you have read the submission guidelines before
posting an PR -->
<!--
https://github.com/nrwl/nx/blob/master/CONTRIBUTING.md#-submitting-a-pr
-->

<!-- Please make sure that your commit message follows our format -->
<!-- Example: `fix(nx): must begin with lowercase` -->

## Current Behavior
<!-- This is the behavior we have today -->

## Expected Behavior
<!-- This is the behavior we should expect with the changes in this PR
-->

## Related Issue(s)
<!-- Please link the issue being fixed so it gets closed when this is
merged. -->

Fixes #
  • Loading branch information
xiongemi committed May 2, 2024
1 parent 2e621f3 commit bacdc79
Show file tree
Hide file tree
Showing 29 changed files with 127 additions and 441 deletions.
8 changes: 1 addition & 7 deletions graph/client/src/app/app.tsx
@@ -1,6 +1,4 @@
import { themeInit } from '@nx/graph/ui-theme';
import { rootStore } from '@nx/graph/state';
import { Provider as StoreProvider } from 'react-redux';
import { rankDirInit } from './rankdir-resolver';
import { RouterProvider } from 'react-router-dom';
import { getRouter } from './get-router';
Expand All @@ -9,9 +7,5 @@ themeInit();
rankDirInit();

export function App() {
return (
<StoreProvider store={rootStore}>
<RouterProvider router={getRouter()} />
</StoreProvider>
);
return <RouterProvider router={getRouter()} />;
}
33 changes: 18 additions & 15 deletions graph/project-details/src/lib/project-details-page.tsx
Expand Up @@ -10,8 +10,9 @@ import {
useParams,
useRouteLoaderData,
} from 'react-router-dom';
import ProjectDetailsWrapper from './project-details-wrapper';
import { ProjectDetailsWrapper } from './project-details-wrapper';
import {
ExpandedTargetsProvider,
fetchProjectGraph,
getProjectGraphDataService,
useEnvironmentConfig,
Expand Down Expand Up @@ -50,20 +51,22 @@ export function ProjectDetailsPage() {
);

return (
<div className="flex w-full flex-col justify-center text-slate-700 dark:text-slate-400">
<ScrollRestoration />
{environment !== 'nx-console' ? (
<ProjectDetailsHeader />
) : (
<div className="py-2"></div>
)}
<div className="mx-auto mb-8 w-full max-w-6xl flex-grow px-8">
<ProjectDetailsWrapper
project={project}
sourceMap={sourceMap}
errors={errors}
></ProjectDetailsWrapper>
<ExpandedTargetsProvider>
<div className="flex w-full flex-col justify-center text-slate-700 dark:text-slate-400">
<ScrollRestoration />
{environment !== 'nx-console' ? (
<ProjectDetailsHeader />
) : (
<div className="py-2"></div>
)}
<div className="mx-auto mb-8 w-full max-w-6xl flex-grow px-8">
<ProjectDetailsWrapper
project={project}
sourceMap={sourceMap}
errors={errors}
></ProjectDetailsWrapper>
</div>
</div>
</div>
</ExpandedTargetsProvider>
);
}
33 changes: 0 additions & 33 deletions graph/project-details/src/lib/project-details-wrapper.state.ts

This file was deleted.

61 changes: 21 additions & 40 deletions graph/project-details/src/lib/project-details-wrapper.tsx
Expand Up @@ -5,37 +5,27 @@ import type { ProjectGraphProjectNode } from '@nx/devkit';
import { GraphError } from 'nx/src/command-line/graph/graph';
/* eslint-enable @nx/enforce-module-boundaries */
import { useNavigate, useNavigation, useSearchParams } from 'react-router-dom';
import { connect } from 'react-redux';
import {
ErrorToast,
ExpandedTargetsContext,
getExternalApiService,
useEnvironmentConfig,
useRouteConstructor,
} from '@nx/graph/shared';
import { Spinner } from '@nx/graph/ui-components';

import { ProjectDetails } from '@nx/graph/ui-project-details';
import { useCallback, useEffect } from 'react';
import {
mapStateToProps,
mapDispatchToProps,
mapStateToPropsType,
mapDispatchToPropsType,
} from './project-details-wrapper.state';
import { useCallback, useContext, useEffect } from 'react';

type ProjectDetailsProps = mapStateToPropsType &
mapDispatchToPropsType & {
project: ProjectGraphProjectNode;
sourceMap: Record<string, string[]>;
errors?: GraphError[];
};
interface ProjectDetailsProps {
project: ProjectGraphProjectNode;
sourceMap: Record<string, string[]>;
errors?: GraphError[];
}

export function ProjectDetailsWrapperComponent({
export function ProjectDetailsWrapper({
project,
sourceMap,
setExpandTargets,
expandTargets,
collapseAllTargets,
errors,
}: ProjectDetailsProps) {
const environment = useEnvironmentConfig()?.environment;
Expand All @@ -44,6 +34,8 @@ export function ProjectDetailsWrapperComponent({
const { state: navigationState, location } = useNavigation();
const routeConstructor = useRouteConstructor();
const [searchParams, setSearchParams] = useSearchParams();
const { expandedTargets, setExpandedTargets, collapseAllTargets } =
useContext(ExpandedTargetsContext);

const handleViewInProjectGraph = useCallback(
(data: { projectName: string }) => {
Expand Down Expand Up @@ -113,44 +105,39 @@ export function ProjectDetailsWrapperComponent({
};

useEffect(() => {
if (!project.data.targets) return;

const expandedTargetsParams = searchParams.get('expanded')?.split(',');
if (expandedTargetsParams && expandedTargetsParams.length > 0) {
setExpandTargets(expandedTargetsParams);
setExpandedTargets(expandedTargetsParams);
}

return () => {
collapseAllTargets();
searchParams.delete('expanded');
setSearchParams(searchParams, { replace: true });
setSearchParams(
(currentSearchParams) => {
currentSearchParams.delete('expanded');
return currentSearchParams;
},
{ replace: true, preventScrollReset: true }
);
};
}, []); // only run on mount

useEffect(() => {
if (!project.data.targets) return;

const expandedTargetsParams =
searchParams.get('expanded')?.split(',') || [];

if (expandedTargetsParams.join(',') === expandTargets.join(',')) {
if (expandedTargetsParams.join(',') === expandedTargets.join(',')) {
return;
}

setSearchParams(
(currentSearchParams) => {
updateSearchParams(currentSearchParams, expandTargets);
updateSearchParams(currentSearchParams, expandedTargets);
return currentSearchParams;
},
{ replace: true, preventScrollReset: true }
);
}, [
expandTargets,
project.data.targets,
setExpandTargets,
searchParams,
setSearchParams,
]);
}, [expandedTargets, searchParams, setSearchParams]);

if (
navigationState === 'loading' &&
Expand Down Expand Up @@ -179,9 +166,3 @@ export function ProjectDetailsWrapperComponent({
</>
);
}

export const ProjectDetailsWrapper = connect(
mapStateToProps,
mapDispatchToProps
)(ProjectDetailsWrapperComponent);
export default ProjectDetailsWrapper;
1 change: 1 addition & 0 deletions graph/shared/src/index.ts
Expand Up @@ -7,3 +7,4 @@ export * from './lib/use-interval-when';
export * from './lib/project-graph-data-service/get-project-graph-data-service';
export * from './lib/fetch-project-graph';
export * from './lib/error-toast';
export * from './lib/expanded-targets-provider';
38 changes: 38 additions & 0 deletions graph/shared/src/lib/expanded-targets-provider.tsx
@@ -0,0 +1,38 @@
import { createContext, useState } from 'react';

export const ExpandedTargetsContext = createContext<{
expandedTargets?: string[];
setExpandedTargets?: (expandedTargets: string[]) => void;
toggleTarget?: (targetName: string) => void;
collapseAllTargets?: () => void;
}>({});

export const ExpandedTargetsProvider = ({ children }) => {
const [expandedTargets, setExpandedTargets] = useState<string[]>([]);

const toggleTarget = (targetName: string) => {
setExpandedTargets((prevExpandedTargets) => {
if (prevExpandedTargets.includes(targetName)) {
return prevExpandedTargets.filter((name) => name !== targetName);
}
return [...prevExpandedTargets, targetName];
});
};

const collapseAllTargets = () => {
setExpandedTargets([]);
};

return (
<ExpandedTargetsContext.Provider
value={{
expandedTargets,
setExpandedTargets,
toggleTarget,
collapseAllTargets,
}}
>
{children}
</ExpandedTargetsContext.Provider>
);
};
12 changes: 0 additions & 12 deletions graph/state/.babelrc

This file was deleted.

18 changes: 0 additions & 18 deletions graph/state/.eslintrc.json

This file was deleted.

11 changes: 0 additions & 11 deletions graph/state/project.json

This file was deleted.

6 changes: 0 additions & 6 deletions graph/state/src/index.ts

This file was deleted.

54 changes: 0 additions & 54 deletions graph/state/src/lib/expand-targets/expand-targets.slice.ts

This file was deleted.

9 changes: 0 additions & 9 deletions graph/state/src/lib/root/root-state.initial.ts

This file was deleted.

5 changes: 0 additions & 5 deletions graph/state/src/lib/root/root-state.interface.ts

This file was deleted.

10 changes: 0 additions & 10 deletions graph/state/src/lib/root/root.reducer.ts

This file was deleted.

0 comments on commit bacdc79

Please sign in to comment.