aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAien Saidi <aien.saidi@gmail.com>2021-03-18 18:00:16 +0100
committerSascha <GlancingMind@outlook.com>2021-04-07 13:07:58 +0200
commit54c5b66271f4f3d95881a186c8124e7e5dcdb6d4 (patch)
treeb7a4295faca9eb02216475fcc22fd6680c5f51f7
parentc7a441bad6a7ca247d955b63d2ba604435fdaab6 (diff)
downloadgit-bug-54c5b66271f4f3d95881a186c8124e7e5dcdb6d4.tar.gz
feat: use author to filter the list
-rw-r--r--webui/.eslintrc.js1
-rw-r--r--webui/package.json2
-rw-r--r--webui/src/pages/list/FilterToolbar.tsx28
-rw-r--r--webui/src/pages/list/ListIdentities.graphql13
4 files changed, 41 insertions, 3 deletions
diff --git a/webui/.eslintrc.js b/webui/.eslintrc.js
index 2dfa7543..125fe801 100644
--- a/webui/.eslintrc.js
+++ b/webui/.eslintrc.js
@@ -38,4 +38,5 @@ module.exports = {
settings: {
'import/internal-regex': '^src/',
},
+ ignorePatterns: ['**/*.generated.tsx'],
};
diff --git a/webui/package.json b/webui/package.json
index 39696a25..a69473d8 100644
--- a/webui/package.json
+++ b/webui/package.json
@@ -46,7 +46,7 @@
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject",
"generate": "graphql-codegen",
- "lint": "eslint src --ext .ts --ext .tsx --ext .js --ext .jsx --ext .graphql",
+ "lint": "eslint --fix src --ext .ts --ext .tsx --ext .js --ext .jsx --ext .graphql",
"clean": "rimraf src/**.generated.* src/schema.json src/gqlTypes.* src/fragmentTypes.*"
},
"proxy": "http://localhost:3001",
diff --git a/webui/src/pages/list/FilterToolbar.tsx b/webui/src/pages/list/FilterToolbar.tsx
index 74eefe4c..92154ad2 100644
--- a/webui/src/pages/list/FilterToolbar.tsx
+++ b/webui/src/pages/list/FilterToolbar.tsx
@@ -8,14 +8,15 @@ import CheckCircleOutline from '@material-ui/icons/CheckCircleOutline';
import ErrorOutline from '@material-ui/icons/ErrorOutline';
import {
+ Filter,
FilterDropdown,
FilterProps,
- Filter,
parse,
- stringify,
Query,
+ stringify,
} from './Filter';
import { useBugCountQuery } from './FilterToolbar.generated';
+import { useListIdentitiesQuery } from './ListIdentities.generated';
const useStyles = makeStyles((theme) => ({
toolbar: {
@@ -35,6 +36,7 @@ type CountingFilterProps = {
query: string; // the query used as a source to count the number of element
children: React.ReactNode;
} & FilterProps;
+
function CountingFilter({ query, children, ...props }: CountingFilterProps) {
const { data, loading, error } = useBugCountQuery({
variables: { query },
@@ -57,9 +59,24 @@ type Props = {
query: string;
queryLocation: (query: string) => LocationDescriptor;
};
+
function FilterToolbar({ query, queryLocation }: Props) {
const classes = useStyles();
const params: Query = parse(query);
+ const { data } = useListIdentitiesQuery();
+
+ let identities: any = [];
+
+ if (
+ data?.repository &&
+ data.repository.allIdentities &&
+ data.repository.allIdentities.nodes
+ ) {
+ identities = data.repository.allIdentities.nodes.map((node) => [
+ node.name,
+ node.name,
+ ]);
+ }
const hasKey = (key: string): boolean =>
params[key] && params[key].length > 0;
@@ -116,6 +133,13 @@ function FilterToolbar({ query, queryLocation }: Props) {
<Filter active={hasKey('label')}>Label</Filter>
*/}
<FilterDropdown
+ dropdown={identities}
+ itemActive={(key) => hasValue('author', key)}
+ to={(key) => pipe(replaceParam('author', key), loc)(params)}
+ >
+ Author
+ </FilterDropdown>
+ <FilterDropdown
dropdown={[
['id', 'ID'],
['creation', 'Newest'],
diff --git a/webui/src/pages/list/ListIdentities.graphql b/webui/src/pages/list/ListIdentities.graphql
new file mode 100644
index 00000000..73073ae8
--- /dev/null
+++ b/webui/src/pages/list/ListIdentities.graphql
@@ -0,0 +1,13 @@
+query ListIdentities {
+ repository {
+ allIdentities {
+ nodes {
+ id
+ humanId
+ name
+ email
+ displayName
+ }
+ }
+ }
+}