From ce6f6a984b374b189141116433ced80dfa0c2aae Mon Sep 17 00:00:00 2001
From: Quentin Gliech <quentingliech@gmail.com>
Date: Thu, 13 Feb 2020 20:00:03 +0100
Subject: webui: move pages components

---
 webui/src/pages/list/FilterToolbar.tsx | 129 +++++++++++++++++++++++++++++++++
 1 file changed, 129 insertions(+)
 create mode 100644 webui/src/pages/list/FilterToolbar.tsx

(limited to 'webui/src/pages/list/FilterToolbar.tsx')

diff --git a/webui/src/pages/list/FilterToolbar.tsx b/webui/src/pages/list/FilterToolbar.tsx
new file mode 100644
index 00000000..825a9dee
--- /dev/null
+++ b/webui/src/pages/list/FilterToolbar.tsx
@@ -0,0 +1,129 @@
+import { pipe } from '@arrows/composition';
+import { LocationDescriptor } from 'history';
+import React from 'react';
+
+import Toolbar from '@material-ui/core/Toolbar';
+import { makeStyles } from '@material-ui/core/styles';
+import CheckCircleOutline from '@material-ui/icons/CheckCircleOutline';
+import ErrorOutline from '@material-ui/icons/ErrorOutline';
+
+import {
+  FilterDropdown,
+  FilterProps,
+  Filter,
+  parse,
+  stringify,
+  Query,
+} from './Filter';
+import { useBugCountQuery } from './FilterToolbar.generated';
+
+const useStyles = makeStyles(theme => ({
+  toolbar: {
+    backgroundColor: theme.palette.grey['100'],
+    borderColor: theme.palette.grey['300'],
+    borderWidth: '1px 0',
+    borderStyle: 'solid',
+    margin: theme.spacing(0, -1),
+  },
+  spacer: {
+    flex: 1,
+  },
+}));
+
+// This prepends the filter text with a count
+type CountingFilterProps = {
+  query: string;
+  children: React.ReactNode;
+} & FilterProps;
+function CountingFilter({ query, children, ...props }: CountingFilterProps) {
+  const { data, loading, error } = useBugCountQuery({
+    variables: { query },
+  });
+
+  var prefix;
+  if (loading) prefix = '...';
+  else if (error || !data?.repository) prefix = '???';
+  // TODO: better prefixes & error handling
+  else prefix = data.repository.bugs.totalCount;
+
+  return (
+    <Filter {...props}>
+      {prefix} {children}
+    </Filter>
+  );
+}
+
+type Props = {
+  query: string;
+  queryLocation: (query: string) => LocationDescriptor;
+};
+function FilterToolbar({ query, queryLocation }: Props) {
+  const classes = useStyles();
+  const params: Query = parse(query);
+
+  const hasKey = (key: string): boolean =>
+    params[key] && params[key].length > 0;
+  const hasValue = (key: string, value: string): boolean =>
+    hasKey(key) && params[key].includes(value);
+  const loc = pipe(stringify, queryLocation);
+  const replaceParam = (key: string, value: string) => (
+    params: Query
+  ): Query => ({
+    ...params,
+    [key]: [value],
+  });
+  const clearParam = (key: string) => (params: Query): Query => ({
+    ...params,
+    [key]: [],
+  });
+
+  // TODO: author/label filters
+  return (
+    <Toolbar className={classes.toolbar}>
+      <CountingFilter
+        active={hasValue('status', 'open')}
+        query={pipe(
+          replaceParam('status', 'open'),
+          clearParam('sort'),
+          stringify
+        )(params)}
+        to={pipe(replaceParam('status', 'open'), loc)(params)}
+        icon={ErrorOutline}
+      >
+        open
+      </CountingFilter>
+      <CountingFilter
+        active={hasValue('status', 'closed')}
+        query={pipe(
+          replaceParam('status', 'closed'),
+          clearParam('sort'),
+          stringify
+        )(params)}
+        to={pipe(replaceParam('status', 'closed'), loc)(params)}
+        icon={CheckCircleOutline}
+      >
+        closed
+      </CountingFilter>
+      <div className={classes.spacer} />
+      {/*
+      <Filter active={hasKey('author')}>Author</Filter>
+      <Filter active={hasKey('label')}>Label</Filter>
+      */}
+      <FilterDropdown
+        dropdown={[
+          ['id', 'ID'],
+          ['creation', 'Newest'],
+          ['creation-asc', 'Oldest'],
+          ['edit', 'Recently updated'],
+          ['edit-asc', 'Least recently updated'],
+        ]}
+        itemActive={key => hasValue('sort', key)}
+        to={key => pipe(replaceParam('sort', key), loc)(params)}
+      >
+        Sort
+      </FilterDropdown>
+    </Toolbar>
+  );
+}
+
+export default FilterToolbar;
-- 
cgit 


From d052ecf67105b5a65511a335e4c3112c74a662a6 Mon Sep 17 00:00:00 2001
From: Michael Muré <batolettre@gmail.com>
Date: Sun, 16 Feb 2020 01:35:13 +0100
Subject: webui: in the bug list, toggle open and close when clicking

---
 webui/src/pages/list/FilterToolbar.tsx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'webui/src/pages/list/FilterToolbar.tsx')

diff --git a/webui/src/pages/list/FilterToolbar.tsx b/webui/src/pages/list/FilterToolbar.tsx
index 825a9dee..c568a9dd 100644
--- a/webui/src/pages/list/FilterToolbar.tsx
+++ b/webui/src/pages/list/FilterToolbar.tsx
@@ -32,7 +32,7 @@ const useStyles = makeStyles(theme => ({
 
 // This prepends the filter text with a count
 type CountingFilterProps = {
-  query: string;
+  query: string; // the query used as a source to count the number of element
   children: React.ReactNode;
 } & FilterProps;
 function CountingFilter({ query, children, ...props }: CountingFilterProps) {
@@ -72,6 +72,12 @@ function FilterToolbar({ query, queryLocation }: Props) {
     ...params,
     [key]: [value],
   });
+  const toggleParam = (key: string, value: string) => (
+    params: Query
+  ): Query => ({
+    ...params,
+    [key]: params[key] && params[key].includes(value) ? [] : [value],
+  });
   const clearParam = (key: string) => (params: Query): Query => ({
     ...params,
     [key]: [],
@@ -87,7 +93,7 @@ function FilterToolbar({ query, queryLocation }: Props) {
           clearParam('sort'),
           stringify
         )(params)}
-        to={pipe(replaceParam('status', 'open'), loc)(params)}
+        to={pipe(toggleParam('status', 'open'), loc)(params)}
         icon={ErrorOutline}
       >
         open
@@ -99,7 +105,7 @@ function FilterToolbar({ query, queryLocation }: Props) {
           clearParam('sort'),
           stringify
         )(params)}
-        to={pipe(replaceParam('status', 'closed'), loc)(params)}
+        to={pipe(toggleParam('status', 'closed'), loc)(params)}
         icon={CheckCircleOutline}
       >
         closed
-- 
cgit