From 851a6c1986f83c1e89574f62aa64df993b587a48 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Nov 2023 10:03:27 -0700 Subject: [PATCH 1/7] Bump ipython from 8.16.1 to 8.17.2 (#3931) Bumps [ipython](https://github.com/ipython/ipython) from 8.16.1 to 8.17.2. - [Release notes](https://github.com/ipython/ipython/releases) - [Commits](https://github.com/ipython/ipython/commits/8.17.2) --- updated-dependencies: - dependency-name: ipython dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-dev.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 3e20adc3d858..c5c9820e99c2 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -10,8 +10,6 @@ asttokens==2.2.1 # stack-data attrs==22.1.0 # via -r requirements-dev.in -backcall==0.2.0 - # via ipython black==23.10.1 # via -r requirements-dev.in cfgv==3.4.0 @@ -44,7 +42,7 @@ identify==2.5.27 # via pre-commit iniconfig==2.0.0 # via pytest -ipython==8.16.1 +ipython==8.17.2 # via -r requirements-dev.in jedi==0.19.0 # via ipython @@ -64,8 +62,6 @@ pathspec==0.11.2 # via black pexpect==4.8.0 # via ipython -pickleshare==0.7.5 - # via ipython platformdirs==3.10.0 # via # black From 92e9c556acc99c77348c53c05fda3ed96e0ba536 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Nov 2023 10:03:35 -0700 Subject: [PATCH 2/7] Bump markdown from 3.5 to 3.5.1 (#3930) Bumps [markdown](https://github.com/Python-Markdown/markdown) from 3.5 to 3.5.1. - [Release notes](https://github.com/Python-Markdown/markdown/releases) - [Changelog](https://github.com/Python-Markdown/markdown/blob/master/docs/changelog.md) - [Commits](https://github.com/Python-Markdown/markdown/compare/3.5...3.5.1) --- updated-dependencies: - dependency-name: markdown dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-base.txt b/requirements-base.txt index f0d0389d530e..13d6d2422237 100644 --- a/requirements-base.txt +++ b/requirements-base.txt @@ -212,7 +212,7 @@ lxml==4.9.3 # premailer mako==1.2.4 # via alembic -markdown==3.5 +markdown==3.5.1 # via -r requirements-base.in markupsafe==2.1.3 # via From 9b15b21696e24ebb5fdf1d6646c201da030a2626 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Nov 2023 10:03:43 -0700 Subject: [PATCH 3/7] Bump protobuf from 4.24.4 to 4.25.0 (#3929) Bumps [protobuf](https://github.com/protocolbuffers/protobuf) from 4.24.4 to 4.25.0. - [Release notes](https://github.com/protocolbuffers/protobuf/releases) - [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl) - [Commits](https://github.com/protocolbuffers/protobuf/compare/v4.24.4...v4.25.0) --- updated-dependencies: - dependency-name: protobuf dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-base.txt b/requirements-base.txt index 13d6d2422237..9aa526711939 100644 --- a/requirements-base.txt +++ b/requirements-base.txt @@ -278,7 +278,7 @@ preshed==3.0.8 # via # spacy # thinc -protobuf==4.24.4 +protobuf==4.25.0 # via # -r requirements-base.in # google-api-core From f96f88bdf53fc7debe130933f1cc0f5151a92241 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Nov 2023 10:03:51 -0700 Subject: [PATCH 4/7] Bump duo-client from 5.1.0 to 5.2.0 (#3928) Bumps [duo-client](https://github.com/duosecurity/duo_client_python) from 5.1.0 to 5.2.0. - [Release notes](https://github.com/duosecurity/duo_client_python/releases) - [Commits](https://github.com/duosecurity/duo_client_python/compare/5.1.0...5.2.0) --- updated-dependencies: - dependency-name: duo-client dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-base.txt b/requirements-base.txt index 9aa526711939..84e03581ef08 100644 --- a/requirements-base.txt +++ b/requirements-base.txt @@ -114,7 +114,7 @@ deprecation==2.1.0 # via pdpyras dnspython==2.4.2 # via email-validator -duo-client==5.1.0 +duo-client==5.2.0 # via -r requirements-base.in ecdsa==0.18.0 # via python-jose From 81080c5ff67702f9821e71b6217bac7ddb562389 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Nov 2023 10:03:58 -0700 Subject: [PATCH 5/7] Bump sentry-sdk from 1.32.0 to 1.34.0 (#3927) Bumps [sentry-sdk](https://github.com/getsentry/sentry-python) from 1.32.0 to 1.34.0. - [Release notes](https://github.com/getsentry/sentry-python/releases) - [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-python/compare/1.32.0...1.34.0) --- updated-dependencies: - dependency-name: sentry-sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements-base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-base.txt b/requirements-base.txt index 84e03581ef08..97db3619e514 100644 --- a/requirements-base.txt +++ b/requirements-base.txt @@ -382,7 +382,7 @@ scipy==1.11.2 # via statsmodels sentry-asgi==0.2.0 # via -r requirements-base.in -sentry-sdk==1.32.0 +sentry-sdk==1.34.0 # via # -r requirements-base.in # sentry-asgi From eec90f7239667a788cf9d264945707097deb3f70 Mon Sep 17 00:00:00 2001 From: kevgliss Date: Fri, 3 Nov 2023 11:53:18 -0700 Subject: [PATCH 6/7] Fixing participant select and centralizes component (#3925) * Fixing participant select and centralizes component * Add component * Removing spans * Fix linting * Fixes * Switch to auto-complete * Fixes autocomplete --- src/dispatch/static/dispatch/components.d.ts | 1 + .../static/dispatch/src/case/DetailsTab.vue | 2 +- .../dispatch/src/case/HandoffDialog.vue | 2 +- .../dispatch/src/case/ParticipantSelect.vue | 127 ---------------- .../src/components/ParticipantSelect.vue | 139 ++++++++++++++++++ .../incident/IncidentDialogFilter.vue | 2 +- .../dispatch/src/incident/DetailsTab.vue | 2 +- .../dispatch/src/incident/HandoffDialog.vue | 2 +- .../src/incident/ParticipantSelect.vue | 128 ---------------- .../src/incident/TableFilterDialog.vue | 2 +- .../static/dispatch/src/task/NewEditSheet.vue | 2 +- 11 files changed, 147 insertions(+), 262 deletions(-) delete mode 100644 src/dispatch/static/dispatch/src/case/ParticipantSelect.vue create mode 100644 src/dispatch/static/dispatch/src/components/ParticipantSelect.vue delete mode 100644 src/dispatch/static/dispatch/src/incident/ParticipantSelect.vue diff --git a/src/dispatch/static/dispatch/components.d.ts b/src/dispatch/static/dispatch/components.d.ts index 938f0eda76fa..20b7ce8714af 100644 --- a/src/dispatch/static/dispatch/components.d.ts +++ b/src/dispatch/static/dispatch/components.d.ts @@ -25,6 +25,7 @@ declare module '@vue/runtime-core' { MonacoEditor: typeof import('./src/components/MonacoEditor.vue')['default'] NotificationSnackbarsWrapper: typeof import('./src/components/NotificationSnackbarsWrapper.vue')['default'] PageHeader: typeof import('./src/components/PageHeader.vue')['default'] + ParticipantSelect: typeof import('./src/components/ParticipantSelect.vue')['default'] Refresh: typeof import('./src/components/Refresh.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] diff --git a/src/dispatch/static/dispatch/src/case/DetailsTab.vue b/src/dispatch/static/dispatch/src/case/DetailsTab.vue index 99786988c9d8..0dd2acc99f0d 100644 --- a/src/dispatch/static/dispatch/src/case/DetailsTab.vue +++ b/src/dispatch/static/dispatch/src/case/DetailsTab.vue @@ -131,7 +131,7 @@ import CaseSeveritySelect from "@/case/severity/CaseSeveritySelect.vue" import CaseTypeSelect from "@/case/type/CaseTypeSelect.vue" import DateTimePickerMenu from "@/components/DateTimePickerMenu.vue" import IncidentFilterCombobox from "@/incident/IncidentFilterCombobox.vue" -import ParticipantSelect from "@/incident/ParticipantSelect.vue" +import ParticipantSelect from "@/components/ParticipantSelect.vue" import ProjectSelect from "@/project/ProjectSelect.vue" import TagFilterAutoComplete from "@/tag/TagFilterAutoComplete.vue" diff --git a/src/dispatch/static/dispatch/src/case/HandoffDialog.vue b/src/dispatch/static/dispatch/src/case/HandoffDialog.vue index 05e65c5801ba..b786ff8b54a8 100644 --- a/src/dispatch/static/dispatch/src/case/HandoffDialog.vue +++ b/src/dispatch/static/dispatch/src/case/HandoffDialog.vue @@ -31,7 +31,7 @@ import { mapFields } from "vuex-map-fields" import { mapActions } from "vuex" -import ParticipantSelect from "@/incident/ParticipantSelect.vue" +import ParticipantSelect from "@/components/ParticipantSelect.vue" export default { name: "CaseHandoffDialog", diff --git a/src/dispatch/static/dispatch/src/case/ParticipantSelect.vue b/src/dispatch/static/dispatch/src/case/ParticipantSelect.vue deleted file mode 100644 index 0e8fbc57e67a..000000000000 --- a/src/dispatch/static/dispatch/src/case/ParticipantSelect.vue +++ /dev/null @@ -1,127 +0,0 @@ - - - diff --git a/src/dispatch/static/dispatch/src/components/ParticipantSelect.vue b/src/dispatch/static/dispatch/src/components/ParticipantSelect.vue new file mode 100644 index 000000000000..f7fc562aae18 --- /dev/null +++ b/src/dispatch/static/dispatch/src/components/ParticipantSelect.vue @@ -0,0 +1,139 @@ + + + diff --git a/src/dispatch/static/dispatch/src/dashboard/incident/IncidentDialogFilter.vue b/src/dispatch/static/dispatch/src/dashboard/incident/IncidentDialogFilter.vue index 7dac62efee00..97875ed28629 100644 --- a/src/dispatch/static/dispatch/src/dashboard/incident/IncidentDialogFilter.vue +++ b/src/dispatch/static/dispatch/src/dashboard/incident/IncidentDialogFilter.vue @@ -75,7 +75,7 @@ import ProjectCombobox from "@/project/ProjectCombobox.vue" import RouterUtils from "@/router/utils" import SearchUtils from "@/search/utils" import TagFilterAutoComplete from "@/tag/TagFilterAutoComplete.vue" -import ParticipantSelect from "@/incident/ParticipantSelect.vue" +import ParticipantSelect from "@/components/ParticipantSelect.vue" let today = function () { let now = new Date() diff --git a/src/dispatch/static/dispatch/src/incident/DetailsTab.vue b/src/dispatch/static/dispatch/src/incident/DetailsTab.vue index cb646216cc9e..4a8914fc5561 100644 --- a/src/dispatch/static/dispatch/src/incident/DetailsTab.vue +++ b/src/dispatch/static/dispatch/src/incident/DetailsTab.vue @@ -125,7 +125,7 @@ import IncidentFilterCombobox from "@/incident/IncidentFilterCombobox.vue" import IncidentPrioritySelect from "@/incident/priority/IncidentPrioritySelect.vue" import IncidentSeveritySelect from "@/incident/severity/IncidentSeveritySelect.vue" import IncidentTypeSelect from "@/incident/type/IncidentTypeSelect.vue" -import ParticipantSelect from "@/incident/ParticipantSelect.vue" +import ParticipantSelect from "@/components/ParticipantSelect.vue" import ProjectSelect from "@/project/ProjectSelect.vue" import TagFilterAutoComplete from "@/tag/TagFilterAutoComplete.vue" diff --git a/src/dispatch/static/dispatch/src/incident/HandoffDialog.vue b/src/dispatch/static/dispatch/src/incident/HandoffDialog.vue index 2cc96a6cc948..b7756a990b0d 100644 --- a/src/dispatch/static/dispatch/src/incident/HandoffDialog.vue +++ b/src/dispatch/static/dispatch/src/incident/HandoffDialog.vue @@ -38,7 +38,7 @@ import { mapFields } from "vuex-map-fields" import { mapActions } from "vuex" -import ParticipantSelect from "@/incident/ParticipantSelect.vue" +import ParticipantSelect from "@/components/ParticipantSelect.vue" export default { name: "IncidentHandoffDialog", diff --git a/src/dispatch/static/dispatch/src/incident/ParticipantSelect.vue b/src/dispatch/static/dispatch/src/incident/ParticipantSelect.vue deleted file mode 100644 index ea5dbeaa1393..000000000000 --- a/src/dispatch/static/dispatch/src/incident/ParticipantSelect.vue +++ /dev/null @@ -1,128 +0,0 @@ - - - diff --git a/src/dispatch/static/dispatch/src/incident/TableFilterDialog.vue b/src/dispatch/static/dispatch/src/incident/TableFilterDialog.vue index 2357d35f3719..6d03d3b392cb 100644 --- a/src/dispatch/static/dispatch/src/incident/TableFilterDialog.vue +++ b/src/dispatch/static/dispatch/src/incident/TableFilterDialog.vue @@ -78,7 +78,7 @@ import IncidentTypeCombobox from "@/incident/type/IncidentTypeCombobox.vue" import ProjectCombobox from "@/project/ProjectCombobox.vue" import TagFilterAutoComplete from "@/tag/TagFilterAutoComplete.vue" import TagTypeFilterCombobox from "@/tag_type/TagTypeFilterCombobox.vue" -import ParticipantSelect from "@/incident/ParticipantSelect.vue" +import ParticipantSelect from "@/components/ParticipantSelect.vue" export default { name: "IncidentTableFilterDialog", diff --git a/src/dispatch/static/dispatch/src/task/NewEditSheet.vue b/src/dispatch/static/dispatch/src/task/NewEditSheet.vue index b67cbb63c5c9..6e39e33928e9 100644 --- a/src/dispatch/static/dispatch/src/task/NewEditSheet.vue +++ b/src/dispatch/static/dispatch/src/task/NewEditSheet.vue @@ -107,7 +107,7 @@ import { mapActions } from "vuex" import ProjectSelect from "@/project/ProjectSelect.vue" import IncidentSelect from "@/incident/IncidentSelect.vue" -import ParticipantSelect from "@/incident/ParticipantSelect.vue" +import ParticipantSelect from "@/components/ParticipantSelect.vue" import AssigneeCombobox from "@/task/AssigneeCombobox.vue" import DateTimePickerMenu from "@/components/DateTimePickerMenu.vue" From c4fba840268b30cdde2826c8d59c6340e0ef96a2 Mon Sep 17 00:00:00 2001 From: David Whittaker <84562015+whitdog47@users.noreply.github.com> Date: Fri, 3 Nov 2023 12:22:43 -0700 Subject: [PATCH 7/7] Restyling templates settings page (#3926) --- .../src/document/template/TemplateTable.vue | 29 ++++++++++++++----- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/src/dispatch/static/dispatch/src/document/template/TemplateTable.vue b/src/dispatch/static/dispatch/src/document/template/TemplateTable.vue index 8753469f9161..89c4617feaac 100644 --- a/src/dispatch/static/dispatch/src/document/template/TemplateTable.vue +++ b/src/dispatch/static/dispatch/src/document/template/TemplateTable.vue @@ -7,17 +7,24 @@ - + - -
+ +
- {{ document.title }} - {{ document.description }} + + {{ document.title }} + + {{ document.icon }} + + + {{ document.description }}
- - {{ document.icon }} -
@@ -161,3 +168,9 @@ export default { }, } + +