From 43939a82806c9b199832109abb4476f1b64db968 Mon Sep 17 00:00:00 2001 From: Brent Bovenzi Date: Tue, 8 Dec 2020 21:17:54 -0600 Subject: [PATCH 1/4] css and npm fixes - add white background to menu button - move react-gtm-module from root directory to /client --- client/package-lock.json | 7 ++++++- client/package.json | 1 + client/src/components/Menu.js | 2 ++ package-lock.json | 7 +------ package.json | 1 - 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 9a7412c48..872bedf13 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1,6 +1,6 @@ { "name": "food-oasis-client", - "version": "1.0.28", + "version": "1.0.31", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -11616,6 +11616,11 @@ "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz", "integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==" }, + "react-gtm-module": { + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/react-gtm-module/-/react-gtm-module-2.0.11.tgz", + "integrity": "sha512-8gyj4TTxeP7eEyc2QKawEuQoAZdjKvMY4pgWfycGmqGByhs17fR+zEBs0JUDq4US/l+vbTl+6zvUIx27iDo/Vw==" + }, "react-i18next": { "version": "10.13.2", "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-10.13.2.tgz", diff --git a/client/package.json b/client/package.json index f7bba5ca1..42440382e 100644 --- a/client/package.json +++ b/client/package.json @@ -34,6 +34,7 @@ "react": "^16.13.1", "react-data-grid": "^6.1.0", "react-dom": "^16.13.1", + "react-gtm-module": "^2.0.11", "react-i18next": "^10.13.2", "react-map-gl": "^5.2.5", "react-proptypes": "^1.0.0", diff --git a/client/src/components/Menu.js b/client/src/components/Menu.js index 59335f8f4..ec487f8a4 100644 --- a/client/src/components/Menu.js +++ b/client/src/components/Menu.js @@ -33,8 +33,10 @@ const useStyles = makeStyles((theme) => ({ menuButton: { transform: "scale(1.6,1.5)", minWidth: "0", + backgroundColor: "#FFF", "&:hover": { backgroundColor: "#FFF", + opacity: 0.8, }, [theme.breakpoints.down("xs")]: { transform: "scale(1.2, 1.2)", diff --git a/package-lock.json b/package-lock.json index beaea7e12..523ee91d1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "foodoasis", - "version": "1.0.30", + "version": "1.0.31", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -5032,11 +5032,6 @@ "strip-json-comments": "~2.0.1" } }, - "react-gtm-module": { - "version": "2.0.11", - "resolved": "https://registry.npmjs.org/react-gtm-module/-/react-gtm-module-2.0.11.tgz", - "integrity": "sha512-8gyj4TTxeP7eEyc2QKawEuQoAZdjKvMY4pgWfycGmqGByhs17fR+zEBs0JUDq4US/l+vbTl+6zvUIx27iDo/Vw==" - }, "react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", diff --git a/package.json b/package.json index 18332bf09..7a4725ee3 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,6 @@ "passport-local": "^1.0.0", "pg": "^8.0.3", "pino-noir": "^2.2.1", - "react-gtm-module": "^2.0.11", "uuid": "^3.3.3" }, "devDependencies": { From f320e3dadc0d972528f9d835ca64c110105259c2 Mon Sep 17 00:00:00 2001 From: John Darragh Date: Wed, 9 Dec 2020 14:18:44 -0800 Subject: [PATCH 2/4] Request Assignments only assign from current tenant --- app/services/stakeholder-service.js | 3 ++- client/src/services/stakeholder-service.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/services/stakeholder-service.js b/app/services/stakeholder-service.js index 19254c574..e10b02114 100644 --- a/app/services/stakeholder-service.js +++ b/app/services/stakeholder-service.js @@ -661,13 +661,14 @@ const insert = async (model) => { }; const requestAssignment = async (model) => { - const { loginId } = model; + const { loginId, tenantId } = model; const sql = `with selected_stakeholder as ( select distinct sh.id, sh.modified_date from stakeholder sh join stakeholder_category sc on sh.id = sc.stakeholder_id join category c on sc.category_id = c.id where sh.verification_status_id = 1 + and sh.tenant_id = ${toSqlNumeric(tenantId)} and c.inactive = false order by sh.modified_date limit 1 diff --git a/client/src/services/stakeholder-service.js b/client/src/services/stakeholder-service.js index edacc5702..8a3a936a2 100644 --- a/client/src/services/stakeholder-service.js +++ b/client/src/services/stakeholder-service.js @@ -10,7 +10,7 @@ const toLocalMoment = (ts) => { }; export const search = async (searchParams) => { - searchParams = searchParams || {}; + searchParams = { ...searchParams, tenantId } || { tenantId }; const response = await axios.get(`${baseUrl}`, { params: searchParams, }); @@ -68,6 +68,7 @@ export const put = async (stakeholder) => { export const requestAssignment = async (loginId) => { const response = await axios.post(`${baseUrl}/requestAssignment`, { loginId, + tenantId, }); return response.data; }; From 95d13cf5267f9aeaf38f01abfb69287bf330f160 Mon Sep 17 00:00:00 2001 From: John Darragh Date: Wed, 9 Dec 2020 14:47:18 -0800 Subject: [PATCH 3/4] Remove tenant drop-down from csearch criteria --- .../components/Verification/SearchCriteria.js | 31 ------------------- .../Verification/SearchCriteriaDisplay.js | 20 ------------ .../Verification/VerificationAdmin.js | 8 +---- 3 files changed, 1 insertion(+), 58 deletions(-) diff --git a/client/src/components/Verification/SearchCriteria.js b/client/src/components/Verification/SearchCriteria.js index 6522bbcfc..5911febc5 100644 --- a/client/src/components/Verification/SearchCriteria.js +++ b/client/src/components/Verification/SearchCriteria.js @@ -36,7 +36,6 @@ const closeTo = (lat1, lon1, lat2, lon2) => { }; const SearchCriteria = ({ - tenants, userLatitude, userLongitude, categories, @@ -134,36 +133,6 @@ const SearchCriteria = ({ - - - - Region - - - - - { if ( - criteria.tenantId !== defaultCriteria.tenantId || criteria.name !== defaultCriteria.name || criteria.placeName !== defaultCriteria.placeName || criteria.radius !== defaultCriteria.radius || @@ -85,24 +83,6 @@ function SearchCriteriaDisplay({ const getCriteriaToDisplay = () => { let criterias = []; - if (criteria.tenantId !== defaultCriteria.tenantId) { - let tenantName = ""; - - tenants.forEach((tenant) => { - if (tenant.id === criteria.tenantId) { - tenantName = tenant.name; - } - }); - - criterias.push( - - ); - } - if (criteria.name !== defaultCriteria.name) { criterias.push(
!c.inactive)} - tenants={tenants} neighborhoods={neighborhoods} criteria={criteria} setCriteria={setCriteria} From f1ace2dec774e25d2bbc2ace46168c6143b8e2f0 Mon Sep 17 00:00:00 2001 From: John Darragh Date: Wed, 9 Dec 2020 15:01:53 -0800 Subject: [PATCH 4/4] Bumped version to 1.0.32 --- client/package.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/package.json b/client/package.json index 42440382e..aa1c86eff 100644 --- a/client/package.json +++ b/client/package.json @@ -1,7 +1,7 @@ { "name": "food-oasis-client", "description": "React Client for Food Oasis", - "version": "1.0.31", + "version": "1.0.32", "author": "Hack for LA", "license": "GPL-2.0", "private": true, diff --git a/package.json b/package.json index 7a4725ee3..bb49efe9d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "foodoasis", - "version": "1.0.31", + "version": "1.0.32", "author": "Hack for LA", "description": "Web API Server for Food Oasis", "main": "server.js",