- {watcherStatus}
+
+
{watcherStatus}
{watcherError &&
}
);
diff --git a/src/components/molecules/jobs-search-fields/jobs-search-fields.molecule.jsx b/src/components/molecules/jobs-search-fields/jobs-search-fields.molecule.jsx
new file mode 100644
index 0000000..45765d0
--- /dev/null
+++ b/src/components/molecules/jobs-search-fields/jobs-search-fields.molecule.jsx
@@ -0,0 +1,38 @@
+import { SearchOutlined } from "@ant-design/icons";
+import { Button, DatePicker, Form, Input } from "antd";
+import React from "react";
+export default function JobsSearchFieldsMolecule({ callSearchQuery }) {
+ const [form] = Form.useForm();
+
+ const handleFinish = (values) => {
+ callSearchQuery({
+ variables: {
+ search: values.search,
+ startDate: (values.dateRange && values.dateRange[0]) || null,
+ endDate: (values.dateRange && values.dateRange[1]) || null,
+ },
+ });
+ };
+
+ return (
+
+
+
+ );
+}
diff --git a/src/components/molecules/shop-settings-form/shop-settings-form.molecule.jsx b/src/components/molecules/shop-settings-form/shop-settings-form.molecule.jsx
index d900058..c06355e 100644
--- a/src/components/molecules/shop-settings-form/shop-settings-form.molecule.jsx
+++ b/src/components/molecules/shop-settings-form/shop-settings-form.molecule.jsx
@@ -1,4 +1,4 @@
-import { Button, Input, Form, Select, InputNumber } from "antd";
+import { Button, Input, Form, Select, InputNumber, Typography } from "antd";
import FormListMoveArrows from "../../atoms/form-list-move-arrows/form-list-move-arrows.atom";
import React from "react";
import LayoutFormRow from "../../atoms/layout-form-row/layout-form-row.atom";
@@ -7,6 +7,7 @@ import { DeleteFilled } from "@ant-design/icons";
export default function ShopSettingsFormMolecule({ form, saveLoading }) {
return (
+
Shop Settings
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
Group Definitions
{(fields, { add, remove, move }) => {
return (
diff --git a/src/components/organisms/filepaths-list/filepaths-list.organism.jsx b/src/components/organisms/filepaths-list/filepaths-list.organism.jsx
index 382d977..1e5c267 100644
--- a/src/components/organisms/filepaths-list/filepaths-list.organism.jsx
+++ b/src/components/organisms/filepaths-list/filepaths-list.organism.jsx
@@ -1,4 +1,4 @@
-import { List } from "antd";
+import { List, Typography } from "antd";
import React, { useEffect } from "react";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
@@ -24,7 +24,7 @@ export function FilePathsList({ watchedPaths }) {
console.log("watchedPaths", watchedPaths);
return (
- File Paths
+ Watcher File Paths
diff --git a/src/components/organisms/jobs-list-latest/jobs-list-latest.organism.jsx b/src/components/organisms/jobs-list-latest/jobs-list-latest.organism.jsx
index 4e2f9d1..ea66ce0 100644
--- a/src/components/organisms/jobs-list-latest/jobs-list-latest.organism.jsx
+++ b/src/components/organisms/jobs-list-latest/jobs-list-latest.organism.jsx
@@ -3,24 +3,12 @@ import { useQuery } from "@apollo/client";
import { Dropdown, List, Menu, Spin } from "antd";
import React, { useState } from "react";
import InfiniteScroll from "react-infinite-scroller";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
import { QUERY_ALL_JOBS_PAGINATED } from "../../../graphql/jobs.queries";
-import { setSelectedJobId } from "../../../redux/application/application.actions";
-import { selectSelectedJobId } from "../../../redux/application/application.selectors";
import ErrorResultAtom from "../../atoms/error-result/error-result.atom";
import JobsListItemMolecule from "../../molecules/jobs-list-item/jobs-list-item.molecule";
-import "./jobs-list-latest.organism.styles.scss";
-
-const mapStateToProps = createStructuredSelector({
- selectedJobId: selectSelectedJobId,
-});
-const mapDispatchToProps = (dispatch) => ({
- setSelectedJobId: (jobId) => dispatch(setSelectedJobId(jobId)),
-});
const limit = 20;
-export function JobsTableOrganism({ selectedJobId, setSelectedJobId }) {
+export default function JobsTableOrganism() {
const [state, setState] = useState({ hasMore: true });
const { loading, error, data, refetch, fetchMore } = useQuery(
@@ -110,4 +98,3 @@ export function JobsTableOrganism({ selectedJobId, setSelectedJobId }) {
);
}
-export default connect(mapStateToProps, mapDispatchToProps)(JobsTableOrganism);
diff --git a/src/components/organisms/jobs-list-latest/jobs-list-latest.organism.styles.scss b/src/components/organisms/jobs-list-latest/jobs-list-latest.organism.styles.scss
deleted file mode 100644
index a43013a..0000000
--- a/src/components/organisms/jobs-list-latest/jobs-list-latest.organism.styles.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-.jobs-list-container {
- height: 100%;
-}
-
-.jobs-list-infinite-container {
- overflow-y: auto;
- overflow-x: hidden;
- height: 100%;
-}
diff --git a/src/components/organisms/jobs-list-search/jobs-list-search.organism.jsx b/src/components/organisms/jobs-list-search/jobs-list-search.organism.jsx
new file mode 100644
index 0000000..fb527dc
--- /dev/null
+++ b/src/components/organisms/jobs-list-search/jobs-list-search.organism.jsx
@@ -0,0 +1,102 @@
+import { SyncOutlined } from "@ant-design/icons";
+import { useLazyQuery } from "@apollo/client";
+import { Dropdown, List, Menu, Spin } from "antd";
+import React, { useState } from "react";
+import InfiniteScroll from "react-infinite-scroller";
+import { SEARCH_JOBS_PAGINATED } from "../../../graphql/jobs.queries";
+import ErrorResultAtom from "../../atoms/error-result/error-result.atom";
+import JobsListItemMolecule from "../../molecules/jobs-list-item/jobs-list-item.molecule";
+import JobsSearchFieldsMolecule from "../../molecules/jobs-search-fields/jobs-search-fields.molecule";
+
+const limit = 20;
+export default function JobsTableOrganism() {
+ const [state, setState] = useState({ hasMore: true });
+
+ const [
+ callSearch,
+ { loading, error, data, refetch, fetchMore },
+ ] = useLazyQuery(SEARCH_JOBS_PAGINATED, {
+ variables: {
+ offset: 0,
+ limit: limit,
+ },
+ });
+
+ const menu = (
+
+ );
+
+ const handleInfiniteOnLoad = (page) => {
+ if (fetchMore)
+ fetchMore({
+ variables: {
+ offset: limit * page,
+ },
+ updateQuery: (prev, { fetchMoreResult }) => {
+ if (!fetchMoreResult) {
+ console.log("No more results. Fetch More was empty.");
+ setState({ ...state, hasMore: false });
+ return prev;
+ }
+
+ const newCache = Object.assign({}, prev, {
+ jobs: [...prev.search_jobs, ...fetchMoreResult.search_jobs],
+ });
+
+ if (
+ newCache.jobs.length >= data &&
+ data.search_jobs_aggregate.aggregate.count
+ ) {
+ console.log("No more results.");
+ setState({ ...state, hasMore: false });
+ }
+
+ return newCache;
+ },
+ });
+ };
+
+ if (error)
+ return (
+
+ );
+
+ return (
+
+
+
+
+
+ }
+ >
+ {loading && state.hasMore && (
+
+
+
+ )}
+
+
+
+
+ {`${data ? data.search_jobs.length : 0} jobs loaded. ${
+ data ? data.search_jobs_aggregate.aggregate.count : 0
+ } total jobs.`}
+
+ );
+}
diff --git a/src/components/organisms/sider-menu/sider-menu.organism.jsx b/src/components/organisms/sider-menu/sider-menu.organism.jsx
index 042545d..7c02dd4 100644
--- a/src/components/organisms/sider-menu/sider-menu.organism.jsx
+++ b/src/components/organisms/sider-menu/sider-menu.organism.jsx
@@ -8,15 +8,18 @@ import React from "react";
import { Link } from "react-router-dom";
import ipcTypes from "../../../ipc.types";
import SiderSignOut from "../../molecules/sider-sign-out/sider-sign-out.molecule";
+import { useLocation } from "react-router-dom";
const { ipcRenderer } = window;
export default function SiderMenuOrganism() {
+ const { pathname } = useLocation();
+
return (
-