Feature/dep94: Added authoring feedback functionality, fixed survey section (#2745)

* feature/dep94: Added feedback functionality, fixed survey section.

* feature/dep94: Refactored code as per Sonarqube Cloud.

* feature/dep94: Removed refs to react-router-dom, fixed report settings component and unit test, fixed Python linting.

* feature/dep94: Additional Python linting.

* feature/dep94: Python version typing resolution, light front-end unit test string conversion change.

* Hotfix: engagement tile display

* Remove vault secret placeholder as it was causing CD failure

* Hotfix: remove duplicate env-reader package from API dev dependencies

* feature/dep94: Made engagement_id nullable in Survey table, changed no content response for survey get, optimized survey loader, removed selected_survey_id from factory scenarios in API.

---------

Co-authored-by: NatSquared <nat.k.weiland@gmail.com>

Author: jareth-whitney

CHANGELOG.MD

@@ -1,3 +1,18 @@
+## February 18, 2026
+
+- Admin authoring - provide feedback section [🎟️ DEP-94](https://citz-gdx.atlassian.net/browse/DEP-94)
+  - Modified existing "Provide Feedback" section to reflect needed controls (Autocomplete survey selector), as per Steve
+  - Hooked up all form controls and created necessary columns in Engagement models/schemas to accomodate data
+  - Got validation working and added navigate away message when form is dirty
+  - Added a confirm modal if engagement is published and user is changing the survey
+- Fixed the survey section
+  - Got the survey creation wizard working
+  - Added mandatory field to select connected engagement when creating a new survey
+  - Fixed invalid calls for survey setting data before it exists
+  - Modified the survey loader to deliver data instead of promises due to complexity of survey data needs
+  - Fixed form validation that was misfiring
+  - Replaced many deprecated components (not exhaustive)
+
 ## February 10, 2026
 
 - **Chore** Move new look route from `/new-look` to base path `/` [🎟️ DEP-217](https://citz-gdx.atlassian.net/browse/DEP-217)

docs/MET_database_ERD.md

@@ -20,6 +20,9 @@ erDiagram
         timestamp scheduled_date
         integer tenant_id FK "The id from tenant"
         boolean is_internal
+        string feedback_heading
+        json feedback_body
+        string selected_survey_id
     }
     survey {
         integer id PK

met-api/migrations/versions/6261697b7a20_added_feedback_heading_and_feedback_.py

@@ -0,0 +1,26 @@
+"""Added feedback heading and feedback body columns to engagement table.
+
+Revision ID: 6261697b7a20
+Revises: 539c56c61127
+Create Date: 2026-02-06 14:12:26.770307
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = '6261697b7a20'
+down_revision = '539c56c61127'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.add_column('engagement', sa.Column('feedback_heading', sa.String(length=60), nullable=True))
+    op.add_column('engagement', sa.Column('feedback_body', postgresql.JSON(astext_type=sa.Text()), nullable=True))
+
+
+def downgrade():
+    op.drop_column('engagement', 'feedback_body')
+    op.drop_column('engagement', 'feedback_heading')

met-api/migrations/versions/6b80c03ea472_added_selected_survey_column_to_.py

@@ -0,0 +1,31 @@
+"""Added selected survey column to engagement, added relationship in survey model, modified engagement surveys.
+
+Revision ID: 6b80c03ea472
+Revises: 6261697b7a20
+Create Date: 2026-02-11 18:05:03.488297
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '6b80c03ea472'
+down_revision = '6261697b7a20'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.add_column('engagement', sa.Column('selected_survey_id', sa.Integer(), nullable=True))
+    op.create_foreign_key('engagement_selected_survey_fk', 'engagement', 'survey', ['selected_survey_id'], ['id'], ondelete='SET NULL')
+    op.alter_column('survey', 'engagement_id',
+               existing_type=sa.INTEGER(),
+               nullable=False)
+
+def downgrade():
+    op.alter_column('survey', 'engagement_id',
+               existing_type=sa.INTEGER(),
+               nullable=True)
+    op.drop_constraint('engagement_selected_survey_fk', 'engagement', type_='foreignkey')
+    op.drop_column('engagement', 'selected_survey_id')

met-api/migrations/versions/e65303810f54_making_engagement_id_column_in_survey_.py

@@ -0,0 +1,28 @@
+"""Making engagement_id column in Survey table nullable again.
+
+Revision ID: e65303810f54
+Revises: 6b80c03ea472
+Create Date: 2026-02-19 17:55:07.103147
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'e65303810f54'
+down_revision = '6b80c03ea472'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.alter_column('survey', 'engagement_id',
+               existing_type=sa.INTEGER(),
+               nullable=True)
+
+
+def downgrade():
+    op.alter_column('survey', 'engagement_id',
+               existing_type=sa.INTEGER(),
+               nullable=False)

met-api/sample.env

@@ -114,6 +114,7 @@ JWT_OIDC_TEST_ALGORITHMS=RS256
 
 # Test database settings
 # If unset, uses the same settings as the main database
+# Warning: Tests currently drop the public schema in the DB so do not use your primary db here.
 DATABASE_TEST_USERNAME=
 DATABASE_TEST_PASSWORD=
 DATABASE_TEST_NAME=

met-api/src/met_api/models/engagement.py

@@ -48,8 +48,20 @@ class Engagement(BaseModel):
     published_date = db.Column(db.DateTime, nullable=True)
     scheduled_date = db.Column(db.DateTime, nullable=True)
     banner_filename = db.Column(db.String(), unique=False, nullable=True)
+    feedback_heading = db.Column(db.String(60), unique=False, nullable=True)
+    feedback_body = db.Column(JSON, unique=False, nullable=True)
+    selected_survey_id = db.Column(db.Integer, ForeignKey(
+        'survey.id', ondelete='SET NULL'
+    ), nullable=True)
     surveys = db.relationship(
-        'Survey', backref='engagement', cascade='all, delete')
+        'Survey',
+        back_populates='engagement',
+        primaryjoin='Survey.engagement_id == Engagement.id',
+        foreign_keys='Survey.engagement_id',
+        cascade='all, delete-orphan',
+        passive_deletes=True,
+        lazy='selectin',
+    )
     status_block = db.relationship(
         'EngagementStatusBlock', backref='engagement')
     tenant_id = db.Column(
@@ -135,6 +147,9 @@ def update_engagement(cls, engagement: EngagementSchema) -> Engagement:
             'start_date': engagement.get('start_date', None),
             'end_date': engagement.get('end_date', None),
             'status_id': engagement.get('status_id', None),
+            'feedback_heading': engagement.get('feedback_heading', None),
+            'feedback_body': engagement.get('feedback_body', None),
+            'selected_survey_id': engagement.get('selected_survey_id', None),
             # to fix the bug with UI not passing published date always.
             # Defaulting to existing
             'published_date': engagement.get(

met-api/src/met_api/models/survey.py

@@ -31,21 +31,35 @@ class Survey(BaseModel):  # pylint: disable=too-few-public-methods
     id = db.Column(db.Integer, primary_key=True, autoincrement=True)
     name = db.Column(db.String(50), index=True)
     form_json = db.Column(postgresql.JSONB(astext_type=db.Text()), nullable=False, server_default='{}')
-    engagement_id = db.Column(db.Integer, ForeignKey('engagement.id', ondelete='CASCADE'))
+    engagement_id = db.Column(db.Integer, ForeignKey('engagement.id', ondelete='CASCADE'), nullable=True)
     comments = db.relationship('Comment', backref='survey', cascade='all, delete')
     submissions = db.relationship('Submission', backref='survey', cascade='all, delete')
     # Survey templates might not need tenant id
     tenant_id = db.Column(db.Integer, db.ForeignKey('tenant.id'), nullable=True)
     is_hidden = db.Column(db.Boolean, nullable=False)
     is_template = db.Column(db.Boolean, nullable=False)
     generate_dashboard = db.Column(db.Boolean, default=True)
+    engagement = db.relationship(
+        'Engagement',
+        back_populates='surveys',
+        foreign_keys=[engagement_id]
+    )
+
+    @classmethod
+    def get_survey(cls, survey_id) -> Survey:
+        """Get a single survey by ID, status agnostic."""
+        survey: Survey = db.session.query(Survey).filter_by(id=survey_id) \
+            .join(Survey.engagement) \
+            .join(EngagementStatus) \
+            .first()
+        return survey
 
     @classmethod
     def get_open(cls, survey_id) -> Survey:
         """Get an open survey."""
         now = datetime.now().date()  # Get the current date without the timestamp
         survey: Survey = db.session.query(Survey).filter_by(id=survey_id) \
-            .join(Engagement) \
+            .join(Survey.engagement) \
             .filter_by(status_id=Status.Published.value) \
             .filter(and_(func.date(Engagement.start_date) <= now, func.date(Engagement.end_date) >= now)) \
             .join(EngagementStatus) \
@@ -56,7 +70,18 @@ def get_open(cls, survey_id) -> Survey:
     def get_surveys_paginated(cls, pagination_options: PaginationOptions,
                               survey_search_options: SurveySearchOptions):
         """Get surveys paginated."""
-        query = db.session.query(Survey).join(Engagement, isouter=True).join(EngagementStatus, isouter=True)
+        query = (
+            db.session.query(Survey)
+            .outerjoin(
+                Engagement,
+                Survey.engagement_id == Engagement.id,
+            )
+            .outerjoin(
+                EngagementStatus,
+                Engagement.status_id == EngagementStatus.id,
+            )
+        )
+
         query = cls._add_tenant_filter(query)
 
         query = cls.filter_by_search_options(survey_search_options, query)

met-api/src/met_api/resources/engagement.py

@@ -157,13 +157,13 @@ def patch():
             requestjson['updated_by'] = user_id
 
             engagement_schema = EngagementSchema()
-            engagement_schema.load(requestjson, partial=True)
-            engagement = EngagementService().edit_engagement(requestjson)
+            payload = engagement_schema.load(requestjson, partial=True)
+            engagement = EngagementService().edit_engagement(payload)
 
             return engagement_schema.dump(engagement), HTTPStatus.OK
         except KeyError as err:
             return str(err), HTTPStatus.INTERNAL_SERVER_ERROR
         except ValueError as err:
             return str(err), HTTPStatus.INTERNAL_SERVER_ERROR
         except ValidationError as err:
-            return str(err.messages), HTTPStatus.INTERNAL_SERVER_ERROR
+            return str(err.messages), HTTPStatus.BAD_REQUEST

met-api/src/met_api/resources/report_setting.py

@@ -47,7 +47,7 @@ def get(survey_id):
             if report_setting:
                 return jsonify(report_setting), HTTPStatus.OK
 
-            return 'Report setting was not found', HTTPStatus.NOT_FOUND
+            return 'Report setting was not found', HTTPStatus.NO_CONTENT
         except KeyError:
             return 'Report setting was not found', HTTPStatus.INTERNAL_SERVER_ERROR
         except ValueError as err: