From 997ebdaa62addcfc22b3e83eb53ba1605c3602aa Mon Sep 17 00:00:00 2001 From: VineetBala-AOT Date: Tue, 6 Jun 2023 15:35:24 -0700 Subject: [PATCH 01/15] updates on engagement publish --- met-api/templates/publish_engagement.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/met-api/templates/publish_engagement.html b/met-api/templates/publish_engagement.html index ac5e504aa..e41503d33 100644 --- a/met-api/templates/publish_engagement.html +++ b/met-api/templates/publish_engagement.html @@ -8,4 +8,4 @@

Thank you for subscribing to our feedback tool.


Thank you,


-

The Team at the Environmental Assessment Office

\ No newline at end of file +

The Team at the Environmental Assessment Office

From f7f1c065f3ca60cd97b850ff2d51a4d7b904a4c9 Mon Sep 17 00:00:00 2001 From: VineetBala-AOT Date: Wed, 7 Jun 2023 10:48:18 -0700 Subject: [PATCH 02/15] update email template --- met-api/templates/publish_engagement.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/met-api/templates/publish_engagement.html b/met-api/templates/publish_engagement.html index e41503d33..ac5e504aa 100644 --- a/met-api/templates/publish_engagement.html +++ b/met-api/templates/publish_engagement.html @@ -8,4 +8,4 @@

Thank you for subscribing to our feedback tool.


Thank you,


-

The Team at the Environmental Assessment Office

+

The Team at the Environmental Assessment Office

\ No newline at end of file From 96447ec80aed75489e4c6fa04f7304a7175f6a68 Mon Sep 17 00:00:00 2001 From: VineetBala-AOT Date: Mon, 12 Jun 2023 14:06:00 -0700 Subject: [PATCH 03/15] adding action drop down --- .../components/userManagement/listing/AssignRoleModal.tsx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/met-web/src/components/userManagement/listing/AssignRoleModal.tsx b/met-web/src/components/userManagement/listing/AssignRoleModal.tsx index 41bf82bbb..6923601c2 100644 --- a/met-web/src/components/userManagement/listing/AssignRoleModal.tsx +++ b/met-web/src/components/userManagement/listing/AssignRoleModal.tsx @@ -1,8 +1,6 @@ -import React, { useContext, useEffect, useRef, useState } from 'react'; +import React, { useContext, useEffect, useState } from 'react'; import Modal from '@mui/material/Modal'; import { - Autocomplete, - CircularProgress, FormControl, FormControlLabel, FormHelperText, @@ -11,14 +9,13 @@ import { Paper, Radio, Stack, - TextField, useTheme, } from '@mui/material'; import { MetHeader3, MetLabel, MetSmallText, modalStyle, PrimaryButton, SecondaryButton } from 'components/common'; import { USER_GROUP } from 'models/user'; import { UserManagementContext } from './UserManagementContext'; import { Palette } from 'styles/Theme'; -import { useForm, FormProvider, SubmitHandler, Controller } from 'react-hook-form'; +import { useForm, FormProvider, SubmitHandler } from 'react-hook-form'; import { yupResolver } from '@hookform/resolvers/yup'; import * as yup from 'yup'; import ControlledRadioGroup from 'components/common/ControlledInputComponents/ControlledRadioGroup'; @@ -63,7 +60,6 @@ export const AssignRoleModal = () => { const { handleSubmit, - control, reset, formState: { errors }, watch, From 9222b5438c7e2398ae5e9727cfdc297d0e6f1495 Mon Sep 17 00:00:00 2001 From: VineetBala-AOT Date: Tue, 13 Jun 2023 09:18:44 -0700 Subject: [PATCH 04/15] updated changes for User Management --- .../components/userManagement/listing/AssignRoleModal.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/met-web/src/components/userManagement/listing/AssignRoleModal.tsx b/met-web/src/components/userManagement/listing/AssignRoleModal.tsx index 6923601c2..41bf82bbb 100644 --- a/met-web/src/components/userManagement/listing/AssignRoleModal.tsx +++ b/met-web/src/components/userManagement/listing/AssignRoleModal.tsx @@ -1,6 +1,8 @@ -import React, { useContext, useEffect, useState } from 'react'; +import React, { useContext, useEffect, useRef, useState } from 'react'; import Modal from '@mui/material/Modal'; import { + Autocomplete, + CircularProgress, FormControl, FormControlLabel, FormHelperText, @@ -9,13 +11,14 @@ import { Paper, Radio, Stack, + TextField, useTheme, } from '@mui/material'; import { MetHeader3, MetLabel, MetSmallText, modalStyle, PrimaryButton, SecondaryButton } from 'components/common'; import { USER_GROUP } from 'models/user'; import { UserManagementContext } from './UserManagementContext'; import { Palette } from 'styles/Theme'; -import { useForm, FormProvider, SubmitHandler } from 'react-hook-form'; +import { useForm, FormProvider, SubmitHandler, Controller } from 'react-hook-form'; import { yupResolver } from '@hookform/resolvers/yup'; import * as yup from 'yup'; import ControlledRadioGroup from 'components/common/ControlledInputComponents/ControlledRadioGroup'; @@ -60,6 +63,7 @@ export const AssignRoleModal = () => { const { handleSubmit, + control, reset, formState: { errors }, watch, From 5e657272844752637b05f80d8cff9aa3be92d363 Mon Sep 17 00:00:00 2001 From: VineetBala-AOT Date: Wed, 14 Jun 2023 12:40:10 -0700 Subject: [PATCH 05/15] access user details page for users without a role --- .../components/userManagement/userDetails/AddToEngagement.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/met-web/src/components/userManagement/userDetails/AddToEngagement.tsx b/met-web/src/components/userManagement/userDetails/AddToEngagement.tsx index 58dbf7041..050a994ae 100644 --- a/met-web/src/components/userManagement/userDetails/AddToEngagement.tsx +++ b/met-web/src/components/userManagement/userDetails/AddToEngagement.tsx @@ -55,6 +55,7 @@ export const AddToEngagementModal = () => { const [engagements, setEngagements] = useState([]); const [engagementsLoading, setEngagementsLoading] = useState(false); const [backendError, setBackendError] = useState(''); + const userHasRole = savedUser?.groups && savedUser?.groups.length > 0; const theme = useTheme(); From 76385b6235607576cd1e32dd8e1cdd4c5d0aef5b Mon Sep 17 00:00:00 2001 From: VineetBala-AOT Date: Wed, 14 Jun 2023 12:47:32 -0700 Subject: [PATCH 06/15] updating variable name --- .../components/userManagement/userDetails/AddToEngagement.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/met-web/src/components/userManagement/userDetails/AddToEngagement.tsx b/met-web/src/components/userManagement/userDetails/AddToEngagement.tsx index 050a994ae..2dae41931 100644 --- a/met-web/src/components/userManagement/userDetails/AddToEngagement.tsx +++ b/met-web/src/components/userManagement/userDetails/AddToEngagement.tsx @@ -55,7 +55,7 @@ export const AddToEngagementModal = () => { const [engagements, setEngagements] = useState([]); const [engagementsLoading, setEngagementsLoading] = useState(false); const [backendError, setBackendError] = useState(''); - const userHasRole = savedUser?.groups && savedUser?.groups.length > 0; + const userHasGroup = savedUser?.groups && savedUser?.groups.length > 0; const theme = useTheme(); From bd88eea916668b11ff97b44c61cda225dd6cc702 Mon Sep 17 00:00:00 2001 From: VineetBala-AOT Date: Wed, 14 Jun 2023 13:49:06 -0700 Subject: [PATCH 07/15] updating the schema --- .../components/userManagement/userDetails/AddToEngagement.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/met-web/src/components/userManagement/userDetails/AddToEngagement.tsx b/met-web/src/components/userManagement/userDetails/AddToEngagement.tsx index 2dae41931..58dbf7041 100644 --- a/met-web/src/components/userManagement/userDetails/AddToEngagement.tsx +++ b/met-web/src/components/userManagement/userDetails/AddToEngagement.tsx @@ -55,7 +55,6 @@ export const AddToEngagementModal = () => { const [engagements, setEngagements] = useState([]); const [engagementsLoading, setEngagementsLoading] = useState(false); const [backendError, setBackendError] = useState(''); - const userHasGroup = savedUser?.groups && savedUser?.groups.length > 0; const theme = useTheme(); From 50d37ddb0ff4e6818cdddc8d3ca9709ec537df65 Mon Sep 17 00:00:00 2001 From: VineetBala-AOT Date: Fri, 30 Jun 2023 13:33:29 -0700 Subject: [PATCH 08/15] updating as per review comments --- met-api/src/met_api/schemas/report_setting.py | 24 ++++++------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/met-api/src/met_api/schemas/report_setting.py b/met-api/src/met_api/schemas/report_setting.py index b06616570..1ef0028ca 100644 --- a/met-api/src/met_api/schemas/report_setting.py +++ b/met-api/src/met_api/schemas/report_setting.py @@ -3,25 +3,15 @@ Manages the report setting """ -from marshmallow import EXCLUDE, Schema, fields +from met_api.models import ReportSetting as ReportSettingModel +from .base_schema import BaseSchema -class ReportSettingSchema(Schema): - """Schema for report setting.""" - class Meta: # pylint: disable=too-few-public-methods - """Exclude unknown fields in the deserialized output.""" +class ReportSettingSchema(BaseSchema): # pylint: disable=too-many-ancestors, too-few-public-methods + """This is the schema for the report setting model.""" - unknown = EXCLUDE + class Meta(BaseSchema.Meta): # pylint: disable=too-few-public-methods + """Maps all of the report setting fields to a default schema.""" - id = fields.Int(data_key='id') - survey_id = fields.Int(data_key='survey_id') - question_id = fields.Str(data_key='question_id') - question_key = fields.Str(data_key='question_key') - question_type = fields.Str(data_key='question_type') - question = fields.Str(data_key='question') - display = fields.Bool(data_key='display') - created_by = fields.Str(data_key='created_by') - created_date = fields.Str(data_key='created_date') - updated_by = fields.Str(data_key='updated_by') - updated_date = fields.Str(data_key='updated_date') + model = ReportSettingModel From 81135e639188d8e3793011813452149a61cf80db Mon Sep 17 00:00:00 2001 From: VineetBala-AOT Date: Fri, 30 Jun 2023 14:06:39 -0700 Subject: [PATCH 09/15] updating schema --- met-api/src/met_api/schemas/report_setting.py | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/met-api/src/met_api/schemas/report_setting.py b/met-api/src/met_api/schemas/report_setting.py index 1ef0028ca..b06616570 100644 --- a/met-api/src/met_api/schemas/report_setting.py +++ b/met-api/src/met_api/schemas/report_setting.py @@ -3,15 +3,25 @@ Manages the report setting """ -from met_api.models import ReportSetting as ReportSettingModel +from marshmallow import EXCLUDE, Schema, fields -from .base_schema import BaseSchema +class ReportSettingSchema(Schema): + """Schema for report setting.""" -class ReportSettingSchema(BaseSchema): # pylint: disable=too-many-ancestors, too-few-public-methods - """This is the schema for the report setting model.""" + class Meta: # pylint: disable=too-few-public-methods + """Exclude unknown fields in the deserialized output.""" - class Meta(BaseSchema.Meta): # pylint: disable=too-few-public-methods - """Maps all of the report setting fields to a default schema.""" + unknown = EXCLUDE - model = ReportSettingModel + id = fields.Int(data_key='id') + survey_id = fields.Int(data_key='survey_id') + question_id = fields.Str(data_key='question_id') + question_key = fields.Str(data_key='question_key') + question_type = fields.Str(data_key='question_type') + question = fields.Str(data_key='question') + display = fields.Bool(data_key='display') + created_by = fields.Str(data_key='created_by') + created_date = fields.Str(data_key='created_date') + updated_by = fields.Str(data_key='updated_by') + updated_date = fields.Str(data_key='updated_date') From 89d183bdf6690e6150d3adff66f9469da437b704 Mon Sep 17 00:00:00 2001 From: VineetBala-AOT Date: Tue, 4 Jul 2023 14:48:34 -0700 Subject: [PATCH 10/15] adding changes for clone and delete --- met-api/src/met_api/models/report_setting.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/met-api/src/met_api/models/report_setting.py b/met-api/src/met_api/models/report_setting.py index e5420645c..ccddf10c6 100644 --- a/met-api/src/met_api/models/report_setting.py +++ b/met-api/src/met_api/models/report_setting.py @@ -5,6 +5,8 @@ """ from __future__ import annotations +from met_api.schemas.report_setting import ReportSettingSchema + from sqlalchemy import ForeignKey from met_api.schemas.report_setting import ReportSettingSchema From d4196f24aa9d271625fbb4ee2dd7421205b7e2be Mon Sep 17 00:00:00 2001 From: VineetBala-AOT Date: Tue, 4 Jul 2023 15:26:19 -0700 Subject: [PATCH 11/15] fixing linting --- met-api/src/met_api/models/report_setting.py | 1 + 1 file changed, 1 insertion(+) diff --git a/met-api/src/met_api/models/report_setting.py b/met-api/src/met_api/models/report_setting.py index ccddf10c6..e84710b57 100644 --- a/met-api/src/met_api/models/report_setting.py +++ b/met-api/src/met_api/models/report_setting.py @@ -5,6 +5,7 @@ """ from __future__ import annotations +from sqlalchemy import ForeignKey from met_api.schemas.report_setting import ReportSettingSchema from sqlalchemy import ForeignKey From bf4b2ef4020ffa3855f4c4b5c366520bfb9d4a70 Mon Sep 17 00:00:00 2001 From: VineetBala-AOT Date: Wed, 12 Jul 2023 10:17:22 -0700 Subject: [PATCH 12/15] update --- met-api/src/met_api/models/report_setting.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/met-api/src/met_api/models/report_setting.py b/met-api/src/met_api/models/report_setting.py index e84710b57..e5420645c 100644 --- a/met-api/src/met_api/models/report_setting.py +++ b/met-api/src/met_api/models/report_setting.py @@ -8,9 +8,6 @@ from sqlalchemy import ForeignKey from met_api.schemas.report_setting import ReportSettingSchema -from sqlalchemy import ForeignKey -from met_api.schemas.report_setting import ReportSettingSchema - from .base_model import BaseModel from .db import db From aca1b4eefd9260b4b2e2d88de51ce766ce662703 Mon Sep 17 00:00:00 2001 From: VineetBala-AOT Date: Thu, 13 Jul 2023 10:54:55 -0700 Subject: [PATCH 13/15] fix for report setting on analytics --- met-api/src/met_api/models/report_setting.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/met-api/src/met_api/models/report_setting.py b/met-api/src/met_api/models/report_setting.py index e5420645c..57855fb11 100644 --- a/met-api/src/met_api/models/report_setting.py +++ b/met-api/src/met_api/models/report_setting.py @@ -64,7 +64,7 @@ def add_all_report_settings(cls, survey_id, report_settings: list, session=None) else: session.add_all(new_report_setting) return new_report_setting - + @classmethod def delete_report_settings(cls, survey_id, question_keys: list) -> ReportSetting: """Delete report setting by survey id and question key.""" From 527d46adaced22f159a2e89515b678e9811bf3a9 Mon Sep 17 00:00:00 2001 From: VineetBala-AOT Date: Thu, 13 Jul 2023 11:10:43 -0700 Subject: [PATCH 14/15] fixing lint --- met-api/src/met_api/models/report_setting.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/met-api/src/met_api/models/report_setting.py b/met-api/src/met_api/models/report_setting.py index 57855fb11..e5420645c 100644 --- a/met-api/src/met_api/models/report_setting.py +++ b/met-api/src/met_api/models/report_setting.py @@ -64,7 +64,7 @@ def add_all_report_settings(cls, survey_id, report_settings: list, session=None) else: session.add_all(new_report_setting) return new_report_setting - + @classmethod def delete_report_settings(cls, survey_id, question_keys: list) -> ReportSetting: """Delete report setting by survey id and question key.""" From d95dcecb679ca331d95794927c6f34c612877a5c Mon Sep 17 00:00:00 2001 From: VineetBala-AOT Date: Thu, 13 Jul 2023 14:31:39 -0700 Subject: [PATCH 15/15] Updating null type check --- analytics-api/src/analytics_api/models/request_type_option.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/analytics-api/src/analytics_api/models/request_type_option.py b/analytics-api/src/analytics_api/models/request_type_option.py index 9d90a914d..c2a36fda4 100644 --- a/analytics-api/src/analytics_api/models/request_type_option.py +++ b/analytics-api/src/analytics_api/models/request_type_option.py @@ -34,7 +34,7 @@ def get_survey_result( .filter(and_(RequestTypeOption.survey_id.in_(analytics_survey_id), RequestTypeOption.is_active == true(), or_(RequestTypeOption.display == true(), - RequestTypeOption.display is None))) + RequestTypeOption.display.is_(None)))) .order_by(RequestTypeOption.position) .subquery())