Fix filter in Catalog view (#1298)

vmware-tanzu · Nov 20, 2019 · 3cc0bac · 3cc0bac
1 parent eb7222b
commit 3cc0bac
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/dashboard/src/components/Catalog/Catalog.test.tsx b/dashboard/src/components/Catalog/Catalog.test.tsx
@@ -44,6 +44,13 @@ it("updates the filter from props", () => {
   expect(wrapper.state("filter")).toBe("foo");
 });
 
+it("keeps the filter from the state", () => {
+  const wrapper = shallow(<Catalog {...defaultProps} />);
+  expect(wrapper.state("filter")).toBe("");
+  wrapper.setState({ filter: "foo" });
+  expect(wrapper.state("filter")).toBe("foo");
+});
+
 describe("renderization", () => {
   context("when no charts", () => {
     it("should render an error", () => {

diff --git a/dashboard/src/components/Catalog/Catalog.tsx b/dashboard/src/components/Catalog/Catalog.tsx
@@ -35,7 +35,7 @@ class Catalog extends React.Component<ICatalogProps, ICatalogState> {
   }
 
   public componentDidUpdate(prevProps: ICatalogProps) {
-    if (this.props.filter !== this.state.filter) {
+    if (this.props.filter !== prevProps.filter) {
       this.setState({ filter: this.props.filter });
     }
     if (this.props.repo !== prevProps.repo) {