diff --git a/src/dispatch/database/revisions/tenant/versions/2023-12-09_99d317cbc848.py b/src/dispatch/database/revisions/tenant/versions/2023-12-09_99d317cbc848.py index 661e511f91c7..12c93f07c0b4 100644 --- a/src/dispatch/database/revisions/tenant/versions/2023-12-09_99d317cbc848.py +++ b/src/dispatch/database/revisions/tenant/versions/2023-12-09_99d317cbc848.py @@ -7,7 +7,6 @@ """ from alembic import op import sqlalchemy as sa -import sqlalchemy_utils # revision identifiers, used by Alembic. revision = "99d317cbc848" diff --git a/src/dispatch/forms/models.py b/src/dispatch/forms/models.py index fa19cfcb1ae7..419474929142 100644 --- a/src/dispatch/forms/models.py +++ b/src/dispatch/forms/models.py @@ -2,8 +2,7 @@ from pydantic import Field from typing import Optional, List -from sqlalchemy import Column, Integer, ForeignKey, DateTime, String -from sqlalchemy_utils import TSVectorType +from sqlalchemy import Column, Integer, ForeignKey, String from sqlalchemy.orm import relationship from dispatch.database.core import Base diff --git a/src/dispatch/forms/service.py b/src/dispatch/forms/service.py index af6fb096aba9..b8354bddcc51 100644 --- a/src/dispatch/forms/service.py +++ b/src/dispatch/forms/service.py @@ -3,9 +3,8 @@ from sqlalchemy.orm import Session -from .models import Forms, FormsCreate, FormsUpdate +from .models import Forms, FormsUpdate from dispatch.individual import service as individual_service -from dispatch.project import service as project_service log = logging.getLogger(__name__) diff --git a/src/dispatch/forms/type/models.py b/src/dispatch/forms/type/models.py index a1dc2da43620..04080f9a24ec 100644 --- a/src/dispatch/forms/type/models.py +++ b/src/dispatch/forms/type/models.py @@ -2,9 +2,8 @@ from pydantic import Field from typing import List, Optional -from sqlalchemy import JSON, Boolean, Column, Integer, ForeignKey, String, DateTime +from sqlalchemy import Boolean, Column, Integer, ForeignKey, String from sqlalchemy.sql.schema import UniqueConstraint -from sqlalchemy_utils import TSVectorType from sqlalchemy.orm import relationship from dispatch.database.core import Base diff --git a/src/dispatch/forms/type/views.py b/src/dispatch/forms/type/views.py index f99f37f48569..1eccb817adab 100644 --- a/src/dispatch/forms/type/views.py +++ b/src/dispatch/forms/type/views.py @@ -50,7 +50,7 @@ def create_forms_type( return create( db_session=db_session, creator=current_user, forms_type_in=forms_type_in ) - except IntegrityError as e: + except IntegrityError: raise ValidationError( [ ErrorWrapper( diff --git a/src/dispatch/forms/views.py b/src/dispatch/forms/views.py index db2e59455199..8281cc5bcc23 100644 --- a/src/dispatch/forms/views.py +++ b/src/dispatch/forms/views.py @@ -14,7 +14,7 @@ from dispatch.models import PrimaryKey from dispatch.exceptions import ExistsError -from .models import FormsRead, FormsCreate, FormsUpdate, FormsPagination +from .models import FormsRead, FormsUpdate, FormsPagination from .service import get, create, update, delete log = logging.getLogger(__name__) diff --git a/src/dispatch/static/dispatch/package-lock.json b/src/dispatch/static/dispatch/package-lock.json index 8e587fc1741f..4c26be4f1081 100644 --- a/src/dispatch/static/dispatch/package-lock.json +++ b/src/dispatch/static/dispatch/package-lock.json @@ -587,7 +587,6 @@ "dependencies": { "@formkit/core": "1.4.0", "@formkit/utils": "1.4.0" -<<<<<<< HEAD } }, "node_modules/@formkit/pro": { @@ -600,8 +599,6 @@ "@formkit/core": "^1.4.0", "@formkit/drag-and-drop": "^0.0.5", "@formkit/inputs": "^1.4.0" -======= ->>>>>>> master } }, "node_modules/@formkit/rules": { diff --git a/src/dispatch/static/dispatch/src/forms/EditForm.vue b/src/dispatch/static/dispatch/src/forms/EditForm.vue index ed6bf04d8011..fd748eef5e8c 100644 --- a/src/dispatch/static/dispatch/src/forms/EditForm.vue +++ b/src/dispatch/static/dispatch/src/forms/EditForm.vue @@ -12,11 +12,19 @@ - + -
For more advanced form components, upgrade to FormKit Pro
+
+ For more advanced form components, upgrade to + FormKit Pro +
@@ -25,7 +33,12 @@ Exit without saving - + You will lose any changes. Continue? diff --git a/src/dispatch/static/dispatch/src/forms/api.js b/src/dispatch/static/dispatch/src/forms/api.js index 7ea132a50611..497518d90feb 100644 --- a/src/dispatch/static/dispatch/src/forms/api.js +++ b/src/dispatch/static/dispatch/src/forms/api.js @@ -12,7 +12,7 @@ export default { }, create(payload) { - return API.post(`${resource}`, payload) + return API.post(`${resource}`, payload) }, update(formId, creator_id, payload) { diff --git a/src/dispatch/static/dispatch/src/forms/table/AttorneyEditForm.vue b/src/dispatch/static/dispatch/src/forms/table/AttorneyEditForm.vue index 6d0b00cbf6e2..a46916ca365b 100644 --- a/src/dispatch/static/dispatch/src/forms/table/AttorneyEditForm.vue +++ b/src/dispatch/static/dispatch/src/forms/table/AttorneyEditForm.vue @@ -12,22 +12,28 @@ Incident Information - {{ item.question }}: {{ item.answer }}
+ {{ item.question }}: {{ item.answer }}
 - Slack channel: #{{ incident_data.name }}
+ Slack channel: #{{ incident_data.name }} +
- Incident document: {{ incident_data.name }} Incident Document
+ Incident document: + {{ incident_data.name }} Incident Document
Form Data - {{ item.question }}: {{ item.answer }}
+ {{ item.question }}: {{ item.answer }}
 Attorney Section - To be completed by counsel only. This section is privileged and confidential. + To be completed by counsel only. This section is privileged and confidential. @@ -56,7 +62,12 @@ Exit without saving - + You will lose any changes. Continue? @@ -65,7 +76,9 @@
- Update form + + Update form + diff --git a/src/dispatch/static/dispatch/src/forms/types/NewEditSheet.vue b/src/dispatch/static/dispatch/src/forms/types/NewEditSheet.vue index 435892c4a210..7d0fc30c9e44 100644 --- a/src/dispatch/static/dispatch/src/forms/types/NewEditSheet.vue +++ b/src/dispatch/static/dispatch/src/forms/types/NewEditSheet.vue @@ -67,7 +67,12 @@ name="Form Schema" /> -
For more advanced form components, upgrade to FormKit Pro
+
+ For more advanced form components, upgrade to + FormKit Pro +
diff --git a/src/dispatch/static/dispatch/src/incident/FormsTab.vue b/src/dispatch/static/dispatch/src/incident/FormsTab.vue index eb090978d327..ab1e0b3215d2 100644 --- a/src/dispatch/static/dispatch/src/incident/FormsTab.vue +++ b/src/dispatch/static/dispatch/src/incident/FormsTab.vue @@ -81,7 +81,6 @@ import NewEditDialog from "@/forms/EditForm.vue" import DeleteDialog from "@/forms/DeleteDialog.vue" import Participant from "@/incident/Participant.vue" - export default { name: "IncidentFormsTab", components: { NewEditDialog, DeleteDialog, Participant }, diff --git a/src/dispatch/static/dispatch/src/main.js b/src/dispatch/static/dispatch/src/main.js index 0648af319fc4..9f04b886bf2e 100644 --- a/src/dispatch/static/dispatch/src/main.js +++ b/src/dispatch/static/dispatch/src/main.js @@ -23,7 +23,6 @@ let SENTRY_ENABLED = import.meta.env.VITE_DISPATCH_SENTRY_ENABLED let SENTRY_DSN = import.meta.env.VITE_DISPATCH_SENTRY_DSN const FORMKIT_PRO_PROJECT_KEY = import.meta.env.VITE_FORMKIT_PRO_PROJECT_KEY - if (SENTRY_ENABLED) { const APP_HOSTNAME = document.location.host