diff --git a/WIP Changelog.txt b/WIP Changelog.txt
index 72936a0..eb0763e 100644
--- a/WIP Changelog.txt
+++ b/WIP Changelog.txt
@@ -1,5 +1,7 @@
New Features:
- Added a reference guide for MPI Grouping Guidelines next to the Group Descriptor on the estimate screen.
+- Added ability to filter for jobs with no close date on job search.
Bug Fixes:
-- Added better error handling on reporting for jobs that did not have a group set.
\ No newline at end of file
+- Added better error handling on reporting for jobs that did not have a group set.
+- Added a confirmation on changes to shop settings to indicate that a restart is required for them to take effect.
\ No newline at end of file
diff --git a/electron/changelog.json b/electron/changelog.json
index fc5a3ed..d068559 100644
--- a/electron/changelog.json
+++ b/electron/changelog.json
@@ -16,7 +16,7 @@
},
"1.0.12": {
"title": "Release Notes for 1.0.12",
- "date": "TBD",
- "notes": ""
+ "date": "11/26/2020",
+ "notes": "New Features: \n- Added a reference guide for MPI Grouping Guidelines next to the Group Descriptor on the estimate screen.\n- Added ability to filter for jobs with no close date on job search.\n\nBug Fixes: \n- Added better error handling on reporting for jobs that did not have a group set.\n- Added a confirmation on changes to shop settings to indicate that a restart is required for them to take effect."
}
}
diff --git a/src/App/App.jsx b/src/App/App.jsx
index 471a210..0349a6b 100644
--- a/src/App/App.jsx
+++ b/src/App/App.jsx
@@ -1,9 +1,10 @@
import { ApolloProvider } from "@apollo/client";
-import { ConfigProvider, Spin } from "antd";
+import { ConfigProvider } from "antd";
import enLocale from "antd/es/locale/en_US";
import React, { useEffect } from "react";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
+import LoadingSpinnerAtom from "../components/atoms/loading-spinner/loading-spinner.atom";
import RoutesPage from "../components/pages/routes/routes.page";
import SignInPage from "../components/pages/sign-in/sign-in.page";
import client from "../graphql/GraphQLClient";
@@ -34,7 +35,7 @@ export function App({ currentUser, checkUserSession }) {
}, []);
if (currentUser.authorized === null) {
- return ;
+ return ;
}
return (
diff --git a/src/components/atoms/loading-spinner/loading-spinner.atom.jsx b/src/components/atoms/loading-spinner/loading-spinner.atom.jsx
new file mode 100644
index 0000000..890713b
--- /dev/null
+++ b/src/components/atoms/loading-spinner/loading-spinner.atom.jsx
@@ -0,0 +1,25 @@
+import React from "react";
+import { Spin } from "antd";
+import "./loading-spinner.styles.scss";
+
+export default function LoadingSpinnerAtom({
+ loading = true,
+ message,
+ ...props
+}) {
+ return (
+