From 37cbbaa9ca9d2398802babfe938a9a7567ea5df9 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Wed, 2 Aug 2023 11:30:21 -0400 Subject: [PATCH 001/445] APPEALS: 25136: refactored conference_client, changed calls to match name, updated method to be more generic, changed pexip.rb to ruby style --- .../virtual_hearings/conference_client.rb | 26 +++++++++++++++++++ app/jobs/virtual_hearings/conference_job.rb | 2 +- .../virtual_hearings/create_conference_job.rb | 4 +-- app/jobs/virtual_hearings/pexip_client.rb | 13 ---------- config/initializers/pexip.rb | 2 +- 5 files changed, 30 insertions(+), 17 deletions(-) create mode 100644 app/jobs/virtual_hearings/conference_client.rb delete mode 100644 app/jobs/virtual_hearings/pexip_client.rb diff --git a/app/jobs/virtual_hearings/conference_client.rb b/app/jobs/virtual_hearings/conference_client.rb new file mode 100644 index 00000000000..6c263da6b6f --- /dev/null +++ b/app/jobs/virtual_hearings/conference_client.rb @@ -0,0 +1,26 @@ +# frozen_string_literal: true + +module VirtualHearings::ConferenceClient + def client + case user.meeting_type + when "pexip" + @client ||= PexipService.new( + host: ENV["PEXIP_MANAGEMENT_NODE_HOST"], + port: ENV["PEXIP_MANAGEMENT_NODE_PORT"], + user_name: ENV["PEXIP_USERNAME"], + password: ENV["PEXIP_PASSWORD"], + client_host: ENV["PEXIP_CLIENT_HOST"] + ) + end + when "webex" + @client ||= WebexService.new( + host: ENV["WEBEX_MANAGEMENT_NODE_HOST"], + port: ENV["WEBEX_MANAGEMENT_NODE_PORT"], + user_name: ENV["WEBEX_USERNAME"], + password: ENV["WEBEX_PASSWORD"], + client_host: ENV["WEBEX_CLIENT_HOST"] + ) + end + end + end +end diff --git a/app/jobs/virtual_hearings/conference_job.rb b/app/jobs/virtual_hearings/conference_job.rb index 6bdc9ca03db..c92dbde5345 100644 --- a/app/jobs/virtual_hearings/conference_job.rb +++ b/app/jobs/virtual_hearings/conference_job.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class VirtualHearings::ConferenceJob < ApplicationJob - include VirtualHearings::PexipClient + include VirtualHearings::ConferenceClient private diff --git a/app/jobs/virtual_hearings/create_conference_job.rb b/app/jobs/virtual_hearings/create_conference_job.rb index 36d04423091..569a4387eb1 100644 --- a/app/jobs/virtual_hearings/create_conference_job.rb +++ b/app/jobs/virtual_hearings/create_conference_job.rb @@ -138,7 +138,7 @@ def create_conference "[#{virtual_hearing.hearing_id}])..." ) - pexip_response = create_pexip_conference + pexip_response = create_new_conference Rails.logger.info("Pexip response: #{pexip_response.inspect}") @@ -176,7 +176,7 @@ def pexip_error_display(response) "(#{response.error.code}) #{response.error.message}" end - def create_pexip_conference + def create_new_conference client.create_conference( host_pin: virtual_hearing.host_pin, guest_pin: virtual_hearing.guest_pin, diff --git a/app/jobs/virtual_hearings/pexip_client.rb b/app/jobs/virtual_hearings/pexip_client.rb deleted file mode 100644 index 70e5023f662..00000000000 --- a/app/jobs/virtual_hearings/pexip_client.rb +++ /dev/null @@ -1,13 +0,0 @@ -# frozen_string_literal: true - -module VirtualHearings::PexipClient - def client - @client ||= PexipService.new( - host: ENV["PEXIP_MANAGEMENT_NODE_HOST"], - port: ENV["PEXIP_MANAGEMENT_NODE_PORT"], - user_name: ENV["PEXIP_USERNAME"], - password: ENV["PEXIP_PASSWORD"], - client_host: ENV["PEXIP_CLIENT_HOST"] - ) - end -end diff --git a/config/initializers/pexip.rb b/config/initializers/pexip.rb index 0b84da94fb0..0cc6eb3bd58 100644 --- a/config/initializers/pexip.rb +++ b/config/initializers/pexip.rb @@ -1 +1 @@ -PexipService = (!ApplicationController.dependencies_faked? ? ExternalApi::PexipService : Fakes::PexipService) +PexipService = (ApplicationController.dependencies_faked? ? Fakes::PexipService : ExternalApi::PexipService) From 3b51fe7cd42661ed5fcfc970abd6f8a0a0567e5c Mon Sep 17 00:00:00 2001 From: breedbah Date: Wed, 2 Aug 2023 12:14:58 -0400 Subject: [PATCH 002/445] Updated index.html.erb --- app/views/queue/index.html.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/queue/index.html.erb b/app/views/queue/index.html.erb index e0ba7a1038a..be620d9da87 100644 --- a/app/views/queue/index.html.erb +++ b/app/views/queue/index.html.erb @@ -24,6 +24,7 @@ canEditCavcDashboards: current_user.can_edit_cavc_dashboards?, canViewCavcDashboards: current_user.can_view_cavc_dashboards?, userIsCobAdmin: ClerkOfTheBoard.singleton.admins.include?(current_user), + meetingType: current_user.meeting_type featureToggles: { collect_video_and_central_emails: FeatureToggle.enabled?(:collect_video_and_central_emails, user: current_user), enable_hearing_time_slots: FeatureToggle.enabled?(:enable_hearing_time_slots, user: current_user), @@ -53,7 +54,8 @@ cavc_remand_granted_substitute_appellant: FeatureToggle.enabled?(:cavc_remand_granted_substitute_appellant, user: current_user), cavc_dashboard_workflow: FeatureToggle.enabled?(:cavc_dashboard_workflow, user: current_user), cc_appeal_workflow: FeatureToggle.enabled?(:cc_appeal_workflow, user: current_user), - cc_vacatur_visibility: FeatureToggle.enabled?(:cc_vacatur_visibility, user: current_user) + cc_vacatur_visibility: FeatureToggle.enabled?(:cc_vacatur_visibility, user: current_user), + conference_selction_visibilty: FeatureToggle.enabled?(:conference_selction_visibilty,user: current_user) } }) %> <% end %> From 6bb011518f4d78d8d53ded5e6b907dfd4cd9da07 Mon Sep 17 00:00:00 2001 From: breedbah Date: Wed, 2 Aug 2023 15:10:12 -0400 Subject: [PATCH 003/445] Updated spelling --- app/views/queue/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/queue/index.html.erb b/app/views/queue/index.html.erb index 0ef261fe53a..3a866eb7bf1 100644 --- a/app/views/queue/index.html.erb +++ b/app/views/queue/index.html.erb @@ -59,7 +59,7 @@ justification_reason: FeatureToggle.enabled?(:justification_reason, user: current_user), cc_appeal_workflow: FeatureToggle.enabled?(:cc_appeal_workflow, user: current_user), cc_vacatur_visibility: FeatureToggle.enabled?(:cc_vacatur_visibility, user: current_user), - conference_selction_visibilty: FeatureToggle.enabled?(:conference_selction_visibilty,user: current_user) + conference_selection_visibilty: FeatureToggle.enabled?(:conference_selection_visibilty,user: current_user) } }) %> <% end %> From 6dfbee3a97fa3b8f8c3139e235815fb0a391bba3 Mon Sep 17 00:00:00 2001 From: breedbah Date: Wed, 2 Aug 2023 15:44:19 -0400 Subject: [PATCH 004/445] APPEALS-25137 Added logic for conference selection visibility --- app/views/queue/index.html.erb | 2 +- client/app/queue/OrganizationUsers.jsx | 6 ++++-- client/app/queue/QueueApp.jsx | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/views/queue/index.html.erb b/app/views/queue/index.html.erb index 3a866eb7bf1..240c44f0656 100644 --- a/app/views/queue/index.html.erb +++ b/app/views/queue/index.html.erb @@ -59,7 +59,7 @@ justification_reason: FeatureToggle.enabled?(:justification_reason, user: current_user), cc_appeal_workflow: FeatureToggle.enabled?(:cc_appeal_workflow, user: current_user), cc_vacatur_visibility: FeatureToggle.enabled?(:cc_vacatur_visibility, user: current_user), - conference_selection_visibilty: FeatureToggle.enabled?(:conference_selection_visibilty,user: current_user) + conference_selection_visibility: FeatureToggle.enabled?(:conference_selection_visibility,user: current_user) } }) %> <% end %> diff --git a/client/app/queue/OrganizationUsers.jsx b/client/app/queue/OrganizationUsers.jsx index 00c128bf118..7158f517fd7 100644 --- a/client/app/queue/OrganizationUsers.jsx +++ b/client/app/queue/OrganizationUsers.jsx @@ -253,6 +253,7 @@ export default class OrganizationUsers extends React.PureComponent { const listOfUsers = this.state.organizationUsers.map((user, i) => { const { dvc, admin } = user.attributes; const style = i === 0 ? topUserStyle : userStyle; + const { conferenceSelectionVisibility } = this.props; return
@@ -270,7 +271,7 @@ export default class OrganizationUsers extends React.PureComponent { { (judgeTeam || dvcTeam) ? '' : this.adminButton(user, admin) } { this.removeUserButton(user) }
- { this.state.organizationName === 'Hearing Admin' && + { this.state.organizationName === 'Hearing Admin' && !conferenceSelectionVisibility &&
@@ -381,5 +382,6 @@ export default class OrganizationUsers extends React.PureComponent { } OrganizationUsers.propTypes = { - organization: PropTypes.string + organization: PropTypes.string, + conferenceSelectionVisibility: PropTypes.bool }; diff --git a/client/app/queue/QueueApp.jsx b/client/app/queue/QueueApp.jsx index 077da987cce..fb20f7235b6 100644 --- a/client/app/queue/QueueApp.jsx +++ b/client/app/queue/QueueApp.jsx @@ -590,7 +590,9 @@ class QueueApp extends React.PureComponent { }; routedOrganizationUsers = (props) => ( - + ); routedTeamManagement = (props) => ; From 98cc12e6e6d1b798148f21b447ee3772225509fe Mon Sep 17 00:00:00 2001 From: breedbah Date: Thu, 3 Aug 2023 11:19:09 -0400 Subject: [PATCH 005/445] commented out meetingType --- app/views/queue/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/queue/index.html.erb b/app/views/queue/index.html.erb index 240c44f0656..14650b548b7 100644 --- a/app/views/queue/index.html.erb +++ b/app/views/queue/index.html.erb @@ -24,7 +24,7 @@ canEditCavcDashboards: current_user.can_edit_cavc_dashboards?, canViewCavcDashboards: current_user.can_view_cavc_dashboards?, userIsCobAdmin: ClerkOfTheBoard.singleton.admins.include?(current_user), - meetingType: current_user.meeting_type + # meetingType: current_user.meeting_type featureToggles: { collect_video_and_central_emails: FeatureToggle.enabled?(:collect_video_and_central_emails, user: current_user), enable_hearing_time_slots: FeatureToggle.enabled?(:enable_hearing_time_slots, user: current_user), From 9877152bc62ebe7f24cace858cfbdbe36e9af3ef Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Fri, 4 Aug 2023 09:52:18 -0400 Subject: [PATCH 006/445] APPEALS-25136: updates to the conference client --- .../virtual_hearings/conference_client.rb | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/app/jobs/virtual_hearings/conference_client.rb b/app/jobs/virtual_hearings/conference_client.rb index 6c263da6b6f..b36f53dffd6 100644 --- a/app/jobs/virtual_hearings/conference_client.rb +++ b/app/jobs/virtual_hearings/conference_client.rb @@ -3,24 +3,22 @@ module VirtualHearings::ConferenceClient def client case user.meeting_type - when "pexip" - @client ||= PexipService.new( - host: ENV["PEXIP_MANAGEMENT_NODE_HOST"], - port: ENV["PEXIP_MANAGEMENT_NODE_PORT"], - user_name: ENV["PEXIP_USERNAME"], - password: ENV["PEXIP_PASSWORD"], - client_host: ENV["PEXIP_CLIENT_HOST"] - ) - end - when "webex" - @client ||= WebexService.new( - host: ENV["WEBEX_MANAGEMENT_NODE_HOST"], - port: ENV["WEBEX_MANAGEMENT_NODE_PORT"], - user_name: ENV["WEBEX_USERNAME"], - password: ENV["WEBEX_PASSWORD"], - client_host: ENV["WEBEX_CLIENT_HOST"] - ) - end + when "pexip" + @client ||= PexipService.new( + host: ENV["PEXIP_MANAGEMENT_NODE_HOST"], + port: ENV["PEXIP_MANAGEMENT_NODE_PORT"], + user_name: ENV["PEXIP_USERNAME"], + password: ENV["PEXIP_PASSWORD"], + client_host: ENV["PEXIP_CLIENT_HOST"] + ) + when "webex" + @client ||= WebexService.new( + host: ENV["WEBEX_MANAGEMENT_NODE_HOST"], + port: ENV["WEBEX_MANAGEMENT_NODE_PORT"], + user_name: ENV["WEBEX_USERNAME"], + password: ENV["WEBEX_PASSWORD"], + client_host: ENV["WEBEX_CLIENT_HOST"] + ) end end end From 0c318228570e6829a2ef558f328bc02acb277447 Mon Sep 17 00:00:00 2001 From: breedbah Date: Fri, 4 Aug 2023 15:18:49 -0400 Subject: [PATCH 007/445] APPEALS-25137 updated React files to setMeetinType --- client/app/queue/QueueApp.jsx | 6 +++++- client/app/queue/uiReducer/uiActions.js | 7 +++++++ client/app/queue/uiReducer/uiConstants.js | 1 + client/app/queue/uiReducer/uiReducer.js | 4 ++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/client/app/queue/QueueApp.jsx b/client/app/queue/QueueApp.jsx index fb20f7235b6..fa745c15cd5 100644 --- a/client/app/queue/QueueApp.jsx +++ b/client/app/queue/QueueApp.jsx @@ -17,6 +17,7 @@ import { setCanEditCavcDashboards, setCanViewCavcDashboards, setFeatureToggles, + setMeetingType, setUserId, setUserRole, setUserCssId, @@ -111,6 +112,7 @@ class QueueApp extends React.PureComponent { this.props.setCanEditAod(this.props.canEditAod); this.props.setCanEditNodDate(this.props.userCanViewEditNodDate); this.props.setUserIsCobAdmin(this.props.userIsCobAdmin); + this.props.setMeetingType(this.props.meetingType); this.props.setCanEditCavcRemands(this.props.canEditCavcRemands); this.props.setCanEditCavcDashboards(this.props.canEditCavcDashboards); this.props.setCanViewCavcDashboards(this.props.canViewCavcDashboards); @@ -1225,7 +1227,7 @@ class QueueApp extends React.PureComponent { /> ({ @@ -1440,6 +1443,7 @@ const mapDispatchToProps = (dispatch) => setCanEditAod, setCanEditNodDate, setUserIsCobAdmin, + setMeetingType, setCanEditCavcRemands, setCanEditCavcDashboards, setCanViewCavcDashboards, diff --git a/client/app/queue/uiReducer/uiActions.js b/client/app/queue/uiReducer/uiActions.js index c428b105da2..1cabce79991 100644 --- a/client/app/queue/uiReducer/uiActions.js +++ b/client/app/queue/uiReducer/uiActions.js @@ -48,6 +48,13 @@ export const setUserIsCobAdmin = (userIsCobAdmin) => ({ } }); +export const setMeetingType = (meetingType) => ({ + type: ACTIONS.SET_MEETING_TYPE, + payload: { + meetingType + } +}); + export const setCanViewOvertimeStatus = (canViewOvertimeStatus) => ({ type: ACTIONS.SET_CAN_VIEW_OVERTIME_STATUS, payload: { diff --git a/client/app/queue/uiReducer/uiConstants.js b/client/app/queue/uiReducer/uiConstants.js index 212902a93d2..7b6c9d8743b 100644 --- a/client/app/queue/uiReducer/uiConstants.js +++ b/client/app/queue/uiReducer/uiConstants.js @@ -8,6 +8,7 @@ export const ACTIONS = { SET_FEEDBACK_URL: 'SET_FEEDBACK_URL', SET_TARGET_USER: 'SET_TARGET_USER', + SET_MEETING_TYPE: 'SET_MEETING_TYPE', HIGHLIGHT_INVALID_FORM_ITEMS: 'HIGHLIGHT_INVALID_FORM_ITEMS', RESET_ERROR_MESSAGES: 'RESET_ERROR_MESSAGES', diff --git a/client/app/queue/uiReducer/uiReducer.js b/client/app/queue/uiReducer/uiReducer.js index 2fbbf3871b4..711ff4e750d 100644 --- a/client/app/queue/uiReducer/uiReducer.js +++ b/client/app/queue/uiReducer/uiReducer.js @@ -99,6 +99,10 @@ const workQueueUiReducer = (state = initialState, action = {}) => { return update(state, { userIsCobAdmin: { $set: action.payload.userIsCobAdmin } }); + case ACTIONS.SET_MEETING_TYPE: + return update(state, { + meetingType: { $set: action.payload.meetingType } + }); case ACTIONS.SET_CAN_EDIT_CAVC_REMANDS: return update(state, { canEditCavcRemands: { $set: action.payload.canEditCavcRemands } From 8383fe03a0994e6f8ad38725cbe606e461fd6bdf Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Mon, 7 Aug 2023 10:33:40 -0400 Subject: [PATCH 008/445] APPEALS-25136: testing current_user vs user --- app/jobs/virtual_hearings/conference_client.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jobs/virtual_hearings/conference_client.rb b/app/jobs/virtual_hearings/conference_client.rb index b36f53dffd6..9593f2d05fc 100644 --- a/app/jobs/virtual_hearings/conference_client.rb +++ b/app/jobs/virtual_hearings/conference_client.rb @@ -2,7 +2,7 @@ module VirtualHearings::ConferenceClient def client - case user.meeting_type + case current_user.meeting_type when "pexip" @client ||= PexipService.new( host: ENV["PEXIP_MANAGEMENT_NODE_HOST"], From 1a366e98e2b471221d3131be0bf771095eb563dc Mon Sep 17 00:00:00 2001 From: breedbah Date: Mon, 7 Aug 2023 11:52:35 -0400 Subject: [PATCH 009/445] APPEALS-25137 completed meetimng type for redux store --- app/views/queue/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/queue/index.html.erb b/app/views/queue/index.html.erb index ee80ce49316..507e51addaa 100644 --- a/app/views/queue/index.html.erb +++ b/app/views/queue/index.html.erb @@ -24,7 +24,7 @@ canEditCavcDashboards: current_user.can_edit_cavc_dashboards?, canViewCavcDashboards: current_user.can_view_cavc_dashboards?, userIsCobAdmin: ClerkOfTheBoard.singleton.admins.include?(current_user), - # meetingType: current_user.meeting_type + meetingType: current_user.meeting_type, featureToggles: { collect_video_and_central_emails: FeatureToggle.enabled?(:collect_video_and_central_emails, user: current_user), enable_hearing_time_slots: FeatureToggle.enabled?(:enable_hearing_time_slots, user: current_user), From 6bafefa2ab2d5a9d8ecfa148d0398fe434b8a3c4 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Mon, 7 Aug 2023 20:28:17 -0400 Subject: [PATCH 010/445] APPEALS-25136: updated current user to use requeststore --- app/jobs/virtual_hearings/conference_client.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jobs/virtual_hearings/conference_client.rb b/app/jobs/virtual_hearings/conference_client.rb index 9593f2d05fc..233c42bafd2 100644 --- a/app/jobs/virtual_hearings/conference_client.rb +++ b/app/jobs/virtual_hearings/conference_client.rb @@ -2,7 +2,7 @@ module VirtualHearings::ConferenceClient def client - case current_user.meeting_type + case RequestStore.store[:current_user].meeting_type when "pexip" @client ||= PexipService.new( host: ENV["PEXIP_MANAGEMENT_NODE_HOST"], From 15cb34742da5531e1e64968a31c4c56d78d92b5e Mon Sep 17 00:00:00 2001 From: breedbah Date: Tue, 8 Aug 2023 13:43:43 -0400 Subject: [PATCH 011/445] APPEALS-25137 start of unit test creation --- .../OrganizationUsers.test.js | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 client/test/app/queue/organizationUsers/OrganizationUsers.test.js diff --git a/client/test/app/queue/organizationUsers/OrganizationUsers.test.js b/client/test/app/queue/organizationUsers/OrganizationUsers.test.js new file mode 100644 index 00000000000..fd0f01cff31 --- /dev/null +++ b/client/test/app/queue/organizationUsers/OrganizationUsers.test.js @@ -0,0 +1,41 @@ +import React from 'react'; +import { render, screen } from '@testing-library/react'; +import '@testing-library/jest-dom/extend-expect'; +import OrganizationUsers from 'app/queue/OrganizationUsers'; + +describe('Conference Selection Visibility Feature Toggle', () => { + it('renders the nested component when conferenceSelectionVisibility is true', () => { + render( + + ); + console.log(< OrganizationUsers />) + + const nestedText = screen.getByText("Pexip"); + expect(nestedText).toBeInTheDocument(); + }); + + it("does not render the nested component for other conditions", () => { + render( + + ); + + const nestedTextQuery = screen.queryByText("Pexip"); + expect(nestedTextQuery).not.toBeInTheDocument(); + + render( + + ); + + const nestedTextQuery2 = screen.queryByText("Pexip"); + expect(nestedTextQuery2).not.toBeInTheDocument(); + }); +}); From 69fc3aa5d0722ee1e0c7d2a013dcd9d759e88c4a Mon Sep 17 00:00:00 2001 From: breedbah Date: Tue, 8 Aug 2023 14:15:19 -0400 Subject: [PATCH 012/445] APPEALS-25137 Added async await to test --- client/app/queue/OrganizationUsers.jsx | 68 ++++++++++++------- .../OrganizationUsers.test.js | 44 ++++++------ 2 files changed, 66 insertions(+), 46 deletions(-) diff --git a/client/app/queue/OrganizationUsers.jsx b/client/app/queue/OrganizationUsers.jsx index 7158f517fd7..8115bb22d99 100644 --- a/client/app/queue/OrganizationUsers.jsx +++ b/client/app/queue/OrganizationUsers.jsx @@ -255,31 +255,51 @@ export default class OrganizationUsers extends React.PureComponent { const style = i === 0 ? topUserStyle : userStyle; const { conferenceSelectionVisibility } = this.props; - return -
-
    -
  • {this.formatName(user)} - { judgeTeam && admin && ( {COPY.USER_MANAGEMENT_JUDGE_LABEL} ) } - { dvcTeam && dvc && ( {COPY.USER_MANAGEMENT_DVC_LABEL} ) } - { judgeTeam && !admin && ( {COPY.USER_MANAGEMENT_ATTORNEY_LABEL} ) } - { (judgeTeam || dvcTeam) && admin && ( {COPY.USER_MANAGEMENT_ADMIN_LABEL} ) } -
    • - { (judgeTeam || dvcTeam) && admin ? -
    : -
    -
    - { (judgeTeam || dvcTeam) ? '' : this.adminButton(user, admin) } - { this.removeUserButton(user) } -
    - { this.state.organizationName === 'Hearing Admin' && !conferenceSelectionVisibility && -
    - + return ( + +
    +
      +
    • + {this.formatName(user)} + {judgeTeam && admin && ( + ( {COPY.USER_MANAGEMENT_JUDGE_LABEL} ) + )} + {dvcTeam && dvc && ( + ( {COPY.USER_MANAGEMENT_DVC_LABEL} ) + )} + {judgeTeam && !admin && ( + ( {COPY.USER_MANAGEMENT_ATTORNEY_LABEL} ) + )} + {(judgeTeam || dvcTeam) && admin && ( + ( {COPY.USER_MANAGEMENT_ADMIN_LABEL} ) + )} +
      • + {(judgeTeam || dvcTeam) && admin ? ( +
      + ) : ( +
      +
      + {judgeTeam || dvcTeam ? "" : this.adminButton(user, admin)} + {this.removeUserButton(user)}
      - } -
      } -
    -
    -     ; + {this.state.organizationName === "Hearing Admin" && + !conferenceSelectionVisibility && ( +
    + +
    + )} +
    + )} +
+
+ + ); }); return diff --git a/client/test/app/queue/organizationUsers/OrganizationUsers.test.js b/client/test/app/queue/organizationUsers/OrganizationUsers.test.js index fd0f01cff31..4f5aa5b06e1 100644 --- a/client/test/app/queue/organizationUsers/OrganizationUsers.test.js +++ b/client/test/app/queue/organizationUsers/OrganizationUsers.test.js @@ -4,38 +4,38 @@ import '@testing-library/jest-dom/extend-expect'; import OrganizationUsers from 'app/queue/OrganizationUsers'; describe('Conference Selection Visibility Feature Toggle', () => { - it('renders the nested component when conferenceSelectionVisibility is true', () => { + it('renders the nested component when conferenceSelectionVisibility is true',async () => { render( ); - console.log(< OrganizationUsers />) - const nestedText = screen.getByText("Pexip"); - expect(nestedText).toBeInTheDocument(); + screen.debug(); + const nestedText = await screen.findByTestId("conference-radio-button"); + expect(nestedText).toBeInTheDocument(); }); - it("does not render the nested component for other conditions", () => { - render( - - ); + // it("does not render the nested component for other conditions", () => { + // render( + // + // ); - const nestedTextQuery = screen.queryByText("Pexip"); - expect(nestedTextQuery).not.toBeInTheDocument(); + // const nestedTextQuery = screen.queryByText("Pexip"); + // expect(nestedTextQuery).not.toBeInTheDocument(); - render( - - ); + // render( + // + // ); - const nestedTextQuery2 = screen.queryByText("Pexip"); - expect(nestedTextQuery2).not.toBeInTheDocument(); - }); + // const nestedTextQuery2 = screen.queryByText("Pexip"); + // expect(nestedTextQuery2).not.toBeInTheDocument(); + // }); }); From 4c122ca670ac7797f66eff5cecb3a317d03b1db5 Mon Sep 17 00:00:00 2001 From: breedbah Date: Tue, 8 Aug 2023 16:24:19 -0400 Subject: [PATCH 013/445] APPEALS-25137 adding mocking ApiUtil to tests --- .../OrganizationUsers.test.js | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/client/test/app/queue/organizationUsers/OrganizationUsers.test.js b/client/test/app/queue/organizationUsers/OrganizationUsers.test.js index 4f5aa5b06e1..f435522dbe0 100644 --- a/client/test/app/queue/organizationUsers/OrganizationUsers.test.js +++ b/client/test/app/queue/organizationUsers/OrganizationUsers.test.js @@ -2,19 +2,33 @@ import React from 'react'; import { render, screen } from '@testing-library/react'; import '@testing-library/jest-dom/extend-expect'; import OrganizationUsers from 'app/queue/OrganizationUsers'; +import ApiUtil from 'client/app/util/ApiUtil.js'; + +jest.mock('/client/app/util/ApiUtil'); describe('Conference Selection Visibility Feature Toggle', () => { - it('renders the nested component when conferenceSelectionVisibility is true',async () => { + beforeEach(() => { + jest.clearAllMocks(); + }); + it('renders the nested component when conferenceSelectionVisibility is true', async () => { + const conferenceSelectionVisibilityValue = true; + + ApiUtil.get.mockResolvedValue({ + body: { + organizationName: 'Hearing Admin', + + }, + }); + render( ); + const nestedText = await screen.findByText('Remove from team:'); screen.debug(); - const nestedText = await screen.findByTestId("conference-radio-button"); - expect(nestedText).toBeInTheDocument(); + expect(nestedText).toBeInTheDocument(); }); // it("does not render the nested component for other conditions", () => { From 844f60d9a862c44ed376176c210b698bfd0dfa61 Mon Sep 17 00:00:00 2001 From: breedbah Date: Wed, 9 Aug 2023 07:23:38 -0400 Subject: [PATCH 014/445] Appeals-25137 Completed unit tests --- client/app/queue/OrganizationUsers.jsx | 5 +- .../OrganizationUsers.test.js | 168 ++++++++++++++---- 2 files changed, 138 insertions(+), 35 deletions(-) diff --git a/client/app/queue/OrganizationUsers.jsx b/client/app/queue/OrganizationUsers.jsx index 8115bb22d99..536cdd1bed0 100644 --- a/client/app/queue/OrganizationUsers.jsx +++ b/client/app/queue/OrganizationUsers.jsx @@ -279,13 +279,12 @@ export default class OrganizationUsers extends React.PureComponent { ) : (
- {judgeTeam || dvcTeam ? "" : this.adminButton(user, admin)} + {judgeTeam || dvcTeam ? '' : this.adminButton(user, admin)} {this.removeUserButton(user)}
- {this.state.organizationName === "Hearing Admin" && + {this.state.organizationName === 'Hearing Admin' && !conferenceSelectionVisibility && (
{ beforeEach(() => { jest.clearAllMocks(); }); - it('renders the nested component when conferenceSelectionVisibility is true', async () => { - const conferenceSelectionVisibilityValue = true; + it('Finds component by fieldset (Role) when conferenceSelectionVisibility is false', async () => { + const conferenceSelectionVisibilityValue = false; ApiUtil.get.mockResolvedValue({ body: { - organizationName: 'Hearing Admin', + organization_name: 'Hearing Admin', + judge_team: false, + dvc_team: false, + organization_users: { + data: [ + { + id: '126', + type: 'administered_user', + attributes: { + css_id: 'BVASORANGE', + full_name: 'Felicia BuildAndEditHearingSchedule Orange', + email: null, + admin: false, + dvc: null + } + }, + { + id: '2000001601', + type: 'administered_user', + attributes: { + css_id: 'AMBRISVACO', + full_name: 'Gail Maggio V', + email: 'juli@stroman-kertzmann.net', + admin: true, + dvc: null + } + }, + ], + }, + membership_requests: [], + isVhaOrg: false + } + }); + + const { findAllByText } = render( + + ); + const nestedText= await findAllByText('Webex'); + expect(nestedText[0]).toBeInTheDocument(); + }); + + it('Component does not render when conferenceSelectionVisibility is true', async () => { + const conferenceSelectionVisibilityValue = true; + + ApiUtil.get.mockResolvedValue({ + body: { + organization_name: 'Hearing Admin', + judge_team: false, + dvc_team: false, + organization_users: { + data: [ + { + id: '126', + type: 'administered_user', + attributes: { + css_id: 'BVASORANGE', + full_name: 'Felicia BuildAndEditHearingSchedule Orange', + email: null, + admin: false, + dvc: null, + }, + }, + { + id: '2000001601', + type: 'administered_user', + attributes: { + css_id: 'AMBRISVACO', + full_name: 'Gail Maggio V', + email: 'juli@stroman-kertzmann.net', + admin: true, + dvc: null, + }, + }, + ], + }, + membership_requests: [], + isVhaOrg: false, }, }); - render( + const { queryAllByText } = render( ); + const nestedText = await queryAllByText('group'); - const nestedText = await screen.findByText('Remove from team:'); - screen.debug(); - expect(nestedText).toBeInTheDocument(); + expect(nestedText).toHaveLength(0); }); - // it("does not render the nested component for other conditions", () => { - // render( - // - // ); - - // const nestedTextQuery = screen.queryByText("Pexip"); - // expect(nestedTextQuery).not.toBeInTheDocument(); - - // render( - // - // ); - - // const nestedTextQuery2 = screen.queryByText("Pexip"); - // expect(nestedTextQuery2).not.toBeInTheDocument(); - // }); + it('Component does not render when orginization_name is ot Hearing Admin', async () => { + const conferenceSelectionVisibilityValue = true; + + ApiUtil.get.mockResolvedValue({ + body: { + organization_name: 'Hearing Management', + judge_team: false, + dvc_team: false, + organization_users: { + data: [ + { + id: '126', + type: 'administered_user', + attributes: { + css_id: 'BVASORANGE', + full_name: 'Felicia BuildAndEditHearingSchedule Orange', + email: null, + admin: false, + dvc: null, + }, + }, + { + id: '2000001601', + type: 'administered_user', + attributes: { + css_id: 'AMBRISVACO', + full_name: 'Gail Maggio V', + email: 'juli@stroman-kertzmann.net', + admin: true, + dvc: null, + }, + }, + ], + }, + membership_requests: [], + isVhaOrg: false, + }, + }); + + const { queryAllByText } = render( + + ); + const nestedText = await queryAllByText('Webex'); + + expect(nestedText).toHaveLength(0); + }); }); From 50e929f6a740809f480b7e402aff0e9702c9daed Mon Sep 17 00:00:00 2001 From: breedbah Date: Wed, 9 Aug 2023 09:21:08 -0400 Subject: [PATCH 015/445] APPEALS-25137 Updated unit tests --- .../OrganizationUsers.test.js | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/client/test/app/queue/organizationUsers/OrganizationUsers.test.js b/client/test/app/queue/organizationUsers/OrganizationUsers.test.js index 77ac4934926..c4d6a5fa57c 100644 --- a/client/test/app/queue/organizationUsers/OrganizationUsers.test.js +++ b/client/test/app/queue/organizationUsers/OrganizationUsers.test.js @@ -10,7 +10,7 @@ describe('Conference Selection Visibility Feature Toggle', () => { beforeEach(() => { jest.clearAllMocks(); }); - it('Finds component by fieldset (Role) when conferenceSelectionVisibility is false', async () => { + it('Finds component by Text (Webex and Pexip) when conferenceSelectionVisibility is false', async () => { const conferenceSelectionVisibilityValue = false; ApiUtil.get.mockResolvedValue({ @@ -54,12 +54,14 @@ describe('Conference Selection Visibility Feature Toggle', () => { conferenceSelectionVisibility={conferenceSelectionVisibilityValue} /> ); - const nestedText= await findAllByText('Webex'); + const nestedTextWebex = await findAllByText('Webex'); + const nestedTextPexip = await findAllByText('Pexip'); - expect(nestedText[0]).toBeInTheDocument(); + expect(nestedTextWebex[0]).toBeInTheDocument(); + expect(nestedTextPexip[0]).toBeInTheDocument(); }); - it('Component does not render when conferenceSelectionVisibility is true', async () => { + it('Finds component by Text (Webex and Pexip) when conferenceSelectionVisibility is true', async () => { const conferenceSelectionVisibilityValue = true; ApiUtil.get.mockResolvedValue({ @@ -103,9 +105,11 @@ describe('Conference Selection Visibility Feature Toggle', () => { conferenceSelectionVisibility={conferenceSelectionVisibilityValue} /> ); - const nestedText = await queryAllByText('group'); + const nestedTextWebex = await queryAllByText('Webex'); + const nestedTextPexip = await queryAllByText('Pexip'); - expect(nestedText).toHaveLength(0); + expect(nestedTextWebex).toHaveLength(0); + expect(nestedTextPexip).toHaveLength(0); }); it('Component does not render when orginization_name is ot Hearing Admin', async () => { @@ -152,8 +156,11 @@ describe('Conference Selection Visibility Feature Toggle', () => { conferenceSelectionVisibility={conferenceSelectionVisibilityValue} /> ); - const nestedText = await queryAllByText('Webex'); + const nestedTextWebex = await queryAllByText('Webex'); + const nestedTextPexip = await queryAllByText('Pexip'); + + expect(nestedTextWebex).toHaveLength(0); + expect(nestedTextPexip).toHaveLength(0); - expect(nestedText).toHaveLength(0); }); }); From 8862f5fd8fed955ee53d14543d6e490496c1b1ce Mon Sep 17 00:00:00 2001 From: breedbah Date: Wed, 9 Aug 2023 09:42:41 -0400 Subject: [PATCH 016/445] APPEALS-25137 D.R.Y. out code in tests --- .../OrganizationUsers.test.js | 124 ++++++------------ 1 file changed, 40 insertions(+), 84 deletions(-) diff --git a/client/test/app/queue/organizationUsers/OrganizationUsers.test.js b/client/test/app/queue/organizationUsers/OrganizationUsers.test.js index c4d6a5fa57c..93b87887d71 100644 --- a/client/test/app/queue/organizationUsers/OrganizationUsers.test.js +++ b/client/test/app/queue/organizationUsers/OrganizationUsers.test.js @@ -10,106 +10,65 @@ describe('Conference Selection Visibility Feature Toggle', () => { beforeEach(() => { jest.clearAllMocks(); }); - it('Finds component by Text (Webex and Pexip) when conferenceSelectionVisibility is false', async () => { - const conferenceSelectionVisibilityValue = false; - - ApiUtil.get.mockResolvedValue({ - body: { - organization_name: 'Hearing Admin', - judge_team: false, - dvc_team: false, - organization_users: { - data: [ - { - id: '126', - type: 'administered_user', - attributes: { - css_id: 'BVASORANGE', - full_name: 'Felicia BuildAndEditHearingSchedule Orange', - email: null, - admin: false, - dvc: null - } + ApiUtil.get.mockResolvedValue({ + body: { + organization_name: 'Hearing Admin', + judge_team: false, + dvc_team: false, + organization_users: { + data: [ + { + id: '126', + type: 'administered_user', + attributes: { + css_id: 'BVASORANGE', + full_name: 'Felicia BuildAndEditHearingSchedule Orange', + email: null, + admin: false, + dvc: null, }, - { - id: '2000001601', - type: 'administered_user', - attributes: { - css_id: 'AMBRISVACO', - full_name: 'Gail Maggio V', - email: 'juli@stroman-kertzmann.net', - admin: true, - dvc: null - } + }, + { + id: '2000001601', + type: 'administered_user', + attributes: { + css_id: 'AMBRISVACO', + full_name: 'Gail Maggio V', + email: 'juli@stroman-kertzmann.net', + admin: true, + dvc: null, }, - ], - }, - membership_requests: [], - isVhaOrg: false - } - }); + }, + ], + }, + membership_requests: [], + isVhaOrg: false, + }, + }); + it('Finds component by Text when conferenceSelectionVisibility is false', async () => { + const conferenceSelectionVisibilityValue = false; const { findAllByText } = render( ); - const nestedTextWebex = await findAllByText('Webex'); - const nestedTextPexip = await findAllByText('Pexip'); + const nestedText = await findAllByText('Webex'); - expect(nestedTextWebex[0]).toBeInTheDocument(); - expect(nestedTextPexip[0]).toBeInTheDocument(); + expect(nestedText[0]).toBeInTheDocument(); }); - it('Finds component by Text (Webex and Pexip) when conferenceSelectionVisibility is true', async () => { + it('Component does not render when conferenceSelectionVisibility is true', async () => { const conferenceSelectionVisibilityValue = true; - ApiUtil.get.mockResolvedValue({ - body: { - organization_name: 'Hearing Admin', - judge_team: false, - dvc_team: false, - organization_users: { - data: [ - { - id: '126', - type: 'administered_user', - attributes: { - css_id: 'BVASORANGE', - full_name: 'Felicia BuildAndEditHearingSchedule Orange', - email: null, - admin: false, - dvc: null, - }, - }, - { - id: '2000001601', - type: 'administered_user', - attributes: { - css_id: 'AMBRISVACO', - full_name: 'Gail Maggio V', - email: 'juli@stroman-kertzmann.net', - admin: true, - dvc: null, - }, - }, - ], - }, - membership_requests: [], - isVhaOrg: false, - }, - }); - const { queryAllByText } = render( ); - const nestedTextWebex = await queryAllByText('Webex'); - const nestedTextPexip = await queryAllByText('Pexip'); + const nestedText = await queryAllByText('Webex'); - expect(nestedTextWebex).toHaveLength(0); - expect(nestedTextPexip).toHaveLength(0); + expect(nestedText).toHaveLength(0); }); it('Component does not render when orginization_name is ot Hearing Admin', async () => { @@ -157,10 +116,7 @@ describe('Conference Selection Visibility Feature Toggle', () => { /> ); const nestedTextWebex = await queryAllByText('Webex'); - const nestedTextPexip = await queryAllByText('Pexip'); expect(nestedTextWebex).toHaveLength(0); - expect(nestedTextPexip).toHaveLength(0); - }); }); From 6a845677588bd8ad89c87b798f5b01786d692540 Mon Sep 17 00:00:00 2001 From: breedbah Date: Wed, 9 Aug 2023 11:51:32 -0400 Subject: [PATCH 017/445] APPEALS-25137 Linting fixes --- client/app/queue/QueueApp.jsx | 19 ++++++++++--------- .../OrganizationUsers.test.js | 4 ++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/client/app/queue/QueueApp.jsx b/client/app/queue/QueueApp.jsx index f1b8746418e..3875a82e704 100644 --- a/client/app/queue/QueueApp.jsx +++ b/client/app/queue/QueueApp.jsx @@ -759,15 +759,15 @@ class QueueApp extends React.PureComponent { // eslint-disable-next-line default-case switch (this.props.reviewActionType) { - case DECISION_TYPES.OMO_REQUEST: - reviewActionType = 'OMO'; - break; - case DECISION_TYPES.DRAFT_DECISION: - reviewActionType = 'Draft Decision'; - break; - case DECISION_TYPES.DISPATCH: - reviewActionType = 'to Dispatch'; - break; + case DECISION_TYPES.OMO_REQUEST: + reviewActionType = 'OMO'; + break; + case DECISION_TYPES.DRAFT_DECISION: + reviewActionType = 'Draft Decision'; + break; + case DECISION_TYPES.DISPATCH: + reviewActionType = 'to Dispatch'; + break; } return `Draft Decision | Submit ${reviewActionType}`; @@ -1422,6 +1422,7 @@ QueueApp.propTypes = { canEditCavcDashboards: PropTypes.bool, canViewCavcDashboards: PropTypes.bool, userIsCobAdmin: PropTypes.bool, + meetingType: PropTypes.string, setMeetingType: PropTypes.string }; diff --git a/client/test/app/queue/organizationUsers/OrganizationUsers.test.js b/client/test/app/queue/organizationUsers/OrganizationUsers.test.js index 93b87887d71..9eee34d1726 100644 --- a/client/test/app/queue/organizationUsers/OrganizationUsers.test.js +++ b/client/test/app/queue/organizationUsers/OrganizationUsers.test.js @@ -71,8 +71,8 @@ describe('Conference Selection Visibility Feature Toggle', () => { expect(nestedText).toHaveLength(0); }); - it('Component does not render when orginization_name is ot Hearing Admin', async () => { - const conferenceSelectionVisibilityValue = true; + it('Component does not render when orginization_name is not Hearing Admin', async () => { + const conferenceSelectionVisibilityValue = false; ApiUtil.get.mockResolvedValue({ body: { From cfd7400e0d8ff27a15d5f95d0bdf90f5a262016e Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Wed, 9 Aug 2023 12:23:29 -0400 Subject: [PATCH 018/445] APPEALS-25136: added error catching on the case statement in client --- app/jobs/virtual_hearings/conference_client.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/jobs/virtual_hearings/conference_client.rb b/app/jobs/virtual_hearings/conference_client.rb index 233c42bafd2..9e1d453fae4 100644 --- a/app/jobs/virtual_hearings/conference_client.rb +++ b/app/jobs/virtual_hearings/conference_client.rb @@ -1,5 +1,6 @@ # frozen_string_literal: true +class VirtualHearingNotCreatedError < StandardError; end module VirtualHearings::ConferenceClient def client case RequestStore.store[:current_user].meeting_type @@ -19,6 +20,8 @@ def client password: ENV["WEBEX_PASSWORD"], client_host: ENV["WEBEX_CLIENT_HOST"] ) + else + fail VirtualHearingNotCreatedError, "Invalid meeting type" end end end From 9d4e99ed0ae943055e631f20e26a8c3fa1d23c71 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Thu, 10 Aug 2023 13:55:30 -0500 Subject: [PATCH 019/445] APPEALS-25136: make pexip specific errors and language more general --- app/jobs/virtual_hearings/create_conference_job.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/jobs/virtual_hearings/create_conference_job.rb b/app/jobs/virtual_hearings/create_conference_job.rb index 569a4387eb1..a16e0f1674e 100644 --- a/app/jobs/virtual_hearings/create_conference_job.rb +++ b/app/jobs/virtual_hearings/create_conference_job.rb @@ -138,12 +138,12 @@ def create_conference "[#{virtual_hearing.hearing_id}])..." ) - pexip_response = create_new_conference + create_conference_response = create_new_conference - Rails.logger.info("Pexip response: #{pexip_response.inspect}") + Rails.logger.info("Create Conference Response: #{create_conference_response.inspect}") - if pexip_response.error - error_display = pexip_error_display(pexip_response) + if create_conference_response.error + error_display = error_display(create_conference_response) Rails.logger.error("CreateConferenceJob failed: #{error_display}") @@ -151,12 +151,12 @@ def create_conference DataDogService.increment_counter(metric_name: "created_conference.failed", **create_conference_datadog_tags) - fail pexip_response.error + fail create_conference_response.error end DataDogService.increment_counter(metric_name: "created_conference.successful", **create_conference_datadog_tags) - virtual_hearing.update(conference_id: pexip_response.data[:conference_id]) + virtual_hearing.update(conference_id: create_conference_response.data[:conference_id]) end end @@ -172,7 +172,7 @@ def send_emails(email_type) end end - def pexip_error_display(response) + def error_display(response) "(#{response.error.code}) #{response.error.message}" end From 1f9dc770c3c8086f15d34ce99e0b988ad46d44c9 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Fri, 11 Aug 2023 08:28:47 -0500 Subject: [PATCH 020/445] APPEALS-25136: cannot get rspec to pass --- app/jobs/virtual_hearings/conference_client.rb | 17 ++++++++--------- lib/caseflow/error.rb | 7 ++++++- .../create_conference_job_spec.rb | 6 ++++++ 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/app/jobs/virtual_hearings/conference_client.rb b/app/jobs/virtual_hearings/conference_client.rb index 9e1d453fae4..7300ba92a19 100644 --- a/app/jobs/virtual_hearings/conference_client.rb +++ b/app/jobs/virtual_hearings/conference_client.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -class VirtualHearingNotCreatedError < StandardError; end module VirtualHearings::ConferenceClient def client case RequestStore.store[:current_user].meeting_type @@ -13,15 +12,15 @@ def client client_host: ENV["PEXIP_CLIENT_HOST"] ) when "webex" - @client ||= WebexService.new( - host: ENV["WEBEX_MANAGEMENT_NODE_HOST"], - port: ENV["WEBEX_MANAGEMENT_NODE_PORT"], - user_name: ENV["WEBEX_USERNAME"], - password: ENV["WEBEX_PASSWORD"], - client_host: ENV["WEBEX_CLIENT_HOST"] - ) + msg = "You hit the Webex Service!" + fail Caseflow::Error::WebexApiError, message: msg else - fail VirtualHearingNotCreatedError, "Invalid meeting type" + begin + fail ConferenceCreationError::MeetingTypeNotFoundError + rescue ConferenceCreationError::MeetingTypeNotFoundError => error + Rails.logger.error(error) + Raven.capture_exception(error) + end end end end diff --git a/lib/caseflow/error.rb b/lib/caseflow/error.rb index df77673dd3b..70f85bd5d25 100644 --- a/lib/caseflow/error.rb +++ b/lib/caseflow/error.rb @@ -405,11 +405,16 @@ class MissingRequiredFieldError < VacolsRepositoryError; end class IdtApiError < StandardError; end class InvalidOneTimeKey < IdtApiError; end - class PexipApiError < SerializableError; end + class ConferenceCreationError < SerializableError; end + class MeetingTypeNotFoundError < ConferenceCreationError; end + + class PexipApiError < ConferenceCreationError; end class PexipNotFoundError < PexipApiError; end class PexipBadRequestError < PexipApiError; end class PexipMethodNotAllowedError < PexipApiError; end + class WebexApiError < ConferenceCreationError; end + class WorkModeCouldNotUpdateError < StandardError; end class VirtualHearingConversionFailed < SerializableError diff --git a/spec/jobs/virtual_hearings/create_conference_job_spec.rb b/spec/jobs/virtual_hearings/create_conference_job_spec.rb index ea4297cedfb..343190c3a51 100644 --- a/spec/jobs/virtual_hearings/create_conference_job_spec.rb +++ b/spec/jobs/virtual_hearings/create_conference_job_spec.rb @@ -97,6 +97,12 @@ expect(virtual_hearing.guest_pin.to_s.length).to eq(11) end + it "fails when meeting type is webex" do + current_user.update!(meeting_type: "webex") + + expect(subject.perform_now).to raise_exception + end + include_examples "confirmation emails are sent" include_examples "sent email event objects are created" From 0bb944b96afa32ea3d849733a90a3197988fc578 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Fri, 11 Aug 2023 08:38:34 -0500 Subject: [PATCH 021/445] APPEALS-25136: rspec udpate --- app/jobs/virtual_hearings/conference_client.rb | 12 ++++++++++-- .../virtual_hearings/create_conference_job_spec.rb | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/jobs/virtual_hearings/conference_client.rb b/app/jobs/virtual_hearings/conference_client.rb index 7300ba92a19..c5420b6ee96 100644 --- a/app/jobs/virtual_hearings/conference_client.rb +++ b/app/jobs/virtual_hearings/conference_client.rb @@ -14,10 +14,18 @@ def client when "webex" msg = "You hit the Webex Service!" fail Caseflow::Error::WebexApiError, message: msg + # @client ||= WebexService.new( + # host: ENV["WEBEX_MANAGEMENT_NODE_HOST"], + # port: ENV["WEBEX_MANAGEMENT_NODE_PORT"], + # user_name: ENV["WEBEX_USERNAME"], + # password: ENV["WEBEX_PASSWORD"], + # client_host: ENV["WEBEX_CLIENT_HOST"] + # ) else begin - fail ConferenceCreationError::MeetingTypeNotFoundError - rescue ConferenceCreationError::MeetingTypeNotFoundError => error + msg = "Meeting type for the user is invalid" + fail Caseflow::Error::MeetingTypeNotFoundError, message: msg + rescue Caseflow::Error::MeetingTypeNotFoundError => error Rails.logger.error(error) Raven.capture_exception(error) end diff --git a/spec/jobs/virtual_hearings/create_conference_job_spec.rb b/spec/jobs/virtual_hearings/create_conference_job_spec.rb index 343190c3a51..21049fef411 100644 --- a/spec/jobs/virtual_hearings/create_conference_job_spec.rb +++ b/spec/jobs/virtual_hearings/create_conference_job_spec.rb @@ -100,7 +100,7 @@ it "fails when meeting type is webex" do current_user.update!(meeting_type: "webex") - expect(subject.perform_now).to raise_exception + expect { subject.perform_now }.to raise_exception end include_examples "confirmation emails are sent" From 599244a3ff0ab9f135fabdcb5df87c7a81b09a3f Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Fri, 11 Aug 2023 08:56:07 -0500 Subject: [PATCH 022/445] APPEALS-25136: updated tests, all are passing --- app/jobs/virtual_hearings/conference_client.rb | 9 ++------- spec/jobs/virtual_hearings/create_conference_job_spec.rb | 8 +++++++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/jobs/virtual_hearings/conference_client.rb b/app/jobs/virtual_hearings/conference_client.rb index c5420b6ee96..3b2d79e27dc 100644 --- a/app/jobs/virtual_hearings/conference_client.rb +++ b/app/jobs/virtual_hearings/conference_client.rb @@ -22,13 +22,8 @@ def client # client_host: ENV["WEBEX_CLIENT_HOST"] # ) else - begin - msg = "Meeting type for the user is invalid" - fail Caseflow::Error::MeetingTypeNotFoundError, message: msg - rescue Caseflow::Error::MeetingTypeNotFoundError => error - Rails.logger.error(error) - Raven.capture_exception(error) - end + msg = "Meeting type for the user is invalid" + fail Caseflow::Error::MeetingTypeNotFoundError, message: msg end end end diff --git a/spec/jobs/virtual_hearings/create_conference_job_spec.rb b/spec/jobs/virtual_hearings/create_conference_job_spec.rb index 21049fef411..db5d7384523 100644 --- a/spec/jobs/virtual_hearings/create_conference_job_spec.rb +++ b/spec/jobs/virtual_hearings/create_conference_job_spec.rb @@ -100,7 +100,13 @@ it "fails when meeting type is webex" do current_user.update!(meeting_type: "webex") - expect { subject.perform_now }.to raise_exception + expect { subject.perform_now }.to raise_exception(Caseflow::Error::WebexApiError) + end + + it "fails when a meeting type is neither pexip nor webex" do + current_user.update!(meeting_type: "say whaaaat") + + expect { subject.perform_now }.to raise_exception(Caseflow::Error::MeetingTypeNotFoundError) end include_examples "confirmation emails are sent" From 2d1354e453aea9823dfe595e6f263ee8530c2498 Mon Sep 17 00:00:00 2001 From: breedbah Date: Mon, 14 Aug 2023 13:08:39 -0400 Subject: [PATCH 023/445] APPEALS-28105 Initial adding of WEBEX Mockservice --- lib/fakes/webex_service.rb | 99 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 lib/fakes/webex_service.rb diff --git a/lib/fakes/webex_service.rb b/lib/fakes/webex_service.rb new file mode 100644 index 00000000000..1b4a586abe0 --- /dev/null +++ b/lib/fakes/webex_service.rb @@ -0,0 +1,99 @@ +# frozen_string_literal: true + +class Fakes::WebexService < ExternalApi::WebexService + COMMUNICATION_PACKAGE_UUID = "24eb6a66-3833-4de6-bea4-4b614e55d5ac" + DISTRIBUTION_UUID = "201cef13-49ba-4f40-8741-97d06cee0270" + + class << self + def send_communication_package_request(file_number, name, document_references) + fake_package_request(file_number, name, document_references) + end + + def send_distribution_request(package_id, recipient, destinations) + [fake_distribution_request(package_id, recipient, destinations)] + end + + def get_distribution_request(distribution_uuid) + distribution = VbmsDistribution.find_by(uuid: distribution_uuid) + + return distribution_not_found_response unless distribution + + fake_distribution_response(distribution.uuid) + end + + private + + def bad_request_response + HTTPI::Response.new( + 400, + {}, + { + "error": "BadRequestError", + "message": "Id is not valid" + }.with_indifferent_access + ) + end + + def bad_access_response + HTTPI::Response.new( + 403, + {}, + { + "error": "BadRequestError", + "message": "Conference link cannot be created due to insufficient privileges" + }.with_indifferent_access + ) + end + + def distribution_not_found_response + HTTPI::Response.new( + 404, + {}, + { + "error": "BadRequestError", + "message": "Conference link does not exist at this time" + }.with_indifferent_access + ) + end + + # POST: /package-manager-service/communication-package + def fake_package_request(file_number, name, document_references) + HTTPI::Response.new( + 201, + {}, + { + "id" => COMMUNICATION_PACKAGE_UUID, + "fileNumber": file_number, + "name": name, + "documentReferences": document_references, + "status": "NEW", + "createDate": "" + }.with_indifferent_access + ) + end + + # POST: /package-manager-service/distribution + def fake_distribution_request(package_id, recipient, destinations) + HTTPI::Response.new( + 201, + {}, + { + + }.with_indifferent_access + ) + end + + # rubocop:disable Metrics/MethodLength + # GET: /package-manager-service/distribution/{id} + def webex_conference_response(_distribution_id) + HTTPI::Response.new( + 200, + {}, + { + 'fake_key': 'fake_value' + }.with_indifferent_access + ) + end + # rubocop:enable Metrics/MethodLength + end +end From 4d741668672bb774852d22f46b9e91af288acce7 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Mon, 14 Aug 2023 17:26:58 -0500 Subject: [PATCH 024/445] APPEALS-25117: built out webex service --- app/services/external_api/webex_service.rb | 123 ++++++++++++++++++ .../webex_service/create_response.rb | 9 ++ .../webex_service/delete_response.rb | 3 + .../external_api/webex_service/response.rb | 52 ++++++++ lib/caseflow/error.rb | 10 +- 5 files changed, 196 insertions(+), 1 deletion(-) create mode 100644 app/services/external_api/webex_service.rb create mode 100644 app/services/external_api/webex_service/create_response.rb create mode 100644 app/services/external_api/webex_service/delete_response.rb create mode 100644 app/services/external_api/webex_service/response.rb diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb new file mode 100644 index 00000000000..a070c64af9f --- /dev/null +++ b/app/services/external_api/webex_service.rb @@ -0,0 +1,123 @@ +# frozen_string_literal: true + +require "json" + +class ExternalApi::WebexService + CONFERENCES_ENDPOINT = "api/admin/configuration/v1/conference/" + # POST https://api-usgov.webex.com/v1/meetings + + def initialize(host:, port: 443, user_name:, password:, client_host:) + @host = host + @port = port + @user_name = user_name + @password = password + @client_host = client_host + end + + def create_conference(host_pin:, guest_pin:, name:) + body = { + "title": "TBD", + "start": "TBD", + "end": "TBD", + # Formatting >> "2019-11-01 21:00:00", + "timezone": "TBD", + # Formatting >> "Asia/Shanghai", + "enabledAutoRecordMeeting": "false", + "allowAnyUserToBeCoHost": "false", + "enabledJoinBeforeHost": "false", + "enableConnectAudioBeforeHost": "false", + "joinBeforeHostMinutes": 0, + "excludePassword": "false", + "publicMeeting": "false", + "reminderTime": 0, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "enabledWebCastView": "false", + "enableAutomaticLock": "false", + "automaticLockMinutes": 0, + "allowFirstUserToBeCoHost": "false", + "allowAuthenticatedDevices": true, + "sendEmail": "false", + "siteUrl": "TBA FROM UC", + "meetingOptions": [ + { + "enabledChat": true, + "enableVideo": true + } + ], + "attendeePrivileges": { + "enableShareContent": true + }, + "enabledBreakoutSessions": false, + "audioConnectionOptions": [ + { + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": true, + "enabledGlobalCallIn": true, + "enabledAudianceCallBack": false, + "entryAndExitTone": "beep", + "allowHosttoUnmuteParticipants": true, + "allowAttendeeToUnmuteSelf": true, + "muteAttendeeUponEntry": true + } + ] + # "aliases": [{ "alias": "BVA#{name}" }, { "alias": VirtualHearing.formatted_alias(name) }, { "alias": name }], + # "allow_guests": true, + # "description": "Created by Caseflow", + # "enable_chat": "yes", + # "enable_overlay_text": true, + # # Theme ID is hard coded for now because it's the same in both environments. + # "ivr_theme": "/api/admin/configuration/v1/ivr_theme/13/", + # "force_presenter_into_main": true, + # "guest_pin": guest_pin.to_s, + # "name": "BVA#{name}", + # "pin": host_pin.to_s, + # "tag": "CASEFLOW" + } + + resp = send_pexip_request(CONFERENCES_ENDPOINT, :post, body: body) + return if resp.nil? + + ExternalApi::PexipService::CreateResponse.new(resp) + end + + def delete_conference(conference_id:) + return if conference_id.nil? + + delete_endpoint = "#{CONFERENCES_ENDPOINT}#{conference_id}/" + resp = send_pexip_request(delete_endpoint, :delete) + return if resp.nil? + + ExternalApi::PexipService::DeleteResponse.new(resp) + end + + private + + attr_reader :host, :port, :user_name, :password, :client_host + + # :nocov: + def send_pexip_request(endpoint, method, body: nil) + url = "https://#{host}:#{port}/#{endpoint}" + request = HTTPI::Request.new(url) + request.auth.basic(user_name, password) + request.open_timeout = 300 + request.read_timeout = 300 + request.auth.ssl.ca_cert_file = ENV["SSL_CERT_FILE"] + request.body = body.to_json unless body.nil? + + request.headers["Content-Type"] = "application/json" if method == :post + + MetricsService.record( + "#{host} #{method.to_s.upcase} request to #{url}", + service: :pexip, + name: endpoint + ) do + case method + when :delete + HTTPI.delete(request) + when :post + HTTPI.post(request) + end + end + end + # :nocov: +end diff --git a/app/services/external_api/webex_service/create_response.rb b/app/services/external_api/webex_service/create_response.rb new file mode 100644 index 00000000000..8ff1ea3afd1 --- /dev/null +++ b/app/services/external_api/webex_service/create_response.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class ExternalApi::WebexService::CreateResponse < ExternalApi::WebexService::Response + def data + return if resp.headers["Location"].nil? + + { "conference_id": resp.headers["Location"].split("/")[-1].to_s } + end +end diff --git a/app/services/external_api/webex_service/delete_response.rb b/app/services/external_api/webex_service/delete_response.rb new file mode 100644 index 00000000000..5c8be1f2f1c --- /dev/null +++ b/app/services/external_api/webex_service/delete_response.rb @@ -0,0 +1,3 @@ +# frozen_string_literal: true + +class ExternalApi::WebexService::DeleteResponse < ExternalApi::WebexService::Response; end diff --git a/app/services/external_api/webex_service/response.rb b/app/services/external_api/webex_service/response.rb new file mode 100644 index 00000000000..bbcf1ae8c0c --- /dev/null +++ b/app/services/external_api/webex_service/response.rb @@ -0,0 +1,52 @@ +# frozen_string_literal: true + +class ExternalApi::WebexService::Response + attr_reader :resp, :code + + def initialize(resp) + @resp = resp + @code = @resp.code + end + + def data; end + + def error + check_for_error + end + + def success? + !resp.error? + end + + private + + # :nocov: + def check_for_error + return if success? + + msg = error_message + case code + when 400 + Caseflow::Error::WebexBadRequestError.new(code: code, message: msg) + when 501 + Caseflow::Error::WebexApiError.new(code: code, message: msg) + when 404 + Caseflow::Error::WebexNotFoundError.new(code: code, message: msg) + when 405 + Caseflow::Error::WebexMethodNotAllowedError.new(code: code, message: msg) + else + Caseflow::Error::WebexApiError.new(code: code, message: msg) + end + end + + def error_message + return "No error message from Webex" if resp.raw_body.empty? + + begin + JSON.parse(resp.raw_body)["conference"]["name"].first + rescue JSON::ParserError + "No error message from Webex" + end + end + # :nocov: +end diff --git a/lib/caseflow/error.rb b/lib/caseflow/error.rb index df77673dd3b..ba9aa3e92d6 100644 --- a/lib/caseflow/error.rb +++ b/lib/caseflow/error.rb @@ -405,11 +405,19 @@ class MissingRequiredFieldError < VacolsRepositoryError; end class IdtApiError < StandardError; end class InvalidOneTimeKey < IdtApiError; end - class PexipApiError < SerializableError; end + class ConferenceCreationError < SerializableError; end + class MeetingTypeNotFoundError < ConferenceCreationError; end + + class PexipApiError < ConferenceCreationError; end class PexipNotFoundError < PexipApiError; end class PexipBadRequestError < PexipApiError; end class PexipMethodNotAllowedError < PexipApiError; end + class WebexApiError < ConferenceCreationError; end + class WebexNotFoundError < WebexApiError; end + class WebexBadRequestError < WebexApiError; end + class WebexMethodNotAllowedError < WebexApiError; end + class WorkModeCouldNotUpdateError < StandardError; end class VirtualHearingConversionFailed < SerializableError From d15cbd01de27807abf8472d2b8b5bb292f39937d Mon Sep 17 00:00:00 2001 From: breedbah Date: Tue, 15 Aug 2023 09:25:07 -0400 Subject: [PATCH 025/445] add commit --- lib/fakes/pexip_service.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/fakes/pexip_service.rb b/lib/fakes/pexip_service.rb index f0d20f204eb..53ff0f47dee 100644 --- a/lib/fakes/pexip_service.rb +++ b/lib/fakes/pexip_service.rb @@ -1,3 +1,4 @@ + # frozen_string_literal: true class Fakes::PexipService From 8ee71bc13fc0fc3d0ba73aeffae9012c2d3d2f64 Mon Sep 17 00:00:00 2001 From: breedbah Date: Tue, 15 Aug 2023 09:31:53 -0400 Subject: [PATCH 026/445] removed space --- lib/fakes/pexip_service.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/fakes/pexip_service.rb b/lib/fakes/pexip_service.rb index 53ff0f47dee..f0d20f204eb 100644 --- a/lib/fakes/pexip_service.rb +++ b/lib/fakes/pexip_service.rb @@ -1,4 +1,3 @@ - # frozen_string_literal: true class Fakes::PexipService From 6f2e8e0cdf95ae8eab94de320de6a787e5020345 Mon Sep 17 00:00:00 2001 From: breedbah Date: Wed, 16 Aug 2023 11:19:55 -0400 Subject: [PATCH 027/445] APPEALS-28105 start of webex custom server --- client/mocks/webex-mocks/README.md | 25 ++++++++ client/mocks/webex-mocks/webex-mock-server.js | 42 +++++++++++++ client/mocks/webex-mocks/webex-mock.json | 63 +++++++++++++++++++ client/package.json | 3 +- 4 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 client/mocks/webex-mocks/README.md create mode 100644 client/mocks/webex-mocks/webex-mock-server.js create mode 100644 client/mocks/webex-mocks/webex-mock.json diff --git a/client/mocks/webex-mocks/README.md b/client/mocks/webex-mocks/README.md new file mode 100644 index 00000000000..a74f888ec7c --- /dev/null +++ b/client/mocks/webex-mocks/README.md @@ -0,0 +1,25 @@ +Setup json server + +Step 1: Open a terminal + +Step 2: Navigate to the caseflow application + +step 3: Run command: npm install json-server + +step 4: Run command: npx json-server --watch client/mocks/webex-mocks/webex-mock.json --port 3001 + +*info: You will recieve all available routes within the terminal under 'Resources' + +*info: port must be set on a different port to run due to caseflow running on port 3000 + +step 5: Open a browser window in chrome and navigate to localhost:3001 [You will get an empty object] + +*info: reference guides +[https://jsonplaceholder.typicode.com/guide/] +[https://blog.logrocket.com/how-to-bootstrap-your-project-with-json-server/] + +step 6: Append the key to the path you are wanting to query [localhost:30001/conference-links] + +*info: this will give you the list of objects with the corresponding key + +step 7: Append the id to GET the specific id [localhost:30001/conference-links/1] diff --git a/client/mocks/webex-mocks/webex-mock-server.js b/client/mocks/webex-mocks/webex-mock-server.js new file mode 100644 index 00000000000..00a398e6dbb --- /dev/null +++ b/client/mocks/webex-mocks/webex-mock-server.js @@ -0,0 +1,42 @@ +const jsonServer = require("json-server"); +const express = require("express"); +const server = jsonServer.create(); +const router = jsonServer.router("mocks/webex-mocks/webex-mock.json"); // your mock data file +const middlewares = jsonServer.defaults(); + +server.use(middlewares); +server.use(jsonServer.bodyParser); + +// Example custom routes for specific error handling +server.get("/error-400", (req, res) => { + res + .status(400) + .json({ + message: "The request was invalid or cannot be otherwise served.", + }); +}); + +server.get("/error-401", (req, res) => { + res + .status(401) + .json({ message: "Authentication credentials were missing or incorrect." }); +}); + +// ... Similarly, add routes for other error codes ... + +// Middleware to handle not-found items +server.use((req, res, next) => { + if (req.method === 'GET' && res.locals.data == null) { + res.status(404).json({ message: "Item not found" }); + } else { + next(); + } +}); + +// To handle the default behavior, use the router middleware last +server.use(router); + +// Start the server +server.listen(3001, () => { + console.log("JSON Server is running on port 3001"); +}); diff --git a/client/mocks/webex-mocks/webex-mock.json b/client/mocks/webex-mocks/webex-mock.json new file mode 100644 index 00000000000..7b821c529e5 --- /dev/null +++ b/client/mocks/webex-mocks/webex-mock.json @@ -0,0 +1,63 @@ +{ + "conference-links": [ + { "id":1, + "title": "CASEFLOW_MOCK_SERVICE_<>", + "start": "2019-11-01 20:00:00", + "end": "2019-11-01 21:00:00", + "timezone": "Asia/Shanghai", + "enabledAutoRecordMeeting": false, + "allowAnyUserToBeCoHost": false, + "enabledJoinBeforeHost": false, + "enableConnectAudioBeforeHost": false, + "joinBeforeHostMinutes": 0, + "excludePassword": false, + "publicMeeting": false, + "reminderTime": 0, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "enabledWebCastView": false, + "enableAutomaticLock": false, + "automaticLockMinutes": 0, + "allowFirstUserToBeCoHost": false, + "allowAuthenticatedDevices": true, + "sendEmail": false, + "siteUrl": "", + "meetingOptions": [{ + "enabledChat": true, + "enableVideo": true + }], + "attendeePrivileges": { + "enableShareContent": true + }, + "enabledBreakoutSessions": false, + "audioConnectionOptions": [{ + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": true, + "enabledGlobalCallIn": true, + "enabledAudianceCallBack": false, + "entryAndExitTone": "beep", + "allowHosttoUnmuteParticipants": true, + "allowAttendeeToUnmuteSelf": true, + "muteAttendeeUponEntry": true + }] }, + { + "id": 2, + "title": "Number 2!!!", + "author": "typicode" + } + ], + "comments": [ + { + "id": 1, + "body": "some comment", + "postId": 1 + }, + { + "id": 2, + "body": "some comment", + "postId": 1 + } + ], + "profile": { + "name": "typicode" + } +} diff --git a/client/package.json b/client/package.json index cc2ba8fbd77..1efdc7c44f0 100644 --- a/client/package.json +++ b/client/package.json @@ -25,7 +25,8 @@ "dev": "yarn run dev:clear-build && NODE_ENV=development yarn run build -w", "dev:hot": "webpack-dev-server", "storybook": "start-storybook -p 6006", - "build:storybook": "build-storybook -o ../public/storybook" + "build:storybook": "build-storybook -o ../public/storybook", + "webex-server": "node mocks/webex-mocks/webex-mock-server" }, "cacheDirectories": [ "node_modules", From 717b69c85792e6d235a3efec0e2eed93579b7700 Mon Sep 17 00:00:00 2001 From: breedbah Date: Wed, 16 Aug 2023 13:55:08 -0400 Subject: [PATCH 028/445] APPEALS-28105 Adding error messages --- client/mocks/webex-mocks/README.md | 21 ++-- client/mocks/webex-mocks/webex-mock-server.js | 96 +++++++++++++++---- 2 files changed, 85 insertions(+), 32 deletions(-) diff --git a/client/mocks/webex-mocks/README.md b/client/mocks/webex-mocks/README.md index a74f888ec7c..33e47c11342 100644 --- a/client/mocks/webex-mocks/README.md +++ b/client/mocks/webex-mocks/README.md @@ -2,24 +2,21 @@ Setup json server Step 1: Open a terminal -Step 2: Navigate to the caseflow application +Step 2: Navigate to the caseflow/client step 3: Run command: npm install json-server -step 4: Run command: npx json-server --watch client/mocks/webex-mocks/webex-mock.json --port 3001 +step 4: Run command: npm run webex-server -*info: You will recieve all available routes within the terminal under 'Resources' +\*info: You will recieve all available routes within the terminal under 'Resources' -*info: port must be set on a different port to run due to caseflow running on port 3000 +\*info: port must be set on a different port to run due to caseflow running on port 3000 -step 5: Open a browser window in chrome and navigate to localhost:3001 [You will get an empty object] +step 5: Open a browser window in chrome and navigate to localhost:3001 [You will get the default page] -*info: reference guides -[https://jsonplaceholder.typicode.com/guide/] -[https://blog.logrocket.com/how-to-bootstrap-your-project-with-json-server/] +\*info: reference guides +[https://github.com/typicode/json-server/blob/master/README.md] -step 6: Append the key to the path you are wanting to query [localhost:30001/conference-links] -*info: this will give you the list of objects with the corresponding key - -step 7: Append the id to GET the specific id [localhost:30001/conference-links/1] +Tutorial Resources: +[https://www.youtube.com/watch?v=_1kNqAybxW0&list=PLC3y8-rFHvwhc9YZIdqNL5sWeTCGxF4ya&index=1] diff --git a/client/mocks/webex-mocks/webex-mock-server.js b/client/mocks/webex-mocks/webex-mock-server.js index 00a398e6dbb..c9dcb5ffdba 100644 --- a/client/mocks/webex-mocks/webex-mock-server.js +++ b/client/mocks/webex-mocks/webex-mock-server.js @@ -1,42 +1,98 @@ -const jsonServer = require("json-server"); -const express = require("express"); +const jsonServer = require('json-server'); const server = jsonServer.create(); -const router = jsonServer.router("mocks/webex-mocks/webex-mock.json"); // your mock data file +const router = jsonServer.router('mocks/webex-mocks/webex-mock.json'); const middlewares = jsonServer.defaults(); server.use(middlewares); server.use(jsonServer.bodyParser); // Example custom routes for specific error handling -server.get("/error-400", (req, res) => { - res - .status(400) - .json({ - message: "The request was invalid or cannot be otherwise served.", - }); +server.get('/error-400', (req, res) => { + res.status(400).json({ + message: 'The request was invalid or cannot be otherwise served.', + }); }); -server.get("/error-401", (req, res) => { - res - .status(401) - .json({ message: "Authentication credentials were missing or incorrect." }); +server.get('/error-401', (req, res) => { + res.status(401).json({ + message: 'Authentication credentials were missing or incorrect.' + }); +}); + +server.get('/error-403', (req, res) => { + res.status(403).json({ + message: 'The request is understood, but it has been refused or access is not allowed', + }); +}); + +server.get('/error-405', (req, res) => { + res.status(405).json({ + message: + 'The request was made to a resource using an HTTP request method that is not supported.', + }); +}); + +server.get('/error-409', (req, res) => { + res.status(409).json({ + message: + 'The request could not be processed because it conflicts with some established rule of the system.', + }); +}); + +server.get('/error-410', (req, res) => { + res.status(410).json({ + message: 'The requested resource is no longer available.', + }); }); // ... Similarly, add routes for other error codes ... +// To handle the default behavior, use the router middleware last +server.use(router); + // Middleware to handle not-found items server.use((req, res, next) => { - if (req.method === 'GET' && res.locals.data == null) { - res.status(404).json({ message: "Item not found" }); + if (req.method === 'GET' && res.locals.data === null) { + res.status(404).json({ message: 'Item not found' }); } else { next(); } }); -// To handle the default behavior, use the router middleware last -server.use(router); +const errorRoutes = [ + { + path: '/error-400', + description: 'The request was invalid or cannot be otherwise served.' + }, + { + path: '/error-401', + description: 'Authentication credentials were missing or incorrect.' + } + // ... Add other error routes here +]; + +// ... + +server.listen(3050, () => { + console.log(' \\{^_^}/ hi!\n'); + console.log(' Loading mocks/webex-mocks/webex-mock.json'); + console.log(' Done\n'); + + console.log(' Resources:'); + const routes = Object.keys(router.db.getState()); + + routes.forEach((route) => { + console.log(` http://localhost:3050/${route}`); + }); + + console.log('\n Error Routes:'); + errorRoutes.forEach(route => { + console.log(` ${route.path} - ${route.description}`); + }); + + console.log('\n Home'); + console.log(' http://localhost:3050'); -// Start the server -server.listen(3001, () => { - console.log("JSON Server is running on port 3001"); + console.log('\n Type s + enter at any time to create a snapshot of the database'); + console.log(' Watching...'); }); From 2f671d10029326d24413a0dbc65eb915bfab50cc Mon Sep 17 00:00:00 2001 From: breedbah Date: Wed, 16 Aug 2023 16:40:00 -0400 Subject: [PATCH 029/445] APPEALS-28105 Completed adding errors to server --- client/mocks/webex-mocks/webex-mock-server.js | 103 +++++++++++++++--- 1 file changed, 90 insertions(+), 13 deletions(-) diff --git a/client/mocks/webex-mocks/webex-mock-server.js b/client/mocks/webex-mocks/webex-mock-server.js index c9dcb5ffdba..b921b749bc5 100644 --- a/client/mocks/webex-mocks/webex-mock-server.js +++ b/client/mocks/webex-mocks/webex-mock-server.js @@ -45,6 +45,75 @@ server.get('/error-410', (req, res) => { }); }); +server.get('/error-415', (req, res) => { + res.status(415).json({ + message: + 'The request was made to a resource without specifying a media type or used a media type that is not supported.', + }); +}); + +server.get('/error-423', (req, res) => { + res.status(423).json({ + message: 'The requested resource is temporarily unavailable', + }); +}); + +server.get('/error-428', (req, res) => { + res.status(428).json({ + message: + 'File(s) cannot be scanned for malware and need to be force downloaded.', + }); +}); + +server.get('/error-429', (req, res) => { + res.status(429).json({ + message: + 'Too many requests have been sent in a given amount of time and the request has been rate limited.', + }); +}); + +server.get('/error-500', (req, res) => { + res.status(500).json({ + message: 'Something went wrong on the server.', + }); +}); + +server.get('/error-502', (req, res) => { + res.status(502).json({ + message: 'The server received an invalid response from an upstream server while processing the request.', + }); +}); + +server.get('/error-503', (req, res) => { + res.status(503).json({ + message: 'Server is overloaded with requests. Try again later.', + }); +}); + +server.get('/error-504', (req, res) => { + res.status(504).json({ + message: 'An upstream server failed to respond on time. If your query uses max parameter, please try to reduce it.', + }); +}); + +server.get('/health-check-yellow', (req, res) => { + res.status(200).json({ + status: 'yellow', + }); +}); + +server.get('/health-check-red', (req, res) => { + res.status(200).json({ + status: 'red', + }); +}); + +server.get('/health-check-green', (req, res) => { + res.status(200).json({ + status: 'green', + }); +}); + // ... Similarly, add routes for other error codes ... // To handle the default behavior, use the router middleware last @@ -60,18 +129,26 @@ server.use((req, res, next) => { }); const errorRoutes = [ - { - path: '/error-400', - description: 'The request was invalid or cannot be otherwise served.' - }, - { - path: '/error-401', - description: 'Authentication credentials were missing or incorrect.' - } - // ... Add other error routes here -]; + '/error-400', + '/error-401', + '/error-403', + '/error-404', + '/error-405', + '/error-409', + '/error-410', + '/error-415', + '/error-423', + '/error-428', + '/error-429', + '/error-500', + '/error-502', + '/error-503', + '/error-504', + '/health-check-yellow', + '/health-check-red', + '/health-check-green', -// ... +]; server.listen(3050, () => { console.log(' \\{^_^}/ hi!\n'); @@ -86,8 +163,8 @@ server.listen(3050, () => { }); console.log('\n Error Routes:'); - errorRoutes.forEach(route => { - console.log(` ${route.path} - ${route.description}`); + errorRoutes.forEach((route) => { + console.log(` ${route}`); }); console.log('\n Home'); From 1b8b8fbe167dcbc5ab72bf369de93d98019d127c Mon Sep 17 00:00:00 2001 From: breedbah Date: Thu, 17 Aug 2023 08:01:24 -0400 Subject: [PATCH 030/445] APPEALS-28105 changes to webex server --- client/mocks/webex-mocks/webex-mock.json | 357 ++++++++++++++++++++--- 1 file changed, 314 insertions(+), 43 deletions(-) diff --git a/client/mocks/webex-mocks/webex-mock.json b/client/mocks/webex-mocks/webex-mock.json index 7b821c529e5..7d50e1c5209 100644 --- a/client/mocks/webex-mocks/webex-mock.json +++ b/client/mocks/webex-mocks/webex-mock.json @@ -1,48 +1,319 @@ { "conference-links": [ - { "id":1, - "title": "CASEFLOW_MOCK_SERVICE_<>", - "start": "2019-11-01 20:00:00", - "end": "2019-11-01 21:00:00", - "timezone": "Asia/Shanghai", - "enabledAutoRecordMeeting": false, - "allowAnyUserToBeCoHost": false, - "enabledJoinBeforeHost": false, - "enableConnectAudioBeforeHost": false, - "joinBeforeHostMinutes": 0, - "excludePassword": false, - "publicMeeting": false, - "reminderTime": 0, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "enabledWebCastView": false, - "enableAutomaticLock": false, - "automaticLockMinutes": 0, - "allowFirstUserToBeCoHost": false, - "allowAuthenticatedDevices": true, - "sendEmail": false, - "siteUrl": "", - "meetingOptions": [{ - "enabledChat": true, - "enableVideo": true - }], - "attendeePrivileges": { - "enableShareContent": true - }, - "enabledBreakoutSessions": false, - "audioConnectionOptions": [{ - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": true, - "enabledGlobalCallIn": true, - "enabledAudianceCallBack": false, - "entryAndExitTone": "beep", - "allowHosttoUnmuteParticipants": true, - "allowAttendeeToUnmuteSelf": true, - "muteAttendeeUponEntry": true - }] }, { - "id": 2, - "title": "Number 2!!!", - "author": "typicode" + "id": 1, + "title": "CASEFLOW_MOCK_SERVICE_<>", + "start": "2019-11-01 20:00:00", + "end": "2019-11-01 21:00:00", + "timezone": "Asia/Shanghai", + "enabledAutoRecordMeeting": false, + "allowAnyUserToBeCoHost": false, + "enabledJoinBeforeHost": false, + "enableConnectAudioBeforeHost": false, + "joinBeforeHostMinutes": 0, + "excludePassword": false, + "publicMeeting": false, + "reminderTime": 0, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "enabledWebCastView": false, + "enableAutomaticLock": false, + "automaticLockMinutes": 0, + "allowFirstUserToBeCoHost": false, + "allowAuthenticatedDevices": true, + "sendEmail": false, + "siteUrl": "", + "meetingOptions": [ + { + "enabledChat": true, + "enableVideo": true + } + ], + "attendeePrivileges": { + "enableShareContent": true + }, + "enabledBreakoutSessions": false, + "audioConnectionOptions": [ + { + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": true, + "enabledGlobalCallIn": true, + "enabledAudianceCallBack": false, + "entryAndExitTone": "beep", + "allowHosttoUnmuteParticipants": true, + "allowAttendeeToUnmuteSelf": true, + "muteAttendeeUponEntry": true + } + ] + }, + { + "id": "2", + "title": "CASEFLOW_MOCK_SERVICE_<>", + "start": "2019-11-01 20:00:00", + "end": "2019-11-01 21:00:00", + "timezone": "Asia/Shanghai", + "enabledAutoRecordMeeting": false, + "allowAnyUserToBeCoHost": false, + "enabledJoinBeforeHost": false, + "enableConnectAudioBeforeHost": false, + "joinBeforeHostMinutes": 0, + "excludePassword": false, + "publicMeeting": false, + "reminderTime": 0, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "enabledWebCastView": false, + "enableAutomaticLock": false, + "automaticLockMinutes": 0, + "allowFirstUserToBeCoHost": false, + "allowAuthenticatedDevices": true, + "sendEmail": false, + "siteUrl": "", + "meetingOptions": [ + { + "enabledChat": true, + "enableVideo": true + } + ], + "attendeePrivileges": { + "enableShareContent": true + }, + "enabledBreakoutSessions": false, + "audioConnectionOptions": [ + { + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": true, + "enabledGlobalCallIn": true, + "enabledAudianceCallBack": false, + "entryAndExitTone": "beep", + "allowHosttoUnmuteParticipants": true, + "allowAttendeeToUnmuteSelf": true, + "muteAttendeeUponEntry": true + } + ] + }, + { + "id": "3", + "title": "CASEFLOW_MOCK_SERVICE_<>", + "start": "2019-11-01 20:00:00", + "end": "2019-11-01 21:00:00", + "timezone": "Asia/Shanghai", + "enabledAutoRecordMeeting": false, + "allowAnyUserToBeCoHost": false, + "enabledJoinBeforeHost": false, + "enableConnectAudioBeforeHost": false, + "joinBeforeHostMinutes": 0, + "excludePassword": false, + "publicMeeting": false, + "reminderTime": 0, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "enabledWebCastView": false, + "enableAutomaticLock": false, + "automaticLockMinutes": 0, + "allowFirstUserToBeCoHost": false, + "allowAuthenticatedDevices": true, + "sendEmail": false, + "siteUrl": "", + "meetingOptions": [ + { + "enabledChat": true, + "enableVideo": true + } + ], + "attendeePrivileges": { + "enableShareContent": true + }, + "enabledBreakoutSessions": false, + "audioConnectionOptions": [ + { + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": true, + "enabledGlobalCallIn": true, + "enabledAudianceCallBack": false, + "entryAndExitTone": "beep", + "allowHosttoUnmuteParticipants": true, + "allowAttendeeToUnmuteSelf": true, + "muteAttendeeUponEntry": true + } + ] + }, + { + "id": "4", + "title": "CASEFLOW_MOCK_SERVICE_<>", + "start": "2019-11-01 20:00:00", + "end": "2019-11-01 21:00:00", + "timezone": "Asia/Shanghai", + "enabledAutoRecordMeeting": false, + "allowAnyUserToBeCoHost": false, + "enabledJoinBeforeHost": false, + "enableConnectAudioBeforeHost": false, + "joinBeforeHostMinutes": 0, + "excludePassword": false, + "publicMeeting": false, + "reminderTime": 0, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "enabledWebCastView": false, + "enableAutomaticLock": false, + "automaticLockMinutes": 0, + "allowFirstUserToBeCoHost": false, + "allowAuthenticatedDevices": true, + "sendEmail": false, + "siteUrl": "", + "meetingOptions": [ + { + "enabledChat": true, + "enableVideo": true + } + ], + "attendeePrivileges": { + "enableShareContent": true + }, + "enabledBreakoutSessions": false, + "audioConnectionOptions": [ + { + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": true, + "enabledGlobalCallIn": true, + "enabledAudianceCallBack": false, + "entryAndExitTone": "beep", + "allowHosttoUnmuteParticipants": true, + "allowAttendeeToUnmuteSelf": true, + "muteAttendeeUponEntry": true + } + ] + }, + { + "id": "5", + "title": "CASEFLOW_MOCK_SERVICE_<>", + "start": "2019-11-01 20:00:00", + "end": "2019-11-01 21:00:00", + "timezone": "Asia/Shanghai", + "enabledAutoRecordMeeting": false, + "allowAnyUserToBeCoHost": false, + "enabledJoinBeforeHost": false, + "enableConnectAudioBeforeHost": false, + "joinBeforeHostMinutes": 0, + "excludePassword": false, + "publicMeeting": false, + "reminderTime": 0, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "enabledWebCastView": false, + "enableAutomaticLock": false, + "automaticLockMinutes": 0, + "allowFirstUserToBeCoHost": false, + "allowAuthenticatedDevices": true, + "sendEmail": false, + "siteUrl": "fakerdomain.com", + "meetingOptions": [ + { + "enabledChat": true, + "enableVideo": true + } + ], + "attendeePrivileges": { + "enableShareContent": true + }, + "enabledBreakoutSessions": false, + "audioConnectionOptions": [ + { + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": true, + "enabledGlobalCallIn": true, + "enabledAudianceCallBack": false, + "entryAndExitTone": "beep", + "allowHosttoUnmuteParticipants": true, + "allowAttendeeToUnmuteSelf": true, + "muteAttendeeUponEntry": true + } + ] + }, + { + "title": "CASEFLOW_MOCK_SERVICE_<>", + "start": "2019-11-01 20:00:00", + "end": "2019-11-01 21:00:00", + "timezone": "Asia/Shanghai", + "enabledAutoRecordMeeting": false, + "allowAnyUserToBeCoHost": false, + "enabledJoinBeforeHost": false, + "enableConnectAudioBeforeHost": false, + "joinBeforeHostMinutes": 0, + "excludePassword": false, + "publicMeeting": false, + "reminderTime": 0, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "enabledWebCastView": false, + "enableAutomaticLock": false, + "automaticLockMinutes": 0, + "allowFirstUserToBeCoHost": false, + "allowAuthenticatedDevices": true, + "sendEmail": false, + "siteUrl": "fakerdomain.com", + "meetingOptions": [ + { + "enabledChat": true, + "enableVideo": true + } + ], + "attendeePrivileges": { + "enableShareContent": true + }, + "enabledBreakoutSessions": false, + "audioConnectionOptions": [ + { + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": true, + "enabledGlobalCallIn": true, + "enabledAudianceCallBack": false, + "entryAndExitTone": "beep", + "allowHosttoUnmuteParticipants": true, + "allowAttendeeToUnmuteSelf": true, + "muteAttendeeUponEntry": true + } + ], + "id": "kN94iPM" + }, + { + "title": "CASEFLOW_MOCK_SERVICE_<>", + "start": "2019-11-01 20:00:00", + "end": "2019-11-01 21:00:00", + "timezone": "Asia/Shanghai", + "enabledAutoRecordMeeting": false, + "allowAnyUserToBeCoHost": false, + "enabledJoinBeforeHost": false, + "enableConnectAudioBeforeHost": false, + "joinBeforeHostMinutes": 0, + "excludePassword": false, + "publicMeeting": false, + "reminderTime": 0, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "enabledWebCastView": false, + "enableAutomaticLock": false, + "automaticLockMinutes": 0, + "allowFirstUserToBeCoHost": false, + "allowAuthenticatedDevices": true, + "sendEmail": false, + "siteUrl": "fakerdomain.com", + "meetingOptions": [ + { + "enabledChat": true, + "enableVideo": true + } + ], + "attendeePrivileges": { + "enableShareContent": true + }, + "enabledBreakoutSessions": false, + "audioConnectionOptions": [ + { + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": true, + "enabledGlobalCallIn": true, + "enabledAudianceCallBack": false, + "entryAndExitTone": "beep", + "allowHosttoUnmuteParticipants": true, + "allowAttendeeToUnmuteSelf": true, + "muteAttendeeUponEntry": true + } + ], + "id": "mv06qEy" } ], "comments": [ @@ -60,4 +331,4 @@ "profile": { "name": "typicode" } -} +} \ No newline at end of file From 05c620b0efd24756216cd4bf7ff85c62bf32d51e Mon Sep 17 00:00:00 2001 From: breedbah Date: Thu, 17 Aug 2023 12:07:59 -0400 Subject: [PATCH 031/445] APPEALS-28105 Started autogenerate data functionality --- client/mocks/webex-mocks/README.md | 6 +- client/mocks/webex-mocks/routes.json | 6 + .../mocks/webex-mocks/webex-mock-generator.js | 31 ++ client/mocks/webex-mocks/webex-mock-server.js | 170 ++++---- client/mocks/webex-mocks/webex-mock.json | 364 +++--------------- client/package.json | 3 +- lib/fakes/webex_service.rb | 99 ----- 7 files changed, 189 insertions(+), 490 deletions(-) create mode 100644 client/mocks/webex-mocks/routes.json create mode 100644 client/mocks/webex-mocks/webex-mock-generator.js delete mode 100644 lib/fakes/webex_service.rb diff --git a/client/mocks/webex-mocks/README.md b/client/mocks/webex-mocks/README.md index 33e47c11342..a51a05d8554 100644 --- a/client/mocks/webex-mocks/README.md +++ b/client/mocks/webex-mocks/README.md @@ -8,11 +8,15 @@ step 3: Run command: npm install json-server step 4: Run command: npm run webex-server +step 5: If you would like to autogenerate test data, run this command: npm run generate-webex + \*info: You will recieve all available routes within the terminal under 'Resources' \*info: port must be set on a different port to run due to caseflow running on port 3000 -step 5: Open a browser window in chrome and navigate to localhost:3001 [You will get the default page] +step 5: Open a browser window in chrome and navigate to localhost:3050 [You will get the default page] + +\*info: You can use any api endpoint software you want like Postman, but a good lightweight vs code ext. is [Thunder Client] \*info: reference guides [https://github.com/typicode/json-server/blob/master/README.md] diff --git a/client/mocks/webex-mocks/routes.json b/client/mocks/webex-mocks/routes.json new file mode 100644 index 00000000000..ce5c6a6006d --- /dev/null +++ b/client/mocks/webex-mocks/routes.json @@ -0,0 +1,6 @@ +{ + + "/api/conference-links/:id": "/conferencelinks/:id", + "/api/conference-links": "/conferenceLinks" + +} diff --git a/client/mocks/webex-mocks/webex-mock-generator.js b/client/mocks/webex-mocks/webex-mock-generator.js new file mode 100644 index 00000000000..b4cec01d566 --- /dev/null +++ b/client/mocks/webex-mocks/webex-mock-generator.js @@ -0,0 +1,31 @@ +const fs = require("fs"); +const faker = require("faker"); + +const generateConferenceLinks = () => { + let users = []; + + for (let id = 1; id <= 10; id++) { + users.push({ + id: id, + name: faker.name.firstName(), + email: faker.internet.email(), + address: faker.address.streetAddress(), + // ... other fields + }); + } + + return users; +}; + +// Generate the data +const data = { + conferenceLinks: generateConferenceLinks(), + // ... other data models +}; + +// Check if the script is being run directly +if (require.main === module) { + fs.writeFileSync("mocks/webex-mocks/webex-mock.json", JSON.stringify(data, null, 2)); + console.log("Generated new data in webex-mock.json"); +} + diff --git a/client/mocks/webex-mocks/webex-mock-server.js b/client/mocks/webex-mocks/webex-mock-server.js index b921b749bc5..cd75f624f1a 100644 --- a/client/mocks/webex-mocks/webex-mock-server.js +++ b/client/mocks/webex-mocks/webex-mock-server.js @@ -1,175 +1,195 @@ -const jsonServer = require('json-server'); +const jsonServer = require("json-server"); const server = jsonServer.create(); -const router = jsonServer.router('mocks/webex-mocks/webex-mock.json'); +const path = require("path"); +const router = jsonServer.router( + path.join("mocks/webex-mocks/webex-mock.json") +); const middlewares = jsonServer.defaults(); +const routesRewrite = require("./routes.json"); server.use(middlewares); server.use(jsonServer.bodyParser); -// Example custom routes for specific error handling -server.get('/error-400', (req, res) => { +// Apply the routes rewrites +server.use(jsonServer.rewriter(routesRewrite)); + +// Custom error routes and handlers +server.get("/error-400", (req, res) => { res.status(400).json({ - message: 'The request was invalid or cannot be otherwise served.', + message: "The request was invalid or cannot be otherwise served.", }); }); -server.get('/error-401', (req, res) => { +server.get("/error-401", (req, res) => { res.status(401).json({ - message: 'Authentication credentials were missing or incorrect.' + message: "Authentication credentials were missing or incorrect.", }); }); -server.get('/error-403', (req, res) => { +server.get("/error-403", (req, res) => { res.status(403).json({ - message: 'The request is understood, but it has been refused or access is not allowed', + message: + "The request is understood, but it has been refused or access is not allowed", }); }); -server.get('/error-405', (req, res) => { +server.get("/error-405", (req, res) => { res.status(405).json({ message: - 'The request was made to a resource using an HTTP request method that is not supported.', + "The request was made to a resource using an HTTP request method that is not supported.", }); }); -server.get('/error-409', (req, res) => { +server.get("/error-409", (req, res) => { res.status(409).json({ message: - 'The request could not be processed because it conflicts with some established rule of the system.', + "The request could not be processed because it conflicts with some established rule of the system.", }); }); -server.get('/error-410', (req, res) => { +server.get("/error-410", (req, res) => { res.status(410).json({ - message: 'The requested resource is no longer available.', + message: "The requested resource is no longer available.", }); }); -server.get('/error-415', (req, res) => { +server.get("/error-415", (req, res) => { res.status(415).json({ message: - 'The request was made to a resource without specifying a media type or used a media type that is not supported.', + "The request was made to a resource without specifying a media type or used a media type that is not supported.", }); }); -server.get('/error-423', (req, res) => { +server.get("/error-423", (req, res) => { res.status(423).json({ - message: 'The requested resource is temporarily unavailable', + message: "The requested resource is temporarily unavailable", }); }); -server.get('/error-428', (req, res) => { +server.get("/error-428", (req, res) => { res.status(428).json({ message: - 'File(s) cannot be scanned for malware and need to be force downloaded.', + "File(s) cannot be scanned for malware and need to be force downloaded.", }); }); -server.get('/error-429', (req, res) => { +server.get("/error-429", (req, res) => { res.status(429).json({ message: - 'Too many requests have been sent in a given amount of time and the request has been rate limited.', + "Too many requests have been sent in a given amount of time and the request has been rate limited.", }); }); -server.get('/error-500', (req, res) => { +server.get("/error-500", (req, res) => { res.status(500).json({ - message: 'Something went wrong on the server.', + message: "Something went wrong on the server.", }); }); -server.get('/error-502', (req, res) => { +server.get("/error-502", (req, res) => { res.status(502).json({ - message: 'The server received an invalid response from an upstream server while processing the request.', + message: + "The server received an invalid response from an upstream server while processing the request.", }); }); -server.get('/error-503', (req, res) => { +server.get("/error-503", (req, res) => { res.status(503).json({ - message: 'Server is overloaded with requests. Try again later.', + message: "Server is overloaded with requests. Try again later.", }); }); -server.get('/error-504', (req, res) => { +server.get("/error-504", (req, res) => { res.status(504).json({ - message: 'An upstream server failed to respond on time. If your query uses max parameter, please try to reduce it.', + message: + "An upstream server failed to respond on time. If your query uses max parameter, please try to reduce it.", }); }); -server.get('/health-check-yellow', (req, res) => { +server.get("/health-check-yellow", (req, res) => { res.status(200).json({ - status: 'yellow', + status: "yellow", }); }); -server.get('/health-check-red', (req, res) => { +server.get("/health-check-red", (req, res) => { res.status(200).json({ - status: 'red', + status: "red", }); }); -server.get('/health-check-green', (req, res) => { +server.get("/health-check-green", (req, res) => { res.status(200).json({ - status: 'green', + status: "green", }); }); -// ... Similarly, add routes for other error codes ... - -// To handle the default behavior, use the router middleware last -server.use(router); - // Middleware to handle not-found items server.use((req, res, next) => { - if (req.method === 'GET' && res.locals.data === null) { - res.status(404).json({ message: 'Item not found' }); + if (req.method === "GET" && res.locals.data === null) { + res.status(404).json({ message: "Item not found" }); } else { next(); } }); -const errorRoutes = [ - '/error-400', - '/error-401', - '/error-403', - '/error-404', - '/error-405', - '/error-409', - '/error-410', - '/error-415', - '/error-423', - '/error-428', - '/error-429', - '/error-500', - '/error-502', - '/error-503', - '/error-504', - '/health-check-yellow', - '/health-check-red', - '/health-check-green', +server.use(router); +const errorRoutes = [ + "/error-400", + "/error-401", + "/error-403", + "/error-404", + "/error-405", + "/error-409", + "/error-410", + "/error-415", + "/error-423", + "/error-428", + "/error-429", + "/error-500", + "/error-502", + "/error-503", + "/error-504", + "/health-check-yellow", + "/health-check-red", + "/health-check-green", ]; server.listen(3050, () => { - console.log(' \\{^_^}/ hi!\n'); - console.log(' Loading mocks/webex-mocks/webex-mock.json'); - console.log(' Done\n'); + console.log(" \\{^_^}/ hi!\n"); + console.log(" Loading mocks/webex-mocks/webex-mock.json"); + console.log(" Done\n"); - console.log(' Resources:'); - const routes = Object.keys(router.db.getState()); + console.log(" Resources:"); + + // Original routes from the database state + const originalRoutes = Object.keys(router.db.getState()); + + // Rewritten routes based on the routes.json rewrites + const rewrittenRoutes = originalRoutes.map((route) => { + for (let key in routesRewrite) { + if (routesRewrite[key] === `/${route}`) { + return key; // returning the custom path + } + } + return `/${route}`; // returning the original path if no custom path found + }); - routes.forEach((route) => { - console.log(` http://localhost:3050/${route}`); + rewrittenRoutes.forEach((route) => { + console.log(` http://localhost:3050${route}`); }); - console.log('\n Error Routes:'); + console.log("\n Error Routes:"); errorRoutes.forEach((route) => { console.log(` ${route}`); }); - console.log('\n Home'); - console.log(' http://localhost:3050'); + console.log("\n Home"); + console.log(" http://localhost:3050"); - console.log('\n Type s + enter at any time to create a snapshot of the database'); - console.log(' Watching...'); + console.log( + "\n Type s + enter at any time to create a snapshot of the database" + ); + console.log(" Watching..."); }); diff --git a/client/mocks/webex-mocks/webex-mock.json b/client/mocks/webex-mocks/webex-mock.json index 7d50e1c5209..d737dd7c7e9 100644 --- a/client/mocks/webex-mocks/webex-mock.json +++ b/client/mocks/webex-mocks/webex-mock.json @@ -1,334 +1,70 @@ { - "conference-links": [ + "conferenceLinks": [ { "id": 1, - "title": "CASEFLOW_MOCK_SERVICE_<>", - "start": "2019-11-01 20:00:00", - "end": "2019-11-01 21:00:00", - "timezone": "Asia/Shanghai", - "enabledAutoRecordMeeting": false, - "allowAnyUserToBeCoHost": false, - "enabledJoinBeforeHost": false, - "enableConnectAudioBeforeHost": false, - "joinBeforeHostMinutes": 0, - "excludePassword": false, - "publicMeeting": false, - "reminderTime": 0, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "enabledWebCastView": false, - "enableAutomaticLock": false, - "automaticLockMinutes": 0, - "allowFirstUserToBeCoHost": false, - "allowAuthenticatedDevices": true, - "sendEmail": false, - "siteUrl": "", - "meetingOptions": [ - { - "enabledChat": true, - "enableVideo": true - } - ], - "attendeePrivileges": { - "enableShareContent": true - }, - "enabledBreakoutSessions": false, - "audioConnectionOptions": [ - { - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": true, - "enabledGlobalCallIn": true, - "enabledAudianceCallBack": false, - "entryAndExitTone": "beep", - "allowHosttoUnmuteParticipants": true, - "allowAttendeeToUnmuteSelf": true, - "muteAttendeeUponEntry": true - } - ] + "name": "Karson", + "email": "Pierre_Erdman34@hotmail.com", + "address": "151 Dawson Lights" }, { - "id": "2", - "title": "CASEFLOW_MOCK_SERVICE_<>", - "start": "2019-11-01 20:00:00", - "end": "2019-11-01 21:00:00", - "timezone": "Asia/Shanghai", - "enabledAutoRecordMeeting": false, - "allowAnyUserToBeCoHost": false, - "enabledJoinBeforeHost": false, - "enableConnectAudioBeforeHost": false, - "joinBeforeHostMinutes": 0, - "excludePassword": false, - "publicMeeting": false, - "reminderTime": 0, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "enabledWebCastView": false, - "enableAutomaticLock": false, - "automaticLockMinutes": 0, - "allowFirstUserToBeCoHost": false, - "allowAuthenticatedDevices": true, - "sendEmail": false, - "siteUrl": "", - "meetingOptions": [ - { - "enabledChat": true, - "enableVideo": true - } - ], - "attendeePrivileges": { - "enableShareContent": true - }, - "enabledBreakoutSessions": false, - "audioConnectionOptions": [ - { - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": true, - "enabledGlobalCallIn": true, - "enabledAudianceCallBack": false, - "entryAndExitTone": "beep", - "allowHosttoUnmuteParticipants": true, - "allowAttendeeToUnmuteSelf": true, - "muteAttendeeUponEntry": true - } - ] + "id": 2, + "name": "Dell", + "email": "Diana95@yahoo.com", + "address": "327 Kyra Springs" }, { - "id": "3", - "title": "CASEFLOW_MOCK_SERVICE_<>", - "start": "2019-11-01 20:00:00", - "end": "2019-11-01 21:00:00", - "timezone": "Asia/Shanghai", - "enabledAutoRecordMeeting": false, - "allowAnyUserToBeCoHost": false, - "enabledJoinBeforeHost": false, - "enableConnectAudioBeforeHost": false, - "joinBeforeHostMinutes": 0, - "excludePassword": false, - "publicMeeting": false, - "reminderTime": 0, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "enabledWebCastView": false, - "enableAutomaticLock": false, - "automaticLockMinutes": 0, - "allowFirstUserToBeCoHost": false, - "allowAuthenticatedDevices": true, - "sendEmail": false, - "siteUrl": "", - "meetingOptions": [ - { - "enabledChat": true, - "enableVideo": true - } - ], - "attendeePrivileges": { - "enableShareContent": true - }, - "enabledBreakoutSessions": false, - "audioConnectionOptions": [ - { - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": true, - "enabledGlobalCallIn": true, - "enabledAudianceCallBack": false, - "entryAndExitTone": "beep", - "allowHosttoUnmuteParticipants": true, - "allowAttendeeToUnmuteSelf": true, - "muteAttendeeUponEntry": true - } - ] + "id": 3, + "name": "Libby", + "email": "Dillon_Pollich56@hotmail.com", + "address": "7687 Kovacek Fork" }, { - "id": "4", - "title": "CASEFLOW_MOCK_SERVICE_<>", - "start": "2019-11-01 20:00:00", - "end": "2019-11-01 21:00:00", - "timezone": "Asia/Shanghai", - "enabledAutoRecordMeeting": false, - "allowAnyUserToBeCoHost": false, - "enabledJoinBeforeHost": false, - "enableConnectAudioBeforeHost": false, - "joinBeforeHostMinutes": 0, - "excludePassword": false, - "publicMeeting": false, - "reminderTime": 0, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "enabledWebCastView": false, - "enableAutomaticLock": false, - "automaticLockMinutes": 0, - "allowFirstUserToBeCoHost": false, - "allowAuthenticatedDevices": true, - "sendEmail": false, - "siteUrl": "", - "meetingOptions": [ - { - "enabledChat": true, - "enableVideo": true - } - ], - "attendeePrivileges": { - "enableShareContent": true - }, - "enabledBreakoutSessions": false, - "audioConnectionOptions": [ - { - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": true, - "enabledGlobalCallIn": true, - "enabledAudianceCallBack": false, - "entryAndExitTone": "beep", - "allowHosttoUnmuteParticipants": true, - "allowAttendeeToUnmuteSelf": true, - "muteAttendeeUponEntry": true - } - ] + "id": 4, + "name": "Anastasia", + "email": "Kendall.Dare26@yahoo.com", + "address": "752 Nicholas Underpass" }, { - "id": "5", - "title": "CASEFLOW_MOCK_SERVICE_<>", - "start": "2019-11-01 20:00:00", - "end": "2019-11-01 21:00:00", - "timezone": "Asia/Shanghai", - "enabledAutoRecordMeeting": false, - "allowAnyUserToBeCoHost": false, - "enabledJoinBeforeHost": false, - "enableConnectAudioBeforeHost": false, - "joinBeforeHostMinutes": 0, - "excludePassword": false, - "publicMeeting": false, - "reminderTime": 0, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "enabledWebCastView": false, - "enableAutomaticLock": false, - "automaticLockMinutes": 0, - "allowFirstUserToBeCoHost": false, - "allowAuthenticatedDevices": true, - "sendEmail": false, - "siteUrl": "fakerdomain.com", - "meetingOptions": [ - { - "enabledChat": true, - "enableVideo": true - } - ], - "attendeePrivileges": { - "enableShareContent": true - }, - "enabledBreakoutSessions": false, - "audioConnectionOptions": [ - { - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": true, - "enabledGlobalCallIn": true, - "enabledAudianceCallBack": false, - "entryAndExitTone": "beep", - "allowHosttoUnmuteParticipants": true, - "allowAttendeeToUnmuteSelf": true, - "muteAttendeeUponEntry": true - } - ] + "id": 5, + "name": "Velda", + "email": "Sheila.Wehner7@gmail.com", + "address": "9119 Jeremie Grove" }, { - "title": "CASEFLOW_MOCK_SERVICE_<>", - "start": "2019-11-01 20:00:00", - "end": "2019-11-01 21:00:00", - "timezone": "Asia/Shanghai", - "enabledAutoRecordMeeting": false, - "allowAnyUserToBeCoHost": false, - "enabledJoinBeforeHost": false, - "enableConnectAudioBeforeHost": false, - "joinBeforeHostMinutes": 0, - "excludePassword": false, - "publicMeeting": false, - "reminderTime": 0, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "enabledWebCastView": false, - "enableAutomaticLock": false, - "automaticLockMinutes": 0, - "allowFirstUserToBeCoHost": false, - "allowAuthenticatedDevices": true, - "sendEmail": false, - "siteUrl": "fakerdomain.com", - "meetingOptions": [ - { - "enabledChat": true, - "enableVideo": true - } - ], - "attendeePrivileges": { - "enableShareContent": true - }, - "enabledBreakoutSessions": false, - "audioConnectionOptions": [ - { - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": true, - "enabledGlobalCallIn": true, - "enabledAudianceCallBack": false, - "entryAndExitTone": "beep", - "allowHosttoUnmuteParticipants": true, - "allowAttendeeToUnmuteSelf": true, - "muteAttendeeUponEntry": true - } - ], - "id": "kN94iPM" + "id": 6, + "name": "Jillian", + "email": "Albertha_Parker47@hotmail.com", + "address": "151 Hyman Orchard" }, { - "title": "CASEFLOW_MOCK_SERVICE_<>", - "start": "2019-11-01 20:00:00", - "end": "2019-11-01 21:00:00", - "timezone": "Asia/Shanghai", - "enabledAutoRecordMeeting": false, - "allowAnyUserToBeCoHost": false, - "enabledJoinBeforeHost": false, - "enableConnectAudioBeforeHost": false, - "joinBeforeHostMinutes": 0, - "excludePassword": false, - "publicMeeting": false, - "reminderTime": 0, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "enabledWebCastView": false, - "enableAutomaticLock": false, - "automaticLockMinutes": 0, - "allowFirstUserToBeCoHost": false, - "allowAuthenticatedDevices": true, - "sendEmail": false, - "siteUrl": "fakerdomain.com", - "meetingOptions": [ - { - "enabledChat": true, - "enableVideo": true - } - ], - "attendeePrivileges": { - "enableShareContent": true - }, - "enabledBreakoutSessions": false, - "audioConnectionOptions": [ - { - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": true, - "enabledGlobalCallIn": true, - "enabledAudianceCallBack": false, - "entryAndExitTone": "beep", - "allowHosttoUnmuteParticipants": true, - "allowAttendeeToUnmuteSelf": true, - "muteAttendeeUponEntry": true - } - ], - "id": "mv06qEy" - } - ], - "comments": [ + "id": 7, + "name": "Ruthe", + "email": "Jamar.Bins@yahoo.com", + "address": "479 Larue Stravenue" + }, { - "id": 1, - "body": "some comment", - "postId": 1 + "id": 8, + "name": "Cristal", + "email": "Oswald54@hotmail.com", + "address": "904 Nikolaus Canyon" }, { - "id": 2, - "body": "some comment", - "postId": 1 + "id": 9, + "name": "Bernita", + "email": "Stella.Schumm@yahoo.com", + "address": "824 Jena Unions" + }, + { + "id": 10, + "name": "Alexzander", + "email": "Mavis59@gmail.com", + "address": "7734 Burdette Forest" + }, + { + "id": 20, + "name": "Karson", + "email": "Pierre_Erdman34@hotmail.com", + "address": "151 Dawson Lights" } - ], - "profile": { - "name": "typicode" - } + ] } \ No newline at end of file diff --git a/client/package.json b/client/package.json index 1efdc7c44f0..2c59c1ca2a0 100644 --- a/client/package.json +++ b/client/package.json @@ -26,7 +26,8 @@ "dev:hot": "webpack-dev-server", "storybook": "start-storybook -p 6006", "build:storybook": "build-storybook -o ../public/storybook", - "webex-server": "node mocks/webex-mocks/webex-mock-server" + "webex-server": "node mocks/webex-mocks/webex-mock-server", + "generate-webex": "node mocks/webex-mocks/webex-mock-generator.js" }, "cacheDirectories": [ "node_modules", diff --git a/lib/fakes/webex_service.rb b/lib/fakes/webex_service.rb deleted file mode 100644 index 1b4a586abe0..00000000000 --- a/lib/fakes/webex_service.rb +++ /dev/null @@ -1,99 +0,0 @@ -# frozen_string_literal: true - -class Fakes::WebexService < ExternalApi::WebexService - COMMUNICATION_PACKAGE_UUID = "24eb6a66-3833-4de6-bea4-4b614e55d5ac" - DISTRIBUTION_UUID = "201cef13-49ba-4f40-8741-97d06cee0270" - - class << self - def send_communication_package_request(file_number, name, document_references) - fake_package_request(file_number, name, document_references) - end - - def send_distribution_request(package_id, recipient, destinations) - [fake_distribution_request(package_id, recipient, destinations)] - end - - def get_distribution_request(distribution_uuid) - distribution = VbmsDistribution.find_by(uuid: distribution_uuid) - - return distribution_not_found_response unless distribution - - fake_distribution_response(distribution.uuid) - end - - private - - def bad_request_response - HTTPI::Response.new( - 400, - {}, - { - "error": "BadRequestError", - "message": "Id is not valid" - }.with_indifferent_access - ) - end - - def bad_access_response - HTTPI::Response.new( - 403, - {}, - { - "error": "BadRequestError", - "message": "Conference link cannot be created due to insufficient privileges" - }.with_indifferent_access - ) - end - - def distribution_not_found_response - HTTPI::Response.new( - 404, - {}, - { - "error": "BadRequestError", - "message": "Conference link does not exist at this time" - }.with_indifferent_access - ) - end - - # POST: /package-manager-service/communication-package - def fake_package_request(file_number, name, document_references) - HTTPI::Response.new( - 201, - {}, - { - "id" => COMMUNICATION_PACKAGE_UUID, - "fileNumber": file_number, - "name": name, - "documentReferences": document_references, - "status": "NEW", - "createDate": "" - }.with_indifferent_access - ) - end - - # POST: /package-manager-service/distribution - def fake_distribution_request(package_id, recipient, destinations) - HTTPI::Response.new( - 201, - {}, - { - - }.with_indifferent_access - ) - end - - # rubocop:disable Metrics/MethodLength - # GET: /package-manager-service/distribution/{id} - def webex_conference_response(_distribution_id) - HTTPI::Response.new( - 200, - {}, - { - 'fake_key': 'fake_value' - }.with_indifferent_access - ) - end - # rubocop:enable Metrics/MethodLength - end -end From 8cf78566cfbd5b9fcd11d1d7291a87e41d481865 Mon Sep 17 00:00:00 2001 From: breedbah Date: Thu, 17 Aug 2023 14:56:24 -0400 Subject: [PATCH 032/445] APPEALS-28105 Updated error handling --- client/mocks/webex-mocks/routes.json | 8 +- client/mocks/webex-mocks/webex-mock-server.js | 188 +++++++++++------- 2 files changed, 121 insertions(+), 75 deletions(-) diff --git a/client/mocks/webex-mocks/routes.json b/client/mocks/webex-mocks/routes.json index ce5c6a6006d..c4ab9b3de57 100644 --- a/client/mocks/webex-mocks/routes.json +++ b/client/mocks/webex-mocks/routes.json @@ -1,6 +1,4 @@ -{ - - "/api/conference-links/:id": "/conferencelinks/:id", - "/api/conference-links": "/conferenceLinks" -} +{ + "/api/conference-links": "/conferenceLinks" + } diff --git a/client/mocks/webex-mocks/webex-mock-server.js b/client/mocks/webex-mocks/webex-mock-server.js index cd75f624f1a..419720b5882 100644 --- a/client/mocks/webex-mocks/webex-mock-server.js +++ b/client/mocks/webex-mocks/webex-mock-server.js @@ -1,11 +1,11 @@ -const jsonServer = require("json-server"); +const jsonServer = require('json-server'); const server = jsonServer.create(); -const path = require("path"); +const path = require('path'); const router = jsonServer.router( - path.join("mocks/webex-mocks/webex-mock.json") + path.join('mocks/webex-mocks/webex-mock.json') ); const middlewares = jsonServer.defaults(); -const routesRewrite = require("./routes.json"); +const routesRewrite = require('./routes.json'); server.use(middlewares); server.use(jsonServer.bodyParser); @@ -14,154 +14,202 @@ server.use(jsonServer.bodyParser); server.use(jsonServer.rewriter(routesRewrite)); // Custom error routes and handlers -server.get("/error-400", (req, res) => { +server.get('/error-400', (req, res) => { res.status(400).json({ - message: "The request was invalid or cannot be otherwise served.", + message: 'The request was invalid or cannot be otherwise served.', }); }); -server.get("/error-401", (req, res) => { +server.get('/error-401', (req, res) => { res.status(401).json({ - message: "Authentication credentials were missing or incorrect.", + message: 'Authentication credentials were missing or incorrect.', }); }); -server.get("/error-403", (req, res) => { +server.get('/error-403', (req, res) => { res.status(403).json({ message: - "The request is understood, but it has been refused or access is not allowed", + 'The request is understood, but it has been refused or access is not allowed', }); }); -server.get("/error-405", (req, res) => { +server.get('/error-405', (req, res) => { res.status(405).json({ message: - "The request was made to a resource using an HTTP request method that is not supported.", + 'The request was made to a resource using an HTTP request method that is not supported.', }); }); -server.get("/error-409", (req, res) => { +server.get('/error-409', (req, res) => { res.status(409).json({ message: - "The request could not be processed because it conflicts with some established rule of the system.", + 'The request could not be processed because it conflicts with some established rule of the system.', }); }); -server.get("/error-410", (req, res) => { +server.get('/error-410', (req, res) => { res.status(410).json({ - message: "The requested resource is no longer available.", + message: 'The requested resource is no longer available.', }); }); -server.get("/error-415", (req, res) => { +server.get('/error-415', (req, res) => { res.status(415).json({ message: - "The request was made to a resource without specifying a media type or used a media type that is not supported.", + 'The request was made to a resource without specifying a media type or used a media type that is not supported.', }); }); -server.get("/error-423", (req, res) => { +server.get('/error-423', (req, res) => { res.status(423).json({ - message: "The requested resource is temporarily unavailable", + message: 'The requested resource is temporarily unavailable', }); }); -server.get("/error-428", (req, res) => { +server.get('/error-428', (req, res) => { res.status(428).json({ message: - "File(s) cannot be scanned for malware and need to be force downloaded.", + 'File(s) cannot be scanned for malware and need to be force downloaded.', }); }); -server.get("/error-429", (req, res) => { +server.get('/error-429', (req, res) => { res.status(429).json({ message: - "Too many requests have been sent in a given amount of time and the request has been rate limited.", + 'Too many requests have been sent in a given amount of time and the request has been rate limited.', }); }); -server.get("/error-500", (req, res) => { +server.get('/error-500', (req, res) => { res.status(500).json({ - message: "Something went wrong on the server.", + message: 'Something went wrong on the server.', }); }); -server.get("/error-502", (req, res) => { +server.get('/error-502', (req, res) => { res.status(502).json({ message: - "The server received an invalid response from an upstream server while processing the request.", + 'The server received an invalid response from an upstream server while processing the request.', }); }); -server.get("/error-503", (req, res) => { +server.get('/error-503', (req, res) => { res.status(503).json({ - message: "Server is overloaded with requests. Try again later.", + message: 'Server is overloaded with requests. Try again later.', }); }); -server.get("/error-504", (req, res) => { +server.get('/error-504', (req, res) => { res.status(504).json({ message: - "An upstream server failed to respond on time. If your query uses max parameter, please try to reduce it.", + 'An upstream server failed to respond on time. If your query uses max parameter, please try to reduce it.', }); }); -server.get("/health-check-yellow", (req, res) => { +server.get('/health-check-yellow', (req, res) => { res.status(200).json({ - status: "yellow", + status: 'yellow', }); }); -server.get("/health-check-red", (req, res) => { +server.get('/health-check-red', (req, res) => { res.status(200).json({ - status: "red", + status: 'red', }); }); -server.get("/health-check-green", (req, res) => { +server.get('/health-check-green', (req, res) => { res.status(200).json({ - status: "green", + status: 'green', }); }); -// Middleware to handle not-found items +// Middleware to handle duplication and not-found items server.use((req, res, next) => { - if (req.method === "GET" && res.locals.data === null) { - res.status(404).json({ message: "Item not found" }); - } else { - next(); + const db = router.db; // Get the lowdb instance + + // Handle POST requests: Check for duplicate items by ID across all collections + if (req.method === 'POST') { + const collections = Object.keys(db.getState()); + + for (const collectionName of collections) { + const collection = db.get(collectionName); + const existingItem = collection.find({ id: req.body.id }).value(); + + if (existingItem) { + res.status(409).json({ + error: true, + message: `Item with the same id already exists in ${collectionName}` + }); + + return; + } + } } + + // Handle GET requests: Check if the item exists across all collections + if (req.method === 'GET') { + // Extract the id from the path. This assumes the path format is always consistent. + const pathParts = req.path.split('/'); + const potentialId = parseInt(pathParts.pop()); + + if (!isNaN(potentialId)) { + const collections = Object.keys(db.getState()); + let itemFound = false; + + for (const collectionName of collections) { + const collection = db.get(collectionName); + const item = collection.find({ id: potentialId }).value(); + + if (item) { + itemFound = true; + break; + } + } + + if (!itemFound) { + res.status(404).json({ + error: true, + message: 'Item not found' + }); + + return; + } + } + } + + next(); }); server.use(router); const errorRoutes = [ - "/error-400", - "/error-401", - "/error-403", - "/error-404", - "/error-405", - "/error-409", - "/error-410", - "/error-415", - "/error-423", - "/error-428", - "/error-429", - "/error-500", - "/error-502", - "/error-503", - "/error-504", - "/health-check-yellow", - "/health-check-red", - "/health-check-green", + '/error-400', + '/error-401', + '/error-403', + '/error-404', + '/error-405', + '/error-409', + '/error-410', + '/error-415', + '/error-423', + '/error-428', + '/error-429', + '/error-500', + '/error-502', + '/error-503', + '/error-504', + '/health-check-yellow', + '/health-check-red', + '/health-check-green', ]; server.listen(3050, () => { - console.log(" \\{^_^}/ hi!\n"); - console.log(" Loading mocks/webex-mocks/webex-mock.json"); - console.log(" Done\n"); + console.log(' \\{^_^}/ hi!\n'); + console.log(' Loading mocks/webex-mocks/webex-mock.json'); + console.log(' Done\n'); - console.log(" Resources:"); + console.log( ' Resources:'); // Original routes from the database state const originalRoutes = Object.keys(router.db.getState()); @@ -180,16 +228,16 @@ server.listen(3050, () => { console.log(` http://localhost:3050${route}`); }); - console.log("\n Error Routes:"); + console.log('\n Error Routes:'); errorRoutes.forEach((route) => { console.log(` ${route}`); }); - console.log("\n Home"); - console.log(" http://localhost:3050"); + console.log('\n Home'); + console.log(' http://localhost:3050'); console.log( - "\n Type s + enter at any time to create a snapshot of the database" + '\n Type s + enter at any time to create a snapshot of the database' ); - console.log(" Watching..."); + console.log( 'Watching...'); }); From 1a55e14ed63cbe5db90a14f0a753e1471fca7d0a Mon Sep 17 00:00:00 2001 From: breedbah Date: Thu, 17 Aug 2023 15:06:06 -0400 Subject: [PATCH 033/445] APPEALS-28105 Updated routes --- client/mocks/webex-mocks/routes.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/mocks/webex-mocks/routes.json b/client/mocks/webex-mocks/routes.json index c4ab9b3de57..76516817fb9 100644 --- a/client/mocks/webex-mocks/routes.json +++ b/client/mocks/webex-mocks/routes.json @@ -1,4 +1,5 @@ { - "/api/conference-links": "/conferenceLinks" + "/api/v1/conference-links": "/conferenceLinks", + "/api/v1/conference-links/:id": "/conferenceLinks/:id" } From e2858be3abb03fe4f1d5fcac5963c407b67e0b75 Mon Sep 17 00:00:00 2001 From: breedbah Date: Fri, 18 Aug 2023 13:21:47 -0400 Subject: [PATCH 034/445] APPEALS-28105 Got the api webex-generation working --- client/mocks/webex-mocks/README.md | 10 + .../mocks/webex-mocks/webex-mock-generator.js | 104 +- client/mocks/webex-mocks/webex-mock-server.js | 194 +++- client/mocks/webex-mocks/webex-mock.json | 946 +++++++++++++++++- 4 files changed, 1148 insertions(+), 106 deletions(-) diff --git a/client/mocks/webex-mocks/README.md b/client/mocks/webex-mocks/README.md index a51a05d8554..391d8c8fdd3 100644 --- a/client/mocks/webex-mocks/README.md +++ b/client/mocks/webex-mocks/README.md @@ -24,3 +24,13 @@ step 5: Open a browser window in chrome and navigate to localhost:3050 [You will Tutorial Resources: [https://www.youtube.com/watch?v=_1kNqAybxW0&list=PLC3y8-rFHvwhc9YZIdqNL5sWeTCGxF4ya&index=1] + +To create a meeting the request body must have all of the keys and hit this endpoint? +[http://localhost:3050/fake.api-usgov.webex.com/v1/meetings] + +Get all conferencelinks with this endpoint +[http://localhost:3050/api/v1/conference-links] + + + + diff --git a/client/mocks/webex-mocks/webex-mock-generator.js b/client/mocks/webex-mocks/webex-mock-generator.js index b4cec01d566..1417f290709 100644 --- a/client/mocks/webex-mocks/webex-mock-generator.js +++ b/client/mocks/webex-mocks/webex-mock-generator.js @@ -2,19 +2,107 @@ const fs = require("fs"); const faker = require("faker"); const generateConferenceLinks = () => { - let users = []; + let webexLinks = []; for (let id = 1; id <= 10; id++) { - users.push({ - id: id, - name: faker.name.firstName(), - email: faker.internet.email(), - address: faker.address.streetAddress(), - // ... other fields + webexLinks.push({ + id: faker.random.uuid(), + meetingNumber: faker.random.number(), + title: faker.company.catchPhrase(), + password: faker.internet.password(), + meetingType: "meetingSeries", + state: "active", + timezone: "Asia/Shanghai", + start: "2023-11-01T20:00:00+08:00", + end: "2023-11-01T21:00:00+08:00", + hostUserId: faker.finance.account(), + hostDisplayName: faker.name.findName(), + hostEmail: faker.internet.email(), + hostKey: faker.random.number(), + siteUrl: "ciscofedsales.webex.com", + webLink: faker.internet.url(), + sipAddress: faker.internet.email(), + dialInIpAddress: faker.internet.ip(), + enabledAutoRecordMeeting: faker.random.boolean(), + allowAnyUserToBeCoHost: faker.random.boolean(), + allowFirstUserToBeCoHost: faker.random.boolean(), + allowAuthenticatedDevices: faker.random.boolean(), + enabledJoinBeforeHost: faker.random.boolean(), + joinBeforeHostMinutes: faker.random.number({ min: 0, max: 10 }), + enableConnectAudioBeforeHost: faker.random.boolean(), + excludePassword: faker.random.boolean(), + publicMeeting: faker.random.boolean(), + enableAutomaticLock: faker.random.boolean(), + automaticLockMinutes: faker.random.number({ min: 1, max: 10 }), + unlockedMeetingJoinSecurity: "allowJoinWithLobby", + telephony: { + accessCode: faker.random + .number({ min: 100000, max: 999999 }) + .toString(), + callInNumbers: [ + { + label: "United States Toll", + callInNumber: "+1-415-527-5035", + tollType: "toll", + }, + { + label: "United States Toll (Washington D.C.)", + callInNumber: "+1-202-600-2533", + tollType: "toll", + }, + ], + links: [ + { + rel: "globalCallinNumbers", + href: + "/v1/meetings/" + faker.random.uuid() + "/globalCallinNumbers", + method: "GET", + }, + ], + }, + meetingOptions: { + enabledChat: faker.random.boolean(), + enabledVideo: faker.random.boolean(), + enabledNote: faker.random.boolean(), + noteType: "allowAll", + enabledFileTransfer: faker.random.boolean(), + enabledUCFRichMedia: faker.random.boolean(), + }, + attendeePrivileges: { + enabledShareContent: faker.random.boolean(), + enabledSaveDocument: faker.random.boolean(), + enabledPrintDocument: faker.random.boolean(), + enabledAnnotate: faker.random.boolean(), + enabledViewParticipantList: faker.random.boolean(), + enabledViewThumbnails: faker.random.boolean(), + enabledRemoteControl: faker.random.boolean(), + enabledViewAnyDocument: faker.random.boolean(), + enabledViewAnyPage: faker.random.boolean(), + enabledContactOperatorPrivately: faker.random.boolean(), + enabledChatHost: faker.random.boolean(), + enabledChatPresenter: faker.random.boolean(), + enabledChatOtherParticipants: faker.random.boolean(), + }, + sessionTypeId: faker.random.number({ min: 1, max: 5 }), + scheduledType: "meeting", + simultaneousInterpretation: { + enabled: faker.random.boolean(), + }, + enabledBreakoutSessions: faker.random.boolean(), + audioConnectionOptions: { + audioConnectionType: "webexAudio", + enabledTollFreeCallIn: faker.random.boolean(), + enabledGlobalCallIn: faker.random.boolean(), + enabledAudienceCallBack: faker.random.boolean(), + entryAndExitTone: "beep", + allowHostToUnmuteParticipants: faker.random.boolean(), + allowAttendeeToUnmuteSelf: faker.random.boolean(), + muteAttendeeUponEntry: faker.random.boolean(), + }, }); } - return users; + return webexLinks; }; // Generate the data diff --git a/client/mocks/webex-mocks/webex-mock-server.js b/client/mocks/webex-mocks/webex-mock-server.js index 419720b5882..91d1be7e9a3 100644 --- a/client/mocks/webex-mocks/webex-mock-server.js +++ b/client/mocks/webex-mocks/webex-mock-server.js @@ -4,8 +4,10 @@ const path = require('path'); const router = jsonServer.router( path.join('mocks/webex-mocks/webex-mock.json') ); + const middlewares = jsonServer.defaults(); const routesRewrite = require('./routes.json'); +const faker = require("faker"); server.use(middlewares); server.use(jsonServer.bodyParser); @@ -124,62 +126,150 @@ server.get('/health-check-green', (req, res) => { }); }); -// Middleware to handle duplication and not-found items -server.use((req, res, next) => { - const db = router.db; // Get the lowdb instance - - // Handle POST requests: Check for duplicate items by ID across all collections - if (req.method === 'POST') { - const collections = Object.keys(db.getState()); - - for (const collectionName of collections) { - const collection = db.get(collectionName); - const existingItem = collection.find({ id: req.body.id }).value(); - - if (existingItem) { - res.status(409).json({ - error: true, - message: `Item with the same id already exists in ${collectionName}` - }); - - return; - } - } - } - - // Handle GET requests: Check if the item exists across all collections - if (req.method === 'GET') { - // Extract the id from the path. This assumes the path format is always consistent. - const pathParts = req.path.split('/'); - const potentialId = parseInt(pathParts.pop()); - - if (!isNaN(potentialId)) { - const collections = Object.keys(db.getState()); - let itemFound = false; - - for (const collectionName of collections) { - const collection = db.get(collectionName); - const item = collection.find({ id: potentialId }).value(); +const requiredKeys = [ + "title", + "start", + "end", + "timezone", + "enabledAutoRecordMeeting", + "allowAnyUserToBeCoHost", + "enabledJoinBeforeHost", + "enableConnectAudioBeforeHost", + "joinBeforeHostMinutes", + "excludePassword", + "publicMeeting", + "reminderTime", + "unlockedMeetingJoinSecurity", + "enabledWebCastView", + "enableAutomaticLock", + "automaticLockMinutes", + "allowFirstUserToBeCoHost", + "allowAuthenticatedDevices", + "sendEmail", + "siteUrl", + "meetingOptions", + "attendeePrivileges", + "enabledBreakoutSessions", + "audioConnectionOptions", +]; - if (item) { - itemFound = true; - break; +const generateMeetingData = { + id: faker.random.uuid(), + meetingNumber: faker.random.number(), + title: faker.company.catchPhrase(), + password: faker.internet.password(), + meetingType: "meetingSeries", + state: "active", + timezone: "Asia/Shanghai", + start: "2023-11-01T20:00:00+08:00", + end: "2023-11-01T21:00:00+08:00", + hostUserId: faker.finance.account(), + hostDisplayName: faker.name.findName(), + hostEmail: faker.internet.email(), + hostKey: faker.random.number(), + siteUrl: "ciscofedsales.webex.com", + webLink: faker.internet.url(), + sipAddress: faker.internet.email(), + dialInIpAddress: faker.internet.ip(), + enabledAutoRecordMeeting: faker.random.boolean(), + allowAnyUserToBeCoHost: faker.random.boolean(), + allowFirstUserToBeCoHost: faker.random.boolean(), + allowAuthenticatedDevices: faker.random.boolean(), + enabledJoinBeforeHost: faker.random.boolean(), + joinBeforeHostMinutes: faker.random.number({ min: 0, max: 10 }), + enableConnectAudioBeforeHost: faker.random.boolean(), + excludePassword: faker.random.boolean(), + publicMeeting: faker.random.boolean(), + enableAutomaticLock: faker.random.boolean(), + automaticLockMinutes: faker.random.number({ min: 1, max: 10 }), + unlockedMeetingJoinSecurity: "allowJoinWithLobby", + telephony: { + accessCode: faker.random.number({ min: 100000, max: 999999 }).toString(), + callInNumbers: [ + { + label: "United States Toll", + callInNumber: "+1-415-527-5035", + tollType: "toll", + }, + { + label: "United States Toll (Washington D.C.)", + callInNumber: "+1-202-600-2533", + tollType: "toll", + }, + ], + links: [ + { + rel: "globalCallinNumbers", + href: "/v1/meetings/" + faker.random.uuid() + "/globalCallinNumbers", + method: "GET", + }, + ], + }, + meetingOptions: { + enabledChat: faker.random.boolean(), + enabledVideo: faker.random.boolean(), + enabledNote: faker.random.boolean(), + noteType: "allowAll", + enabledFileTransfer: faker.random.boolean(), + enabledUCFRichMedia: faker.random.boolean(), + }, + attendeePrivileges: { + enabledShareContent: faker.random.boolean(), + enabledSaveDocument: faker.random.boolean(), + enabledPrintDocument: faker.random.boolean(), + enabledAnnotate: faker.random.boolean(), + enabledViewParticipantList: faker.random.boolean(), + enabledViewThumbnails: faker.random.boolean(), + enabledRemoteControl: faker.random.boolean(), + enabledViewAnyDocument: faker.random.boolean(), + enabledViewAnyPage: faker.random.boolean(), + enabledContactOperatorPrivately: faker.random.boolean(), + enabledChatHost: faker.random.boolean(), + enabledChatPresenter: faker.random.boolean(), + enabledChatOtherParticipants: faker.random.boolean(), + }, + sessionTypeId: faker.random.number({ min: 1, max: 5 }), + scheduledType: "meeting", + simultaneousInterpretation: { + enabled: faker.random.boolean(), + }, + enabledBreakoutSessions: faker.random.boolean(), + audioConnectionOptions: { + audioConnectionType: "webexAudio", + enabledTollFreeCallIn: faker.random.boolean(), + enabledGlobalCallIn: faker.random.boolean(), + enabledAudienceCallBack: faker.random.boolean(), + entryAndExitTone: "beep", + allowHostToUnmuteParticipants: faker.random.boolean(), + allowAttendeeToUnmuteSelf: faker.random.boolean(), + muteAttendeeUponEntry: faker.random.boolean(), + }, +}; + +server.post("/fake.api-usgov.webex.com/v1/meetings", (req, res) => { + const requestBody = req.body; + + // Check if all required keys are present + const missingKeys = requiredKeys.filter((key) => !(key in requestBody)); + + if (missingKeys.length > 0) { + res.status(400).json({ message: "Missing required keys", missingKeys }); + } else { + // Access conferenceLinks from database + const db = router.db; // Get lowdb instance + const conferenceLinks = db.get("conferenceLinks"); + + // Add generateMeetingData object to conferenceLinks + conferenceLinks.push(generateMeetingData).write(); + + res + .status(200) + .json({ message: "Request is valid and data added!" }); } - } - - if (!itemFound) { - res.status(404).json({ - error: true, - message: 'Item not found' - }); +}); - return; - } - } - } +// Sample object to be added - next(); -}); server.use(router); diff --git a/client/mocks/webex-mocks/webex-mock.json b/client/mocks/webex-mocks/webex-mock.json index d737dd7c7e9..6c5fd19657d 100644 --- a/client/mocks/webex-mocks/webex-mock.json +++ b/client/mocks/webex-mocks/webex-mock.json @@ -1,70 +1,924 @@ { "conferenceLinks": [ { - "id": 1, - "name": "Karson", - "email": "Pierre_Erdman34@hotmail.com", - "address": "151 Dawson Lights" + "id": "2bbdaa15-3d32-47bb-9b22-f961515a7f57", + "meetingNumber": 56455, + "title": "Streamlined 5th generation matrices", + "password": "ieIzUkSP6bRDqG0", + "meetingType": "meetingSeries", + "state": "active", + "timezone": "Asia/Shanghai", + "start": "2023-11-01T20:00:00+08:00", + "end": "2023-11-01T21:00:00+08:00", + "hostUserId": "37222262", + "hostDisplayName": "Neil Vandervort", + "hostEmail": "Jay_Hilpert@yahoo.com", + "hostKey": 9307, + "siteUrl": "ciscofedsales.webex.com", + "webLink": "https://ima.net", + "sipAddress": "Yazmin46@hotmail.com", + "dialInIpAddress": "128.142.68.190", + "enabledAutoRecordMeeting": true, + "allowAnyUserToBeCoHost": true, + "allowFirstUserToBeCoHost": true, + "allowAuthenticatedDevices": true, + "enabledJoinBeforeHost": true, + "joinBeforeHostMinutes": 4, + "enableConnectAudioBeforeHost": false, + "excludePassword": false, + "publicMeeting": false, + "enableAutomaticLock": false, + "automaticLockMinutes": 3, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "telephony": { + "accessCode": "720253", + "callInNumbers": [ + { + "label": "United States Toll", + "callInNumber": "+1-415-527-5035", + "tollType": "toll" + }, + { + "label": "United States Toll (Washington D.C.)", + "callInNumber": "+1-202-600-2533", + "tollType": "toll" + } + ], + "links": [ + { + "rel": "globalCallinNumbers", + "href": "/v1/meetings/24bc67b1-f8ec-44b2-a3a9-0afa8b267048/globalCallinNumbers", + "method": "GET" + } + ] + }, + "meetingOptions": { + "enabledChat": true, + "enabledVideo": false, + "enabledNote": true, + "noteType": "allowAll", + "enabledFileTransfer": false, + "enabledUCFRichMedia": false + }, + "attendeePrivileges": { + "enabledShareContent": false, + "enabledSaveDocument": true, + "enabledPrintDocument": false, + "enabledAnnotate": true, + "enabledViewParticipantList": true, + "enabledViewThumbnails": true, + "enabledRemoteControl": false, + "enabledViewAnyDocument": true, + "enabledViewAnyPage": true, + "enabledContactOperatorPrivately": true, + "enabledChatHost": true, + "enabledChatPresenter": false, + "enabledChatOtherParticipants": false + }, + "sessionTypeId": 5, + "scheduledType": "meeting", + "simultaneousInterpretation": { + "enabled": true + }, + "enabledBreakoutSessions": false, + "audioConnectionOptions": { + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": true, + "enabledGlobalCallIn": false, + "enabledAudienceCallBack": false, + "entryAndExitTone": "beep", + "allowHostToUnmuteParticipants": false, + "allowAttendeeToUnmuteSelf": false, + "muteAttendeeUponEntry": false + } }, { - "id": 2, - "name": "Dell", - "email": "Diana95@yahoo.com", - "address": "327 Kyra Springs" + "id": "3270b6a4-bec5-4fc9-8528-2f555d5872ad", + "meetingNumber": 95282, + "title": "Extended motivating strategy", + "password": "cbNG8fwZQegFOE2", + "meetingType": "meetingSeries", + "state": "active", + "timezone": "Asia/Shanghai", + "start": "2023-11-01T20:00:00+08:00", + "end": "2023-11-01T21:00:00+08:00", + "hostUserId": "30921397", + "hostDisplayName": "Dulce Nikolaus", + "hostEmail": "Berniece.Morar@yahoo.com", + "hostKey": 81643, + "siteUrl": "ciscofedsales.webex.com", + "webLink": "https://norris.com", + "sipAddress": "Freda19@gmail.com", + "dialInIpAddress": "140.162.243.122", + "enabledAutoRecordMeeting": false, + "allowAnyUserToBeCoHost": true, + "allowFirstUserToBeCoHost": true, + "allowAuthenticatedDevices": true, + "enabledJoinBeforeHost": false, + "joinBeforeHostMinutes": 5, + "enableConnectAudioBeforeHost": true, + "excludePassword": true, + "publicMeeting": true, + "enableAutomaticLock": false, + "automaticLockMinutes": 10, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "telephony": { + "accessCode": "104372", + "callInNumbers": [ + { + "label": "United States Toll", + "callInNumber": "+1-415-527-5035", + "tollType": "toll" + }, + { + "label": "United States Toll (Washington D.C.)", + "callInNumber": "+1-202-600-2533", + "tollType": "toll" + } + ], + "links": [ + { + "rel": "globalCallinNumbers", + "href": "/v1/meetings/bc253dc6-536c-499f-ad98-8e4710811749/globalCallinNumbers", + "method": "GET" + } + ] + }, + "meetingOptions": { + "enabledChat": false, + "enabledVideo": true, + "enabledNote": true, + "noteType": "allowAll", + "enabledFileTransfer": true, + "enabledUCFRichMedia": false + }, + "attendeePrivileges": { + "enabledShareContent": false, + "enabledSaveDocument": true, + "enabledPrintDocument": false, + "enabledAnnotate": false, + "enabledViewParticipantList": false, + "enabledViewThumbnails": false, + "enabledRemoteControl": false, + "enabledViewAnyDocument": true, + "enabledViewAnyPage": false, + "enabledContactOperatorPrivately": true, + "enabledChatHost": true, + "enabledChatPresenter": true, + "enabledChatOtherParticipants": true + }, + "sessionTypeId": 5, + "scheduledType": "meeting", + "simultaneousInterpretation": { + "enabled": false + }, + "enabledBreakoutSessions": true, + "audioConnectionOptions": { + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": false, + "enabledGlobalCallIn": true, + "enabledAudienceCallBack": false, + "entryAndExitTone": "beep", + "allowHostToUnmuteParticipants": true, + "allowAttendeeToUnmuteSelf": true, + "muteAttendeeUponEntry": true + } }, { - "id": 3, - "name": "Libby", - "email": "Dillon_Pollich56@hotmail.com", - "address": "7687 Kovacek Fork" + "id": "427d18ba-dd84-4309-9992-2ad4d28a5df3", + "meetingNumber": 32689, + "title": "Compatible radical adapter", + "password": "atmv_B2iZEOSAwQ", + "meetingType": "meetingSeries", + "state": "active", + "timezone": "Asia/Shanghai", + "start": "2023-11-01T20:00:00+08:00", + "end": "2023-11-01T21:00:00+08:00", + "hostUserId": "85649747", + "hostDisplayName": "Taurean McKenzie", + "hostEmail": "Jarvis_Hyatt@gmail.com", + "hostKey": 33023, + "siteUrl": "ciscofedsales.webex.com", + "webLink": "http://ansley.com", + "sipAddress": "Vanessa.Graham@yahoo.com", + "dialInIpAddress": "17.67.187.244", + "enabledAutoRecordMeeting": false, + "allowAnyUserToBeCoHost": true, + "allowFirstUserToBeCoHost": true, + "allowAuthenticatedDevices": false, + "enabledJoinBeforeHost": false, + "joinBeforeHostMinutes": 3, + "enableConnectAudioBeforeHost": true, + "excludePassword": false, + "publicMeeting": true, + "enableAutomaticLock": false, + "automaticLockMinutes": 7, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "telephony": { + "accessCode": "171528", + "callInNumbers": [ + { + "label": "United States Toll", + "callInNumber": "+1-415-527-5035", + "tollType": "toll" + }, + { + "label": "United States Toll (Washington D.C.)", + "callInNumber": "+1-202-600-2533", + "tollType": "toll" + } + ], + "links": [ + { + "rel": "globalCallinNumbers", + "href": "/v1/meetings/7e93877f-0c41-48fa-876c-0e20323246cd/globalCallinNumbers", + "method": "GET" + } + ] + }, + "meetingOptions": { + "enabledChat": false, + "enabledVideo": false, + "enabledNote": false, + "noteType": "allowAll", + "enabledFileTransfer": true, + "enabledUCFRichMedia": false + }, + "attendeePrivileges": { + "enabledShareContent": true, + "enabledSaveDocument": true, + "enabledPrintDocument": true, + "enabledAnnotate": false, + "enabledViewParticipantList": false, + "enabledViewThumbnails": false, + "enabledRemoteControl": true, + "enabledViewAnyDocument": true, + "enabledViewAnyPage": false, + "enabledContactOperatorPrivately": true, + "enabledChatHost": false, + "enabledChatPresenter": true, + "enabledChatOtherParticipants": true + }, + "sessionTypeId": 4, + "scheduledType": "meeting", + "simultaneousInterpretation": { + "enabled": false + }, + "enabledBreakoutSessions": false, + "audioConnectionOptions": { + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": true, + "enabledGlobalCallIn": false, + "enabledAudienceCallBack": true, + "entryAndExitTone": "beep", + "allowHostToUnmuteParticipants": false, + "allowAttendeeToUnmuteSelf": false, + "muteAttendeeUponEntry": false + } }, { - "id": 4, - "name": "Anastasia", - "email": "Kendall.Dare26@yahoo.com", - "address": "752 Nicholas Underpass" + "id": "907b19d5-d864-44a8-942a-4cba89cc8ba8", + "meetingNumber": 97930, + "title": "Polarised asymmetric policy", + "password": "o8am6PYaXhJUHoN", + "meetingType": "meetingSeries", + "state": "active", + "timezone": "Asia/Shanghai", + "start": "2023-11-01T20:00:00+08:00", + "end": "2023-11-01T21:00:00+08:00", + "hostUserId": "63176565", + "hostDisplayName": "Alta Bruen III", + "hostEmail": "Chaya_Torp@yahoo.com", + "hostKey": 81091, + "siteUrl": "ciscofedsales.webex.com", + "webLink": "http://nona.net", + "sipAddress": "Zoila_Turcotte@yahoo.com", + "dialInIpAddress": "152.74.55.155", + "enabledAutoRecordMeeting": true, + "allowAnyUserToBeCoHost": false, + "allowFirstUserToBeCoHost": true, + "allowAuthenticatedDevices": false, + "enabledJoinBeforeHost": true, + "joinBeforeHostMinutes": 2, + "enableConnectAudioBeforeHost": false, + "excludePassword": true, + "publicMeeting": true, + "enableAutomaticLock": false, + "automaticLockMinutes": 1, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "telephony": { + "accessCode": "907519", + "callInNumbers": [ + { + "label": "United States Toll", + "callInNumber": "+1-415-527-5035", + "tollType": "toll" + }, + { + "label": "United States Toll (Washington D.C.)", + "callInNumber": "+1-202-600-2533", + "tollType": "toll" + } + ], + "links": [ + { + "rel": "globalCallinNumbers", + "href": "/v1/meetings/c322fa7d-3027-4dcf-9149-7fb7d818ce99/globalCallinNumbers", + "method": "GET" + } + ] + }, + "meetingOptions": { + "enabledChat": true, + "enabledVideo": true, + "enabledNote": false, + "noteType": "allowAll", + "enabledFileTransfer": true, + "enabledUCFRichMedia": true + }, + "attendeePrivileges": { + "enabledShareContent": false, + "enabledSaveDocument": true, + "enabledPrintDocument": true, + "enabledAnnotate": false, + "enabledViewParticipantList": true, + "enabledViewThumbnails": true, + "enabledRemoteControl": false, + "enabledViewAnyDocument": false, + "enabledViewAnyPage": true, + "enabledContactOperatorPrivately": false, + "enabledChatHost": true, + "enabledChatPresenter": false, + "enabledChatOtherParticipants": false + }, + "sessionTypeId": 3, + "scheduledType": "meeting", + "simultaneousInterpretation": { + "enabled": false + }, + "enabledBreakoutSessions": true, + "audioConnectionOptions": { + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": false, + "enabledGlobalCallIn": false, + "enabledAudienceCallBack": false, + "entryAndExitTone": "beep", + "allowHostToUnmuteParticipants": false, + "allowAttendeeToUnmuteSelf": false, + "muteAttendeeUponEntry": false + } }, { - "id": 5, - "name": "Velda", - "email": "Sheila.Wehner7@gmail.com", - "address": "9119 Jeremie Grove" + "id": "54ac78eb-f2c8-4587-8d43-b9a8e6ab4bea", + "meetingNumber": 42165, + "title": "Multi-channelled interactive capability", + "password": "hjsxn41KZT25xXu", + "meetingType": "meetingSeries", + "state": "active", + "timezone": "Asia/Shanghai", + "start": "2023-11-01T20:00:00+08:00", + "end": "2023-11-01T21:00:00+08:00", + "hostUserId": "54834533", + "hostDisplayName": "Jeramie Hoppe", + "hostEmail": "Camila_Lesch@yahoo.com", + "hostKey": 22255, + "siteUrl": "ciscofedsales.webex.com", + "webLink": "http://charlotte.com", + "sipAddress": "Ryann49@yahoo.com", + "dialInIpAddress": "152.117.169.81", + "enabledAutoRecordMeeting": true, + "allowAnyUserToBeCoHost": false, + "allowFirstUserToBeCoHost": false, + "allowAuthenticatedDevices": false, + "enabledJoinBeforeHost": false, + "joinBeforeHostMinutes": 9, + "enableConnectAudioBeforeHost": false, + "excludePassword": true, + "publicMeeting": true, + "enableAutomaticLock": true, + "automaticLockMinutes": 4, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "telephony": { + "accessCode": "223098", + "callInNumbers": [ + { + "label": "United States Toll", + "callInNumber": "+1-415-527-5035", + "tollType": "toll" + }, + { + "label": "United States Toll (Washington D.C.)", + "callInNumber": "+1-202-600-2533", + "tollType": "toll" + } + ], + "links": [ + { + "rel": "globalCallinNumbers", + "href": "/v1/meetings/3ca8e38a-c2fd-4e6b-8a1b-18f450ca1e4d/globalCallinNumbers", + "method": "GET" + } + ] + }, + "meetingOptions": { + "enabledChat": true, + "enabledVideo": false, + "enabledNote": false, + "noteType": "allowAll", + "enabledFileTransfer": false, + "enabledUCFRichMedia": false + }, + "attendeePrivileges": { + "enabledShareContent": false, + "enabledSaveDocument": false, + "enabledPrintDocument": false, + "enabledAnnotate": false, + "enabledViewParticipantList": true, + "enabledViewThumbnails": true, + "enabledRemoteControl": false, + "enabledViewAnyDocument": false, + "enabledViewAnyPage": true, + "enabledContactOperatorPrivately": true, + "enabledChatHost": true, + "enabledChatPresenter": true, + "enabledChatOtherParticipants": false + }, + "sessionTypeId": 5, + "scheduledType": "meeting", + "simultaneousInterpretation": { + "enabled": false + }, + "enabledBreakoutSessions": false, + "audioConnectionOptions": { + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": false, + "enabledGlobalCallIn": true, + "enabledAudienceCallBack": false, + "entryAndExitTone": "beep", + "allowHostToUnmuteParticipants": false, + "allowAttendeeToUnmuteSelf": false, + "muteAttendeeUponEntry": false + } }, { - "id": 6, - "name": "Jillian", - "email": "Albertha_Parker47@hotmail.com", - "address": "151 Hyman Orchard" + "id": "c15270ed-e835-4592-b5b9-b4b13b5a2b8c", + "meetingNumber": 9797, + "title": "Mandatory system-worthy Graphical User Interface", + "password": "FeUE8hXE7SYlAwy", + "meetingType": "meetingSeries", + "state": "active", + "timezone": "Asia/Shanghai", + "start": "2023-11-01T20:00:00+08:00", + "end": "2023-11-01T21:00:00+08:00", + "hostUserId": "59184959", + "hostDisplayName": "Orlando Stiedemann", + "hostEmail": "Leila.Hills@gmail.com", + "hostKey": 37898, + "siteUrl": "ciscofedsales.webex.com", + "webLink": "http://maximilian.info", + "sipAddress": "Jon_Rice@hotmail.com", + "dialInIpAddress": "195.32.68.156", + "enabledAutoRecordMeeting": false, + "allowAnyUserToBeCoHost": true, + "allowFirstUserToBeCoHost": true, + "allowAuthenticatedDevices": false, + "enabledJoinBeforeHost": true, + "joinBeforeHostMinutes": 2, + "enableConnectAudioBeforeHost": false, + "excludePassword": true, + "publicMeeting": false, + "enableAutomaticLock": true, + "automaticLockMinutes": 9, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "telephony": { + "accessCode": "622352", + "callInNumbers": [ + { + "label": "United States Toll", + "callInNumber": "+1-415-527-5035", + "tollType": "toll" + }, + { + "label": "United States Toll (Washington D.C.)", + "callInNumber": "+1-202-600-2533", + "tollType": "toll" + } + ], + "links": [ + { + "rel": "globalCallinNumbers", + "href": "/v1/meetings/ec62ba8b-a145-44f5-9412-3147f1a669e8/globalCallinNumbers", + "method": "GET" + } + ] + }, + "meetingOptions": { + "enabledChat": true, + "enabledVideo": true, + "enabledNote": true, + "noteType": "allowAll", + "enabledFileTransfer": true, + "enabledUCFRichMedia": true + }, + "attendeePrivileges": { + "enabledShareContent": false, + "enabledSaveDocument": true, + "enabledPrintDocument": false, + "enabledAnnotate": true, + "enabledViewParticipantList": false, + "enabledViewThumbnails": false, + "enabledRemoteControl": false, + "enabledViewAnyDocument": true, + "enabledViewAnyPage": false, + "enabledContactOperatorPrivately": false, + "enabledChatHost": true, + "enabledChatPresenter": true, + "enabledChatOtherParticipants": false + }, + "sessionTypeId": 2, + "scheduledType": "meeting", + "simultaneousInterpretation": { + "enabled": true + }, + "enabledBreakoutSessions": false, + "audioConnectionOptions": { + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": false, + "enabledGlobalCallIn": false, + "enabledAudienceCallBack": false, + "entryAndExitTone": "beep", + "allowHostToUnmuteParticipants": true, + "allowAttendeeToUnmuteSelf": true, + "muteAttendeeUponEntry": false + } }, { - "id": 7, - "name": "Ruthe", - "email": "Jamar.Bins@yahoo.com", - "address": "479 Larue Stravenue" + "id": "018862ce-ab6d-41ed-a102-20a136aaf923", + "meetingNumber": 84055, + "title": "Multi-tiered methodical ability", + "password": "oBo3EMXravQsDGE", + "meetingType": "meetingSeries", + "state": "active", + "timezone": "Asia/Shanghai", + "start": "2023-11-01T20:00:00+08:00", + "end": "2023-11-01T21:00:00+08:00", + "hostUserId": "43811862", + "hostDisplayName": "Mr. Kirstin Volkman", + "hostEmail": "Edd_Kihn1@hotmail.com", + "hostKey": 14386, + "siteUrl": "ciscofedsales.webex.com", + "webLink": "https://gideon.name", + "sipAddress": "Bernhard.Harris15@hotmail.com", + "dialInIpAddress": "116.247.213.104", + "enabledAutoRecordMeeting": false, + "allowAnyUserToBeCoHost": true, + "allowFirstUserToBeCoHost": true, + "allowAuthenticatedDevices": false, + "enabledJoinBeforeHost": true, + "joinBeforeHostMinutes": 9, + "enableConnectAudioBeforeHost": true, + "excludePassword": false, + "publicMeeting": false, + "enableAutomaticLock": false, + "automaticLockMinutes": 7, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "telephony": { + "accessCode": "512359", + "callInNumbers": [ + { + "label": "United States Toll", + "callInNumber": "+1-415-527-5035", + "tollType": "toll" + }, + { + "label": "United States Toll (Washington D.C.)", + "callInNumber": "+1-202-600-2533", + "tollType": "toll" + } + ], + "links": [ + { + "rel": "globalCallinNumbers", + "href": "/v1/meetings/f9dbdc29-3741-4277-b6b4-d031e75ea67e/globalCallinNumbers", + "method": "GET" + } + ] + }, + "meetingOptions": { + "enabledChat": false, + "enabledVideo": false, + "enabledNote": true, + "noteType": "allowAll", + "enabledFileTransfer": false, + "enabledUCFRichMedia": true + }, + "attendeePrivileges": { + "enabledShareContent": false, + "enabledSaveDocument": true, + "enabledPrintDocument": true, + "enabledAnnotate": true, + "enabledViewParticipantList": true, + "enabledViewThumbnails": true, + "enabledRemoteControl": true, + "enabledViewAnyDocument": true, + "enabledViewAnyPage": false, + "enabledContactOperatorPrivately": false, + "enabledChatHost": false, + "enabledChatPresenter": true, + "enabledChatOtherParticipants": false + }, + "sessionTypeId": 1, + "scheduledType": "meeting", + "simultaneousInterpretation": { + "enabled": false + }, + "enabledBreakoutSessions": true, + "audioConnectionOptions": { + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": false, + "enabledGlobalCallIn": false, + "enabledAudienceCallBack": true, + "entryAndExitTone": "beep", + "allowHostToUnmuteParticipants": false, + "allowAttendeeToUnmuteSelf": false, + "muteAttendeeUponEntry": false + } }, { - "id": 8, - "name": "Cristal", - "email": "Oswald54@hotmail.com", - "address": "904 Nikolaus Canyon" + "id": "9c31787a-e73c-4af4-b08b-e81684d0cbb1", + "meetingNumber": 86831, + "title": "Mandatory dedicated matrix", + "password": "CYvWgC1IQD6ytvD", + "meetingType": "meetingSeries", + "state": "active", + "timezone": "Asia/Shanghai", + "start": "2023-11-01T20:00:00+08:00", + "end": "2023-11-01T21:00:00+08:00", + "hostUserId": "80182230", + "hostDisplayName": "Virgie King", + "hostEmail": "Ari_Volkman37@gmail.com", + "hostKey": 66529, + "siteUrl": "ciscofedsales.webex.com", + "webLink": "http://ethelyn.com", + "sipAddress": "Wilma.Stroman@hotmail.com", + "dialInIpAddress": "116.242.42.39", + "enabledAutoRecordMeeting": true, + "allowAnyUserToBeCoHost": false, + "allowFirstUserToBeCoHost": false, + "allowAuthenticatedDevices": true, + "enabledJoinBeforeHost": false, + "joinBeforeHostMinutes": 0, + "enableConnectAudioBeforeHost": false, + "excludePassword": false, + "publicMeeting": true, + "enableAutomaticLock": true, + "automaticLockMinutes": 9, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "telephony": { + "accessCode": "471458", + "callInNumbers": [ + { + "label": "United States Toll", + "callInNumber": "+1-415-527-5035", + "tollType": "toll" + }, + { + "label": "United States Toll (Washington D.C.)", + "callInNumber": "+1-202-600-2533", + "tollType": "toll" + } + ], + "links": [ + { + "rel": "globalCallinNumbers", + "href": "/v1/meetings/bea0bc33-a364-47d6-a095-00744d5dc821/globalCallinNumbers", + "method": "GET" + } + ] + }, + "meetingOptions": { + "enabledChat": false, + "enabledVideo": false, + "enabledNote": false, + "noteType": "allowAll", + "enabledFileTransfer": true, + "enabledUCFRichMedia": true + }, + "attendeePrivileges": { + "enabledShareContent": true, + "enabledSaveDocument": false, + "enabledPrintDocument": true, + "enabledAnnotate": false, + "enabledViewParticipantList": false, + "enabledViewThumbnails": false, + "enabledRemoteControl": true, + "enabledViewAnyDocument": true, + "enabledViewAnyPage": false, + "enabledContactOperatorPrivately": false, + "enabledChatHost": false, + "enabledChatPresenter": false, + "enabledChatOtherParticipants": true + }, + "sessionTypeId": 5, + "scheduledType": "meeting", + "simultaneousInterpretation": { + "enabled": true + }, + "enabledBreakoutSessions": false, + "audioConnectionOptions": { + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": false, + "enabledGlobalCallIn": false, + "enabledAudienceCallBack": true, + "entryAndExitTone": "beep", + "allowHostToUnmuteParticipants": false, + "allowAttendeeToUnmuteSelf": false, + "muteAttendeeUponEntry": false + } }, { - "id": 9, - "name": "Bernita", - "email": "Stella.Schumm@yahoo.com", - "address": "824 Jena Unions" + "id": "8f0b295a-33e6-4989-b874-b5fc5a2ed53d", + "meetingNumber": 22723, + "title": "Stand-alone bi-directional intranet", + "password": "fFWi8yMedJkvKOO", + "meetingType": "meetingSeries", + "state": "active", + "timezone": "Asia/Shanghai", + "start": "2023-11-01T20:00:00+08:00", + "end": "2023-11-01T21:00:00+08:00", + "hostUserId": "19393117", + "hostDisplayName": "Porter Ruecker", + "hostEmail": "Delmer.Koch92@gmail.com", + "hostKey": 33208, + "siteUrl": "ciscofedsales.webex.com", + "webLink": "http://lenore.info", + "sipAddress": "Giovani.Connelly79@gmail.com", + "dialInIpAddress": "152.226.222.66", + "enabledAutoRecordMeeting": false, + "allowAnyUserToBeCoHost": true, + "allowFirstUserToBeCoHost": false, + "allowAuthenticatedDevices": true, + "enabledJoinBeforeHost": false, + "joinBeforeHostMinutes": 2, + "enableConnectAudioBeforeHost": false, + "excludePassword": false, + "publicMeeting": true, + "enableAutomaticLock": true, + "automaticLockMinutes": 6, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "telephony": { + "accessCode": "919054", + "callInNumbers": [ + { + "label": "United States Toll", + "callInNumber": "+1-415-527-5035", + "tollType": "toll" + }, + { + "label": "United States Toll (Washington D.C.)", + "callInNumber": "+1-202-600-2533", + "tollType": "toll" + } + ], + "links": [ + { + "rel": "globalCallinNumbers", + "href": "/v1/meetings/8c9dd12b-5c9f-4874-aae2-8d745f82039d/globalCallinNumbers", + "method": "GET" + } + ] + }, + "meetingOptions": { + "enabledChat": false, + "enabledVideo": true, + "enabledNote": false, + "noteType": "allowAll", + "enabledFileTransfer": true, + "enabledUCFRichMedia": true + }, + "attendeePrivileges": { + "enabledShareContent": true, + "enabledSaveDocument": false, + "enabledPrintDocument": true, + "enabledAnnotate": false, + "enabledViewParticipantList": true, + "enabledViewThumbnails": false, + "enabledRemoteControl": true, + "enabledViewAnyDocument": false, + "enabledViewAnyPage": false, + "enabledContactOperatorPrivately": true, + "enabledChatHost": true, + "enabledChatPresenter": true, + "enabledChatOtherParticipants": false + }, + "sessionTypeId": 4, + "scheduledType": "meeting", + "simultaneousInterpretation": { + "enabled": false + }, + "enabledBreakoutSessions": false, + "audioConnectionOptions": { + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": false, + "enabledGlobalCallIn": true, + "enabledAudienceCallBack": true, + "entryAndExitTone": "beep", + "allowHostToUnmuteParticipants": true, + "allowAttendeeToUnmuteSelf": false, + "muteAttendeeUponEntry": false + } }, { - "id": 10, - "name": "Alexzander", - "email": "Mavis59@gmail.com", - "address": "7734 Burdette Forest" - }, - { - "id": 20, - "name": "Karson", - "email": "Pierre_Erdman34@hotmail.com", - "address": "151 Dawson Lights" + "id": "6ed04428-7d9b-4cd6-b7f3-54e348d5c340", + "meetingNumber": 24458, + "title": "Profound multimedia hub", + "password": "ZVn3BBpTl1wxc2w", + "meetingType": "meetingSeries", + "state": "active", + "timezone": "Asia/Shanghai", + "start": "2023-11-01T20:00:00+08:00", + "end": "2023-11-01T21:00:00+08:00", + "hostUserId": "72417773", + "hostDisplayName": "Twila Kuphal", + "hostEmail": "Hillard.Ward85@yahoo.com", + "hostKey": 58387, + "siteUrl": "ciscofedsales.webex.com", + "webLink": "https://kassandra.net", + "sipAddress": "Alvera.Bergstrom@gmail.com", + "dialInIpAddress": "17.99.142.78", + "enabledAutoRecordMeeting": false, + "allowAnyUserToBeCoHost": true, + "allowFirstUserToBeCoHost": false, + "allowAuthenticatedDevices": false, + "enabledJoinBeforeHost": false, + "joinBeforeHostMinutes": 3, + "enableConnectAudioBeforeHost": true, + "excludePassword": false, + "publicMeeting": false, + "enableAutomaticLock": true, + "automaticLockMinutes": 7, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "telephony": { + "accessCode": "432807", + "callInNumbers": [ + { + "label": "United States Toll", + "callInNumber": "+1-415-527-5035", + "tollType": "toll" + }, + { + "label": "United States Toll (Washington D.C.)", + "callInNumber": "+1-202-600-2533", + "tollType": "toll" + } + ], + "links": [ + { + "rel": "globalCallinNumbers", + "href": "/v1/meetings/9c54ed9c-91f7-4e34-a399-53824a954683/globalCallinNumbers", + "method": "GET" + } + ] + }, + "meetingOptions": { + "enabledChat": false, + "enabledVideo": true, + "enabledNote": false, + "noteType": "allowAll", + "enabledFileTransfer": false, + "enabledUCFRichMedia": true + }, + "attendeePrivileges": { + "enabledShareContent": false, + "enabledSaveDocument": false, + "enabledPrintDocument": false, + "enabledAnnotate": true, + "enabledViewParticipantList": false, + "enabledViewThumbnails": false, + "enabledRemoteControl": true, + "enabledViewAnyDocument": false, + "enabledViewAnyPage": true, + "enabledContactOperatorPrivately": false, + "enabledChatHost": false, + "enabledChatPresenter": false, + "enabledChatOtherParticipants": false + }, + "sessionTypeId": 4, + "scheduledType": "meeting", + "simultaneousInterpretation": { + "enabled": false + }, + "enabledBreakoutSessions": false, + "audioConnectionOptions": { + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": false, + "enabledGlobalCallIn": true, + "enabledAudienceCallBack": true, + "entryAndExitTone": "beep", + "allowHostToUnmuteParticipants": true, + "allowAttendeeToUnmuteSelf": false, + "muteAttendeeUponEntry": false + } } ] } \ No newline at end of file From 38ddb287d8f3f4eebb8247dd1d80485e812e5ea6 Mon Sep 17 00:00:00 2001 From: breedbah Date: Fri, 18 Aug 2023 13:44:59 -0400 Subject: [PATCH 035/445] APPEALS-25108 removed dummy data --- client/mocks/webex-mocks/webex-mock.json | 923 +---------------------- 1 file changed, 2 insertions(+), 921 deletions(-) diff --git a/client/mocks/webex-mocks/webex-mock.json b/client/mocks/webex-mocks/webex-mock.json index 6c5fd19657d..45f026b185e 100644 --- a/client/mocks/webex-mocks/webex-mock.json +++ b/client/mocks/webex-mocks/webex-mock.json @@ -1,924 +1,5 @@ { "conferenceLinks": [ - { - "id": "2bbdaa15-3d32-47bb-9b22-f961515a7f57", - "meetingNumber": 56455, - "title": "Streamlined 5th generation matrices", - "password": "ieIzUkSP6bRDqG0", - "meetingType": "meetingSeries", - "state": "active", - "timezone": "Asia/Shanghai", - "start": "2023-11-01T20:00:00+08:00", - "end": "2023-11-01T21:00:00+08:00", - "hostUserId": "37222262", - "hostDisplayName": "Neil Vandervort", - "hostEmail": "Jay_Hilpert@yahoo.com", - "hostKey": 9307, - "siteUrl": "ciscofedsales.webex.com", - "webLink": "https://ima.net", - "sipAddress": "Yazmin46@hotmail.com", - "dialInIpAddress": "128.142.68.190", - "enabledAutoRecordMeeting": true, - "allowAnyUserToBeCoHost": true, - "allowFirstUserToBeCoHost": true, - "allowAuthenticatedDevices": true, - "enabledJoinBeforeHost": true, - "joinBeforeHostMinutes": 4, - "enableConnectAudioBeforeHost": false, - "excludePassword": false, - "publicMeeting": false, - "enableAutomaticLock": false, - "automaticLockMinutes": 3, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "telephony": { - "accessCode": "720253", - "callInNumbers": [ - { - "label": "United States Toll", - "callInNumber": "+1-415-527-5035", - "tollType": "toll" - }, - { - "label": "United States Toll (Washington D.C.)", - "callInNumber": "+1-202-600-2533", - "tollType": "toll" - } - ], - "links": [ - { - "rel": "globalCallinNumbers", - "href": "/v1/meetings/24bc67b1-f8ec-44b2-a3a9-0afa8b267048/globalCallinNumbers", - "method": "GET" - } - ] - }, - "meetingOptions": { - "enabledChat": true, - "enabledVideo": false, - "enabledNote": true, - "noteType": "allowAll", - "enabledFileTransfer": false, - "enabledUCFRichMedia": false - }, - "attendeePrivileges": { - "enabledShareContent": false, - "enabledSaveDocument": true, - "enabledPrintDocument": false, - "enabledAnnotate": true, - "enabledViewParticipantList": true, - "enabledViewThumbnails": true, - "enabledRemoteControl": false, - "enabledViewAnyDocument": true, - "enabledViewAnyPage": true, - "enabledContactOperatorPrivately": true, - "enabledChatHost": true, - "enabledChatPresenter": false, - "enabledChatOtherParticipants": false - }, - "sessionTypeId": 5, - "scheduledType": "meeting", - "simultaneousInterpretation": { - "enabled": true - }, - "enabledBreakoutSessions": false, - "audioConnectionOptions": { - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": true, - "enabledGlobalCallIn": false, - "enabledAudienceCallBack": false, - "entryAndExitTone": "beep", - "allowHostToUnmuteParticipants": false, - "allowAttendeeToUnmuteSelf": false, - "muteAttendeeUponEntry": false - } - }, - { - "id": "3270b6a4-bec5-4fc9-8528-2f555d5872ad", - "meetingNumber": 95282, - "title": "Extended motivating strategy", - "password": "cbNG8fwZQegFOE2", - "meetingType": "meetingSeries", - "state": "active", - "timezone": "Asia/Shanghai", - "start": "2023-11-01T20:00:00+08:00", - "end": "2023-11-01T21:00:00+08:00", - "hostUserId": "30921397", - "hostDisplayName": "Dulce Nikolaus", - "hostEmail": "Berniece.Morar@yahoo.com", - "hostKey": 81643, - "siteUrl": "ciscofedsales.webex.com", - "webLink": "https://norris.com", - "sipAddress": "Freda19@gmail.com", - "dialInIpAddress": "140.162.243.122", - "enabledAutoRecordMeeting": false, - "allowAnyUserToBeCoHost": true, - "allowFirstUserToBeCoHost": true, - "allowAuthenticatedDevices": true, - "enabledJoinBeforeHost": false, - "joinBeforeHostMinutes": 5, - "enableConnectAudioBeforeHost": true, - "excludePassword": true, - "publicMeeting": true, - "enableAutomaticLock": false, - "automaticLockMinutes": 10, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "telephony": { - "accessCode": "104372", - "callInNumbers": [ - { - "label": "United States Toll", - "callInNumber": "+1-415-527-5035", - "tollType": "toll" - }, - { - "label": "United States Toll (Washington D.C.)", - "callInNumber": "+1-202-600-2533", - "tollType": "toll" - } - ], - "links": [ - { - "rel": "globalCallinNumbers", - "href": "/v1/meetings/bc253dc6-536c-499f-ad98-8e4710811749/globalCallinNumbers", - "method": "GET" - } - ] - }, - "meetingOptions": { - "enabledChat": false, - "enabledVideo": true, - "enabledNote": true, - "noteType": "allowAll", - "enabledFileTransfer": true, - "enabledUCFRichMedia": false - }, - "attendeePrivileges": { - "enabledShareContent": false, - "enabledSaveDocument": true, - "enabledPrintDocument": false, - "enabledAnnotate": false, - "enabledViewParticipantList": false, - "enabledViewThumbnails": false, - "enabledRemoteControl": false, - "enabledViewAnyDocument": true, - "enabledViewAnyPage": false, - "enabledContactOperatorPrivately": true, - "enabledChatHost": true, - "enabledChatPresenter": true, - "enabledChatOtherParticipants": true - }, - "sessionTypeId": 5, - "scheduledType": "meeting", - "simultaneousInterpretation": { - "enabled": false - }, - "enabledBreakoutSessions": true, - "audioConnectionOptions": { - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": false, - "enabledGlobalCallIn": true, - "enabledAudienceCallBack": false, - "entryAndExitTone": "beep", - "allowHostToUnmuteParticipants": true, - "allowAttendeeToUnmuteSelf": true, - "muteAttendeeUponEntry": true - } - }, - { - "id": "427d18ba-dd84-4309-9992-2ad4d28a5df3", - "meetingNumber": 32689, - "title": "Compatible radical adapter", - "password": "atmv_B2iZEOSAwQ", - "meetingType": "meetingSeries", - "state": "active", - "timezone": "Asia/Shanghai", - "start": "2023-11-01T20:00:00+08:00", - "end": "2023-11-01T21:00:00+08:00", - "hostUserId": "85649747", - "hostDisplayName": "Taurean McKenzie", - "hostEmail": "Jarvis_Hyatt@gmail.com", - "hostKey": 33023, - "siteUrl": "ciscofedsales.webex.com", - "webLink": "http://ansley.com", - "sipAddress": "Vanessa.Graham@yahoo.com", - "dialInIpAddress": "17.67.187.244", - "enabledAutoRecordMeeting": false, - "allowAnyUserToBeCoHost": true, - "allowFirstUserToBeCoHost": true, - "allowAuthenticatedDevices": false, - "enabledJoinBeforeHost": false, - "joinBeforeHostMinutes": 3, - "enableConnectAudioBeforeHost": true, - "excludePassword": false, - "publicMeeting": true, - "enableAutomaticLock": false, - "automaticLockMinutes": 7, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "telephony": { - "accessCode": "171528", - "callInNumbers": [ - { - "label": "United States Toll", - "callInNumber": "+1-415-527-5035", - "tollType": "toll" - }, - { - "label": "United States Toll (Washington D.C.)", - "callInNumber": "+1-202-600-2533", - "tollType": "toll" - } - ], - "links": [ - { - "rel": "globalCallinNumbers", - "href": "/v1/meetings/7e93877f-0c41-48fa-876c-0e20323246cd/globalCallinNumbers", - "method": "GET" - } - ] - }, - "meetingOptions": { - "enabledChat": false, - "enabledVideo": false, - "enabledNote": false, - "noteType": "allowAll", - "enabledFileTransfer": true, - "enabledUCFRichMedia": false - }, - "attendeePrivileges": { - "enabledShareContent": true, - "enabledSaveDocument": true, - "enabledPrintDocument": true, - "enabledAnnotate": false, - "enabledViewParticipantList": false, - "enabledViewThumbnails": false, - "enabledRemoteControl": true, - "enabledViewAnyDocument": true, - "enabledViewAnyPage": false, - "enabledContactOperatorPrivately": true, - "enabledChatHost": false, - "enabledChatPresenter": true, - "enabledChatOtherParticipants": true - }, - "sessionTypeId": 4, - "scheduledType": "meeting", - "simultaneousInterpretation": { - "enabled": false - }, - "enabledBreakoutSessions": false, - "audioConnectionOptions": { - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": true, - "enabledGlobalCallIn": false, - "enabledAudienceCallBack": true, - "entryAndExitTone": "beep", - "allowHostToUnmuteParticipants": false, - "allowAttendeeToUnmuteSelf": false, - "muteAttendeeUponEntry": false - } - }, - { - "id": "907b19d5-d864-44a8-942a-4cba89cc8ba8", - "meetingNumber": 97930, - "title": "Polarised asymmetric policy", - "password": "o8am6PYaXhJUHoN", - "meetingType": "meetingSeries", - "state": "active", - "timezone": "Asia/Shanghai", - "start": "2023-11-01T20:00:00+08:00", - "end": "2023-11-01T21:00:00+08:00", - "hostUserId": "63176565", - "hostDisplayName": "Alta Bruen III", - "hostEmail": "Chaya_Torp@yahoo.com", - "hostKey": 81091, - "siteUrl": "ciscofedsales.webex.com", - "webLink": "http://nona.net", - "sipAddress": "Zoila_Turcotte@yahoo.com", - "dialInIpAddress": "152.74.55.155", - "enabledAutoRecordMeeting": true, - "allowAnyUserToBeCoHost": false, - "allowFirstUserToBeCoHost": true, - "allowAuthenticatedDevices": false, - "enabledJoinBeforeHost": true, - "joinBeforeHostMinutes": 2, - "enableConnectAudioBeforeHost": false, - "excludePassword": true, - "publicMeeting": true, - "enableAutomaticLock": false, - "automaticLockMinutes": 1, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "telephony": { - "accessCode": "907519", - "callInNumbers": [ - { - "label": "United States Toll", - "callInNumber": "+1-415-527-5035", - "tollType": "toll" - }, - { - "label": "United States Toll (Washington D.C.)", - "callInNumber": "+1-202-600-2533", - "tollType": "toll" - } - ], - "links": [ - { - "rel": "globalCallinNumbers", - "href": "/v1/meetings/c322fa7d-3027-4dcf-9149-7fb7d818ce99/globalCallinNumbers", - "method": "GET" - } - ] - }, - "meetingOptions": { - "enabledChat": true, - "enabledVideo": true, - "enabledNote": false, - "noteType": "allowAll", - "enabledFileTransfer": true, - "enabledUCFRichMedia": true - }, - "attendeePrivileges": { - "enabledShareContent": false, - "enabledSaveDocument": true, - "enabledPrintDocument": true, - "enabledAnnotate": false, - "enabledViewParticipantList": true, - "enabledViewThumbnails": true, - "enabledRemoteControl": false, - "enabledViewAnyDocument": false, - "enabledViewAnyPage": true, - "enabledContactOperatorPrivately": false, - "enabledChatHost": true, - "enabledChatPresenter": false, - "enabledChatOtherParticipants": false - }, - "sessionTypeId": 3, - "scheduledType": "meeting", - "simultaneousInterpretation": { - "enabled": false - }, - "enabledBreakoutSessions": true, - "audioConnectionOptions": { - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": false, - "enabledGlobalCallIn": false, - "enabledAudienceCallBack": false, - "entryAndExitTone": "beep", - "allowHostToUnmuteParticipants": false, - "allowAttendeeToUnmuteSelf": false, - "muteAttendeeUponEntry": false - } - }, - { - "id": "54ac78eb-f2c8-4587-8d43-b9a8e6ab4bea", - "meetingNumber": 42165, - "title": "Multi-channelled interactive capability", - "password": "hjsxn41KZT25xXu", - "meetingType": "meetingSeries", - "state": "active", - "timezone": "Asia/Shanghai", - "start": "2023-11-01T20:00:00+08:00", - "end": "2023-11-01T21:00:00+08:00", - "hostUserId": "54834533", - "hostDisplayName": "Jeramie Hoppe", - "hostEmail": "Camila_Lesch@yahoo.com", - "hostKey": 22255, - "siteUrl": "ciscofedsales.webex.com", - "webLink": "http://charlotte.com", - "sipAddress": "Ryann49@yahoo.com", - "dialInIpAddress": "152.117.169.81", - "enabledAutoRecordMeeting": true, - "allowAnyUserToBeCoHost": false, - "allowFirstUserToBeCoHost": false, - "allowAuthenticatedDevices": false, - "enabledJoinBeforeHost": false, - "joinBeforeHostMinutes": 9, - "enableConnectAudioBeforeHost": false, - "excludePassword": true, - "publicMeeting": true, - "enableAutomaticLock": true, - "automaticLockMinutes": 4, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "telephony": { - "accessCode": "223098", - "callInNumbers": [ - { - "label": "United States Toll", - "callInNumber": "+1-415-527-5035", - "tollType": "toll" - }, - { - "label": "United States Toll (Washington D.C.)", - "callInNumber": "+1-202-600-2533", - "tollType": "toll" - } - ], - "links": [ - { - "rel": "globalCallinNumbers", - "href": "/v1/meetings/3ca8e38a-c2fd-4e6b-8a1b-18f450ca1e4d/globalCallinNumbers", - "method": "GET" - } - ] - }, - "meetingOptions": { - "enabledChat": true, - "enabledVideo": false, - "enabledNote": false, - "noteType": "allowAll", - "enabledFileTransfer": false, - "enabledUCFRichMedia": false - }, - "attendeePrivileges": { - "enabledShareContent": false, - "enabledSaveDocument": false, - "enabledPrintDocument": false, - "enabledAnnotate": false, - "enabledViewParticipantList": true, - "enabledViewThumbnails": true, - "enabledRemoteControl": false, - "enabledViewAnyDocument": false, - "enabledViewAnyPage": true, - "enabledContactOperatorPrivately": true, - "enabledChatHost": true, - "enabledChatPresenter": true, - "enabledChatOtherParticipants": false - }, - "sessionTypeId": 5, - "scheduledType": "meeting", - "simultaneousInterpretation": { - "enabled": false - }, - "enabledBreakoutSessions": false, - "audioConnectionOptions": { - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": false, - "enabledGlobalCallIn": true, - "enabledAudienceCallBack": false, - "entryAndExitTone": "beep", - "allowHostToUnmuteParticipants": false, - "allowAttendeeToUnmuteSelf": false, - "muteAttendeeUponEntry": false - } - }, - { - "id": "c15270ed-e835-4592-b5b9-b4b13b5a2b8c", - "meetingNumber": 9797, - "title": "Mandatory system-worthy Graphical User Interface", - "password": "FeUE8hXE7SYlAwy", - "meetingType": "meetingSeries", - "state": "active", - "timezone": "Asia/Shanghai", - "start": "2023-11-01T20:00:00+08:00", - "end": "2023-11-01T21:00:00+08:00", - "hostUserId": "59184959", - "hostDisplayName": "Orlando Stiedemann", - "hostEmail": "Leila.Hills@gmail.com", - "hostKey": 37898, - "siteUrl": "ciscofedsales.webex.com", - "webLink": "http://maximilian.info", - "sipAddress": "Jon_Rice@hotmail.com", - "dialInIpAddress": "195.32.68.156", - "enabledAutoRecordMeeting": false, - "allowAnyUserToBeCoHost": true, - "allowFirstUserToBeCoHost": true, - "allowAuthenticatedDevices": false, - "enabledJoinBeforeHost": true, - "joinBeforeHostMinutes": 2, - "enableConnectAudioBeforeHost": false, - "excludePassword": true, - "publicMeeting": false, - "enableAutomaticLock": true, - "automaticLockMinutes": 9, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "telephony": { - "accessCode": "622352", - "callInNumbers": [ - { - "label": "United States Toll", - "callInNumber": "+1-415-527-5035", - "tollType": "toll" - }, - { - "label": "United States Toll (Washington D.C.)", - "callInNumber": "+1-202-600-2533", - "tollType": "toll" - } - ], - "links": [ - { - "rel": "globalCallinNumbers", - "href": "/v1/meetings/ec62ba8b-a145-44f5-9412-3147f1a669e8/globalCallinNumbers", - "method": "GET" - } - ] - }, - "meetingOptions": { - "enabledChat": true, - "enabledVideo": true, - "enabledNote": true, - "noteType": "allowAll", - "enabledFileTransfer": true, - "enabledUCFRichMedia": true - }, - "attendeePrivileges": { - "enabledShareContent": false, - "enabledSaveDocument": true, - "enabledPrintDocument": false, - "enabledAnnotate": true, - "enabledViewParticipantList": false, - "enabledViewThumbnails": false, - "enabledRemoteControl": false, - "enabledViewAnyDocument": true, - "enabledViewAnyPage": false, - "enabledContactOperatorPrivately": false, - "enabledChatHost": true, - "enabledChatPresenter": true, - "enabledChatOtherParticipants": false - }, - "sessionTypeId": 2, - "scheduledType": "meeting", - "simultaneousInterpretation": { - "enabled": true - }, - "enabledBreakoutSessions": false, - "audioConnectionOptions": { - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": false, - "enabledGlobalCallIn": false, - "enabledAudienceCallBack": false, - "entryAndExitTone": "beep", - "allowHostToUnmuteParticipants": true, - "allowAttendeeToUnmuteSelf": true, - "muteAttendeeUponEntry": false - } - }, - { - "id": "018862ce-ab6d-41ed-a102-20a136aaf923", - "meetingNumber": 84055, - "title": "Multi-tiered methodical ability", - "password": "oBo3EMXravQsDGE", - "meetingType": "meetingSeries", - "state": "active", - "timezone": "Asia/Shanghai", - "start": "2023-11-01T20:00:00+08:00", - "end": "2023-11-01T21:00:00+08:00", - "hostUserId": "43811862", - "hostDisplayName": "Mr. Kirstin Volkman", - "hostEmail": "Edd_Kihn1@hotmail.com", - "hostKey": 14386, - "siteUrl": "ciscofedsales.webex.com", - "webLink": "https://gideon.name", - "sipAddress": "Bernhard.Harris15@hotmail.com", - "dialInIpAddress": "116.247.213.104", - "enabledAutoRecordMeeting": false, - "allowAnyUserToBeCoHost": true, - "allowFirstUserToBeCoHost": true, - "allowAuthenticatedDevices": false, - "enabledJoinBeforeHost": true, - "joinBeforeHostMinutes": 9, - "enableConnectAudioBeforeHost": true, - "excludePassword": false, - "publicMeeting": false, - "enableAutomaticLock": false, - "automaticLockMinutes": 7, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "telephony": { - "accessCode": "512359", - "callInNumbers": [ - { - "label": "United States Toll", - "callInNumber": "+1-415-527-5035", - "tollType": "toll" - }, - { - "label": "United States Toll (Washington D.C.)", - "callInNumber": "+1-202-600-2533", - "tollType": "toll" - } - ], - "links": [ - { - "rel": "globalCallinNumbers", - "href": "/v1/meetings/f9dbdc29-3741-4277-b6b4-d031e75ea67e/globalCallinNumbers", - "method": "GET" - } - ] - }, - "meetingOptions": { - "enabledChat": false, - "enabledVideo": false, - "enabledNote": true, - "noteType": "allowAll", - "enabledFileTransfer": false, - "enabledUCFRichMedia": true - }, - "attendeePrivileges": { - "enabledShareContent": false, - "enabledSaveDocument": true, - "enabledPrintDocument": true, - "enabledAnnotate": true, - "enabledViewParticipantList": true, - "enabledViewThumbnails": true, - "enabledRemoteControl": true, - "enabledViewAnyDocument": true, - "enabledViewAnyPage": false, - "enabledContactOperatorPrivately": false, - "enabledChatHost": false, - "enabledChatPresenter": true, - "enabledChatOtherParticipants": false - }, - "sessionTypeId": 1, - "scheduledType": "meeting", - "simultaneousInterpretation": { - "enabled": false - }, - "enabledBreakoutSessions": true, - "audioConnectionOptions": { - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": false, - "enabledGlobalCallIn": false, - "enabledAudienceCallBack": true, - "entryAndExitTone": "beep", - "allowHostToUnmuteParticipants": false, - "allowAttendeeToUnmuteSelf": false, - "muteAttendeeUponEntry": false - } - }, - { - "id": "9c31787a-e73c-4af4-b08b-e81684d0cbb1", - "meetingNumber": 86831, - "title": "Mandatory dedicated matrix", - "password": "CYvWgC1IQD6ytvD", - "meetingType": "meetingSeries", - "state": "active", - "timezone": "Asia/Shanghai", - "start": "2023-11-01T20:00:00+08:00", - "end": "2023-11-01T21:00:00+08:00", - "hostUserId": "80182230", - "hostDisplayName": "Virgie King", - "hostEmail": "Ari_Volkman37@gmail.com", - "hostKey": 66529, - "siteUrl": "ciscofedsales.webex.com", - "webLink": "http://ethelyn.com", - "sipAddress": "Wilma.Stroman@hotmail.com", - "dialInIpAddress": "116.242.42.39", - "enabledAutoRecordMeeting": true, - "allowAnyUserToBeCoHost": false, - "allowFirstUserToBeCoHost": false, - "allowAuthenticatedDevices": true, - "enabledJoinBeforeHost": false, - "joinBeforeHostMinutes": 0, - "enableConnectAudioBeforeHost": false, - "excludePassword": false, - "publicMeeting": true, - "enableAutomaticLock": true, - "automaticLockMinutes": 9, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "telephony": { - "accessCode": "471458", - "callInNumbers": [ - { - "label": "United States Toll", - "callInNumber": "+1-415-527-5035", - "tollType": "toll" - }, - { - "label": "United States Toll (Washington D.C.)", - "callInNumber": "+1-202-600-2533", - "tollType": "toll" - } - ], - "links": [ - { - "rel": "globalCallinNumbers", - "href": "/v1/meetings/bea0bc33-a364-47d6-a095-00744d5dc821/globalCallinNumbers", - "method": "GET" - } - ] - }, - "meetingOptions": { - "enabledChat": false, - "enabledVideo": false, - "enabledNote": false, - "noteType": "allowAll", - "enabledFileTransfer": true, - "enabledUCFRichMedia": true - }, - "attendeePrivileges": { - "enabledShareContent": true, - "enabledSaveDocument": false, - "enabledPrintDocument": true, - "enabledAnnotate": false, - "enabledViewParticipantList": false, - "enabledViewThumbnails": false, - "enabledRemoteControl": true, - "enabledViewAnyDocument": true, - "enabledViewAnyPage": false, - "enabledContactOperatorPrivately": false, - "enabledChatHost": false, - "enabledChatPresenter": false, - "enabledChatOtherParticipants": true - }, - "sessionTypeId": 5, - "scheduledType": "meeting", - "simultaneousInterpretation": { - "enabled": true - }, - "enabledBreakoutSessions": false, - "audioConnectionOptions": { - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": false, - "enabledGlobalCallIn": false, - "enabledAudienceCallBack": true, - "entryAndExitTone": "beep", - "allowHostToUnmuteParticipants": false, - "allowAttendeeToUnmuteSelf": false, - "muteAttendeeUponEntry": false - } - }, - { - "id": "8f0b295a-33e6-4989-b874-b5fc5a2ed53d", - "meetingNumber": 22723, - "title": "Stand-alone bi-directional intranet", - "password": "fFWi8yMedJkvKOO", - "meetingType": "meetingSeries", - "state": "active", - "timezone": "Asia/Shanghai", - "start": "2023-11-01T20:00:00+08:00", - "end": "2023-11-01T21:00:00+08:00", - "hostUserId": "19393117", - "hostDisplayName": "Porter Ruecker", - "hostEmail": "Delmer.Koch92@gmail.com", - "hostKey": 33208, - "siteUrl": "ciscofedsales.webex.com", - "webLink": "http://lenore.info", - "sipAddress": "Giovani.Connelly79@gmail.com", - "dialInIpAddress": "152.226.222.66", - "enabledAutoRecordMeeting": false, - "allowAnyUserToBeCoHost": true, - "allowFirstUserToBeCoHost": false, - "allowAuthenticatedDevices": true, - "enabledJoinBeforeHost": false, - "joinBeforeHostMinutes": 2, - "enableConnectAudioBeforeHost": false, - "excludePassword": false, - "publicMeeting": true, - "enableAutomaticLock": true, - "automaticLockMinutes": 6, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "telephony": { - "accessCode": "919054", - "callInNumbers": [ - { - "label": "United States Toll", - "callInNumber": "+1-415-527-5035", - "tollType": "toll" - }, - { - "label": "United States Toll (Washington D.C.)", - "callInNumber": "+1-202-600-2533", - "tollType": "toll" - } - ], - "links": [ - { - "rel": "globalCallinNumbers", - "href": "/v1/meetings/8c9dd12b-5c9f-4874-aae2-8d745f82039d/globalCallinNumbers", - "method": "GET" - } - ] - }, - "meetingOptions": { - "enabledChat": false, - "enabledVideo": true, - "enabledNote": false, - "noteType": "allowAll", - "enabledFileTransfer": true, - "enabledUCFRichMedia": true - }, - "attendeePrivileges": { - "enabledShareContent": true, - "enabledSaveDocument": false, - "enabledPrintDocument": true, - "enabledAnnotate": false, - "enabledViewParticipantList": true, - "enabledViewThumbnails": false, - "enabledRemoteControl": true, - "enabledViewAnyDocument": false, - "enabledViewAnyPage": false, - "enabledContactOperatorPrivately": true, - "enabledChatHost": true, - "enabledChatPresenter": true, - "enabledChatOtherParticipants": false - }, - "sessionTypeId": 4, - "scheduledType": "meeting", - "simultaneousInterpretation": { - "enabled": false - }, - "enabledBreakoutSessions": false, - "audioConnectionOptions": { - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": false, - "enabledGlobalCallIn": true, - "enabledAudienceCallBack": true, - "entryAndExitTone": "beep", - "allowHostToUnmuteParticipants": true, - "allowAttendeeToUnmuteSelf": false, - "muteAttendeeUponEntry": false - } - }, - { - "id": "6ed04428-7d9b-4cd6-b7f3-54e348d5c340", - "meetingNumber": 24458, - "title": "Profound multimedia hub", - "password": "ZVn3BBpTl1wxc2w", - "meetingType": "meetingSeries", - "state": "active", - "timezone": "Asia/Shanghai", - "start": "2023-11-01T20:00:00+08:00", - "end": "2023-11-01T21:00:00+08:00", - "hostUserId": "72417773", - "hostDisplayName": "Twila Kuphal", - "hostEmail": "Hillard.Ward85@yahoo.com", - "hostKey": 58387, - "siteUrl": "ciscofedsales.webex.com", - "webLink": "https://kassandra.net", - "sipAddress": "Alvera.Bergstrom@gmail.com", - "dialInIpAddress": "17.99.142.78", - "enabledAutoRecordMeeting": false, - "allowAnyUserToBeCoHost": true, - "allowFirstUserToBeCoHost": false, - "allowAuthenticatedDevices": false, - "enabledJoinBeforeHost": false, - "joinBeforeHostMinutes": 3, - "enableConnectAudioBeforeHost": true, - "excludePassword": false, - "publicMeeting": false, - "enableAutomaticLock": true, - "automaticLockMinutes": 7, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "telephony": { - "accessCode": "432807", - "callInNumbers": [ - { - "label": "United States Toll", - "callInNumber": "+1-415-527-5035", - "tollType": "toll" - }, - { - "label": "United States Toll (Washington D.C.)", - "callInNumber": "+1-202-600-2533", - "tollType": "toll" - } - ], - "links": [ - { - "rel": "globalCallinNumbers", - "href": "/v1/meetings/9c54ed9c-91f7-4e34-a399-53824a954683/globalCallinNumbers", - "method": "GET" - } - ] - }, - "meetingOptions": { - "enabledChat": false, - "enabledVideo": true, - "enabledNote": false, - "noteType": "allowAll", - "enabledFileTransfer": false, - "enabledUCFRichMedia": true - }, - "attendeePrivileges": { - "enabledShareContent": false, - "enabledSaveDocument": false, - "enabledPrintDocument": false, - "enabledAnnotate": true, - "enabledViewParticipantList": false, - "enabledViewThumbnails": false, - "enabledRemoteControl": true, - "enabledViewAnyDocument": false, - "enabledViewAnyPage": true, - "enabledContactOperatorPrivately": false, - "enabledChatHost": false, - "enabledChatPresenter": false, - "enabledChatOtherParticipants": false - }, - "sessionTypeId": 4, - "scheduledType": "meeting", - "simultaneousInterpretation": { - "enabled": false - }, - "enabledBreakoutSessions": false, - "audioConnectionOptions": { - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": false, - "enabledGlobalCallIn": true, - "enabledAudienceCallBack": true, - "entryAndExitTone": "beep", - "allowHostToUnmuteParticipants": true, - "allowAttendeeToUnmuteSelf": false, - "muteAttendeeUponEntry": false - } - } + ] -} \ No newline at end of file +} From 28b27ed47126c442440ee5120f4f26ca4865090b Mon Sep 17 00:00:00 2001 From: breedbah Date: Mon, 21 Aug 2023 10:28:02 -0400 Subject: [PATCH 036/445] APPEALS-28105 return the conference link object --- client/mocks/webex-mocks/webex-mock-server.js | 16 +- client/mocks/webex-mocks/webex-mock.json | 1015 ++++++++++++++++- 2 files changed, 1020 insertions(+), 11 deletions(-) diff --git a/client/mocks/webex-mocks/webex-mock-server.js b/client/mocks/webex-mocks/webex-mock-server.js index 91d1be7e9a3..6684e3731fd 100644 --- a/client/mocks/webex-mocks/webex-mock-server.js +++ b/client/mocks/webex-mocks/webex-mock-server.js @@ -255,17 +255,15 @@ server.post("/fake.api-usgov.webex.com/v1/meetings", (req, res) => { if (missingKeys.length > 0) { res.status(400).json({ message: "Missing required keys", missingKeys }); } else { - // Access conferenceLinks from database - const db = router.db; // Get lowdb instance - const conferenceLinks = db.get("conferenceLinks"); + // Access conferenceLinks from database + const db = router.db; // Get lowdb instance + const conferenceLinks = db.get("conferenceLinks"); - // Add generateMeetingData object to conferenceLinks - conferenceLinks.push(generateMeetingData).write(); + // Add generateMeetingData object to conferenceLinks + conferenceLinks.push(generateMeetingData).write(); - res - .status(200) - .json({ message: "Request is valid and data added!" }); - } + res.status(200).json(generateMeetingData); + } }); // Sample object to be added diff --git a/client/mocks/webex-mocks/webex-mock.json b/client/mocks/webex-mocks/webex-mock.json index 45f026b185e..f5af74baabd 100644 --- a/client/mocks/webex-mocks/webex-mock.json +++ b/client/mocks/webex-mocks/webex-mock.json @@ -1,5 +1,1016 @@ { "conferenceLinks": [ - + { + "id": "e3fafcc8-4aac-4b11-822e-bc8e8f55fbab", + "meetingNumber": 47482, + "title": "Phased bifurcated contingency", + "password": "9WcETihSp6EzDFz", + "meetingType": "meetingSeries", + "state": "active", + "timezone": "Asia/Shanghai", + "start": "2023-11-01T20:00:00+08:00", + "end": "2023-11-01T21:00:00+08:00", + "hostUserId": "69728606", + "hostDisplayName": "Cathryn Huel II", + "hostEmail": "Monserrate.Shanahan90@gmail.com", + "hostKey": 72954, + "siteUrl": "ciscofedsales.webex.com", + "webLink": "https://ariane.net", + "sipAddress": "Lola.Douglas20@hotmail.com", + "dialInIpAddress": "204.13.184.133", + "enabledAutoRecordMeeting": false, + "allowAnyUserToBeCoHost": true, + "allowFirstUserToBeCoHost": true, + "allowAuthenticatedDevices": true, + "enabledJoinBeforeHost": false, + "joinBeforeHostMinutes": 2, + "enableConnectAudioBeforeHost": true, + "excludePassword": false, + "publicMeeting": true, + "enableAutomaticLock": true, + "automaticLockMinutes": 1, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "telephony": { + "accessCode": "793131", + "callInNumbers": [ + { + "label": "United States Toll", + "callInNumber": "+1-415-527-5035", + "tollType": "toll" + }, + { + "label": "United States Toll (Washington D.C.)", + "callInNumber": "+1-202-600-2533", + "tollType": "toll" + } + ], + "links": [ + { + "rel": "globalCallinNumbers", + "href": "/v1/meetings/4a45b8b9-b19c-4e49-886a-4e07cb052124/globalCallinNumbers", + "method": "GET" + } + ] + }, + "meetingOptions": { + "enabledChat": true, + "enabledVideo": true, + "enabledNote": false, + "noteType": "allowAll", + "enabledFileTransfer": true, + "enabledUCFRichMedia": true + }, + "attendeePrivileges": { + "enabledShareContent": true, + "enabledSaveDocument": false, + "enabledPrintDocument": true, + "enabledAnnotate": false, + "enabledViewParticipantList": false, + "enabledViewThumbnails": true, + "enabledRemoteControl": true, + "enabledViewAnyDocument": true, + "enabledViewAnyPage": true, + "enabledContactOperatorPrivately": false, + "enabledChatHost": false, + "enabledChatPresenter": true, + "enabledChatOtherParticipants": false + }, + "sessionTypeId": 5, + "scheduledType": "meeting", + "simultaneousInterpretation": { + "enabled": false + }, + "enabledBreakoutSessions": false, + "audioConnectionOptions": { + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": false, + "enabledGlobalCallIn": true, + "enabledAudienceCallBack": true, + "entryAndExitTone": "beep", + "allowHostToUnmuteParticipants": true, + "allowAttendeeToUnmuteSelf": true, + "muteAttendeeUponEntry": false + } + }, + { + "id": "e18a14fc-6451-47b7-a66a-114d610d1fb3", + "meetingNumber": 67089, + "title": "Robust non-volatile utilisation", + "password": "YlGyunVBgLF7ybb", + "meetingType": "meetingSeries", + "state": "active", + "timezone": "Asia/Shanghai", + "start": "2023-11-01T20:00:00+08:00", + "end": "2023-11-01T21:00:00+08:00", + "hostUserId": "49632136", + "hostDisplayName": "Reba Johnson", + "hostEmail": "Jensen_Schoen3@yahoo.com", + "hostKey": 29203, + "siteUrl": "ciscofedsales.webex.com", + "webLink": "https://karine.com", + "sipAddress": "Edison.Senger@hotmail.com", + "dialInIpAddress": "210.145.135.132", + "enabledAutoRecordMeeting": false, + "allowAnyUserToBeCoHost": false, + "allowFirstUserToBeCoHost": false, + "allowAuthenticatedDevices": false, + "enabledJoinBeforeHost": true, + "joinBeforeHostMinutes": 3, + "enableConnectAudioBeforeHost": false, + "excludePassword": false, + "publicMeeting": false, + "enableAutomaticLock": true, + "automaticLockMinutes": 9, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "telephony": { + "accessCode": "473819", + "callInNumbers": [ + { + "label": "United States Toll", + "callInNumber": "+1-415-527-5035", + "tollType": "toll" + }, + { + "label": "United States Toll (Washington D.C.)", + "callInNumber": "+1-202-600-2533", + "tollType": "toll" + } + ], + "links": [ + { + "rel": "globalCallinNumbers", + "href": "/v1/meetings/ab413b66-16a0-4176-ac4d-f5d55d15d775/globalCallinNumbers", + "method": "GET" + } + ] + }, + "meetingOptions": { + "enabledChat": false, + "enabledVideo": true, + "enabledNote": true, + "noteType": "allowAll", + "enabledFileTransfer": true, + "enabledUCFRichMedia": false + }, + "attendeePrivileges": { + "enabledShareContent": true, + "enabledSaveDocument": true, + "enabledPrintDocument": true, + "enabledAnnotate": false, + "enabledViewParticipantList": true, + "enabledViewThumbnails": true, + "enabledRemoteControl": true, + "enabledViewAnyDocument": false, + "enabledViewAnyPage": false, + "enabledContactOperatorPrivately": false, + "enabledChatHost": true, + "enabledChatPresenter": true, + "enabledChatOtherParticipants": false + }, + "sessionTypeId": 1, + "scheduledType": "meeting", + "simultaneousInterpretation": { + "enabled": false + }, + "enabledBreakoutSessions": false, + "audioConnectionOptions": { + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": false, + "enabledGlobalCallIn": true, + "enabledAudienceCallBack": true, + "entryAndExitTone": "beep", + "allowHostToUnmuteParticipants": true, + "allowAttendeeToUnmuteSelf": true, + "muteAttendeeUponEntry": true + } + }, + { + "id": "4417685c-5f2b-44b5-9623-e5b500043a0c", + "meetingNumber": 10956, + "title": "Virtual mobile implementation", + "password": "uV4K24gq2zRgtDV", + "meetingType": "meetingSeries", + "state": "active", + "timezone": "Asia/Shanghai", + "start": "2023-11-01T20:00:00+08:00", + "end": "2023-11-01T21:00:00+08:00", + "hostUserId": "90742575", + "hostDisplayName": "Kris Corkery", + "hostEmail": "Dedric.Pagac26@hotmail.com", + "hostKey": 25185, + "siteUrl": "ciscofedsales.webex.com", + "webLink": "http://emerald.com", + "sipAddress": "Peyton23@hotmail.com", + "dialInIpAddress": "128.170.63.147", + "enabledAutoRecordMeeting": false, + "allowAnyUserToBeCoHost": true, + "allowFirstUserToBeCoHost": false, + "allowAuthenticatedDevices": false, + "enabledJoinBeforeHost": true, + "joinBeforeHostMinutes": 7, + "enableConnectAudioBeforeHost": true, + "excludePassword": false, + "publicMeeting": false, + "enableAutomaticLock": true, + "automaticLockMinutes": 1, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "telephony": { + "accessCode": "100945", + "callInNumbers": [ + { + "label": "United States Toll", + "callInNumber": "+1-415-527-5035", + "tollType": "toll" + }, + { + "label": "United States Toll (Washington D.C.)", + "callInNumber": "+1-202-600-2533", + "tollType": "toll" + } + ], + "links": [ + { + "rel": "globalCallinNumbers", + "href": "/v1/meetings/1c2c1e96-1fd5-4ca3-92ea-43db6d56f81c/globalCallinNumbers", + "method": "GET" + } + ] + }, + "meetingOptions": { + "enabledChat": true, + "enabledVideo": true, + "enabledNote": true, + "noteType": "allowAll", + "enabledFileTransfer": true, + "enabledUCFRichMedia": true + }, + "attendeePrivileges": { + "enabledShareContent": false, + "enabledSaveDocument": true, + "enabledPrintDocument": false, + "enabledAnnotate": true, + "enabledViewParticipantList": true, + "enabledViewThumbnails": false, + "enabledRemoteControl": true, + "enabledViewAnyDocument": true, + "enabledViewAnyPage": false, + "enabledContactOperatorPrivately": true, + "enabledChatHost": true, + "enabledChatPresenter": false, + "enabledChatOtherParticipants": false + }, + "sessionTypeId": 4, + "scheduledType": "meeting", + "simultaneousInterpretation": { + "enabled": false + }, + "enabledBreakoutSessions": false, + "audioConnectionOptions": { + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": true, + "enabledGlobalCallIn": true, + "enabledAudienceCallBack": false, + "entryAndExitTone": "beep", + "allowHostToUnmuteParticipants": true, + "allowAttendeeToUnmuteSelf": true, + "muteAttendeeUponEntry": false + } + }, + { + "id": "f2e00d03-8e9d-4385-822d-73a0b934c6ce", + "meetingNumber": 59205, + "title": "Open-architected even-keeled encryption", + "password": "CiXgRg61OA57ZAT", + "meetingType": "meetingSeries", + "state": "active", + "timezone": "Asia/Shanghai", + "start": "2023-11-01T20:00:00+08:00", + "end": "2023-11-01T21:00:00+08:00", + "hostUserId": "65047964", + "hostDisplayName": "Frieda Collier", + "hostEmail": "Korbin_Kuvalis@hotmail.com", + "hostKey": 21009, + "siteUrl": "ciscofedsales.webex.com", + "webLink": "http://maynard.net", + "sipAddress": "Destin.Braun@yahoo.com", + "dialInIpAddress": "24.16.174.2", + "enabledAutoRecordMeeting": false, + "allowAnyUserToBeCoHost": false, + "allowFirstUserToBeCoHost": true, + "allowAuthenticatedDevices": false, + "enabledJoinBeforeHost": false, + "joinBeforeHostMinutes": 10, + "enableConnectAudioBeforeHost": false, + "excludePassword": true, + "publicMeeting": true, + "enableAutomaticLock": false, + "automaticLockMinutes": 7, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "telephony": { + "accessCode": "967669", + "callInNumbers": [ + { + "label": "United States Toll", + "callInNumber": "+1-415-527-5035", + "tollType": "toll" + }, + { + "label": "United States Toll (Washington D.C.)", + "callInNumber": "+1-202-600-2533", + "tollType": "toll" + } + ], + "links": [ + { + "rel": "globalCallinNumbers", + "href": "/v1/meetings/2cbdc33e-b179-4b6f-927a-aff6fd1007dc/globalCallinNumbers", + "method": "GET" + } + ] + }, + "meetingOptions": { + "enabledChat": false, + "enabledVideo": false, + "enabledNote": true, + "noteType": "allowAll", + "enabledFileTransfer": false, + "enabledUCFRichMedia": false + }, + "attendeePrivileges": { + "enabledShareContent": false, + "enabledSaveDocument": true, + "enabledPrintDocument": false, + "enabledAnnotate": true, + "enabledViewParticipantList": false, + "enabledViewThumbnails": false, + "enabledRemoteControl": false, + "enabledViewAnyDocument": false, + "enabledViewAnyPage": false, + "enabledContactOperatorPrivately": true, + "enabledChatHost": true, + "enabledChatPresenter": true, + "enabledChatOtherParticipants": true + }, + "sessionTypeId": 5, + "scheduledType": "meeting", + "simultaneousInterpretation": { + "enabled": false + }, + "enabledBreakoutSessions": true, + "audioConnectionOptions": { + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": false, + "enabledGlobalCallIn": false, + "enabledAudienceCallBack": false, + "entryAndExitTone": "beep", + "allowHostToUnmuteParticipants": true, + "allowAttendeeToUnmuteSelf": true, + "muteAttendeeUponEntry": true + } + }, + { + "id": "392c5958-3a92-4e3f-b591-dd80fc1af6d2", + "meetingNumber": 29893, + "title": "Automated stable artificial intelligence", + "password": "GWoP8waZ2azWE2o", + "meetingType": "meetingSeries", + "state": "active", + "timezone": "Asia/Shanghai", + "start": "2023-11-01T20:00:00+08:00", + "end": "2023-11-01T21:00:00+08:00", + "hostUserId": "19263574", + "hostDisplayName": "Augustine Schinner IV", + "hostEmail": "Maurice11@hotmail.com", + "hostKey": 53145, + "siteUrl": "ciscofedsales.webex.com", + "webLink": "http://wilber.net", + "sipAddress": "Kadin15@gmail.com", + "dialInIpAddress": "116.146.215.231", + "enabledAutoRecordMeeting": false, + "allowAnyUserToBeCoHost": true, + "allowFirstUserToBeCoHost": true, + "allowAuthenticatedDevices": true, + "enabledJoinBeforeHost": false, + "joinBeforeHostMinutes": 2, + "enableConnectAudioBeforeHost": false, + "excludePassword": true, + "publicMeeting": false, + "enableAutomaticLock": false, + "automaticLockMinutes": 2, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "telephony": { + "accessCode": "540893", + "callInNumbers": [ + { + "label": "United States Toll", + "callInNumber": "+1-415-527-5035", + "tollType": "toll" + }, + { + "label": "United States Toll (Washington D.C.)", + "callInNumber": "+1-202-600-2533", + "tollType": "toll" + } + ], + "links": [ + { + "rel": "globalCallinNumbers", + "href": "/v1/meetings/8be32614-1f61-447a-9277-d4ddf50d9e05/globalCallinNumbers", + "method": "GET" + } + ] + }, + "meetingOptions": { + "enabledChat": true, + "enabledVideo": false, + "enabledNote": true, + "noteType": "allowAll", + "enabledFileTransfer": false, + "enabledUCFRichMedia": true + }, + "attendeePrivileges": { + "enabledShareContent": false, + "enabledSaveDocument": false, + "enabledPrintDocument": true, + "enabledAnnotate": true, + "enabledViewParticipantList": false, + "enabledViewThumbnails": false, + "enabledRemoteControl": true, + "enabledViewAnyDocument": true, + "enabledViewAnyPage": true, + "enabledContactOperatorPrivately": false, + "enabledChatHost": false, + "enabledChatPresenter": true, + "enabledChatOtherParticipants": false + }, + "sessionTypeId": 1, + "scheduledType": "meeting", + "simultaneousInterpretation": { + "enabled": false + }, + "enabledBreakoutSessions": false, + "audioConnectionOptions": { + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": true, + "enabledGlobalCallIn": false, + "enabledAudienceCallBack": true, + "entryAndExitTone": "beep", + "allowHostToUnmuteParticipants": true, + "allowAttendeeToUnmuteSelf": true, + "muteAttendeeUponEntry": true + } + }, + { + "id": "56725652-ca96-462a-b213-f7833c4bb496", + "meetingNumber": 37140, + "title": "Reactive client-driven access", + "password": "wWDxYPLLjrARWva", + "meetingType": "meetingSeries", + "state": "active", + "timezone": "Asia/Shanghai", + "start": "2023-11-01T20:00:00+08:00", + "end": "2023-11-01T21:00:00+08:00", + "hostUserId": "48131198", + "hostDisplayName": "Johnathan Conn", + "hostEmail": "Isidro.Morissette63@gmail.com", + "hostKey": 2293, + "siteUrl": "ciscofedsales.webex.com", + "webLink": "http://domingo.net", + "sipAddress": "Richmond64@gmail.com", + "dialInIpAddress": "40.246.34.158", + "enabledAutoRecordMeeting": true, + "allowAnyUserToBeCoHost": true, + "allowFirstUserToBeCoHost": true, + "allowAuthenticatedDevices": true, + "enabledJoinBeforeHost": true, + "joinBeforeHostMinutes": 9, + "enableConnectAudioBeforeHost": false, + "excludePassword": false, + "publicMeeting": false, + "enableAutomaticLock": true, + "automaticLockMinutes": 2, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "telephony": { + "accessCode": "749299", + "callInNumbers": [ + { + "label": "United States Toll", + "callInNumber": "+1-415-527-5035", + "tollType": "toll" + }, + { + "label": "United States Toll (Washington D.C.)", + "callInNumber": "+1-202-600-2533", + "tollType": "toll" + } + ], + "links": [ + { + "rel": "globalCallinNumbers", + "href": "/v1/meetings/35eb7c92-1ed1-4a65-b618-bea5124627e7/globalCallinNumbers", + "method": "GET" + } + ] + }, + "meetingOptions": { + "enabledChat": false, + "enabledVideo": true, + "enabledNote": false, + "noteType": "allowAll", + "enabledFileTransfer": true, + "enabledUCFRichMedia": true + }, + "attendeePrivileges": { + "enabledShareContent": true, + "enabledSaveDocument": true, + "enabledPrintDocument": true, + "enabledAnnotate": true, + "enabledViewParticipantList": true, + "enabledViewThumbnails": true, + "enabledRemoteControl": false, + "enabledViewAnyDocument": true, + "enabledViewAnyPage": true, + "enabledContactOperatorPrivately": false, + "enabledChatHost": false, + "enabledChatPresenter": false, + "enabledChatOtherParticipants": true + }, + "sessionTypeId": 5, + "scheduledType": "meeting", + "simultaneousInterpretation": { + "enabled": false + }, + "enabledBreakoutSessions": false, + "audioConnectionOptions": { + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": true, + "enabledGlobalCallIn": false, + "enabledAudienceCallBack": false, + "entryAndExitTone": "beep", + "allowHostToUnmuteParticipants": false, + "allowAttendeeToUnmuteSelf": false, + "muteAttendeeUponEntry": true + } + }, + { + "id": "0d3c9510-9634-494f-bf4e-38517813cb74", + "meetingNumber": 78490, + "title": "Advanced client-driven matrices", + "password": "2ELAzEbSkzrPg3b", + "meetingType": "meetingSeries", + "state": "active", + "timezone": "Asia/Shanghai", + "start": "2023-11-01T20:00:00+08:00", + "end": "2023-11-01T21:00:00+08:00", + "hostUserId": "03941178", + "hostDisplayName": "Helene McKenzie", + "hostEmail": "Idella_Ondricka12@hotmail.com", + "hostKey": 15585, + "siteUrl": "ciscofedsales.webex.com", + "webLink": "https://nikolas.info", + "sipAddress": "Helga_MacGyver96@yahoo.com", + "dialInIpAddress": "160.147.247.171", + "enabledAutoRecordMeeting": true, + "allowAnyUserToBeCoHost": false, + "allowFirstUserToBeCoHost": true, + "allowAuthenticatedDevices": false, + "enabledJoinBeforeHost": false, + "joinBeforeHostMinutes": 10, + "enableConnectAudioBeforeHost": false, + "excludePassword": false, + "publicMeeting": false, + "enableAutomaticLock": false, + "automaticLockMinutes": 9, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "telephony": { + "accessCode": "918071", + "callInNumbers": [ + { + "label": "United States Toll", + "callInNumber": "+1-415-527-5035", + "tollType": "toll" + }, + { + "label": "United States Toll (Washington D.C.)", + "callInNumber": "+1-202-600-2533", + "tollType": "toll" + } + ], + "links": [ + { + "rel": "globalCallinNumbers", + "href": "/v1/meetings/756e8261-b660-49a7-9502-b2166767fb1e/globalCallinNumbers", + "method": "GET" + } + ] + }, + "meetingOptions": { + "enabledChat": false, + "enabledVideo": false, + "enabledNote": true, + "noteType": "allowAll", + "enabledFileTransfer": false, + "enabledUCFRichMedia": true + }, + "attendeePrivileges": { + "enabledShareContent": false, + "enabledSaveDocument": true, + "enabledPrintDocument": true, + "enabledAnnotate": false, + "enabledViewParticipantList": false, + "enabledViewThumbnails": true, + "enabledRemoteControl": false, + "enabledViewAnyDocument": false, + "enabledViewAnyPage": false, + "enabledContactOperatorPrivately": false, + "enabledChatHost": true, + "enabledChatPresenter": true, + "enabledChatOtherParticipants": false + }, + "sessionTypeId": 5, + "scheduledType": "meeting", + "simultaneousInterpretation": { + "enabled": true + }, + "enabledBreakoutSessions": true, + "audioConnectionOptions": { + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": true, + "enabledGlobalCallIn": true, + "enabledAudienceCallBack": false, + "entryAndExitTone": "beep", + "allowHostToUnmuteParticipants": false, + "allowAttendeeToUnmuteSelf": true, + "muteAttendeeUponEntry": false + } + }, + { + "id": "f5d131ce-c8b3-4e2f-8f61-311d912da8a9", + "meetingNumber": 82623, + "title": "Function-based interactive throughput", + "password": "EESLHbhLMue1et7", + "meetingType": "meetingSeries", + "state": "active", + "timezone": "Asia/Shanghai", + "start": "2023-11-01T20:00:00+08:00", + "end": "2023-11-01T21:00:00+08:00", + "hostUserId": "36075676", + "hostDisplayName": "Enrico Wyman", + "hostEmail": "Buddy.Gislason97@gmail.com", + "hostKey": 1212, + "siteUrl": "ciscofedsales.webex.com", + "webLink": "https://megane.info", + "sipAddress": "Sid17@yahoo.com", + "dialInIpAddress": "114.88.134.243", + "enabledAutoRecordMeeting": false, + "allowAnyUserToBeCoHost": true, + "allowFirstUserToBeCoHost": false, + "allowAuthenticatedDevices": false, + "enabledJoinBeforeHost": false, + "joinBeforeHostMinutes": 5, + "enableConnectAudioBeforeHost": false, + "excludePassword": true, + "publicMeeting": false, + "enableAutomaticLock": true, + "automaticLockMinutes": 5, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "telephony": { + "accessCode": "442338", + "callInNumbers": [ + { + "label": "United States Toll", + "callInNumber": "+1-415-527-5035", + "tollType": "toll" + }, + { + "label": "United States Toll (Washington D.C.)", + "callInNumber": "+1-202-600-2533", + "tollType": "toll" + } + ], + "links": [ + { + "rel": "globalCallinNumbers", + "href": "/v1/meetings/c20b96a8-dca7-4e26-bffd-5cd6d3579d62/globalCallinNumbers", + "method": "GET" + } + ] + }, + "meetingOptions": { + "enabledChat": false, + "enabledVideo": false, + "enabledNote": true, + "noteType": "allowAll", + "enabledFileTransfer": false, + "enabledUCFRichMedia": false + }, + "attendeePrivileges": { + "enabledShareContent": true, + "enabledSaveDocument": false, + "enabledPrintDocument": false, + "enabledAnnotate": false, + "enabledViewParticipantList": false, + "enabledViewThumbnails": false, + "enabledRemoteControl": true, + "enabledViewAnyDocument": true, + "enabledViewAnyPage": false, + "enabledContactOperatorPrivately": true, + "enabledChatHost": true, + "enabledChatPresenter": false, + "enabledChatOtherParticipants": true + }, + "sessionTypeId": 3, + "scheduledType": "meeting", + "simultaneousInterpretation": { + "enabled": false + }, + "enabledBreakoutSessions": true, + "audioConnectionOptions": { + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": true, + "enabledGlobalCallIn": true, + "enabledAudienceCallBack": false, + "entryAndExitTone": "beep", + "allowHostToUnmuteParticipants": true, + "allowAttendeeToUnmuteSelf": true, + "muteAttendeeUponEntry": true + } + }, + { + "id": "0463e7ab-f5e3-4501-bad4-080b5c1692ba", + "meetingNumber": 52131, + "title": "Synergistic radical capability", + "password": "J3lpVAWwcC9vOPJ", + "meetingType": "meetingSeries", + "state": "active", + "timezone": "Asia/Shanghai", + "start": "2023-11-01T20:00:00+08:00", + "end": "2023-11-01T21:00:00+08:00", + "hostUserId": "27351129", + "hostDisplayName": "Hunter Wilderman Jr.", + "hostEmail": "Leatha.Predovic@yahoo.com", + "hostKey": 76480, + "siteUrl": "ciscofedsales.webex.com", + "webLink": "http://marlene.net", + "sipAddress": "Abbey_Hills77@yahoo.com", + "dialInIpAddress": "193.211.228.35", + "enabledAutoRecordMeeting": true, + "allowAnyUserToBeCoHost": true, + "allowFirstUserToBeCoHost": false, + "allowAuthenticatedDevices": true, + "enabledJoinBeforeHost": true, + "joinBeforeHostMinutes": 3, + "enableConnectAudioBeforeHost": true, + "excludePassword": false, + "publicMeeting": false, + "enableAutomaticLock": true, + "automaticLockMinutes": 4, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "telephony": { + "accessCode": "308889", + "callInNumbers": [ + { + "label": "United States Toll", + "callInNumber": "+1-415-527-5035", + "tollType": "toll" + }, + { + "label": "United States Toll (Washington D.C.)", + "callInNumber": "+1-202-600-2533", + "tollType": "toll" + } + ], + "links": [ + { + "rel": "globalCallinNumbers", + "href": "/v1/meetings/5ca4c68b-26fd-4a9c-8e70-01f392b483ae/globalCallinNumbers", + "method": "GET" + } + ] + }, + "meetingOptions": { + "enabledChat": false, + "enabledVideo": false, + "enabledNote": true, + "noteType": "allowAll", + "enabledFileTransfer": true, + "enabledUCFRichMedia": false + }, + "attendeePrivileges": { + "enabledShareContent": true, + "enabledSaveDocument": true, + "enabledPrintDocument": true, + "enabledAnnotate": false, + "enabledViewParticipantList": true, + "enabledViewThumbnails": false, + "enabledRemoteControl": true, + "enabledViewAnyDocument": false, + "enabledViewAnyPage": true, + "enabledContactOperatorPrivately": false, + "enabledChatHost": true, + "enabledChatPresenter": false, + "enabledChatOtherParticipants": false + }, + "sessionTypeId": 5, + "scheduledType": "meeting", + "simultaneousInterpretation": { + "enabled": false + }, + "enabledBreakoutSessions": false, + "audioConnectionOptions": { + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": true, + "enabledGlobalCallIn": false, + "enabledAudienceCallBack": false, + "entryAndExitTone": "beep", + "allowHostToUnmuteParticipants": true, + "allowAttendeeToUnmuteSelf": false, + "muteAttendeeUponEntry": true + } + }, + { + "id": "ac5d73a8-5194-4344-9e84-cec7510d5d77", + "meetingNumber": 45733, + "title": "Virtual scalable task-force", + "password": "yxej_vtIadcY3Na", + "meetingType": "meetingSeries", + "state": "active", + "timezone": "Asia/Shanghai", + "start": "2023-11-01T20:00:00+08:00", + "end": "2023-11-01T21:00:00+08:00", + "hostUserId": "14611038", + "hostDisplayName": "Breana Stehr", + "hostEmail": "Dave.Corkery5@hotmail.com", + "hostKey": 47941, + "siteUrl": "ciscofedsales.webex.com", + "webLink": "https://ryleigh.biz", + "sipAddress": "Kevon.Jacobson@gmail.com", + "dialInIpAddress": "162.16.32.58", + "enabledAutoRecordMeeting": false, + "allowAnyUserToBeCoHost": false, + "allowFirstUserToBeCoHost": true, + "allowAuthenticatedDevices": false, + "enabledJoinBeforeHost": false, + "joinBeforeHostMinutes": 7, + "enableConnectAudioBeforeHost": true, + "excludePassword": true, + "publicMeeting": false, + "enableAutomaticLock": false, + "automaticLockMinutes": 2, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "telephony": { + "accessCode": "897918", + "callInNumbers": [ + { + "label": "United States Toll", + "callInNumber": "+1-415-527-5035", + "tollType": "toll" + }, + { + "label": "United States Toll (Washington D.C.)", + "callInNumber": "+1-202-600-2533", + "tollType": "toll" + } + ], + "links": [ + { + "rel": "globalCallinNumbers", + "href": "/v1/meetings/c771ba6e-2c61-47f7-8a8f-fc2b64e84041/globalCallinNumbers", + "method": "GET" + } + ] + }, + "meetingOptions": { + "enabledChat": true, + "enabledVideo": false, + "enabledNote": false, + "noteType": "allowAll", + "enabledFileTransfer": true, + "enabledUCFRichMedia": true + }, + "attendeePrivileges": { + "enabledShareContent": false, + "enabledSaveDocument": false, + "enabledPrintDocument": true, + "enabledAnnotate": false, + "enabledViewParticipantList": true, + "enabledViewThumbnails": false, + "enabledRemoteControl": false, + "enabledViewAnyDocument": false, + "enabledViewAnyPage": true, + "enabledContactOperatorPrivately": true, + "enabledChatHost": false, + "enabledChatPresenter": true, + "enabledChatOtherParticipants": true + }, + "sessionTypeId": 2, + "scheduledType": "meeting", + "simultaneousInterpretation": { + "enabled": false + }, + "enabledBreakoutSessions": false, + "audioConnectionOptions": { + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": true, + "enabledGlobalCallIn": true, + "enabledAudienceCallBack": false, + "entryAndExitTone": "beep", + "allowHostToUnmuteParticipants": true, + "allowAttendeeToUnmuteSelf": false, + "muteAttendeeUponEntry": true + } + }, + { + "id": "572400cd-1661-4deb-8c9a-8ba0210340de", + "meetingNumber": 74244, + "title": "Fully-configurable homogeneous algorithm", + "password": "HVfUgzMLD9Z8gl8", + "meetingType": "meetingSeries", + "state": "active", + "timezone": "Asia/Shanghai", + "start": "2023-11-01T20:00:00+08:00", + "end": "2023-11-01T21:00:00+08:00", + "hostUserId": "38475615", + "hostDisplayName": "Teresa Walsh", + "hostEmail": "Garnett92@yahoo.com", + "hostKey": 60679, + "siteUrl": "ciscofedsales.webex.com", + "webLink": "http://gertrude.org", + "sipAddress": "Henriette_Parker76@yahoo.com", + "dialInIpAddress": "209.186.73.185", + "enabledAutoRecordMeeting": true, + "allowAnyUserToBeCoHost": false, + "allowFirstUserToBeCoHost": false, + "allowAuthenticatedDevices": false, + "enabledJoinBeforeHost": false, + "joinBeforeHostMinutes": 5, + "enableConnectAudioBeforeHost": true, + "excludePassword": true, + "publicMeeting": true, + "enableAutomaticLock": false, + "automaticLockMinutes": 7, + "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + "telephony": { + "accessCode": "776239", + "callInNumbers": [ + { + "label": "United States Toll", + "callInNumber": "+1-415-527-5035", + "tollType": "toll" + }, + { + "label": "United States Toll (Washington D.C.)", + "callInNumber": "+1-202-600-2533", + "tollType": "toll" + } + ], + "links": [ + { + "rel": "globalCallinNumbers", + "href": "/v1/meetings/bd8a1b5f-5654-4b17-b3cd-91193ede5aac/globalCallinNumbers", + "method": "GET" + } + ] + }, + "meetingOptions": { + "enabledChat": true, + "enabledVideo": false, + "enabledNote": true, + "noteType": "allowAll", + "enabledFileTransfer": false, + "enabledUCFRichMedia": true + }, + "attendeePrivileges": { + "enabledShareContent": false, + "enabledSaveDocument": true, + "enabledPrintDocument": false, + "enabledAnnotate": true, + "enabledViewParticipantList": true, + "enabledViewThumbnails": true, + "enabledRemoteControl": false, + "enabledViewAnyDocument": true, + "enabledViewAnyPage": false, + "enabledContactOperatorPrivately": true, + "enabledChatHost": false, + "enabledChatPresenter": true, + "enabledChatOtherParticipants": false + }, + "sessionTypeId": 5, + "scheduledType": "meeting", + "simultaneousInterpretation": { + "enabled": false + }, + "enabledBreakoutSessions": false, + "audioConnectionOptions": { + "audioConnectionType": "webexAudio", + "enabledTollFreeCallIn": false, + "enabledGlobalCallIn": false, + "enabledAudienceCallBack": false, + "entryAndExitTone": "beep", + "allowHostToUnmuteParticipants": false, + "allowAttendeeToUnmuteSelf": false, + "muteAttendeeUponEntry": true + } + } ] -} +} \ No newline at end of file From fe87289e9d4d829987fa5f2acb134c147f724b74 Mon Sep 17 00:00:00 2001 From: breedbah Date: Mon, 21 Aug 2023 10:51:36 -0400 Subject: [PATCH 037/445] APPEALS-28105 Removed webex-mock.json file --- client/mocks/webex-mocks/README.md | 6 +- client/mocks/webex-mocks/webex-mock.json | 1016 ---------------------- 2 files changed, 5 insertions(+), 1017 deletions(-) delete mode 100644 client/mocks/webex-mocks/webex-mock.json diff --git a/client/mocks/webex-mocks/README.md b/client/mocks/webex-mocks/README.md index 391d8c8fdd3..27c1f72f31b 100644 --- a/client/mocks/webex-mocks/README.md +++ b/client/mocks/webex-mocks/README.md @@ -6,6 +6,8 @@ Step 2: Navigate to the caseflow/client step 3: Run command: npm install json-server +step 4: Make sure casfelow application is running + step 4: Run command: npm run webex-server step 5: If you would like to autogenerate test data, run this command: npm run generate-webex @@ -21,7 +23,6 @@ step 5: Open a browser window in chrome and navigate to localhost:3050 [You will \*info: reference guides [https://github.com/typicode/json-server/blob/master/README.md] - Tutorial Resources: [https://www.youtube.com/watch?v=_1kNqAybxW0&list=PLC3y8-rFHvwhc9YZIdqNL5sWeTCGxF4ya&index=1] @@ -31,6 +32,9 @@ To create a meeting the request body must have all of the keys and hit this endp Get all conferencelinks with this endpoint [http://localhost:3050/api/v1/conference-links] +Javascript API call Fetch/Axios examples +[https://jsonplaceholder.typicode.com/] + diff --git a/client/mocks/webex-mocks/webex-mock.json b/client/mocks/webex-mocks/webex-mock.json deleted file mode 100644 index f5af74baabd..00000000000 --- a/client/mocks/webex-mocks/webex-mock.json +++ /dev/null @@ -1,1016 +0,0 @@ -{ - "conferenceLinks": [ - { - "id": "e3fafcc8-4aac-4b11-822e-bc8e8f55fbab", - "meetingNumber": 47482, - "title": "Phased bifurcated contingency", - "password": "9WcETihSp6EzDFz", - "meetingType": "meetingSeries", - "state": "active", - "timezone": "Asia/Shanghai", - "start": "2023-11-01T20:00:00+08:00", - "end": "2023-11-01T21:00:00+08:00", - "hostUserId": "69728606", - "hostDisplayName": "Cathryn Huel II", - "hostEmail": "Monserrate.Shanahan90@gmail.com", - "hostKey": 72954, - "siteUrl": "ciscofedsales.webex.com", - "webLink": "https://ariane.net", - "sipAddress": "Lola.Douglas20@hotmail.com", - "dialInIpAddress": "204.13.184.133", - "enabledAutoRecordMeeting": false, - "allowAnyUserToBeCoHost": true, - "allowFirstUserToBeCoHost": true, - "allowAuthenticatedDevices": true, - "enabledJoinBeforeHost": false, - "joinBeforeHostMinutes": 2, - "enableConnectAudioBeforeHost": true, - "excludePassword": false, - "publicMeeting": true, - "enableAutomaticLock": true, - "automaticLockMinutes": 1, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "telephony": { - "accessCode": "793131", - "callInNumbers": [ - { - "label": "United States Toll", - "callInNumber": "+1-415-527-5035", - "tollType": "toll" - }, - { - "label": "United States Toll (Washington D.C.)", - "callInNumber": "+1-202-600-2533", - "tollType": "toll" - } - ], - "links": [ - { - "rel": "globalCallinNumbers", - "href": "/v1/meetings/4a45b8b9-b19c-4e49-886a-4e07cb052124/globalCallinNumbers", - "method": "GET" - } - ] - }, - "meetingOptions": { - "enabledChat": true, - "enabledVideo": true, - "enabledNote": false, - "noteType": "allowAll", - "enabledFileTransfer": true, - "enabledUCFRichMedia": true - }, - "attendeePrivileges": { - "enabledShareContent": true, - "enabledSaveDocument": false, - "enabledPrintDocument": true, - "enabledAnnotate": false, - "enabledViewParticipantList": false, - "enabledViewThumbnails": true, - "enabledRemoteControl": true, - "enabledViewAnyDocument": true, - "enabledViewAnyPage": true, - "enabledContactOperatorPrivately": false, - "enabledChatHost": false, - "enabledChatPresenter": true, - "enabledChatOtherParticipants": false - }, - "sessionTypeId": 5, - "scheduledType": "meeting", - "simultaneousInterpretation": { - "enabled": false - }, - "enabledBreakoutSessions": false, - "audioConnectionOptions": { - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": false, - "enabledGlobalCallIn": true, - "enabledAudienceCallBack": true, - "entryAndExitTone": "beep", - "allowHostToUnmuteParticipants": true, - "allowAttendeeToUnmuteSelf": true, - "muteAttendeeUponEntry": false - } - }, - { - "id": "e18a14fc-6451-47b7-a66a-114d610d1fb3", - "meetingNumber": 67089, - "title": "Robust non-volatile utilisation", - "password": "YlGyunVBgLF7ybb", - "meetingType": "meetingSeries", - "state": "active", - "timezone": "Asia/Shanghai", - "start": "2023-11-01T20:00:00+08:00", - "end": "2023-11-01T21:00:00+08:00", - "hostUserId": "49632136", - "hostDisplayName": "Reba Johnson", - "hostEmail": "Jensen_Schoen3@yahoo.com", - "hostKey": 29203, - "siteUrl": "ciscofedsales.webex.com", - "webLink": "https://karine.com", - "sipAddress": "Edison.Senger@hotmail.com", - "dialInIpAddress": "210.145.135.132", - "enabledAutoRecordMeeting": false, - "allowAnyUserToBeCoHost": false, - "allowFirstUserToBeCoHost": false, - "allowAuthenticatedDevices": false, - "enabledJoinBeforeHost": true, - "joinBeforeHostMinutes": 3, - "enableConnectAudioBeforeHost": false, - "excludePassword": false, - "publicMeeting": false, - "enableAutomaticLock": true, - "automaticLockMinutes": 9, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "telephony": { - "accessCode": "473819", - "callInNumbers": [ - { - "label": "United States Toll", - "callInNumber": "+1-415-527-5035", - "tollType": "toll" - }, - { - "label": "United States Toll (Washington D.C.)", - "callInNumber": "+1-202-600-2533", - "tollType": "toll" - } - ], - "links": [ - { - "rel": "globalCallinNumbers", - "href": "/v1/meetings/ab413b66-16a0-4176-ac4d-f5d55d15d775/globalCallinNumbers", - "method": "GET" - } - ] - }, - "meetingOptions": { - "enabledChat": false, - "enabledVideo": true, - "enabledNote": true, - "noteType": "allowAll", - "enabledFileTransfer": true, - "enabledUCFRichMedia": false - }, - "attendeePrivileges": { - "enabledShareContent": true, - "enabledSaveDocument": true, - "enabledPrintDocument": true, - "enabledAnnotate": false, - "enabledViewParticipantList": true, - "enabledViewThumbnails": true, - "enabledRemoteControl": true, - "enabledViewAnyDocument": false, - "enabledViewAnyPage": false, - "enabledContactOperatorPrivately": false, - "enabledChatHost": true, - "enabledChatPresenter": true, - "enabledChatOtherParticipants": false - }, - "sessionTypeId": 1, - "scheduledType": "meeting", - "simultaneousInterpretation": { - "enabled": false - }, - "enabledBreakoutSessions": false, - "audioConnectionOptions": { - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": false, - "enabledGlobalCallIn": true, - "enabledAudienceCallBack": true, - "entryAndExitTone": "beep", - "allowHostToUnmuteParticipants": true, - "allowAttendeeToUnmuteSelf": true, - "muteAttendeeUponEntry": true - } - }, - { - "id": "4417685c-5f2b-44b5-9623-e5b500043a0c", - "meetingNumber": 10956, - "title": "Virtual mobile implementation", - "password": "uV4K24gq2zRgtDV", - "meetingType": "meetingSeries", - "state": "active", - "timezone": "Asia/Shanghai", - "start": "2023-11-01T20:00:00+08:00", - "end": "2023-11-01T21:00:00+08:00", - "hostUserId": "90742575", - "hostDisplayName": "Kris Corkery", - "hostEmail": "Dedric.Pagac26@hotmail.com", - "hostKey": 25185, - "siteUrl": "ciscofedsales.webex.com", - "webLink": "http://emerald.com", - "sipAddress": "Peyton23@hotmail.com", - "dialInIpAddress": "128.170.63.147", - "enabledAutoRecordMeeting": false, - "allowAnyUserToBeCoHost": true, - "allowFirstUserToBeCoHost": false, - "allowAuthenticatedDevices": false, - "enabledJoinBeforeHost": true, - "joinBeforeHostMinutes": 7, - "enableConnectAudioBeforeHost": true, - "excludePassword": false, - "publicMeeting": false, - "enableAutomaticLock": true, - "automaticLockMinutes": 1, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "telephony": { - "accessCode": "100945", - "callInNumbers": [ - { - "label": "United States Toll", - "callInNumber": "+1-415-527-5035", - "tollType": "toll" - }, - { - "label": "United States Toll (Washington D.C.)", - "callInNumber": "+1-202-600-2533", - "tollType": "toll" - } - ], - "links": [ - { - "rel": "globalCallinNumbers", - "href": "/v1/meetings/1c2c1e96-1fd5-4ca3-92ea-43db6d56f81c/globalCallinNumbers", - "method": "GET" - } - ] - }, - "meetingOptions": { - "enabledChat": true, - "enabledVideo": true, - "enabledNote": true, - "noteType": "allowAll", - "enabledFileTransfer": true, - "enabledUCFRichMedia": true - }, - "attendeePrivileges": { - "enabledShareContent": false, - "enabledSaveDocument": true, - "enabledPrintDocument": false, - "enabledAnnotate": true, - "enabledViewParticipantList": true, - "enabledViewThumbnails": false, - "enabledRemoteControl": true, - "enabledViewAnyDocument": true, - "enabledViewAnyPage": false, - "enabledContactOperatorPrivately": true, - "enabledChatHost": true, - "enabledChatPresenter": false, - "enabledChatOtherParticipants": false - }, - "sessionTypeId": 4, - "scheduledType": "meeting", - "simultaneousInterpretation": { - "enabled": false - }, - "enabledBreakoutSessions": false, - "audioConnectionOptions": { - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": true, - "enabledGlobalCallIn": true, - "enabledAudienceCallBack": false, - "entryAndExitTone": "beep", - "allowHostToUnmuteParticipants": true, - "allowAttendeeToUnmuteSelf": true, - "muteAttendeeUponEntry": false - } - }, - { - "id": "f2e00d03-8e9d-4385-822d-73a0b934c6ce", - "meetingNumber": 59205, - "title": "Open-architected even-keeled encryption", - "password": "CiXgRg61OA57ZAT", - "meetingType": "meetingSeries", - "state": "active", - "timezone": "Asia/Shanghai", - "start": "2023-11-01T20:00:00+08:00", - "end": "2023-11-01T21:00:00+08:00", - "hostUserId": "65047964", - "hostDisplayName": "Frieda Collier", - "hostEmail": "Korbin_Kuvalis@hotmail.com", - "hostKey": 21009, - "siteUrl": "ciscofedsales.webex.com", - "webLink": "http://maynard.net", - "sipAddress": "Destin.Braun@yahoo.com", - "dialInIpAddress": "24.16.174.2", - "enabledAutoRecordMeeting": false, - "allowAnyUserToBeCoHost": false, - "allowFirstUserToBeCoHost": true, - "allowAuthenticatedDevices": false, - "enabledJoinBeforeHost": false, - "joinBeforeHostMinutes": 10, - "enableConnectAudioBeforeHost": false, - "excludePassword": true, - "publicMeeting": true, - "enableAutomaticLock": false, - "automaticLockMinutes": 7, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "telephony": { - "accessCode": "967669", - "callInNumbers": [ - { - "label": "United States Toll", - "callInNumber": "+1-415-527-5035", - "tollType": "toll" - }, - { - "label": "United States Toll (Washington D.C.)", - "callInNumber": "+1-202-600-2533", - "tollType": "toll" - } - ], - "links": [ - { - "rel": "globalCallinNumbers", - "href": "/v1/meetings/2cbdc33e-b179-4b6f-927a-aff6fd1007dc/globalCallinNumbers", - "method": "GET" - } - ] - }, - "meetingOptions": { - "enabledChat": false, - "enabledVideo": false, - "enabledNote": true, - "noteType": "allowAll", - "enabledFileTransfer": false, - "enabledUCFRichMedia": false - }, - "attendeePrivileges": { - "enabledShareContent": false, - "enabledSaveDocument": true, - "enabledPrintDocument": false, - "enabledAnnotate": true, - "enabledViewParticipantList": false, - "enabledViewThumbnails": false, - "enabledRemoteControl": false, - "enabledViewAnyDocument": false, - "enabledViewAnyPage": false, - "enabledContactOperatorPrivately": true, - "enabledChatHost": true, - "enabledChatPresenter": true, - "enabledChatOtherParticipants": true - }, - "sessionTypeId": 5, - "scheduledType": "meeting", - "simultaneousInterpretation": { - "enabled": false - }, - "enabledBreakoutSessions": true, - "audioConnectionOptions": { - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": false, - "enabledGlobalCallIn": false, - "enabledAudienceCallBack": false, - "entryAndExitTone": "beep", - "allowHostToUnmuteParticipants": true, - "allowAttendeeToUnmuteSelf": true, - "muteAttendeeUponEntry": true - } - }, - { - "id": "392c5958-3a92-4e3f-b591-dd80fc1af6d2", - "meetingNumber": 29893, - "title": "Automated stable artificial intelligence", - "password": "GWoP8waZ2azWE2o", - "meetingType": "meetingSeries", - "state": "active", - "timezone": "Asia/Shanghai", - "start": "2023-11-01T20:00:00+08:00", - "end": "2023-11-01T21:00:00+08:00", - "hostUserId": "19263574", - "hostDisplayName": "Augustine Schinner IV", - "hostEmail": "Maurice11@hotmail.com", - "hostKey": 53145, - "siteUrl": "ciscofedsales.webex.com", - "webLink": "http://wilber.net", - "sipAddress": "Kadin15@gmail.com", - "dialInIpAddress": "116.146.215.231", - "enabledAutoRecordMeeting": false, - "allowAnyUserToBeCoHost": true, - "allowFirstUserToBeCoHost": true, - "allowAuthenticatedDevices": true, - "enabledJoinBeforeHost": false, - "joinBeforeHostMinutes": 2, - "enableConnectAudioBeforeHost": false, - "excludePassword": true, - "publicMeeting": false, - "enableAutomaticLock": false, - "automaticLockMinutes": 2, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "telephony": { - "accessCode": "540893", - "callInNumbers": [ - { - "label": "United States Toll", - "callInNumber": "+1-415-527-5035", - "tollType": "toll" - }, - { - "label": "United States Toll (Washington D.C.)", - "callInNumber": "+1-202-600-2533", - "tollType": "toll" - } - ], - "links": [ - { - "rel": "globalCallinNumbers", - "href": "/v1/meetings/8be32614-1f61-447a-9277-d4ddf50d9e05/globalCallinNumbers", - "method": "GET" - } - ] - }, - "meetingOptions": { - "enabledChat": true, - "enabledVideo": false, - "enabledNote": true, - "noteType": "allowAll", - "enabledFileTransfer": false, - "enabledUCFRichMedia": true - }, - "attendeePrivileges": { - "enabledShareContent": false, - "enabledSaveDocument": false, - "enabledPrintDocument": true, - "enabledAnnotate": true, - "enabledViewParticipantList": false, - "enabledViewThumbnails": false, - "enabledRemoteControl": true, - "enabledViewAnyDocument": true, - "enabledViewAnyPage": true, - "enabledContactOperatorPrivately": false, - "enabledChatHost": false, - "enabledChatPresenter": true, - "enabledChatOtherParticipants": false - }, - "sessionTypeId": 1, - "scheduledType": "meeting", - "simultaneousInterpretation": { - "enabled": false - }, - "enabledBreakoutSessions": false, - "audioConnectionOptions": { - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": true, - "enabledGlobalCallIn": false, - "enabledAudienceCallBack": true, - "entryAndExitTone": "beep", - "allowHostToUnmuteParticipants": true, - "allowAttendeeToUnmuteSelf": true, - "muteAttendeeUponEntry": true - } - }, - { - "id": "56725652-ca96-462a-b213-f7833c4bb496", - "meetingNumber": 37140, - "title": "Reactive client-driven access", - "password": "wWDxYPLLjrARWva", - "meetingType": "meetingSeries", - "state": "active", - "timezone": "Asia/Shanghai", - "start": "2023-11-01T20:00:00+08:00", - "end": "2023-11-01T21:00:00+08:00", - "hostUserId": "48131198", - "hostDisplayName": "Johnathan Conn", - "hostEmail": "Isidro.Morissette63@gmail.com", - "hostKey": 2293, - "siteUrl": "ciscofedsales.webex.com", - "webLink": "http://domingo.net", - "sipAddress": "Richmond64@gmail.com", - "dialInIpAddress": "40.246.34.158", - "enabledAutoRecordMeeting": true, - "allowAnyUserToBeCoHost": true, - "allowFirstUserToBeCoHost": true, - "allowAuthenticatedDevices": true, - "enabledJoinBeforeHost": true, - "joinBeforeHostMinutes": 9, - "enableConnectAudioBeforeHost": false, - "excludePassword": false, - "publicMeeting": false, - "enableAutomaticLock": true, - "automaticLockMinutes": 2, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "telephony": { - "accessCode": "749299", - "callInNumbers": [ - { - "label": "United States Toll", - "callInNumber": "+1-415-527-5035", - "tollType": "toll" - }, - { - "label": "United States Toll (Washington D.C.)", - "callInNumber": "+1-202-600-2533", - "tollType": "toll" - } - ], - "links": [ - { - "rel": "globalCallinNumbers", - "href": "/v1/meetings/35eb7c92-1ed1-4a65-b618-bea5124627e7/globalCallinNumbers", - "method": "GET" - } - ] - }, - "meetingOptions": { - "enabledChat": false, - "enabledVideo": true, - "enabledNote": false, - "noteType": "allowAll", - "enabledFileTransfer": true, - "enabledUCFRichMedia": true - }, - "attendeePrivileges": { - "enabledShareContent": true, - "enabledSaveDocument": true, - "enabledPrintDocument": true, - "enabledAnnotate": true, - "enabledViewParticipantList": true, - "enabledViewThumbnails": true, - "enabledRemoteControl": false, - "enabledViewAnyDocument": true, - "enabledViewAnyPage": true, - "enabledContactOperatorPrivately": false, - "enabledChatHost": false, - "enabledChatPresenter": false, - "enabledChatOtherParticipants": true - }, - "sessionTypeId": 5, - "scheduledType": "meeting", - "simultaneousInterpretation": { - "enabled": false - }, - "enabledBreakoutSessions": false, - "audioConnectionOptions": { - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": true, - "enabledGlobalCallIn": false, - "enabledAudienceCallBack": false, - "entryAndExitTone": "beep", - "allowHostToUnmuteParticipants": false, - "allowAttendeeToUnmuteSelf": false, - "muteAttendeeUponEntry": true - } - }, - { - "id": "0d3c9510-9634-494f-bf4e-38517813cb74", - "meetingNumber": 78490, - "title": "Advanced client-driven matrices", - "password": "2ELAzEbSkzrPg3b", - "meetingType": "meetingSeries", - "state": "active", - "timezone": "Asia/Shanghai", - "start": "2023-11-01T20:00:00+08:00", - "end": "2023-11-01T21:00:00+08:00", - "hostUserId": "03941178", - "hostDisplayName": "Helene McKenzie", - "hostEmail": "Idella_Ondricka12@hotmail.com", - "hostKey": 15585, - "siteUrl": "ciscofedsales.webex.com", - "webLink": "https://nikolas.info", - "sipAddress": "Helga_MacGyver96@yahoo.com", - "dialInIpAddress": "160.147.247.171", - "enabledAutoRecordMeeting": true, - "allowAnyUserToBeCoHost": false, - "allowFirstUserToBeCoHost": true, - "allowAuthenticatedDevices": false, - "enabledJoinBeforeHost": false, - "joinBeforeHostMinutes": 10, - "enableConnectAudioBeforeHost": false, - "excludePassword": false, - "publicMeeting": false, - "enableAutomaticLock": false, - "automaticLockMinutes": 9, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "telephony": { - "accessCode": "918071", - "callInNumbers": [ - { - "label": "United States Toll", - "callInNumber": "+1-415-527-5035", - "tollType": "toll" - }, - { - "label": "United States Toll (Washington D.C.)", - "callInNumber": "+1-202-600-2533", - "tollType": "toll" - } - ], - "links": [ - { - "rel": "globalCallinNumbers", - "href": "/v1/meetings/756e8261-b660-49a7-9502-b2166767fb1e/globalCallinNumbers", - "method": "GET" - } - ] - }, - "meetingOptions": { - "enabledChat": false, - "enabledVideo": false, - "enabledNote": true, - "noteType": "allowAll", - "enabledFileTransfer": false, - "enabledUCFRichMedia": true - }, - "attendeePrivileges": { - "enabledShareContent": false, - "enabledSaveDocument": true, - "enabledPrintDocument": true, - "enabledAnnotate": false, - "enabledViewParticipantList": false, - "enabledViewThumbnails": true, - "enabledRemoteControl": false, - "enabledViewAnyDocument": false, - "enabledViewAnyPage": false, - "enabledContactOperatorPrivately": false, - "enabledChatHost": true, - "enabledChatPresenter": true, - "enabledChatOtherParticipants": false - }, - "sessionTypeId": 5, - "scheduledType": "meeting", - "simultaneousInterpretation": { - "enabled": true - }, - "enabledBreakoutSessions": true, - "audioConnectionOptions": { - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": true, - "enabledGlobalCallIn": true, - "enabledAudienceCallBack": false, - "entryAndExitTone": "beep", - "allowHostToUnmuteParticipants": false, - "allowAttendeeToUnmuteSelf": true, - "muteAttendeeUponEntry": false - } - }, - { - "id": "f5d131ce-c8b3-4e2f-8f61-311d912da8a9", - "meetingNumber": 82623, - "title": "Function-based interactive throughput", - "password": "EESLHbhLMue1et7", - "meetingType": "meetingSeries", - "state": "active", - "timezone": "Asia/Shanghai", - "start": "2023-11-01T20:00:00+08:00", - "end": "2023-11-01T21:00:00+08:00", - "hostUserId": "36075676", - "hostDisplayName": "Enrico Wyman", - "hostEmail": "Buddy.Gislason97@gmail.com", - "hostKey": 1212, - "siteUrl": "ciscofedsales.webex.com", - "webLink": "https://megane.info", - "sipAddress": "Sid17@yahoo.com", - "dialInIpAddress": "114.88.134.243", - "enabledAutoRecordMeeting": false, - "allowAnyUserToBeCoHost": true, - "allowFirstUserToBeCoHost": false, - "allowAuthenticatedDevices": false, - "enabledJoinBeforeHost": false, - "joinBeforeHostMinutes": 5, - "enableConnectAudioBeforeHost": false, - "excludePassword": true, - "publicMeeting": false, - "enableAutomaticLock": true, - "automaticLockMinutes": 5, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "telephony": { - "accessCode": "442338", - "callInNumbers": [ - { - "label": "United States Toll", - "callInNumber": "+1-415-527-5035", - "tollType": "toll" - }, - { - "label": "United States Toll (Washington D.C.)", - "callInNumber": "+1-202-600-2533", - "tollType": "toll" - } - ], - "links": [ - { - "rel": "globalCallinNumbers", - "href": "/v1/meetings/c20b96a8-dca7-4e26-bffd-5cd6d3579d62/globalCallinNumbers", - "method": "GET" - } - ] - }, - "meetingOptions": { - "enabledChat": false, - "enabledVideo": false, - "enabledNote": true, - "noteType": "allowAll", - "enabledFileTransfer": false, - "enabledUCFRichMedia": false - }, - "attendeePrivileges": { - "enabledShareContent": true, - "enabledSaveDocument": false, - "enabledPrintDocument": false, - "enabledAnnotate": false, - "enabledViewParticipantList": false, - "enabledViewThumbnails": false, - "enabledRemoteControl": true, - "enabledViewAnyDocument": true, - "enabledViewAnyPage": false, - "enabledContactOperatorPrivately": true, - "enabledChatHost": true, - "enabledChatPresenter": false, - "enabledChatOtherParticipants": true - }, - "sessionTypeId": 3, - "scheduledType": "meeting", - "simultaneousInterpretation": { - "enabled": false - }, - "enabledBreakoutSessions": true, - "audioConnectionOptions": { - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": true, - "enabledGlobalCallIn": true, - "enabledAudienceCallBack": false, - "entryAndExitTone": "beep", - "allowHostToUnmuteParticipants": true, - "allowAttendeeToUnmuteSelf": true, - "muteAttendeeUponEntry": true - } - }, - { - "id": "0463e7ab-f5e3-4501-bad4-080b5c1692ba", - "meetingNumber": 52131, - "title": "Synergistic radical capability", - "password": "J3lpVAWwcC9vOPJ", - "meetingType": "meetingSeries", - "state": "active", - "timezone": "Asia/Shanghai", - "start": "2023-11-01T20:00:00+08:00", - "end": "2023-11-01T21:00:00+08:00", - "hostUserId": "27351129", - "hostDisplayName": "Hunter Wilderman Jr.", - "hostEmail": "Leatha.Predovic@yahoo.com", - "hostKey": 76480, - "siteUrl": "ciscofedsales.webex.com", - "webLink": "http://marlene.net", - "sipAddress": "Abbey_Hills77@yahoo.com", - "dialInIpAddress": "193.211.228.35", - "enabledAutoRecordMeeting": true, - "allowAnyUserToBeCoHost": true, - "allowFirstUserToBeCoHost": false, - "allowAuthenticatedDevices": true, - "enabledJoinBeforeHost": true, - "joinBeforeHostMinutes": 3, - "enableConnectAudioBeforeHost": true, - "excludePassword": false, - "publicMeeting": false, - "enableAutomaticLock": true, - "automaticLockMinutes": 4, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "telephony": { - "accessCode": "308889", - "callInNumbers": [ - { - "label": "United States Toll", - "callInNumber": "+1-415-527-5035", - "tollType": "toll" - }, - { - "label": "United States Toll (Washington D.C.)", - "callInNumber": "+1-202-600-2533", - "tollType": "toll" - } - ], - "links": [ - { - "rel": "globalCallinNumbers", - "href": "/v1/meetings/5ca4c68b-26fd-4a9c-8e70-01f392b483ae/globalCallinNumbers", - "method": "GET" - } - ] - }, - "meetingOptions": { - "enabledChat": false, - "enabledVideo": false, - "enabledNote": true, - "noteType": "allowAll", - "enabledFileTransfer": true, - "enabledUCFRichMedia": false - }, - "attendeePrivileges": { - "enabledShareContent": true, - "enabledSaveDocument": true, - "enabledPrintDocument": true, - "enabledAnnotate": false, - "enabledViewParticipantList": true, - "enabledViewThumbnails": false, - "enabledRemoteControl": true, - "enabledViewAnyDocument": false, - "enabledViewAnyPage": true, - "enabledContactOperatorPrivately": false, - "enabledChatHost": true, - "enabledChatPresenter": false, - "enabledChatOtherParticipants": false - }, - "sessionTypeId": 5, - "scheduledType": "meeting", - "simultaneousInterpretation": { - "enabled": false - }, - "enabledBreakoutSessions": false, - "audioConnectionOptions": { - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": true, - "enabledGlobalCallIn": false, - "enabledAudienceCallBack": false, - "entryAndExitTone": "beep", - "allowHostToUnmuteParticipants": true, - "allowAttendeeToUnmuteSelf": false, - "muteAttendeeUponEntry": true - } - }, - { - "id": "ac5d73a8-5194-4344-9e84-cec7510d5d77", - "meetingNumber": 45733, - "title": "Virtual scalable task-force", - "password": "yxej_vtIadcY3Na", - "meetingType": "meetingSeries", - "state": "active", - "timezone": "Asia/Shanghai", - "start": "2023-11-01T20:00:00+08:00", - "end": "2023-11-01T21:00:00+08:00", - "hostUserId": "14611038", - "hostDisplayName": "Breana Stehr", - "hostEmail": "Dave.Corkery5@hotmail.com", - "hostKey": 47941, - "siteUrl": "ciscofedsales.webex.com", - "webLink": "https://ryleigh.biz", - "sipAddress": "Kevon.Jacobson@gmail.com", - "dialInIpAddress": "162.16.32.58", - "enabledAutoRecordMeeting": false, - "allowAnyUserToBeCoHost": false, - "allowFirstUserToBeCoHost": true, - "allowAuthenticatedDevices": false, - "enabledJoinBeforeHost": false, - "joinBeforeHostMinutes": 7, - "enableConnectAudioBeforeHost": true, - "excludePassword": true, - "publicMeeting": false, - "enableAutomaticLock": false, - "automaticLockMinutes": 2, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "telephony": { - "accessCode": "897918", - "callInNumbers": [ - { - "label": "United States Toll", - "callInNumber": "+1-415-527-5035", - "tollType": "toll" - }, - { - "label": "United States Toll (Washington D.C.)", - "callInNumber": "+1-202-600-2533", - "tollType": "toll" - } - ], - "links": [ - { - "rel": "globalCallinNumbers", - "href": "/v1/meetings/c771ba6e-2c61-47f7-8a8f-fc2b64e84041/globalCallinNumbers", - "method": "GET" - } - ] - }, - "meetingOptions": { - "enabledChat": true, - "enabledVideo": false, - "enabledNote": false, - "noteType": "allowAll", - "enabledFileTransfer": true, - "enabledUCFRichMedia": true - }, - "attendeePrivileges": { - "enabledShareContent": false, - "enabledSaveDocument": false, - "enabledPrintDocument": true, - "enabledAnnotate": false, - "enabledViewParticipantList": true, - "enabledViewThumbnails": false, - "enabledRemoteControl": false, - "enabledViewAnyDocument": false, - "enabledViewAnyPage": true, - "enabledContactOperatorPrivately": true, - "enabledChatHost": false, - "enabledChatPresenter": true, - "enabledChatOtherParticipants": true - }, - "sessionTypeId": 2, - "scheduledType": "meeting", - "simultaneousInterpretation": { - "enabled": false - }, - "enabledBreakoutSessions": false, - "audioConnectionOptions": { - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": true, - "enabledGlobalCallIn": true, - "enabledAudienceCallBack": false, - "entryAndExitTone": "beep", - "allowHostToUnmuteParticipants": true, - "allowAttendeeToUnmuteSelf": false, - "muteAttendeeUponEntry": true - } - }, - { - "id": "572400cd-1661-4deb-8c9a-8ba0210340de", - "meetingNumber": 74244, - "title": "Fully-configurable homogeneous algorithm", - "password": "HVfUgzMLD9Z8gl8", - "meetingType": "meetingSeries", - "state": "active", - "timezone": "Asia/Shanghai", - "start": "2023-11-01T20:00:00+08:00", - "end": "2023-11-01T21:00:00+08:00", - "hostUserId": "38475615", - "hostDisplayName": "Teresa Walsh", - "hostEmail": "Garnett92@yahoo.com", - "hostKey": 60679, - "siteUrl": "ciscofedsales.webex.com", - "webLink": "http://gertrude.org", - "sipAddress": "Henriette_Parker76@yahoo.com", - "dialInIpAddress": "209.186.73.185", - "enabledAutoRecordMeeting": true, - "allowAnyUserToBeCoHost": false, - "allowFirstUserToBeCoHost": false, - "allowAuthenticatedDevices": false, - "enabledJoinBeforeHost": false, - "joinBeforeHostMinutes": 5, - "enableConnectAudioBeforeHost": true, - "excludePassword": true, - "publicMeeting": true, - "enableAutomaticLock": false, - "automaticLockMinutes": 7, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "telephony": { - "accessCode": "776239", - "callInNumbers": [ - { - "label": "United States Toll", - "callInNumber": "+1-415-527-5035", - "tollType": "toll" - }, - { - "label": "United States Toll (Washington D.C.)", - "callInNumber": "+1-202-600-2533", - "tollType": "toll" - } - ], - "links": [ - { - "rel": "globalCallinNumbers", - "href": "/v1/meetings/bd8a1b5f-5654-4b17-b3cd-91193ede5aac/globalCallinNumbers", - "method": "GET" - } - ] - }, - "meetingOptions": { - "enabledChat": true, - "enabledVideo": false, - "enabledNote": true, - "noteType": "allowAll", - "enabledFileTransfer": false, - "enabledUCFRichMedia": true - }, - "attendeePrivileges": { - "enabledShareContent": false, - "enabledSaveDocument": true, - "enabledPrintDocument": false, - "enabledAnnotate": true, - "enabledViewParticipantList": true, - "enabledViewThumbnails": true, - "enabledRemoteControl": false, - "enabledViewAnyDocument": true, - "enabledViewAnyPage": false, - "enabledContactOperatorPrivately": true, - "enabledChatHost": false, - "enabledChatPresenter": true, - "enabledChatOtherParticipants": false - }, - "sessionTypeId": 5, - "scheduledType": "meeting", - "simultaneousInterpretation": { - "enabled": false - }, - "enabledBreakoutSessions": false, - "audioConnectionOptions": { - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": false, - "enabledGlobalCallIn": false, - "enabledAudienceCallBack": false, - "entryAndExitTone": "beep", - "allowHostToUnmuteParticipants": false, - "allowAttendeeToUnmuteSelf": false, - "muteAttendeeUponEntry": true - } - } - ] -} \ No newline at end of file From 38d701050376db81828d91e5e51a5a89021bcead Mon Sep 17 00:00:00 2001 From: breedbah Date: Mon, 21 Aug 2023 10:52:20 -0400 Subject: [PATCH 038/445] APPEALS-28105 added the webex-mock.json to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 18884fd4e16..b655037991d 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ client/junit.xml !/reports/sql_queries !/reports/.keep credstash.log +client/mocks/webex-mocks/webex-mock.json # Ignore MS Office temp files ~$* From 88a743532f853e682e312236f5a153f2a82cf550 Mon Sep 17 00:00:00 2001 From: breedbah Date: Mon, 21 Aug 2023 11:09:44 -0400 Subject: [PATCH 039/445] APPEALS-28105 update linting errors --- .../mocks/webex-mocks/webex-mock-generator.js | 52 +++++---- client/mocks/webex-mocks/webex-mock-server.js | 105 +++++++++--------- 2 files changed, 76 insertions(+), 81 deletions(-) diff --git a/client/mocks/webex-mocks/webex-mock-generator.js b/client/mocks/webex-mocks/webex-mock-generator.js index 1417f290709..20188273c20 100644 --- a/client/mocks/webex-mocks/webex-mock-generator.js +++ b/client/mocks/webex-mocks/webex-mock-generator.js @@ -1,5 +1,5 @@ -const fs = require("fs"); -const faker = require("faker"); +const fs = require('fs'); +const faker = require('faker'); const generateConferenceLinks = () => { let webexLinks = []; @@ -10,16 +10,16 @@ const generateConferenceLinks = () => { meetingNumber: faker.random.number(), title: faker.company.catchPhrase(), password: faker.internet.password(), - meetingType: "meetingSeries", - state: "active", - timezone: "Asia/Shanghai", - start: "2023-11-01T20:00:00+08:00", - end: "2023-11-01T21:00:00+08:00", + meetingType: 'meetingSeries', + state: 'active', + timezone: 'Asia/Shanghai', + start: '2023-11-01T20:00:00+08:00', + end: '2023-11-01T21:00:00+08:00', hostUserId: faker.finance.account(), hostDisplayName: faker.name.findName(), hostEmail: faker.internet.email(), hostKey: faker.random.number(), - siteUrl: "ciscofedsales.webex.com", + siteUrl: 'ciscofedsales.webex.com', webLink: faker.internet.url(), sipAddress: faker.internet.email(), dialInIpAddress: faker.internet.ip(), @@ -34,29 +34,27 @@ const generateConferenceLinks = () => { publicMeeting: faker.random.boolean(), enableAutomaticLock: faker.random.boolean(), automaticLockMinutes: faker.random.number({ min: 1, max: 10 }), - unlockedMeetingJoinSecurity: "allowJoinWithLobby", + unlockedMeetingJoinSecurity: 'allowJoinWithLobby', telephony: { - accessCode: faker.random - .number({ min: 100000, max: 999999 }) - .toString(), + accessCode: faker.random.number({ min: 100000, max: 999999 }).toString(), callInNumbers: [ { - label: "United States Toll", - callInNumber: "+1-415-527-5035", - tollType: "toll", + label: 'United States Toll', + callInNumber: '+1-415-527-5035', + tollType: 'toll', }, { - label: "United States Toll (Washington D.C.)", - callInNumber: "+1-202-600-2533", - tollType: "toll", + label: 'United States Toll (Washington D.C.)', + callInNumber: '+1-202-600-2533', + tollType: 'toll', }, ], links: [ { - rel: "globalCallinNumbers", + rel: 'globalCallinNumbers', href: - "/v1/meetings/" + faker.random.uuid() + "/globalCallinNumbers", - method: "GET", + '/v1/meetings/' + faker.random.uuid() + '/globalCallinNumbers', + method: 'GET', }, ], }, @@ -64,7 +62,7 @@ const generateConferenceLinks = () => { enabledChat: faker.random.boolean(), enabledVideo: faker.random.boolean(), enabledNote: faker.random.boolean(), - noteType: "allowAll", + noteType: 'allowAll', enabledFileTransfer: faker.random.boolean(), enabledUCFRichMedia: faker.random.boolean(), }, @@ -84,17 +82,17 @@ const generateConferenceLinks = () => { enabledChatOtherParticipants: faker.random.boolean(), }, sessionTypeId: faker.random.number({ min: 1, max: 5 }), - scheduledType: "meeting", + scheduledType: 'meeting', simultaneousInterpretation: { enabled: faker.random.boolean(), }, enabledBreakoutSessions: faker.random.boolean(), audioConnectionOptions: { - audioConnectionType: "webexAudio", + audioConnectionType: 'webexAudio', enabledTollFreeCallIn: faker.random.boolean(), enabledGlobalCallIn: faker.random.boolean(), enabledAudienceCallBack: faker.random.boolean(), - entryAndExitTone: "beep", + entryAndExitTone: 'beep', allowHostToUnmuteParticipants: faker.random.boolean(), allowAttendeeToUnmuteSelf: faker.random.boolean(), muteAttendeeUponEntry: faker.random.boolean(), @@ -113,7 +111,7 @@ const data = { // Check if the script is being run directly if (require.main === module) { - fs.writeFileSync("mocks/webex-mocks/webex-mock.json", JSON.stringify(data, null, 2)); - console.log("Generated new data in webex-mock.json"); + fs.writeFileSync('mocks/webex-mocks/webex-mock.json', JSON.stringify(data, null, 2)); + console.log('Generated new data in webex-mock.json'); } diff --git a/client/mocks/webex-mocks/webex-mock-server.js b/client/mocks/webex-mocks/webex-mock-server.js index 6684e3731fd..22493c697c7 100644 --- a/client/mocks/webex-mocks/webex-mock-server.js +++ b/client/mocks/webex-mocks/webex-mock-server.js @@ -7,7 +7,7 @@ const router = jsonServer.router( const middlewares = jsonServer.defaults(); const routesRewrite = require('./routes.json'); -const faker = require("faker"); +const faker = require('faker'); server.use(middlewares); server.use(jsonServer.bodyParser); @@ -127,30 +127,30 @@ server.get('/health-check-green', (req, res) => { }); const requiredKeys = [ - "title", - "start", - "end", - "timezone", - "enabledAutoRecordMeeting", - "allowAnyUserToBeCoHost", - "enabledJoinBeforeHost", - "enableConnectAudioBeforeHost", - "joinBeforeHostMinutes", - "excludePassword", - "publicMeeting", - "reminderTime", - "unlockedMeetingJoinSecurity", - "enabledWebCastView", - "enableAutomaticLock", - "automaticLockMinutes", - "allowFirstUserToBeCoHost", - "allowAuthenticatedDevices", - "sendEmail", - "siteUrl", - "meetingOptions", - "attendeePrivileges", - "enabledBreakoutSessions", - "audioConnectionOptions", + 'title', + 'start', + 'end', + 'timezone', + 'enabledAutoRecordMeeting', + 'allowAnyUserToBeCoHost', + 'enabledJoinBeforeHost', + 'enableConnectAudioBeforeHost', + 'joinBeforeHostMinutes', + 'excludePassword', + 'publicMeeting', + 'reminderTime', + 'unlockedMeetingJoinSecurity', + 'enabledWebCastView', + 'enableAutomaticLock', + 'automaticLockMinutes', + 'allowFirstUserToBeCoHost', + 'allowAuthenticatedDevices', + 'sendEmail', + 'siteUrl', + 'meetingOptions', + 'attendeePrivileges', + 'enabledBreakoutSessions', + 'audioConnectionOptions', ]; const generateMeetingData = { @@ -158,16 +158,16 @@ const generateMeetingData = { meetingNumber: faker.random.number(), title: faker.company.catchPhrase(), password: faker.internet.password(), - meetingType: "meetingSeries", - state: "active", - timezone: "Asia/Shanghai", - start: "2023-11-01T20:00:00+08:00", - end: "2023-11-01T21:00:00+08:00", + meetingType: 'meetingSeries', + state: 'active', + timezone: 'Asia/Shanghai', + start: '2023-11-01T20:00:00+08:00', + end: '2023-11-01T21:00:00+08:00', hostUserId: faker.finance.account(), hostDisplayName: faker.name.findName(), hostEmail: faker.internet.email(), hostKey: faker.random.number(), - siteUrl: "ciscofedsales.webex.com", + siteUrl: 'ciscofedsales.webex.com', webLink: faker.internet.url(), sipAddress: faker.internet.email(), dialInIpAddress: faker.internet.ip(), @@ -182,26 +182,26 @@ const generateMeetingData = { publicMeeting: faker.random.boolean(), enableAutomaticLock: faker.random.boolean(), automaticLockMinutes: faker.random.number({ min: 1, max: 10 }), - unlockedMeetingJoinSecurity: "allowJoinWithLobby", + unlockedMeetingJoinSecurity: 'allowJoinWithLobby', telephony: { accessCode: faker.random.number({ min: 100000, max: 999999 }).toString(), callInNumbers: [ { - label: "United States Toll", - callInNumber: "+1-415-527-5035", - tollType: "toll", + label: 'United States Toll', + callInNumber: '+1-415-527-5035', + tollType: 'toll', }, { - label: "United States Toll (Washington D.C.)", - callInNumber: "+1-202-600-2533", - tollType: "toll", + label: 'United States Toll (Washington D.C.)', + callInNumber: '+1-202-600-2533', + tollType: 'toll', }, ], links: [ { - rel: "globalCallinNumbers", - href: "/v1/meetings/" + faker.random.uuid() + "/globalCallinNumbers", - method: "GET", + rel: 'globalCallinNumbers', + href: '/v1/meetings/' + faker.random.uuid() + '/globalCallinNumbers', + method: 'GET', }, ], }, @@ -209,7 +209,7 @@ const generateMeetingData = { enabledChat: faker.random.boolean(), enabledVideo: faker.random.boolean(), enabledNote: faker.random.boolean(), - noteType: "allowAll", + noteType: 'allowAll', enabledFileTransfer: faker.random.boolean(), enabledUCFRichMedia: faker.random.boolean(), }, @@ -229,35 +229,35 @@ const generateMeetingData = { enabledChatOtherParticipants: faker.random.boolean(), }, sessionTypeId: faker.random.number({ min: 1, max: 5 }), - scheduledType: "meeting", + scheduledType: 'meeting', simultaneousInterpretation: { enabled: faker.random.boolean(), }, enabledBreakoutSessions: faker.random.boolean(), audioConnectionOptions: { - audioConnectionType: "webexAudio", + audioConnectionType: 'webexAudio', enabledTollFreeCallIn: faker.random.boolean(), enabledGlobalCallIn: faker.random.boolean(), enabledAudienceCallBack: faker.random.boolean(), - entryAndExitTone: "beep", + entryAndExitTone: 'beep', allowHostToUnmuteParticipants: faker.random.boolean(), allowAttendeeToUnmuteSelf: faker.random.boolean(), muteAttendeeUponEntry: faker.random.boolean(), }, }; -server.post("/fake.api-usgov.webex.com/v1/meetings", (req, res) => { +server.post('/fake.api-usgov.webex.com/v1/meetings', (req, res) => { const requestBody = req.body; // Check if all required keys are present const missingKeys = requiredKeys.filter((key) => !(key in requestBody)); if (missingKeys.length > 0) { - res.status(400).json({ message: "Missing required keys", missingKeys }); + res.status(400).json({ message: 'Missing required keys', missingKeys }); } else { // Access conferenceLinks from database - const db = router.db; // Get lowdb instance - const conferenceLinks = db.get("conferenceLinks"); + const db = router.db; + const conferenceLinks = db.get('conferenceLinks'); // Add generateMeetingData object to conferenceLinks conferenceLinks.push(generateMeetingData).write(); @@ -266,9 +266,6 @@ server.post("/fake.api-usgov.webex.com/v1/meetings", (req, res) => { } }); -// Sample object to be added - - server.use(router); const errorRoutes = [ @@ -297,7 +294,7 @@ server.listen(3050, () => { console.log(' Loading mocks/webex-mocks/webex-mock.json'); console.log(' Done\n'); - console.log( ' Resources:'); + console.log(' Resources:'); // Original routes from the database state const originalRoutes = Object.keys(router.db.getState()); @@ -327,5 +324,5 @@ server.listen(3050, () => { console.log( '\n Type s + enter at any time to create a snapshot of the database' ); - console.log( 'Watching...'); + console.log('Watching...'); }); From a45deef07ab569b526fdd50756de961a3c6054f6 Mon Sep 17 00:00:00 2001 From: breedbah Date: Mon, 21 Aug 2023 11:16:41 -0400 Subject: [PATCH 040/445] APPEALS-28105 Completed addressing linting errors --- client/mocks/webex-mocks/webex-mock-generator.js | 3 ++- client/mocks/webex-mocks/webex-mock-server.js | 10 +++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/client/mocks/webex-mocks/webex-mock-generator.js b/client/mocks/webex-mocks/webex-mock-generator.js index 20188273c20..d158432cbea 100644 --- a/client/mocks/webex-mocks/webex-mock-generator.js +++ b/client/mocks/webex-mocks/webex-mock-generator.js @@ -53,7 +53,7 @@ const generateConferenceLinks = () => { { rel: 'globalCallinNumbers', href: - '/v1/meetings/' + faker.random.uuid() + '/globalCallinNumbers', + `/v1/meetings/${faker.random.uuid()}/globalCallinNumbers`, method: 'GET', }, ], @@ -112,6 +112,7 @@ const data = { // Check if the script is being run directly if (require.main === module) { fs.writeFileSync('mocks/webex-mocks/webex-mock.json', JSON.stringify(data, null, 2)); + // eslint-disable-next-line no-console console.log('Generated new data in webex-mock.json'); } diff --git a/client/mocks/webex-mocks/webex-mock-server.js b/client/mocks/webex-mocks/webex-mock-server.js index 22493c697c7..a28df013a16 100644 --- a/client/mocks/webex-mocks/webex-mock-server.js +++ b/client/mocks/webex-mocks/webex-mock-server.js @@ -200,7 +200,7 @@ const generateMeetingData = { links: [ { rel: 'globalCallinNumbers', - href: '/v1/meetings/' + faker.random.uuid() + '/globalCallinNumbers', + href: `/v1/meetings/${faker.random.uuid()}/globalCallinNumbers`, method: 'GET', }, ], @@ -290,6 +290,7 @@ const errorRoutes = [ ]; server.listen(3050, () => { + /* eslint-disable no-console */ console.log(' \\{^_^}/ hi!\n'); console.log(' Loading mocks/webex-mocks/webex-mock.json'); console.log(' Done\n'); @@ -303,10 +304,12 @@ server.listen(3050, () => { const rewrittenRoutes = originalRoutes.map((route) => { for (let key in routesRewrite) { if (routesRewrite[key] === `/${route}`) { - return key; // returning the custom path + // returning the custom path + return key; } } - return `/${route}`; // returning the original path if no custom path found + + return `/${route}`; }); rewrittenRoutes.forEach((route) => { @@ -325,4 +328,5 @@ server.listen(3050, () => { '\n Type s + enter at any time to create a snapshot of the database' ); console.log('Watching...'); + /* eslint-enable no-console */ }); From 6802591043eff30f1553d5b3e2142f42f9a46a4c Mon Sep 17 00:00:00 2001 From: breedbah Date: Mon, 21 Aug 2023 12:19:22 -0400 Subject: [PATCH 041/445] APPEALS-28105 Updated the Readme.md --- client/mocks/webex-mocks/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/mocks/webex-mocks/README.md b/client/mocks/webex-mocks/README.md index 27c1f72f31b..6ba50ab12c7 100644 --- a/client/mocks/webex-mocks/README.md +++ b/client/mocks/webex-mocks/README.md @@ -10,7 +10,7 @@ step 4: Make sure casfelow application is running step 4: Run command: npm run webex-server -step 5: If you would like to autogenerate test data, run this command: npm run generate-webex +step 5: Autogenerate test data, run this command: npm run generate-webex(This will also create the json file) \*info: You will recieve all available routes within the terminal under 'Resources' From 94719fe178877a4756d34c32c83e807767922eb3 Mon Sep 17 00:00:00 2001 From: breedbah Date: Mon, 21 Aug 2023 13:03:43 -0400 Subject: [PATCH 042/445] APPEALS-28105 Addressed Code Climate errors --- client/mocks/webex-mocks/meetingData.js | 96 +++++++++++++++++++ .../mocks/webex-mocks/webex-mock-generator.js | 96 +------------------ client/mocks/webex-mocks/webex-mock-server.js | 96 +------------------ 3 files changed, 100 insertions(+), 188 deletions(-) create mode 100644 client/mocks/webex-mocks/meetingData.js diff --git a/client/mocks/webex-mocks/meetingData.js b/client/mocks/webex-mocks/meetingData.js new file mode 100644 index 00000000000..cea2a5a8804 --- /dev/null +++ b/client/mocks/webex-mocks/meetingData.js @@ -0,0 +1,96 @@ +const faker = require("faker"); + +const generateMeetingData = { + id: faker.random.uuid(), + meetingNumber: faker.random.number(), + title: faker.company.catchPhrase(), + password: faker.internet.password(), + meetingType: "meetingSeries", + state: "active", + timezone: "Asia/Shanghai", + start: "2023-11-01T20:00:00+08:00", + end: "2023-11-01T21:00:00+08:00", + hostUserId: faker.finance.account(), + hostDisplayName: faker.name.findName(), + hostEmail: faker.internet.email(), + hostKey: faker.random.number(), + siteUrl: "ciscofedsales.webex.com", + webLink: faker.internet.url(), + sipAddress: faker.internet.email(), + dialInIpAddress: faker.internet.ip(), + enabledAutoRecordMeeting: faker.random.boolean(), + allowAnyUserToBeCoHost: faker.random.boolean(), + allowFirstUserToBeCoHost: faker.random.boolean(), + allowAuthenticatedDevices: faker.random.boolean(), + enabledJoinBeforeHost: faker.random.boolean(), + joinBeforeHostMinutes: faker.random.number({ min: 0, max: 10 }), + enableConnectAudioBeforeHost: faker.random.boolean(), + excludePassword: faker.random.boolean(), + publicMeeting: faker.random.boolean(), + enableAutomaticLock: faker.random.boolean(), + automaticLockMinutes: faker.random.number({ min: 1, max: 10 }), + unlockedMeetingJoinSecurity: "allowJoinWithLobby", + telephony: { + accessCode: faker.random.number({ min: 100000, max: 999999 }).toString(), + callInNumbers: [ + { + label: "United States Toll", + callInNumber: "+1-415-527-5035", + tollType: "toll", + }, + { + label: "United States Toll (Washington D.C.)", + callInNumber: "+1-202-600-2533", + tollType: "toll", + }, + ], + links: [ + { + rel: "globalCallinNumbers", + href: `/v1/meetings/${faker.random.uuid()}/globalCallinNumbers`, + method: "GET", + }, + ], + }, + meetingOptions: { + enabledChat: faker.random.boolean(), + enabledVideo: faker.random.boolean(), + enabledNote: faker.random.boolean(), + noteType: "allowAll", + enabledFileTransfer: faker.random.boolean(), + enabledUCFRichMedia: faker.random.boolean(), + }, + attendeePrivileges: { + enabledShareContent: faker.random.boolean(), + enabledSaveDocument: faker.random.boolean(), + enabledPrintDocument: faker.random.boolean(), + enabledAnnotate: faker.random.boolean(), + enabledViewParticipantList: faker.random.boolean(), + enabledViewThumbnails: faker.random.boolean(), + enabledRemoteControl: faker.random.boolean(), + enabledViewAnyDocument: faker.random.boolean(), + enabledViewAnyPage: faker.random.boolean(), + enabledContactOperatorPrivately: faker.random.boolean(), + enabledChatHost: faker.random.boolean(), + enabledChatPresenter: faker.random.boolean(), + enabledChatOtherParticipants: faker.random.boolean(), + }, + sessionTypeId: faker.random.number({ min: 1, max: 5 }), + scheduledType: "meeting", + simultaneousInterpretation: { + enabled: faker.random.boolean(), + }, + enabledBreakoutSessions: faker.random.boolean(), + audioConnectionOptions: { + audioConnectionType: "webexAudio", + enabledTollFreeCallIn: faker.random.boolean(), + enabledGlobalCallIn: faker.random.boolean(), + enabledAudienceCallBack: faker.random.boolean(), + entryAndExitTone: "beep", + allowHostToUnmuteParticipants: faker.random.boolean(), + allowAttendeeToUnmuteSelf: faker.random.boolean(), + muteAttendeeUponEntry: faker.random.boolean(), + }, +}; + +module.exports = generateMeetingData; diff --git a/client/mocks/webex-mocks/webex-mock-generator.js b/client/mocks/webex-mocks/webex-mock-generator.js index d158432cbea..985894425d5 100644 --- a/client/mocks/webex-mocks/webex-mock-generator.js +++ b/client/mocks/webex-mocks/webex-mock-generator.js @@ -1,103 +1,11 @@ const fs = require('fs'); -const faker = require('faker'); +const generateMeetingData = require("./meetingData.js"); const generateConferenceLinks = () => { let webexLinks = []; for (let id = 1; id <= 10; id++) { - webexLinks.push({ - id: faker.random.uuid(), - meetingNumber: faker.random.number(), - title: faker.company.catchPhrase(), - password: faker.internet.password(), - meetingType: 'meetingSeries', - state: 'active', - timezone: 'Asia/Shanghai', - start: '2023-11-01T20:00:00+08:00', - end: '2023-11-01T21:00:00+08:00', - hostUserId: faker.finance.account(), - hostDisplayName: faker.name.findName(), - hostEmail: faker.internet.email(), - hostKey: faker.random.number(), - siteUrl: 'ciscofedsales.webex.com', - webLink: faker.internet.url(), - sipAddress: faker.internet.email(), - dialInIpAddress: faker.internet.ip(), - enabledAutoRecordMeeting: faker.random.boolean(), - allowAnyUserToBeCoHost: faker.random.boolean(), - allowFirstUserToBeCoHost: faker.random.boolean(), - allowAuthenticatedDevices: faker.random.boolean(), - enabledJoinBeforeHost: faker.random.boolean(), - joinBeforeHostMinutes: faker.random.number({ min: 0, max: 10 }), - enableConnectAudioBeforeHost: faker.random.boolean(), - excludePassword: faker.random.boolean(), - publicMeeting: faker.random.boolean(), - enableAutomaticLock: faker.random.boolean(), - automaticLockMinutes: faker.random.number({ min: 1, max: 10 }), - unlockedMeetingJoinSecurity: 'allowJoinWithLobby', - telephony: { - accessCode: faker.random.number({ min: 100000, max: 999999 }).toString(), - callInNumbers: [ - { - label: 'United States Toll', - callInNumber: '+1-415-527-5035', - tollType: 'toll', - }, - { - label: 'United States Toll (Washington D.C.)', - callInNumber: '+1-202-600-2533', - tollType: 'toll', - }, - ], - links: [ - { - rel: 'globalCallinNumbers', - href: - `/v1/meetings/${faker.random.uuid()}/globalCallinNumbers`, - method: 'GET', - }, - ], - }, - meetingOptions: { - enabledChat: faker.random.boolean(), - enabledVideo: faker.random.boolean(), - enabledNote: faker.random.boolean(), - noteType: 'allowAll', - enabledFileTransfer: faker.random.boolean(), - enabledUCFRichMedia: faker.random.boolean(), - }, - attendeePrivileges: { - enabledShareContent: faker.random.boolean(), - enabledSaveDocument: faker.random.boolean(), - enabledPrintDocument: faker.random.boolean(), - enabledAnnotate: faker.random.boolean(), - enabledViewParticipantList: faker.random.boolean(), - enabledViewThumbnails: faker.random.boolean(), - enabledRemoteControl: faker.random.boolean(), - enabledViewAnyDocument: faker.random.boolean(), - enabledViewAnyPage: faker.random.boolean(), - enabledContactOperatorPrivately: faker.random.boolean(), - enabledChatHost: faker.random.boolean(), - enabledChatPresenter: faker.random.boolean(), - enabledChatOtherParticipants: faker.random.boolean(), - }, - sessionTypeId: faker.random.number({ min: 1, max: 5 }), - scheduledType: 'meeting', - simultaneousInterpretation: { - enabled: faker.random.boolean(), - }, - enabledBreakoutSessions: faker.random.boolean(), - audioConnectionOptions: { - audioConnectionType: 'webexAudio', - enabledTollFreeCallIn: faker.random.boolean(), - enabledGlobalCallIn: faker.random.boolean(), - enabledAudienceCallBack: faker.random.boolean(), - entryAndExitTone: 'beep', - allowHostToUnmuteParticipants: faker.random.boolean(), - allowAttendeeToUnmuteSelf: faker.random.boolean(), - muteAttendeeUponEntry: faker.random.boolean(), - }, - }); + webexLinks.push(generateMeetingData); } return webexLinks; diff --git a/client/mocks/webex-mocks/webex-mock-server.js b/client/mocks/webex-mocks/webex-mock-server.js index a28df013a16..1e235028a3d 100644 --- a/client/mocks/webex-mocks/webex-mock-server.js +++ b/client/mocks/webex-mocks/webex-mock-server.js @@ -4,10 +4,11 @@ const path = require('path'); const router = jsonServer.router( path.join('mocks/webex-mocks/webex-mock.json') ); +const generateMeetingData = require('./meetingData.js'); const middlewares = jsonServer.defaults(); const routesRewrite = require('./routes.json'); -const faker = require('faker'); +// const faker = require('faker'); server.use(middlewares); server.use(jsonServer.bodyParser); @@ -153,99 +154,6 @@ const requiredKeys = [ 'audioConnectionOptions', ]; -const generateMeetingData = { - id: faker.random.uuid(), - meetingNumber: faker.random.number(), - title: faker.company.catchPhrase(), - password: faker.internet.password(), - meetingType: 'meetingSeries', - state: 'active', - timezone: 'Asia/Shanghai', - start: '2023-11-01T20:00:00+08:00', - end: '2023-11-01T21:00:00+08:00', - hostUserId: faker.finance.account(), - hostDisplayName: faker.name.findName(), - hostEmail: faker.internet.email(), - hostKey: faker.random.number(), - siteUrl: 'ciscofedsales.webex.com', - webLink: faker.internet.url(), - sipAddress: faker.internet.email(), - dialInIpAddress: faker.internet.ip(), - enabledAutoRecordMeeting: faker.random.boolean(), - allowAnyUserToBeCoHost: faker.random.boolean(), - allowFirstUserToBeCoHost: faker.random.boolean(), - allowAuthenticatedDevices: faker.random.boolean(), - enabledJoinBeforeHost: faker.random.boolean(), - joinBeforeHostMinutes: faker.random.number({ min: 0, max: 10 }), - enableConnectAudioBeforeHost: faker.random.boolean(), - excludePassword: faker.random.boolean(), - publicMeeting: faker.random.boolean(), - enableAutomaticLock: faker.random.boolean(), - automaticLockMinutes: faker.random.number({ min: 1, max: 10 }), - unlockedMeetingJoinSecurity: 'allowJoinWithLobby', - telephony: { - accessCode: faker.random.number({ min: 100000, max: 999999 }).toString(), - callInNumbers: [ - { - label: 'United States Toll', - callInNumber: '+1-415-527-5035', - tollType: 'toll', - }, - { - label: 'United States Toll (Washington D.C.)', - callInNumber: '+1-202-600-2533', - tollType: 'toll', - }, - ], - links: [ - { - rel: 'globalCallinNumbers', - href: `/v1/meetings/${faker.random.uuid()}/globalCallinNumbers`, - method: 'GET', - }, - ], - }, - meetingOptions: { - enabledChat: faker.random.boolean(), - enabledVideo: faker.random.boolean(), - enabledNote: faker.random.boolean(), - noteType: 'allowAll', - enabledFileTransfer: faker.random.boolean(), - enabledUCFRichMedia: faker.random.boolean(), - }, - attendeePrivileges: { - enabledShareContent: faker.random.boolean(), - enabledSaveDocument: faker.random.boolean(), - enabledPrintDocument: faker.random.boolean(), - enabledAnnotate: faker.random.boolean(), - enabledViewParticipantList: faker.random.boolean(), - enabledViewThumbnails: faker.random.boolean(), - enabledRemoteControl: faker.random.boolean(), - enabledViewAnyDocument: faker.random.boolean(), - enabledViewAnyPage: faker.random.boolean(), - enabledContactOperatorPrivately: faker.random.boolean(), - enabledChatHost: faker.random.boolean(), - enabledChatPresenter: faker.random.boolean(), - enabledChatOtherParticipants: faker.random.boolean(), - }, - sessionTypeId: faker.random.number({ min: 1, max: 5 }), - scheduledType: 'meeting', - simultaneousInterpretation: { - enabled: faker.random.boolean(), - }, - enabledBreakoutSessions: faker.random.boolean(), - audioConnectionOptions: { - audioConnectionType: 'webexAudio', - enabledTollFreeCallIn: faker.random.boolean(), - enabledGlobalCallIn: faker.random.boolean(), - enabledAudienceCallBack: faker.random.boolean(), - entryAndExitTone: 'beep', - allowHostToUnmuteParticipants: faker.random.boolean(), - allowAttendeeToUnmuteSelf: faker.random.boolean(), - muteAttendeeUponEntry: faker.random.boolean(), - }, -}; - server.post('/fake.api-usgov.webex.com/v1/meetings', (req, res) => { const requestBody = req.body; From 45e6eed8509993e7f7625a232219246d14c06815 Mon Sep 17 00:00:00 2001 From: breedbah Date: Mon, 21 Aug 2023 13:07:56 -0400 Subject: [PATCH 043/445] APPEALS-28105 Addressed linting errors --- client/mocks/webex-mocks/meetingData.js | 40 +++++++++---------- .../mocks/webex-mocks/webex-mock-generator.js | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/client/mocks/webex-mocks/meetingData.js b/client/mocks/webex-mocks/meetingData.js index cea2a5a8804..34afb658f9c 100644 --- a/client/mocks/webex-mocks/meetingData.js +++ b/client/mocks/webex-mocks/meetingData.js @@ -1,20 +1,20 @@ -const faker = require("faker"); +const faker = require('faker'); const generateMeetingData = { id: faker.random.uuid(), meetingNumber: faker.random.number(), title: faker.company.catchPhrase(), password: faker.internet.password(), - meetingType: "meetingSeries", - state: "active", - timezone: "Asia/Shanghai", - start: "2023-11-01T20:00:00+08:00", - end: "2023-11-01T21:00:00+08:00", + meetingType: 'meetingSeries', + state: 'active', + timezone: 'Asia/Shanghai', + start: '2023-11-01T20:00:00+08:00', + end: '2023-11-01T21:00:00+08:00', hostUserId: faker.finance.account(), hostDisplayName: faker.name.findName(), hostEmail: faker.internet.email(), hostKey: faker.random.number(), - siteUrl: "ciscofedsales.webex.com", + siteUrl: 'ciscofedsales.webex.com', webLink: faker.internet.url(), sipAddress: faker.internet.email(), dialInIpAddress: faker.internet.ip(), @@ -29,26 +29,26 @@ const generateMeetingData = { publicMeeting: faker.random.boolean(), enableAutomaticLock: faker.random.boolean(), automaticLockMinutes: faker.random.number({ min: 1, max: 10 }), - unlockedMeetingJoinSecurity: "allowJoinWithLobby", + unlockedMeetingJoinSecurity: 'allowJoinWithLobby', telephony: { accessCode: faker.random.number({ min: 100000, max: 999999 }).toString(), callInNumbers: [ { - label: "United States Toll", - callInNumber: "+1-415-527-5035", - tollType: "toll", + label: 'United States Toll', + callInNumber: '+1-415-527-5035', + tollType: 'toll', }, { - label: "United States Toll (Washington D.C.)", - callInNumber: "+1-202-600-2533", - tollType: "toll", + label: 'United States Toll (Washington D.C.)', + callInNumber: '+1-202-600-2533', + tollType: 'toll', }, ], links: [ { - rel: "globalCallinNumbers", + rel: 'globalCallinNumbers', href: `/v1/meetings/${faker.random.uuid()}/globalCallinNumbers`, - method: "GET", + method: 'GET', }, ], }, @@ -56,7 +56,7 @@ const generateMeetingData = { enabledChat: faker.random.boolean(), enabledVideo: faker.random.boolean(), enabledNote: faker.random.boolean(), - noteType: "allowAll", + noteType: 'allowAll', enabledFileTransfer: faker.random.boolean(), enabledUCFRichMedia: faker.random.boolean(), }, @@ -76,17 +76,17 @@ const generateMeetingData = { enabledChatOtherParticipants: faker.random.boolean(), }, sessionTypeId: faker.random.number({ min: 1, max: 5 }), - scheduledType: "meeting", + scheduledType: 'meeting', simultaneousInterpretation: { enabled: faker.random.boolean(), }, enabledBreakoutSessions: faker.random.boolean(), audioConnectionOptions: { - audioConnectionType: "webexAudio", + audioConnectionType: 'webexAudio', enabledTollFreeCallIn: faker.random.boolean(), enabledGlobalCallIn: faker.random.boolean(), enabledAudienceCallBack: faker.random.boolean(), - entryAndExitTone: "beep", + entryAndExitTone: 'beep', allowHostToUnmuteParticipants: faker.random.boolean(), allowAttendeeToUnmuteSelf: faker.random.boolean(), muteAttendeeUponEntry: faker.random.boolean(), diff --git a/client/mocks/webex-mocks/webex-mock-generator.js b/client/mocks/webex-mocks/webex-mock-generator.js index 985894425d5..9d4d9c98423 100644 --- a/client/mocks/webex-mocks/webex-mock-generator.js +++ b/client/mocks/webex-mocks/webex-mock-generator.js @@ -1,5 +1,5 @@ const fs = require('fs'); -const generateMeetingData = require("./meetingData.js"); +const generateMeetingData = require('./meetingData.js'); const generateConferenceLinks = () => { let webexLinks = []; From 55c641053c95ead6033c78ecde1ab4505e06aaf5 Mon Sep 17 00:00:00 2001 From: breedbah Date: Tue, 22 Aug 2023 08:16:41 -0400 Subject: [PATCH 044/445] APPEALS-28105 removed commented code --- client/mocks/webex-mocks/webex-mock-server.js | 1 - 1 file changed, 1 deletion(-) diff --git a/client/mocks/webex-mocks/webex-mock-server.js b/client/mocks/webex-mocks/webex-mock-server.js index 1e235028a3d..b7d6c50dd74 100644 --- a/client/mocks/webex-mocks/webex-mock-server.js +++ b/client/mocks/webex-mocks/webex-mock-server.js @@ -8,7 +8,6 @@ const generateMeetingData = require('./meetingData.js'); const middlewares = jsonServer.defaults(); const routesRewrite = require('./routes.json'); -// const faker = require('faker'); server.use(middlewares); server.use(jsonServer.bodyParser); From 0cbb257780836a551b36b185a3c4d42b27c0e2ad Mon Sep 17 00:00:00 2001 From: mchbidwell <122634362+mchbidwell@users.noreply.github.com> Date: Wed, 23 Aug 2023 10:39:54 -0500 Subject: [PATCH 045/445] Revert "Revert "lthompson/APPEALS-26633"" --- .../organizations/users_controller.rb | 9 +++ app/models/organizations_user.rb | 6 ++ .../administered_user_serializer.rb | 1 + client/COPY.json | 1 + client/app/queue/OrganizationUsers.jsx | 55 +++++++++---- .../queue/SelectConferenceTypeRadioField.jsx | 48 +++++++++++ .../SelectConferenceTypeRadioField.test.js | 80 +++++++++++++++++++ ...electConferenceTypeRadioField.test.js.snap | 55 +++++++++++++ ...0230726201514_add_meeting_type_to_users.rb | 9 +++ ...30_add_meeting_type_to_virtual_hearings.rb | 9 +++ ...50_add_meeting_type_to_conference_links.rb | 9 +++ db/schema.rb | 33 ++++++++ spec/models/organizations_user_spec.rb | 14 ++++ spec/models/user_spec.rb | 3 +- 14 files changed, 315 insertions(+), 17 deletions(-) create mode 100644 client/app/queue/SelectConferenceTypeRadioField.jsx create mode 100644 client/test/app/queue/SelectConferenceTypeRadioField.test.js create mode 100644 client/test/app/queue/__snapshots__/SelectConferenceTypeRadioField.test.js.snap create mode 100644 db/migrate/20230726201514_add_meeting_type_to_users.rb create mode 100644 db/migrate/20230726203030_add_meeting_type_to_virtual_hearings.rb create mode 100644 db/migrate/20230726203750_add_meeting_type_to_conference_links.rb diff --git a/app/controllers/organizations/users_controller.rb b/app/controllers/organizations/users_controller.rb index 6a125576a84..4d6cd9eb2a5 100644 --- a/app/controllers/organizations/users_controller.rb +++ b/app/controllers/organizations/users_controller.rb @@ -32,6 +32,7 @@ def update adjust_admin_rights end + update_user_meeting_type render json: { users: json_administered_users([user_to_modify]) }, status: :ok end @@ -67,6 +68,14 @@ def adjust_admin_rights end end + def update_user_meeting_type + new_meeting_type = params.dig(:attributes, :meeting_type) + + if organization["url"] == HearingsManagement.singleton.url && new_meeting_type + OrganizationsUser.update_user_conference_type(user_to_modify, new_meeting_type) + end + end + def organization_url params[:organization_url] end diff --git a/app/models/organizations_user.rb b/app/models/organizations_user.rb index 189d98de647..23ce4f1c4b4 100644 --- a/app/models/organizations_user.rb +++ b/app/models/organizations_user.rb @@ -28,6 +28,12 @@ def remove_admin_rights_from_user(user, organization) existing_record(user, organization)&.update!(admin: false) end + def update_user_conference_type(user, new_meeting_type) + if user.meeting_type + user.update!(meeting_type: new_meeting_type) + end + end + def remove_user_from_organization(user, organization) if user_is_judge_of_team?(user, organization) fail Caseflow::Error::ActionForbiddenError, message: COPY::JUDGE_TEAM_REMOVE_JUDGE_ERROR diff --git a/app/models/serializers/work_queue/administered_user_serializer.rb b/app/models/serializers/work_queue/administered_user_serializer.rb index 61b86097292..f4ffcf0e3a9 100644 --- a/app/models/serializers/work_queue/administered_user_serializer.rb +++ b/app/models/serializers/work_queue/administered_user_serializer.rb @@ -11,4 +11,5 @@ class WorkQueue::AdministeredUserSerializer < WorkQueue::UserSerializer params[:organization].dvc&.eql?(object) end end + attribute :meeting_type end diff --git a/client/COPY.json b/client/COPY.json index 9bd85705be1..f02e14b0e86 100644 --- a/client/COPY.json +++ b/client/COPY.json @@ -772,6 +772,7 @@ "USER_MANAGEMENT_GIVE_USER_ADMIN_RIGHTS_BUTTON_TEXT": "Add admin rights", "USER_MANAGEMENT_REMOVE_USER_ADMIN_RIGHTS_BUTTON_TEXT": "Remove admin rights", "USER_MANAGEMENT_REMOVE_USER_FROM_ORG_BUTTON_TEXT": "Remove from team", + "USER_MANAGEMENT_SELECT_HEARINGS_CONFERENCE_TYPE": "Schedule hearings using:", "MEMBERSHIP_REQUEST_ACTION_SUCCESS_TITLE": "You successfully %s %s's request", "MEMBERSHIP_REQUEST_ACTION_SUCCESS_MESSAGE": "The user was %s regular member access to %s.", "VHA_MEMBERSHIP_REQUEST_AUTOMATIC_VHA_ACCESS_NOTE": "Note: If you are requesting specialized access and are not a member of the general VHA group, you will automatically be given access to the general VHA group if your request is approved.", diff --git a/client/app/queue/OrganizationUsers.jsx b/client/app/queue/OrganizationUsers.jsx index 3497cf30792..12b38c018c0 100644 --- a/client/app/queue/OrganizationUsers.jsx +++ b/client/app/queue/OrganizationUsers.jsx @@ -16,6 +16,7 @@ import { LOGO_COLORS } from '../constants/AppConstants'; import COPY from '../../COPY'; import LoadingDataDisplay from '../components/LoadingDataDisplay'; import MembershipRequestTable from './MembershipRequestTable'; +import SelectConferenceTypeRadioField from './SelectConferenceTypeRadioField'; const userStyle = css({ margin: '.5rem 0 .5rem', @@ -38,11 +39,17 @@ const buttonStyle = css({ const buttonContainerStyle = css({ borderBottom: '1rem solid gray', borderWidth: '1px', - padding: '.5rem 0 2rem', + padding: '.5rem 7rem 2rem 0', + display: 'flex', + justifyContent: 'space-between', + flexWrap: 'wrap' }); const listStyle = css({ listStyle: 'none' }); +const radioContainerStyle = css({ + padding: '-5rem 5rem 2rem 2rem', +}); export default class OrganizationUsers extends React.PureComponent { constructor(props) { @@ -248,18 +255,34 @@ export default class OrganizationUsers extends React.PureComponent { const style = i === 0 ? topUserStyle : userStyle; return -
  • {this.formatName(user)} - { judgeTeam && admin && ( {COPY.USER_MANAGEMENT_JUDGE_LABEL} ) } - { dvcTeam && dvc && ( {COPY.USER_MANAGEMENT_DVC_LABEL} ) } - { judgeTeam && !admin && ( {COPY.USER_MANAGEMENT_ATTORNEY_LABEL} ) } - { (judgeTeam || dvcTeam) && admin && ( {COPY.USER_MANAGEMENT_ADMIN_LABEL} ) } -
    • - { (judgeTeam || dvcTeam) && admin ? -
    : -
    - { (judgeTeam || dvcTeam) ? '' : this.adminButton(user, admin) } - { this.removeUserButton(user) } -
    } +
    +
      +
    • {this.formatName(user)} + { judgeTeam && admin && ( {COPY.USER_MANAGEMENT_JUDGE_LABEL} ) } + { dvcTeam && dvc && ( {COPY.USER_MANAGEMENT_DVC_LABEL} ) } + { judgeTeam && !admin && ( {COPY.USER_MANAGEMENT_ATTORNEY_LABEL} ) } + { (judgeTeam || dvcTeam) && admin && ( {COPY.USER_MANAGEMENT_ADMIN_LABEL} ) } +
      • + { (judgeTeam || dvcTeam) && admin ? +
      : +
      +
      + { (judgeTeam || dvcTeam) ? '' : this.adminButton(user, admin) } + { this.removeUserButton(user) } +
      + { this.state.organizationName === 'Hearings Management' && +
      + +
      + } +
      } +
    +
    ; }); @@ -285,10 +308,10 @@ export default class OrganizationUsers extends React.PureComponent {

    {COPY.USER_MANAGEMENT_EDIT_USER_IN_ORG_LABEL}

      - { (judgeTeam || dvcTeam) ? '' :
    • {COPY.USER_MANAGEMENT_ADMIN_RIGHTS_HEADING}{COPY.USER_MANAGEMENT_ADMIN_RIGHTS_DESCRIPTION}
      • } -
    • {COPY.USER_MANAGEMENT_REMOVE_USER_HEADING}{ judgeTeam ? + { (judgeTeam || dvcTeam) ? '' :
      • {COPY.USER_MANAGEMENT_ADMIN_RIGHTS_HEADING}{COPY.USER_MANAGEMENT_ADMIN_RIGHTS_DESCRIPTION}
      } +
      • {COPY.USER_MANAGEMENT_REMOVE_USER_HEADING}{ judgeTeam ? COPY.USER_MANAGEMENT_JUDGE_TEAM_REMOVE_USER_DESCRIPTION : - COPY.USER_MANAGEMENT_REMOVE_USER_DESCRIPTION }
        • + COPY.USER_MANAGEMENT_REMOVE_USER_DESCRIPTION }
      {listOfUsers}
    diff --git a/client/app/queue/SelectConferenceTypeRadioField.jsx b/client/app/queue/SelectConferenceTypeRadioField.jsx new file mode 100644 index 00000000000..805c88f26c1 --- /dev/null +++ b/client/app/queue/SelectConferenceTypeRadioField.jsx @@ -0,0 +1,48 @@ +import React, { useState } from 'react'; +import PropTypes from 'prop-types'; +import ApiUtil from '../util/ApiUtil'; + +import RadioField from '../components/RadioField'; +import COPY from '../../COPY'; + +const radioOptions = [ + { displayText: 'Pexip', + value: 'pexip' }, + { displayText: 'Webex', + value: 'webex' } +]; + +const SelectConferenceTypeRadioField = ({ name, meetingType, organization, user }) => { + const [value, setValue] = useState(meetingType); + + const modifyConferenceType = (newMeetingType) => { + const payload = { data: { ...user, attributes: { ...user.attributes, meeting_type: newMeetingType } } }; + + ApiUtil.patch(`/organizations/${organization}/users/${user.id}`, payload); + }; + + return ( + <> + setValue(newValue) || modifyConferenceType(newValue))} + vertical + /> + ); +}; + +SelectConferenceTypeRadioField.propTypes = { + name: PropTypes.string, + onClick: PropTypes.func, + meetingType: PropTypes.string, + organization: PropTypes.string, + user: PropTypes.shape({ + id: PropTypes.string, + attributes: PropTypes.object + }) +}; + +export default SelectConferenceTypeRadioField; diff --git a/client/test/app/queue/SelectConferenceTypeRadioField.test.js b/client/test/app/queue/SelectConferenceTypeRadioField.test.js new file mode 100644 index 00000000000..dd36e4f4343 --- /dev/null +++ b/client/test/app/queue/SelectConferenceTypeRadioField.test.js @@ -0,0 +1,80 @@ +import React from 'react'; +import { render, screen } from '@testing-library/react'; +import userEvent from '@testing-library/user-event'; +import ApiUtil from 'app/util/ApiUtil'; + +import SelectConferenceTypeRadioField from 'app/queue/SelectConferenceTypeRadioField'; + +const createSpy = () => jest.spyOn(ApiUtil, 'patch'). + mockImplementation(() => jest.fn(() => Promise.resolve( + { + body: { } + } + ))); + +const defaults = { + name: 'field1', + value: '1', + options: [ + { displayText: 'Pexip', + value: 'pexip' }, + { displayText: 'Webex', + value: 'webex' }, + ], +}; + +describe('SelectConferenceTypeRadioField', () => { + beforeEach(() => { + jest.clearAllMocks(); + }); + + const setupComponent = (props = { + user: { + attributes: { + id: 1 + } + }, + meetingType: 'pexip', + organization: 'my org' + }) => { + const utils = render( + + ); + const inputs = utils.getAllByRole('radio'); + + return { + inputs, + ...utils, + }; + }; + + it('renders correctly', async () => { + const { container } = setupComponent(); + + expect(container).toMatchSnapshot(); + }); + + it('changes values by radio button selected', () => { + let requestPatchSpy = createSpy(); + + setupComponent(); + + const webexRadioButton = screen.getByRole('radio', { name: 'Webex' }); + const pexipRadioButton = screen.getByRole('radio', { name: 'Pexip' }); + + expect(webexRadioButton).not.toHaveAttribute('checked', ''); + expect(pexipRadioButton).toHaveAttribute('checked', ''); + + userEvent.click(webexRadioButton); + + expect(requestPatchSpy.mock.calls[0][1].data.attributes.meeting_type).toBe('webex'); + + userEvent.click(pexipRadioButton); + + expect(requestPatchSpy.mock.calls[1][1].data.attributes.meeting_type).toBe('pexip'); + }); +}); diff --git a/client/test/app/queue/__snapshots__/SelectConferenceTypeRadioField.test.js.snap b/client/test/app/queue/__snapshots__/SelectConferenceTypeRadioField.test.js.snap new file mode 100644 index 00000000000..40d135d3387 --- /dev/null +++ b/client/test/app/queue/__snapshots__/SelectConferenceTypeRadioField.test.js.snap @@ -0,0 +1,55 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`SelectConferenceTypeRadioField renders correctly 1`] = ` +
    +
    + + + Schedule hearings using: + + + +
    +
    + + +
    +
    + + +
    +
    +
    +
    +`; diff --git a/db/migrate/20230726201514_add_meeting_type_to_users.rb b/db/migrate/20230726201514_add_meeting_type_to_users.rb new file mode 100644 index 00000000000..b07b732c95f --- /dev/null +++ b/db/migrate/20230726201514_add_meeting_type_to_users.rb @@ -0,0 +1,9 @@ +class AddMeetingTypeToUsers < Caseflow::Migration + def up + add_column :users, :meeting_type, :varChar, default: "pexip", comment: "Video Conferencing Application Type" + end + + def down + remove_column :users, :meeting_type + end +end diff --git a/db/migrate/20230726203030_add_meeting_type_to_virtual_hearings.rb b/db/migrate/20230726203030_add_meeting_type_to_virtual_hearings.rb new file mode 100644 index 00000000000..6b8f6b1e1c6 --- /dev/null +++ b/db/migrate/20230726203030_add_meeting_type_to_virtual_hearings.rb @@ -0,0 +1,9 @@ +class AddMeetingTypeToVirtualHearings < Caseflow::Migration + def up + add_column :virtual_hearings, :meeting_type, :varChar, default: "pexip", comment: "Video Conferencing Application Type" + end + + def down + remove_column :virtual_hearings, :meeting_type + end +end diff --git a/db/migrate/20230726203750_add_meeting_type_to_conference_links.rb b/db/migrate/20230726203750_add_meeting_type_to_conference_links.rb new file mode 100644 index 00000000000..dc0713e3f35 --- /dev/null +++ b/db/migrate/20230726203750_add_meeting_type_to_conference_links.rb @@ -0,0 +1,9 @@ +class AddMeetingTypeToConferenceLinks < Caseflow::Migration + def up + add_column :conference_links, :meeting_type, :varChar, default: "pexip", comment: "Video Conferencing Application Type" + end + + def down + remove_column :conference_links, :meeting_type + end +end diff --git a/db/schema.rb b/db/schema.rb index 2f02f9c82e3..06240150d9a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -556,6 +556,7 @@ t.string "host_link", comment: "Conference link generated from external conference service" t.integer "host_pin", comment: "Pin for the host of the conference to get into the conference" t.string "host_pin_long", limit: 8, comment: "Generated host pin stored as a string" + t.string "meeting_type", default: "pexip", comment: "Video Conferencing Application Type" t.datetime "updated_at", comment: "Date and Time record was last updated" t.bigint "updated_by_id", comment: "user id of the user to last update the record. FK on the User table" t.index ["created_by_id"], name: "index_created_by_id" @@ -597,6 +598,8 @@ t.string "diagnostic_code", comment: "If a decision resulted in a rating, this is the rating issue's diagnostic code." t.string "disposition", comment: "The disposition for a decision issue. Dispositions made in Caseflow and dispositions made in VBMS can have different values." t.date "end_product_last_action_date", comment: "After an end product gets synced with a status of CLR (cleared), the end product's last_action_date is saved on any decision issues that are created as a result. This is used as a proxy for decision date for non-rating issues that are processed in VBMS because they don't have a rating profile date, and the exact decision date is not available." + t.boolean "mst_status", default: false, comment: "Indicates if decision issue is related to Military Sexual Trauma (MST)" + t.boolean "pact_status", default: false, comment: "Indicates if decision issue is related to Promise to Address Comprehensive Toxics (PACT) Act" t.string "participant_id", null: false, comment: "The Veteran's participant id." t.string "percent_number", comment: "percent_number from RatingIssue (prcntNo from Rating Profile)" t.string "rating_issue_reference_id", comment: "Identifies the specific issue on the rating that resulted from the decision issue (a rating issue can be connected to multiple contentions)." @@ -1472,9 +1475,13 @@ t.string "ineligible_reason", comment: "The reason for a Request Issue being ineligible. If a Request Issue has an ineligible_reason, it is still captured, but it will not get a contention in VBMS or a decision." t.boolean "is_predocket_needed", comment: "Indicates whether or not an issue has been selected to go to the pre-docket queue opposed to normal docketing." t.boolean "is_unidentified", comment: "Indicates whether a Request Issue is unidentified, meaning it wasn't found in the list of contestable issues, and is not a new nonrating issue. Contentions for unidentified issues are created on a rating End Product if processed in VBMS but without the issue description, and someone is required to edit it in Caseflow before proceeding with the decision." + t.boolean "mst_status", default: false, comment: "Indicates if issue is related to Military Sexual Trauma (MST)" + t.text "mst_status_update_reason_notes", comment: "The reason for why Request Issue is Military Sexual Trauma (MST)" t.string "nonrating_issue_category", comment: "The category selected for nonrating request issues. These vary by business line." t.string "nonrating_issue_description", comment: "The user entered description if the issue is a nonrating issue" t.text "notes", comment: "Notes added by the Claims Assistant when adding request issues. This may be used to capture handwritten notes on the form, or other comments the CA wants to capture." + t.boolean "pact_status", default: false, comment: "Indicates if issue is related to Promise to Address Comprehensive Toxics (PACT) Act" + t.text "pact_status_update_reason_notes", comment: "The reason for why Request Issue is Promise to Address Comprehensive Toxics (PACT) Act" t.string "ramp_claim_id", comment: "If a rating issue was created as a result of an issue intaken for a RAMP Review, it will be connected to the former RAMP issue by its End Product's claim ID." t.datetime "rating_issue_associated_at", comment: "Timestamp when a contention and its contested rating issue are associated in VBMS." t.string "split_issue_status", comment: "If a request issue is part of a split, on_hold status applies to the original request issues while active are request issues on splitted appeals" @@ -1485,6 +1492,8 @@ t.datetime "updated_at", comment: "Automatic timestamp whenever the record changes." t.string "vacols_id", comment: "The vacols_id of the legacy appeal that had an issue found to match the request issue." t.integer "vacols_sequence_id", comment: "The vacols_sequence_id, for the specific issue on the legacy appeal which the Claims Assistant determined to match the request issue on the Decision Review. A combination of the vacols_id (for the legacy appeal), and vacols_sequence_id (for which issue on the legacy appeal), is required to identify the issue being opted-in." + t.boolean "vbms_mst_status", default: false, comment: "Indicates if issue is related to Military Sexual Trauma (MST) and was imported from VBMS" + t.boolean "vbms_pact_status", default: false, comment: "Indicates if issue is related to Promise to Address Comprehensive Toxics (PACT) Act and was imported from VBMS" t.boolean "verified_unidentified_issue", comment: "A verified unidentified issue allows an issue whose rating data is missing to be intaken as a regular rating issue. In order to be marked as verified, a VSR needs to confirm that they were able to find the record of the decision for the issue." t.string "veteran_participant_id", comment: "The veteran participant ID. This should be unique in upstream systems and used in the future to reconcile duplicates." t.index ["closed_at"], name: "index_request_issues_on_closed_at" @@ -1510,6 +1519,8 @@ t.integer "edited_request_issue_ids", comment: "An array of the request issue IDs that were edited during this request issues update", array: true t.string "error", comment: "The error message if the last attempt at processing the request issues update was not successful." t.datetime "last_submitted_at", comment: "Timestamp for when the processing for the request issues update was last submitted. Used to determine how long to continue retrying the processing job. Can be reset to allow for additional retries." + t.integer "mst_edited_request_issue_ids", comment: "An array of the request issue IDs that were updated to be associated with MST in request issues update", array: true + t.integer "pact_edited_request_issue_ids", comment: "An array of the request issue IDs that were updated to be associated with PACT in request issues update", array: true t.datetime "processed_at", comment: "Timestamp for when the request issue update successfully completed processing." t.bigint "review_id", null: false, comment: "The ID of the decision review edited." t.string "review_type", null: false, comment: "The type of the decision review edited." @@ -1558,6 +1569,26 @@ t.index ["sent_by_id"], name: "index_sent_hearing_email_events_on_sent_by_id" end + create_table "special_issue_changes", force: :cascade do |t| + t.bigint "appeal_id", null: false, comment: "AMA or Legacy Appeal ID that the issue is tied to" + t.string "appeal_type", null: false, comment: "Appeal Type (Appeal or LegacyAppeal)" + t.string "change_category", null: false, comment: "Type of change that occured to the issue (Established Issue, Added Issue, Edited Issue, Removed Issue)" + t.datetime "created_at", null: false, comment: "Date the special issue change was made" + t.string "created_by_css_id", null: false, comment: "CSS ID of the user that made the special issue change" + t.bigint "created_by_id", null: false, comment: "User ID of the user that made the special issue change" + t.bigint "decision_issue_id", comment: "ID of the decision issue that had a special issue change from its corresponding request issue" + t.bigint "issue_id", null: false, comment: "ID of the issue that was changed" + t.boolean "mst_from_vbms", comment: "Indication that the MST status originally came from VBMS on intake" + t.string "mst_reason_for_change", comment: "Reason for changing the MST status on an issue" + t.boolean "original_mst_status", null: false, comment: "Original MST special issue status of the issue" + t.boolean "original_pact_status", null: false, comment: "Original PACT special issue status of the issue" + t.boolean "pact_from_vbms" + t.string "pact_reason_for_change", comment: "Reason for changing the PACT status on an issue" + t.bigint "task_id", null: false, comment: "Task ID of the IssueUpdateTask or EstablishmentTask used to log this issue in the case timeline" + t.boolean "updated_mst_status", comment: "Updated MST special issue status of the issue" + t.boolean "updated_pact_status", comment: "Updated PACT special issue status of the issue" + end + create_table "special_issue_lists", comment: "Associates special issues to an AMA or legacy appeal for Caseflow Queue. Caseflow Dispatch uses special issues stored in legacy_appeals. They are intentionally disconnected.", force: :cascade do |t| t.bigint "appeal_id", comment: "The ID of the appeal associated with this record" t.string "appeal_type", comment: "The type of appeal associated with this record" @@ -1779,6 +1810,7 @@ t.string "email" t.string "full_name" t.datetime "last_login_at", comment: "The last time the user-agent (browser) provided session credentials; see User.from_session for precision" + t.string "meeting_type", default: "pexip", comment: "Video Conferencing Application Type" t.string "roles", array: true t.string "selected_regional_office" t.string "station_id", null: false @@ -1944,6 +1976,7 @@ t.string "host_pin_long", limit: 8, comment: "Change the host pin to store a longer pin with the # sign trailing" t.string "judge_email", comment: "Judge's email address" t.boolean "judge_email_sent", default: false, null: false, comment: "Whether or not a notification email was sent to the judge" + t.string "meeting_type", default: "pexip", comment: "Video Conferencing Application Type" t.string "representative_email", comment: "Veteran's representative's email address" t.boolean "representative_email_sent", default: false, null: false, comment: "Whether or not a notification email was sent to the veteran's representative" t.datetime "representative_reminder_sent_at", comment: "The datetime the last reminder email was sent to the representative." diff --git a/spec/models/organizations_user_spec.rb b/spec/models/organizations_user_spec.rb index bc148bd7a4f..f68b294517d 100644 --- a/spec/models/organizations_user_spec.rb +++ b/spec/models/organizations_user_spec.rb @@ -114,4 +114,18 @@ end end end + + describe ".update_user_conference_type" do + let(:meeting_type) { user.meeting_type } + let(:new_meeting_type) { "webex" } + + subject { OrganizationsUser.update_user_conference_type(user, new_meeting_type) } + + context "when meeting type exists" do + it "should set meeting type to equal new meeting type" do + subject + expect(meeting_type).to eq(new_meeting_type) + end + end + end end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 7b25a645c36..6c5b35355d5 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -158,7 +158,8 @@ :display_name => css_id.upcase, "name" => "Tom Brady", "status" => Constants.USER_STATUSES.active, - "status_updated_at" => nil + "status_updated_at" => nil, + "meeting_type" => "pexip" } end From e4bb5f34e1c1a1da2b51ef8d4f1e4d6f3fedfb9f Mon Sep 17 00:00:00 2001 From: breedbah Date: Wed, 23 Aug 2023 13:09:22 -0400 Subject: [PATCH 046/445] APPEALS-28105 Updated readme.md with installation resolution --- client/mocks/webex-mocks/README.md | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/client/mocks/webex-mocks/README.md b/client/mocks/webex-mocks/README.md index 6ba50ab12c7..cca7ce34640 100644 --- a/client/mocks/webex-mocks/README.md +++ b/client/mocks/webex-mocks/README.md @@ -4,19 +4,38 @@ Step 1: Open a terminal Step 2: Navigate to the caseflow/client -step 3: Run command: npm install json-server +step 3: Run command: [npm install json-server] or [yarn add json-server] -step 4: Make sure casfelow application is running +If the [npm install json-server] or [yarn add json-server] returns an error that resembles: + +error standard@17.1.0: The engine "node" is incompatible with this module. Expected version "^12.22.0 || ^14.17.0 || >=16.0.0". Got "15.1.0" + +extra steps may need to be taken. + +for brevity These instructions will follow the happy path. While in the client directory in terminal: +[nodenv install 14.21.2] +[nodenv local 14.21.2] + +If for any reason you want to go back to the original nodenv that was used prior to this change you can run, [nodenv local 12.13.0] -step 4: Run command: npm run webex-server +If it all succeeds you can attempt the [npm install json-server] or [yarn add json-server] once again. + +This time with no issue. +given that the install goes as expected you can continue following the rest of the directions. + +If there are still issues in getting this to operate as expected, See your tech lead for asssisstance. + +step 4: Make sure casfelow application is running step 5: Autogenerate test data, run this command: npm run generate-webex(This will also create the json file) +step 6: Run command: npm run webex-server + \*info: You will recieve all available routes within the terminal under 'Resources' \*info: port must be set on a different port to run due to caseflow running on port 3000 -step 5: Open a browser window in chrome and navigate to localhost:3050 [You will get the default page] +step 7: Open a browser window in chrome and navigate to localhost:3050 [You will get the default page] \*info: You can use any api endpoint software you want like Postman, but a good lightweight vs code ext. is [Thunder Client] From 75f563d762edffdf0fc99ff33b80c832bf8c3820 Mon Sep 17 00:00:00 2001 From: breedbah Date: Thu, 24 Aug 2023 15:55:23 -0400 Subject: [PATCH 047/445] APPEALS-28105 Revert back to Addressed lint errors --- app/controllers/application_controller.rb | 5 - .../organizations/users_controller.rb | 9 ++ .../virtual_hearings/conference_client.rb | 29 ++++ app/jobs/virtual_hearings/conference_job.rb | 2 +- .../virtual_hearings/create_conference_job.rb | 16 +- app/jobs/virtual_hearings/pexip_client.rb | 13 -- app/models/organizations_user.rb | 6 + .../administered_user_serializer.rb | 1 + app/views/queue/index.html.erb | 4 +- app/views/reader/appeal/index.html.erb | 1 - client/COPY.json | 1 + client/app/queue/OrganizationUsers.jsx | 55 +++++-- client/app/queue/QueueApp.jsx | 29 ++-- .../queue/SelectConferenceTypeRadioField.jsx | 48 ++++++ client/app/queue/uiReducer/uiActions.js | 7 + client/app/queue/uiReducer/uiConstants.js | 1 + client/app/queue/uiReducer/uiReducer.js | 4 + client/app/reader/DecisionReviewer.jsx | 2 - .../DocumentList/DocumentListActions.js | 7 +- .../DocumentList/DocumentListReducer.js | 6 +- client/app/reader/LastRetrievalAlert.jsx | 38 ++--- client/app/reader/LastRetrievalInfo.jsx | 13 +- client/app/reader/PdfListView.jsx | 8 +- client/mocks/webex-mocks/README.md | 27 +++- client/mocks/webex-mocks/webex-mock-server.js | 1 - .../SelectConferenceTypeRadioField.test.js | 80 ++++++++++ ...electConferenceTypeRadioField.test.js.snap | 55 +++++++ .../OrganizationUsers.test.js | 122 ++++++++++++++ config/environments/demo.rb | 3 - config/initializers/pexip.rb | 2 +- ...0230726201514_add_meeting_type_to_users.rb | 9 ++ ...30_add_meeting_type_to_virtual_hearings.rb | 9 ++ ...50_add_meeting_type_to_conference_links.rb | 9 ++ db/schema.rb | 33 ++++ lib/caseflow/error.rb | 7 +- spec/feature/dispatch/establish_claim_spec.rb | 12 +- .../substitute_appellant_task_copy_spec.rb | 149 ------------------ .../create_conference_job_spec.rb | 12 ++ spec/models/docket_spec.rb | 3 +- spec/models/idt/token_spec.rb | 8 +- spec/models/organizations_user_spec.rb | 14 ++ spec/models/user_spec.rb | 3 +- 42 files changed, 605 insertions(+), 258 deletions(-) create mode 100644 app/jobs/virtual_hearings/conference_client.rb delete mode 100644 app/jobs/virtual_hearings/pexip_client.rb create mode 100644 client/app/queue/SelectConferenceTypeRadioField.jsx create mode 100644 client/test/app/queue/SelectConferenceTypeRadioField.test.js create mode 100644 client/test/app/queue/__snapshots__/SelectConferenceTypeRadioField.test.js.snap create mode 100644 client/test/app/queue/organizationUsers/OrganizationUsers.test.js create mode 100644 db/migrate/20230726201514_add_meeting_type_to_users.rb create mode 100644 db/migrate/20230726203030_add_meeting_type_to_virtual_hearings.rb create mode 100644 db/migrate/20230726203750_add_meeting_type_to_conference_links.rb delete mode 100644 spec/feature/queue/substitute_appellant/substitute_appellant_task_copy_spec.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index bb3e4cc7797..f1e67283d53 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -380,11 +380,6 @@ def feedback_url end helper_method :feedback_url - def efolder_express_url - Rails.application.config.efolder_url.to_s - end - helper_method :efolder_express_url - def help_url { "certification" => certification_help_path, diff --git a/app/controllers/organizations/users_controller.rb b/app/controllers/organizations/users_controller.rb index 6a125576a84..4d6cd9eb2a5 100644 --- a/app/controllers/organizations/users_controller.rb +++ b/app/controllers/organizations/users_controller.rb @@ -32,6 +32,7 @@ def update adjust_admin_rights end + update_user_meeting_type render json: { users: json_administered_users([user_to_modify]) }, status: :ok end @@ -67,6 +68,14 @@ def adjust_admin_rights end end + def update_user_meeting_type + new_meeting_type = params.dig(:attributes, :meeting_type) + + if organization["url"] == HearingsManagement.singleton.url && new_meeting_type + OrganizationsUser.update_user_conference_type(user_to_modify, new_meeting_type) + end + end + def organization_url params[:organization_url] end diff --git a/app/jobs/virtual_hearings/conference_client.rb b/app/jobs/virtual_hearings/conference_client.rb new file mode 100644 index 00000000000..3b2d79e27dc --- /dev/null +++ b/app/jobs/virtual_hearings/conference_client.rb @@ -0,0 +1,29 @@ +# frozen_string_literal: true + +module VirtualHearings::ConferenceClient + def client + case RequestStore.store[:current_user].meeting_type + when "pexip" + @client ||= PexipService.new( + host: ENV["PEXIP_MANAGEMENT_NODE_HOST"], + port: ENV["PEXIP_MANAGEMENT_NODE_PORT"], + user_name: ENV["PEXIP_USERNAME"], + password: ENV["PEXIP_PASSWORD"], + client_host: ENV["PEXIP_CLIENT_HOST"] + ) + when "webex" + msg = "You hit the Webex Service!" + fail Caseflow::Error::WebexApiError, message: msg + # @client ||= WebexService.new( + # host: ENV["WEBEX_MANAGEMENT_NODE_HOST"], + # port: ENV["WEBEX_MANAGEMENT_NODE_PORT"], + # user_name: ENV["WEBEX_USERNAME"], + # password: ENV["WEBEX_PASSWORD"], + # client_host: ENV["WEBEX_CLIENT_HOST"] + # ) + else + msg = "Meeting type for the user is invalid" + fail Caseflow::Error::MeetingTypeNotFoundError, message: msg + end + end +end diff --git a/app/jobs/virtual_hearings/conference_job.rb b/app/jobs/virtual_hearings/conference_job.rb index 6bdc9ca03db..c92dbde5345 100644 --- a/app/jobs/virtual_hearings/conference_job.rb +++ b/app/jobs/virtual_hearings/conference_job.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class VirtualHearings::ConferenceJob < ApplicationJob - include VirtualHearings::PexipClient + include VirtualHearings::ConferenceClient private diff --git a/app/jobs/virtual_hearings/create_conference_job.rb b/app/jobs/virtual_hearings/create_conference_job.rb index 36d04423091..a16e0f1674e 100644 --- a/app/jobs/virtual_hearings/create_conference_job.rb +++ b/app/jobs/virtual_hearings/create_conference_job.rb @@ -138,12 +138,12 @@ def create_conference "[#{virtual_hearing.hearing_id}])..." ) - pexip_response = create_pexip_conference + create_conference_response = create_new_conference - Rails.logger.info("Pexip response: #{pexip_response.inspect}") + Rails.logger.info("Create Conference Response: #{create_conference_response.inspect}") - if pexip_response.error - error_display = pexip_error_display(pexip_response) + if create_conference_response.error + error_display = error_display(create_conference_response) Rails.logger.error("CreateConferenceJob failed: #{error_display}") @@ -151,12 +151,12 @@ def create_conference DataDogService.increment_counter(metric_name: "created_conference.failed", **create_conference_datadog_tags) - fail pexip_response.error + fail create_conference_response.error end DataDogService.increment_counter(metric_name: "created_conference.successful", **create_conference_datadog_tags) - virtual_hearing.update(conference_id: pexip_response.data[:conference_id]) + virtual_hearing.update(conference_id: create_conference_response.data[:conference_id]) end end @@ -172,11 +172,11 @@ def send_emails(email_type) end end - def pexip_error_display(response) + def error_display(response) "(#{response.error.code}) #{response.error.message}" end - def create_pexip_conference + def create_new_conference client.create_conference( host_pin: virtual_hearing.host_pin, guest_pin: virtual_hearing.guest_pin, diff --git a/app/jobs/virtual_hearings/pexip_client.rb b/app/jobs/virtual_hearings/pexip_client.rb deleted file mode 100644 index 70e5023f662..00000000000 --- a/app/jobs/virtual_hearings/pexip_client.rb +++ /dev/null @@ -1,13 +0,0 @@ -# frozen_string_literal: true - -module VirtualHearings::PexipClient - def client - @client ||= PexipService.new( - host: ENV["PEXIP_MANAGEMENT_NODE_HOST"], - port: ENV["PEXIP_MANAGEMENT_NODE_PORT"], - user_name: ENV["PEXIP_USERNAME"], - password: ENV["PEXIP_PASSWORD"], - client_host: ENV["PEXIP_CLIENT_HOST"] - ) - end -end diff --git a/app/models/organizations_user.rb b/app/models/organizations_user.rb index 189d98de647..23ce4f1c4b4 100644 --- a/app/models/organizations_user.rb +++ b/app/models/organizations_user.rb @@ -28,6 +28,12 @@ def remove_admin_rights_from_user(user, organization) existing_record(user, organization)&.update!(admin: false) end + def update_user_conference_type(user, new_meeting_type) + if user.meeting_type + user.update!(meeting_type: new_meeting_type) + end + end + def remove_user_from_organization(user, organization) if user_is_judge_of_team?(user, organization) fail Caseflow::Error::ActionForbiddenError, message: COPY::JUDGE_TEAM_REMOVE_JUDGE_ERROR diff --git a/app/models/serializers/work_queue/administered_user_serializer.rb b/app/models/serializers/work_queue/administered_user_serializer.rb index 61b86097292..f4ffcf0e3a9 100644 --- a/app/models/serializers/work_queue/administered_user_serializer.rb +++ b/app/models/serializers/work_queue/administered_user_serializer.rb @@ -11,4 +11,5 @@ class WorkQueue::AdministeredUserSerializer < WorkQueue::UserSerializer params[:organization].dvc&.eql?(object) end end + attribute :meeting_type end diff --git a/app/views/queue/index.html.erb b/app/views/queue/index.html.erb index e0ba7a1038a..507e51addaa 100644 --- a/app/views/queue/index.html.erb +++ b/app/views/queue/index.html.erb @@ -24,6 +24,7 @@ canEditCavcDashboards: current_user.can_edit_cavc_dashboards?, canViewCavcDashboards: current_user.can_view_cavc_dashboards?, userIsCobAdmin: ClerkOfTheBoard.singleton.admins.include?(current_user), + meetingType: current_user.meeting_type, featureToggles: { collect_video_and_central_emails: FeatureToggle.enabled?(:collect_video_and_central_emails, user: current_user), enable_hearing_time_slots: FeatureToggle.enabled?(:enable_hearing_time_slots, user: current_user), @@ -53,7 +54,8 @@ cavc_remand_granted_substitute_appellant: FeatureToggle.enabled?(:cavc_remand_granted_substitute_appellant, user: current_user), cavc_dashboard_workflow: FeatureToggle.enabled?(:cavc_dashboard_workflow, user: current_user), cc_appeal_workflow: FeatureToggle.enabled?(:cc_appeal_workflow, user: current_user), - cc_vacatur_visibility: FeatureToggle.enabled?(:cc_vacatur_visibility, user: current_user) + cc_vacatur_visibility: FeatureToggle.enabled?(:cc_vacatur_visibility, user: current_user), + conference_selection_visibility: FeatureToggle.enabled?(:conference_selection_visibility,user: current_user) } }) %> <% end %> diff --git a/app/views/reader/appeal/index.html.erb b/app/views/reader/appeal/index.html.erb index f57c2c57ca4..7c65fbd45f0 100644 --- a/app/views/reader/appeal/index.html.erb +++ b/app/views/reader/appeal/index.html.erb @@ -7,7 +7,6 @@ applicationUrls: application_urls, page: "DecisionReviewer", feedbackUrl: feedback_url, - efolderExpressUrl: efolder_express_url, featureToggles: { interfaceVersion2: FeatureToggle.enabled?(:interface_version_2, user: current_user), windowSlider: FeatureToggle.enabled?(:window_slider, user: current_user), diff --git a/client/COPY.json b/client/COPY.json index 9bd85705be1..f02e14b0e86 100644 --- a/client/COPY.json +++ b/client/COPY.json @@ -772,6 +772,7 @@ "USER_MANAGEMENT_GIVE_USER_ADMIN_RIGHTS_BUTTON_TEXT": "Add admin rights", "USER_MANAGEMENT_REMOVE_USER_ADMIN_RIGHTS_BUTTON_TEXT": "Remove admin rights", "USER_MANAGEMENT_REMOVE_USER_FROM_ORG_BUTTON_TEXT": "Remove from team", + "USER_MANAGEMENT_SELECT_HEARINGS_CONFERENCE_TYPE": "Schedule hearings using:", "MEMBERSHIP_REQUEST_ACTION_SUCCESS_TITLE": "You successfully %s %s's request", "MEMBERSHIP_REQUEST_ACTION_SUCCESS_MESSAGE": "The user was %s regular member access to %s.", "VHA_MEMBERSHIP_REQUEST_AUTOMATIC_VHA_ACCESS_NOTE": "Note: If you are requesting specialized access and are not a member of the general VHA group, you will automatically be given access to the general VHA group if your request is approved.", diff --git a/client/app/queue/OrganizationUsers.jsx b/client/app/queue/OrganizationUsers.jsx index 3497cf30792..12b38c018c0 100644 --- a/client/app/queue/OrganizationUsers.jsx +++ b/client/app/queue/OrganizationUsers.jsx @@ -16,6 +16,7 @@ import { LOGO_COLORS } from '../constants/AppConstants'; import COPY from '../../COPY'; import LoadingDataDisplay from '../components/LoadingDataDisplay'; import MembershipRequestTable from './MembershipRequestTable'; +import SelectConferenceTypeRadioField from './SelectConferenceTypeRadioField'; const userStyle = css({ margin: '.5rem 0 .5rem', @@ -38,11 +39,17 @@ const buttonStyle = css({ const buttonContainerStyle = css({ borderBottom: '1rem solid gray', borderWidth: '1px', - padding: '.5rem 0 2rem', + padding: '.5rem 7rem 2rem 0', + display: 'flex', + justifyContent: 'space-between', + flexWrap: 'wrap' }); const listStyle = css({ listStyle: 'none' }); +const radioContainerStyle = css({ + padding: '-5rem 5rem 2rem 2rem', +}); export default class OrganizationUsers extends React.PureComponent { constructor(props) { @@ -248,18 +255,34 @@ export default class OrganizationUsers extends React.PureComponent { const style = i === 0 ? topUserStyle : userStyle; return -
  • {this.formatName(user)} - { judgeTeam && admin && ( {COPY.USER_MANAGEMENT_JUDGE_LABEL} ) } - { dvcTeam && dvc && ( {COPY.USER_MANAGEMENT_DVC_LABEL} ) } - { judgeTeam && !admin && ( {COPY.USER_MANAGEMENT_ATTORNEY_LABEL} ) } - { (judgeTeam || dvcTeam) && admin && ( {COPY.USER_MANAGEMENT_ADMIN_LABEL} ) } -
    • - { (judgeTeam || dvcTeam) && admin ? -
    : -
    - { (judgeTeam || dvcTeam) ? '' : this.adminButton(user, admin) } - { this.removeUserButton(user) } -
    } +
    +
      +
    • {this.formatName(user)} + { judgeTeam && admin && ( {COPY.USER_MANAGEMENT_JUDGE_LABEL} ) } + { dvcTeam && dvc && ( {COPY.USER_MANAGEMENT_DVC_LABEL} ) } + { judgeTeam && !admin && ( {COPY.USER_MANAGEMENT_ATTORNEY_LABEL} ) } + { (judgeTeam || dvcTeam) && admin && ( {COPY.USER_MANAGEMENT_ADMIN_LABEL} ) } +
      • + { (judgeTeam || dvcTeam) && admin ? +
      : +
      +
      + { (judgeTeam || dvcTeam) ? '' : this.adminButton(user, admin) } + { this.removeUserButton(user) } +
      + { this.state.organizationName === 'Hearings Management' && +
      + +
      + } +
      } +
    +
    ; }); @@ -285,10 +308,10 @@ export default class OrganizationUsers extends React.PureComponent {

    {COPY.USER_MANAGEMENT_EDIT_USER_IN_ORG_LABEL}

      - { (judgeTeam || dvcTeam) ? '' :
    • {COPY.USER_MANAGEMENT_ADMIN_RIGHTS_HEADING}{COPY.USER_MANAGEMENT_ADMIN_RIGHTS_DESCRIPTION}
      • } -
    • {COPY.USER_MANAGEMENT_REMOVE_USER_HEADING}{ judgeTeam ? + { (judgeTeam || dvcTeam) ? '' :
      • {COPY.USER_MANAGEMENT_ADMIN_RIGHTS_HEADING}{COPY.USER_MANAGEMENT_ADMIN_RIGHTS_DESCRIPTION}
      } +
      • {COPY.USER_MANAGEMENT_REMOVE_USER_HEADING}{ judgeTeam ? COPY.USER_MANAGEMENT_JUDGE_TEAM_REMOVE_USER_DESCRIPTION : - COPY.USER_MANAGEMENT_REMOVE_USER_DESCRIPTION }
        • + COPY.USER_MANAGEMENT_REMOVE_USER_DESCRIPTION }
      {listOfUsers}
    diff --git a/client/app/queue/QueueApp.jsx b/client/app/queue/QueueApp.jsx index f1b6d83a52c..3875a82e704 100644 --- a/client/app/queue/QueueApp.jsx +++ b/client/app/queue/QueueApp.jsx @@ -17,6 +17,7 @@ import { setCanEditCavcDashboards, setCanViewCavcDashboards, setFeatureToggles, + setMeetingType, setUserId, setUserRole, setUserCssId, @@ -111,6 +112,7 @@ class QueueApp extends React.PureComponent { this.props.setCanEditAod(this.props.canEditAod); this.props.setCanEditNodDate(this.props.userCanViewEditNodDate); this.props.setUserIsCobAdmin(this.props.userIsCobAdmin); + this.props.setMeetingType(this.props.meetingType); this.props.setCanEditCavcRemands(this.props.canEditCavcRemands); this.props.setCanEditCavcDashboards(this.props.canEditCavcDashboards); this.props.setCanViewCavcDashboards(this.props.canViewCavcDashboards); @@ -582,7 +584,9 @@ class QueueApp extends React.PureComponent { }; routedOrganizationUsers = (props) => ( - + ); routedTeamManagement = (props) => ; @@ -755,15 +759,15 @@ class QueueApp extends React.PureComponent { // eslint-disable-next-line default-case switch (this.props.reviewActionType) { - case DECISION_TYPES.OMO_REQUEST: - reviewActionType = 'OMO'; - break; - case DECISION_TYPES.DRAFT_DECISION: - reviewActionType = 'Draft Decision'; - break; - case DECISION_TYPES.DISPATCH: - reviewActionType = 'to Dispatch'; - break; + case DECISION_TYPES.OMO_REQUEST: + reviewActionType = 'OMO'; + break; + case DECISION_TYPES.DRAFT_DECISION: + reviewActionType = 'Draft Decision'; + break; + case DECISION_TYPES.DISPATCH: + reviewActionType = 'to Dispatch'; + break; } return `Draft Decision | Submit ${reviewActionType}`; @@ -1215,7 +1219,7 @@ class QueueApp extends React.PureComponent { /> ({ @@ -1430,6 +1436,7 @@ const mapDispatchToProps = (dispatch) => setCanEditAod, setCanEditNodDate, setUserIsCobAdmin, + setMeetingType, setCanEditCavcRemands, setCanEditCavcDashboards, setCanViewCavcDashboards, diff --git a/client/app/queue/SelectConferenceTypeRadioField.jsx b/client/app/queue/SelectConferenceTypeRadioField.jsx new file mode 100644 index 00000000000..805c88f26c1 --- /dev/null +++ b/client/app/queue/SelectConferenceTypeRadioField.jsx @@ -0,0 +1,48 @@ +import React, { useState } from 'react'; +import PropTypes from 'prop-types'; +import ApiUtil from '../util/ApiUtil'; + +import RadioField from '../components/RadioField'; +import COPY from '../../COPY'; + +const radioOptions = [ + { displayText: 'Pexip', + value: 'pexip' }, + { displayText: 'Webex', + value: 'webex' } +]; + +const SelectConferenceTypeRadioField = ({ name, meetingType, organization, user }) => { + const [value, setValue] = useState(meetingType); + + const modifyConferenceType = (newMeetingType) => { + const payload = { data: { ...user, attributes: { ...user.attributes, meeting_type: newMeetingType } } }; + + ApiUtil.patch(`/organizations/${organization}/users/${user.id}`, payload); + }; + + return ( + <> + setValue(newValue) || modifyConferenceType(newValue))} + vertical + /> + ); +}; + +SelectConferenceTypeRadioField.propTypes = { + name: PropTypes.string, + onClick: PropTypes.func, + meetingType: PropTypes.string, + organization: PropTypes.string, + user: PropTypes.shape({ + id: PropTypes.string, + attributes: PropTypes.object + }) +}; + +export default SelectConferenceTypeRadioField; diff --git a/client/app/queue/uiReducer/uiActions.js b/client/app/queue/uiReducer/uiActions.js index c428b105da2..1cabce79991 100644 --- a/client/app/queue/uiReducer/uiActions.js +++ b/client/app/queue/uiReducer/uiActions.js @@ -48,6 +48,13 @@ export const setUserIsCobAdmin = (userIsCobAdmin) => ({ } }); +export const setMeetingType = (meetingType) => ({ + type: ACTIONS.SET_MEETING_TYPE, + payload: { + meetingType + } +}); + export const setCanViewOvertimeStatus = (canViewOvertimeStatus) => ({ type: ACTIONS.SET_CAN_VIEW_OVERTIME_STATUS, payload: { diff --git a/client/app/queue/uiReducer/uiConstants.js b/client/app/queue/uiReducer/uiConstants.js index 212902a93d2..7b6c9d8743b 100644 --- a/client/app/queue/uiReducer/uiConstants.js +++ b/client/app/queue/uiReducer/uiConstants.js @@ -8,6 +8,7 @@ export const ACTIONS = { SET_FEEDBACK_URL: 'SET_FEEDBACK_URL', SET_TARGET_USER: 'SET_TARGET_USER', + SET_MEETING_TYPE: 'SET_MEETING_TYPE', HIGHLIGHT_INVALID_FORM_ITEMS: 'HIGHLIGHT_INVALID_FORM_ITEMS', RESET_ERROR_MESSAGES: 'RESET_ERROR_MESSAGES', diff --git a/client/app/queue/uiReducer/uiReducer.js b/client/app/queue/uiReducer/uiReducer.js index 2fbbf3871b4..711ff4e750d 100644 --- a/client/app/queue/uiReducer/uiReducer.js +++ b/client/app/queue/uiReducer/uiReducer.js @@ -99,6 +99,10 @@ const workQueueUiReducer = (state = initialState, action = {}) => { return update(state, { userIsCobAdmin: { $set: action.payload.userIsCobAdmin } }); + case ACTIONS.SET_MEETING_TYPE: + return update(state, { + meetingType: { $set: action.payload.meetingType } + }); case ACTIONS.SET_CAN_EDIT_CAVC_REMANDS: return update(state, { canEditCavcRemands: { $set: action.payload.canEditCavcRemands } diff --git a/client/app/reader/DecisionReviewer.jsx b/client/app/reader/DecisionReviewer.jsx index dcbda91528a..2d676eb5e62 100644 --- a/client/app/reader/DecisionReviewer.jsx +++ b/client/app/reader/DecisionReviewer.jsx @@ -92,7 +92,6 @@ export class DecisionReviewer extends React.PureComponent { annotations={this.props.annotations} vacolsId={vacolsId}> ({ } }); -export const onReceiveManifests = (manifestVbmsFetchedAt) => ({ +export const onReceiveManifests = (manifestVbmsFetchedAt, manifestVvaFetchedAt) => ({ type: Constants.RECEIVE_MANIFESTS, - payload: { - manifestVbmsFetchedAt - } + payload: { manifestVbmsFetchedAt, + manifestVvaFetchedAt } }); diff --git a/client/app/reader/DocumentList/DocumentListReducer.js b/client/app/reader/DocumentList/DocumentListReducer.js index 1107e7cea8b..dd96cc2539e 100644 --- a/client/app/reader/DocumentList/DocumentListReducer.js +++ b/client/app/reader/DocumentList/DocumentListReducer.js @@ -54,7 +54,8 @@ const initialState = { category: false } }, - manifestVbmsFetchedAt: null + manifestVbmsFetchedAt: null, + manifestVvaFetchedAt: null }; const documentListReducer = (state = initialState, action = {}) => { @@ -180,6 +181,9 @@ const documentListReducer = (state = initialState, action = {}) => { return update(state, { manifestVbmsFetchedAt: { $set: action.payload.manifestVbmsFetchedAt + }, + manifestVvaFetchedAt: { + $set: action.payload.manifestVvaFetchedAt } }); case Constants.UPDATE_FILTERED_RESULTS: diff --git a/client/app/reader/LastRetrievalAlert.jsx b/client/app/reader/LastRetrievalAlert.jsx index e5a3d341f27..880296536b5 100644 --- a/client/app/reader/LastRetrievalAlert.jsx +++ b/client/app/reader/LastRetrievalAlert.jsx @@ -1,7 +1,6 @@ import _ from 'lodash'; import moment from 'moment'; import React from 'react'; -import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import Alert from '../components/Alert'; import { css } from 'glamor'; @@ -16,33 +15,34 @@ class LastRetrievalAlert extends React.PureComponent { render() { - // Check that document manifests have been recieved from VBMS -- red banner - if (!this.props.manifestVbmsFetchedAt) { + // Check that document manifests have been recieved from VVA and VBMS + if (!this.props.manifestVbmsFetchedAt || !this.props.manifestVvaFetchedAt) { return
    - Some of {this.props.appeal.veteran_full_name}'s documents are unavailable at the moment due to - a loading error from their eFolder. As a result, you may be viewing a partial list of eFolder documents. + Some of {this.props.appeal.veteran_full_name}'s documents are not available at the moment due to + a loading error from VBMS or VVA. As a result, you may be viewing a partial list of claims folder documents.
    - Please visit eFolder Express to fetch the - latest list of documents or submit a support ticket to sync their eFolder with Reader. +
    + Please refresh your browser at a later point to view a complete list of documents in the claims + folder.
    ; } const staleCacheTime = moment().subtract(CACHE_TIMEOUT_HOURS, 'h'), - vbmsManifestTimestamp = moment(this.props.manifestVbmsFetchedAt, 'MM/DD/YY HH:mma Z'); + vbmsManifestTimestamp = moment(this.props.manifestVbmsFetchedAt, 'MM/DD/YY HH:mma Z'), + vvaManifestTimestamp = moment(this.props.manifestVvaFetchedAt, 'MM/DD/YY HH:mma Z'); - // Check that manifest results are fresh -- yellow banner - if (vbmsManifestTimestamp.isBefore(staleCacheTime)) { + // Check that manifest results are fresh + if (vbmsManifestTimestamp.isBefore(staleCacheTime) || vvaManifestTimestamp.isBefore(staleCacheTime)) { const now = moment(), - vbmsDiff = now.diff(vbmsManifestTimestamp, 'hours'); + vbmsDiff = now.diff(vbmsManifestTimestamp, 'hours'), + vvaDiff = now.diff(vvaManifestTimestamp, 'hours'); return
    - Reader last synced the list of documents with {this.props.appeal.veteran_full_name}'s eFolder - {vbmsDiff} hours ago. If you'd like to view documents in Reader uploaded to their eFolder since - the last sync, please visit eFolder Express - to fetch the latest list of documents or submit a support ticket to sync their eFolder with Reader. + We last synced with VBMS and VVA {Math.max(vbmsDiff, vvaDiff)} hours ago. If you'd like to check for new + documents, refresh the page.
    ; } @@ -51,12 +51,6 @@ class LastRetrievalAlert extends React.PureComponent { } } -LastRetrievalAlert.propTypes = { - manifestVbmsFetchedAt: PropTypes.string, - efolderExpressUrl: PropTypes.string, - appeal: PropTypes.object, -}; - export default connect( - (state) => _.pick(state.documentList, 'manifestVbmsFetchedAt') + (state) => _.pick(state.documentList, ['manifestVvaFetchedAt', 'manifestVbmsFetchedAt']) )(LastRetrievalAlert); diff --git a/client/app/reader/LastRetrievalInfo.jsx b/client/app/reader/LastRetrievalInfo.jsx index 845929f2076..01e43efda38 100644 --- a/client/app/reader/LastRetrievalInfo.jsx +++ b/client/app/reader/LastRetrievalInfo.jsx @@ -7,15 +7,22 @@ class UnconnectedLastRetrievalInfo extends React.PureComponent { return [ this.props.manifestVbmsFetchedAt ?
    - Last synced with {this.props.appeal.veteran_full_name}'s eFolder: {this.props.manifestVbmsFetchedAt.slice(0, -5)} + Last VBMS retrieval: {this.props.manifestVbmsFetchedAt.slice(0, -5)}
    :
    - Unable to display eFolder documents at this time + Unable to display VBMS documents at this time +
    , + this.props.manifestVvaFetchedAt ? +
    + Last VVA retrieval: {this.props.manifestVvaFetchedAt.slice(0, -5)} +
    : +
    + Unable to display VVA documents at this time
    ]; } } export default connect( - (state) => _.pick(state.documentList, 'manifestVbmsFetchedAt') + (state) => _.pick(state.documentList, ['manifestVvaFetchedAt', 'manifestVbmsFetchedAt']) )(UnconnectedLastRetrievalInfo); diff --git a/client/app/reader/PdfListView.jsx b/client/app/reader/PdfListView.jsx index 4a2c907bd45..8ac596eba42 100644 --- a/client/app/reader/PdfListView.jsx +++ b/client/app/reader/PdfListView.jsx @@ -68,7 +68,7 @@ export class PdfListView extends React.Component {
    - + - +
    ; } } @@ -108,8 +108,6 @@ export default connect( PdfListView.propTypes = { documents: PropTypes.arrayOf(PropTypes.object).isRequired, - efolderExpressUrl: PropTypes.string, onJumpToComment: PropTypes.func, - sortBy: PropTypes.string, - appeal: PropTypes.object, + sortBy: PropTypes.string }; diff --git a/client/mocks/webex-mocks/README.md b/client/mocks/webex-mocks/README.md index 6ba50ab12c7..cca7ce34640 100644 --- a/client/mocks/webex-mocks/README.md +++ b/client/mocks/webex-mocks/README.md @@ -4,19 +4,38 @@ Step 1: Open a terminal Step 2: Navigate to the caseflow/client -step 3: Run command: npm install json-server +step 3: Run command: [npm install json-server] or [yarn add json-server] -step 4: Make sure casfelow application is running +If the [npm install json-server] or [yarn add json-server] returns an error that resembles: + +error standard@17.1.0: The engine "node" is incompatible with this module. Expected version "^12.22.0 || ^14.17.0 || >=16.0.0". Got "15.1.0" + +extra steps may need to be taken. + +for brevity These instructions will follow the happy path. While in the client directory in terminal: +[nodenv install 14.21.2] +[nodenv local 14.21.2] + +If for any reason you want to go back to the original nodenv that was used prior to this change you can run, [nodenv local 12.13.0] -step 4: Run command: npm run webex-server +If it all succeeds you can attempt the [npm install json-server] or [yarn add json-server] once again. + +This time with no issue. +given that the install goes as expected you can continue following the rest of the directions. + +If there are still issues in getting this to operate as expected, See your tech lead for asssisstance. + +step 4: Make sure casfelow application is running step 5: Autogenerate test data, run this command: npm run generate-webex(This will also create the json file) +step 6: Run command: npm run webex-server + \*info: You will recieve all available routes within the terminal under 'Resources' \*info: port must be set on a different port to run due to caseflow running on port 3000 -step 5: Open a browser window in chrome and navigate to localhost:3050 [You will get the default page] +step 7: Open a browser window in chrome and navigate to localhost:3050 [You will get the default page] \*info: You can use any api endpoint software you want like Postman, but a good lightweight vs code ext. is [Thunder Client] diff --git a/client/mocks/webex-mocks/webex-mock-server.js b/client/mocks/webex-mocks/webex-mock-server.js index 1e235028a3d..b7d6c50dd74 100644 --- a/client/mocks/webex-mocks/webex-mock-server.js +++ b/client/mocks/webex-mocks/webex-mock-server.js @@ -8,7 +8,6 @@ const generateMeetingData = require('./meetingData.js'); const middlewares = jsonServer.defaults(); const routesRewrite = require('./routes.json'); -// const faker = require('faker'); server.use(middlewares); server.use(jsonServer.bodyParser); diff --git a/client/test/app/queue/SelectConferenceTypeRadioField.test.js b/client/test/app/queue/SelectConferenceTypeRadioField.test.js new file mode 100644 index 00000000000..dd36e4f4343 --- /dev/null +++ b/client/test/app/queue/SelectConferenceTypeRadioField.test.js @@ -0,0 +1,80 @@ +import React from 'react'; +import { render, screen } from '@testing-library/react'; +import userEvent from '@testing-library/user-event'; +import ApiUtil from 'app/util/ApiUtil'; + +import SelectConferenceTypeRadioField from 'app/queue/SelectConferenceTypeRadioField'; + +const createSpy = () => jest.spyOn(ApiUtil, 'patch'). + mockImplementation(() => jest.fn(() => Promise.resolve( + { + body: { } + } + ))); + +const defaults = { + name: 'field1', + value: '1', + options: [ + { displayText: 'Pexip', + value: 'pexip' }, + { displayText: 'Webex', + value: 'webex' }, + ], +}; + +describe('SelectConferenceTypeRadioField', () => { + beforeEach(() => { + jest.clearAllMocks(); + }); + + const setupComponent = (props = { + user: { + attributes: { + id: 1 + } + }, + meetingType: 'pexip', + organization: 'my org' + }) => { + const utils = render( + + ); + const inputs = utils.getAllByRole('radio'); + + return { + inputs, + ...utils, + }; + }; + + it('renders correctly', async () => { + const { container } = setupComponent(); + + expect(container).toMatchSnapshot(); + }); + + it('changes values by radio button selected', () => { + let requestPatchSpy = createSpy(); + + setupComponent(); + + const webexRadioButton = screen.getByRole('radio', { name: 'Webex' }); + const pexipRadioButton = screen.getByRole('radio', { name: 'Pexip' }); + + expect(webexRadioButton).not.toHaveAttribute('checked', ''); + expect(pexipRadioButton).toHaveAttribute('checked', ''); + + userEvent.click(webexRadioButton); + + expect(requestPatchSpy.mock.calls[0][1].data.attributes.meeting_type).toBe('webex'); + + userEvent.click(pexipRadioButton); + + expect(requestPatchSpy.mock.calls[1][1].data.attributes.meeting_type).toBe('pexip'); + }); +}); diff --git a/client/test/app/queue/__snapshots__/SelectConferenceTypeRadioField.test.js.snap b/client/test/app/queue/__snapshots__/SelectConferenceTypeRadioField.test.js.snap new file mode 100644 index 00000000000..40d135d3387 --- /dev/null +++ b/client/test/app/queue/__snapshots__/SelectConferenceTypeRadioField.test.js.snap @@ -0,0 +1,55 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`SelectConferenceTypeRadioField renders correctly 1`] = ` +
    +
    + + + Schedule hearings using: + + + +
    +
    + + +
    +
    + + +
    +
    +
    +
    +`; diff --git a/client/test/app/queue/organizationUsers/OrganizationUsers.test.js b/client/test/app/queue/organizationUsers/OrganizationUsers.test.js new file mode 100644 index 00000000000..9eee34d1726 --- /dev/null +++ b/client/test/app/queue/organizationUsers/OrganizationUsers.test.js @@ -0,0 +1,122 @@ +import React from 'react'; +import { render } from '@testing-library/react'; +import '@testing-library/jest-dom/extend-expect'; +import OrganizationUsers from 'app/queue/OrganizationUsers'; +import ApiUtil from 'app/util/ApiUtil'; + +jest.mock('app/util/ApiUtil'); + +describe('Conference Selection Visibility Feature Toggle', () => { + beforeEach(() => { + jest.clearAllMocks(); + }); + ApiUtil.get.mockResolvedValue({ + body: { + organization_name: 'Hearing Admin', + judge_team: false, + dvc_team: false, + organization_users: { + data: [ + { + id: '126', + type: 'administered_user', + attributes: { + css_id: 'BVASORANGE', + full_name: 'Felicia BuildAndEditHearingSchedule Orange', + email: null, + admin: false, + dvc: null, + }, + }, + { + id: '2000001601', + type: 'administered_user', + attributes: { + css_id: 'AMBRISVACO', + full_name: 'Gail Maggio V', + email: 'juli@stroman-kertzmann.net', + admin: true, + dvc: null, + }, + }, + ], + }, + membership_requests: [], + isVhaOrg: false, + }, + }); + it('Finds component by Text when conferenceSelectionVisibility is false', async () => { + const conferenceSelectionVisibilityValue = false; + + const { findAllByText } = render( + + ); + const nestedText = await findAllByText('Webex'); + + expect(nestedText[0]).toBeInTheDocument(); + }); + + it('Component does not render when conferenceSelectionVisibility is true', async () => { + const conferenceSelectionVisibilityValue = true; + + const { queryAllByText } = render( + + ); + const nestedText = await queryAllByText('Webex'); + + expect(nestedText).toHaveLength(0); + }); + + it('Component does not render when orginization_name is not Hearing Admin', async () => { + const conferenceSelectionVisibilityValue = false; + + ApiUtil.get.mockResolvedValue({ + body: { + organization_name: 'Hearing Management', + judge_team: false, + dvc_team: false, + organization_users: { + data: [ + { + id: '126', + type: 'administered_user', + attributes: { + css_id: 'BVASORANGE', + full_name: 'Felicia BuildAndEditHearingSchedule Orange', + email: null, + admin: false, + dvc: null, + }, + }, + { + id: '2000001601', + type: 'administered_user', + attributes: { + css_id: 'AMBRISVACO', + full_name: 'Gail Maggio V', + email: 'juli@stroman-kertzmann.net', + admin: true, + dvc: null, + }, + }, + ], + }, + membership_requests: [], + isVhaOrg: false, + }, + }); + + const { queryAllByText } = render( + + ); + const nestedTextWebex = await queryAllByText('Webex'); + + expect(nestedTextWebex).toHaveLength(0); + }); +}); diff --git a/config/environments/demo.rb b/config/environments/demo.rb index e937ce9b7ff..f6d7574b65f 100644 --- a/config/environments/demo.rb +++ b/config/environments/demo.rb @@ -82,9 +82,6 @@ ENV["DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL"] ||= "true" - # eFolder Express URL for demo environment used as a mock link - ENV["EFOLDER_EXPRESS_URL"] ||= "http://localhost:4000" - # Setup S3 config.s3_enabled = ENV["AWS_BUCKET_NAME"].present? config.s3_bucket_name = ENV["AWS_BUCKET_NAME"] diff --git a/config/initializers/pexip.rb b/config/initializers/pexip.rb index 0b84da94fb0..0cc6eb3bd58 100644 --- a/config/initializers/pexip.rb +++ b/config/initializers/pexip.rb @@ -1 +1 @@ -PexipService = (!ApplicationController.dependencies_faked? ? ExternalApi::PexipService : Fakes::PexipService) +PexipService = (ApplicationController.dependencies_faked? ? Fakes::PexipService : ExternalApi::PexipService) diff --git a/db/migrate/20230726201514_add_meeting_type_to_users.rb b/db/migrate/20230726201514_add_meeting_type_to_users.rb new file mode 100644 index 00000000000..b07b732c95f --- /dev/null +++ b/db/migrate/20230726201514_add_meeting_type_to_users.rb @@ -0,0 +1,9 @@ +class AddMeetingTypeToUsers < Caseflow::Migration + def up + add_column :users, :meeting_type, :varChar, default: "pexip", comment: "Video Conferencing Application Type" + end + + def down + remove_column :users, :meeting_type + end +end diff --git a/db/migrate/20230726203030_add_meeting_type_to_virtual_hearings.rb b/db/migrate/20230726203030_add_meeting_type_to_virtual_hearings.rb new file mode 100644 index 00000000000..6b8f6b1e1c6 --- /dev/null +++ b/db/migrate/20230726203030_add_meeting_type_to_virtual_hearings.rb @@ -0,0 +1,9 @@ +class AddMeetingTypeToVirtualHearings < Caseflow::Migration + def up + add_column :virtual_hearings, :meeting_type, :varChar, default: "pexip", comment: "Video Conferencing Application Type" + end + + def down + remove_column :virtual_hearings, :meeting_type + end +end diff --git a/db/migrate/20230726203750_add_meeting_type_to_conference_links.rb b/db/migrate/20230726203750_add_meeting_type_to_conference_links.rb new file mode 100644 index 00000000000..dc0713e3f35 --- /dev/null +++ b/db/migrate/20230726203750_add_meeting_type_to_conference_links.rb @@ -0,0 +1,9 @@ +class AddMeetingTypeToConferenceLinks < Caseflow::Migration + def up + add_column :conference_links, :meeting_type, :varChar, default: "pexip", comment: "Video Conferencing Application Type" + end + + def down + remove_column :conference_links, :meeting_type + end +end diff --git a/db/schema.rb b/db/schema.rb index 2f02f9c82e3..06240150d9a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -556,6 +556,7 @@ t.string "host_link", comment: "Conference link generated from external conference service" t.integer "host_pin", comment: "Pin for the host of the conference to get into the conference" t.string "host_pin_long", limit: 8, comment: "Generated host pin stored as a string" + t.string "meeting_type", default: "pexip", comment: "Video Conferencing Application Type" t.datetime "updated_at", comment: "Date and Time record was last updated" t.bigint "updated_by_id", comment: "user id of the user to last update the record. FK on the User table" t.index ["created_by_id"], name: "index_created_by_id" @@ -597,6 +598,8 @@ t.string "diagnostic_code", comment: "If a decision resulted in a rating, this is the rating issue's diagnostic code." t.string "disposition", comment: "The disposition for a decision issue. Dispositions made in Caseflow and dispositions made in VBMS can have different values." t.date "end_product_last_action_date", comment: "After an end product gets synced with a status of CLR (cleared), the end product's last_action_date is saved on any decision issues that are created as a result. This is used as a proxy for decision date for non-rating issues that are processed in VBMS because they don't have a rating profile date, and the exact decision date is not available." + t.boolean "mst_status", default: false, comment: "Indicates if decision issue is related to Military Sexual Trauma (MST)" + t.boolean "pact_status", default: false, comment: "Indicates if decision issue is related to Promise to Address Comprehensive Toxics (PACT) Act" t.string "participant_id", null: false, comment: "The Veteran's participant id." t.string "percent_number", comment: "percent_number from RatingIssue (prcntNo from Rating Profile)" t.string "rating_issue_reference_id", comment: "Identifies the specific issue on the rating that resulted from the decision issue (a rating issue can be connected to multiple contentions)." @@ -1472,9 +1475,13 @@ t.string "ineligible_reason", comment: "The reason for a Request Issue being ineligible. If a Request Issue has an ineligible_reason, it is still captured, but it will not get a contention in VBMS or a decision." t.boolean "is_predocket_needed", comment: "Indicates whether or not an issue has been selected to go to the pre-docket queue opposed to normal docketing." t.boolean "is_unidentified", comment: "Indicates whether a Request Issue is unidentified, meaning it wasn't found in the list of contestable issues, and is not a new nonrating issue. Contentions for unidentified issues are created on a rating End Product if processed in VBMS but without the issue description, and someone is required to edit it in Caseflow before proceeding with the decision." + t.boolean "mst_status", default: false, comment: "Indicates if issue is related to Military Sexual Trauma (MST)" + t.text "mst_status_update_reason_notes", comment: "The reason for why Request Issue is Military Sexual Trauma (MST)" t.string "nonrating_issue_category", comment: "The category selected for nonrating request issues. These vary by business line." t.string "nonrating_issue_description", comment: "The user entered description if the issue is a nonrating issue" t.text "notes", comment: "Notes added by the Claims Assistant when adding request issues. This may be used to capture handwritten notes on the form, or other comments the CA wants to capture." + t.boolean "pact_status", default: false, comment: "Indicates if issue is related to Promise to Address Comprehensive Toxics (PACT) Act" + t.text "pact_status_update_reason_notes", comment: "The reason for why Request Issue is Promise to Address Comprehensive Toxics (PACT) Act" t.string "ramp_claim_id", comment: "If a rating issue was created as a result of an issue intaken for a RAMP Review, it will be connected to the former RAMP issue by its End Product's claim ID." t.datetime "rating_issue_associated_at", comment: "Timestamp when a contention and its contested rating issue are associated in VBMS." t.string "split_issue_status", comment: "If a request issue is part of a split, on_hold status applies to the original request issues while active are request issues on splitted appeals" @@ -1485,6 +1492,8 @@ t.datetime "updated_at", comment: "Automatic timestamp whenever the record changes." t.string "vacols_id", comment: "The vacols_id of the legacy appeal that had an issue found to match the request issue." t.integer "vacols_sequence_id", comment: "The vacols_sequence_id, for the specific issue on the legacy appeal which the Claims Assistant determined to match the request issue on the Decision Review. A combination of the vacols_id (for the legacy appeal), and vacols_sequence_id (for which issue on the legacy appeal), is required to identify the issue being opted-in." + t.boolean "vbms_mst_status", default: false, comment: "Indicates if issue is related to Military Sexual Trauma (MST) and was imported from VBMS" + t.boolean "vbms_pact_status", default: false, comment: "Indicates if issue is related to Promise to Address Comprehensive Toxics (PACT) Act and was imported from VBMS" t.boolean "verified_unidentified_issue", comment: "A verified unidentified issue allows an issue whose rating data is missing to be intaken as a regular rating issue. In order to be marked as verified, a VSR needs to confirm that they were able to find the record of the decision for the issue." t.string "veteran_participant_id", comment: "The veteran participant ID. This should be unique in upstream systems and used in the future to reconcile duplicates." t.index ["closed_at"], name: "index_request_issues_on_closed_at" @@ -1510,6 +1519,8 @@ t.integer "edited_request_issue_ids", comment: "An array of the request issue IDs that were edited during this request issues update", array: true t.string "error", comment: "The error message if the last attempt at processing the request issues update was not successful." t.datetime "last_submitted_at", comment: "Timestamp for when the processing for the request issues update was last submitted. Used to determine how long to continue retrying the processing job. Can be reset to allow for additional retries." + t.integer "mst_edited_request_issue_ids", comment: "An array of the request issue IDs that were updated to be associated with MST in request issues update", array: true + t.integer "pact_edited_request_issue_ids", comment: "An array of the request issue IDs that were updated to be associated with PACT in request issues update", array: true t.datetime "processed_at", comment: "Timestamp for when the request issue update successfully completed processing." t.bigint "review_id", null: false, comment: "The ID of the decision review edited." t.string "review_type", null: false, comment: "The type of the decision review edited." @@ -1558,6 +1569,26 @@ t.index ["sent_by_id"], name: "index_sent_hearing_email_events_on_sent_by_id" end + create_table "special_issue_changes", force: :cascade do |t| + t.bigint "appeal_id", null: false, comment: "AMA or Legacy Appeal ID that the issue is tied to" + t.string "appeal_type", null: false, comment: "Appeal Type (Appeal or LegacyAppeal)" + t.string "change_category", null: false, comment: "Type of change that occured to the issue (Established Issue, Added Issue, Edited Issue, Removed Issue)" + t.datetime "created_at", null: false, comment: "Date the special issue change was made" + t.string "created_by_css_id", null: false, comment: "CSS ID of the user that made the special issue change" + t.bigint "created_by_id", null: false, comment: "User ID of the user that made the special issue change" + t.bigint "decision_issue_id", comment: "ID of the decision issue that had a special issue change from its corresponding request issue" + t.bigint "issue_id", null: false, comment: "ID of the issue that was changed" + t.boolean "mst_from_vbms", comment: "Indication that the MST status originally came from VBMS on intake" + t.string "mst_reason_for_change", comment: "Reason for changing the MST status on an issue" + t.boolean "original_mst_status", null: false, comment: "Original MST special issue status of the issue" + t.boolean "original_pact_status", null: false, comment: "Original PACT special issue status of the issue" + t.boolean "pact_from_vbms" + t.string "pact_reason_for_change", comment: "Reason for changing the PACT status on an issue" + t.bigint "task_id", null: false, comment: "Task ID of the IssueUpdateTask or EstablishmentTask used to log this issue in the case timeline" + t.boolean "updated_mst_status", comment: "Updated MST special issue status of the issue" + t.boolean "updated_pact_status", comment: "Updated PACT special issue status of the issue" + end + create_table "special_issue_lists", comment: "Associates special issues to an AMA or legacy appeal for Caseflow Queue. Caseflow Dispatch uses special issues stored in legacy_appeals. They are intentionally disconnected.", force: :cascade do |t| t.bigint "appeal_id", comment: "The ID of the appeal associated with this record" t.string "appeal_type", comment: "The type of appeal associated with this record" @@ -1779,6 +1810,7 @@ t.string "email" t.string "full_name" t.datetime "last_login_at", comment: "The last time the user-agent (browser) provided session credentials; see User.from_session for precision" + t.string "meeting_type", default: "pexip", comment: "Video Conferencing Application Type" t.string "roles", array: true t.string "selected_regional_office" t.string "station_id", null: false @@ -1944,6 +1976,7 @@ t.string "host_pin_long", limit: 8, comment: "Change the host pin to store a longer pin with the # sign trailing" t.string "judge_email", comment: "Judge's email address" t.boolean "judge_email_sent", default: false, null: false, comment: "Whether or not a notification email was sent to the judge" + t.string "meeting_type", default: "pexip", comment: "Video Conferencing Application Type" t.string "representative_email", comment: "Veteran's representative's email address" t.boolean "representative_email_sent", default: false, null: false, comment: "Whether or not a notification email was sent to the veteran's representative" t.datetime "representative_reminder_sent_at", comment: "The datetime the last reminder email was sent to the representative." diff --git a/lib/caseflow/error.rb b/lib/caseflow/error.rb index df77673dd3b..70f85bd5d25 100644 --- a/lib/caseflow/error.rb +++ b/lib/caseflow/error.rb @@ -405,11 +405,16 @@ class MissingRequiredFieldError < VacolsRepositoryError; end class IdtApiError < StandardError; end class InvalidOneTimeKey < IdtApiError; end - class PexipApiError < SerializableError; end + class ConferenceCreationError < SerializableError; end + class MeetingTypeNotFoundError < ConferenceCreationError; end + + class PexipApiError < ConferenceCreationError; end class PexipNotFoundError < PexipApiError; end class PexipBadRequestError < PexipApiError; end class PexipMethodNotAllowedError < PexipApiError; end + class WebexApiError < ConferenceCreationError; end + class WorkModeCouldNotUpdateError < StandardError; end class VirtualHearingConversionFailed < SerializableError diff --git a/spec/feature/dispatch/establish_claim_spec.rb b/spec/feature/dispatch/establish_claim_spec.rb index 15442585c9a..02cab5c7992 100644 --- a/spec/feature/dispatch/establish_claim_spec.rb +++ b/spec/feature/dispatch/establish_claim_spec.rb @@ -141,6 +141,7 @@ end visit "/dispatch/work-assignments" + expect(page).to have_content("1.\nJanet Smith\n0 0 1 1 3") expect(page).to have_content("2.\nJune Smith\n1 0 0 1 2") expect(page).to have_content("3.\nJeffers Smith\n0 1 0 1 2") @@ -544,6 +545,7 @@ click_label("confirmNote") click_on "Finish routing claim" + expect(page).to have_current_path("/dispatch/establish-claim/#{task.id}") expect(page).to have_content("Success!") expect(page).to have_content("Reviewed Full Grant decision") expect(page).to have_content("Established EP: 070BVAGR - BVA Grant (070) for Station 351 - Muskogee") @@ -579,6 +581,7 @@ click_on "Finish routing claim" # Confirmation Page + expect(page).to have_current_path("/dispatch/establish-claim/#{task.id}") expect(page).to have_content("Success!") expect(page).to have_content("Added VBMS Note on Rice Compliance") @@ -623,7 +626,7 @@ ) end - scenario "Assigning it to complete the claims establishment", skip: "flakey hang" do + scenario "Assigning it to complete the claims establishment" do visit "/dispatch/establish-claim" click_on "Establish next claim" @@ -631,8 +634,9 @@ expect(page).to have_current_path("/dispatch/establish-claim/#{task.id}") expect(page).to have_content("Route Claim") expect(page).to have_selector(:link_or_button, "Assign to Claim") - click_on "Assign to Claim" # unknown reason sometimes hangs here + click_on "Assign to Claim" + expect(page).to have_current_path("/dispatch/establish-claim/#{task.id}") expect(page).to have_content("Success!") expect(task.reload.outgoing_reference_id).to eq(end_product.claim_id) @@ -671,6 +675,7 @@ click_on "Create End Product" # Confirmation Page + expect(page).to have_current_path("/dispatch/establish-claim/#{task.id}") expect(page).to have_content("Success!") expect(page).to have_content("Established EP: 070RMBVAGARC - ARC Remand with BVA Grant for Station 397 - ARC") expect(page).to have_content("VACOLS Updated: Changed Location to 98") @@ -768,6 +773,7 @@ safe_click "#button-Finish-routing-claim" + expect(page).to have_current_path("/dispatch/establish-claim/#{task.id}") expect(page).to have_content("Success!") expect(page).to have_content("VACOLS Updated: Changed Location to 50") expect(page).to have_content("Added VBMS Note on Rice Compliance") @@ -824,6 +830,7 @@ click_on "Finish routing claim" + expect(page).to have_current_path("/dispatch/establish-claim/#{task.id}") expect(page).to have_content("Success!") expect(task.reload.completion_status).to eq("special_issue_vacols_routed") end @@ -855,6 +862,7 @@ click_on "Create new EP" click_on "Create End Product" + expect(page).to have_current_path("/dispatch/establish-claim/#{task.id}") expect(page).to have_content("Success!") expect(Fakes::VBMSService).to have_received(:establish_claim!).with( diff --git a/spec/feature/queue/substitute_appellant/substitute_appellant_task_copy_spec.rb b/spec/feature/queue/substitute_appellant/substitute_appellant_task_copy_spec.rb deleted file mode 100644 index 30b7536c417..00000000000 --- a/spec/feature/queue/substitute_appellant/substitute_appellant_task_copy_spec.rb +++ /dev/null @@ -1,149 +0,0 @@ -# frozen_string_literal: true - -def wait_for_page_render - # This find forces a wait for the page to render. Without it, a test asserting presence or absence of content - # may pass whether the content is present or not! - find("div", id: "caseTitleDetailsSubheader") -end - -def select_task_ids_in_ui(task_ids) - visit "/queue" - visit "/queue/appeals/#{appeal.uuid}" - wait_for_page_render - - click_on "+ Add Substitute" - - fill_in("substitutionDate", with: Time.zone.parse("2021-01-01")) - find("label", text: "Bob Vance, Spouse").click - click_on "Continue" - - # Uncomment this if you wish to use demo specific selections in the browser - # binding.pry - # appeal.treee - - task_ids.each do |task_id| - find("div", class: "checkbox-wrapper-taskIds[#{task_id}]").find("label").click - end - click_on "Continue" - click_on "Confirm" - wait_for_page_render -end - -# Since the appeal is imported from JSON, the IDs here are always the below values. -# Give them friendly names for easier access -TASKS = { - distribution: 2_000_758_353, - schedule_hearing: 2_000_758_355, - assign_hearing_disposition: 2_001_178_199, - address_verify: 2_001_143_838, - transcription: 2_001_233_993, - evidence_submission_window: 2_001_233_994, - evidence_or_argument_mail: 2_001_578_851 -}.freeze - -note = "This test is only used to aid manual testing/demonstration." -RSpec.feature "CASEFLOW-1501 Substitute appellant behavior", :postgres, skip: note do - describe "Substitute Appellant appeal creation" do - before do - cob_user = create(:user, css_id: "COB_USER", station_id: "101") - ClerkOfTheBoard.singleton.add_user(cob_user) - OrganizationsUser.make_user_admin(cob_user, ClerkOfTheBoard.singleton) - User.authenticate!(user: cob_user) - end - - let!(:appeal) do - sji = SanitizedJsonImporter.from_file( - "db/seeds/sanitized_json/b5eba21a-9baf-41a3-ac1c-08470c2b79c4.json", - verbosity: 0 - ) - sji.import - sji.imported_records[Appeal.table_name].first - end - - let(:new_appeal) do - appellant_substitution = AppellantSubstitution.find_by(source_appeal_id: appeal.id) - appellant_substitution.target_appeal - end - - context "with an EvidenceSubmissionWindowTask selected" do - before do - select_task_ids_in_ui([TASKS[:evidence_submission_window]]) - end - - it "show a success message" do - expect(page).to have_content("You have successfully added a substitute appellant") - end - - it "prints the generated task tree" do - new_appeal.treee - end - end - - context "with a ScheduleHearingTask selected" do - before do - select_task_ids_in_ui([TASKS[:schedule_hearing]]) - end - - it "prints a task tree" do - new_appeal.treee - end - end - - context "with a HearingAdminActionVerifyAddressTask selected" do - before do - select_task_ids_in_ui([TASKS[:address_verify]]) - end - - it "creates a proper task tree" do - new_appeal.treee - - sht = ScheduleHearingTask.find_by(appeal_id: new_appeal.id) - expect(sht.status).to eq "on_hold" - - haavat = HearingAdminActionVerifyAddressTask.find_by(appeal_id: new_appeal.id) - expect(haavat.status).to eq "assigned" - expect(haavat.assigned_to.type).to eq "HearingsManagement" - end - end - - context "with an AssignHearingDispositionTask selected" do - before do - select_task_ids_in_ui([TASKS[:assign_hearing_disposition]]) - end - - it "prints a task tree" do - new_appeal.treee - end - end - - context "with a TranscriptionTask selected" do - before do - select_task_ids_in_ui([TASKS[:transcription]]) - end - - it "prints a task tree" do - new_appeal.treee - end - end - - context "with EvidenceSubmissionWindow and Transcription selected" do - before do - select_task_ids_in_ui([TASKS[:evidence_submission_window], TASKS[:transcription]]) - end - - it "prints a task tree" do - new_appeal.treee - end - end - - context "with Verify Address and Schedule Hearing selected" do - before do - select_task_ids_in_ui([TASKS[:address_verify], TASKS[:schedule_hearing]]) - end - - it "prints a task tree" do - new_appeal.treee - end - end - end -end diff --git a/spec/jobs/virtual_hearings/create_conference_job_spec.rb b/spec/jobs/virtual_hearings/create_conference_job_spec.rb index ea4297cedfb..db5d7384523 100644 --- a/spec/jobs/virtual_hearings/create_conference_job_spec.rb +++ b/spec/jobs/virtual_hearings/create_conference_job_spec.rb @@ -97,6 +97,18 @@ expect(virtual_hearing.guest_pin.to_s.length).to eq(11) end + it "fails when meeting type is webex" do + current_user.update!(meeting_type: "webex") + + expect { subject.perform_now }.to raise_exception(Caseflow::Error::WebexApiError) + end + + it "fails when a meeting type is neither pexip nor webex" do + current_user.update!(meeting_type: "say whaaaat") + + expect { subject.perform_now }.to raise_exception(Caseflow::Error::MeetingTypeNotFoundError) + end + include_examples "confirmation emails are sent" include_examples "sent email event objects are created" diff --git a/spec/models/docket_spec.rb b/spec/models/docket_spec.rb index 78e6734650b..fe65466a522 100644 --- a/spec/models/docket_spec.rb +++ b/spec/models/docket_spec.rb @@ -553,12 +553,11 @@ end it "sets the case ids when a redistribution occurs" do - distributed_case.id ymd = Time.zone.today.strftime("%F") result = subject expect(DistributedCase.find(distributed_case.id).case_id).to eq("#{distributed_appeal.uuid}-redistributed-#{ymd}") - expect(result[0].case_id).to eq(distributed_appeal.uuid) + expect(result.any? { |item| item.case_id == distributed_appeal.uuid }).to be_truthy end end diff --git a/spec/models/idt/token_spec.rb b/spec/models/idt/token_spec.rb index 90a17bf2c1b..6401aecfa79 100644 --- a/spec/models/idt/token_spec.rb +++ b/spec/models/idt/token_spec.rb @@ -7,6 +7,7 @@ let(:css_id) { "TEST_ID" } let(:key_token_pair) { Idt::Token.generate_one_time_key_and_proposed_token } + # rubocop:disable Metrics/LineLength let(:invalid_token) { "9373a256a2ac3c3bd320adeeb8a1e4d996ef064d1332357954410f25740bf0c17b6565e152760c461a85587e6a6845457f955ccfa20a8e462a77b776eb10b72c" } # rubocop:enable Metrics/LineLength @@ -50,7 +51,12 @@ expect(Idt::Token.active?(invalid_token)).to eq(false) end - xit "returns false after a token expires" do + it "returns false after a token expires" do + key, token = key_token_pair + Idt::Token.activate_proposed_token(key, css_id) + expect(Idt::Token.active?(token)).to eq(true) + Idt::Token.client.expire("valid_tokens_key" + token, -1) + expect(Idt::Token.active?(token)).to eq(false) end end end diff --git a/spec/models/organizations_user_spec.rb b/spec/models/organizations_user_spec.rb index bc148bd7a4f..f68b294517d 100644 --- a/spec/models/organizations_user_spec.rb +++ b/spec/models/organizations_user_spec.rb @@ -114,4 +114,18 @@ end end end + + describe ".update_user_conference_type" do + let(:meeting_type) { user.meeting_type } + let(:new_meeting_type) { "webex" } + + subject { OrganizationsUser.update_user_conference_type(user, new_meeting_type) } + + context "when meeting type exists" do + it "should set meeting type to equal new meeting type" do + subject + expect(meeting_type).to eq(new_meeting_type) + end + end + end end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 7b25a645c36..6c5b35355d5 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -158,7 +158,8 @@ :display_name => css_id.upcase, "name" => "Tom Brady", "status" => Constants.USER_STATUSES.active, - "status_updated_at" => nil + "status_updated_at" => nil, + "meeting_type" => "pexip" } end From 99c1ee912c1e0f20f4a2cabec774499ab37810e0 Mon Sep 17 00:00:00 2001 From: breedbah Date: Fri, 25 Aug 2023 10:43:49 -0400 Subject: [PATCH 048/445] APPEALS-28105 cleaned up and completed mock server update --- client/app/queue/OrganizationUsers.jsx | 1 - client/mocks/webex-mocks/meetingData.js | 134 ++++++------------ .../mocks/webex-mocks/webex-mock-generator.js | 2 +- client/mocks/webex-mocks/webex-mock-server.js | 48 +++---- 4 files changed, 66 insertions(+), 119 deletions(-) diff --git a/client/app/queue/OrganizationUsers.jsx b/client/app/queue/OrganizationUsers.jsx index 2f60f308d57..1453040d758 100644 --- a/client/app/queue/OrganizationUsers.jsx +++ b/client/app/queue/OrganizationUsers.jsx @@ -17,7 +17,6 @@ import COPY from '../../COPY'; import LoadingDataDisplay from '../components/LoadingDataDisplay'; import MembershipRequestTable from './MembershipRequestTable'; import SelectConferenceTypeRadioField from './SelectConferenceTypeRadioField'; -import SelectConferenceTypeRadioField from './SelectConferenceTypeRadioField'; const userStyle = css({ margin: '.5rem 0 .5rem', diff --git a/client/mocks/webex-mocks/meetingData.js b/client/mocks/webex-mocks/meetingData.js index 34afb658f9c..377317996b9 100644 --- a/client/mocks/webex-mocks/meetingData.js +++ b/client/mocks/webex-mocks/meetingData.js @@ -1,96 +1,50 @@ const faker = require('faker'); -const generateMeetingData = { - id: faker.random.uuid(), - meetingNumber: faker.random.number(), - title: faker.company.catchPhrase(), - password: faker.internet.password(), - meetingType: 'meetingSeries', - state: 'active', - timezone: 'Asia/Shanghai', - start: '2023-11-01T20:00:00+08:00', - end: '2023-11-01T21:00:00+08:00', - hostUserId: faker.finance.account(), - hostDisplayName: faker.name.findName(), - hostEmail: faker.internet.email(), - hostKey: faker.random.number(), - siteUrl: 'ciscofedsales.webex.com', - webLink: faker.internet.url(), - sipAddress: faker.internet.email(), - dialInIpAddress: faker.internet.ip(), - enabledAutoRecordMeeting: faker.random.boolean(), - allowAnyUserToBeCoHost: faker.random.boolean(), - allowFirstUserToBeCoHost: faker.random.boolean(), - allowAuthenticatedDevices: faker.random.boolean(), - enabledJoinBeforeHost: faker.random.boolean(), - joinBeforeHostMinutes: faker.random.number({ min: 0, max: 10 }), - enableConnectAudioBeforeHost: faker.random.boolean(), - excludePassword: faker.random.boolean(), - publicMeeting: faker.random.boolean(), - enableAutomaticLock: faker.random.boolean(), - automaticLockMinutes: faker.random.number({ min: 1, max: 10 }), - unlockedMeetingJoinSecurity: 'allowJoinWithLobby', - telephony: { - accessCode: faker.random.number({ min: 100000, max: 999999 }).toString(), - callInNumbers: [ - { - label: 'United States Toll', - callInNumber: '+1-415-527-5035', - tollType: 'toll', - }, - { - label: 'United States Toll (Washington D.C.)', - callInNumber: '+1-202-600-2533', - tollType: 'toll', - }, - ], - links: [ - { - rel: 'globalCallinNumbers', - href: `/v1/meetings/${faker.random.uuid()}/globalCallinNumbers`, - method: 'GET', +const generateMeetingData = (subject, startTime, endTime) => { + const undefinedValue = undefined; + + if ( + startTime === undefinedValue && + endTime === undefinedValue && + subject === undefinedValue + ) { + startTime = faker.date.recent().toTimeString(). + split(' ')[0]; + endTime = faker.date.future().toTimeString(). + split(' ')[0]; + subject = faker.lorem.words(); + } + + return { + id: faker.random.uuid(), + jwt: { + sub: subject, + Nbf: startTime, + Exp: endTime, + flow: { + id: faker.random.uuid(), + data: [ + { + uri: `${faker.internet.userName()}@intadmin.room.wbx2.com`, + }, + { + uri: `${faker.internet.userName()}@intadmin.room.wbx2.com`, + }, + ], }, - ], - }, - meetingOptions: { - enabledChat: faker.random.boolean(), - enabledVideo: faker.random.boolean(), - enabledNote: faker.random.boolean(), - noteType: 'allowAll', - enabledFileTransfer: faker.random.boolean(), - enabledUCFRichMedia: faker.random.boolean(), - }, - attendeePrivileges: { - enabledShareContent: faker.random.boolean(), - enabledSaveDocument: faker.random.boolean(), - enabledPrintDocument: faker.random.boolean(), - enabledAnnotate: faker.random.boolean(), - enabledViewParticipantList: faker.random.boolean(), - enabledViewThumbnails: faker.random.boolean(), - enabledRemoteControl: faker.random.boolean(), - enabledViewAnyDocument: faker.random.boolean(), - enabledViewAnyPage: faker.random.boolean(), - enabledContactOperatorPrivately: faker.random.boolean(), - enabledChatHost: faker.random.boolean(), - enabledChatPresenter: faker.random.boolean(), - enabledChatOtherParticipants: faker.random.boolean(), - }, - sessionTypeId: faker.random.number({ min: 1, max: 5 }), - scheduledType: 'meeting', - simultaneousInterpretation: { - enabled: faker.random.boolean(), - }, - enabledBreakoutSessions: faker.random.boolean(), - audioConnectionOptions: { - audioConnectionType: 'webexAudio', - enabledTollFreeCallIn: faker.random.boolean(), - enabledGlobalCallIn: faker.random.boolean(), - enabledAudienceCallBack: faker.random.boolean(), - entryAndExitTone: 'beep', - allowHostToUnmuteParticipants: faker.random.boolean(), - allowAttendeeToUnmuteSelf: faker.random.boolean(), - muteAttendeeUponEntry: faker.random.boolean(), - }, + }, + aud: faker.random.uuid(), + numGuest: faker.random.number({ min: 1, max: 10 }), + numHost: 1, + provideShortUrls: faker.random.boolean(), + verticalType: faker.company.catchPhrase(), + loginUrlForHost: faker.random.boolean(), + jweAlg: 'PBES2-HS512+A256KW', + saltLength: faker.random.number({ min: 1, max: 16 }), + iterations: faker.random.number({ min: 500, max: 2000 }), + enc: 'A256GCM', + jwsAlg: 'HS512', + }; }; module.exports = generateMeetingData; diff --git a/client/mocks/webex-mocks/webex-mock-generator.js b/client/mocks/webex-mocks/webex-mock-generator.js index 9d4d9c98423..57d4fa640f0 100644 --- a/client/mocks/webex-mocks/webex-mock-generator.js +++ b/client/mocks/webex-mocks/webex-mock-generator.js @@ -5,7 +5,7 @@ const generateConferenceLinks = () => { let webexLinks = []; for (let id = 1; id <= 10; id++) { - webexLinks.push(generateMeetingData); + webexLinks.push(generateMeetingData()); } return webexLinks; diff --git a/client/mocks/webex-mocks/webex-mock-server.js b/client/mocks/webex-mocks/webex-mock-server.js index b7d6c50dd74..3d72cbb894b 100644 --- a/client/mocks/webex-mocks/webex-mock-server.js +++ b/client/mocks/webex-mocks/webex-mock-server.js @@ -127,30 +127,18 @@ server.get('/health-check-green', (req, res) => { }); const requiredKeys = [ - 'title', - 'start', - 'end', - 'timezone', - 'enabledAutoRecordMeeting', - 'allowAnyUserToBeCoHost', - 'enabledJoinBeforeHost', - 'enableConnectAudioBeforeHost', - 'joinBeforeHostMinutes', - 'excludePassword', - 'publicMeeting', - 'reminderTime', - 'unlockedMeetingJoinSecurity', - 'enabledWebCastView', - 'enableAutomaticLock', - 'automaticLockMinutes', - 'allowFirstUserToBeCoHost', - 'allowAuthenticatedDevices', - 'sendEmail', - 'siteUrl', - 'meetingOptions', - 'attendeePrivileges', - 'enabledBreakoutSessions', - 'audioConnectionOptions', + 'jwt', + 'aud', + 'numGuest', + 'numHost', + 'provideShortUrls', + 'verticalType', + 'loginUrlForHost', + 'jweAlg', + 'saltLength', + 'iterations', + 'enc', + 'jwsAlg' ]; server.post('/fake.api-usgov.webex.com/v1/meetings', (req, res) => { @@ -167,9 +155,15 @@ server.post('/fake.api-usgov.webex.com/v1/meetings', (req, res) => { const conferenceLinks = db.get('conferenceLinks'); // Add generateMeetingData object to conferenceLinks - conferenceLinks.push(generateMeetingData).write(); - - res.status(200).json(generateMeetingData); + conferenceLinks.push( + generateMeetingData( + requestBody.jwt.sub, + requestBody.jwt.Nbf, + requestBody.jwt.Exp + ) + ).write(); + + res.status(200).json(generateMeetingData(requestBody.jwt.sub, requestBody.jwt.Nbf, requestBody.jwt.Exp)); } }); From ffef0dbe357c5406f40e90877d290936fd03f6a7 Mon Sep 17 00:00:00 2001 From: breedbah Date: Fri, 25 Aug 2023 12:35:19 -0400 Subject: [PATCH 049/445] APPEALS-28105 Updated and modified meeting data --- client/mocks/webex-mocks/meetingData.js | 21 +++--------- .../mocks/webex-mocks/webex-mock-generator.js | 32 ++++++++++++++++--- client/mocks/webex-mocks/webex-mock-server.js | 18 +++++------ 3 files changed, 40 insertions(+), 31 deletions(-) diff --git a/client/mocks/webex-mocks/meetingData.js b/client/mocks/webex-mocks/meetingData.js index 377317996b9..0ed5772a76e 100644 --- a/client/mocks/webex-mocks/meetingData.js +++ b/client/mocks/webex-mocks/meetingData.js @@ -1,26 +1,13 @@ const faker = require('faker'); -const generateMeetingData = (subject, startTime, endTime) => { - const undefinedValue = undefined; - - if ( - startTime === undefinedValue && - endTime === undefinedValue && - subject === undefinedValue - ) { - startTime = faker.date.recent().toTimeString(). - split(' ')[0]; - endTime = faker.date.future().toTimeString(). - split(' ')[0]; - subject = faker.lorem.words(); - } +const generateMeetingData = (response) => { return { id: faker.random.uuid(), jwt: { - sub: subject, - Nbf: startTime, - Exp: endTime, + sub: response.jwt.sub, + Nbf: response.jwt.Nbf, + Exp: response.jwt.Exp, flow: { id: faker.random.uuid(), data: [ diff --git a/client/mocks/webex-mocks/webex-mock-generator.js b/client/mocks/webex-mocks/webex-mock-generator.js index 57d4fa640f0..6f8a108f5ee 100644 --- a/client/mocks/webex-mocks/webex-mock-generator.js +++ b/client/mocks/webex-mocks/webex-mock-generator.js @@ -1,11 +1,33 @@ const fs = require('fs'); +const faker = require('faker'); const generateMeetingData = require('./meetingData.js'); const generateConferenceLinks = () => { let webexLinks = []; for (let id = 1; id <= 10; id++) { - webexLinks.push(generateMeetingData()); + const startDate = new Date('2021-01-01T00:00:00Z'); + const endDate = new Date('2023-01-01T00:00:00Z'); + + const randomStartDate = faker.date.between(startDate, endDate); + const randomEndDate = new Date(randomStartDate.getTime()); + + randomEndDate.setHours(randomEndDate.getHours() + 1); + + let startTime = randomStartDate.toISOString().replace('Z', ''); + let endTime = randomEndDate.toISOString().replace('Z', ''); + + let subject = faker.lorem.words(); + + let updatedValues = { + jwt: { + sub: subject, + Nbf: startTime, + Exp: endTime + } + }; + + webexLinks.push(generateMeetingData(updatedValues)); } return webexLinks; @@ -19,8 +41,10 @@ const data = { // Check if the script is being run directly if (require.main === module) { - fs.writeFileSync('mocks/webex-mocks/webex-mock.json', JSON.stringify(data, null, 2)); + fs.writeFileSync( + 'mocks/webex-mocks/webex-mock.json', + JSON.stringify(data, null, 2) + ); // eslint-disable-next-line no-console - console.log('Generated new data in webex-mock.json'); + console.log("Generated new data in webex-mock.json"); } - diff --git a/client/mocks/webex-mocks/webex-mock-server.js b/client/mocks/webex-mocks/webex-mock-server.js index 3d72cbb894b..884bf9b2810 100644 --- a/client/mocks/webex-mocks/webex-mock-server.js +++ b/client/mocks/webex-mocks/webex-mock-server.js @@ -149,21 +149,19 @@ server.post('/fake.api-usgov.webex.com/v1/meetings', (req, res) => { if (missingKeys.length > 0) { res.status(400).json({ message: 'Missing required keys', missingKeys }); + } else if (!requestBody.jwt.sub || !requestBody.jwt.Nbf || !requestBody.jwt.Exp) { + res.status(400).json({ + message: 'Missing required params', + }); } else { - // Access conferenceLinks from database + const db = router.db; const conferenceLinks = db.get('conferenceLinks'); // Add generateMeetingData object to conferenceLinks - conferenceLinks.push( - generateMeetingData( - requestBody.jwt.sub, - requestBody.jwt.Nbf, - requestBody.jwt.Exp - ) - ).write(); - - res.status(200).json(generateMeetingData(requestBody.jwt.sub, requestBody.jwt.Nbf, requestBody.jwt.Exp)); + conferenceLinks.push(generateMeetingData(requestBody)).write(); + + res.status(200).json(generateMeetingData(requestBody)); } }); From 28930ef864e59ceab6acb890987b1b00e3e278cf Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Mon, 28 Aug 2023 11:01:45 -0400 Subject: [PATCH 050/445] Resolve Org Users --- client/app/queue/OrganizationUsers.jsx | 40 +++++++++----------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/client/app/queue/OrganizationUsers.jsx b/client/app/queue/OrganizationUsers.jsx index 8e66a73063e..e24ecbddcb9 100644 --- a/client/app/queue/OrganizationUsers.jsx +++ b/client/app/queue/OrganizationUsers.jsx @@ -258,19 +258,19 @@ export default class OrganizationUsers extends React.PureComponent {
    • {this.formatName(user)} - { judgeTeam && admin && ( {COPY.USER_MANAGEMENT_JUDGE_LABEL} ) } - { dvcTeam && dvc && ( {COPY.USER_MANAGEMENT_DVC_LABEL} ) } - { judgeTeam && !admin && ( {COPY.USER_MANAGEMENT_ATTORNEY_LABEL} ) } - { (judgeTeam || dvcTeam) && admin && ( {COPY.USER_MANAGEMENT_ADMIN_LABEL} ) } + {judgeTeam && admin && ( {COPY.USER_MANAGEMENT_JUDGE_LABEL} )} + {dvcTeam && dvc && ( {COPY.USER_MANAGEMENT_DVC_LABEL} )} + {judgeTeam && !admin && ( {COPY.USER_MANAGEMENT_ATTORNEY_LABEL} )} + {(judgeTeam || dvcTeam) && admin && ( {COPY.USER_MANAGEMENT_ADMIN_LABEL} )}
      • - { (judgeTeam || dvcTeam) && admin ? -
      : + {(judgeTeam || dvcTeam) && admin ? +
      :
      - { (judgeTeam || dvcTeam) ? '' : this.adminButton(user, admin) } - { this.removeUserButton(user) } + {(judgeTeam || dvcTeam) ? '' : this.adminButton(user, admin)} + {this.removeUserButton(user)}
      - { this.state.organizationName === 'Hearings Management' && + {this.state.organizationName === 'Hearings Management' &&
      - {this.state.organizationName === 'Hearing Admin' && - !conferenceSelectionVisibility && ( -
      - -
      - )} -
      - )} -
    -
    - - ); + } +
    } + +
    +     ; }); return From c69cb9c8dc63f998398de137f88d9f91f0ee5fed Mon Sep 17 00:00:00 2001 From: breedbah Date: Mon, 28 Aug 2023 14:09:48 -0400 Subject: [PATCH 051/445] resolve conflict --- client/app/queue/OrganizationUsers.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/app/queue/OrganizationUsers.jsx b/client/app/queue/OrganizationUsers.jsx index 1453040d758..1a97b037d89 100644 --- a/client/app/queue/OrganizationUsers.jsx +++ b/client/app/queue/OrganizationUsers.jsx @@ -280,7 +280,7 @@ export default class OrganizationUsers extends React.PureComponent { user={user} /> } - } + } ; From d79c0c5290f2620c6d967cec35a9e463561c3ecc Mon Sep 17 00:00:00 2001 From: breedbah Date: Mon, 28 Aug 2023 14:53:06 -0400 Subject: [PATCH 052/445] APPEALS-28105 removed space routes.json --- client/mocks/webex-mocks/routes.json | 1 - 1 file changed, 1 deletion(-) diff --git a/client/mocks/webex-mocks/routes.json b/client/mocks/webex-mocks/routes.json index 76516817fb9..77567effdf6 100644 --- a/client/mocks/webex-mocks/routes.json +++ b/client/mocks/webex-mocks/routes.json @@ -1,4 +1,3 @@ - { "/api/v1/conference-links": "/conferenceLinks", "/api/v1/conference-links/:id": "/conferenceLinks/:id" From ce501b0a4f3032c8c6f0234bcc38290efb07fb30 Mon Sep 17 00:00:00 2001 From: breedbah Date: Tue, 29 Aug 2023 09:54:04 -0400 Subject: [PATCH 053/445] APPEALS-28105 fixed conferenceSelectionVisibility --- client/app/queue/OrganizationUsers.jsx | 75 +++++++++++++++----------- 1 file changed, 45 insertions(+), 30 deletions(-) diff --git a/client/app/queue/OrganizationUsers.jsx b/client/app/queue/OrganizationUsers.jsx index e24ecbddcb9..536cdd1bed0 100644 --- a/client/app/queue/OrganizationUsers.jsx +++ b/client/app/queue/OrganizationUsers.jsx @@ -253,37 +253,52 @@ export default class OrganizationUsers extends React.PureComponent { const listOfUsers = this.state.organizationUsers.map((user, i) => { const { dvc, admin } = user.attributes; const style = i === 0 ? topUserStyle : userStyle; - - return -
    -
      -
    • {this.formatName(user)} - {judgeTeam && admin && ( {COPY.USER_MANAGEMENT_JUDGE_LABEL} )} - {dvcTeam && dvc && ( {COPY.USER_MANAGEMENT_DVC_LABEL} )} - {judgeTeam && !admin && ( {COPY.USER_MANAGEMENT_ATTORNEY_LABEL} )} - {(judgeTeam || dvcTeam) && admin && ( {COPY.USER_MANAGEMENT_ADMIN_LABEL} )} -
      • - {(judgeTeam || dvcTeam) && admin ? -
      : -
      -
      - {(judgeTeam || dvcTeam) ? '' : this.adminButton(user, admin)} - {this.removeUserButton(user)} -
      - {this.state.organizationName === 'Hearings Management' && -
      - + const { conferenceSelectionVisibility } = this.props; + + return ( + +
      +
        +
      • + {this.formatName(user)} + {judgeTeam && admin && ( + ( {COPY.USER_MANAGEMENT_JUDGE_LABEL} ) + )} + {dvcTeam && dvc && ( + ( {COPY.USER_MANAGEMENT_DVC_LABEL} ) + )} + {judgeTeam && !admin && ( + ( {COPY.USER_MANAGEMENT_ATTORNEY_LABEL} ) + )} + {(judgeTeam || dvcTeam) && admin && ( + ( {COPY.USER_MANAGEMENT_ADMIN_LABEL} ) + )} +
        • + {(judgeTeam || dvcTeam) && admin ? ( +
        + ) : ( +
        +
        + {judgeTeam || dvcTeam ? '' : this.adminButton(user, admin)} + {this.removeUserButton(user)}
        - } -
        } -
      -
      -       ; + {this.state.organizationName === 'Hearing Admin' && + !conferenceSelectionVisibility && ( +
      + +
      + )} +
      + )} +
    +
    +     + ); }); return From 5944f05edc25b621495d0a397bb5e750a6013956 Mon Sep 17 00:00:00 2001 From: breedbah Date: Tue, 29 Aug 2023 10:16:56 -0400 Subject: [PATCH 054/445] APPEALS-28105 corrected radio button page display --- client/app/queue/OrganizationUsers.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/app/queue/OrganizationUsers.jsx b/client/app/queue/OrganizationUsers.jsx index 536cdd1bed0..4ac2c1b5c0f 100644 --- a/client/app/queue/OrganizationUsers.jsx +++ b/client/app/queue/OrganizationUsers.jsx @@ -282,7 +282,7 @@ export default class OrganizationUsers extends React.PureComponent { {judgeTeam || dvcTeam ? '' : this.adminButton(user, admin)} {this.removeUserButton(user)} - {this.state.organizationName === 'Hearing Admin' && + {this.state.organizationName === 'Hearings Management' && !conferenceSelectionVisibility && (
    Date: Tue, 29 Aug 2023 10:18:33 -0400 Subject: [PATCH 055/445] APPEALS-28105 updated jest test for correct organization --- .../test/app/queue/organizationUsers/OrganizationUsers.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/test/app/queue/organizationUsers/OrganizationUsers.test.js b/client/test/app/queue/organizationUsers/OrganizationUsers.test.js index 9eee34d1726..65f8dbd38b7 100644 --- a/client/test/app/queue/organizationUsers/OrganizationUsers.test.js +++ b/client/test/app/queue/organizationUsers/OrganizationUsers.test.js @@ -12,7 +12,7 @@ describe('Conference Selection Visibility Feature Toggle', () => { }); ApiUtil.get.mockResolvedValue({ body: { - organization_name: 'Hearing Admin', + organization_name: 'Hearings Management', judge_team: false, dvc_team: false, organization_users: { From ab89d13581aaac32c293c23fe114e9f176f9999f Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Tue, 29 Aug 2023 12:57:19 -0400 Subject: [PATCH 056/445] APPEALS-29006 created new class of DeleteConferenceLinkJob --- app/jobs/hearings/delete_conference_link_job.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 app/jobs/hearings/delete_conference_link_job.rb diff --git a/app/jobs/hearings/delete_conference_link_job.rb b/app/jobs/hearings/delete_conference_link_job.rb new file mode 100644 index 00000000000..d5583ab0352 --- /dev/null +++ b/app/jobs/hearings/delete_conference_link_job.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +class DeleteConferenceLinkJob < CaseflowJob + queue_with_priority :low_priority + + def perform + + end + +end From 9945e63f53e16692adba569e158037eb00c358b5 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Tue, 29 Aug 2023 14:45:01 -0400 Subject: [PATCH 057/445] APPEALS-25117: updates --- .../virtual_hearings/create_conference_job.rb | 4 +- app/services/external_api/pexip_service.rb | 6 ++- app/services/external_api/webex_service.rb | 49 +++++++++---------- 3 files changed, 29 insertions(+), 30 deletions(-) diff --git a/app/jobs/virtual_hearings/create_conference_job.rb b/app/jobs/virtual_hearings/create_conference_job.rb index a16e0f1674e..a5ab5bd39db 100644 --- a/app/jobs/virtual_hearings/create_conference_job.rb +++ b/app/jobs/virtual_hearings/create_conference_job.rb @@ -178,9 +178,7 @@ def error_display(response) def create_new_conference client.create_conference( - host_pin: virtual_hearing.host_pin, - guest_pin: virtual_hearing.guest_pin, - name: virtual_hearing.alias + virtual_hearing ) end diff --git a/app/services/external_api/pexip_service.rb b/app/services/external_api/pexip_service.rb index 6cb26d61704..4dd48ab0f40 100644 --- a/app/services/external_api/pexip_service.rb +++ b/app/services/external_api/pexip_service.rb @@ -13,7 +13,11 @@ def initialize(host:, port: 443, user_name:, password:, client_host:) @client_host = client_host end - def create_conference(host_pin:, guest_pin:, name:) + def create_conference(virtual_hearing) + host_pin = virtual_hearing.host_pin + guest_pin = virtual_hearing.guest_pin + name = virtual_hearing.alias + body = { "aliases": [{ "alias": "BVA#{name}" }, { "alias": VirtualHearing.formatted_alias(name) }, { "alias": name }], "allow_guests": true, diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb index a070c64af9f..c20548581be 100644 --- a/app/services/external_api/webex_service.rb +++ b/app/services/external_api/webex_service.rb @@ -3,8 +3,7 @@ require "json" class ExternalApi::WebexService - CONFERENCES_ENDPOINT = "api/admin/configuration/v1/conference/" - # POST https://api-usgov.webex.com/v1/meetings + CREATE_CONFERENCE_ENDPOINT = "api-usgov.webex.com/v1/meetings" def initialize(host:, port: 443, user_name:, password:, client_host:) @host = host @@ -14,14 +13,24 @@ def initialize(host:, port: 443, user_name:, password:, client_host:) @client_host = client_host end - def create_conference(host_pin:, guest_pin:, name:) + def create_conference(virtual_hearing) + title + # where can we get this from + hearing_day = HearingDay.find(virtual_hearing.hearing.hearing_day_id) + start_date_time = hearing_day.scheduled_for + # does not give timezone + # method to ensure correct formatting + # begins_at in hearing_day auto creates time zone to America/New York...but can be nil + end_date_time + # slot_length_minutes can be nil but relevant? + body = { - "title": "TBD", - "start": "TBD", - "end": "TBD", + "title": title, + "start": start_date_time, + "end": end_date_time, # Formatting >> "2019-11-01 21:00:00", - "timezone": "TBD", - # Formatting >> "Asia/Shanghai", + "timezone": "Asia/Shanghai", + # not required "enabledAutoRecordMeeting": "false", "allowAnyUserToBeCoHost": "false", "enabledJoinBeforeHost": "false", @@ -60,34 +69,22 @@ def create_conference(host_pin:, guest_pin:, name:) "muteAttendeeUponEntry": true } ] - # "aliases": [{ "alias": "BVA#{name}" }, { "alias": VirtualHearing.formatted_alias(name) }, { "alias": name }], - # "allow_guests": true, - # "description": "Created by Caseflow", - # "enable_chat": "yes", - # "enable_overlay_text": true, - # # Theme ID is hard coded for now because it's the same in both environments. - # "ivr_theme": "/api/admin/configuration/v1/ivr_theme/13/", - # "force_presenter_into_main": true, - # "guest_pin": guest_pin.to_s, - # "name": "BVA#{name}", - # "pin": host_pin.to_s, - # "tag": "CASEFLOW" } - resp = send_pexip_request(CONFERENCES_ENDPOINT, :post, body: body) + resp = send_webex_request(CREATE_CONFERENCE_ENDPOINT, :post, body: body) return if resp.nil? - ExternalApi::PexipService::CreateResponse.new(resp) + ExternalApi::WebexService::CreateResponse.new(resp) end def delete_conference(conference_id:) return if conference_id.nil? - delete_endpoint = "#{CONFERENCES_ENDPOINT}#{conference_id}/" - resp = send_pexip_request(delete_endpoint, :delete) + delete_endpoint = "#{CREATE_CONFERENCE_ENDPOINT}#{conference_id}/" + resp = send_webex_request(delete_endpoint, :delete) return if resp.nil? - ExternalApi::PexipService::DeleteResponse.new(resp) + ExternalApi::WebexService::DeleteResponse.new(resp) end private @@ -95,7 +92,7 @@ def delete_conference(conference_id:) attr_reader :host, :port, :user_name, :password, :client_host # :nocov: - def send_pexip_request(endpoint, method, body: nil) + def send_webex_request(endpoint, method, body: nil) url = "https://#{host}:#{port}/#{endpoint}" request = HTTPI::Request.new(url) request.auth.basic(user_name, password) From e6600a7da6f0a3b3e1e0d0c99c1cb0c8f24b8ba9 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Tue, 29 Aug 2023 14:45:26 -0400 Subject: [PATCH 058/445] APPEALS-25117: updates --- config/initializers/webex.rb | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 config/initializers/webex.rb diff --git a/config/initializers/webex.rb b/config/initializers/webex.rb new file mode 100644 index 00000000000..b92f02ec34c --- /dev/null +++ b/config/initializers/webex.rb @@ -0,0 +1,2 @@ +VADotGovService = (ApplicationController.dependencies_faked? ? Mocks::WebexMocks::WebexMockService : ExternalApi::WebexService) +# may not need this at all in the end From 7ea173d73df38f3f5126f66818d372cd8e91a56a Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Wed, 30 Aug 2023 12:08:21 -0400 Subject: [PATCH 059/445] updates to the DeleteConferenceLinkJob file. migration received at branching was also ran at this point. --- .../hearings/delete_conference_link_job.rb | 26 ++++++++++++++++ db/schema.rb | 30 ------------------- 2 files changed, 26 insertions(+), 30 deletions(-) diff --git a/app/jobs/hearings/delete_conference_link_job.rb b/app/jobs/hearings/delete_conference_link_job.rb index d5583ab0352..46e582297ca 100644 --- a/app/jobs/hearings/delete_conference_link_job.rb +++ b/app/jobs/hearings/delete_conference_link_job.rb @@ -4,7 +4,33 @@ class DeleteConferenceLinkJob < CaseflowJob queue_with_priority :low_priority def perform + links_for_past_date = retreive_stale_conference_links + soft_delete_links(links_for_past_date) + end + + private + def retreive_stale_conference_links + ConferenceLink.joins(:hearing_day).where("scheduled_for < ?", Date.today) end + def soft_delete_links(collection) + collection.each do |old_link| + old_link.update!(update_conf_links) + end + end + + def update_conf_links + { + conference_deleted: true, + updated_by_id: RequestStore[:current_user], + updated_at: Time.zone.now, + guest_hearing_link: nil, + # guest_pin: nil, + guest_pin_long: nil, + host_link: nil, + host_pin: nil, + host_pin_long: nil + } + end end diff --git a/db/schema.rb b/db/schema.rb index 06240150d9a..124d780fb01 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -598,8 +598,6 @@ t.string "diagnostic_code", comment: "If a decision resulted in a rating, this is the rating issue's diagnostic code." t.string "disposition", comment: "The disposition for a decision issue. Dispositions made in Caseflow and dispositions made in VBMS can have different values." t.date "end_product_last_action_date", comment: "After an end product gets synced with a status of CLR (cleared), the end product's last_action_date is saved on any decision issues that are created as a result. This is used as a proxy for decision date for non-rating issues that are processed in VBMS because they don't have a rating profile date, and the exact decision date is not available." - t.boolean "mst_status", default: false, comment: "Indicates if decision issue is related to Military Sexual Trauma (MST)" - t.boolean "pact_status", default: false, comment: "Indicates if decision issue is related to Promise to Address Comprehensive Toxics (PACT) Act" t.string "participant_id", null: false, comment: "The Veteran's participant id." t.string "percent_number", comment: "percent_number from RatingIssue (prcntNo from Rating Profile)" t.string "rating_issue_reference_id", comment: "Identifies the specific issue on the rating that resulted from the decision issue (a rating issue can be connected to multiple contentions)." @@ -1475,13 +1473,9 @@ t.string "ineligible_reason", comment: "The reason for a Request Issue being ineligible. If a Request Issue has an ineligible_reason, it is still captured, but it will not get a contention in VBMS or a decision." t.boolean "is_predocket_needed", comment: "Indicates whether or not an issue has been selected to go to the pre-docket queue opposed to normal docketing." t.boolean "is_unidentified", comment: "Indicates whether a Request Issue is unidentified, meaning it wasn't found in the list of contestable issues, and is not a new nonrating issue. Contentions for unidentified issues are created on a rating End Product if processed in VBMS but without the issue description, and someone is required to edit it in Caseflow before proceeding with the decision." - t.boolean "mst_status", default: false, comment: "Indicates if issue is related to Military Sexual Trauma (MST)" - t.text "mst_status_update_reason_notes", comment: "The reason for why Request Issue is Military Sexual Trauma (MST)" t.string "nonrating_issue_category", comment: "The category selected for nonrating request issues. These vary by business line." t.string "nonrating_issue_description", comment: "The user entered description if the issue is a nonrating issue" t.text "notes", comment: "Notes added by the Claims Assistant when adding request issues. This may be used to capture handwritten notes on the form, or other comments the CA wants to capture." - t.boolean "pact_status", default: false, comment: "Indicates if issue is related to Promise to Address Comprehensive Toxics (PACT) Act" - t.text "pact_status_update_reason_notes", comment: "The reason for why Request Issue is Promise to Address Comprehensive Toxics (PACT) Act" t.string "ramp_claim_id", comment: "If a rating issue was created as a result of an issue intaken for a RAMP Review, it will be connected to the former RAMP issue by its End Product's claim ID." t.datetime "rating_issue_associated_at", comment: "Timestamp when a contention and its contested rating issue are associated in VBMS." t.string "split_issue_status", comment: "If a request issue is part of a split, on_hold status applies to the original request issues while active are request issues on splitted appeals" @@ -1492,8 +1486,6 @@ t.datetime "updated_at", comment: "Automatic timestamp whenever the record changes." t.string "vacols_id", comment: "The vacols_id of the legacy appeal that had an issue found to match the request issue." t.integer "vacols_sequence_id", comment: "The vacols_sequence_id, for the specific issue on the legacy appeal which the Claims Assistant determined to match the request issue on the Decision Review. A combination of the vacols_id (for the legacy appeal), and vacols_sequence_id (for which issue on the legacy appeal), is required to identify the issue being opted-in." - t.boolean "vbms_mst_status", default: false, comment: "Indicates if issue is related to Military Sexual Trauma (MST) and was imported from VBMS" - t.boolean "vbms_pact_status", default: false, comment: "Indicates if issue is related to Promise to Address Comprehensive Toxics (PACT) Act and was imported from VBMS" t.boolean "verified_unidentified_issue", comment: "A verified unidentified issue allows an issue whose rating data is missing to be intaken as a regular rating issue. In order to be marked as verified, a VSR needs to confirm that they were able to find the record of the decision for the issue." t.string "veteran_participant_id", comment: "The veteran participant ID. This should be unique in upstream systems and used in the future to reconcile duplicates." t.index ["closed_at"], name: "index_request_issues_on_closed_at" @@ -1519,8 +1511,6 @@ t.integer "edited_request_issue_ids", comment: "An array of the request issue IDs that were edited during this request issues update", array: true t.string "error", comment: "The error message if the last attempt at processing the request issues update was not successful." t.datetime "last_submitted_at", comment: "Timestamp for when the processing for the request issues update was last submitted. Used to determine how long to continue retrying the processing job. Can be reset to allow for additional retries." - t.integer "mst_edited_request_issue_ids", comment: "An array of the request issue IDs that were updated to be associated with MST in request issues update", array: true - t.integer "pact_edited_request_issue_ids", comment: "An array of the request issue IDs that were updated to be associated with PACT in request issues update", array: true t.datetime "processed_at", comment: "Timestamp for when the request issue update successfully completed processing." t.bigint "review_id", null: false, comment: "The ID of the decision review edited." t.string "review_type", null: false, comment: "The type of the decision review edited." @@ -1569,26 +1559,6 @@ t.index ["sent_by_id"], name: "index_sent_hearing_email_events_on_sent_by_id" end - create_table "special_issue_changes", force: :cascade do |t| - t.bigint "appeal_id", null: false, comment: "AMA or Legacy Appeal ID that the issue is tied to" - t.string "appeal_type", null: false, comment: "Appeal Type (Appeal or LegacyAppeal)" - t.string "change_category", null: false, comment: "Type of change that occured to the issue (Established Issue, Added Issue, Edited Issue, Removed Issue)" - t.datetime "created_at", null: false, comment: "Date the special issue change was made" - t.string "created_by_css_id", null: false, comment: "CSS ID of the user that made the special issue change" - t.bigint "created_by_id", null: false, comment: "User ID of the user that made the special issue change" - t.bigint "decision_issue_id", comment: "ID of the decision issue that had a special issue change from its corresponding request issue" - t.bigint "issue_id", null: false, comment: "ID of the issue that was changed" - t.boolean "mst_from_vbms", comment: "Indication that the MST status originally came from VBMS on intake" - t.string "mst_reason_for_change", comment: "Reason for changing the MST status on an issue" - t.boolean "original_mst_status", null: false, comment: "Original MST special issue status of the issue" - t.boolean "original_pact_status", null: false, comment: "Original PACT special issue status of the issue" - t.boolean "pact_from_vbms" - t.string "pact_reason_for_change", comment: "Reason for changing the PACT status on an issue" - t.bigint "task_id", null: false, comment: "Task ID of the IssueUpdateTask or EstablishmentTask used to log this issue in the case timeline" - t.boolean "updated_mst_status", comment: "Updated MST special issue status of the issue" - t.boolean "updated_pact_status", comment: "Updated PACT special issue status of the issue" - end - create_table "special_issue_lists", comment: "Associates special issues to an AMA or legacy appeal for Caseflow Queue. Caseflow Dispatch uses special issues stored in legacy_appeals. They are intentionally disconnected.", force: :cascade do |t| t.bigint "appeal_id", comment: "The ID of the appeal associated with this record" t.string "appeal_type", comment: "The type of appeal associated with this record" From d6f8ccbb45c7d0fce5cf0c6f67f6bfd725c3c5a2 Mon Sep 17 00:00:00 2001 From: 631862 Date: Wed, 30 Aug 2023 12:26:20 -0400 Subject: [PATCH 060/445] Added name of virtual conference type to virtual hearing link section --- .../components/details/VirtualHearingFields.jsx | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/client/app/hearings/components/details/VirtualHearingFields.jsx b/client/app/hearings/components/details/VirtualHearingFields.jsx index 638b82a504e..fc6ee56db0b 100644 --- a/client/app/hearings/components/details/VirtualHearingFields.jsx +++ b/client/app/hearings/components/details/VirtualHearingFields.jsx @@ -1,5 +1,6 @@ import PropTypes from 'prop-types'; import React, { useContext } from 'react'; +import { css } from 'glamor'; import { ContentSection } from '../../../components/ContentSection'; import { HearingLinks } from './HearingLinks'; @@ -13,11 +14,16 @@ export const VirtualHearingFields = ( } const user = useContext(HearingsUserContext); + const meetingType = hearing.judge.meetingType; + const formattedMeetingType = meetingType.charAt(0).toUpperCase() + meetingType.slice(1); return ( +
    + {formattedMeetingType} Conference +
    Date: Wed, 30 Aug 2023 12:49:14 -0400 Subject: [PATCH 061/445] TODO added. --- app/jobs/hearings/delete_conference_link_job.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/jobs/hearings/delete_conference_link_job.rb b/app/jobs/hearings/delete_conference_link_job.rb index 46e582297ca..2dea1f8bb69 100644 --- a/app/jobs/hearings/delete_conference_link_job.rb +++ b/app/jobs/hearings/delete_conference_link_job.rb @@ -33,4 +33,6 @@ def update_conf_links host_pin_long: nil } end + + # TODO Create a Hearing Day scheduled in the future. Given that the link is created, that would allow me to test the job and see how many it receives. end From c17f508a856d10e2fcbe96e6ad458e5750ef4de9 Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Thu, 31 Aug 2023 10:26:49 -0400 Subject: [PATCH 062/445] local ENV changes implemented. Work still where I left yesterday. --- client/package.json | 2 +- client/yarn.lock | 175 +++++++++++++++++++++++++++----------------- 2 files changed, 107 insertions(+), 70 deletions(-) diff --git a/client/package.json b/client/package.json index cc2ba8fbd77..6511d9c5ab9 100644 --- a/client/package.json +++ b/client/package.json @@ -95,7 +95,7 @@ "moment": "^2.24.0", "moment-range": "^4.0.2", "moment-timezone": "^0.5.27", - "node-sass": "^4.13.1", + "node-sass": "4.13.1", "pdf-annotate.js": "^1.0.0", "pdfjs-dist": "2.6.347", "pluralize": "^7.0.0", diff --git a/client/yarn.lock b/client/yarn.lock index 494f936b028..ee454d3c72a 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -4749,7 +4749,7 @@ ajv@^6.9.1: amdefine@>=0.0.4: version "1.0.1" resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" - integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU= + integrity sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg== ansi-align@^3.0.0: version "3.0.0" @@ -4910,7 +4910,7 @@ array-filter@~0.0.0: array-find-index@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" - integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E= + integrity sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw== array-find@^1.0.0: version "1.0.0" @@ -5079,7 +5079,7 @@ async-each@^1.0.1: async-foreach@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" - integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI= + integrity sha512-VUeSMD8nEGBWaZK4lizI1sf3yEC7pnAQ/mrI7pC2fBz2s/tq5jWWEngTwaf0Gruu/OoXRGLGg1XFqpYBiGTYJA== async@^2.6.2: version "2.6.3" @@ -5489,7 +5489,7 @@ bindings@^1.5.0: block-stream@*: version "0.0.9" resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" - integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo= + integrity sha512-OorbnJVPII4DuUKbjARAe8u8EfqOmkEEaSFIyoQ7OjTHn6kafxWl0wLgoZ2rXaYd7MyLcDaU4TmhfxtwgcccMQ== dependencies: inherits "~2.0.0" @@ -5928,7 +5928,7 @@ camelcase-css@2.0.1: camelcase-keys@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7" - integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc= + integrity sha512-bA/Z/DERHKqoEOrp+qeGKw1QlvEQkGZSc0XaY6VnTxZr+Kv1G5zFwttpjv8qxZ/sBPT4nthwZaAcsAZTJlSKXQ== dependencies: camelcase "^2.0.0" map-obj "^1.0.0" @@ -5936,12 +5936,12 @@ camelcase-keys@^2.0.0: camelcase@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" - integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= + integrity sha512-DLIsRzJVBQu72meAKPkWQOLcujdXT32hwdfnkI1frSiSRMK1MofjKHf+MEx0SB6fjEFXL8fBDv1dKymBlOp4Qw== camelcase@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" - integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo= + integrity sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg== camelcase@^4.1.0: version "4.1.0" @@ -6771,7 +6771,7 @@ cross-spawn@7.0.3: cross-spawn@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982" - integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI= + integrity sha512-eZ+m1WNhSZutOa/uRblAc9Ut5MQfukFrFMtPSm3bZCA888NmMd5AWXWdgRZ80zd+pTk1P2JrGjg9pUPTvl2PWQ== dependencies: lru-cache "^4.0.1" which "^1.2.9" @@ -6924,7 +6924,7 @@ csstype@^3.0.2: currently-unhandled@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" - integrity sha1-mI3zP+qxke95mmE2nddsF635V+o= + integrity sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng== dependencies: array-find-index "^1.0.1" @@ -8675,7 +8675,7 @@ find-up@4.1.0, find-up@^4.0.0, find-up@^4.1.0: find-up@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" - integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8= + integrity sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA== dependencies: path-exists "^2.0.0" pinkie-promise "^2.0.0" @@ -9045,7 +9045,7 @@ get-package-type@^0.1.0: get-stdin@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" - integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4= + integrity sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw== get-stream@^3.0.0: version "3.0.0" @@ -9156,7 +9156,7 @@ glob-to-regexp@^0.3.0: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs= -glob@^7.0.0, glob@^7.0.3, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.1.1: +glob@^7.0.0, glob@^7.0.3, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -9168,6 +9168,18 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, gl once "^1.3.0" path-is-absolute "^1.0.0" +glob@~7.1.1: + version "7.1.7" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" + integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + global-modules@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780" @@ -9280,12 +9292,12 @@ globby@^9.2.0: slash "^2.0.0" globule@^1.0.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d" - integrity sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ== + version "1.3.4" + resolved "https://registry.yarnpkg.com/globule/-/globule-1.3.4.tgz#7c11c43056055a75a6e68294453c17f2796170fb" + integrity sha512-OPTIfhMBh7JbBYDpa5b+Q5ptmMWKwcNcFSR/0c6t8V4f3ZAVBEsKNY37QdVqmLRYSMhOUGYrY0QhSoEpzGr/Eg== dependencies: glob "~7.1.1" - lodash "~4.17.10" + lodash "^4.17.21" minimatch "~3.0.2" good-listener@^1.2.2: @@ -9927,14 +9939,14 @@ imurmurhash@^0.1.4: integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= in-publish@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51" - integrity sha1-4g/146KvwmkDILbcVSaCqcf631E= + version "2.0.1" + resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.1.tgz#948b1a535c8030561cea522f73f78f4be357e00c" + integrity sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ== indent-string@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80" - integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA= + integrity sha512-aqwDFWSgSgfRaEwao5lg5KEcVd/2a+D1rvoG7NdilmYz0NwRk6StWpWdz/Hpk34MKPpx7s8XxUqimfcQK6gGlg== dependencies: repeating "^2.0.0" @@ -10286,11 +10298,9 @@ is-extglob@^2.1.0, is-extglob@^2.1.1: integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= is-finite@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" - integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko= - dependencies: - number-is-nan "^1.0.0" + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3" + integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w== is-fullwidth-code-point@^1.0.0: version "1.0.0" @@ -10471,7 +10481,7 @@ is-typedarray@^1.0.0, is-typedarray@~1.0.0: is-utf8@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" - integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI= + integrity sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q== is-whitespace-character@^1.0.0: version "1.0.4" @@ -11161,9 +11171,9 @@ jest@^26.4.1: jest-cli "^26.4.1" js-base64@^2.1.8: - version "2.5.1" - resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121" - integrity sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw== + version "2.6.4" + resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4" + integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ== js-string-escape@^1.0.1: version "1.0.1" @@ -11483,7 +11493,7 @@ linkify-it@^2.0.3: load-json-file@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" - integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA= + integrity sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A== dependencies: graceful-fs "^4.1.2" parse-json "^2.2.0" @@ -11628,7 +11638,7 @@ lodash.uniq@4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.16, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.7.0, lodash@~4.17.10: +lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.16, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.7.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -11665,7 +11675,7 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3 loud-rejection@^1.0.0: version "1.6.0" resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" - integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8= + integrity sha512-RPNliZOFkqFumDhvYqOaNY4Uz9oJM2K9tC6JWsJJsNdhuONW4LQHRBpb0qf4pJApVffI5N39SwzWZJuEhfd7eQ== dependencies: currently-unhandled "^0.4.1" signal-exit "^3.0.0" @@ -11744,7 +11754,7 @@ map-cache@^0.2.2: map-obj@^1.0.0, map-obj@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" - integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= + integrity sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg== map-or-similar@^1.5.0: version "1.5.0" @@ -11968,6 +11978,7 @@ memory-fs@^0.5.0: meow@^3.7.0: version "3.7.0" resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" + integrity sha512-TNdwZs0skRlpPpCUK25StC4VH+tP5GgeY1HQOOGP+lQ2xtdkN2VtT/5tiX9k3IWpkBPV9b3LsAWXn4GGi/PrSA== dependencies: camelcase-keys "^2.0.0" decamelize "^1.1.2" @@ -12228,14 +12239,21 @@ minimalistic-crypto-utils@^1.0.1: resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= -minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2: +minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== dependencies: brace-expansion "^1.1.7" -minimist@^1.1.0, minimist@^1.1.3: +minimatch@~3.0.2: + version "3.0.8" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.8.tgz#5e6a59bd11e2ab0de1cfb843eb2d82e546c321c1" + integrity sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q== + dependencies: + brace-expansion "^1.1.7" + +minimist@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" @@ -12244,6 +12262,11 @@ minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== +minimist@^1.1.3, minimist@^1.2.6: + version "1.2.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" + integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== + minipass-collect@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" @@ -12304,7 +12327,14 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3: +"mkdirp@>=0.5 0", mkdirp@^0.5.0: + version "0.5.6" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" + integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== + dependencies: + minimist "^1.2.6" + +mkdirp@^0.5.1, mkdirp@^0.5.3: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -12406,11 +12436,16 @@ mute-stream@0.0.8: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== -nan@^2.12.1, nan@^2.13.2: +nan@^2.12.1: version "2.14.1" resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01" integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw== +nan@^2.13.2: + version "2.17.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb" + integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ== + nanoclone@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/nanoclone/-/nanoclone-0.2.1.tgz#dd4090f8f1a110d26bb32c49ed2f5b9235209ed4" @@ -12613,7 +12648,7 @@ node-releases@^1.1.66: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz#28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12" integrity sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg== -node-sass@^4.13.1: +node-sass@4.13.1: version "4.13.1" resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.13.1.tgz#9db5689696bb2eec2c32b98bfea4c7a2e992d0a3" integrity sha512-TTWFx+ZhyDx1Biiez2nB0L3YrCZ/8oHagaDalbuBSlqXgUPsdkUSzJsVxeDO9LtPB49+Fh3WQl3slABo6AotNw== @@ -12646,7 +12681,7 @@ nomnom@~1.6.2: "nopt@2 || 3": version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" - integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k= + integrity sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg== dependencies: abbrev "1" @@ -12983,12 +13018,12 @@ os-browserify@~0.1.1: os-homedir@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" - integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= + integrity sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ== os-locale@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" - integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk= + integrity sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g== dependencies: lcid "^1.0.0" @@ -13018,6 +13053,7 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: osenv@0: version "0.1.5" resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" + integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== dependencies: os-homedir "^1.0.0" os-tmpdir "^1.0.0" @@ -13297,7 +13333,7 @@ path-dirname@^1.0.0: path-exists@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" - integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s= + integrity sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ== dependencies: pinkie-promise "^2.0.0" @@ -13358,7 +13394,7 @@ path-to-regexp@^1.7.0: path-type@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" - integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE= + integrity sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg== dependencies: graceful-fs "^4.1.2" pify "^2.0.0" @@ -14449,7 +14485,7 @@ read-only-stream@^2.0.0: read-pkg-up@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" - integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI= + integrity sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A== dependencies: find-up "^1.0.0" read-pkg "^1.0.0" @@ -14474,7 +14510,7 @@ read-pkg-up@^7.0.1: read-pkg@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" - integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg= + integrity sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ== dependencies: load-json-file "^1.0.0" normalize-package-data "^2.3.2" @@ -14589,7 +14625,7 @@ recursive-readdir@2.2.2: redent@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde" - integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94= + integrity sha512-qtW5hKzGQZqKoh6JNSD+4lfitfPKGz42e6QwiRmPM5mmKtR0N41AbJRYu0xJi7nhOJ4WDgRkKvAk6tw4WIwR4g== dependencies: indent-string "^2.1.0" strip-indent "^1.0.1" @@ -14868,7 +14904,7 @@ repeat-string@^1.0.0, repeat-string@^1.5.4, repeat-string@^1.6.1: repeating@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" - integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo= + integrity sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A== dependencies: is-finite "^1.0.0" @@ -15090,20 +15126,20 @@ reusify@^1.0.4: resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== -rimraf@2, rimraf@2.6.3: - version "2.6.3" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" - integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== - dependencies: - glob "^7.1.3" - -rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.3: +rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== dependencies: glob "^7.1.3" +rimraf@2.6.3: + version "2.6.3" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" + integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== + dependencies: + glob "^7.1.3" + rimraf@^3.0.0, rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" @@ -15211,9 +15247,9 @@ sane@^4.0.3: walker "~1.0.5" sass-graph@^2.2.4: - version "2.2.4" - resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49" - integrity sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k= + version "2.2.6" + resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.6.tgz#09fda0e4287480e3e4967b72a2d133ba09b8d827" + integrity sha512-MKuEYXFSGuRSi8FZ3A7imN1CeVn9Gpw0/SFJKdL1ejXJneI9a5rwlEZrKejhEFAA3O6yr3eIyl/WuvASvlT36g== dependencies: glob "^7.0.0" lodash "^4.0.0" @@ -15314,7 +15350,7 @@ scroll-to@0.0.2: scss-tokenizer@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" - integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE= + integrity sha512-dYE8LhncfBUar6POCxMTm0Ln+erjeczqEvCJib5/7XNkdw1FkUGgwMPY360FY0FgPWQxHWCx29Jl3oejyGLM9Q== dependencies: js-base64 "^2.1.8" source-map "^0.4.2" @@ -15372,7 +15408,7 @@ semver@^7.3.4, semver@^7.3.5: semver@~5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" - integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8= + integrity sha512-mfmm3/H9+67MCVix1h+IXTpDwL6710LyHuk7+cWC9T1mE0qz4iHhh6r4hU2wrIT9iTsAAC2XQRvfblL028cpLw== send@0.17.1: version "0.17.1" @@ -15717,6 +15753,7 @@ source-map-url@^0.4.0: source-map@^0.4.2: version "0.4.4" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" + integrity sha512-Y8nIfcb1s/7DcobUz1yOO1GSp7gyL+D9zLHDehT7iRESqGSxjJ448Sg7rvfgsRJCnKLdSl11uGf0s9X80cH0/A== dependencies: amdefine ">=0.0.4" @@ -16102,7 +16139,7 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: strip-bom@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" - integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4= + integrity sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g== dependencies: is-utf8 "^0.2.0" @@ -16129,7 +16166,7 @@ strip-final-newline@^2.0.0: strip-indent@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2" - integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI= + integrity sha512-I5iQq6aFMM62fBEAIB/hXzwJD6EEZ0xEGCX2t7oXqaKPIRgt4WruAQ285BISgdkP+HLGWyeGmNJcpIwFeRYRUA== dependencies: get-stdin "^4.0.1" @@ -16575,7 +16612,7 @@ tr46@^2.0.2: trim-newlines@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" - integrity sha1-WIeWa7WCpFA6QetST301ARgVphM= + integrity sha512-Nm4cF79FhSTzrLKGDMi3I4utBtFv8qKy4sq1enftf2gMdpqI8oVQTAfySkTz5r49giVzDj88SVZXP4CeYQwjaw== trim-trailing-lines@^1.0.0: version "1.1.3" @@ -17514,7 +17551,7 @@ whatwg-url@^8.5.0: which-module@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" - integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8= + integrity sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ== which-module@^2.0.0: version "2.0.0" @@ -17709,7 +17746,7 @@ yargs-parser@^18.1.1: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^5.0.0: +yargs-parser@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.1.tgz#7ede329c1d8cdbbe209bd25cdb990e9b1ebbb394" integrity sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA== @@ -17777,9 +17814,9 @@ yargs@^15.3.1: yargs-parser "^18.1.1" yargs@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8" - integrity sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg= + version "7.1.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.2.tgz#63a0a5d42143879fdbb30370741374e0641d55db" + integrity sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA== dependencies: camelcase "^3.0.0" cliui "^3.2.0" @@ -17793,7 +17830,7 @@ yargs@^7.0.0: string-width "^1.0.2" which-module "^1.0.0" y18n "^3.2.1" - yargs-parser "^5.0.0" + yargs-parser "^5.0.1" yargs@^8.0.2: version "8.0.2" From 1b89fcd27b2134f49339e0e5fa5014561b7fda00 Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Thu, 31 Aug 2023 14:55:13 -0400 Subject: [PATCH 063/445] updated to-dos in new job, and provided fixme in method that will need to be updated when gem becomes active in file. --- app/jobs/hearings/delete_conference_link_job.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/jobs/hearings/delete_conference_link_job.rb b/app/jobs/hearings/delete_conference_link_job.rb index 2dea1f8bb69..feaee4a3cf7 100644 --- a/app/jobs/hearings/delete_conference_link_job.rb +++ b/app/jobs/hearings/delete_conference_link_job.rb @@ -26,13 +26,14 @@ def update_conf_links updated_by_id: RequestStore[:current_user], updated_at: Time.zone.now, guest_hearing_link: nil, - # guest_pin: nil, guest_pin_long: nil, host_link: nil, host_pin: nil, host_pin_long: nil } end - - # TODO Create a Hearing Day scheduled in the future. Given that the link is created, that would allow me to test the job and see how many it receives. end + + ## TODO Implement use of the paranoia gems macros. + ## TODO set macro on the conference_link class, acts_as_paranoid + ## TODO create AddDeletedAtComlumnToConferenceLinks migration From 8372ff0522e58bbf12d031fb5023c07387a429af Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Fri, 1 Sep 2023 10:16:40 -0400 Subject: [PATCH 064/445] macro added to conf_links. Migration for conf_links table Created. Not run at this point. --- app/models/hearings/conference_link.rb | 1 + .../20230901140311_add_deleted_at_to_conference_links.rb | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 db/migrate/20230901140311_add_deleted_at_to_conference_links.rb diff --git a/app/models/hearings/conference_link.rb b/app/models/hearings/conference_link.rb index 89272e5870c..9132b170bd7 100644 --- a/app/models/hearings/conference_link.rb +++ b/app/models/hearings/conference_link.rb @@ -8,6 +8,7 @@ class LinkMismatchError < StandardError; end include CreatedByUserConcern after_create :generate_links_and_pins + acts_as_paranoid class << self def client_host_or_default diff --git a/db/migrate/20230901140311_add_deleted_at_to_conference_links.rb b/db/migrate/20230901140311_add_deleted_at_to_conference_links.rb new file mode 100644 index 00000000000..80101e951cd --- /dev/null +++ b/db/migrate/20230901140311_add_deleted_at_to_conference_links.rb @@ -0,0 +1,6 @@ +class AddDeletedAtToConferenceLinks < Caseflow::Migration + def change + add_column :conference_links, :deleted_at, :datetime, comment: "Neccessary column for soft delete functionality." + add_index :conference_links, :deleted_at + end +end From e9f4199d96f49501dcf831928fe2cd064a56c487 Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Fri, 1 Sep 2023 11:24:23 -0400 Subject: [PATCH 065/445] Revert "updated to-dos in new job, and provided fixme in method that will need to be updated when gem becomes active in file." This reverts commit 1b89fcd27b2134f49339e0e5fa5014561b7fda00. --- app/jobs/hearings/delete_conference_link_job.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/jobs/hearings/delete_conference_link_job.rb b/app/jobs/hearings/delete_conference_link_job.rb index feaee4a3cf7..2dea1f8bb69 100644 --- a/app/jobs/hearings/delete_conference_link_job.rb +++ b/app/jobs/hearings/delete_conference_link_job.rb @@ -26,14 +26,13 @@ def update_conf_links updated_by_id: RequestStore[:current_user], updated_at: Time.zone.now, guest_hearing_link: nil, + # guest_pin: nil, guest_pin_long: nil, host_link: nil, host_pin: nil, host_pin_long: nil } end -end - ## TODO Implement use of the paranoia gems macros. - ## TODO set macro on the conference_link class, acts_as_paranoid - ## TODO create AddDeletedAtComlumnToConferenceLinks migration + # TODO Create a Hearing Day scheduled in the future. Given that the link is created, that would allow me to test the job and see how many it receives. +end From ee3ac6bf3f97d10c993994609182fac769dcb8d2 Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Fri, 1 Sep 2023 13:12:21 -0400 Subject: [PATCH 066/445] Job exists. migration exists, but hasnt been run. macro hasn't been placed in conf_link class yet. --- app/models/hearings/conference_link.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/models/hearings/conference_link.rb b/app/models/hearings/conference_link.rb index 9132b170bd7..89272e5870c 100644 --- a/app/models/hearings/conference_link.rb +++ b/app/models/hearings/conference_link.rb @@ -8,7 +8,6 @@ class LinkMismatchError < StandardError; end include CreatedByUserConcern after_create :generate_links_and_pins - acts_as_paranoid class << self def client_host_or_default From 4b82f856f2dcf1a66e88a10766c0bc2e0d3c3774 Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Fri, 1 Sep 2023 14:33:49 -0400 Subject: [PATCH 067/445] schema where it needs to be. before new migration. --- .../20230901140311_add_deleted_at_to_conference_links.rb | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 db/migrate/20230901140311_add_deleted_at_to_conference_links.rb diff --git a/db/migrate/20230901140311_add_deleted_at_to_conference_links.rb b/db/migrate/20230901140311_add_deleted_at_to_conference_links.rb deleted file mode 100644 index 80101e951cd..00000000000 --- a/db/migrate/20230901140311_add_deleted_at_to_conference_links.rb +++ /dev/null @@ -1,6 +0,0 @@ -class AddDeletedAtToConferenceLinks < Caseflow::Migration - def change - add_column :conference_links, :deleted_at, :datetime, comment: "Neccessary column for soft delete functionality." - add_index :conference_links, :deleted_at - end -end From d0d9b0b3b335f66554780694b65c7af3f37a8917 Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Fri, 1 Sep 2023 14:41:14 -0400 Subject: [PATCH 068/445] Migration created. Not run. No macro placed in object file yet. --- .../20230901183934_add_deleted_at_to_conference_links.rb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 db/migrate/20230901183934_add_deleted_at_to_conference_links.rb diff --git a/db/migrate/20230901183934_add_deleted_at_to_conference_links.rb b/db/migrate/20230901183934_add_deleted_at_to_conference_links.rb new file mode 100644 index 00000000000..2651f1149d3 --- /dev/null +++ b/db/migrate/20230901183934_add_deleted_at_to_conference_links.rb @@ -0,0 +1,6 @@ +class AddDeletedAtToConferenceLinks < ActiveRecord::Migration[5.2] + def change + add_column :conference_links, :deleted_at, :datetime + add_index :conference_links, :deleted_at + end +end From a449d972f085f22ff30420c8a5dcd69d1f8877f8 Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Fri, 1 Sep 2023 14:56:29 -0400 Subject: [PATCH 069/445] Comment added to migration. --- .../20230901183934_add_deleted_at_to_conference_links.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/db/migrate/20230901183934_add_deleted_at_to_conference_links.rb b/db/migrate/20230901183934_add_deleted_at_to_conference_links.rb index 2651f1149d3..d8d4a4142b7 100644 --- a/db/migrate/20230901183934_add_deleted_at_to_conference_links.rb +++ b/db/migrate/20230901183934_add_deleted_at_to_conference_links.rb @@ -1,6 +1,8 @@ -class AddDeletedAtToConferenceLinks < ActiveRecord::Migration[5.2] +class AddDeletedAtToConferenceLinks < Caseflow::Migration + disable_ddl_transaction! + def change - add_column :conference_links, :deleted_at, :datetime - add_index :conference_links, :deleted_at + add_column :conference_links, :deleted_at, :datetime, comment: "Needed column to make use of the paranoia gem." + add_index :conference_links, :deleted_at, algorithm: :concurrently end end From 9d56cdb6ffbc18ddacc1e8d1da28ad4f18a76295 Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Fri, 1 Sep 2023 15:21:03 -0400 Subject: [PATCH 070/445] Migration ran successfully, destory method works as expected. Schema updated. --- app/models/hearings/conference_link.rb | 1 + db/schema.rb | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/models/hearings/conference_link.rb b/app/models/hearings/conference_link.rb index 89272e5870c..bdc0e1fcbab 100644 --- a/app/models/hearings/conference_link.rb +++ b/app/models/hearings/conference_link.rb @@ -3,6 +3,7 @@ class ConferenceLink < CaseflowRecord class NoAliasWithHostPresentError < StandardError; end class LinkMismatchError < StandardError; end + acts_as_paranoid include UpdatedByUserConcern include CreatedByUserConcern diff --git a/db/schema.rb b/db/schema.rb index 124d780fb01..378519e9299 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2023_07_31_194341) do +ActiveRecord::Schema.define(version: 2023_09_01_183934) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -550,6 +550,7 @@ t.integer "conference_id", comment: "Id of the conference" t.datetime "created_at", null: false, comment: "Date and Time of creation" t.bigint "created_by_id", null: false, comment: "User id of the user who created the record. FK on User table" + t.datetime "deleted_at", comment: "Needed column to make use of the paranoia gem." t.string "guest_hearing_link", comment: "Guest link for hearing daily docket." t.string "guest_pin_long", comment: "Pin provided for the guest, allowing them entry into the video conference." t.bigint "hearing_day_id", null: false, comment: "The associated hearing day id" @@ -560,6 +561,7 @@ t.datetime "updated_at", comment: "Date and Time record was last updated" t.bigint "updated_by_id", comment: "user id of the user to last update the record. FK on the User table" t.index ["created_by_id"], name: "index_created_by_id" + t.index ["deleted_at"], name: "index_conference_links_on_deleted_at" t.index ["hearing_day_id"], name: "index_conference_links_on_hearing_day_id" t.index ["updated_by_id"], name: "index_updated_by_id" end From ee1b125bcbd201e4dc1d17262ad3c9e5c4e7ad57 Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Fri, 1 Sep 2023 17:14:04 -0400 Subject: [PATCH 071/445] APPEALS-29006 Updated job with comments providing explanation on the methods used.Also included a begin/end block for some error handling through use of the log_error method provided through inheritance. --- .../hearings/delete_conference_link_job.rb | 34 +++++++++++++++---- 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/app/jobs/hearings/delete_conference_link_job.rb b/app/jobs/hearings/delete_conference_link_job.rb index 2dea1f8bb69..6b87dbd7062 100644 --- a/app/jobs/hearings/delete_conference_link_job.rb +++ b/app/jobs/hearings/delete_conference_link_job.rb @@ -1,32 +1,54 @@ # frozen_string_literal: true +## +# + class DeleteConferenceLinkJob < CaseflowJob queue_with_priority :low_priority def perform - links_for_past_date = retreive_stale_conference_links - soft_delete_links(links_for_past_date) + begin + links_for_past_date = retreive_stale_conference_links + links_soft_removal(links_for_past_date) + rescue ActiveRecordError => error + log_error(error) + end end private + # Purpose: Queries the database table of conference_links that are associated with a hearing_day that has already passed. + # + # Params: None + # + # Return: A collection of links that have passed. def retreive_stale_conference_links ConferenceLink.joins(:hearing_day).where("scheduled_for < ?", Date.today) end - def soft_delete_links(collection) + # Purpose: Iterates through a collection of links, updating each item and then soft_deleting. + # + # Params: An array of conference_links. + # + # Return: None + def links_soft_removal(collection) collection.each do |old_link| - old_link.update!(update_conf_links) + # old_link.update!(update_conf_links) + old_link.destroy end end + # Purpose: Updates conference_link attributes when passed into the 'update!' method. + # + # Params: None + # + # Return: Hash that will update the conference_link def update_conf_links { conference_deleted: true, updated_by_id: RequestStore[:current_user], updated_at: Time.zone.now, guest_hearing_link: nil, - # guest_pin: nil, guest_pin_long: nil, host_link: nil, host_pin: nil, @@ -34,5 +56,5 @@ def update_conf_links } end - # TODO Create a Hearing Day scheduled in the future. Given that the link is created, that would allow me to test the job and see how many it receives. + # TODO end From ab8e4b0d51cc0b2634398907d161e6b511928e0a Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Tue, 5 Sep 2023 09:06:26 -0400 Subject: [PATCH 072/445] APPEALS-29006 spec file added. Made change to where new job sits within the directory. --- .../delete_conference_link_job.rb | 2 +- spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename app/jobs/{hearings => virtual_hearings}/delete_conference_link_job.rb (95%) create mode 100644 spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb diff --git a/app/jobs/hearings/delete_conference_link_job.rb b/app/jobs/virtual_hearings/delete_conference_link_job.rb similarity index 95% rename from app/jobs/hearings/delete_conference_link_job.rb rename to app/jobs/virtual_hearings/delete_conference_link_job.rb index 6b87dbd7062..488970a4820 100644 --- a/app/jobs/hearings/delete_conference_link_job.rb +++ b/app/jobs/virtual_hearings/delete_conference_link_job.rb @@ -3,7 +3,7 @@ ## # -class DeleteConferenceLinkJob < CaseflowJob +class VirtualHearings::DeleteConferenceLinkJob < CaseflowJob queue_with_priority :low_priority def perform diff --git a/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb b/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb new file mode 100644 index 00000000000..e69de29bb2d From d7e40cd18d143d36213f7d2f0a2d60e5999213a5 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Tue, 5 Sep 2023 09:44:05 -0400 Subject: [PATCH 073/445] APPEALS-25117: fine tuning code, just need request body updates --- .../virtual_hearings/conference_client.rb | 10 +------ app/services/external_api/webex_service.rb | 29 +++++++------------ config/initializers/webex.rb | 2 -- 3 files changed, 11 insertions(+), 30 deletions(-) delete mode 100644 config/initializers/webex.rb diff --git a/app/jobs/virtual_hearings/conference_client.rb b/app/jobs/virtual_hearings/conference_client.rb index 3b2d79e27dc..ddba13cd880 100644 --- a/app/jobs/virtual_hearings/conference_client.rb +++ b/app/jobs/virtual_hearings/conference_client.rb @@ -12,15 +12,7 @@ def client client_host: ENV["PEXIP_CLIENT_HOST"] ) when "webex" - msg = "You hit the Webex Service!" - fail Caseflow::Error::WebexApiError, message: msg - # @client ||= WebexService.new( - # host: ENV["WEBEX_MANAGEMENT_NODE_HOST"], - # port: ENV["WEBEX_MANAGEMENT_NODE_PORT"], - # user_name: ENV["WEBEX_USERNAME"], - # password: ENV["WEBEX_PASSWORD"], - # client_host: ENV["WEBEX_CLIENT_HOST"] - # ) + @client ||= WebexService.new else msg = "Meeting type for the user is invalid" fail Caseflow::Error::MeetingTypeNotFoundError, message: msg diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb index c20548581be..be714d4e62a 100644 --- a/app/services/external_api/webex_service.rb +++ b/app/services/external_api/webex_service.rb @@ -4,14 +4,8 @@ class ExternalApi::WebexService CREATE_CONFERENCE_ENDPOINT = "api-usgov.webex.com/v1/meetings" - - def initialize(host:, port: 443, user_name:, password:, client_host:) - @host = host - @port = port - @user_name = user_name - @password = password - @client_host = client_host - end + MOCK_ENDPOINT = "localhost:3050/fake.#{CREATE_CONFERENCE_ENDPOINT}" + # ENDPOINT = ApplicationController.dependencies_faked? ? MOCK_ENDPOINT : CREATE_CONFERENCE_ENDPOINT def create_conference(virtual_hearing) title @@ -26,6 +20,7 @@ def create_conference(virtual_hearing) body = { "title": title, + # the mock uses 'subject' which is the one we need? "start": start_date_time, "end": end_date_time, # Formatting >> "2019-11-01 21:00:00", @@ -71,16 +66,16 @@ def create_conference(virtual_hearing) ] } - resp = send_webex_request(CREATE_CONFERENCE_ENDPOINT, :post, body: body) + resp = send_webex_request(MOCK_ENDPOINT, :post, body: body) return if resp.nil? ExternalApi::WebexService::CreateResponse.new(resp) end - def delete_conference(conference_id:) - return if conference_id.nil? + def delete_conference(virtual_hearing) + return if virtual_hearing.conference_id.nil? - delete_endpoint = "#{CREATE_CONFERENCE_ENDPOINT}#{conference_id}/" + delete_endpoint = "#{MOCK_ENDPOINT}#{conference_id}/" resp = send_webex_request(delete_endpoint, :delete) return if resp.nil? @@ -89,23 +84,19 @@ def delete_conference(conference_id:) private - attr_reader :host, :port, :user_name, :password, :client_host - # :nocov: def send_webex_request(endpoint, method, body: nil) - url = "https://#{host}:#{port}/#{endpoint}" + url = endpoint request = HTTPI::Request.new(url) - request.auth.basic(user_name, password) request.open_timeout = 300 request.read_timeout = 300 - request.auth.ssl.ca_cert_file = ENV["SSL_CERT_FILE"] request.body = body.to_json unless body.nil? request.headers["Content-Type"] = "application/json" if method == :post MetricsService.record( - "#{host} #{method.to_s.upcase} request to #{url}", - service: :pexip, + "api-usgov.webex #{method.to_s.upcase} request to #{url}", + service: :webex, name: endpoint ) do case method diff --git a/config/initializers/webex.rb b/config/initializers/webex.rb deleted file mode 100644 index b92f02ec34c..00000000000 --- a/config/initializers/webex.rb +++ /dev/null @@ -1,2 +0,0 @@ -VADotGovService = (ApplicationController.dependencies_faked? ? Mocks::WebexMocks::WebexMockService : ExternalApi::WebexService) -# may not need this at all in the end From ae5abb2e09db3446df1829d9fc114cb8b8b2a056 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Tue, 5 Sep 2023 15:03:38 -0400 Subject: [PATCH 074/445] APPEALS-25117: final updates to connect webex service to webex mock server --- app/services/external_api/webex_service.rb | 148 +- client/mocks/webex-mocks/README.md | 6 +- client/package.json | 1 + client/yarn.lock | 1509 +++++++++++++++++++- 4 files changed, 1596 insertions(+), 68 deletions(-) diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb index be714d4e62a..dd3f5352d23 100644 --- a/app/services/external_api/webex_service.rb +++ b/app/services/external_api/webex_service.rb @@ -7,65 +7,111 @@ class ExternalApi::WebexService MOCK_ENDPOINT = "localhost:3050/fake.#{CREATE_CONFERENCE_ENDPOINT}" # ENDPOINT = ApplicationController.dependencies_faked? ? MOCK_ENDPOINT : CREATE_CONFERENCE_ENDPOINT + # Creates a datetime with timezone from these parts + # - Time, a string like "08:30" + # - Timezone, a string like "America/Los_Angeles" + # - Date, a ruby Date + # :reek:UtilityFunction + def combine_time_and_date(time, timezone, date) + # Parse the time string into a ruby Time instance with zone + time_with_zone = time.in_time_zone(timezone) + # Make a string like "2021-04-23 08:30:00" + time_and_date_string = "#{date.strftime('%F')} #{time_with_zone.strftime('%T')}" + # Parse the combined string into a ruby DateTime + combined_datetime = time_and_date_string.in_time_zone(timezone) + # Format the DateTime to iso8601 like "2021-04-23T08:30:00-06:00" + formatted_datetime_string = combined_datetime.iso8601 + + formatted_datetime_string + end + def create_conference(virtual_hearing) - title - # where can we get this from + title = virtual_hearing.alias hearing_day = HearingDay.find(virtual_hearing.hearing.hearing_day_id) - start_date_time = hearing_day.scheduled_for - # does not give timezone - # method to ensure correct formatting - # begins_at in hearing_day auto creates time zone to America/New York...but can be nil - end_date_time - # slot_length_minutes can be nil but relevant? + hearing = Hearing.find(virtual_hearing.hearing.hearing_day_id) + start_date_time = hearing.scheduled_for.iso8601 + timezone = hearing.regional_office&.timezone + end_date = hearing_day.scheduled_for + end_time = "23:59:59" + end_date_time = combine_time_and_date(end_time, timezone, end_date) body = { - "title": title, - # the mock uses 'subject' which is the one we need? - "start": start_date_time, - "end": end_date_time, - # Formatting >> "2019-11-01 21:00:00", - "timezone": "Asia/Shanghai", - # not required - "enabledAutoRecordMeeting": "false", - "allowAnyUserToBeCoHost": "false", - "enabledJoinBeforeHost": "false", - "enableConnectAudioBeforeHost": "false", - "joinBeforeHostMinutes": 0, - "excludePassword": "false", - "publicMeeting": "false", - "reminderTime": 0, - "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - "enabledWebCastView": "false", - "enableAutomaticLock": "false", - "automaticLockMinutes": 0, - "allowFirstUserToBeCoHost": "false", - "allowAuthenticatedDevices": true, - "sendEmail": "false", - "siteUrl": "TBA FROM UC", - "meetingOptions": [ - { - "enabledChat": true, - "enableVideo": true + "jwt": { + "sub": title, + "Nbf": start_date_time, + "Exp": end_date_time, + "flow": { + "id": "sip-no-knock", + "data": [ + { + "uri": "example1@intadmin.room.wbx2.com" + }, + { + "uri": "example2@intadmin.room.wbx2.com" + } + ] } - ], - "attendeePrivileges": { - "enableShareContent": true }, - "enabledBreakoutSessions": false, - "audioConnectionOptions": [ - { - "audioConnectionType": "webexAudio", - "enabledTollFreeCallIn": true, - "enabledGlobalCallIn": true, - "enabledAudianceCallBack": false, - "entryAndExitTone": "beep", - "allowHosttoUnmuteParticipants": true, - "allowAttendeeToUnmuteSelf": true, - "muteAttendeeUponEntry": true - } - ] + "numGuest": 1, + "numHost": 1, + "provideShortUrls": true, + "verticalType": "gen", + "loginUrlForHost": false, + "jweAlg": "PBES2-HS512+A256KW", + "saltLength": 8, + "iterations": 1000, + "enc": "A256GCM", + "jwsAlg": "HS512" } + # body = { + # "title": title, + # # the mock uses 'subject' which is the one we need? + # "start": start_date_time, + # "end": end_date_time, + # # Formatting >> "2019-11-01 21:00:00", + # "timezone": "Asia/Shanghai", + # # not required + # "enabledAutoRecordMeeting": "false", + # "allowAnyUserToBeCoHost": "false", + # "enabledJoinBeforeHost": "false", + # "enableConnectAudioBeforeHost": "false", + # "joinBeforeHostMinutes": 0, + # "excludePassword": "false", + # "publicMeeting": "false", + # "reminderTime": 0, + # "unlockedMeetingJoinSecurity": "allowJoinWithLobby", + # "enabledWebCastView": "false", + # "enableAutomaticLock": "false", + # "automaticLockMinutes": 0, + # "allowFirstUserToBeCoHost": "false", + # "allowAuthenticatedDevices": true, + # "sendEmail": "false", + # "siteUrl": "TBA FROM UC", + # "meetingOptions": [ + # { + # "enabledChat": true, + # "enableVideo": true + # } + # ], + # "attendeePrivileges": { + # "enableShareContent": true + # }, + # "enabledBreakoutSessions": false, + # "audioConnectionOptions": [ + # { + # "audioConnectionType": "webexAudio", + # "enabledTollFreeCallIn": true, + # "enabledGlobalCallIn": true, + # "enabledAudianceCallBack": false, + # "entryAndExitTone": "beep", + # "allowHosttoUnmuteParticipants": true, + # "allowAttendeeToUnmuteSelf": true, + # "muteAttendeeUponEntry": true + # } + # ] + # } + resp = send_webex_request(MOCK_ENDPOINT, :post, body: body) return if resp.nil? diff --git a/client/mocks/webex-mocks/README.md b/client/mocks/webex-mocks/README.md index cca7ce34640..ae827843226 100644 --- a/client/mocks/webex-mocks/README.md +++ b/client/mocks/webex-mocks/README.md @@ -4,9 +4,9 @@ Step 1: Open a terminal Step 2: Navigate to the caseflow/client -step 3: Run command: [npm install json-server] or [yarn add json-server] +step 3: Run command: [yarn add json-server] -If the [npm install json-server] or [yarn add json-server] returns an error that resembles: +If the [yarn add json-server] returns an error that resembles: error standard@17.1.0: The engine "node" is incompatible with this module. Expected version "^12.22.0 || ^14.17.0 || >=16.0.0". Got "15.1.0" @@ -18,7 +18,7 @@ for brevity These instructions will follow the happy path. While in the client If for any reason you want to go back to the original nodenv that was used prior to this change you can run, [nodenv local 12.13.0] -If it all succeeds you can attempt the [npm install json-server] or [yarn add json-server] once again. +If it all succeeds you can attempt the [yarn add json-server] once again. This time with no issue. given that the install goes as expected you can continue following the rest of the directions. diff --git a/client/package.json b/client/package.json index 2c59c1ca2a0..34b6db5339c 100644 --- a/client/package.json +++ b/client/package.json @@ -92,6 +92,7 @@ "immutability-helper": "^3.0.1", "immutable": "^3.8.2", "imports-loader": "^0.7.1", + "json-server": "^0.17.3", "lodash": "^4.17.21", "mark.js": "^8.11.0", "moment": "^2.24.0", diff --git a/client/yarn.lock b/client/yarn.lock index 494f936b028..e1e68156cd6 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -2,6 +2,11 @@ # yarn lockfile v1 +"@aashutoshrathi/word-wrap@^1.2.3": + version "1.2.6" + resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" + integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== + "@babel/cli@^7.12.8": version "7.12.8" resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.12.8.tgz#3b24ed2fd5da353ee6f19e8935ff8c93b5fe8430" @@ -2661,6 +2666,38 @@ resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46" integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA== +"@eslint-community/eslint-utils@^4.2.0": + version "4.4.0" + resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" + integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA== + dependencies: + eslint-visitor-keys "^3.3.0" + +"@eslint-community/regexpp@^4.6.1": + version "4.8.0" + resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.8.0.tgz#11195513186f68d42fbf449f9a7136b2c0c92005" + integrity sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg== + +"@eslint/eslintrc@^2.1.2": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.2.tgz#c6936b4b328c64496692f76944e755738be62396" + integrity sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g== + dependencies: + ajv "^6.12.4" + debug "^4.3.2" + espree "^9.6.0" + globals "^13.19.0" + ignore "^5.2.0" + import-fresh "^3.2.1" + js-yaml "^4.1.0" + minimatch "^3.1.2" + strip-json-comments "^3.1.1" + +"@eslint/js@8.48.0": + version "8.48.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.48.0.tgz#642633964e217905436033a2bd08bf322849b7fb" + integrity sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw== + "@fortawesome/fontawesome-free@^5.3.1": version "5.3.1" resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.3.1.tgz#5466b8f31c1f493a96754c1426c25796d0633dd9" @@ -2675,6 +2712,25 @@ resolved "https://registry.yarnpkg.com/@hookform/resolvers/-/resolvers-2.0.0-beta.5.tgz#35b8c605973d201281649e5504a2e164185b4fe4" integrity sha512-q3DqKeYJyFvqkWUo3eQ2SJenI2lECuTeBZvp8WebjS80SaRY3+npC4Vx9ILk8hm3jinT95tN7mkl9hJrjyPkuA== +"@humanwhocodes/config-array@^0.11.10": + version "0.11.11" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.11.tgz#88a04c570dbbc7dd943e4712429c3df09bc32844" + integrity sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA== + dependencies: + "@humanwhocodes/object-schema" "^1.2.1" + debug "^4.1.1" + minimatch "^3.0.5" + +"@humanwhocodes/module-importer@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" + integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== + +"@humanwhocodes/object-schema@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" + integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== + "@istanbuljs/load-nyc-config@^1.0.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" @@ -3033,7 +3089,7 @@ resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b" integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw== -"@nodelib/fs.walk@^1.2.3": +"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8": version "1.2.8" resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== @@ -4072,6 +4128,11 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== +"@types/json5@^0.0.29": + version "0.0.29" + resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" + integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== + "@types/lodash@^4.14.165": version "4.14.168" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.168.tgz#fe24632e79b7ade3f132891afff86caa5e5ce008" @@ -4567,7 +4628,7 @@ acorn-jsx@^5.2.0: resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe" integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ== -acorn-jsx@^5.3.1: +acorn-jsx@^5.3.1, acorn-jsx@^5.3.2: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== @@ -4639,6 +4700,11 @@ acorn@^8.1.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.4.tgz#caba24b08185c3b56e3168e97d15ed17f4d31fd0" integrity sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg== +acorn@^8.9.0: + version "8.10.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5" + integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw== + address@1.1.2, address@^1.0.1: version "1.1.2" resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6" @@ -4726,7 +4792,7 @@ ajv@^6.10.0: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^6.12.3, ajv@^6.12.5: +ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -4800,6 +4866,11 @@ ansi-regex@^5.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== +ansi-regex@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== + ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" @@ -4876,6 +4947,11 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" +argparse@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== + aria-query@^4.2.2: version "4.2.2" resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz#0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b" @@ -4899,6 +4975,14 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= +array-buffer-byte-length@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead" + integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A== + dependencies: + call-bind "^1.0.2" + is-array-buffer "^3.0.1" + array-filter@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83" @@ -4939,6 +5023,17 @@ array-includes@^3.0.3, array-includes@^3.1.1: es-abstract "^1.17.0" is-string "^1.0.5" +array-includes@^3.1.6: + version "3.1.7" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.7.tgz#8cd2e01b26f7a3086cbc87271593fe921c62abda" + integrity sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + get-intrinsic "^1.2.1" + is-string "^1.0.7" + array-map@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662" @@ -4977,6 +5072,17 @@ array.prototype.find@^2.1.0: define-properties "^1.1.3" es-abstract "^1.13.0" +array.prototype.findlastindex@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz#b37598438f97b579166940814e2c0493a4f50207" + integrity sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + es-shim-unscopables "^1.0.0" + get-intrinsic "^1.2.1" + array.prototype.flat@^1.2.1: version "1.2.3" resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b" @@ -4985,6 +5091,16 @@ array.prototype.flat@^1.2.1: define-properties "^1.1.3" es-abstract "^1.17.0-next.1" +array.prototype.flat@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2" + integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.4" + es-abstract "^1.20.4" + es-shim-unscopables "^1.0.0" + array.prototype.flatmap@^1.2.1: version "1.2.3" resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.3.tgz#1c13f84a178566042dd63de4414440db9222e443" @@ -4994,6 +5110,16 @@ array.prototype.flatmap@^1.2.1: es-abstract "^1.17.0-next.1" function-bind "^1.1.1" +array.prototype.flatmap@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz#1aae7903c2100433cb8261cd4ed310aab5c4a183" + integrity sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.4" + es-abstract "^1.20.4" + es-shim-unscopables "^1.0.0" + array.prototype.map@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/array.prototype.map/-/array.prototype.map-1.0.2.tgz#9a4159f416458a23e9483078de1106b2ef68f8ec" @@ -5004,6 +5130,29 @@ array.prototype.map@^1.0.1: es-array-method-boxes-properly "^1.0.0" is-string "^1.0.4" +array.prototype.tosorted@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz#ccf44738aa2b5ac56578ffda97c03fd3e23dd532" + integrity sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.4" + es-abstract "^1.20.4" + es-shim-unscopables "^1.0.0" + get-intrinsic "^1.1.3" + +arraybuffer.prototype.slice@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz#9b5ea3868a6eebc30273da577eb888381c0044bb" + integrity sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw== + dependencies: + array-buffer-byte-length "^1.0.0" + call-bind "^1.0.2" + define-properties "^1.2.0" + get-intrinsic "^1.2.1" + is-array-buffer "^3.0.2" + is-shared-array-buffer "^1.0.2" + arrify@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa" @@ -5088,6 +5237,13 @@ async@^2.6.2: dependencies: lodash "^4.17.14" +asynciterator.prototype@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/asynciterator.prototype/-/asynciterator.prototype-1.0.0.tgz#8c5df0514936cdd133604dfcc9d3fb93f09b2b62" + integrity sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg== + dependencies: + has-symbols "^1.0.3" + asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -5116,6 +5272,11 @@ autoprefixer@^9.8.6: postcss "^7.0.32" postcss-value-parser "^4.1.0" +available-typed-arrays@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" + integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== + aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" @@ -5436,6 +5597,13 @@ base@^0.11.1: mixin-deep "^1.2.0" pascalcase "^0.1.1" +basic-auth@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a" + integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg== + dependencies: + safe-buffer "5.1.2" + batch-processor@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/batch-processor/-/batch-processor-1.0.0.tgz#75c95c32b748e0850d10c2b168f6bdbe9891ace8" @@ -5524,6 +5692,24 @@ body-parser@1.19.0: raw-body "2.4.0" type-is "~1.6.17" +body-parser@^1.19.0: + version "1.20.2" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd" + integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA== + dependencies: + bytes "3.1.2" + content-type "~1.0.5" + debug "2.6.9" + depd "2.0.0" + destroy "1.2.0" + http-errors "2.0.0" + iconv-lite "0.4.24" + on-finished "2.4.1" + qs "6.11.0" + raw-body "2.5.2" + type-is "~1.6.18" + unpipe "1.0.0" + bonjour@^3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5" @@ -5820,6 +6006,13 @@ builtin-status-codes@^3.0.0: resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug= +builtins@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9" + integrity sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ== + dependencies: + semver "^7.0.0" + bytes@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" @@ -5830,6 +6023,11 @@ bytes@3.1.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== +bytes@3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" + integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== + cacache@^12.0.2: version "12.0.4" resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c" @@ -6036,6 +6234,14 @@ chalk@^4.0.0, chalk@^4.1.0: ansi-styles "^4.1.0" supports-color "^7.1.0" +chalk@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + char-regex@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" @@ -6264,6 +6470,15 @@ cliui@^6.0.0: strip-ansi "^6.0.0" wrap-ansi "^6.2.0" +cliui@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" + integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.1" + wrap-ansi "^7.0.0" + clone-deep@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" @@ -6507,6 +6722,11 @@ connect-history-api-fallback@^1.6.0: resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg== +connect-pause@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/connect-pause/-/connect-pause-0.1.1.tgz#b269b2bb82ddb1ac3db5099c0fb582aba99fb37a" + integrity sha512-a1gSWQBQD73krFXdUEYJom2RTFrWUL3YvXDCRkyv//GVXc79cdW9MngtRuN9ih4FDKBtfJAJId+BbDuX+1rh2w== + console-browserify@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" @@ -6537,6 +6757,11 @@ content-type@~1.0.4: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== +content-type@~1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" + integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== + convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" @@ -6658,6 +6883,14 @@ core-util-is@1.0.2, core-util-is@~1.0.0: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= +cors@^2.8.5: + version "2.8.5" + resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29" + integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g== + dependencies: + object-assign "^4" + vary "^1" + cosmiconfig@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" @@ -6962,6 +7195,13 @@ date-fns@^2.16.1: resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.16.1.tgz#05775792c3f3331da812af253e1a935851d3834b" integrity sha512-sAJVKx/FqrLYHAQeN7VpJrPhagZc9R4ImZIWYRFZaaohR3KzmuK88touwsSwSVT8Qcbd4zoDsnGfX4GFB4imyQ== +debug@*, debug@^4.3.2: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + dependencies: + ms "2.1.2" + debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -6969,6 +7209,13 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9: dependencies: ms "2.0.0" +debug@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" + integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== + dependencies: + ms "2.0.0" + debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" @@ -6976,6 +7223,13 @@ debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5: dependencies: ms "^2.1.1" +debug@^3.2.7: + version "3.2.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== + dependencies: + ms "^2.1.1" + debug@^4.0.0: version "4.2.0" resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1" @@ -7053,6 +7307,14 @@ define-properties@^1.1.2, define-properties@^1.1.3: dependencies: object-keys "^1.0.12" +define-properties@^1.1.4, define-properties@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5" + integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA== + dependencies: + has-property-descriptors "^1.0.0" + object-keys "^1.1.1" + define-property@^0.2.5: version "0.2.5" resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" @@ -7107,6 +7369,11 @@ delegates@^1.0.0: resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= +depd@2.0.0, depd@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" + integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== + depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" @@ -7129,6 +7396,11 @@ des.js@^1.0.0: inherits "^2.0.1" minimalistic-assert "^1.0.0" +destroy@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" + integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== + destroy@~1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" @@ -7762,6 +8034,14 @@ error-stack-parser@^2.0.6: dependencies: stackframe "^1.1.1" +errorhandler@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/errorhandler/-/errorhandler-1.5.1.tgz#b9ba5d17cf90744cd1e851357a6e75bf806a9a91" + integrity sha512-rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A== + dependencies: + accepts "~1.3.7" + escape-html "~1.0.3" + es-abstract@^1.13.0: version "1.16.3" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.3.tgz#52490d978f96ff9f89ec15b5cf244304a5bca161" @@ -7795,6 +8075,51 @@ es-abstract@^1.17.0, es-abstract@^1.17.0-next.0, es-abstract@^1.17.0-next.1, es- string.prototype.trimend "^1.0.1" string.prototype.trimstart "^1.0.1" +es-abstract@^1.20.4, es-abstract@^1.22.1: + version "1.22.1" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.1.tgz#8b4e5fc5cefd7f1660f0f8e1a52900dfbc9d9ccc" + integrity sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw== + dependencies: + array-buffer-byte-length "^1.0.0" + arraybuffer.prototype.slice "^1.0.1" + available-typed-arrays "^1.0.5" + call-bind "^1.0.2" + es-set-tostringtag "^2.0.1" + es-to-primitive "^1.2.1" + function.prototype.name "^1.1.5" + get-intrinsic "^1.2.1" + get-symbol-description "^1.0.0" + globalthis "^1.0.3" + gopd "^1.0.1" + has "^1.0.3" + has-property-descriptors "^1.0.0" + has-proto "^1.0.1" + has-symbols "^1.0.3" + internal-slot "^1.0.5" + is-array-buffer "^3.0.2" + is-callable "^1.2.7" + is-negative-zero "^2.0.2" + is-regex "^1.1.4" + is-shared-array-buffer "^1.0.2" + is-string "^1.0.7" + is-typed-array "^1.1.10" + is-weakref "^1.0.2" + object-inspect "^1.12.3" + object-keys "^1.1.1" + object.assign "^4.1.4" + regexp.prototype.flags "^1.5.0" + safe-array-concat "^1.0.0" + safe-regex-test "^1.0.0" + string.prototype.trim "^1.2.7" + string.prototype.trimend "^1.0.6" + string.prototype.trimstart "^1.0.6" + typed-array-buffer "^1.0.0" + typed-array-byte-length "^1.0.0" + typed-array-byte-offset "^1.0.0" + typed-array-length "^1.0.4" + unbox-primitive "^1.0.2" + which-typed-array "^1.1.10" + es-abstract@^1.6.1: version "1.9.0" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.9.0.tgz#690829a07cae36b222e7fd9b75c0d0573eb25227" @@ -7823,6 +8148,42 @@ es-get-iterator@^1.0.2: is-string "^1.0.5" isarray "^2.0.5" +es-iterator-helpers@^1.0.12: + version "1.0.14" + resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.0.14.tgz#19cd7903697d97e21198f3293b55e8985791c365" + integrity sha512-JgtVnwiuoRuzLvqelrvN3Xu7H9bu2ap/kQ2CrM62iidP8SKuD99rWU3CJy++s7IVL2qb/AjXPGR/E7i9ngd/Cw== + dependencies: + asynciterator.prototype "^1.0.0" + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + es-set-tostringtag "^2.0.1" + function-bind "^1.1.1" + get-intrinsic "^1.2.1" + globalthis "^1.0.3" + has-property-descriptors "^1.0.0" + has-proto "^1.0.1" + has-symbols "^1.0.3" + internal-slot "^1.0.5" + iterator.prototype "^1.1.0" + safe-array-concat "^1.0.0" + +es-set-tostringtag@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8" + integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg== + dependencies: + get-intrinsic "^1.1.3" + has "^1.0.3" + has-tostringtag "^1.0.0" + +es-shim-unscopables@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241" + integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w== + dependencies: + has "^1.0.3" + es-to-primitive@^1.1.1, es-to-primitive@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" @@ -7893,6 +8254,11 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + escodegen@^1.14.1: version "1.14.1" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457" @@ -7917,6 +8283,16 @@ escodegen@^2.0.0: optionalDependencies: source-map "~0.6.1" +eslint-config-standard-jsx@^11.0.0: + version "11.0.0" + resolved "https://registry.yarnpkg.com/eslint-config-standard-jsx/-/eslint-config-standard-jsx-11.0.0.tgz#70852d395731a96704a592be5b0bfaccfeded239" + integrity sha512-+1EV/R0JxEK1L0NGolAr8Iktm3Rgotx3BKwgaX+eAuSX8D952LULKtjgZD3F+e6SvibONnhLwoTi9DPxN5LvvQ== + +eslint-config-standard@17.1.0: + version "17.1.0" + resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz#40ffb8595d47a6b242e07cbfd49dc211ed128975" + integrity sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q== + eslint-import-resolver-node@^0.3.2: version "0.3.3" resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz#dbaa52b6b2816b50bc6711af75422de808e98404" @@ -7925,6 +8301,15 @@ eslint-import-resolver-node@^0.3.2: debug "^2.6.9" resolve "^1.13.1" +eslint-import-resolver-node@^0.3.7: + version "0.3.9" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac" + integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g== + dependencies: + debug "^3.2.7" + is-core-module "^2.13.0" + resolve "^1.22.4" + eslint-import-resolver-webpack@^0.13.0: version "0.13.0" resolved "https://registry.yarnpkg.com/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.13.0.tgz#5cb19cf4b6996c8a2514aeb10f909e2c70488dc3" @@ -7949,6 +8334,13 @@ eslint-module-utils@^2.4.1: debug "^2.6.9" pkg-dir "^2.0.0" +eslint-module-utils@^2.8.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz#e439fee65fc33f6bba630ff621efc38ec0375c49" + integrity sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw== + dependencies: + debug "^3.2.7" + eslint-plugin-babel@^5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-5.3.0.tgz#2e7f251ccc249326da760c1a4c948a91c32d0023" @@ -7956,6 +8348,14 @@ eslint-plugin-babel@^5.3.0: dependencies: eslint-rule-composer "^0.3.0" +eslint-plugin-es@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz#f0822f0c18a535a97c3e714e89f88586a7641ec9" + integrity sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ== + dependencies: + eslint-utils "^2.0.0" + regexpp "^3.0.0" + eslint-plugin-import@^2.20.1: version "2.20.1" resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz#802423196dcb11d9ce8435a5fc02a6d3b46939b3" @@ -7974,6 +8374,29 @@ eslint-plugin-import@^2.20.1: read-pkg-up "^2.0.0" resolve "^1.12.0" +eslint-plugin-import@^2.27.5: + version "2.28.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz#63b8b5b3c409bfc75ebaf8fb206b07ab435482c4" + integrity sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A== + dependencies: + array-includes "^3.1.6" + array.prototype.findlastindex "^1.2.2" + array.prototype.flat "^1.3.1" + array.prototype.flatmap "^1.3.1" + debug "^3.2.7" + doctrine "^2.1.0" + eslint-import-resolver-node "^0.3.7" + eslint-module-utils "^2.8.0" + has "^1.0.3" + is-core-module "^2.13.0" + is-glob "^4.0.3" + minimatch "^3.1.2" + object.fromentries "^2.0.6" + object.groupby "^1.0.0" + object.values "^1.1.6" + semver "^6.3.1" + tsconfig-paths "^3.14.2" + eslint-plugin-jest@^23.19.0: version "23.19.0" resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.19.0.tgz#da9c45a629bf3180269c7d5033afd7f8b910bde5" @@ -7987,6 +8410,25 @@ eslint-plugin-mocha@^4.11.0: dependencies: ramda "^0.24.1" +eslint-plugin-n@^15.7.0: + version "15.7.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz#e29221d8f5174f84d18f2eb94765f2eeea033b90" + integrity sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q== + dependencies: + builtins "^5.0.1" + eslint-plugin-es "^4.1.0" + eslint-utils "^3.0.0" + ignore "^5.1.1" + is-core-module "^2.11.0" + minimatch "^3.1.2" + resolve "^1.22.1" + semver "^7.3.8" + +eslint-plugin-promise@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz#269a3e2772f62875661220631bd4dafcb4083816" + integrity sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig== + eslint-plugin-react@^7.19.0: version "7.19.0" resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.19.0.tgz#6d08f9673628aa69c5559d33489e855d83551666" @@ -8005,6 +8447,28 @@ eslint-plugin-react@^7.19.0: string.prototype.matchall "^4.0.2" xregexp "^4.3.0" +eslint-plugin-react@^7.32.2: + version "7.33.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz#69ee09443ffc583927eafe86ffebb470ee737608" + integrity sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw== + dependencies: + array-includes "^3.1.6" + array.prototype.flatmap "^1.3.1" + array.prototype.tosorted "^1.1.1" + doctrine "^2.1.0" + es-iterator-helpers "^1.0.12" + estraverse "^5.3.0" + jsx-ast-utils "^2.4.1 || ^3.0.0" + minimatch "^3.1.2" + object.entries "^1.1.6" + object.fromentries "^2.0.6" + object.hasown "^1.1.2" + object.values "^1.1.6" + prop-types "^15.8.1" + resolve "^2.0.0-next.4" + semver "^6.3.1" + string.prototype.matchall "^4.0.8" + eslint-rule-composer@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9" @@ -8034,6 +8498,14 @@ eslint-scope@^5.0.0: esrecurse "^4.1.0" estraverse "^4.1.1" +eslint-scope@^7.2.2: + version "7.2.2" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f" + integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg== + dependencies: + esrecurse "^4.3.0" + estraverse "^5.2.0" + eslint-utils@^1.3.1: version "1.4.3" resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f" @@ -8048,11 +8520,28 @@ eslint-utils@^2.0.0: dependencies: eslint-visitor-keys "^1.1.0" +eslint-utils@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" + integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== + dependencies: + eslint-visitor-keys "^2.0.0" + eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A== +eslint-visitor-keys@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== + +eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3: + version "3.4.3" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800" + integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== + eslint@^5.0.0: version "5.16.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea" @@ -8137,6 +8626,49 @@ eslint@^7.0.0: text-table "^0.2.0" v8-compile-cache "^2.0.3" +eslint@^8.41.0: + version "8.48.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.48.0.tgz#bf9998ba520063907ba7bfe4c480dc8be03c2155" + integrity sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg== + dependencies: + "@eslint-community/eslint-utils" "^4.2.0" + "@eslint-community/regexpp" "^4.6.1" + "@eslint/eslintrc" "^2.1.2" + "@eslint/js" "8.48.0" + "@humanwhocodes/config-array" "^0.11.10" + "@humanwhocodes/module-importer" "^1.0.1" + "@nodelib/fs.walk" "^1.2.8" + ajv "^6.12.4" + chalk "^4.0.0" + cross-spawn "^7.0.2" + debug "^4.3.2" + doctrine "^3.0.0" + escape-string-regexp "^4.0.0" + eslint-scope "^7.2.2" + eslint-visitor-keys "^3.4.3" + espree "^9.6.1" + esquery "^1.4.2" + esutils "^2.0.2" + fast-deep-equal "^3.1.3" + file-entry-cache "^6.0.1" + find-up "^5.0.0" + glob-parent "^6.0.2" + globals "^13.19.0" + graphemer "^1.4.0" + ignore "^5.2.0" + imurmurhash "^0.1.4" + is-glob "^4.0.0" + is-path-inside "^3.0.3" + js-yaml "^4.1.0" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.4.1" + lodash.merge "^4.6.2" + minimatch "^3.1.2" + natural-compare "^1.4.0" + optionator "^0.9.3" + strip-ansi "^6.0.1" + text-table "^0.2.0" + espree@^3.5.2: version "3.5.4" resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7" @@ -8163,6 +8695,15 @@ espree@^7.0.0: acorn-jsx "^5.2.0" eslint-visitor-keys "^1.1.0" +espree@^9.6.0, espree@^9.6.1: + version "9.6.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f" + integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ== + dependencies: + acorn "^8.9.0" + acorn-jsx "^5.3.2" + eslint-visitor-keys "^3.4.1" + esprima@^4.0.0, esprima@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" @@ -8188,6 +8729,13 @@ esquery@^1.2.0: dependencies: estraverse "^5.1.0" +esquery@^1.4.2: + version "1.5.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b" + integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg== + dependencies: + estraverse "^5.1.0" + esrecurse@^4.1.0: version "4.2.1" resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf" @@ -8195,6 +8743,13 @@ esrecurse@^4.1.0: dependencies: estraverse "^4.1.0" +esrecurse@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== + dependencies: + estraverse "^5.2.0" + estraverse@^4.0.0: version "4.2.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" @@ -8214,6 +8769,11 @@ estraverse@^5.2.0: resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== +estraverse@^5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== + esutils@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" @@ -8344,6 +8904,14 @@ expose-loader@^0.7.3: version "0.7.3" resolved "https://registry.yarnpkg.com/expose-loader/-/expose-loader-0.7.3.tgz#35fbd3659789e4faa81f59de8b7e9fc39e466d51" +express-urlrewrite@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/express-urlrewrite/-/express-urlrewrite-1.4.0.tgz#985ee022773bac7ed32126f1cf9ec8ee48e1290a" + integrity sha512-PI5h8JuzoweS26vFizwQl6UTF25CAHSggNv0J25Dn/IKZscJHWZzPrI5z2Y2jgOzIaw2qh8l6+/jUcig23Z2SA== + dependencies: + debug "*" + path-to-regexp "^1.0.3" + express@^4.17.1: version "4.17.1" resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" @@ -8577,6 +9145,13 @@ file-entry-cache@^5.0.1: dependencies: flat-cache "^2.0.1" +file-entry-cache@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" + integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== + dependencies: + flat-cache "^3.0.4" + file-loader@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-2.0.0.tgz#39749c82f020b9e85901dcff98e8004e6401cfde" @@ -8756,6 +9331,13 @@ font-awesome@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133" +for-each@^0.3.3: + version "0.3.3" + resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" + integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw== + dependencies: + is-callable "^1.1.3" + for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -8969,6 +9551,16 @@ function.prototype.name@^1.1.0, function.prototype.name@^1.1.1: es-abstract "^1.17.0-next.1" functions-have-names "^1.2.0" +function.prototype.name@^1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd" + integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + functions-have-names "^1.2.3" + functional-red-black-tree@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" @@ -8978,6 +9570,11 @@ functions-have-names@^1.2.0: resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.1.tgz#a981ac397fa0c9964551402cdc5533d7a4d52f91" integrity sha512-j48B/ZI7VKs3sgeI2cZp7WXWmZXu7Iq5pl5/vptV5N2mq+DGFuS/ulaDjtaoLpYzuD6u8UgrUKHfgo7fDTSiBA== +functions-have-names@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" + integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== + fuse.js@^3.6.1: version "3.6.1" resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-3.6.1.tgz#7de85fdd6e1b3377c23ce010892656385fd9b10c" @@ -9023,7 +9620,7 @@ get-caller-file@^1.0.1: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w== -get-caller-file@^2.0.1: +get-caller-file@^2.0.1, get-caller-file@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== @@ -9037,6 +9634,16 @@ get-intrinsic@^1.0.2: has "^1.0.3" has-symbols "^1.0.1" +get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82" + integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw== + dependencies: + function-bind "^1.1.1" + has "^1.0.3" + has-proto "^1.0.1" + has-symbols "^1.0.3" + get-package-type@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" @@ -9047,6 +9654,11 @@ get-stdin@^4.0.1: resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4= +get-stdin@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53" + integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg== + get-stream@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" @@ -9066,6 +9678,14 @@ get-stream@^5.0.0: dependencies: pump "^3.0.0" +get-symbol-description@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" + integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.1.1" + get-symbol-from-current-process-h@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/get-symbol-from-current-process-h/-/get-symbol-from-current-process-h-1.0.2.tgz#510af52eaef873f7028854c3377f47f7bb200265" @@ -9144,6 +9764,13 @@ glob-parent@^5.1.2: dependencies: is-glob "^4.0.1" +glob-parent@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" + integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== + dependencies: + is-glob "^4.0.3" + glob-promise@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/glob-promise/-/glob-promise-3.4.0.tgz#b6b8f084504216f702dc2ce8c9bc9ac8866fdb20" @@ -9224,6 +9851,13 @@ globals@^12.1.0: dependencies: type-fest "^0.8.1" +globals@^13.19.0: + version "13.21.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.21.0.tgz#163aae12f34ef502f5153cfbdd3600f36c63c571" + integrity sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg== + dependencies: + type-fest "^0.20.2" + globalthis@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.1.tgz#40116f5d9c071f9e8fb0037654df1ab3a83b7ef9" @@ -9231,6 +9865,13 @@ globalthis@^1.0.0: dependencies: define-properties "^1.1.3" +globalthis@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf" + integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA== + dependencies: + define-properties "^1.1.3" + globby@11.0.1: version "11.0.1" resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357" @@ -9295,11 +9936,28 @@ good-listener@^1.2.2: dependencies: delegate "^3.1.2" +gopd@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" + integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== + dependencies: + get-intrinsic "^1.1.3" + graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.4: version "4.2.4" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== +graceful-fs@^4.1.3: + version "4.2.11" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" + integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== + +graphemer@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6" + integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag== + growly@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" @@ -9355,6 +10013,11 @@ has-ansi@^2.0.0: dependencies: ansi-regex "^2.0.0" +has-bigints@^1.0.1, has-bigints@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa" + integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ== + has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -9372,11 +10035,28 @@ has-glob@^1.0.0: dependencies: is-glob "^3.0.0" +has-property-descriptors@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861" + integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ== + dependencies: + get-intrinsic "^1.1.1" + +has-proto@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" + integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg== + has-symbols@^1.0.1, has-symbols@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== +has-symbols@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" + integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== + has-tostringtag@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" @@ -9738,6 +10418,17 @@ http-errors@1.7.2: statuses ">= 1.5.0 < 2" toidentifier "1.0.0" +http-errors@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" + integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ== + dependencies: + depd "2.0.0" + inherits "2.0.4" + setprototypeof "1.2.0" + statuses "2.0.1" + toidentifier "1.0.1" + http-errors@~1.6.2: version "1.6.3" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" @@ -9852,6 +10543,11 @@ ignore@^4.0.3, ignore@^4.0.6: resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== +ignore@^5.1.1, ignore@^5.2.0: + version "5.2.4" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" + integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== + ignore@^5.1.4: version "5.1.8" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" @@ -10074,6 +10770,15 @@ internal-slot@^1.0.2: has "^1.0.3" side-channel "^1.0.2" +internal-slot@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986" + integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ== + dependencies: + get-intrinsic "^1.2.0" + has "^1.0.3" + side-channel "^1.0.4" + interpret@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296" @@ -10157,15 +10862,38 @@ is-arguments@^1.0.4: resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3" integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA== +is-array-buffer@^3.0.1, is-array-buffer@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe" + integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.2.0" + is-typed-array "^1.1.10" + is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= -is-binary-path@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" - integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg= +is-async-function@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.0.0.tgz#8e4418efd3e5d3a6ebb0164c05ef5afb69aa9646" + integrity sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA== + dependencies: + has-tostringtag "^1.0.0" + +is-bigint@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" + integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== + dependencies: + has-bigints "^1.0.1" + +is-binary-path@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" + integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg= dependencies: binary-extensions "^1.0.0" @@ -10180,6 +10908,14 @@ is-boolean-object@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.0.tgz#98f8b28030684219a95f375cfbd88ce3405dff93" +is-boolean-object@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" + is-buffer@^1.1.0: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" @@ -10194,6 +10930,11 @@ is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.0: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb" integrity sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw== +is-callable@^1.2.7: + version "1.2.7" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" + integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== + is-ci@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" @@ -10201,6 +10942,13 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" +is-core-module@^2.11.0, is-core-module@^2.13.0, is-core-module@^2.9.0: + version "2.13.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db" + integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ== + dependencies: + has "^1.0.3" + is-core-module@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz#d341652e3408bca69c4671b79a0954a3d349f887" @@ -10227,6 +10975,13 @@ is-date-object@^1.0.1: resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== +is-date-object@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" + integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== + dependencies: + has-tostringtag "^1.0.0" + is-decimal@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5" @@ -10285,6 +11040,13 @@ is-extglob@^2.1.0, is-extglob@^2.1.1: resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= +is-finalizationregistry@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz#c8749b65f17c133313e661b1289b95ad3dbd62e6" + integrity sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw== + dependencies: + call-bind "^1.0.2" + is-finite@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" @@ -10319,6 +11081,13 @@ is-generator-fn@^2.0.0: resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118" integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ== +is-generator-function@^1.0.10: + version "1.0.10" + resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72" + integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A== + dependencies: + has-tostringtag "^1.0.0" + is-glob@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" @@ -10340,6 +11109,13 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: dependencies: is-extglob "^2.1.1" +is-glob@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== + dependencies: + is-extglob "^2.1.1" + is-hexadecimal@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7" @@ -10350,10 +11126,22 @@ is-map@^2.0.1: resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.1.tgz#520dafc4307bb8ebc33b813de5ce7c9400d644a1" integrity sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw== +is-negative-zero@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" + integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== + is-number-object@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.3.tgz#f265ab89a9f445034ef6aff15a8f00b00f551799" +is-number-object@^1.0.4: + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc" + integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ== + dependencies: + has-tostringtag "^1.0.0" + is-number@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" @@ -10390,6 +11178,11 @@ is-path-inside@^2.1.0: dependencies: path-is-inside "^1.0.2" +is-path-inside@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" + integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== + is-plain-obj@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" @@ -10412,6 +11205,11 @@ is-potential-custom-element-name@^1.0.0: resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397" integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c= +is-promise@^2.1.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1" + integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ== + is-regex@^1.0.4, is-regex@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz#ece38e389e490df0dc21caea2bd596f987f767ff" @@ -10419,7 +11217,7 @@ is-regex@^1.0.4, is-regex@^1.1.0: dependencies: has-symbols "^1.0.1" -is-regex@^1.1.2: +is-regex@^1.1.2, is-regex@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== @@ -10437,6 +11235,13 @@ is-set@^2.0.1: resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.1.tgz#d1604afdab1724986d30091575f54945da7e5f43" integrity sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA== +is-shared-array-buffer@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" + integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA== + dependencies: + call-bind "^1.0.2" + is-stream@^1.0.1, is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" @@ -10452,6 +11257,13 @@ is-string@^1.0.4, is-string@^1.0.5: resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ== +is-string@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" + integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== + dependencies: + has-tostringtag "^1.0.0" + is-subset@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6" @@ -10463,6 +11275,13 @@ is-symbol@^1.0.2, is-symbol@^1.0.3: dependencies: has-symbols "^1.0.1" +is-typed-array@^1.1.10, is-typed-array@^1.1.9: + version "1.1.12" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a" + integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg== + dependencies: + which-typed-array "^1.1.11" + is-typedarray@^1.0.0, is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" @@ -10473,6 +11292,26 @@ is-utf8@^0.2.0: resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI= +is-weakmap@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2" + integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA== + +is-weakref@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" + integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ== + dependencies: + call-bind "^1.0.2" + +is-weakset@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.2.tgz#4569d67a747a1ce5a994dfd4ef6dcea76e7c0a1d" + integrity sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.1.1" + is-whitespace-character@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7" @@ -10613,6 +11452,16 @@ iterate-value@^1.0.0: es-get-iterator "^1.0.2" iterate-iterator "^1.0.1" +iterator.prototype@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.1.tgz#ab5b790e23ec00658f5974e032a2b05188bd3a5c" + integrity sha512-9E+nePc8C9cnQldmNl6bgpTY6zI4OPRZd97fhJ/iVZ1GifIUDVV5F6x1nEDqpe8KaMEZGT4xgrwKQDxXnjOIZQ== + dependencies: + define-properties "^1.2.0" + get-intrinsic "^1.2.1" + has-symbols "^1.0.3" + reflect.getprototypeof "^1.0.3" + jest-axe@^3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/jest-axe/-/jest-axe-3.5.0.tgz#a8c88c1f1411e57626c488a2bc44ff23d79b1426" @@ -11160,6 +12009,11 @@ jest@^26.4.1: import-local "^3.0.2" jest-cli "^26.4.1" +jju@^1.1.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/jju/-/jju-1.4.0.tgz#a3abe2718af241a2b2904f84a625970f389ae32a" + integrity sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA== + js-base64@^2.1.8: version "2.5.1" resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121" @@ -11191,6 +12045,13 @@ js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" +js-yaml@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== + dependencies: + argparse "^2.0.1" + jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" @@ -11270,7 +12131,7 @@ jsesc@~0.5.0: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= -json-parse-better-errors@^1.0.2: +json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== @@ -11280,6 +12141,13 @@ json-parse-even-better-errors@^2.3.0: resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== +json-parse-helpfulerror@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz#13f14ce02eed4e981297b64eb9e3b932e2dd13dc" + integrity sha512-XgP0FGR77+QhUxjXkwOMkC94k3WtqEBfcnjWqhRd82qTat4SWKRE+9kUnynz/shm3I4ea2+qISvTIeGTNU7kJg== + dependencies: + jju "^1.1.0" + json-schema-traverse@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" @@ -11290,6 +12158,32 @@ json-schema@0.2.3: resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= +json-server@^0.17.3: + version "0.17.3" + resolved "https://registry.yarnpkg.com/json-server/-/json-server-0.17.3.tgz#c641884189aad59f101f7ad9f519fa3c4c3cff14" + integrity sha512-LDNOvleTv3rPAcefzXZpXMDZshV0FtSzWo8ZjnTOhKm4OCiUvsYGrGrfz4iHXIFd+UbRgFHm6gcOHI/BSZ/3fw== + dependencies: + body-parser "^1.19.0" + chalk "^4.1.2" + compression "^1.7.4" + connect-pause "^0.1.1" + cors "^2.8.5" + errorhandler "^1.5.1" + express "^4.17.1" + express-urlrewrite "^1.4.0" + json-parse-helpfulerror "^1.0.3" + lodash "^4.17.21" + lodash-id "^0.14.1" + lowdb "^1.0.0" + method-override "^3.0.0" + morgan "^1.10.0" + nanoid "^3.1.23" + please-upgrade-node "^3.2.0" + pluralize "^8.0.0" + server-destroy "^1.0.1" + standard "^17.0.0" + yargs "^17.0.1" + json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" @@ -11322,6 +12216,13 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" +json5@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" + integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA== + dependencies: + minimist "^1.2.0" + json5@^2.1.2: version "2.1.3" resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43" @@ -11379,6 +12280,16 @@ jsx-ast-utils@^2.2.3: array-includes "^3.0.3" object.assign "^4.1.0" +"jsx-ast-utils@^2.4.1 || ^3.0.0": + version "3.3.5" + resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz#4766bd05a8e2a11af222becd19e15575e52a853a" + integrity sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ== + dependencies: + array-includes "^3.1.6" + array.prototype.flat "^1.3.1" + object.assign "^4.1.4" + object.values "^1.1.6" + junk@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/junk/-/junk-3.1.0.tgz#31499098d902b7e98c5d9b9c80f43457a88abfa1" @@ -11501,6 +12412,17 @@ load-json-file@^2.0.0: pify "^2.0.0" strip-bom "^3.0.0" +load-json-file@^5.2.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-5.3.0.tgz#4d3c1e01fa1c03ea78a60ac7af932c9ce53403f3" + integrity sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw== + dependencies: + graceful-fs "^4.1.15" + parse-json "^4.0.0" + pify "^4.0.1" + strip-bom "^3.0.0" + type-fest "^0.3.0" + loader-runner@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" @@ -11581,6 +12503,11 @@ lodash-es@^4.2.0, lodash-es@^4.2.1: resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78" integrity sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ== +lodash-id@^0.14.1: + version "0.14.1" + resolved "https://registry.yarnpkg.com/lodash-id/-/lodash-id-0.14.1.tgz#dffa1f1f8b90d1803bb0d70b7d7547e10751e80b" + integrity sha512-ikQPBTiq/d5m6dfKQlFdIXFzvThPi2Be9/AHxktOnDSfSxE1j9ICbBT5Elk1ke7HSTgM38LHTpmJovo9/klnLg== + lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" @@ -11628,7 +12555,7 @@ lodash.uniq@4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.16, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.7.0, lodash@~4.17.10: +lodash@4, lodash@^4.0.0, lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.16, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.7.0, lodash@~4.17.10: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -11670,6 +12597,17 @@ loud-rejection@^1.0.0: currently-unhandled "^0.4.1" signal-exit "^3.0.0" +lowdb@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/lowdb/-/lowdb-1.0.0.tgz#5243be6b22786ccce30e50c9a33eac36b20c8064" + integrity sha512-2+x8esE/Wb9SQ1F9IHaYWfsC9FIecLOPrK4g17FGEayjUWH172H6nwicRovGvSE2CPZouc2MCIqCI7h9d+GftQ== + dependencies: + graceful-fs "^4.1.3" + is-promise "^2.1.0" + lodash "4" + pify "^3.0.0" + steno "^0.4.1" + lower-case@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz#39eeb36e396115cc05e29422eaea9e692c9408c7" @@ -11995,6 +12933,16 @@ merge2@^1.2.3, merge2@^1.3.0: resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== +method-override@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/method-override/-/method-override-3.0.0.tgz#6ab0d5d574e3208f15b0c9cf45ab52000468d7a2" + integrity sha512-IJ2NNN/mSl9w3kzWB92rcdHpz+HjkxhDJWNDBqSlas+zQdP8wBiJzITPg08M/k2uVvMow7Sk41atndNtt/PHSA== + dependencies: + debug "3.1.0" + methods "~1.1.2" + parseurl "~1.3.2" + vary "~1.1.2" + methods@^1.1.1, methods@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" @@ -12235,6 +13183,13 @@ minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2: dependencies: brace-expansion "^1.1.7" +minimatch@^3.0.5, minimatch@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== + dependencies: + brace-expansion "^1.1.7" + minimist@^1.1.0, minimist@^1.1.3: version "1.2.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" @@ -12244,6 +13199,11 @@ minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== +minimist@^1.2.6: + version "1.2.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" + integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== + minipass-collect@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" @@ -12359,6 +13319,17 @@ moment@^2.24.0: resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b" integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg== +morgan@^1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7" + integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ== + dependencies: + basic-auth "~2.0.1" + debug "2.6.9" + depd "~2.0.0" + on-finished "~2.3.0" + on-headers "~1.0.2" + move-concurrently@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" @@ -12416,6 +13387,11 @@ nanoclone@^0.2.1: resolved "https://registry.yarnpkg.com/nanoclone/-/nanoclone-0.2.1.tgz#dd4090f8f1a110d26bb32c49ed2f5b9235209ed4" integrity sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA== +nanoid@^3.1.23: + version "3.3.6" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" + integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== + nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -12727,7 +13703,7 @@ oauth-sign@~0.9.0: resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== -object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: +object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= @@ -12741,6 +13717,11 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" +object-inspect@^1.12.3: + version "1.12.3" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" + integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g== + object-inspect@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b" @@ -12786,6 +13767,16 @@ object.assign@^4.1.0: has-symbols "^1.0.1" object-keys "^1.1.1" +object.assign@^4.1.4: + version "4.1.4" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f" + integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.4" + has-symbols "^1.0.3" + object-keys "^1.1.1" + object.entries@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.0.4.tgz#1bf9a4dd2288f5b33f3a993d257661f05d161a5f" @@ -12814,6 +13805,15 @@ object.entries@^1.1.1: function-bind "^1.1.1" has "^1.0.3" +object.entries@^1.1.6: + version "1.1.7" + resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.7.tgz#2b47760e2a2e3a752f39dd874655c61a7f03c131" + integrity sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + "object.fromentries@^2.0.0 || ^1.0.0", object.fromentries@^2.0.1, object.fromentries@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9" @@ -12824,6 +13824,15 @@ object.entries@^1.1.1: function-bind "^1.1.1" has "^1.0.3" +object.fromentries@^2.0.6: + version "2.0.7" + resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.7.tgz#71e95f441e9a0ea6baf682ecaaf37fa2a8d7e616" + integrity sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + object.getownpropertydescriptors@^2.0.3: version "2.1.0" resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649" @@ -12832,6 +13841,24 @@ object.getownpropertydescriptors@^2.0.3: define-properties "^1.1.3" es-abstract "^1.17.0-next.1" +object.groupby@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.1.tgz#d41d9f3c8d6c778d9cbac86b4ee9f5af103152ee" + integrity sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + get-intrinsic "^1.2.1" + +object.hasown@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.3.tgz#6a5f2897bb4d3668b8e79364f98ccf971bda55ae" + integrity sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA== + dependencies: + define-properties "^1.2.0" + es-abstract "^1.22.1" + object.pick@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" @@ -12858,6 +13885,15 @@ object.values@^1.1.0, object.values@^1.1.1: function-bind "^1.1.1" has "^1.0.3" +object.values@^1.1.6: + version "1.1.7" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.7.tgz#617ed13272e7e1071b43973aa1655d9291b8442a" + integrity sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + objectorarray@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/objectorarray/-/objectorarray-1.0.4.tgz#d69b2f0ff7dc2701903d308bb85882f4ddb49483" @@ -12872,6 +13908,13 @@ obuf@^1.1.2: resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== +on-finished@2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" + integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg== + dependencies: + ee-first "1.1.1" + on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" @@ -12959,6 +14002,18 @@ optionator@^0.9.1: type-check "^0.4.0" word-wrap "^1.2.3" +optionator@^0.9.3: + version "0.9.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64" + integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg== + dependencies: + "@aashutoshrathi/word-wrap" "^1.2.3" + deep-is "^0.1.3" + fast-levenshtein "^2.0.6" + levn "^0.4.1" + prelude-ls "^1.2.1" + type-check "^0.4.0" + options@>=0.0.5: version "0.0.6" resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f" @@ -13231,6 +14286,14 @@ parse-json@^2.2.0: dependencies: error-ex "^1.2.0" +parse-json@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" + integrity sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw== + dependencies: + error-ex "^1.3.1" + json-parse-better-errors "^1.0.1" + parse-json@^5.0.0: version "5.2.0" resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" @@ -13339,6 +14402,11 @@ path-parse@^1.0.6: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== +path-parse@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== + path-platform@~0.11.15: version "0.11.15" resolved "https://registry.yarnpkg.com/path-platform/-/path-platform-0.11.15.tgz#e864217f74c36850f0852b78dc7bf7d4a5721bf2" @@ -13348,6 +14416,13 @@ path-to-regexp@0.1.7: resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= +path-to-regexp@^1.0.3: + version "1.8.0" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" + integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA== + dependencies: + isarray "0.0.1" + path-to-regexp@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d" @@ -13455,6 +14530,14 @@ pirates@^4.0.0, pirates@^4.0.1: dependencies: node-modules-regexp "^1.0.0" +pkg-conf@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/pkg-conf/-/pkg-conf-3.1.0.tgz#d9f9c75ea1bae0e77938cde045b276dac7cc69ae" + integrity sha512-m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ== + dependencies: + find-up "^3.0.0" + load-json-file "^5.2.0" + pkg-dir@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" @@ -13490,10 +14573,22 @@ pkg-up@3.1.0: dependencies: find-up "^3.0.0" +please-upgrade-node@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" + integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg== + dependencies: + semver-compare "^1.0.0" + pluralize@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" +pluralize@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1" + integrity sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA== + pnp-webpack-plugin@1.6.4: version "1.6.4" resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz#c9711ac4dc48a685dabafc86f8b6dd9f8df84149" @@ -13802,6 +14897,15 @@ prop-types@^15.0.0, prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0, object-assign "^4.1.1" react-is "^16.8.1" +prop-types@^15.8.1: + version "15.8.1" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" + integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== + dependencies: + loose-envify "^1.4.0" + object-assign "^4.1.1" + react-is "^16.13.1" + property-expr@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-2.0.4.tgz#37b925478e58965031bb612ec5b3260f8241e910" @@ -13889,6 +14993,13 @@ punycode@^2.1.0, punycode@^2.1.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== +qs@6.11.0: + version "6.11.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" + integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== + dependencies: + side-channel "^1.0.4" + qs@6.7.0: version "6.7.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" @@ -13990,6 +15101,16 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" +raw-body@2.5.2: + version "2.5.2" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a" + integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA== + dependencies: + bytes "3.1.2" + http-errors "2.0.0" + iconv-lite "0.4.24" + unpipe "1.0.0" + raw-loader@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.2.tgz#1aac6b7d1ad1501e66efdac1522c73e59a584eb6" @@ -14185,7 +15306,7 @@ react-is@^16.10.2, react-is@^16.8.6, react-is@^16.9.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c" integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q== -react-is@^16.12.0, react-is@^16.7.0, react-is@^16.8.1: +react-is@^16.12.0, react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.1: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== @@ -14641,6 +15762,18 @@ redux@^4.0.0, redux@^4.0.5: loose-envify "^1.4.0" symbol-observable "^1.2.0" +reflect.getprototypeof@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.4.tgz#aaccbf41aca3821b87bb71d9dcbc7ad0ba50a3f3" + integrity sha512-ECkTw8TmJwW60lOTR+ZkODISW6RQ8+2CL3COqtiJKLd6MmB45hN51HprHFziKLGkAuTGQhBb91V8cy+KHlaCjw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + get-intrinsic "^1.2.1" + globalthis "^1.0.3" + which-builtin-type "^1.1.3" + reflect.ownkeys@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz#749aceec7f3fdf8b63f927a04809e90c5c0b3460" @@ -14705,11 +15838,25 @@ regexp.prototype.flags@^1.3.0: define-properties "^1.1.3" es-abstract "^1.17.0-next.1" +regexp.prototype.flags@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb" + integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + functions-have-names "^1.2.3" + regexpp@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== +regexpp@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" + integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== + regexpp@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" @@ -15060,6 +16207,24 @@ resolve@^1.17.0, resolve@^1.3.2: dependencies: path-parse "^1.0.6" +resolve@^1.22.1, resolve@^1.22.4: + version "1.22.4" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.4.tgz#1dc40df46554cdaf8948a486a10f6ba1e2026c34" + integrity sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg== + dependencies: + is-core-module "^2.13.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + +resolve@^2.0.0-next.4: + version "2.0.0-next.4" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.4.tgz#3d37a113d6429f496ec4752d2a2e58efb1fd4660" + integrity sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ== + dependencies: + is-core-module "^2.9.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + restore-cursor@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" @@ -15164,6 +16329,16 @@ rxjs@^6.6.0: dependencies: tslib "^1.9.0" +safe-array-concat@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.0.tgz#2064223cba3c08d2ee05148eedbc563cd6d84060" + integrity sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.2.0" + has-symbols "^1.0.3" + isarray "^2.0.5" + safe-buffer@5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" @@ -15179,6 +16354,15 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== +safe-regex-test@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295" + integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.1.3" + is-regex "^1.1.4" + safe-regex@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" @@ -15335,6 +16519,11 @@ selfsigned@^1.10.7: dependencies: node-forge "0.9.0" +semver-compare@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" + integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow== + "semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" @@ -15355,6 +16544,18 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== +semver@^6.3.1: + version "6.3.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" + integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== + +semver@^7.0.0, semver@^7.3.8: + version "7.5.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" + integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== + dependencies: + lru-cache "^6.0.0" + semver@^7.2.1, semver@^7.3.2: version "7.3.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" @@ -15441,6 +16642,11 @@ serve-static@1.14.1: parseurl "~1.3.3" send "0.17.1" +server-destroy@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/server-destroy/-/server-destroy-1.0.1.tgz#f13bf928e42b9c3e79383e61cc3998b5d14e6cdd" + integrity sha512-rb+9B5YBIEzYcD6x2VKidaa+cqYBJQKnU4oe4E3ANwRRN56yk/ua1YCJT1n21NTS8w6CcOclAKNP3PhdCXKYtQ== + set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" @@ -15478,6 +16684,11 @@ setprototypeof@1.1.1: resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== +setprototypeof@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" + integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== + sha.js@^2.4.0, sha.js@^2.4.8, sha.js@~2.4.4: version "2.4.11" resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" @@ -15852,6 +17063,31 @@ stackframe@^1.1.1: resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.2.0.tgz#52429492d63c62eb989804c11552e3d22e779303" integrity sha512-GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA== +standard-engine@^15.0.0: + version "15.1.0" + resolved "https://registry.yarnpkg.com/standard-engine/-/standard-engine-15.1.0.tgz#717409a002edd13cd57f6554fdd3464d9a22a774" + integrity sha512-VHysfoyxFu/ukT+9v49d4BRXIokFRZuH3z1VRxzFArZdjSCFpro6rEIU3ji7e4AoAtuSfKBkiOmsrDqKW5ZSRw== + dependencies: + get-stdin "^8.0.0" + minimist "^1.2.6" + pkg-conf "^3.1.0" + xdg-basedir "^4.0.0" + +standard@^17.0.0: + version "17.1.0" + resolved "https://registry.yarnpkg.com/standard/-/standard-17.1.0.tgz#829eeeb3139ad50714294d3531592d60ad1286af" + integrity sha512-jaDqlNSzLtWYW4lvQmU0EnxWMUGQiwHasZl5ZEIwx3S/ijZDjZOzs1y1QqKwKs5vqnFpGtizo4NOYX2s0Voq/g== + dependencies: + eslint "^8.41.0" + eslint-config-standard "17.1.0" + eslint-config-standard-jsx "^11.0.0" + eslint-plugin-import "^2.27.5" + eslint-plugin-n "^15.7.0" + eslint-plugin-promise "^6.1.1" + eslint-plugin-react "^7.32.2" + standard-engine "^15.0.0" + version-guard "^1.1.1" + state-toggle@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe" @@ -15865,6 +17101,11 @@ static-extend@^0.1.1: define-property "^0.2.5" object-copy "^0.1.0" +statuses@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" + integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== + "statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" @@ -15882,6 +17123,13 @@ stealthy-require@^1.1.1: resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks= +steno@^0.4.1: + version "0.4.4" + resolved "https://registry.yarnpkg.com/steno/-/steno-0.4.4.tgz#071105bdfc286e6615c0403c27e9d7b5dcb855cb" + integrity sha512-EEHMVYHNXFHfGtgjNITnka0aHhiAlo93F7z2/Pwd+g0teG9CnM3JIINM7hVVB5/rhw9voufD7Wukwgtw2uqh6w== + dependencies: + graceful-fs "^4.1.3" + store2@^2.12.0: version "2.12.0" resolved "https://registry.yarnpkg.com/store2/-/store2-2.12.0.tgz#e1f1b7e1a59b6083b2596a8d067f6ee88fd4d3cf" @@ -15982,6 +17230,15 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" +string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + "string.prototype.matchall@^4.0.0 || ^3.0.1", string.prototype.matchall@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e" @@ -15994,6 +17251,20 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0: regexp.prototype.flags "^1.3.0" side-channel "^1.0.2" +string.prototype.matchall@^4.0.8: + version "4.0.9" + resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.9.tgz#148779de0f75d36b13b15885fec5cadde994520d" + integrity sha512-6i5hL3MqG/K2G43mWXWgP+qizFW/QH/7kCNN13JrJS5q48FN5IKksLDscexKP3dnmB6cdm9jlNgAsWNLpSykmA== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + get-intrinsic "^1.2.1" + has-symbols "^1.0.3" + internal-slot "^1.0.5" + regexp.prototype.flags "^1.5.0" + side-channel "^1.0.4" + string.prototype.padend@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.0.tgz#dc08f57a8010dc5c153550318f67e13adbb72ac3" @@ -16019,6 +17290,15 @@ string.prototype.trim@^1.1.2: es-abstract "^1.13.0" function-bind "^1.1.1" +string.prototype.trim@^1.2.7: + version "1.2.7" + resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533" + integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.4" + es-abstract "^1.20.4" + string.prototype.trimend@^1.0.0, string.prototype.trimend@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913" @@ -16027,6 +17307,15 @@ string.prototype.trimend@^1.0.0, string.prototype.trimend@^1.0.1: define-properties "^1.1.3" es-abstract "^1.17.5" +string.prototype.trimend@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533" + integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.4" + es-abstract "^1.20.4" + string.prototype.trimleft@^2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc" @@ -16053,6 +17342,15 @@ string.prototype.trimstart@^1.0.0, string.prototype.trimstart@^1.0.1: define-properties "^1.1.3" es-abstract "^1.17.5" +string.prototype.trimstart@^1.0.6: + version "1.0.7" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298" + integrity sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + string_decoder@^1.0.0, string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" @@ -16099,6 +17397,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" +strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + strip-bom@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" @@ -16150,6 +17455,11 @@ strip-json-comments@^3.1.0: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.0.tgz#7638d31422129ecf4457440009fba03f9f9ac180" integrity sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w== +strip-json-comments@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== + style-loader@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.0.1.tgz#aec6d4c61d0ed8d0a442faed741d4dfc6573888a" @@ -16250,6 +17560,11 @@ supports-hyperlinks@^2.0.0: has-flag "^4.0.0" supports-color "^7.0.0" +supports-preserve-symlinks-flag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" + integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== + svg-loader@^0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/svg-loader/-/svg-loader-0.0.2.tgz#601ab2fdaa1dadae3ca9975b550de92a07e1d92b" @@ -16529,6 +17844,11 @@ toidentifier@1.0.0: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== +toidentifier@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" + integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== + toposort@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330" @@ -16614,6 +17934,16 @@ ts-pnp@^1.1.6: resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92" integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw== +tsconfig-paths@^3.14.2: + version "3.14.2" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088" + integrity sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g== + dependencies: + "@types/json5" "^0.0.29" + json5 "^1.0.2" + minimist "^1.2.6" + strip-bom "^3.0.0" + tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0: version "1.13.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043" @@ -16690,6 +18020,16 @@ type-fest@^0.11.0: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== + +type-fest@^0.3.0: + version "0.3.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1" + integrity sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ== + type-fest@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" @@ -16718,6 +18058,45 @@ type@^2.7.2: resolved "https://registry.yarnpkg.com/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0" integrity sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw== +typed-array-buffer@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz#18de3e7ed7974b0a729d3feecb94338d1472cd60" + integrity sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.2.1" + is-typed-array "^1.1.10" + +typed-array-byte-length@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0" + integrity sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA== + dependencies: + call-bind "^1.0.2" + for-each "^0.3.3" + has-proto "^1.0.1" + is-typed-array "^1.1.10" + +typed-array-byte-offset@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b" + integrity sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg== + dependencies: + available-typed-arrays "^1.0.5" + call-bind "^1.0.2" + for-each "^0.3.3" + has-proto "^1.0.1" + is-typed-array "^1.1.10" + +typed-array-length@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb" + integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng== + dependencies: + call-bind "^1.0.2" + for-each "^0.3.3" + is-typed-array "^1.1.9" + typedarray-to-buffer@^3.1.5: version "3.1.5" resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" @@ -16761,6 +18140,16 @@ umd@^3.0.0: version "3.0.3" resolved "https://registry.yarnpkg.com/umd/-/umd-3.0.3.tgz#aa9fe653c42b9097678489c01000acb69f0b26cf" +unbox-primitive@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e" + integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw== + dependencies: + call-bind "^1.0.2" + has-bigints "^1.0.2" + has-symbols "^1.0.3" + which-boxed-primitive "^1.0.2" + undeclared-identifiers@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/undeclared-identifiers/-/undeclared-identifiers-1.1.2.tgz#7d850a98887cff4bd0bf64999c014d08ed6d1acc" @@ -17133,7 +18522,7 @@ value-equal@^0.4.0: resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz#c5bdd2f54ee093c04839d71ce2e4758a6890abc7" integrity sha512-x+cYdNnaA3CxvMaTX0INdTCN8m8aF2uY9BvEqmxuYp8bL09cs/kWVQPVGcA35fMktdOsP69IgU7wFj/61dJHEw== -vary@~1.1.2: +vary@^1, vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= @@ -17147,6 +18536,11 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" +version-guard@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/version-guard/-/version-guard-1.1.1.tgz#7a6e87a1babff1b43d6a7b0fd239731e278262fa" + integrity sha512-MGQLX89UxmYHgDvcXyjBI0cbmoW+t/dANDppNPrno64rYr8nH4SHSuElQuSYdXGEs0mUzdQe1BY+FhVPNsAmJQ== + vfile-location@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-3.0.1.tgz#d78677c3546de0f7cd977544c367266764d31bb3" @@ -17511,6 +18905,45 @@ whatwg-url@^8.5.0: tr46 "^2.0.2" webidl-conversions "^6.1.0" +which-boxed-primitive@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" + integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== + dependencies: + is-bigint "^1.0.1" + is-boolean-object "^1.1.0" + is-number-object "^1.0.4" + is-string "^1.0.5" + is-symbol "^1.0.3" + +which-builtin-type@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.1.3.tgz#b1b8443707cc58b6e9bf98d32110ff0c2cbd029b" + integrity sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw== + dependencies: + function.prototype.name "^1.1.5" + has-tostringtag "^1.0.0" + is-async-function "^2.0.0" + is-date-object "^1.0.5" + is-finalizationregistry "^1.0.2" + is-generator-function "^1.0.10" + is-regex "^1.1.4" + is-weakref "^1.0.2" + isarray "^2.0.5" + which-boxed-primitive "^1.0.2" + which-collection "^1.0.1" + which-typed-array "^1.1.9" + +which-collection@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906" + integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A== + dependencies: + is-map "^2.0.1" + is-set "^2.0.1" + is-weakmap "^2.0.1" + is-weakset "^2.0.1" + which-module@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" @@ -17521,6 +18954,17 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= +which-typed-array@^1.1.10, which-typed-array@^1.1.11, which-typed-array@^1.1.9: + version "1.1.11" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.11.tgz#99d691f23c72aab6768680805a271b69761ed61a" + integrity sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew== + dependencies: + available-typed-arrays "^1.0.5" + call-bind "^1.0.2" + for-each "^0.3.3" + gopd "^1.0.1" + has-tostringtag "^1.0.0" + which@1, which@^1.2.14, which@^1.2.9, which@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" @@ -17599,6 +19043,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" @@ -17629,6 +19082,11 @@ ws@^1.1.5, ws@^6.2.1, ws@^7.2.3, ws@^7.3.1, ws@^7.4.4: options ">=0.0.5" ultron "1.0.x" +xdg-basedir@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" + integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q== + xml-name-validator@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" @@ -17665,6 +19123,11 @@ y18n@^3.2.1: resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== +y18n@^5.0.5: + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== + yallist@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" @@ -17709,6 +19172,11 @@ yargs-parser@^18.1.1: camelcase "^5.0.0" decamelize "^1.2.0" +yargs-parser@^21.1.1: + version "21.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" + integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== + yargs-parser@^5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.1.tgz#7ede329c1d8cdbbe209bd25cdb990e9b1ebbb394" @@ -17776,6 +19244,19 @@ yargs@^15.3.1: y18n "^4.0.0" yargs-parser "^18.1.1" +yargs@^17.0.1: + version "17.7.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" + integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== + dependencies: + cliui "^8.0.1" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.1.1" + yargs@^7.0.0: version "7.1.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8" From d5209927a555238c21d7fe6a1dc904b26f475eac Mon Sep 17 00:00:00 2001 From: 631862 Date: Tue, 5 Sep 2023 16:05:39 -0400 Subject: [PATCH 075/445] added tests to check for pexip or webex conference type --- .../details/VirtualHearingFields.test.js | 5 +++- .../VirtualHearingFields.test.js.snap | 24 +++++++++++++++++++ client/test/data/hearings.js | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/client/test/app/hearings/components/details/VirtualHearingFields.test.js b/client/test/app/hearings/components/details/VirtualHearingFields.test.js index b93d3c3fb82..45a8856e18c 100644 --- a/client/test/app/hearings/components/details/VirtualHearingFields.test.js +++ b/client/test/app/hearings/components/details/VirtualHearingFields.test.js @@ -33,7 +33,6 @@ describe('VirtualHearingFields', () => { // Assertions expect(virtualHearingForm.children()).toHaveLength(0); expect(virtualHearingForm).toMatchSnapshot(); - }); test('Shows only hearing links with no virtualHearing', () => { @@ -72,9 +71,13 @@ describe('VirtualHearingFields', () => { } ); + const hearingMeetingType = amaHearing.judge.meetingType; + // Assertions expect(virtualHearingForm.find(ContentSection)).toHaveLength(1); expect(virtualHearingForm.find(HearingLinks)).toHaveLength(1); + expect(hearingMeetingType).toBeTruthy(); + expect(hearingMeetingType).toStrictEqual('pexip' || 'webex'); expect(virtualHearingForm).toMatchSnapshot(); }); diff --git a/client/test/app/hearings/components/details/__snapshots__/VirtualHearingFields.test.js.snap b/client/test/app/hearings/components/details/__snapshots__/VirtualHearingFields.test.js.snap index 6b998a6aa3b..b167defa1d5 100644 --- a/client/test/app/hearings/components/details/__snapshots__/VirtualHearingFields.test.js.snap +++ b/client/test/app/hearings/components/details/__snapshots__/VirtualHearingFields.test.js.snap @@ -156,6 +156,7 @@ exports[`VirtualHearingFields Shows hearing details with virtualHearing 1`] = ` "fullName": "Aaron Judge_HearingsAndCases Abshire", "id": 3, "lastLoginAt": null, + "meetingType": "pexip", "roles": Object {}, "selectedRegionalOffice": null, "stationId": "101", @@ -247,6 +248,14 @@ exports[`VirtualHearingFields Shows hearing details with virtualHearing 1`] = `
    +
    + + Pexip + Conference + +
    +
    + + Pexip + Conference + +
    Date: Tue, 5 Sep 2023 16:13:24 -0400 Subject: [PATCH 076/445] APPEALS-25117: update method length and repeated method --- app/services/external_api/webex_service.rb | 70 +--------------------- 1 file changed, 3 insertions(+), 67 deletions(-) diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb index dd3f5352d23..68470e8ad7e 100644 --- a/app/services/external_api/webex_service.rb +++ b/app/services/external_api/webex_service.rb @@ -7,24 +7,7 @@ class ExternalApi::WebexService MOCK_ENDPOINT = "localhost:3050/fake.#{CREATE_CONFERENCE_ENDPOINT}" # ENDPOINT = ApplicationController.dependencies_faked? ? MOCK_ENDPOINT : CREATE_CONFERENCE_ENDPOINT - # Creates a datetime with timezone from these parts - # - Time, a string like "08:30" - # - Timezone, a string like "America/Los_Angeles" - # - Date, a ruby Date - # :reek:UtilityFunction - def combine_time_and_date(time, timezone, date) - # Parse the time string into a ruby Time instance with zone - time_with_zone = time.in_time_zone(timezone) - # Make a string like "2021-04-23 08:30:00" - time_and_date_string = "#{date.strftime('%F')} #{time_with_zone.strftime('%T')}" - # Parse the combined string into a ruby DateTime - combined_datetime = time_and_date_string.in_time_zone(timezone) - # Format the DateTime to iso8601 like "2021-04-23T08:30:00-06:00" - formatted_datetime_string = combined_datetime.iso8601 - - formatted_datetime_string - end - + # rubocop:disable Metrics/MethodLength def create_conference(virtual_hearing) title = virtual_hearing.alias hearing_day = HearingDay.find(virtual_hearing.hearing.hearing_day_id) @@ -33,7 +16,7 @@ def create_conference(virtual_hearing) timezone = hearing.regional_office&.timezone end_date = hearing_day.scheduled_for end_time = "23:59:59" - end_date_time = combine_time_and_date(end_time, timezone, end_date) + end_date_time = HearingDay.combine_time_and_date(end_time, timezone, end_date) body = { "jwt": { @@ -64,59 +47,12 @@ def create_conference(virtual_hearing) "jwsAlg": "HS512" } - # body = { - # "title": title, - # # the mock uses 'subject' which is the one we need? - # "start": start_date_time, - # "end": end_date_time, - # # Formatting >> "2019-11-01 21:00:00", - # "timezone": "Asia/Shanghai", - # # not required - # "enabledAutoRecordMeeting": "false", - # "allowAnyUserToBeCoHost": "false", - # "enabledJoinBeforeHost": "false", - # "enableConnectAudioBeforeHost": "false", - # "joinBeforeHostMinutes": 0, - # "excludePassword": "false", - # "publicMeeting": "false", - # "reminderTime": 0, - # "unlockedMeetingJoinSecurity": "allowJoinWithLobby", - # "enabledWebCastView": "false", - # "enableAutomaticLock": "false", - # "automaticLockMinutes": 0, - # "allowFirstUserToBeCoHost": "false", - # "allowAuthenticatedDevices": true, - # "sendEmail": "false", - # "siteUrl": "TBA FROM UC", - # "meetingOptions": [ - # { - # "enabledChat": true, - # "enableVideo": true - # } - # ], - # "attendeePrivileges": { - # "enableShareContent": true - # }, - # "enabledBreakoutSessions": false, - # "audioConnectionOptions": [ - # { - # "audioConnectionType": "webexAudio", - # "enabledTollFreeCallIn": true, - # "enabledGlobalCallIn": true, - # "enabledAudianceCallBack": false, - # "entryAndExitTone": "beep", - # "allowHosttoUnmuteParticipants": true, - # "allowAttendeeToUnmuteSelf": true, - # "muteAttendeeUponEntry": true - # } - # ] - # } - resp = send_webex_request(MOCK_ENDPOINT, :post, body: body) return if resp.nil? ExternalApi::WebexService::CreateResponse.new(resp) end + # rubocop:enable Metrics/MethodLength def delete_conference(virtual_hearing) return if virtual_hearing.conference_id.nil? From ed4a511b96dd94d0123bf079bcc3d0515dd73a65 Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Tue, 5 Sep 2023 16:30:34 -0400 Subject: [PATCH 077/445] changes made to how the job is kicked off. Instead of explicitly calling it within the hearig_day controller, were making use of the before_destroy macro within the hearing_day object itself. Also adjusted the rescue block in the del_conf_link_job. --- app/controllers/hearings/hearing_day_controller.rb | 4 ++-- .../virtual_hearings/delete_conference_link_job.rb | 14 +++++++------- app/models/hearing_day.rb | 4 ++++ 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/app/controllers/hearings/hearing_day_controller.rb b/app/controllers/hearings/hearing_day_controller.rb index add4b6b27f2..ac672ba536d 100644 --- a/app/controllers/hearings/hearing_day_controller.rb +++ b/app/controllers/hearings/hearing_day_controller.rb @@ -44,8 +44,8 @@ def show hearings: hearing_day.hearings_for_user(current_user).map { |hearing| hearing.quick_to_hash(current_user.id) } ) } - rescue VirtualHearings::LinkService::PINKeyMissingError, - VirtualHearings::LinkService::URLHostMissingError, + rescue VirtualHearings::LinkService::PINKeyMissingError, + VirtualHearings::LinkService::URLHostMissingError, VirtualHearings::LinkService::URLPathMissingError => error log_error(error) render json: { diff --git a/app/jobs/virtual_hearings/delete_conference_link_job.rb b/app/jobs/virtual_hearings/delete_conference_link_job.rb index 488970a4820..7a1032cf951 100644 --- a/app/jobs/virtual_hearings/delete_conference_link_job.rb +++ b/app/jobs/virtual_hearings/delete_conference_link_job.rb @@ -1,7 +1,8 @@ # frozen_string_literal: true -## -# +# The DeleteConferenceLinkJob is a job thats collects conference_links from past hearing days. +# It then iterates through that collection and adjusts attribute values for each link. +# Afterwards each link then has `.destroy` called on it to issue a [soft delete]. class VirtualHearings::DeleteConferenceLinkJob < CaseflowJob queue_with_priority :low_priority @@ -10,7 +11,7 @@ def perform begin links_for_past_date = retreive_stale_conference_links links_soft_removal(links_for_past_date) - rescue ActiveRecordError => error + rescue StandardError => error log_error(error) end end @@ -21,7 +22,7 @@ def perform # # Params: None # - # Return: A collection of links that have passed. + # Return: A collection of links for hearing days that have passed. def retreive_stale_conference_links ConferenceLink.joins(:hearing_day).where("scheduled_for < ?", Date.today) end @@ -33,7 +34,8 @@ def retreive_stale_conference_links # Return: None def links_soft_removal(collection) collection.each do |old_link| - # old_link.update!(update_conf_links) + #keep below line for pulling info to the front-end. + old_link.update!(update_conf_links) old_link.destroy end end @@ -55,6 +57,4 @@ def update_conf_links host_pin_long: nil } end - - # TODO end diff --git a/app/models/hearing_day.rb b/app/models/hearing_day.rb index 9d559d2695c..3a7252079f2 100644 --- a/app/models/hearing_day.rb +++ b/app/models/hearing_day.rb @@ -52,6 +52,7 @@ class HearingDayHasChildrenRecords < StandardError; end before_create :assign_created_by_user after_update :update_children_records after_create :generate_link_on_create + before_destroy :kickoff_link_cleanup # Validates if the judge id maps to an actual record. validates :judge, presence: true, if: -> { judge_id.present? } @@ -221,6 +222,9 @@ def conference_link end private + def kickoff_link_cleanup + VirtualHearings::DeleteConferenceLinkJob.new.perform + end def assign_created_by_user self.created_by ||= RequestStore[:current_user] From e78db1ce59bbcd71778c0d056383a1c59fb4dbc9 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Tue, 5 Sep 2023 17:05:24 -0400 Subject: [PATCH 078/445] APPEALS-25117: add aud field to the body --- app/services/external_api/webex_service.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb index 68470e8ad7e..2b4cb120553 100644 --- a/app/services/external_api/webex_service.rb +++ b/app/services/external_api/webex_service.rb @@ -35,6 +35,7 @@ def create_conference(virtual_hearing) ] } }, + "aud": "some stuff", "numGuest": 1, "numHost": 1, "provideShortUrls": true, From d1730c1503669b234947eef4d5a41bed50726a11 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Tue, 5 Sep 2023 17:12:29 -0400 Subject: [PATCH 079/445] APPEALS-25117: add example request body to webex mock readme --- client/mocks/webex-mocks/README.md | 31 +++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/client/mocks/webex-mocks/README.md b/client/mocks/webex-mocks/README.md index ae827843226..9153402b56c 100644 --- a/client/mocks/webex-mocks/README.md +++ b/client/mocks/webex-mocks/README.md @@ -54,6 +54,35 @@ Get all conferencelinks with this endpoint Javascript API call Fetch/Axios examples [https://jsonplaceholder.typicode.com/] - +example request body: +{ + "jwt": { + "sub": "0006370", + "Nbf": "2023-09-05T09:00:00-10:00", + "Exp": "2023-09-05T23:59:59-10:00", + "flow": { + "id": "6a78ea67-220a-4f9f-9271-a76989ff1f5e", + "data": [ + { + "uri": "Allan.Mosciski@intadmin.room.wbx2.com" + }, + { + "uri": "Uriah.Reinger34@intadmin.room.wbx2.com" + } + ] + } + }, + "aud": "some stuff", + "numGuest": 10, + "numHost": 1, + "provideShortUrls": false, + "verticalType": "Stand-alone contextually-based pricing structure", + "loginUrlForHost": true, + "jweAlg": "PBES2-HS512+A256KW", + "saltLength": 5, + "iterations": 713, + "enc": "A256GCM", + "jwsAlg": "HS512" +} From 8492da0c661568ce7d46fc06225b66cdbe4c40fb Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Wed, 6 Sep 2023 13:16:07 -0400 Subject: [PATCH 080/445] APPEALS-25117: finalized service and create response --- app/jobs/virtual_hearings/conference_client.rb | 2 +- app/services/external_api/webex_service.rb | 14 ++++++++++++-- .../external_api/webex_service/create_response.rb | 5 ++--- .../virtual_hearings/create_conference_job_spec.rb | 1 - 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/app/jobs/virtual_hearings/conference_client.rb b/app/jobs/virtual_hearings/conference_client.rb index ddba13cd880..2938ac031cf 100644 --- a/app/jobs/virtual_hearings/conference_client.rb +++ b/app/jobs/virtual_hearings/conference_client.rb @@ -12,7 +12,7 @@ def client client_host: ENV["PEXIP_CLIENT_HOST"] ) when "webex" - @client ||= WebexService.new + @client ||= ExternalApi::WebexService.new else msg = "Meeting type for the user is invalid" fail Caseflow::Error::MeetingTypeNotFoundError, message: msg diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb index 2b4cb120553..1974b9767d3 100644 --- a/app/services/external_api/webex_service.rb +++ b/app/services/external_api/webex_service.rb @@ -7,6 +7,16 @@ class ExternalApi::WebexService MOCK_ENDPOINT = "localhost:3050/fake.#{CREATE_CONFERENCE_ENDPOINT}" # ENDPOINT = ApplicationController.dependencies_faked? ? MOCK_ENDPOINT : CREATE_CONFERENCE_ENDPOINT + # :reek:UtilityFunction + def combine_time_and_date(time, timezone, date) + time_with_zone = time.in_time_zone(timezone) + time_and_date_string = "#{date.strftime('%F')} #{time_with_zone.strftime('%T')}" + combined_datetime = time_and_date_string.in_time_zone(timezone) + formatted_datetime_string = combined_datetime.iso8601 + + formatted_datetime_string + end + # rubocop:disable Metrics/MethodLength def create_conference(virtual_hearing) title = virtual_hearing.alias @@ -16,7 +26,7 @@ def create_conference(virtual_hearing) timezone = hearing.regional_office&.timezone end_date = hearing_day.scheduled_for end_time = "23:59:59" - end_date_time = HearingDay.combine_time_and_date(end_time, timezone, end_date) + end_date_time = combine_time_and_date(end_time, timezone, end_date) body = { "jwt": { @@ -69,7 +79,7 @@ def delete_conference(virtual_hearing) # :nocov: def send_webex_request(endpoint, method, body: nil) - url = endpoint + url = "http://#{endpoint}" request = HTTPI::Request.new(url) request.open_timeout = 300 request.read_timeout = 300 diff --git a/app/services/external_api/webex_service/create_response.rb b/app/services/external_api/webex_service/create_response.rb index 8ff1ea3afd1..b5b02ec4ee3 100644 --- a/app/services/external_api/webex_service/create_response.rb +++ b/app/services/external_api/webex_service/create_response.rb @@ -2,8 +2,7 @@ class ExternalApi::WebexService::CreateResponse < ExternalApi::WebexService::Response def data - return if resp.headers["Location"].nil? - - { "conference_id": resp.headers["Location"].split("/")[-1].to_s } + response = JSON.parse(resp.body) + { "conference_id": response.first.last } end end diff --git a/spec/jobs/virtual_hearings/create_conference_job_spec.rb b/spec/jobs/virtual_hearings/create_conference_job_spec.rb index db5d7384523..4c629aa1a96 100644 --- a/spec/jobs/virtual_hearings/create_conference_job_spec.rb +++ b/spec/jobs/virtual_hearings/create_conference_job_spec.rb @@ -99,7 +99,6 @@ it "fails when meeting type is webex" do current_user.update!(meeting_type: "webex") - expect { subject.perform_now }.to raise_exception(Caseflow::Error::WebexApiError) end From 430acbc1c13d6a8115c4f3fb52a8c65a006a03b6 Mon Sep 17 00:00:00 2001 From: 631862 Date: Wed, 6 Sep 2023 14:37:27 -0400 Subject: [PATCH 081/445] Updated snapshots of jest tests in Hearings components folder --- .../RepresentativeSection.test.js.snap | 2 + .../__snapshots__/Details.test.js.snap | 49 +++++++++++++++++++ .../HearingConversion.test.js.snap | 16 ++++++ .../__snapshots__/HearingLinks.test.js.snap | 4 ++ 4 files changed, 71 insertions(+) diff --git a/client/test/app/hearings/components/VirtualHearings/__snapshots__/RepresentativeSection.test.js.snap b/client/test/app/hearings/components/VirtualHearings/__snapshots__/RepresentativeSection.test.js.snap index adaca5fef47..be13a16c77a 100644 --- a/client/test/app/hearings/components/VirtualHearings/__snapshots__/RepresentativeSection.test.js.snap +++ b/client/test/app/hearings/components/VirtualHearings/__snapshots__/RepresentativeSection.test.js.snap @@ -17048,6 +17048,7 @@ exports[`RepresentativeSection Shows Representative name when representative add "fullName": "Aaron Judge_HearingsAndCases Abshire", "id": 3, "lastLoginAt": null, + "meetingType": "pexip", "roles": Object {}, "selectedRegionalOffice": null, "stationId": "101", @@ -17298,6 +17299,7 @@ exports[`RepresentativeSection Shows Representative not present message when no "fullName": "Aaron Judge_HearingsAndCases Abshire", "id": 3, "lastLoginAt": null, + "meetingType": "pexip", "roles": Object {}, "selectedRegionalOffice": null, "stationId": "101", diff --git a/client/test/app/hearings/components/__snapshots__/Details.test.js.snap b/client/test/app/hearings/components/__snapshots__/Details.test.js.snap index df02f5f7837..2da7c819728 100644 --- a/client/test/app/hearings/components/__snapshots__/Details.test.js.snap +++ b/client/test/app/hearings/components/__snapshots__/Details.test.js.snap @@ -59,6 +59,7 @@ exports[`Details Displays HearingConversion when converting from central 1`] = ` "fullName": "Aaron Judge_HearingsAndCases Abshire", "id": 3, "lastLoginAt": null, + "meetingType": "pexip", "roles": Object {}, "selectedRegionalOffice": null, "stationId": "101", @@ -182,6 +183,7 @@ exports[`Details Displays HearingConversion when converting from central 1`] = ` "fullName": "Aaron Judge_HearingsAndCases Abshire", "id": 3, "lastLoginAt": null, + "meetingType": "pexip", "roles": Object {}, "selectedRegionalOffice": null, "stationId": "101", @@ -310,6 +312,7 @@ exports[`Details Displays HearingConversion when converting from central 1`] = ` "fullName": "Aaron Judge_HearingsAndCases Abshire", "id": 3, "lastLoginAt": null, + "meetingType": "pexip", "roles": Object {}, "selectedRegionalOffice": null, "stationId": "101", @@ -9441,6 +9444,7 @@ exports[`Details Displays HearingConversion when converting from central 1`] = ` "fullName": "Aaron Judge_HearingsAndCases Abshire", "id": 3, "lastLoginAt": null, + "meetingType": "pexip", "roles": Object {}, "selectedRegionalOffice": null, "stationId": "101", @@ -25827,6 +25831,7 @@ SAN FRANCISCO, CA 94103 "fullName": "Aaron Judge_HearingsAndCases Abshire", "id": 3, "lastLoginAt": null, + "meetingType": "pexip", "roles": Object {}, "selectedRegionalOffice": null, "stationId": "101", @@ -129379,6 +129384,7 @@ exports[`Details Displays VirtualHearing details when there is a virtual hearing "fullName": "Aaron Judge_HearingsAndCases Abshire", "id": 3, "lastLoginAt": null, + "meetingType": "pexip", "roles": Object {}, "selectedRegionalOffice": null, "stationId": "101", @@ -129523,6 +129529,7 @@ exports[`Details Displays VirtualHearing details when there is a virtual hearing "fullName": "Aaron Judge_HearingsAndCases Abshire", "id": 3, "lastLoginAt": null, + "meetingType": "pexip", "roles": Object {}, "selectedRegionalOffice": null, "stationId": "101", @@ -130177,6 +130184,7 @@ exports[`Details Displays VirtualHearing details when there is a virtual hearing "fullName": "Aaron Judge_HearingsAndCases Abshire", "id": 3, "lastLoginAt": null, + "meetingType": "pexip", "roles": Object {}, "selectedRegionalOffice": null, "stationId": "101", @@ -130312,6 +130320,7 @@ exports[`Details Displays VirtualHearing details when there is a virtual hearing "fullName": "Aaron Judge_HearingsAndCases Abshire", "id": 3, "lastLoginAt": null, + "meetingType": "pexip", "roles": Object {}, "selectedRegionalOffice": null, "stationId": "101", @@ -138946,6 +138955,7 @@ exports[`Details Displays VirtualHearing details when there is a virtual hearing "fullName": "Aaron Judge_HearingsAndCases Abshire", "id": 3, "lastLoginAt": null, + "meetingType": "pexip", "roles": Object {}, "selectedRegionalOffice": null, "stationId": "101", @@ -139066,6 +139076,7 @@ exports[`Details Displays VirtualHearing details when there is a virtual hearing "fullName": "Aaron Judge_HearingsAndCases Abshire", "id": 3, "lastLoginAt": null, + "meetingType": "pexip", "roles": Object {}, "selectedRegionalOffice": null, "stationId": "101", @@ -139163,6 +139174,14 @@ exports[`Details Displays VirtualHearing details when there is a virtual hearing
    +
    + + Pexip + Conference + +
    +
    + + Pexip + Conference + +
    Date: Wed, 6 Sep 2023 14:49:39 -0400 Subject: [PATCH 082/445] APPEALS-29006 test.rb added env variables. spec testing underway --- .../delete_conference_link_job.rb | 1 - config/environments/test.rb | 6 ++ .../delete_conference_link_job_spec.rb | 96 +++++++++++++++++++ 3 files changed, 102 insertions(+), 1 deletion(-) diff --git a/app/jobs/virtual_hearings/delete_conference_link_job.rb b/app/jobs/virtual_hearings/delete_conference_link_job.rb index 7a1032cf951..cd74a0c6cd6 100644 --- a/app/jobs/virtual_hearings/delete_conference_link_job.rb +++ b/app/jobs/virtual_hearings/delete_conference_link_job.rb @@ -34,7 +34,6 @@ def retreive_stale_conference_links # Return: None def links_soft_removal(collection) collection.each do |old_link| - #keep below line for pulling info to the front-end. old_link.update!(update_conf_links) old_link.destroy end diff --git a/config/environments/test.rb b/config/environments/test.rb index 89a089dabb7..0286e1a72fe 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -120,4 +120,10 @@ ENV["PACMAN_API_TOKEN_SECRET"] ||= "client-secret" ENV["PACMAN_API_TOKEN_ISSUER"] ||= "issuer-of-our-token" ENV["PACMAN_API_SYS_ACCOUNT"] ||= "CSS_ID_OF_OUR_ACCOUNT" + + # Necessary vars needed to create virtual hearing links + # Used by VirtualHearings::LinkService + ENV["VIRTUAL_HEARING_PIN_KEY"] ||= "mysecretkey" + ENV["VIRTUAL_HEARING_URL_HOST"] ||= "example.va.gov" + ENV["VIRTUAL_HEARING_URL_PATH"] ||= "/sample" end diff --git a/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb b/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb index e69de29bb2d..0d8362eb383 100644 --- a/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb +++ b/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb @@ -0,0 +1,96 @@ +# frozen_string_literal: true + +describe VirtualHearings::DeleteConferenceLinkJob do + include ActiveJob::TestHelper + + let(:current_user) { create(:user, roles: ["System Admin"]) } + let(:judge) { Judge.new(create(:user)) } + + let!(:single_hearing_day) do + create(:hearing_day, + id: 1, + created_by: current_user, + judge_id: judge, + regional_office: "RO17", + request_type: "V", + room: (1..7).to_s, + scheduled_for: Date.new(2023, 9, 4)) + end + + let(:hearing_days_test_collection) do + create(:hearing_day, + id: 1, + created_by: current_user, + judge_id: judge, + regional_office: "RO17", + request_type: "V", + room: (1..7).to_s, + scheduled_for: Date.new(2023, 9, 4)) + create(:hearing_day, + id: 2, + created_by: current_user, + judge_id: judge, + regional_office: "RO17", + request_type: "V", + room: (1..7).to_s, + scheduled_for: Date.new(2023, 9, 1)) + create(:hearing_day, + id: 3, + created_by: current_user, + judge_id: judge, + regional_office: "RO17", + request_type: "V", + room: (1..7).to_s, + scheduled_for: Date.new(2023, 8, 31)) + create(:hearing_day, + id: 4, + created_by: current_user, + judge_id: judge, + regional_office: "RO17", + request_type: "V", + room: (1..7).to_s, + scheduled_for: Date.new(2023, 9, 8)) + create(:hearing_day, + id: 5, + created_by: current_user, + judge_id: judge, + regional_office: "RO17", + request_type: "V", + room: (1..7).to_s, + scheduled_for: Date.new(2023, 9, 8)) + end + + let(:conf_link_test_collection) do + create(:conference_link, + hearing_day_id: 1, + guest_pin_long: "6393596604", + created_at: Time.zone.now) + create(:conference_link, + hearing_day_id: 2, + guest_pin_long: "6393596604", + created_at: Time.zone.now) + create(:conference_link, + hearing_day_id: 3, + guest_pin_long: "6393596604", + created_at: Time.zone.now) + create(:conference_link, + hearing_day_id: 4, + guest_pin_long: "6393596604", + created_at: Time.zone.now) + create(:conference_link, + hearing_day_id: 5, + guest_pin_long: "6393596604", + created_at: Time.zone.now) + end + + context ".perform" do + subject(:job) { VirtualHearings::DeleteConferenceLinkJob.perform_later } + it "Calls the retrieve_stale_conference_links" do + hearing_days_test_collection + byebug + conf_link_test_collection + expect(job).to receive(:retreive_stale_conference_links) + job.perform + end + end +end From 176db745b081af601f49c29df57d4353697f83c5 Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Thu, 7 Sep 2023 14:26:26 -0400 Subject: [PATCH 083/445] APPEALS-29006 updated test spec for job. test passing. Also provided more traits to the hearing_day factory that allow for object creation for itself and the association of a conference_link. --- spec/factories/hearing_day.rb | 13 +++ .../delete_conference_link_job_spec.rb | 95 ++----------------- 2 files changed, 23 insertions(+), 85 deletions(-) diff --git a/spec/factories/hearing_day.rb b/spec/factories/hearing_day.rb index 0d0a5e89ddb..88979358df8 100644 --- a/spec/factories/hearing_day.rb +++ b/spec/factories/hearing_day.rb @@ -24,5 +24,18 @@ request_type { HearingDay::REQUEST_TYPES[:virtual] } room { nil } end + + trait :future_with_link do + after(:create) do |hearing_day| + create(:conference_link, :hearing_day => hearing_day) + end + end + + trait :past_with_link do + scheduled_for { 10.days.ago.to_formatted_s.split(" ")[0] } + after(:create) do |hearing_day| + create(:conference_link, :hearing_day => hearing_day) + end + end end end diff --git a/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb b/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb index 0d8362eb383..41864fcfa2a 100644 --- a/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb +++ b/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb @@ -3,94 +3,19 @@ describe VirtualHearings::DeleteConferenceLinkJob do include ActiveJob::TestHelper - let(:current_user) { create(:user, roles: ["System Admin"]) } - let(:judge) { Judge.new(create(:user)) } + let!(:current_user) { create(:user, roles: ["System Admin"]) } + let!(:judge) { Judge.new(create(:user)) } + let!(:single_hearing_day) { FactoryBot.create(:hearing_day) } - let!(:single_hearing_day) do - create(:hearing_day, - id: 1, - created_by: current_user, - judge_id: judge, - regional_office: "RO17", - request_type: "V", - room: (1..7).to_s, - scheduled_for: Date.new(2023, 9, 4)) - end - - let(:hearing_days_test_collection) do - create(:hearing_day, - id: 1, - created_by: current_user, - judge_id: judge, - regional_office: "RO17", - request_type: "V", - room: (1..7).to_s, - scheduled_for: Date.new(2023, 9, 4)) - create(:hearing_day, - id: 2, - created_by: current_user, - judge_id: judge, - regional_office: "RO17", - request_type: "V", - room: (1..7).to_s, - scheduled_for: Date.new(2023, 9, 1)) - create(:hearing_day, - id: 3, - created_by: current_user, - judge_id: judge, - regional_office: "RO17", - request_type: "V", - room: (1..7).to_s, - scheduled_for: Date.new(2023, 8, 31)) - create(:hearing_day, - id: 4, - created_by: current_user, - judge_id: judge, - regional_office: "RO17", - request_type: "V", - room: (1..7).to_s, - scheduled_for: Date.new(2023, 9, 8)) - create(:hearing_day, - id: 5, - created_by: current_user, - judge_id: judge, - regional_office: "RO17", - request_type: "V", - room: (1..7).to_s, - scheduled_for: Date.new(2023, 9, 8)) - end - - let(:conf_link_test_collection) do - create(:conference_link, - hearing_day_id: 1, - guest_pin_long: "6393596604", - created_at: Time.zone.now) - create(:conference_link, - hearing_day_id: 2, - guest_pin_long: "6393596604", - created_at: Time.zone.now) - create(:conference_link, - hearing_day_id: 3, - guest_pin_long: "6393596604", - created_at: Time.zone.now) - create(:conference_link, - hearing_day_id: 4, - guest_pin_long: "6393596604", - created_at: Time.zone.now) - create(:conference_link, - hearing_day_id: 5, - guest_pin_long: "6393596604", - created_at: Time.zone.now) - end + let!(:future_hearing_day_with_link) { FactoryBot.create(:hearing_day, :virtual, :future_with_link) } + let!(:past_hearing_day_with_link) { FactoryBot.create(:hearing_day, :virtual, :past_with_link) } context ".perform" do - subject(:job) { VirtualHearings::DeleteConferenceLinkJob.perform_later } - it "Calls the retrieve_stale_conference_links" do - hearing_days_test_collection - byebug - conf_link_test_collection - expect(job).to receive(:retreive_stale_conference_links) - job.perform + # subject(:job) { VirtualHearings::DeleteConferenceLinkJob.new } + it "When conference links in the DB are past the date of the date the job is run" do + expect(ConferenceLink.count).to be(2) + perform_enqueued_jobs { VirtualHearings::DeleteConferenceLinkJob.perform_now } + expect(ConferenceLink.count).to be(1) end end end From d289761ee0ead32eb2930d5af388187c701565b7 Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Thu, 7 Sep 2023 14:33:58 -0400 Subject: [PATCH 084/445] APPEALS-29006 comment cleanup in test. --- spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb b/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb index 41864fcfa2a..0a4d24c9eb6 100644 --- a/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb +++ b/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb @@ -11,7 +11,6 @@ let!(:past_hearing_day_with_link) { FactoryBot.create(:hearing_day, :virtual, :past_with_link) } context ".perform" do - # subject(:job) { VirtualHearings::DeleteConferenceLinkJob.new } it "When conference links in the DB are past the date of the date the job is run" do expect(ConferenceLink.count).to be(2) perform_enqueued_jobs { VirtualHearings::DeleteConferenceLinkJob.perform_now } From dc3bbad86f29090b71f5eaec3a98f956538447cd Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Thu, 7 Sep 2023 14:39:20 -0400 Subject: [PATCH 085/445] APPEALS-29006 added formatting date method in the job. --- .../virtual_hearings/delete_conference_link_job.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/app/jobs/virtual_hearings/delete_conference_link_job.rb b/app/jobs/virtual_hearings/delete_conference_link_job.rb index cd74a0c6cd6..bc0509f1f4f 100644 --- a/app/jobs/virtual_hearings/delete_conference_link_job.rb +++ b/app/jobs/virtual_hearings/delete_conference_link_job.rb @@ -24,7 +24,7 @@ def perform # # Return: A collection of links for hearing days that have passed. def retreive_stale_conference_links - ConferenceLink.joins(:hearing_day).where("scheduled_for < ?", Date.today) + ConferenceLink.joins(:hearing_day).where("scheduled_for < ?", query_date_formatted) end # Purpose: Iterates through a collection of links, updating each item and then soft_deleting. @@ -56,4 +56,13 @@ def update_conf_links host_pin_long: nil } end + + # Purpose: Simple date formatting work to be done outside of the query. + # + # Params: None + # + # Return: "YYYY-mm-dd" formatted date from the Time object. + def query_date_formatted + Time.zone.now.to_formatted_s.split(" ")[0] + end end From 9799896fabdbf6ead723a9f421647f185af1fb5b Mon Sep 17 00:00:00 2001 From: Prerna Devulapalli Date: Thu, 7 Sep 2023 15:15:57 -0400 Subject: [PATCH 086/445] APPEALS-25142 Disable hearing link after scheduled_for date is passed --- .../delete_conferences_job.rb | 12 ++- .../dailyDocket/DailyDocketRowInputs.jsx | 30 ++++--- .../components/details/HearingLinks.jsx | 7 +- .../details/VirtualHearingFields.jsx | 1 + client/app/hearings/utils.js | 5 ++ .../dailyDocket/StaticVirtualHearing.test.js | 18 ++++ .../StaticVirtualHearing.test.js.snap | 10 +++ client/test/data/hearings.js | 84 +++++++++++++++++++ 8 files changed, 151 insertions(+), 16 deletions(-) diff --git a/app/jobs/virtual_hearings/delete_conferences_job.rb b/app/jobs/virtual_hearings/delete_conferences_job.rb index c5e6849e522..8ff0f4cad3c 100644 --- a/app/jobs/virtual_hearings/delete_conferences_job.rb +++ b/app/jobs/virtual_hearings/delete_conferences_job.rb @@ -140,14 +140,22 @@ def process_virtual_hearing(virtual_hearing) # Returns whether or not the conference was deleted from Pexip def delete_conference(virtual_hearing) + #TODO: Update the clients once the webex implementation is completed + if virtual_hearing.meeting_type === "pexip" + #client = pexip client + conference_client = "Pexip" + else + #client = webex client + conference_client = "Webex" + end response = client.delete_conference(conference_id: virtual_hearing.conference_id) - Rails.logger.info("Pexip response: #{response}") + Rails.logger.info("#{conference_client} response: #{response}") fail response.error unless response.success? true rescue Caseflow::Error::PexipNotFoundError - Rails.logger.info("Conference for hearing (#{virtual_hearing.hearing_id}) was already deleted") + Rails.logger.info("Pexip Conference for hearing (#{virtual_hearing.hearing_id}) was already deleted") # Assume the conference was already deleted if it's no longer in Pexip. true diff --git a/client/app/hearings/components/dailyDocket/DailyDocketRowInputs.jsx b/client/app/hearings/components/dailyDocket/DailyDocketRowInputs.jsx index 265027ce759..1a940ff58e6 100644 --- a/client/app/hearings/components/dailyDocket/DailyDocketRowInputs.jsx +++ b/client/app/hearings/components/dailyDocket/DailyDocketRowInputs.jsx @@ -19,6 +19,7 @@ import HEARING_DISPOSITION_TYPES from '../../../../constants/HEARING_DISPOSITION import { virtualHearingRoleForUser, virtualHearingLinkLabelFull, + virtualHearingScheduledDatePassedLabelFull, VIRTUAL_HEARING_HOST } from '../../utils'; @@ -350,18 +351,23 @@ PreppedCheckbox.propTypes = { export const StaticVirtualHearing = ({ hearing, user }) => (
    - + { hearing?.scheduledForIsPast && + {virtualHearingScheduledDatePassedLabelFull(virtualHearingRoleForUser(user, hearing))} + } + { !hearing?.scheduledForIsPast && ( + + )} {hearing?.virtualHearing?.status === 'pending' && (
    {COPY.VIRTUAL_HEARING_SCHEDULING_IN_PROGRESS} diff --git a/client/app/hearings/components/details/HearingLinks.jsx b/client/app/hearings/components/details/HearingLinks.jsx index 4e7d1edd6b9..6009d4dd511 100644 --- a/client/app/hearings/components/details/HearingLinks.jsx +++ b/client/app/hearings/components/details/HearingLinks.jsx @@ -27,8 +27,11 @@ export const VirtualHearingLinkDetails = ({ virtualHearing }) => ( - {hearing?.scheduledForIsPast || wasVirtual ? ( - Expired + {hearing.scheduledForIsPast || hearing.wasVirtual ? ( +
    + N/A + Expired +
    ) : ( diff --git a/client/app/hearings/utils.js b/client/app/hearings/utils.js index 5910ee2fb6e..12a031bb2e1 100644 --- a/client/app/hearings/utils.js +++ b/client/app/hearings/utils.js @@ -216,6 +216,11 @@ export const virtualHearingLinkLabelFull = (role) => COPY.VLJ_VIRTUAL_HEARING_LINK_LABEL_FULL : COPY.REPRESENTATIVE_VIRTUAL_HEARING_LINK_LABEL; +export const virtualHearingScheduledDatePassedLabelFull = (role) => +role === VIRTUAL_HEARING_HOST ? + COPY.VLJ_VIRTUAL_HEARING_LINK_LABEL_FULL + ": N/A" : + COPY.REPRESENTATIVE_VIRTUAL_HEARING_PASSED_LABEL + ": N/A"; + export const pollVirtualHearingData = (hearingId, onSuccess) => ( // Did not specify retryCount so if api call fails, it'll stop polling. // If need to retry on failure, pass in retryCount diff --git a/client/test/app/hearings/components/dailyDocket/StaticVirtualHearing.test.js b/client/test/app/hearings/components/dailyDocket/StaticVirtualHearing.test.js index f2df3cfc3c6..0eca7d74ddd 100644 --- a/client/test/app/hearings/components/dailyDocket/StaticVirtualHearing.test.js +++ b/client/test/app/hearings/components/dailyDocket/StaticVirtualHearing.test.js @@ -3,6 +3,7 @@ import { render, screen, fireEvent } from '@testing-library/react'; import { axe } from 'jest-axe'; import { amaHearing } from 'test/data/hearings'; +import { amaHearingPast } from 'test/data/hearings'; import { anyUser, vsoUser } from 'test/data/user'; import COPY from '../../../../../COPY'; @@ -14,6 +15,10 @@ describe('StaticVirtualHearing', () => { hearing: amaHearing }; + const pastHearingProps = { + user: anyUser, + hearing: amaHearingPast + }; it('renders correctly', () => { const { container } = render(); @@ -21,6 +26,12 @@ describe('StaticVirtualHearing', () => { expect(container).toMatchSnapshot(); }) + it('renders past hearing correctly', () => { + const { container } = render(); + + expect(container).toMatchSnapshot(); + }) + it('passes a11y testing', async () => { const { container } = render(); @@ -28,6 +39,13 @@ describe('StaticVirtualHearing', () => { expect(results).toHaveNoViolations(); }) + it('passes a11y testing for past hearing', async () => { + const { container } = render(); + + const results = await axe(container); + expect(results).toHaveNoViolations(); + }) + it('displays correct label for host user', () => { const component = render( diff --git a/client/test/app/hearings/components/dailyDocket/__snapshots__/StaticVirtualHearing.test.js.snap b/client/test/app/hearings/components/dailyDocket/__snapshots__/StaticVirtualHearing.test.js.snap index b6e14b9ce82..cc9bf109b0d 100644 --- a/client/test/app/hearings/components/dailyDocket/__snapshots__/StaticVirtualHearing.test.js.snap +++ b/client/test/app/hearings/components/dailyDocket/__snapshots__/StaticVirtualHearing.test.js.snap @@ -365,3 +365,13 @@ exports[`StaticVirtualHearing renders correctly 1`] = `
    `; + +exports[`StaticVirtualHearing renders past hearing correctly 1`] = ` +
    +
    + + undefined: N/A + +
    +
    +`; diff --git a/client/test/data/hearings.js b/client/test/data/hearings.js index bf16769bbcd..bc197b577e5 100644 --- a/client/test/data/hearings.js +++ b/client/test/data/hearings.js @@ -43,6 +43,90 @@ export const virtualHearing = { }, }; +export const amaHearingPast = { + poaName: 'AMERICAN LEGION', + currentIssueCount: 1, + caseType: 'Original', + aod: false, + advanceOnDocketMotion: null, + appealExternalId: '005334f7-b5c6-490c-a310-7dc5db22c8c3', + appealId: 4, + appellantAddressLine1: '9999 MISSION ST', + appellantCity: 'SAN FRANCISCO', + appellantEmailAddress: 'tom.brady@caseflow.gov', + appellantFirstName: 'Bob', + appellantIsNotVeteran: false, + appellantLastName: 'Smith', + appellantState: 'CA', + appellantTz: 'America/Los_Angeles', + appellantZip: '94103', + availableHearingLocations: {}, + bvaPoc: null, + centralOfficeTimeString: '03:30', + claimantId: 4, + closestRegionalOffice: null, + disposition: null, + dispositionEditable: true, + docketName: 'hearing', + docketNumber: '200628-4', + evidenceWindowWaived: false, + externalId: '9bb8e27e-9b89-48cd-8b0b-2e75cfa5627a', + hearingDayId: 4, + id: 4, + judgeId: 3, + judge: { + id: 3, + createdAt: '2020-06-25T11:00:43.257-04:00', + cssId: 'BVAAABSHIRE', + efolderDocumentsFetchedAt: null, + email: null, + fullName: 'Aaron Judge_HearingsAndCases Abshire', + lastLoginAt: null, + roles: {}, + selectedRegionalOffice: null, + stationId: '101', + status: 'active', + statusUpdatedAt: null, + updatedAt: '2020-06-25T11:00:43.257-04:00', + displayName: 'BVAAABSHIRE (VACO)', + }, + location: null, + militaryService: '', + notes: null, + paperCase: false, + prepped: null, + readableLocation: 'Washington, DC', + readableRequestType: 'Central', + regionalOfficeKey: 'C', + regionalOfficeName: 'Central', + regionalOfficeTimezone: 'America/New_York', + representative: 'Clarence Darrow', + representativeName: 'PARALYZED VETERANS OF AMERICA, INC.', + representativeEmailAddress: 'tom.brady@caseflow.gov', + representativeTz: 'America/Denver', + room: '2', + scheduledFor: '2020-01-06T06:00:00.000-04:00', + scheduledForIsPast: true, + scheduledTime: '2000-01-01T03:30:00.000-05:00', + scheduledTimeString: '03:30', + summary: null, + transcriptRequested: null, + transcription: {}, + uuid: '9bb8e27e-9b89-48cd-8b0b-2e75cfa5627a', + veteranAge: 85, + veteranFileNumber: '500000003', + veteranFirstName: 'Bob', + veteranGender: 'M', + veteranLastName: 'Smith', + veteranEmailAddress: 'Bob.Smith@test.com', + isVirtual: true, + wasVirtual: false, + witness: null, + worksheetIssues: {}, + ...virtualHearing, + ...virtualHearingEmails, +}; + export const amaHearing = { poaName: 'AMERICAN LEGION', currentIssueCount: 1, From 138f8f9e65fe4a79713081ef608c160c054f4ad5 Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Thu, 7 Sep 2023 17:18:55 -0400 Subject: [PATCH 087/445] APPEALS-29006 spec updates/cleanup --- .../delete_conference_link_job_spec.rb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb b/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb index 0a4d24c9eb6..c6214a0f945 100644 --- a/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb +++ b/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb @@ -7,14 +7,16 @@ let!(:judge) { Judge.new(create(:user)) } let!(:single_hearing_day) { FactoryBot.create(:hearing_day) } - let!(:future_hearing_day_with_link) { FactoryBot.create(:hearing_day, :virtual, :future_with_link) } - let!(:past_hearing_day_with_link) { FactoryBot.create(:hearing_day, :virtual, :past_with_link) } + describe ".perform" do + context "When conference links in the DB are past the date of the date the job is run" do + let!(:future_hearing_day_with_link) { FactoryBot.create(:hearing_day, :virtual, :future_with_link) } + let!(:past_hearing_day_with_link) { FactoryBot.create(:hearing_day, :virtual, :past_with_link) } - context ".perform" do - it "When conference links in the DB are past the date of the date the job is run" do - expect(ConferenceLink.count).to be(2) - perform_enqueued_jobs { VirtualHearings::DeleteConferenceLinkJob.perform_now } - expect(ConferenceLink.count).to be(1) + it "Soft deletes the qualifying links." do + expect(ConferenceLink.count).to be(2) + perform_enqueued_jobs { VirtualHearings::DeleteConferenceLinkJob.perform_now } + expect(ConferenceLink.count).to be(1) + end end end end From 9926e8df022701ea3ab7d4ef7d438e864665ccb2 Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Fri, 8 Sep 2023 12:11:15 -0400 Subject: [PATCH 088/445] APPEALS-29006 code climate fixes --- app/jobs/virtual_hearings/delete_conference_link_job.rb | 2 +- app/models/hearing_day.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/jobs/virtual_hearings/delete_conference_link_job.rb b/app/jobs/virtual_hearings/delete_conference_link_job.rb index bc0509f1f4f..a1a5eab6bd3 100644 --- a/app/jobs/virtual_hearings/delete_conference_link_job.rb +++ b/app/jobs/virtual_hearings/delete_conference_link_job.rb @@ -18,7 +18,7 @@ def perform private - # Purpose: Queries the database table of conference_links that are associated with a hearing_day that has already passed. + # Purpose: Queries the DB table of conference_links that are associated with a hearing_day that has already passed. # # Params: None # diff --git a/app/models/hearing_day.rb b/app/models/hearing_day.rb index 3a7252079f2..1cf2bb1ad8a 100644 --- a/app/models/hearing_day.rb +++ b/app/models/hearing_day.rb @@ -222,6 +222,7 @@ def conference_link end private + def kickoff_link_cleanup VirtualHearings::DeleteConferenceLinkJob.new.perform end From 32b83917a714e91a6bfed1f9c2868ef78125e08b Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Fri, 8 Sep 2023 13:38:06 -0400 Subject: [PATCH 089/445] APPEALS-25117: updates to rspec, webex responses, delete conferences job --- .../virtual_hearings/create_conference_job.rb | 1 - .../delete_conferences_job.rb | 42 +++++++++++++++---- app/services/external_api/webex_service.rb | 2 +- .../webex_service/create_response.rb | 6 ++- .../external_api/webex_service/response.rb | 2 +- .../create_conference_job_spec.rb | 14 ++++++- 6 files changed, 52 insertions(+), 15 deletions(-) diff --git a/app/jobs/virtual_hearings/create_conference_job.rb b/app/jobs/virtual_hearings/create_conference_job.rb index a5ab5bd39db..8c1a1379102 100644 --- a/app/jobs/virtual_hearings/create_conference_job.rb +++ b/app/jobs/virtual_hearings/create_conference_job.rb @@ -141,7 +141,6 @@ def create_conference create_conference_response = create_new_conference Rails.logger.info("Create Conference Response: #{create_conference_response.inspect}") - if create_conference_response.error error_display = error_display(create_conference_response) diff --git a/app/jobs/virtual_hearings/delete_conferences_job.rb b/app/jobs/virtual_hearings/delete_conferences_job.rb index c5e6849e522..443c439a0cf 100644 --- a/app/jobs/virtual_hearings/delete_conferences_job.rb +++ b/app/jobs/virtual_hearings/delete_conferences_job.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true ## -# Job that deletes the pexip conference resource if the hearing was held or +# Job that deletes the pexip/webex conference resource if the hearing was held or # if the hearing type is switched from virtual to original hearing type. # It also sends cancellation emails to hearing participants if latter is case. @@ -18,7 +18,7 @@ class EmailsFailedToSend < StandardError; end before_perform do Rails.logger.info( - "#{self.class.name} for deleting Pexip conferences and sending cancellation emails" + "#{self.class.name} for deleting Pexip or Webex conferences and sending cancellation emails" ) end @@ -47,14 +47,14 @@ def perform count_deleted_and_log(VirtualHearingRepository.ready_for_deletion) do |virtual_hearing| log_virtual_hearing_state(virtual_hearing) - Rails.logger.info("Deleting Pexip conference for hearing (#{virtual_hearing.hearing_id})") + Rails.logger.info("Deleting Pexip or Webex conference for hearing (#{virtual_hearing.hearing_id})") process_virtual_hearing(virtual_hearing) end log_failed_virtual_hearings if exception_list.present? - # raise DeleteConferencesJobFailure if EmailsFailedToSend and/or PexipApiErrors were raised + # raise DeleteConferencesJobFailure if EmailsFailedToSend and/or Pexip/Webex ApiErrors were raised fail DeleteConferencesJobFailure if exception_list.present? end @@ -66,9 +66,13 @@ def exception_list def log_failed_virtual_hearings vh_with_pexip_errors = exception_list[Caseflow::Error::PexipApiError] + vh_with_webex_errors = exception_list[Caseflow::Error::WebexApiError] if vh_with_pexip_errors - Rails.logger.info("Failed to delete conferences for the following hearings: " \ + Rails.logger.info("Failed to delete pexip conferences for the following hearings: " \ "#{vh_with_pexip_errors.map(&:hearing_id)}") + elsif vh_with_webex_errors + Rails.logger.info("Failed to delete webex conferences for the following hearings: " \ + "#{vh_with_webex_errors.map(&:hearing_id)}") end vh_with_email_errors = exception_list[EmailsFailedToSend] @@ -82,7 +86,8 @@ def log_virtual_hearing_state(virtual_hearing) super Rails.logger.info("Cancelled?: (#{virtual_hearing.cancelled?})") - Rails.logger.info("Pexip conference id: (#{virtual_hearing.conference_id?})") + Rails.logger.info("Conference id: (#{virtual_hearing.conference_id?})") + Rails.logger.info("Meeting Type: (#{virtual_hearing.meeting_type?})") end def send_cancellation_emails(virtual_hearing) @@ -138,10 +143,10 @@ def process_virtual_hearing(virtual_hearing) true end - # Returns whether or not the conference was deleted from Pexip + # Returns whether or not the conference was deleted from Pexip or Webex def delete_conference(virtual_hearing) response = client.delete_conference(conference_id: virtual_hearing.conference_id) - Rails.logger.info("Pexip response: #{response}") + Rails.logger.info("Response: #{response}") fail response.error unless response.success? @@ -149,7 +154,10 @@ def delete_conference(virtual_hearing) rescue Caseflow::Error::PexipNotFoundError Rails.logger.info("Conference for hearing (#{virtual_hearing.hearing_id}) was already deleted") - # Assume the conference was already deleted if it's no longer in Pexip. + rescue Caseflow::Error::WebexNotFoundError + Rails.logger.info("Conference for hearing (#{virtual_hearing.hearing_id}) was already deleted") + + # Assume the conference was already deleted if it's no longer in Pexip or Webex. true rescue Caseflow::Error::PexipApiError => error Rails.logger.error("Failed to delete conference from Pexip for hearing (#{virtual_hearing.hearing_id})" \ @@ -167,6 +175,22 @@ def delete_conference(virtual_hearing) } ) + false + rescue Caseflow::Error::WebexApiError => error + Rails.logger.error("Failed to delete conference from Webex for hearing (#{virtual_hearing.hearing_id})" \ + " with error: (#{error.code}) #{error.message}") + + (exception_list[Caseflow::Error::WebexApiError] ||= []) << virtual_hearing + + capture_exception( + error: error, + extra: { + hearing_id: virtual_hearing.hearing_id, + virtual_hearing_id: virtual_hearing.id, + webex_conference_Id: virtual_hearing.conference_id + } + ) + false end end diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb index 1974b9767d3..f286853c312 100644 --- a/app/services/external_api/webex_service.rb +++ b/app/services/external_api/webex_service.rb @@ -45,7 +45,7 @@ def create_conference(virtual_hearing) ] } }, - "aud": "some stuff", + # "aud": "some stuff", "numGuest": 1, "numHost": 1, "provideShortUrls": true, diff --git a/app/services/external_api/webex_service/create_response.rb b/app/services/external_api/webex_service/create_response.rb index b5b02ec4ee3..7b72eb9c27c 100644 --- a/app/services/external_api/webex_service/create_response.rb +++ b/app/services/external_api/webex_service/create_response.rb @@ -2,7 +2,9 @@ class ExternalApi::WebexService::CreateResponse < ExternalApi::WebexService::Response def data - response = JSON.parse(resp.body) - { "conference_id": response.first.last } + if !response.body? nil + response = JSON.parse(resp.body) + { "conference_id": response.first.last } + end end end diff --git a/app/services/external_api/webex_service/response.rb b/app/services/external_api/webex_service/response.rb index bbcf1ae8c0c..385bbceb56f 100644 --- a/app/services/external_api/webex_service/response.rb +++ b/app/services/external_api/webex_service/response.rb @@ -43,7 +43,7 @@ def error_message return "No error message from Webex" if resp.raw_body.empty? begin - JSON.parse(resp.raw_body)["conference"]["name"].first + JSON.parse(resp.raw_body)["message"] rescue JSON::ParserError "No error message from Webex" end diff --git a/spec/jobs/virtual_hearings/create_conference_job_spec.rb b/spec/jobs/virtual_hearings/create_conference_job_spec.rb index 4c629aa1a96..0618eaa27d8 100644 --- a/spec/jobs/virtual_hearings/create_conference_job_spec.rb +++ b/spec/jobs/virtual_hearings/create_conference_job_spec.rb @@ -97,8 +97,20 @@ expect(virtual_hearing.guest_pin.to_s.length).to eq(11) end - it "fails when meeting type is webex" do + it "creates a conference when meeting type is webex" do current_user.update!(meeting_type: "webex") + subject.perform_now + virtual_hearing.reload + + expect(virtual_hearing.status).to eq(:active) + expect(virtual_hearing.alias).to eq("0000001") + expect(virtual_hearing.alias_with_host).to eq("BVA0000001@#{pexip_url}") + # alias with host will change with either link service or real webex server + end + + it "raises error when webex conference creation fails" do + current_user.update!(meeting_type: "webex") + expect { subject.perform_now }.to raise_exception(Caseflow::Error::WebexApiError) end From e388f4bbf311ad648a733495d438980baa6e0557 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Fri, 8 Sep 2023 13:39:36 -0400 Subject: [PATCH 090/445] APPEALS-25117: adding/removing code comments --- app/services/external_api/webex_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb index f286853c312..1974b9767d3 100644 --- a/app/services/external_api/webex_service.rb +++ b/app/services/external_api/webex_service.rb @@ -45,7 +45,7 @@ def create_conference(virtual_hearing) ] } }, - # "aud": "some stuff", + "aud": "some stuff", "numGuest": 1, "numHost": 1, "provideShortUrls": true, From cea9ff2d74252fa1a1518823925a890ec57780e8 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Fri, 8 Sep 2023 13:39:54 -0400 Subject: [PATCH 091/445] APPEALS-25117: adding/removing code comments --- spec/jobs/virtual_hearings/create_conference_job_spec.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/jobs/virtual_hearings/create_conference_job_spec.rb b/spec/jobs/virtual_hearings/create_conference_job_spec.rb index 0618eaa27d8..ffd12c158c3 100644 --- a/spec/jobs/virtual_hearings/create_conference_job_spec.rb +++ b/spec/jobs/virtual_hearings/create_conference_job_spec.rb @@ -109,6 +109,7 @@ end it "raises error when webex conference creation fails" do + # must comment out line 48 in webex_service.rb current_user.update!(meeting_type: "webex") expect { subject.perform_now }.to raise_exception(Caseflow::Error::WebexApiError) From 5df251b8add240dc34bbab349af5a52990e9d40b Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Fri, 8 Sep 2023 14:19:34 -0400 Subject: [PATCH 092/445] APPEAL-29006 updated [update conf links] method --- app/jobs/virtual_hearings/delete_conference_link_job.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/jobs/virtual_hearings/delete_conference_link_job.rb b/app/jobs/virtual_hearings/delete_conference_link_job.rb index a1a5eab6bd3..be784feb20c 100644 --- a/app/jobs/virtual_hearings/delete_conference_link_job.rb +++ b/app/jobs/virtual_hearings/delete_conference_link_job.rb @@ -46,6 +46,8 @@ def links_soft_removal(collection) # Return: Hash that will update the conference_link def update_conf_links { + alias: nil, + alias_with_host: nil, conference_deleted: true, updated_by_id: RequestStore[:current_user], updated_at: Time.zone.now, From 92d5e4da39d5a76ea0e3efecf417b1954a20fb4c Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Mon, 11 Sep 2023 11:03:32 -0400 Subject: [PATCH 093/445] APPEALS-25117: adding notes to rspec tests --- spec/jobs/virtual_hearings/create_conference_job_spec.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/jobs/virtual_hearings/create_conference_job_spec.rb b/spec/jobs/virtual_hearings/create_conference_job_spec.rb index ffd12c158c3..8e088311fcc 100644 --- a/spec/jobs/virtual_hearings/create_conference_job_spec.rb +++ b/spec/jobs/virtual_hearings/create_conference_job_spec.rb @@ -109,7 +109,8 @@ end it "raises error when webex conference creation fails" do - # must comment out line 48 in webex_service.rb + # must comment out line 48 in webex_service.rb for the mock server to return an error + # these tests will need to be updated after GHA workflow is updated current_user.update!(meeting_type: "webex") expect { subject.perform_now }.to raise_exception(Caseflow::Error::WebexApiError) From 384a5ebce5be01812cd21740b6029f589a25654e Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Mon, 11 Sep 2023 15:09:52 -0400 Subject: [PATCH 094/445] delete conference link job (update_conf_links method) updated. No longer setting values to null and instead allow soft-delete feature to be handled with paranoia --- app/jobs/virtual_hearings/delete_conference_link_job.rb | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/app/jobs/virtual_hearings/delete_conference_link_job.rb b/app/jobs/virtual_hearings/delete_conference_link_job.rb index be784feb20c..4d1a556e8f0 100644 --- a/app/jobs/virtual_hearings/delete_conference_link_job.rb +++ b/app/jobs/virtual_hearings/delete_conference_link_job.rb @@ -46,16 +46,9 @@ def links_soft_removal(collection) # Return: Hash that will update the conference_link def update_conf_links { - alias: nil, - alias_with_host: nil, conference_deleted: true, updated_by_id: RequestStore[:current_user], - updated_at: Time.zone.now, - guest_hearing_link: nil, - guest_pin_long: nil, - host_link: nil, - host_pin: nil, - host_pin_long: nil + updated_at: Time.zone.now } end From ee7e3144bdb271d1c3c66da98833d7bfa52ee7e1 Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Mon, 11 Sep 2023 16:01:52 -0400 Subject: [PATCH 095/445] hearing_day object file updated with 'scheduled_date_pased?' and updated 'conference_link' method --- app/models/hearing_day.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/models/hearing_day.rb b/app/models/hearing_day.rb index 1cf2bb1ad8a..30a91fce101 100644 --- a/app/models/hearing_day.rb +++ b/app/models/hearing_day.rb @@ -216,13 +216,18 @@ def half_day? total_slots ? total_slots <= 5 : false end - # over write of the .conference_link method from belongs_to :conference_link to add logic to create of not there + # over write of the .conference_link method from belongs_to :conference_link to add logic to create of not there def conference_link - @conference_link ||= find_or_create_conference_link! + @conference_link ||= h_day_is_in_past? ? nil : find_or_create_conference_link! + # @conference_link ||= find_or_create_conference_link! end private + def h_day_is_in_past? + scheduled_for < Date.current + end + def kickoff_link_cleanup VirtualHearings::DeleteConferenceLinkJob.new.perform end From 846122b71a0065561449e916a41ab6fe1907f31b Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Tue, 12 Sep 2023 08:40:33 -0400 Subject: [PATCH 096/445] Resync schema --- db/schema.rb | 40 +++++----------------------------------- 1 file changed, 5 insertions(+), 35 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index be9b061421c..bf2db4cc6c9 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -91,7 +91,7 @@ t.boolean "appeal_docketed", default: false, null: false, comment: "When true, appeal has been docketed" t.bigint "appeal_id", null: false, comment: "AMA or Legacy Appeal ID" t.string "appeal_type", null: false, comment: "Appeal Type (Appeal or LegacyAppeal)" - t.datetime "created_at", null: false + t.datetime "created_at", null: false, comment: "Date and Time the record was inserted into the table" t.bigint "created_by_id", null: false, comment: "User id of the user that inserted the record" t.boolean "decision_mailed", default: false, null: false, comment: "When true, appeal has decision mail request complete" t.boolean "hearing_postponed", default: false, null: false, comment: "When true, appeal has hearing postponed and no hearings scheduled" @@ -100,7 +100,7 @@ t.boolean "privacy_act_complete", default: false, null: false, comment: "When true, appeal has a privacy act request completed" t.boolean "privacy_act_pending", default: false, null: false, comment: "When true, appeal has a privacy act request still open" t.boolean "scheduled_in_error", default: false, null: false, comment: "When true, hearing was scheduled in error and none scheduled" - t.datetime "updated_at" + t.datetime "updated_at", comment: "Date and time the record was last updated" t.bigint "updated_by_id", comment: "User id of the last user that updated the record" t.boolean "vso_ihp_complete", default: false, null: false, comment: "When true, appeal has a VSO IHP request completed" t.boolean "vso_ihp_pending", default: false, null: false, comment: "When true, appeal has a VSO IHP request pending" @@ -624,8 +624,6 @@ t.string "diagnostic_code", comment: "If a decision resulted in a rating, this is the rating issue's diagnostic code." t.string "disposition", comment: "The disposition for a decision issue. Dispositions made in Caseflow and dispositions made in VBMS can have different values." t.date "end_product_last_action_date", comment: "After an end product gets synced with a status of CLR (cleared), the end product's last_action_date is saved on any decision issues that are created as a result. This is used as a proxy for decision date for non-rating issues that are processed in VBMS because they don't have a rating profile date, and the exact decision date is not available." - t.boolean "mst_status", default: false, comment: "Indicates if decision issue is related to Military Sexual Trauma (MST)" - t.boolean "pact_status", default: false, comment: "Indicates if decision issue is related to Promise to Address Comprehensive Toxics (PACT) Act" t.string "participant_id", null: false, comment: "The Veteran's participant id." t.string "percent_number", comment: "percent_number from RatingIssue (prcntNo from Rating Profile)" t.string "rating_issue_reference_id", comment: "Identifies the specific issue on the rating that resulted from the decision issue (a rating issue can be connected to multiple contentions)." @@ -1296,7 +1294,7 @@ t.string "appeals_type", null: false, comment: "Type of Appeal" t.datetime "created_at", comment: "Timestamp of when Noticiation was Created" t.boolean "email_enabled", default: true, null: false - t.string "email_notification_content", comment: "Full Email Text Content of Notification" + t.text "email_notification_content", comment: "Full Email Text Content of Notification" t.string "email_notification_external_id", comment: "VA Notify Notification Id for the email notification send through their API " t.string "email_notification_status", comment: "Status of the Email Notification" t.date "event_date", null: false, comment: "Date of Event" @@ -1307,8 +1305,8 @@ t.string "participant_id", comment: "ID of Participant" t.string "recipient_email", comment: "Participant's Email Address" t.string "recipient_phone_number", comment: "Participants Phone Number" - t.string "sms_notification_content", comment: "Full SMS Text Content of Notification" - t.string "sms_notification_external_id", comment: "VA Notify Notification Id for the sms notification send through their API " + t.text "sms_notification_content", comment: "Full SMS Text Content of Notification" + t.string "sms_notification_external_id" t.string "sms_notification_status", comment: "Status of SMS/Text Notification" t.datetime "updated_at", comment: "TImestamp of when Notification was Updated" t.index ["appeals_id", "appeals_type"], name: "index_appeals_notifications_on_appeals_id_and_appeals_type" @@ -1516,13 +1514,9 @@ t.string "ineligible_reason", comment: "The reason for a Request Issue being ineligible. If a Request Issue has an ineligible_reason, it is still captured, but it will not get a contention in VBMS or a decision." t.boolean "is_predocket_needed", comment: "Indicates whether or not an issue has been selected to go to the pre-docket queue opposed to normal docketing." t.boolean "is_unidentified", comment: "Indicates whether a Request Issue is unidentified, meaning it wasn't found in the list of contestable issues, and is not a new nonrating issue. Contentions for unidentified issues are created on a rating End Product if processed in VBMS but without the issue description, and someone is required to edit it in Caseflow before proceeding with the decision." - t.boolean "mst_status", default: false, comment: "Indicates if issue is related to Military Sexual Trauma (MST)" - t.text "mst_status_update_reason_notes", comment: "The reason for why Request Issue is Military Sexual Trauma (MST)" t.string "nonrating_issue_category", comment: "The category selected for nonrating request issues. These vary by business line." t.string "nonrating_issue_description", comment: "The user entered description if the issue is a nonrating issue" t.text "notes", comment: "Notes added by the Claims Assistant when adding request issues. This may be used to capture handwritten notes on the form, or other comments the CA wants to capture." - t.boolean "pact_status", default: false, comment: "Indicates if issue is related to Promise to Address Comprehensive Toxics (PACT) Act" - t.text "pact_status_update_reason_notes", comment: "The reason for why Request Issue is Promise to Address Comprehensive Toxics (PACT) Act" t.string "ramp_claim_id", comment: "If a rating issue was created as a result of an issue intaken for a RAMP Review, it will be connected to the former RAMP issue by its End Product's claim ID." t.datetime "rating_issue_associated_at", comment: "Timestamp when a contention and its contested rating issue are associated in VBMS." t.string "split_issue_status", comment: "If a request issue is part of a split, on_hold status applies to the original request issues while active are request issues on splitted appeals" @@ -1533,8 +1527,6 @@ t.datetime "updated_at", comment: "Automatic timestamp whenever the record changes." t.string "vacols_id", comment: "The vacols_id of the legacy appeal that had an issue found to match the request issue." t.integer "vacols_sequence_id", comment: "The vacols_sequence_id, for the specific issue on the legacy appeal which the Claims Assistant determined to match the request issue on the Decision Review. A combination of the vacols_id (for the legacy appeal), and vacols_sequence_id (for which issue on the legacy appeal), is required to identify the issue being opted-in." - t.boolean "vbms_mst_status", default: false, comment: "Indicates if issue is related to Military Sexual Trauma (MST) and was imported from VBMS" - t.boolean "vbms_pact_status", default: false, comment: "Indicates if issue is related to Promise to Address Comprehensive Toxics (PACT) Act and was imported from VBMS" t.boolean "verified_unidentified_issue", comment: "A verified unidentified issue allows an issue whose rating data is missing to be intaken as a regular rating issue. In order to be marked as verified, a VSR needs to confirm that they were able to find the record of the decision for the issue." t.string "veteran_participant_id", comment: "The veteran participant ID. This should be unique in upstream systems and used in the future to reconcile duplicates." t.index ["closed_at"], name: "index_request_issues_on_closed_at" @@ -1560,8 +1552,6 @@ t.integer "edited_request_issue_ids", comment: "An array of the request issue IDs that were edited during this request issues update", array: true t.string "error", comment: "The error message if the last attempt at processing the request issues update was not successful." t.datetime "last_submitted_at", comment: "Timestamp for when the processing for the request issues update was last submitted. Used to determine how long to continue retrying the processing job. Can be reset to allow for additional retries." - t.integer "mst_edited_request_issue_ids", comment: "An array of the request issue IDs that were updated to be associated with MST in request issues update", array: true - t.integer "pact_edited_request_issue_ids", comment: "An array of the request issue IDs that were updated to be associated with PACT in request issues update", array: true t.datetime "processed_at", comment: "Timestamp for when the request issue update successfully completed processing." t.bigint "review_id", null: false, comment: "The ID of the decision review edited." t.string "review_type", null: false, comment: "The type of the decision review edited." @@ -1610,26 +1600,6 @@ t.index ["sent_by_id"], name: "index_sent_hearing_email_events_on_sent_by_id" end - create_table "special_issue_changes", force: :cascade do |t| - t.bigint "appeal_id", null: false, comment: "AMA or Legacy Appeal ID that the issue is tied to" - t.string "appeal_type", null: false, comment: "Appeal Type (Appeal or LegacyAppeal)" - t.string "change_category", null: false, comment: "Type of change that occured to the issue (Established Issue, Added Issue, Edited Issue, Removed Issue)" - t.datetime "created_at", null: false, comment: "Date the special issue change was made" - t.string "created_by_css_id", null: false, comment: "CSS ID of the user that made the special issue change" - t.bigint "created_by_id", null: false, comment: "User ID of the user that made the special issue change" - t.bigint "decision_issue_id", comment: "ID of the decision issue that had a special issue change from its corresponding request issue" - t.bigint "issue_id", null: false, comment: "ID of the issue that was changed" - t.boolean "mst_from_vbms", comment: "Indication that the MST status originally came from VBMS on intake" - t.string "mst_reason_for_change", comment: "Reason for changing the MST status on an issue" - t.boolean "original_mst_status", null: false, comment: "Original MST special issue status of the issue" - t.boolean "original_pact_status", null: false, comment: "Original PACT special issue status of the issue" - t.boolean "pact_from_vbms" - t.string "pact_reason_for_change", comment: "Reason for changing the PACT status on an issue" - t.bigint "task_id", null: false, comment: "Task ID of the IssueUpdateTask or EstablishmentTask used to log this issue in the case timeline" - t.boolean "updated_mst_status", comment: "Updated MST special issue status of the issue" - t.boolean "updated_pact_status", comment: "Updated PACT special issue status of the issue" - end - create_table "special_issue_lists", comment: "Associates special issues to an AMA or legacy appeal for Caseflow Queue. Caseflow Dispatch uses special issues stored in legacy_appeals. They are intentionally disconnected.", force: :cascade do |t| t.bigint "appeal_id", comment: "The ID of the appeal associated with this record" t.string "appeal_type", comment: "The type of appeal associated with this record" From 6c70232007fda3955978863ef6dbbc8226a6df52 Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Tue, 12 Sep 2023 10:58:22 -0400 Subject: [PATCH 097/445] Updated method name in hearingday. --- app/models/hearing_day.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/hearing_day.rb b/app/models/hearing_day.rb index 30a91fce101..0754fe9384b 100644 --- a/app/models/hearing_day.rb +++ b/app/models/hearing_day.rb @@ -218,13 +218,13 @@ def half_day? # over write of the .conference_link method from belongs_to :conference_link to add logic to create of not there def conference_link - @conference_link ||= h_day_is_in_past? ? nil : find_or_create_conference_link! + @conference_link ||= scheduled_date_passed? ? nil : find_or_create_conference_link! # @conference_link ||= find_or_create_conference_link! end private - def h_day_is_in_past? + def scheduled_date_passed? scheduled_for < Date.current end From 98db9bcd08fa182f582f5ab2dc049a635bbb491e Mon Sep 17 00:00:00 2001 From: Prerna Devulapalli Date: Tue, 12 Sep 2023 12:08:53 -0400 Subject: [PATCH 098/445] APPEALS-25142 Disable virtual and video hearing links after scheduled date is passed --- Gemfile.lock | 24 +- client/app/components/CopyTextButton.jsx | 7 + .../DailyDocketGuestLinkSection.jsx | 11 +- .../components/dailyDocket/DailyDocketRow.jsx | 6 +- .../components/details/HearingLinks.jsx | 1 - .../__snapshots__/Details.test.js.snap | 20 +- .../DailyDocketGuestLinkSection.test.js | 32 ++ .../DailyDocketGuestLinkSection.test.js.snap | 312 +++++++++++++++++- .../__snapshots__/DailyDocketRow.test.js.snap | 113 ++----- .../components/details/HearingLinks.test.js | 2 +- .../__snapshots__/HearingLinks.test.js.snap | 75 ++++- .../VirtualHearingFields.test.js.snap | 5 +- .../NotificationsView.test.js.snap | 3 +- spec/feature/hearings/hearing_details_spec.rb | 4 +- 14 files changed, 491 insertions(+), 124 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 710c4378d8d..1a52a5a52df 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -186,8 +186,6 @@ GEM capybara-screenshot (1.0.23) capybara (>= 1.0, < 4) launchy - childprocess (1.0.1) - rake (< 13.0) choice (0.2.0) claide (1.1.0) claide-plugins (0.9.2) @@ -412,7 +410,7 @@ GEM nokogiri (~> 1) rake mini_mime (1.1.0) - mini_portile2 (2.7.1) + mini_portile2 (2.8.4) minitest (5.14.4) moment_timezone-rails (0.5.0) momentjs-rails (2.29.4.1) @@ -431,8 +429,8 @@ GEM newrelic_rpm (6.5.0.357) nio4r (2.5.8) no_proxy_fix (0.1.2) - nokogiri (1.13.1) - mini_portile2 (~> 2.7.0) + nokogiri (1.15.4) + mini_portile2 (~> 2.8.2) racc (~> 1.4) nori (2.6.0) notiffany (0.1.1) @@ -467,7 +465,7 @@ GEM public_suffix (4.0.6) puma (5.6.4) nio4r (~> 2.0) - racc (1.6.0) + racc (1.7.1) rack (2.2.6.2) rack-contrib (2.1.0) rack (~> 2.0) @@ -622,9 +620,10 @@ GEM scss_lint (0.58.0) rake (>= 0.9, < 13) sass (~> 3.5, >= 3.5.5) - selenium-webdriver (3.142.3) - childprocess (>= 0.5, < 2.0) - rubyzip (~> 1.2, >= 1.2.2) + selenium-webdriver (4.9.0) + rexml (~> 3.2, >= 3.2.5) + rubyzip (>= 1.2.2, < 3.0) + websocket (~> 1.0) sentry-raven (2.11.0) faraday (>= 0.7.6, < 1.0) sexp_processor (4.12.1) @@ -685,15 +684,16 @@ GEM addressable httpi (~> 2.0) nokogiri (>= 1.4.2) - webdrivers (4.1.2) + webdrivers (5.3.1) nokogiri (~> 1.6) - rubyzip (~> 1.0) - selenium-webdriver (>= 3.0, < 4.0) + rubyzip (>= 1.3.0) + selenium-webdriver (~> 4.0, < 4.11) webmock (3.6.2) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) webrick (1.7.0) + websocket (1.2.9) websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) diff --git a/client/app/components/CopyTextButton.jsx b/client/app/components/CopyTextButton.jsx index 77e49f0c3da..597aa114b4b 100644 --- a/client/app/components/CopyTextButton.jsx +++ b/client/app/components/CopyTextButton.jsx @@ -31,6 +31,12 @@ export default class CopyTextButton extends React.PureComponent { borderColor: COLORS.PRIMARY, borderBottomWidth: '1px' }, + ':disabled': { + backgroundColor: COLORS.GREY_BACKGROUND, + borderColor: COLORS.GREY_LIGHT, + color: COLORS.GREY_LIGHT, + borderBottomWidth: '1px' + }, '& > svg path': { fill: COLORS.GREY_LIGHT }, '&:hover > svg path': { fill: COLORS.PRIMARY } } : @@ -43,6 +49,7 @@ export default class CopyTextButton extends React.PureComponent { type="submit" className="cf-apppeal-id" aria-label={ariaLabel || `Copy ${label} ${text}`} + disabled={textToCopy === null} {...clipboardButtonStyling(buttonStyles)} > {text}  diff --git a/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx b/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx index 8e0ca4393f9..cefd62c0431 100644 --- a/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx +++ b/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx @@ -44,14 +44,19 @@ export const DailyDocketGuestLinkSection = ({ linkInfo }) => { * @param {roleAccess} - Boolean for if the current user has access to the guest link * @returns The room information */ - const renderRoomInfo = () => { - return ( + const renderRoomInfo = () => { return (linkInfo === null ? ( +
    +

    {GUEST_LINK_LABELS.GUEST_CONFERENCE_ROOM}:N/A

    +

    {GUEST_LINK_LABELS.GUEST_PIN}:N/A

    +

    +
    + ) : (

    {GUEST_LINK_LABELS.GUEST_CONFERENCE_ROOM}:{alias || useAliasFromLink()}

    {GUEST_LINK_LABELS.GUEST_PIN}:{usePinFromLink()}#

    - ); + )); }; return ( diff --git a/client/app/hearings/components/dailyDocket/DailyDocketRow.jsx b/client/app/hearings/components/dailyDocket/DailyDocketRow.jsx index fe49f91449e..a996c0a14af 100644 --- a/client/app/hearings/components/dailyDocket/DailyDocketRow.jsx +++ b/client/app/hearings/components/dailyDocket/DailyDocketRow.jsx @@ -375,11 +375,15 @@ class DailyDocketRow extends React.Component { return (
    {hearing?.isVirtual && } - {hearing?.isVirtual !== true && userJudgeOrCoordinator(user, hearing) && } + {hearing?.isVirtual !== true && hearing?.scheduledForIsPast && userJudgeOrCoordinator(user, hearing) &&
    + + Host Link: N/A +
    } N/A - Expired
    ) : ( { expect(screen.getByRole('heading', { name: 'PIN: 3998472#' })).toBeTruthy(); }); + + it('renders correctly for hearing admins and hearing management users if the hearing date is passed', () => { + const { container } = render(); + + expect(container).toMatchSnapshot(); + }); + + it('renders correctly for non hearing admins and hearing management users if the hearing date is passed', () => { + const { container } = render(); + + expect(container).toMatchSnapshot(); + }); + + it('passes a11y testing if the hearing date is passed', async () => { + const { container } = render(); + + const results = await axe(container); + + expect(results).toHaveNoViolations(); + }); + + it('renders conference room correctly if the hearing date is passed', () => { + render(); + + expect(screen.getByRole('heading', { name: 'Conference Room: N/A' })).toBeTruthy(); + }); + + it('renders guest pin correctly if the hearing date is passed', () => { + render(); + + expect(screen.getByRole('heading', { name: 'PIN: N/A' })).toBeTruthy(); + }); }); diff --git a/client/test/app/hearings/components/dailyDocket/__snapshots__/DailyDocketGuestLinkSection.test.js.snap b/client/test/app/hearings/components/dailyDocket/__snapshots__/DailyDocketGuestLinkSection.test.js.snap index cda56dc1c78..c984bea1d3d 100644 --- a/client/test/app/hearings/components/dailyDocket/__snapshots__/DailyDocketGuestLinkSection.test.js.snap +++ b/client/test/app/hearings/components/dailyDocket/__snapshots__/DailyDocketGuestLinkSection.test.js.snap @@ -36,7 +36,7 @@ exports[`DailyDocketGuestLinkSection renders correctly for hearing admins and he aria-label="" class="cf-apppeal-id" currentitem="false" - data-css-cjlnsd="" + data-css-p6dv0b="" data-event="focus mouseenter" data-event-off="mouseleave keydown" data-for="tooltip-Copy Guest Link" @@ -154,6 +154,160 @@ exports[`DailyDocketGuestLinkSection renders correctly for hearing admins and he
    `; +exports[`DailyDocketGuestLinkSection renders correctly for hearing admins and hearing management users if the hearing date is passed 1`] = ` +
    +
    +

    + Guest links for non-virtual hearings +

    +
    +

    + Conference Room + : + + N/A + +

    +

    + PIN + : + + N/A + +

    +

    + + + + +

    +
    +
    +
    +`; + exports[`DailyDocketGuestLinkSection renders correctly for non hearing admins and hearing management users 1`] = `
    + Copy Guest Link +   + + + + + + + + +
    +
    +
    +`; + +exports[`DailyDocketGuestLinkSection renders correctly for non hearing admins and hearing management users if the hearing date is passed 1`] = ` +
    +
    +

    + Guest links for non-virtual hearings +

    +
    +

    + Conference Room + : + + N/A + +

    +

    + PIN + : + + N/A + +

    +

    + - +
    + + Host Link: N/A + +
    - - - +
    + + Host Link: N/A + +
    - - - +
    + + Host Link: N/A + +
    - - - +
    + + Host Link: N/A + +
    - - - +
    + + Host Link: N/A + +
    { expect(form).toMatchSnapshot(); expect(form.find(VirtualHearingLink)).toHaveLength(0); expect( - form.find('span').filterWhere((node) => node.text() === 'Expired') + form.find('span').filterWhere((node) => node.text() === 'N/A') ).toHaveLength(2); }); diff --git a/client/test/app/hearings/components/details/__snapshots__/HearingLinks.test.js.snap b/client/test/app/hearings/components/details/__snapshots__/HearingLinks.test.js.snap index 434777426aa..548c569e159 100644 --- a/client/test/app/hearings/components/details/__snapshots__/HearingLinks.test.js.snap +++ b/client/test/app/hearings/components/details/__snapshots__/HearingLinks.test.js.snap @@ -229,11 +229,12 @@ exports[`HearingLinks Matches snapshot when hearing is virtual and in progress 1 aria-describedby="tooltip-Copy VLJ Link" aria-label="" className="cf-apppeal-id" - data-css-cjlnsd="" + data-css-p6dv0b="" data-event="focus mouseenter" data-event-off="mouseleave keydown" data-for="tooltip-Copy VLJ Link" data-tip={true} + disabled={true} onClick={[Function]} tabIndex={0} type="submit" @@ -569,11 +570,12 @@ exports[`HearingLinks Matches snapshot when hearing is virtual and in progress 1 aria-describedby="tooltip-Copy Guest Link" aria-label="" className="cf-apppeal-id" - data-css-cjlnsd="" + data-css-p6dv0b="" data-event="focus mouseenter" data-event-off="mouseleave keydown" data-for="tooltip-Copy Guest Link" data-tip={true} + disabled={true} onClick={[Function]} tabIndex={0} type="submit" @@ -818,9 +820,36 @@ exports[`HearingLinks Matches snapshot when hearing was virtual and occurred 1`] } wasVirtual={true} > - - Expired - +
    @@ -909,9 +938,36 @@ exports[`HearingLinks Matches snapshot when hearing was virtual and occurred 1`] } wasVirtual={true} > - - Expired - +
    @@ -1648,11 +1704,12 @@ exports[`HearingLinks Only displays Guest Link when user is not a host 1`] = ` aria-describedby="tooltip-Copy Guest Link" aria-label="" className="cf-apppeal-id" - data-css-cjlnsd="" + data-css-p6dv0b="" data-event="focus mouseenter" data-event-off="mouseleave keydown" data-for="tooltip-Copy Guest Link" data-tip={true} + disabled={false} onClick={[Function]} tabIndex={0} type="submit" diff --git a/client/test/app/hearings/components/details/__snapshots__/VirtualHearingFields.test.js.snap b/client/test/app/hearings/components/details/__snapshots__/VirtualHearingFields.test.js.snap index 6b998a6aa3b..f6633be7add 100644 --- a/client/test/app/hearings/components/details/__snapshots__/VirtualHearingFields.test.js.snap +++ b/client/test/app/hearings/components/details/__snapshots__/VirtualHearingFields.test.js.snap @@ -363,6 +363,7 @@ exports[`VirtualHearingFields Shows hearing details with virtualHearing 1`] = ` } } isVirtual={true} + scheduledForIsPast={false} user={ Object { "addressCity": "Washington", @@ -947,11 +948,12 @@ exports[`VirtualHearingFields Shows hearing details with virtualHearing 1`] = ` aria-describedby="tooltip-Copy Guest Link" aria-label="" className="cf-apppeal-id" - data-css-cjlnsd="" + data-css-p6dv0b="" data-event="focus mouseenter" data-event-off="mouseleave keydown" data-for="tooltip-Copy Guest Link" data-tip={true} + disabled={false} onClick={[Function]} tabIndex={0} type="submit" @@ -1347,6 +1349,7 @@ exports[`VirtualHearingFields Shows only hearing links with no virtualHearing 1` } } isVirtual={true} + scheduledForIsPast={false} user={ Object { "addressCity": "Washington", diff --git a/client/test/app/queue/__snapshots__/NotificationsView.test.js.snap b/client/test/app/queue/__snapshots__/NotificationsView.test.js.snap index 5528343affd..281180097af 100644 --- a/client/test/app/queue/__snapshots__/NotificationsView.test.js.snap +++ b/client/test/app/queue/__snapshots__/NotificationsView.test.js.snap @@ -25,11 +25,12 @@ exports[`NotificationsTest matches snapshot 1`] = ` aria-label="" class="cf-apppeal-id" currentitem="false" - data-css-cjlnsd="" + data-css-p6dv0b="" data-event="focus mouseenter" data-event-off="mouseleave keydown" data-for="tooltip-200000161" data-tip="true" + disabled="" tabindex="0" type="submit" > diff --git a/spec/feature/hearings/hearing_details_spec.rb b/spec/feature/hearings/hearing_details_spec.rb index 82e5c9383a1..6eb472e4e2e 100644 --- a/spec/feature/hearings/hearing_details_spec.rb +++ b/spec/feature/hearings/hearing_details_spec.rb @@ -73,15 +73,15 @@ def check_email_event_table(hearing, row_count) def check_virtual_hearings_links_expired(virtual_hearing) within "#vlj-hearings-link" do + find("span", text: "N/A") expect(page).to have_content( - "VLJ Link: Expired\n" \ "Conference Room: #{virtual_hearing.formatted_alias_or_alias_with_host}\n" \ "PIN: #{virtual_hearing.host_pin}" ) end within "#guest-hearings-link" do + find("span", text: "N/A") expect(page).to have_content( - "Guest Link: Expired\n" \ "Conference Room: #{virtual_hearing.formatted_alias_or_alias_with_host}\n" \ "PIN: #{virtual_hearing.guest_pin}" ) From f00bf24ef1bc5457201505d057bd221ded680430 Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Tue, 12 Sep 2023 12:34:19 -0400 Subject: [PATCH 099/445] deleted commmented line in conf_link overwrite method. --- app/models/hearing_day.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/models/hearing_day.rb b/app/models/hearing_day.rb index 0754fe9384b..b4bd4b54c19 100644 --- a/app/models/hearing_day.rb +++ b/app/models/hearing_day.rb @@ -219,7 +219,6 @@ def half_day? # over write of the .conference_link method from belongs_to :conference_link to add logic to create of not there def conference_link @conference_link ||= scheduled_date_passed? ? nil : find_or_create_conference_link! - # @conference_link ||= find_or_create_conference_link! end private From 4ed06b7c80daeb618d9c6501a9b287a63f78dc06 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Wed, 13 Sep 2023 08:55:00 -0400 Subject: [PATCH 100/445] Alleviate RubyParser spam in Lint CI job --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b30d239e337..54ab1a2eb41 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -596,8 +596,8 @@ GEM ruby-prof (1.4.1) ruby-progressbar (1.10.1) ruby_dep (1.5.0) - ruby_parser (3.13.1) - sexp_processor (~> 4.9) + ruby_parser (3.20.3) + sexp_processor (~> 4.16) rubyzip (1.3.0) safe_shell (1.1.0) safe_yaml (1.0.5) @@ -631,7 +631,7 @@ GEM rubyzip (~> 1.2, >= 1.2.2) sentry-raven (2.11.0) faraday (>= 0.7.6, < 1.0) - sexp_processor (4.12.1) + sexp_processor (4.17.0) shellany (0.0.1) shoryuken (3.1.11) aws-sdk-core (>= 2) From 28da74eedccd8122ea1cc28c0b444e10b43d8a4c Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Wed, 13 Sep 2023 11:05:16 -0400 Subject: [PATCH 101/445] DeleteConferenceLinkJob added to scheduled jobs file. --- config/initializers/scheduled_jobs.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/initializers/scheduled_jobs.rb b/config/initializers/scheduled_jobs.rb index 6f097bf1114..ef3c55d3145 100644 --- a/config/initializers/scheduled_jobs.rb +++ b/config/initializers/scheduled_jobs.rb @@ -5,6 +5,7 @@ "create_establish_claim" => CreateEstablishClaimTasksJob, "data_integrity_checks" => DataIntegrityChecksJob, "delete_conferences_job" => VirtualHearings::DeleteConferencesJob, + "delete_conference_link_job" => VirtualHearings::DeleteConferenceLinkJob, "dependencies_check" => DependenciesCheckJob, "dependencies_report_service_log" => DependenciesReportServiceLogJob, "docket_range_job" => DocketRangeJob, From cfc94dd2364c22508e776e30a5ec1df1e0c6ebcb Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Thu, 14 Sep 2023 12:07:11 -0400 Subject: [PATCH 102/445] Combo PR branch suggestions pertaining to 29006 applied. Rspec test updated as well --- app/controllers/hearings/hearing_day_controller.rb | 4 ++-- .../virtual_hearings/delete_conference_link_job.rb | 12 ++---------- app/models/hearing_day.rb | 8 ++++---- spec/factories/hearing_day.rb | 4 ++-- .../delete_conference_link_job_spec.rb | 7 ++++--- 5 files changed, 14 insertions(+), 21 deletions(-) diff --git a/app/controllers/hearings/hearing_day_controller.rb b/app/controllers/hearings/hearing_day_controller.rb index ac672ba536d..274e9f2387b 100644 --- a/app/controllers/hearings/hearing_day_controller.rb +++ b/app/controllers/hearings/hearing_day_controller.rb @@ -45,8 +45,8 @@ def show ) } rescue VirtualHearings::LinkService::PINKeyMissingError, - VirtualHearings::LinkService::URLHostMissingError, - VirtualHearings::LinkService::URLPathMissingError => error + VirtualHearings::LinkService::URLHostMissingError, + VirtualHearings::LinkService::URLPathMissingError => error log_error(error) render json: { hearing_day: hearing_day.to_hash(include_conference_link: false).merge( diff --git a/app/jobs/virtual_hearings/delete_conference_link_job.rb b/app/jobs/virtual_hearings/delete_conference_link_job.rb index 4d1a556e8f0..a07da8cf0e5 100644 --- a/app/jobs/virtual_hearings/delete_conference_link_job.rb +++ b/app/jobs/virtual_hearings/delete_conference_link_job.rb @@ -9,6 +9,7 @@ class VirtualHearings::DeleteConferenceLinkJob < CaseflowJob def perform begin + RequestStore[:current_user] = User.system_user links_for_past_date = retreive_stale_conference_links links_soft_removal(links_for_past_date) rescue StandardError => error @@ -24,7 +25,7 @@ def perform # # Return: A collection of links for hearing days that have passed. def retreive_stale_conference_links - ConferenceLink.joins(:hearing_day).where("scheduled_for < ?", query_date_formatted) + ConferenceLink.joins(:hearing_day).where("scheduled_for < ?", Date.today) end # Purpose: Iterates through a collection of links, updating each item and then soft_deleting. @@ -51,13 +52,4 @@ def update_conf_links updated_at: Time.zone.now } end - - # Purpose: Simple date formatting work to be done outside of the query. - # - # Params: None - # - # Return: "YYYY-mm-dd" formatted date from the Time object. - def query_date_formatted - Time.zone.now.to_formatted_s.split(" ")[0] - end end diff --git a/app/models/hearing_day.rb b/app/models/hearing_day.rb index b4bd4b54c19..444bde11b7e 100644 --- a/app/models/hearing_day.rb +++ b/app/models/hearing_day.rb @@ -52,7 +52,7 @@ class HearingDayHasChildrenRecords < StandardError; end before_create :assign_created_by_user after_update :update_children_records after_create :generate_link_on_create - before_destroy :kickoff_link_cleanup + before_destroy :cleanup_conference_links # Validates if the judge id maps to an actual record. validates :judge, presence: true, if: -> { judge_id.present? } @@ -221,13 +221,13 @@ def conference_link @conference_link ||= scheduled_date_passed? ? nil : find_or_create_conference_link! end - private - def scheduled_date_passed? scheduled_for < Date.current end - def kickoff_link_cleanup + private + + def cleanup_conference_links VirtualHearings::DeleteConferenceLinkJob.new.perform end diff --git a/spec/factories/hearing_day.rb b/spec/factories/hearing_day.rb index 88979358df8..b20b63d7ea0 100644 --- a/spec/factories/hearing_day.rb +++ b/spec/factories/hearing_day.rb @@ -27,14 +27,14 @@ trait :future_with_link do after(:create) do |hearing_day| - create(:conference_link, :hearing_day => hearing_day) + create(:conference_link, hearing_day: hearing_day) end end trait :past_with_link do scheduled_for { 10.days.ago.to_formatted_s.split(" ")[0] } after(:create) do |hearing_day| - create(:conference_link, :hearing_day => hearing_day) + create(:conference_link, hearing_day: hearing_day) end end end diff --git a/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb b/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb index c6214a0f945..4dfe39bb856 100644 --- a/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb +++ b/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb @@ -5,17 +5,18 @@ let!(:current_user) { create(:user, roles: ["System Admin"]) } let!(:judge) { Judge.new(create(:user)) } - let!(:single_hearing_day) { FactoryBot.create(:hearing_day) } + describe ".perform" do context "When conference links in the DB are past the date of the date the job is run" do - let!(:future_hearing_day_with_link) { FactoryBot.create(:hearing_day, :virtual, :future_with_link) } - let!(:past_hearing_day_with_link) { FactoryBot.create(:hearing_day, :virtual, :past_with_link) } + let!(:future_hearing_day_with_link) { create(:hearing_day, :virtual, :future_with_link) } + let!(:past_hearing_day_with_link) { create(:hearing_day, :virtual, :past_with_link) } it "Soft deletes the qualifying links." do expect(ConferenceLink.count).to be(2) perform_enqueued_jobs { VirtualHearings::DeleteConferenceLinkJob.perform_now } expect(ConferenceLink.count).to be(1) + expect(ConferenceLink.all.pluck(:id)).not_to include(2) end end end From b06e3a27bb819033561614752bae7e7b636e58fc Mon Sep 17 00:00:00 2001 From: Prerna Devulapalli Date: Thu, 14 Sep 2023 12:58:23 -0400 Subject: [PATCH 103/445] APPEALS-25142 Addressing PR feedback and updating conditionals --- app/jobs/virtual_hearings/delete_conferences_job.rb | 10 +--------- .../components/dailyDocket/DailyDocketRowInputs.jsx | 5 ++--- .../app/hearings/components/details/HearingLinks.jsx | 2 +- client/app/hearings/utils.js | 4 ++-- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/app/jobs/virtual_hearings/delete_conferences_job.rb b/app/jobs/virtual_hearings/delete_conferences_job.rb index 8ff0f4cad3c..37388dd7d5f 100644 --- a/app/jobs/virtual_hearings/delete_conferences_job.rb +++ b/app/jobs/virtual_hearings/delete_conferences_job.rb @@ -140,16 +140,8 @@ def process_virtual_hearing(virtual_hearing) # Returns whether or not the conference was deleted from Pexip def delete_conference(virtual_hearing) - #TODO: Update the clients once the webex implementation is completed - if virtual_hearing.meeting_type === "pexip" - #client = pexip client - conference_client = "Pexip" - else - #client = webex client - conference_client = "Webex" - end response = client.delete_conference(conference_id: virtual_hearing.conference_id) - Rails.logger.info("#{conference_client} response: #{response}") + Rails.logger.info("#{virtual_hearing.meeting_type.capitalize} response: #{response}") fail response.error unless response.success? diff --git a/client/app/hearings/components/dailyDocket/DailyDocketRowInputs.jsx b/client/app/hearings/components/dailyDocket/DailyDocketRowInputs.jsx index 1a940ff58e6..f382d28f5e7 100644 --- a/client/app/hearings/components/dailyDocket/DailyDocketRowInputs.jsx +++ b/client/app/hearings/components/dailyDocket/DailyDocketRowInputs.jsx @@ -351,10 +351,9 @@ PreppedCheckbox.propTypes = { export const StaticVirtualHearing = ({ hearing, user }) => (
    - { hearing?.scheduledForIsPast && + { hearing?.scheduledForIsPast ? ( {virtualHearingScheduledDatePassedLabelFull(virtualHearingRoleForUser(user, hearing))} - } - { !hearing?.scheduledForIsPast && ( + ) : ( ( - {hearing.scheduledForIsPast || hearing.wasVirtual ? ( + {hearing?.scheduledForIsPast || hearing?.wasVirtual ? (
    N/A
    diff --git a/client/app/hearings/utils.js b/client/app/hearings/utils.js index 12a031bb2e1..0ab109a01ad 100644 --- a/client/app/hearings/utils.js +++ b/client/app/hearings/utils.js @@ -218,8 +218,8 @@ export const virtualHearingLinkLabelFull = (role) => export const virtualHearingScheduledDatePassedLabelFull = (role) => role === VIRTUAL_HEARING_HOST ? - COPY.VLJ_VIRTUAL_HEARING_LINK_LABEL_FULL + ": N/A" : - COPY.REPRESENTATIVE_VIRTUAL_HEARING_PASSED_LABEL + ": N/A"; +`${COPY.VLJ_VIRTUAL_HEARING_LINK_LABEL_FULL}: N/A` : +`${COPY.REPRESENTATIVE_VIRTUAL_HEARING_PASSED_LABEL}: N/A`; export const pollVirtualHearingData = (hearingId, onSuccess) => ( // Did not specify retryCount so if api call fails, it'll stop polling. From 877068eb546df0bb8e484569ac66d66905c3819f Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 14 Sep 2023 16:29:24 -0400 Subject: [PATCH 104/445] Update rubocop config --- .rubocop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 8a486b6dcc0..e5f8adb57f8 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -15,8 +15,8 @@ AllCops: - 'client/node_modules/**/*' - 'app/mappers/zip_code_to_lat_lng_mapper.rb' - 'db/seeds/*' - TargetRailsVersion: 5.1 - TargetRubyVersion: 2.5 + TargetRailsVersion: 5.2.8.2 + TargetRubyVersion: 2.7.3 UseCache: true Bundler/OrderedGems: From 5cbb10cc238ae4dfc0330f48100cdf605584969d Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 14 Sep 2023 17:03:53 -0400 Subject: [PATCH 105/445] WIP: Adding services for webex --- app/services/external_api/webex_service.rb | 11 ++++ .../webex_service/create_response.rb | 7 +++ .../external_api/webex_service/response.rb | 42 +++++++++++++++ config/initializers/webex.rb | 1 + lib/fakes/webex_service.rb | 51 +++++++++++++++++++ 5 files changed, 112 insertions(+) create mode 100644 app/services/external_api/webex_service.rb create mode 100644 app/services/external_api/webex_service/create_response.rb create mode 100644 app/services/external_api/webex_service/response.rb create mode 100644 config/initializers/webex.rb create mode 100644 lib/fakes/webex_service.rb diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb new file mode 100644 index 00000000000..e61ec7355f7 --- /dev/null +++ b/app/services/external_api/webex_service.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +class ExternalApi::PexipService + def create_conference(*) + fail NotImplementedError + end + + def delete_conference(*) + fail NotImplementedError + end +end diff --git a/app/services/external_api/webex_service/create_response.rb b/app/services/external_api/webex_service/create_response.rb new file mode 100644 index 00000000000..f77ac53d9d2 --- /dev/null +++ b/app/services/external_api/webex_service/create_response.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class ExternalApi::PexipService::CreateResponse < ExternalApi::PexipService::Response + def data + # Hi data, I'm dad + end +end diff --git a/app/services/external_api/webex_service/response.rb b/app/services/external_api/webex_service/response.rb new file mode 100644 index 00000000000..03567ed96a5 --- /dev/null +++ b/app/services/external_api/webex_service/response.rb @@ -0,0 +1,42 @@ +# frozen_string_literal: true + +class ExternalApi::PexipService::Response + attr_reader :resp, :code + + def initialize(resp) + @resp = resp + @code = @resp.code + end + + def data; end + + def error + check_for_error + end + + def success? + !resp.error? + end + + private + + def check_for_error + return if success? + + # What error codes can we get? + msg = error_message + + case code + in (400..499) then "400" + in (500..599) then "500" + else + "Something else" + end + end + + def error_message + return "No error message from Webex" if resp.raw_body.empty? + + "TODO: I need to figure out how Webex IC will present its errors to us" + end +end diff --git a/config/initializers/webex.rb b/config/initializers/webex.rb new file mode 100644 index 00000000000..561e795cc0f --- /dev/null +++ b/config/initializers/webex.rb @@ -0,0 +1 @@ +WebexService = (ApplicationController.dependencies_faked? ? Fakes::WebexService : ExternalApi::WebexService) diff --git a/lib/fakes/webex_service.rb b/lib/fakes/webex_service.rb new file mode 100644 index 00000000000..2c2e034cc45 --- /dev/null +++ b/lib/fakes/webex_service.rb @@ -0,0 +1,51 @@ +# frozen_string_literal: true + +require "json" +require "base64" +require "digest" + +class Fakes::WebexService + include JwtGenerator + + def create_conference(*) + fail NotImplementedError + end + + def delete_conference(*) + fail NotImplementedError + end + + private + + # Purpose: Generate the JWT token + # + # Params: none + # + # Return: token needed for authentication + def generate_token + jwt_secret = "fakeSecret" + + header = { + typ: "JWT", + alg: TOKEN_ALG + }.to_json.encode("UTF-8") + + data = { + iss: SERVICE_ID, + iat: DateTime.now.strftime("%Q").to_i / 1000.floor + }.to_json.encode("UTF-8") + + token = "#{base64url(header)}.#{base64url(data)}" + signature = base64url(sOpenSSL::HMAC.digest("SHA256", jwt_secret, token)) + + "#{token}.#{signature}" + end +end + +#### +# { +# "jwt": { +# "sub": "Subject goes here." +# }, +# "aud": "a4d886b0-979f-4e2c-a958-3e8c14605e51" +# } From 621dc5375144119cf83c9913800c1db606b478c8 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 14 Sep 2023 17:19:31 -0400 Subject: [PATCH 106/445] Add new meeting_types table Add polymorhpic association named conferenceable Remove existing meeting_types --- db/schema.rb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index bf2db4cc6c9..dbcf260a963 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2023_08_01_195310) do +ActiveRecord::Schema.define(version: 2023_09_14_210532) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -576,16 +576,17 @@ t.integer "conference_id", comment: "Id of the conference" t.datetime "created_at", null: false, comment: "Date and Time of creation" t.bigint "created_by_id", null: false, comment: "User id of the user who created the record. FK on User table" + t.datetime "deleted_at", comment: "Needed column to make use of the paranoia gem." t.string "guest_hearing_link", comment: "Guest link for hearing daily docket." t.string "guest_pin_long", comment: "Pin provided for the guest, allowing them entry into the video conference." t.bigint "hearing_day_id", null: false, comment: "The associated hearing day id" t.string "host_link", comment: "Conference link generated from external conference service" t.integer "host_pin", comment: "Pin for the host of the conference to get into the conference" t.string "host_pin_long", limit: 8, comment: "Generated host pin stored as a string" - t.string "meeting_type", default: "pexip", comment: "Video Conferencing Application Type" t.datetime "updated_at", comment: "Date and Time record was last updated" t.bigint "updated_by_id", comment: "user id of the user to last update the record. FK on the User table" t.index ["created_by_id"], name: "index_created_by_id" + t.index ["deleted_at"], name: "index_conference_links_on_deleted_at" t.index ["hearing_day_id"], name: "index_conference_links_on_hearing_day_id" t.index ["updated_by_id"], name: "index_updated_by_id" end @@ -1225,6 +1226,13 @@ t.index ["request_issue_id"], name: "index_legacy_issues_on_request_issue_id" end + create_table "meeting_types", force: :cascade do |t| + t.bigint "conferenceable_id" + t.string "conferenceable_type" + t.integer "service_type", comment: "Pexip or Webex Instant Connect" + t.index ["conferenceable_type", "conferenceable_id"], name: "conferenceable_association_idx" + end + create_table "membership_requests", force: :cascade do |t| t.datetime "created_at", null: false t.datetime "decided_at", comment: "The date and time when the deider user made a decision about the membership request" @@ -1821,7 +1829,6 @@ t.string "email" t.string "full_name" t.datetime "last_login_at", comment: "The last time the user-agent (browser) provided session credentials; see User.from_session for precision" - t.string "meeting_type", default: "pexip", comment: "Video Conferencing Application Type" t.string "roles", array: true t.string "selected_regional_office" t.string "station_id", null: false @@ -1987,7 +1994,6 @@ t.string "host_pin_long", limit: 8, comment: "Change the host pin to store a longer pin with the # sign trailing" t.string "judge_email", comment: "Judge's email address" t.boolean "judge_email_sent", default: false, null: false, comment: "Whether or not a notification email was sent to the judge" - t.string "meeting_type", default: "pexip", comment: "Video Conferencing Application Type" t.string "representative_email", comment: "Veteran's representative's email address" t.boolean "representative_email_sent", default: false, null: false, comment: "Whether or not a notification email was sent to the veteran's representative" t.datetime "representative_reminder_sent_at", comment: "The datetime the last reminder email was sent to the representative." From 39f89fb48080f5268d1dee5ac92a897a809baf23 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 14 Sep 2023 17:25:41 -0400 Subject: [PATCH 107/445] Add new meeting_types table Add polymorhpic association named conferenceable Remove existing meeting_types --- .../20230914210532_normalize_meeting_types.rb | 25 +++++++++++++++++++ db/schema.rb | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20230914210532_normalize_meeting_types.rb diff --git a/db/migrate/20230914210532_normalize_meeting_types.rb b/db/migrate/20230914210532_normalize_meeting_types.rb new file mode 100644 index 00000000000..fe319da41dd --- /dev/null +++ b/db/migrate/20230914210532_normalize_meeting_types.rb @@ -0,0 +1,25 @@ +# frozen_string_literal: true + +class NormalizeMeetingTypes < Caseflow::Migration + disable_ddl_transaction! + + def change + create_table :meeting_types do |table| + table.integer :service_type, comment: "Pexip or Webex Instant Connect", default: 0 + end + + # Create polymorhpic association for other classes to tap into + add_reference :meeting_types, :conferenceable, polymorphic: true, index: false + add_index :meeting_types, + [:conferenceable_type, :conferenceable_id], + algorithm: :concurrently, + name: "conferenceable_association_idx" + + # Remove existing columns + safety_assured do + remove_column :virtual_hearings, :meeting_type, :string + remove_column :conference_links, :meeting_type, :string + remove_column :users, :meeting_type, :string + end + end +end diff --git a/db/schema.rb b/db/schema.rb index dbcf260a963..d524782dba7 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1229,7 +1229,7 @@ create_table "meeting_types", force: :cascade do |t| t.bigint "conferenceable_id" t.string "conferenceable_type" - t.integer "service_type", comment: "Pexip or Webex Instant Connect" + t.integer "service_type", default: 0, comment: "Pexip or Webex Instant Connect" t.index ["conferenceable_type", "conferenceable_id"], name: "conferenceable_association_idx" end From 976b5ff84751ed535d1d0c6023fefff2cd41203e Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 14 Sep 2023 17:26:06 -0400 Subject: [PATCH 108/445] Add MeetingType model --- app/models/meeting_type.rb | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 app/models/meeting_type.rb diff --git a/app/models/meeting_type.rb b/app/models/meeting_type.rb new file mode 100644 index 00000000000..265d44d1270 --- /dev/null +++ b/app/models/meeting_type.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class MeetingType < CaseflowRecord + belongs_to :conferenceable, polymorphic: true + + enum service_type: { pexip: 0, webex: 1 } +end From f38d2b85da90cd4686ea19706511cac66d48a317 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 14 Sep 2023 17:29:35 -0400 Subject: [PATCH 109/445] Add associations --- app/models/hearing.rb | 1 + app/models/hearings/conference_link.rb | 2 ++ app/models/hearings/virtual_hearing.rb | 1 + app/models/legacy_hearing.rb | 1 + app/models/user.rb | 1 + 5 files changed, 6 insertions(+) diff --git a/app/models/hearing.rb b/app/models/hearing.rb index 82ab53e311b..ddd27a05ff6 100644 --- a/app/models/hearing.rb +++ b/app/models/hearing.rb @@ -47,6 +47,7 @@ class Hearing < CaseflowRecord has_many :hearing_issue_notes has_many :email_events, class_name: "SentHearingEmailEvent" has_many :email_recipients, class_name: "HearingEmailRecipient" + has_one :meeting_type, as: :conferenceable class HearingDayFull < StandardError; end diff --git a/app/models/hearings/conference_link.rb b/app/models/hearings/conference_link.rb index 89272e5870c..319e4fc1601 100644 --- a/app/models/hearings/conference_link.rb +++ b/app/models/hearings/conference_link.rb @@ -7,6 +7,8 @@ class LinkMismatchError < StandardError; end include UpdatedByUserConcern include CreatedByUserConcern + has_one :meeting_type, as: :conferenceable + after_create :generate_links_and_pins class << self diff --git a/app/models/hearings/virtual_hearing.rb b/app/models/hearings/virtual_hearing.rb index 378f3bdfd36..cdc06861964 100644 --- a/app/models/hearings/virtual_hearing.rb +++ b/app/models/hearings/virtual_hearing.rb @@ -59,6 +59,7 @@ def base_url # Tracks the progress of the job that creates the virtual hearing in Pexip. has_one :establishment, class_name: "VirtualHearingEstablishment" + has_one :meeting_type, as: :conferenceable before_create :assign_created_by_user validate :hearing_is_not_virtual, on: :create diff --git a/app/models/legacy_hearing.rb b/app/models/legacy_hearing.rb index 07bbbfb9acc..37fce5cfc03 100644 --- a/app/models/legacy_hearing.rb +++ b/app/models/legacy_hearing.rb @@ -72,6 +72,7 @@ class LegacyHearing < CaseflowRecord has_one :hearing_location, as: :hearing has_many :email_events, class_name: "SentHearingEmailEvent", foreign_key: :hearing_id has_many :email_recipients, class_name: "HearingEmailRecipient", foreign_key: :hearing_id + has_one :meeting_type, as: :conferenceable alias_attribute :location, :hearing_location accepts_nested_attributes_for :hearing_location, reject_if: proc { |attributes| attributes.blank? } diff --git a/app/models/user.rb b/app/models/user.rb index 65076b555b2..94fbe28fcab 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -18,6 +18,7 @@ class User < CaseflowRecord # rubocop:disable Metrics/ClassLength has_many :unrecognized_appellants, foreign_key: :created_by_id has_one :vacols_user, class_name: "CachedUser", foreign_key: :sdomainid, primary_key: :css_id has_one :vacols_staff, class_name: "VACOLS::Staff", foreign_key: :sdomainid, primary_key: :css_id + has_one :meeting_type, as: :conferenceable # Alternative: where("roles @> ARRAY[?]::varchar[]", role) scope :with_role, ->(role) { where("? = ANY(roles)", role) } From cc0d84e2dcd6c9b07915f69029f3e843c58076d2 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 14 Sep 2023 18:58:27 -0400 Subject: [PATCH 110/445] Change service_type to service_name --- db/migrate/20230914210532_normalize_meeting_types.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20230914210532_normalize_meeting_types.rb b/db/migrate/20230914210532_normalize_meeting_types.rb index fe319da41dd..87bb405196b 100644 --- a/db/migrate/20230914210532_normalize_meeting_types.rb +++ b/db/migrate/20230914210532_normalize_meeting_types.rb @@ -5,7 +5,7 @@ class NormalizeMeetingTypes < Caseflow::Migration def change create_table :meeting_types do |table| - table.integer :service_type, comment: "Pexip or Webex Instant Connect", default: 0 + table.integer :service_name, comment: "Pexip or Webex Instant Connect", default: 0 end # Create polymorhpic association for other classes to tap into From 1d832eb96e05e40a02d6263131fa190e9eeb775b Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 14 Sep 2023 18:59:25 -0400 Subject: [PATCH 111/445] Change service_type to service_name --- app/models/meeting_type.rb | 2 +- db/schema.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/meeting_type.rb b/app/models/meeting_type.rb index 265d44d1270..db98a3beb27 100644 --- a/app/models/meeting_type.rb +++ b/app/models/meeting_type.rb @@ -3,5 +3,5 @@ class MeetingType < CaseflowRecord belongs_to :conferenceable, polymorphic: true - enum service_type: { pexip: 0, webex: 1 } + enum service_name: { pexip: 0, webex: 1 } end diff --git a/db/schema.rb b/db/schema.rb index d524782dba7..12aa387dfd0 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1229,7 +1229,7 @@ create_table "meeting_types", force: :cascade do |t| t.bigint "conferenceable_id" t.string "conferenceable_type" - t.integer "service_type", default: 0, comment: "Pexip or Webex Instant Connect" + t.integer "service_name", default: 0, comment: "Pexip or Webex Instant Connect" t.index ["conferenceable_type", "conferenceable_id"], name: "conferenceable_association_idx" end From a62fb8a4476a7b13c518f6712d31cf614b9ca386 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 14 Sep 2023 19:02:21 -0400 Subject: [PATCH 112/445] Use concern --- app/models/hearing.rb | 2 +- app/models/hearings/conference_link.rb | 3 +-- app/models/hearings/virtual_hearing.rb | 2 +- app/models/legacy_hearing.rb | 3 ++- app/models/user.rb | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/models/hearing.rb b/app/models/hearing.rb index ddd27a05ff6..96cfe1abe1c 100644 --- a/app/models/hearing.rb +++ b/app/models/hearing.rb @@ -31,6 +31,7 @@ class Hearing < CaseflowRecord include UpdatedByUserConcern include HearingConcern include HasHearingEmailRecipientsConcern + include ConferenceableConcern prepend HearingScheduled prepend HearingPostponed @@ -47,7 +48,6 @@ class Hearing < CaseflowRecord has_many :hearing_issue_notes has_many :email_events, class_name: "SentHearingEmailEvent" has_many :email_recipients, class_name: "HearingEmailRecipient" - has_one :meeting_type, as: :conferenceable class HearingDayFull < StandardError; end diff --git a/app/models/hearings/conference_link.rb b/app/models/hearings/conference_link.rb index 319e4fc1601..2ae212386e0 100644 --- a/app/models/hearings/conference_link.rb +++ b/app/models/hearings/conference_link.rb @@ -6,8 +6,7 @@ class LinkMismatchError < StandardError; end include UpdatedByUserConcern include CreatedByUserConcern - - has_one :meeting_type, as: :conferenceable + include ConferenceableConcern after_create :generate_links_and_pins diff --git a/app/models/hearings/virtual_hearing.rb b/app/models/hearings/virtual_hearing.rb index cdc06861964..cc2a4e1a76d 100644 --- a/app/models/hearings/virtual_hearing.rb +++ b/app/models/hearings/virtual_hearing.rb @@ -37,6 +37,7 @@ class NoAliasWithHostPresentError < StandardError; end class LinkMismatchError < StandardError; end include UpdatedByUserConcern + include ConferenceableConcern class << self def client_host_or_default @@ -59,7 +60,6 @@ def base_url # Tracks the progress of the job that creates the virtual hearing in Pexip. has_one :establishment, class_name: "VirtualHearingEstablishment" - has_one :meeting_type, as: :conferenceable before_create :assign_created_by_user validate :hearing_is_not_virtual, on: :create diff --git a/app/models/legacy_hearing.rb b/app/models/legacy_hearing.rb index 37fce5cfc03..0ce7f44ca70 100644 --- a/app/models/legacy_hearing.rb +++ b/app/models/legacy_hearing.rb @@ -35,6 +35,8 @@ class LegacyHearing < CaseflowRecord include UpdatedByUserConcern include HearingConcern include HasHearingEmailRecipientsConcern + include ConferenceableConcern + prepend HearingScheduled prepend HearingWithdrawn prepend HearingPostponed @@ -72,7 +74,6 @@ class LegacyHearing < CaseflowRecord has_one :hearing_location, as: :hearing has_many :email_events, class_name: "SentHearingEmailEvent", foreign_key: :hearing_id has_many :email_recipients, class_name: "HearingEmailRecipient", foreign_key: :hearing_id - has_one :meeting_type, as: :conferenceable alias_attribute :location, :hearing_location accepts_nested_attributes_for :hearing_location, reject_if: proc { |attributes| attributes.blank? } diff --git a/app/models/user.rb b/app/models/user.rb index 94fbe28fcab..785d607d84b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -2,6 +2,7 @@ class User < CaseflowRecord # rubocop:disable Metrics/ClassLength include BgsService + include ConferenceableConcern has_many :dispatch_tasks, class_name: "Dispatch::Task" has_many :document_views @@ -18,7 +19,6 @@ class User < CaseflowRecord # rubocop:disable Metrics/ClassLength has_many :unrecognized_appellants, foreign_key: :created_by_id has_one :vacols_user, class_name: "CachedUser", foreign_key: :sdomainid, primary_key: :css_id has_one :vacols_staff, class_name: "VACOLS::Staff", foreign_key: :sdomainid, primary_key: :css_id - has_one :meeting_type, as: :conferenceable # Alternative: where("roles @> ARRAY[?]::varchar[]", role) scope :with_role, ->(role) { where("? = ANY(roles)", role) } From 52f71848f74e5fe9ea497756a5b2c1cd46bf5370 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 14 Sep 2023 19:03:37 -0400 Subject: [PATCH 113/445] Add concern --- app/models/concerns/conferenceable_concern.rb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 app/models/concerns/conferenceable_concern.rb diff --git a/app/models/concerns/conferenceable_concern.rb b/app/models/concerns/conferenceable_concern.rb new file mode 100644 index 00000000000..31ef2d9cead --- /dev/null +++ b/app/models/concerns/conferenceable_concern.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +module ConferenceableConcern + extend ActiveSupport::Concern + + DEFAULT_SERVICE = "pexp" + + included do + has_one :meeting_type, as: :conferenceable + + before_create :set_default_meeting_type + end + + def set_default_meeting_type + MeetingType.create!(service_name: DEFAULT_SERVICE, conferenceable: self) + end +end From 168a8d49d595fc1dbff341e9d6fbd0ca26b5370b Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 14 Sep 2023 19:04:07 -0400 Subject: [PATCH 114/445] Fix typo --- app/models/concerns/conferenceable_concern.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/concerns/conferenceable_concern.rb b/app/models/concerns/conferenceable_concern.rb index 31ef2d9cead..6459f619619 100644 --- a/app/models/concerns/conferenceable_concern.rb +++ b/app/models/concerns/conferenceable_concern.rb @@ -3,7 +3,7 @@ module ConferenceableConcern extend ActiveSupport::Concern - DEFAULT_SERVICE = "pexp" + DEFAULT_SERVICE = "pexip" included do has_one :meeting_type, as: :conferenceable From bbab525db9fa7a001446a48c2b690aefde14caa0 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 14 Sep 2023 19:17:57 -0400 Subject: [PATCH 115/445] Tweak callback --- app/models/concerns/conferenceable_concern.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/concerns/conferenceable_concern.rb b/app/models/concerns/conferenceable_concern.rb index 6459f619619..7a6193fab72 100644 --- a/app/models/concerns/conferenceable_concern.rb +++ b/app/models/concerns/conferenceable_concern.rb @@ -8,10 +8,10 @@ module ConferenceableConcern included do has_one :meeting_type, as: :conferenceable - before_create :set_default_meeting_type + after_create :set_default_meeting_type end def set_default_meeting_type - MeetingType.create!(service_name: DEFAULT_SERVICE, conferenceable: self) + MeetingType.create!(service_name: DEFAULT_SERVICE, conferenceable: self) unless meeting_type end end From 106f5905bc477c1df6a6bb026532cfe990bf4699 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 14 Sep 2023 20:38:17 -0400 Subject: [PATCH 116/445] Add new factory --- app/models/concerns/conferenceable_concern.rb | 1 + app/models/hearing_day.rb | 2 +- spec/factories/conference_link.rb | 7 +++++++ spec/factories/hearing.rb | 6 ++++++ spec/factories/legacy_appeal.rb | 6 ++++++ spec/factories/meeting_type.rb | 12 ++++++++++++ spec/factories/user.rb | 4 ++++ spec/factories/virtual_hearing.rb | 6 ++++++ 8 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 spec/factories/meeting_type.rb diff --git a/app/models/concerns/conferenceable_concern.rb b/app/models/concerns/conferenceable_concern.rb index 7a6193fab72..c7dad834ca3 100644 --- a/app/models/concerns/conferenceable_concern.rb +++ b/app/models/concerns/conferenceable_concern.rb @@ -12,6 +12,7 @@ module ConferenceableConcern end def set_default_meeting_type + byebug MeetingType.create!(service_name: DEFAULT_SERVICE, conferenceable: self) unless meeting_type end end diff --git a/app/models/hearing_day.rb b/app/models/hearing_day.rb index 9d559d2695c..610077d8373 100644 --- a/app/models/hearing_day.rb +++ b/app/models/hearing_day.rb @@ -233,7 +233,7 @@ def log_error(error) def generate_link_on_create begin - this.conference_link + conference_link rescue StandardError => error log_error(error) end diff --git a/spec/factories/conference_link.rb b/spec/factories/conference_link.rb index ac8b578278d..a5884f14cde 100644 --- a/spec/factories/conference_link.rb +++ b/spec/factories/conference_link.rb @@ -2,6 +2,10 @@ FactoryBot.define do factory :conference_link do + transient do + conference_service { "pexip" } + end + alias_name { nil } conference_id { nil } conference_deleted { false } @@ -12,5 +16,8 @@ updated_at { Time.zone.now } created_by { create(:user) } updated_by { create(:user) } + meeting_type do + create(:meeting_type, service_name: conference_service) + end end end diff --git a/spec/factories/hearing.rb b/spec/factories/hearing.rb index 6da02fe1bb8..9f73ec35e7a 100644 --- a/spec/factories/hearing.rb +++ b/spec/factories/hearing.rb @@ -121,5 +121,11 @@ appeal: hearing.appeal) end end + + after(:create) do |hearing, _evaluator| + create(:meeting_type, conferenceable: hearing) + + hearing.reload + end end end diff --git a/spec/factories/legacy_appeal.rb b/spec/factories/legacy_appeal.rb index f46ce3d409a..b39eee4f868 100644 --- a/spec/factories/legacy_appeal.rb +++ b/spec/factories/legacy_appeal.rb @@ -121,5 +121,11 @@ } end end + + after(:create) do |legacy_hearing, _evaluator| + create(:meeting_type, conferenceable: legacy_hearing) + + legacy_hearing.reload + end end end diff --git a/spec/factories/meeting_type.rb b/spec/factories/meeting_type.rb new file mode 100644 index 00000000000..4d15e45f563 --- /dev/null +++ b/spec/factories/meeting_type.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +FactoryBot.define do + factory :meeting_type do + service_name { "pexip" } + conferenceable { create(:user) } + + trait :webex do + service_name { "webex" } + end + end +end diff --git a/spec/factories/user.rb b/spec/factories/user.rb index 10480cd686d..5c17f92b850 100644 --- a/spec/factories/user.rb +++ b/spec/factories/user.rb @@ -95,6 +95,10 @@ if evaluator.vacols_uniq_id create(:staff, slogid: evaluator.vacols_uniq_id, user: user) end + + create(:meeting_type) + + user.reload end end end diff --git a/spec/factories/virtual_hearing.rb b/spec/factories/virtual_hearing.rb index f9e7da92fbb..3e8372ac94e 100644 --- a/spec/factories/virtual_hearing.rb +++ b/spec/factories/virtual_hearing.rb @@ -58,6 +58,12 @@ end end + after(:create) do |virtual_hearing, _evaluator| + create(:meeting_type, conferenceable: user) + + virtual_hearing.reload + end + after(:create) do |virtual_hearing, _evaluator| # Calling reload after create fixes a problem where calling `virtual_hearing.hearing.virtual_hearing` # would return `nil`. From 385a6df460cc30e29bddff443be569de3cd23d24 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 14 Sep 2023 20:43:21 -0400 Subject: [PATCH 117/445] Overcommited --- app/models/concerns/conferenceable_concern.rb | 1 - spec/factories/hearing.rb | 6 ------ spec/factories/legacy_appeal.rb | 6 ------ spec/factories/user.rb | 4 ---- spec/factories/virtual_hearing.rb | 6 ------ 5 files changed, 23 deletions(-) diff --git a/app/models/concerns/conferenceable_concern.rb b/app/models/concerns/conferenceable_concern.rb index c7dad834ca3..7a6193fab72 100644 --- a/app/models/concerns/conferenceable_concern.rb +++ b/app/models/concerns/conferenceable_concern.rb @@ -12,7 +12,6 @@ module ConferenceableConcern end def set_default_meeting_type - byebug MeetingType.create!(service_name: DEFAULT_SERVICE, conferenceable: self) unless meeting_type end end diff --git a/spec/factories/hearing.rb b/spec/factories/hearing.rb index 9f73ec35e7a..6da02fe1bb8 100644 --- a/spec/factories/hearing.rb +++ b/spec/factories/hearing.rb @@ -121,11 +121,5 @@ appeal: hearing.appeal) end end - - after(:create) do |hearing, _evaluator| - create(:meeting_type, conferenceable: hearing) - - hearing.reload - end end end diff --git a/spec/factories/legacy_appeal.rb b/spec/factories/legacy_appeal.rb index b39eee4f868..f46ce3d409a 100644 --- a/spec/factories/legacy_appeal.rb +++ b/spec/factories/legacy_appeal.rb @@ -121,11 +121,5 @@ } end end - - after(:create) do |legacy_hearing, _evaluator| - create(:meeting_type, conferenceable: legacy_hearing) - - legacy_hearing.reload - end end end diff --git a/spec/factories/user.rb b/spec/factories/user.rb index 5c17f92b850..10480cd686d 100644 --- a/spec/factories/user.rb +++ b/spec/factories/user.rb @@ -95,10 +95,6 @@ if evaluator.vacols_uniq_id create(:staff, slogid: evaluator.vacols_uniq_id, user: user) end - - create(:meeting_type) - - user.reload end end end diff --git a/spec/factories/virtual_hearing.rb b/spec/factories/virtual_hearing.rb index 3e8372ac94e..f9e7da92fbb 100644 --- a/spec/factories/virtual_hearing.rb +++ b/spec/factories/virtual_hearing.rb @@ -58,12 +58,6 @@ end end - after(:create) do |virtual_hearing, _evaluator| - create(:meeting_type, conferenceable: user) - - virtual_hearing.reload - end - after(:create) do |virtual_hearing, _evaluator| # Calling reload after create fixes a problem where calling `virtual_hearing.hearing.virtual_hearing` # would return `nil`. From 4174758c0700d29830c6cf4002c0230e7e9ee650 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 14 Sep 2023 20:45:53 -0400 Subject: [PATCH 118/445] Update update_user_conference_type --- app/models/concerns/conferenceable_concern.rb | 2 ++ app/models/organizations_user.rb | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/models/concerns/conferenceable_concern.rb b/app/models/concerns/conferenceable_concern.rb index 7a6193fab72..d4cebe75a6a 100644 --- a/app/models/concerns/conferenceable_concern.rb +++ b/app/models/concerns/conferenceable_concern.rb @@ -13,5 +13,7 @@ module ConferenceableConcern def set_default_meeting_type MeetingType.create!(service_name: DEFAULT_SERVICE, conferenceable: self) unless meeting_type + + reload end end diff --git a/app/models/organizations_user.rb b/app/models/organizations_user.rb index 23ce4f1c4b4..0f6f90a5185 100644 --- a/app/models/organizations_user.rb +++ b/app/models/organizations_user.rb @@ -28,9 +28,12 @@ def remove_admin_rights_from_user(user, organization) existing_record(user, organization)&.update!(admin: false) end - def update_user_conference_type(user, new_meeting_type) + def update_user_conference_type(user, new_service_name) + # This could be an upsert once we get to Rails 6 if user.meeting_type - user.update!(meeting_type: new_meeting_type) + user.meeting_type.update!(service_name: new_service_name) + else + MeetingType.create!(service_name: new_service_name, conferenceable: user) end end From fdfe7054f85032cc4db5ae424720c719afbd7d34 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 14 Sep 2023 20:48:22 -0400 Subject: [PATCH 119/445] Update org user spec --- spec/models/organizations_user_spec.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/spec/models/organizations_user_spec.rb b/spec/models/organizations_user_spec.rb index f68b294517d..7134075778d 100644 --- a/spec/models/organizations_user_spec.rb +++ b/spec/models/organizations_user_spec.rb @@ -116,15 +116,17 @@ end describe ".update_user_conference_type" do - let(:meeting_type) { user.meeting_type } let(:new_meeting_type) { "webex" } subject { OrganizationsUser.update_user_conference_type(user, new_meeting_type) } context "when meeting type exists" do it "should set meeting type to equal new meeting type" do + expect(user.meeting_type.service_name).to eq "pexip" + subject - expect(meeting_type).to eq(new_meeting_type) + + expect(user.meeting_type.service_name).to eq new_meeting_type end end end From 8c2af354a4beaced5014cc4dc0abd9c03f9ed529 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 14 Sep 2023 21:17:17 -0400 Subject: [PATCH 120/445] Refactor find_or_create_conference_link --- app/models/hearing_day.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/models/hearing_day.rb b/app/models/hearing_day.rb index 610077d8373..3972fa394e5 100644 --- a/app/models/hearing_day.rb +++ b/app/models/hearing_day.rb @@ -281,11 +281,7 @@ def combine_time_and_date(time, timezone, date) # Method to get the associated conference link record if exists and if not create new one def find_or_create_conference_link! - conference_link = ConferenceLink.find_by_hearing_day_id(id) - if conference_link.nil? - conference_link = ConferenceLink.create(hearing_day_id: id) - end - conference_link + ConferenceLink.find_or_create_by!(hearing_day_id: id, created_by_id: created_by.id) end class << self From 952bb071bdf778a25c28427bcf20028ceda40b39 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 14 Sep 2023 22:09:17 -0400 Subject: [PATCH 121/445] Tweak VH factory --- spec/factories/virtual_hearing.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spec/factories/virtual_hearing.rb b/spec/factories/virtual_hearing.rb index f9e7da92fbb..39384e79a3f 100644 --- a/spec/factories/virtual_hearing.rb +++ b/spec/factories/virtual_hearing.rb @@ -20,7 +20,6 @@ representative_tz { nil } association :created_by, factory: :user association :updated_by, factory: :user - establishment { build(:virtual_hearing_establishment) } guest_pin_long { nil } created_at { Time.zone.now } updated_at { Time.zone.now } @@ -69,7 +68,7 @@ end after(:create) do |virtual_hearing, evaluator| - virtual_hearing.establishment.save! + build(:virtual_hearing_establishment, virtual_hearing: virtual_hearing).save! if evaluator.status == :cancelled virtual_hearing.cancel! From b6bf368c67fbdc09ef0e47f9ea38757df0cd1e3f Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 14 Sep 2023 22:10:15 -0400 Subject: [PATCH 122/445] Add env vars --- config/environments/test.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/environments/test.rb b/config/environments/test.rb index fff81c6c7a2..019cc52f900 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -135,4 +135,10 @@ ENV["PACMAN_API_TOKEN_SECRET"] ||= "client-secret" ENV["PACMAN_API_TOKEN_ISSUER"] ||= "issuer-of-our-token" ENV["PACMAN_API_SYS_ACCOUNT"] ||= "CSS_ID_OF_OUR_ACCOUNT" + + # Necessary vars needed to create virtual hearing links + # Used by VirtualHearings::LinkService + ENV["VIRTUAL_HEARING_PIN_KEY"] ||= "mysecretkey" + ENV["VIRTUAL_HEARING_URL_HOST"] ||= "example.va.gov" + ENV["VIRTUAL_HEARING_URL_PATH"] ||= "/sample" end From fe7c2ee9d36016bb1a7b33421cf3434561ea476a Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 14 Sep 2023 22:58:12 -0400 Subject: [PATCH 123/445] Scope the reload a bit tighter --- app/models/concerns/conferenceable_concern.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/models/concerns/conferenceable_concern.rb b/app/models/concerns/conferenceable_concern.rb index d4cebe75a6a..16052ec0d2b 100644 --- a/app/models/concerns/conferenceable_concern.rb +++ b/app/models/concerns/conferenceable_concern.rb @@ -12,8 +12,10 @@ module ConferenceableConcern end def set_default_meeting_type - MeetingType.create!(service_name: DEFAULT_SERVICE, conferenceable: self) unless meeting_type + unless meeting_type + MeetingType.create!(service_name: DEFAULT_SERVICE, conferenceable: self) - reload + reload_meeting_type + end end end From 6653e1117c93fcffc63c89bd0ae4b4fc25deb290 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 14 Sep 2023 23:04:50 -0400 Subject: [PATCH 124/445] Fix conference client --- app/jobs/virtual_hearings/conference_client.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jobs/virtual_hearings/conference_client.rb b/app/jobs/virtual_hearings/conference_client.rb index 3b2d79e27dc..7d383f019a4 100644 --- a/app/jobs/virtual_hearings/conference_client.rb +++ b/app/jobs/virtual_hearings/conference_client.rb @@ -2,7 +2,7 @@ module VirtualHearings::ConferenceClient def client - case RequestStore.store[:current_user].meeting_type + case RequestStore.store[:current_user].meeting_type.service_name when "pexip" @client ||= PexipService.new( host: ENV["PEXIP_MANAGEMENT_NODE_HOST"], From 89c7ffe0e96df711a0f3caa0619937fd25b025c8 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 14 Sep 2023 23:08:32 -0400 Subject: [PATCH 125/445] Some name fixes --- .../serializers/work_queue/administered_user_serializer.rb | 4 +++- app/views/queue/index.html.erb | 2 +- spec/jobs/virtual_hearings/create_conference_job_spec.rb | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/models/serializers/work_queue/administered_user_serializer.rb b/app/models/serializers/work_queue/administered_user_serializer.rb index f4ffcf0e3a9..86dac51b31b 100644 --- a/app/models/serializers/work_queue/administered_user_serializer.rb +++ b/app/models/serializers/work_queue/administered_user_serializer.rb @@ -11,5 +11,7 @@ class WorkQueue::AdministeredUserSerializer < WorkQueue::UserSerializer params[:organization].dvc&.eql?(object) end end - attribute :meeting_type + attribute :meeting_type do |object,_params| + object.meeting_type.service_name + end end diff --git a/app/views/queue/index.html.erb b/app/views/queue/index.html.erb index 507e51addaa..ba780be38a4 100644 --- a/app/views/queue/index.html.erb +++ b/app/views/queue/index.html.erb @@ -24,7 +24,7 @@ canEditCavcDashboards: current_user.can_edit_cavc_dashboards?, canViewCavcDashboards: current_user.can_view_cavc_dashboards?, userIsCobAdmin: ClerkOfTheBoard.singleton.admins.include?(current_user), - meetingType: current_user.meeting_type, + meetingType: current_user.meeting_type.service_name, featureToggles: { collect_video_and_central_emails: FeatureToggle.enabled?(:collect_video_and_central_emails, user: current_user), enable_hearing_time_slots: FeatureToggle.enabled?(:enable_hearing_time_slots, user: current_user), diff --git a/spec/jobs/virtual_hearings/create_conference_job_spec.rb b/spec/jobs/virtual_hearings/create_conference_job_spec.rb index db5d7384523..b95a3c0ca2b 100644 --- a/spec/jobs/virtual_hearings/create_conference_job_spec.rb +++ b/spec/jobs/virtual_hearings/create_conference_job_spec.rb @@ -98,13 +98,13 @@ end it "fails when meeting type is webex" do - current_user.update!(meeting_type: "webex") + current_user.meeting_type.update!(service_name: "webex") expect { subject.perform_now }.to raise_exception(Caseflow::Error::WebexApiError) end it "fails when a meeting type is neither pexip nor webex" do - current_user.update!(meeting_type: "say whaaaat") + current_user.meeting_type.update!(meeting_type: "say whaaaat") expect { subject.perform_now }.to raise_exception(Caseflow::Error::MeetingTypeNotFoundError) end From cc3ac14785268b0c5868d7993e18eceab332ab13 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 14 Sep 2023 23:12:59 -0400 Subject: [PATCH 126/445] Delegate conference_service to meeting_type --- app/models/concerns/conferenceable_concern.rb | 2 ++ app/models/meeting_type.rb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/models/concerns/conferenceable_concern.rb b/app/models/concerns/conferenceable_concern.rb index 16052ec0d2b..6921af5068e 100644 --- a/app/models/concerns/conferenceable_concern.rb +++ b/app/models/concerns/conferenceable_concern.rb @@ -9,6 +9,8 @@ module ConferenceableConcern has_one :meeting_type, as: :conferenceable after_create :set_default_meeting_type + + delegate :conference_service, to: :meeting_type end def set_default_meeting_type diff --git a/app/models/meeting_type.rb b/app/models/meeting_type.rb index db98a3beb27..3e9b362692c 100644 --- a/app/models/meeting_type.rb +++ b/app/models/meeting_type.rb @@ -4,4 +4,6 @@ class MeetingType < CaseflowRecord belongs_to :conferenceable, polymorphic: true enum service_name: { pexip: 0, webex: 1 } + + alias_attribute :conference_service, :service_name end From c8a54c54a1e85b66e6a73de1feb415a921b1a6d5 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 14 Sep 2023 23:14:43 -0400 Subject: [PATCH 127/445] Use new alias --- app/jobs/virtual_hearings/conference_client.rb | 2 +- .../serializers/work_queue/administered_user_serializer.rb | 4 +--- app/views/queue/index.html.erb | 2 +- spec/models/organizations_user_spec.rb | 4 ++-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/jobs/virtual_hearings/conference_client.rb b/app/jobs/virtual_hearings/conference_client.rb index 7d383f019a4..d751fd7de32 100644 --- a/app/jobs/virtual_hearings/conference_client.rb +++ b/app/jobs/virtual_hearings/conference_client.rb @@ -2,7 +2,7 @@ module VirtualHearings::ConferenceClient def client - case RequestStore.store[:current_user].meeting_type.service_name + case RequestStore.store[:current_user].conference_service when "pexip" @client ||= PexipService.new( host: ENV["PEXIP_MANAGEMENT_NODE_HOST"], diff --git a/app/models/serializers/work_queue/administered_user_serializer.rb b/app/models/serializers/work_queue/administered_user_serializer.rb index 86dac51b31b..ed1de5d334d 100644 --- a/app/models/serializers/work_queue/administered_user_serializer.rb +++ b/app/models/serializers/work_queue/administered_user_serializer.rb @@ -11,7 +11,5 @@ class WorkQueue::AdministeredUserSerializer < WorkQueue::UserSerializer params[:organization].dvc&.eql?(object) end end - attribute :meeting_type do |object,_params| - object.meeting_type.service_name - end + attribute :meeting_type, &:conference_service end diff --git a/app/views/queue/index.html.erb b/app/views/queue/index.html.erb index ba780be38a4..1626157da54 100644 --- a/app/views/queue/index.html.erb +++ b/app/views/queue/index.html.erb @@ -24,7 +24,7 @@ canEditCavcDashboards: current_user.can_edit_cavc_dashboards?, canViewCavcDashboards: current_user.can_view_cavc_dashboards?, userIsCobAdmin: ClerkOfTheBoard.singleton.admins.include?(current_user), - meetingType: current_user.meeting_type.service_name, + meetingType: current_user.conference_service, featureToggles: { collect_video_and_central_emails: FeatureToggle.enabled?(:collect_video_and_central_emails, user: current_user), enable_hearing_time_slots: FeatureToggle.enabled?(:enable_hearing_time_slots, user: current_user), diff --git a/spec/models/organizations_user_spec.rb b/spec/models/organizations_user_spec.rb index 7134075778d..4804db9becb 100644 --- a/spec/models/organizations_user_spec.rb +++ b/spec/models/organizations_user_spec.rb @@ -122,11 +122,11 @@ context "when meeting type exists" do it "should set meeting type to equal new meeting type" do - expect(user.meeting_type.service_name).to eq "pexip" + expect(user.conference_service).to eq "pexip" subject - expect(user.meeting_type.service_name).to eq new_meeting_type + expect(user.conference_service).to eq new_meeting_type end end end From db9292e72c5ec4968452a67271d3b11a4408d83c Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 14 Sep 2023 23:16:45 -0400 Subject: [PATCH 128/445] Fix attr name --- spec/jobs/virtual_hearings/create_conference_job_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/jobs/virtual_hearings/create_conference_job_spec.rb b/spec/jobs/virtual_hearings/create_conference_job_spec.rb index b95a3c0ca2b..3d68b043cb5 100644 --- a/spec/jobs/virtual_hearings/create_conference_job_spec.rb +++ b/spec/jobs/virtual_hearings/create_conference_job_spec.rb @@ -104,7 +104,7 @@ end it "fails when a meeting type is neither pexip nor webex" do - current_user.meeting_type.update!(meeting_type: "say whaaaat") + current_user.meeting_type.update!(service_name: "say whaaaat") expect { subject.perform_now }.to raise_exception(Caseflow::Error::MeetingTypeNotFoundError) end From 38f86012c1d228e159565c3cf946e55e25985349 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 14 Sep 2023 23:19:22 -0400 Subject: [PATCH 129/445] Remove test because now it's not possible to enter state it targets --- spec/jobs/virtual_hearings/create_conference_job_spec.rb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/spec/jobs/virtual_hearings/create_conference_job_spec.rb b/spec/jobs/virtual_hearings/create_conference_job_spec.rb index 3d68b043cb5..8f1733847d5 100644 --- a/spec/jobs/virtual_hearings/create_conference_job_spec.rb +++ b/spec/jobs/virtual_hearings/create_conference_job_spec.rb @@ -103,12 +103,6 @@ expect { subject.perform_now }.to raise_exception(Caseflow::Error::WebexApiError) end - it "fails when a meeting type is neither pexip nor webex" do - current_user.meeting_type.update!(service_name: "say whaaaat") - - expect { subject.perform_now }.to raise_exception(Caseflow::Error::MeetingTypeNotFoundError) - end - include_examples "confirmation emails are sent" include_examples "sent email event objects are created" From db02d9296ca4de794b3a1cfcaae6aa616ccafdf9 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 14 Sep 2023 23:24:10 -0400 Subject: [PATCH 130/445] Remove attr from test since it no longer exists on this model --- spec/models/user_spec.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 6c5b35355d5..7b25a645c36 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -158,8 +158,7 @@ :display_name => css_id.upcase, "name" => "Tom Brady", "status" => Constants.USER_STATUSES.active, - "status_updated_at" => nil, - "meeting_type" => "pexip" + "status_updated_at" => nil } end From f8466d92d84c4f67a70235ef7951c777e7839f97 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 14 Sep 2023 23:49:41 -0400 Subject: [PATCH 131/445] Remove env vars --- config/environments/test.rb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/config/environments/test.rb b/config/environments/test.rb index 019cc52f900..fff81c6c7a2 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -135,10 +135,4 @@ ENV["PACMAN_API_TOKEN_SECRET"] ||= "client-secret" ENV["PACMAN_API_TOKEN_ISSUER"] ||= "issuer-of-our-token" ENV["PACMAN_API_SYS_ACCOUNT"] ||= "CSS_ID_OF_OUR_ACCOUNT" - - # Necessary vars needed to create virtual hearing links - # Used by VirtualHearings::LinkService - ENV["VIRTUAL_HEARING_PIN_KEY"] ||= "mysecretkey" - ENV["VIRTUAL_HEARING_URL_HOST"] ||= "example.va.gov" - ENV["VIRTUAL_HEARING_URL_PATH"] ||= "/sample" end From 5cfd694f31a22d6439d2de30dffc576de8f4ef31 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 15 Sep 2023 00:48:33 -0400 Subject: [PATCH 132/445] Test tweaks --- spec/models/hearings/conference_link_spec.rb | 51 ++++++++++++-------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/spec/models/hearings/conference_link_spec.rb b/spec/models/hearings/conference_link_spec.rb index 4af207cd0f6..98a4d331f4e 100644 --- a/spec/models/hearings/conference_link_spec.rb +++ b/spec/models/hearings/conference_link_spec.rb @@ -20,7 +20,9 @@ let(:user) { create(:user) } it "raises the missing PIN key error" do RequestStore[:current_user] = user - expect { described_class.create(hearing_day_id: hearing_day.id) }.to raise_error VirtualHearings::LinkService::PINKeyMissingError + expect do + described_class.create(hearing_day_id: hearing_day.id) + end.to raise_error VirtualHearings::LinkService::PINKeyMissingError end end @@ -33,7 +35,9 @@ let(:user) { create(:user) } it "raises the missing host error" do RequestStore[:current_user] = user - expect { described_class.create(hearing_day_id: hearing_day.id) }.to raise_error VirtualHearings::LinkService::URLHostMissingError + expect do + described_class.create(hearing_day_id: hearing_day.id) + end.to raise_error VirtualHearings::LinkService::URLHostMissingError end end @@ -46,7 +50,9 @@ let(:user) { create(:user) } it "raises the missing path error" do RequestStore[:current_user] = user - expect { described_class.create(hearing_day_id: hearing_day.id) }.to raise_error VirtualHearings::LinkService::URLPathMissingError + expect do + described_class.create(hearing_day_id: hearing_day.id) + end.to raise_error VirtualHearings::LinkService::URLPathMissingError end end @@ -55,7 +61,9 @@ let(:user) { create(:user) } it "raises the missing PIN key error" do RequestStore[:current_user] = user - expect { described_class.create(hearing_day_id: hearing_day.id) }.to raise_error VirtualHearings::LinkService::PINKeyMissingError + expect do + described_class.create(hearing_day_id: hearing_day.id) + end.to raise_error VirtualHearings::LinkService::PINKeyMissingError end end end @@ -143,17 +151,11 @@ let!(:user) { RequestStore.store[:current_user] = User.system_user } - let(:conference_link) do - create(:conference_link, - hearing_day_id: hearing_day.id, - guest_hearing_link: nil, - guest_pin_long: "7470125694") - end + let(:conference_link) { hearing_day.conference_link } context "guest_pin_long property already has a pin as a value" do it "Returns the guest_pin for the conference_link" do - conference_link.guest_pin - expect(conference_link.guest_pin_long).to eq("7470125694") + expect(conference_link.guest_pin_long).to eq(conference_link.guest_pin) end end context "guest_pin_long property has a value of nil." do @@ -169,6 +171,9 @@ allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return "mysecretkey" allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return "example.va.gov" allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return "/sample" + + allow_any_instance_of(VirtualHearings::LinkService).to receive(:conference_id).and_return expected_conference_id + allow_any_instance_of(VirtualHearings::LinkService).to receive(:guest_pin).and_return expected_pin end let(:hearing_day) { create(:hearing_day) } @@ -177,14 +182,19 @@ let(:conference_link) do create(:conference_link, - hearing_day_id: hearing_day.id, - guest_hearing_link: existing_url, - guest_pin_long: nil) + hearing_day_id: hearing_day.id, + guest_hearing_link: existing_url, + guest_pin_long: nil) end - let(:existing_url) { "https://example.va.gov/sample/?" \ - "conference=BVA0000001@example.va.gov&" \ - "pin=7470125694&callType=video" } + let(:expected_pin) { "7470125694" } + let(:expected_conference_id) { "0000001" } + + let(:existing_url) do + "https://example.va.gov/sample/?" \ + "conference=BVA#{expected_conference_id}@example.va.gov&" \ + "pin=#{expected_pin}&callType=video" + end context "guest_hearing_link property already has a link/string as a value" do it "Returns the guest_pin for the conference_link" do @@ -199,9 +209,10 @@ expect(conference_link.guest_hearing_link).to eq(existing_url) end end - context "If alias_name(aliased for the alias property) is nil AND guest_hearing_link is nil and alias_with_host is NOT nil" do + context "If alias_name(aliased for the alias property) is nil AND guest_hearing_link is nil "\ + "and alias_with_host is NOT nil" do it "creates a guest_hearing_link updates the property and updates the alias property" do - conference_link.update!(alias: nil, guest_hearing_link: nil, alias_with_host: "BVA0000001@example.va.gov" ) + conference_link.update!(alias: nil, guest_hearing_link: nil, alias_with_host: "BVA0000001@example.va.gov") conference_link.guest_link expect(conference_link.guest_hearing_link).to eq(existing_url) end From 6e80c3dff44542519f634648fa4c431e233839f2 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 15 Sep 2023 08:47:11 -0400 Subject: [PATCH 133/445] Swapping usage of meeting_type to conference_provider --- app/controllers/organizations/users_controller.rb | 10 +++++----- app/jobs/virtual_hearings/conference_client.rb | 2 +- app/models/concerns/conferenceable_concern.rb | 2 +- app/models/meeting_type.rb | 2 +- app/models/organizations_user.rb | 2 +- .../work_queue/administered_user_serializer.rb | 2 +- app/views/queue/index.html.erb | 2 +- client/app/queue/QueueApp.jsx | 4 ++-- client/app/queue/SelectConferenceTypeRadioField.jsx | 12 +++++++----- client/app/queue/uiReducer/uiActions.js | 6 +++--- client/app/queue/uiReducer/uiConstants.js | 2 +- client/app/queue/uiReducer/uiReducer.js | 4 ++-- .../app/queue/SelectConferenceTypeRadioField.test.js | 6 +++--- spec/factories/conference_link.rb | 4 ++-- spec/models/organizations_user_spec.rb | 8 ++++---- 15 files changed, 35 insertions(+), 33 deletions(-) diff --git a/app/controllers/organizations/users_controller.rb b/app/controllers/organizations/users_controller.rb index 4d6cd9eb2a5..f5b7650bcf2 100644 --- a/app/controllers/organizations/users_controller.rb +++ b/app/controllers/organizations/users_controller.rb @@ -32,7 +32,7 @@ def update adjust_admin_rights end - update_user_meeting_type + update_user_conference_provider render json: { users: json_administered_users([user_to_modify]) }, status: :ok end @@ -68,11 +68,11 @@ def adjust_admin_rights end end - def update_user_meeting_type - new_meeting_type = params.dig(:attributes, :meeting_type) + def update_user_conference_provider + new_conference_provider = params.dig(:attributes, :conference_provider) - if organization["url"] == HearingsManagement.singleton.url && new_meeting_type - OrganizationsUser.update_user_conference_type(user_to_modify, new_meeting_type) + if organization["url"] == HearingsManagement.singleton.url && new_conference_provider + OrganizationsUser.update_user_conference_provider(user_to_modify, new_conference_provider) end end diff --git a/app/jobs/virtual_hearings/conference_client.rb b/app/jobs/virtual_hearings/conference_client.rb index d751fd7de32..c0920c41e8d 100644 --- a/app/jobs/virtual_hearings/conference_client.rb +++ b/app/jobs/virtual_hearings/conference_client.rb @@ -2,7 +2,7 @@ module VirtualHearings::ConferenceClient def client - case RequestStore.store[:current_user].conference_service + case RequestStore.store[:current_user].conference_provider when "pexip" @client ||= PexipService.new( host: ENV["PEXIP_MANAGEMENT_NODE_HOST"], diff --git a/app/models/concerns/conferenceable_concern.rb b/app/models/concerns/conferenceable_concern.rb index 6921af5068e..c08701dca99 100644 --- a/app/models/concerns/conferenceable_concern.rb +++ b/app/models/concerns/conferenceable_concern.rb @@ -10,7 +10,7 @@ module ConferenceableConcern after_create :set_default_meeting_type - delegate :conference_service, to: :meeting_type + delegate :conference_provider, to: :meeting_type end def set_default_meeting_type diff --git a/app/models/meeting_type.rb b/app/models/meeting_type.rb index 3e9b362692c..a4599a5c935 100644 --- a/app/models/meeting_type.rb +++ b/app/models/meeting_type.rb @@ -5,5 +5,5 @@ class MeetingType < CaseflowRecord enum service_name: { pexip: 0, webex: 1 } - alias_attribute :conference_service, :service_name + alias_attribute :conference_provider, :service_name end diff --git a/app/models/organizations_user.rb b/app/models/organizations_user.rb index 0f6f90a5185..caf892a125a 100644 --- a/app/models/organizations_user.rb +++ b/app/models/organizations_user.rb @@ -28,7 +28,7 @@ def remove_admin_rights_from_user(user, organization) existing_record(user, organization)&.update!(admin: false) end - def update_user_conference_type(user, new_service_name) + def update_user_conference_provider(user, new_service_name) # This could be an upsert once we get to Rails 6 if user.meeting_type user.meeting_type.update!(service_name: new_service_name) diff --git a/app/models/serializers/work_queue/administered_user_serializer.rb b/app/models/serializers/work_queue/administered_user_serializer.rb index ed1de5d334d..dffbb0f75a4 100644 --- a/app/models/serializers/work_queue/administered_user_serializer.rb +++ b/app/models/serializers/work_queue/administered_user_serializer.rb @@ -11,5 +11,5 @@ class WorkQueue::AdministeredUserSerializer < WorkQueue::UserSerializer params[:organization].dvc&.eql?(object) end end - attribute :meeting_type, &:conference_service + attribute :conference_provider end diff --git a/app/views/queue/index.html.erb b/app/views/queue/index.html.erb index 1626157da54..79bda70a0b4 100644 --- a/app/views/queue/index.html.erb +++ b/app/views/queue/index.html.erb @@ -24,7 +24,7 @@ canEditCavcDashboards: current_user.can_edit_cavc_dashboards?, canViewCavcDashboards: current_user.can_view_cavc_dashboards?, userIsCobAdmin: ClerkOfTheBoard.singleton.admins.include?(current_user), - meetingType: current_user.conference_service, + conferenceProvider: current_user.conference_provider, featureToggles: { collect_video_and_central_emails: FeatureToggle.enabled?(:collect_video_and_central_emails, user: current_user), enable_hearing_time_slots: FeatureToggle.enabled?(:enable_hearing_time_slots, user: current_user), diff --git a/client/app/queue/QueueApp.jsx b/client/app/queue/QueueApp.jsx index 3875a82e704..8a8719f321c 100644 --- a/client/app/queue/QueueApp.jsx +++ b/client/app/queue/QueueApp.jsx @@ -112,7 +112,7 @@ class QueueApp extends React.PureComponent { this.props.setCanEditAod(this.props.canEditAod); this.props.setCanEditNodDate(this.props.userCanViewEditNodDate); this.props.setUserIsCobAdmin(this.props.userIsCobAdmin); - this.props.setMeetingType(this.props.meetingType); + this.props.setMeetingType(this.props.conferenceProvider); this.props.setCanEditCavcRemands(this.props.canEditCavcRemands); this.props.setCanEditCavcDashboards(this.props.canEditCavcDashboards); this.props.setCanViewCavcDashboards(this.props.canViewCavcDashboards); @@ -1422,7 +1422,7 @@ QueueApp.propTypes = { canEditCavcDashboards: PropTypes.bool, canViewCavcDashboards: PropTypes.bool, userIsCobAdmin: PropTypes.bool, - meetingType: PropTypes.string, + conferenceProvider: PropTypes.string, setMeetingType: PropTypes.string }; diff --git a/client/app/queue/SelectConferenceTypeRadioField.jsx b/client/app/queue/SelectConferenceTypeRadioField.jsx index 805c88f26c1..7ecfd5dcdf5 100644 --- a/client/app/queue/SelectConferenceTypeRadioField.jsx +++ b/client/app/queue/SelectConferenceTypeRadioField.jsx @@ -12,11 +12,13 @@ const radioOptions = [ value: 'webex' } ]; -const SelectConferenceTypeRadioField = ({ name, meetingType, organization, user }) => { - const [value, setValue] = useState(meetingType); +const SelectConferenceTypeRadioField = ({ name, conferenceProvider, organization, user }) => { + const [value, setValue] = useState(conferenceProvider); - const modifyConferenceType = (newMeetingType) => { - const payload = { data: { ...user, attributes: { ...user.attributes, meeting_type: newMeetingType } } }; + const modifyConferenceType = (newConferenceProvider) => { + const payload = { + data: { ...user, attributes: { ...user.attributes, conference_provider: newConferenceProvider } } + }; ApiUtil.patch(`/organizations/${organization}/users/${user.id}`, payload); }; @@ -37,7 +39,7 @@ const SelectConferenceTypeRadioField = ({ name, meetingType, organization, user SelectConferenceTypeRadioField.propTypes = { name: PropTypes.string, onClick: PropTypes.func, - meetingType: PropTypes.string, + conferenceProvider: PropTypes.string, organization: PropTypes.string, user: PropTypes.shape({ id: PropTypes.string, diff --git a/client/app/queue/uiReducer/uiActions.js b/client/app/queue/uiReducer/uiActions.js index 1cabce79991..bec0927e094 100644 --- a/client/app/queue/uiReducer/uiActions.js +++ b/client/app/queue/uiReducer/uiActions.js @@ -48,10 +48,10 @@ export const setUserIsCobAdmin = (userIsCobAdmin) => ({ } }); -export const setMeetingType = (meetingType) => ({ - type: ACTIONS.SET_MEETING_TYPE, +export const setMeetingType = (conferenceProvider) => ({ + type: ACTIONS.SET_CONFERENCE_PROVIDER, payload: { - meetingType + conferenceProvider } }); diff --git a/client/app/queue/uiReducer/uiConstants.js b/client/app/queue/uiReducer/uiConstants.js index 7b6c9d8743b..f8019836660 100644 --- a/client/app/queue/uiReducer/uiConstants.js +++ b/client/app/queue/uiReducer/uiConstants.js @@ -8,7 +8,7 @@ export const ACTIONS = { SET_FEEDBACK_URL: 'SET_FEEDBACK_URL', SET_TARGET_USER: 'SET_TARGET_USER', - SET_MEETING_TYPE: 'SET_MEETING_TYPE', + SET_CONFERENCE_PROVIDER: 'SET_CONFERENCE_PROVIDER', HIGHLIGHT_INVALID_FORM_ITEMS: 'HIGHLIGHT_INVALID_FORM_ITEMS', RESET_ERROR_MESSAGES: 'RESET_ERROR_MESSAGES', diff --git a/client/app/queue/uiReducer/uiReducer.js b/client/app/queue/uiReducer/uiReducer.js index 711ff4e750d..24909a9e962 100644 --- a/client/app/queue/uiReducer/uiReducer.js +++ b/client/app/queue/uiReducer/uiReducer.js @@ -99,9 +99,9 @@ const workQueueUiReducer = (state = initialState, action = {}) => { return update(state, { userIsCobAdmin: { $set: action.payload.userIsCobAdmin } }); - case ACTIONS.SET_MEETING_TYPE: + case ACTIONS.SET_CONFERENCE_PROVIDER: return update(state, { - meetingType: { $set: action.payload.meetingType } + conferenceProvider: { $set: action.payload.conferenceProvider } }); case ACTIONS.SET_CAN_EDIT_CAVC_REMANDS: return update(state, { diff --git a/client/test/app/queue/SelectConferenceTypeRadioField.test.js b/client/test/app/queue/SelectConferenceTypeRadioField.test.js index dd36e4f4343..05e79ce2729 100644 --- a/client/test/app/queue/SelectConferenceTypeRadioField.test.js +++ b/client/test/app/queue/SelectConferenceTypeRadioField.test.js @@ -34,7 +34,7 @@ describe('SelectConferenceTypeRadioField', () => { id: 1 } }, - meetingType: 'pexip', + conferenceProvider: 'pexip', organization: 'my org' }) => { const utils = render( @@ -71,10 +71,10 @@ describe('SelectConferenceTypeRadioField', () => { userEvent.click(webexRadioButton); - expect(requestPatchSpy.mock.calls[0][1].data.attributes.meeting_type).toBe('webex'); + expect(requestPatchSpy.mock.calls[0][1].data.attributes.conference_provider).toBe('webex'); userEvent.click(pexipRadioButton); - expect(requestPatchSpy.mock.calls[1][1].data.attributes.meeting_type).toBe('pexip'); + expect(requestPatchSpy.mock.calls[1][1].data.attributes.conference_provider).toBe('pexip'); }); }); diff --git a/spec/factories/conference_link.rb b/spec/factories/conference_link.rb index a5884f14cde..1dd313c1af2 100644 --- a/spec/factories/conference_link.rb +++ b/spec/factories/conference_link.rb @@ -3,7 +3,7 @@ FactoryBot.define do factory :conference_link do transient do - conference_service { "pexip" } + conference_provider { "pexip" } end alias_name { nil } @@ -17,7 +17,7 @@ created_by { create(:user) } updated_by { create(:user) } meeting_type do - create(:meeting_type, service_name: conference_service) + create(:meeting_type, service_name: conference_provider) end end end diff --git a/spec/models/organizations_user_spec.rb b/spec/models/organizations_user_spec.rb index 4804db9becb..1ed9de6e7fc 100644 --- a/spec/models/organizations_user_spec.rb +++ b/spec/models/organizations_user_spec.rb @@ -115,18 +115,18 @@ end end - describe ".update_user_conference_type" do + describe ".update_user_conference_provider" do let(:new_meeting_type) { "webex" } - subject { OrganizationsUser.update_user_conference_type(user, new_meeting_type) } + subject { OrganizationsUser.update_user_conference_provider(user, new_meeting_type) } context "when meeting type exists" do it "should set meeting type to equal new meeting type" do - expect(user.conference_service).to eq "pexip" + expect(user.conference_provider).to eq "pexip" subject - expect(user.conference_service).to eq new_meeting_type + expect(user.conference_provider).to eq new_meeting_type end end end From 6dcc19ae0dd7d1b6a7aa1d357ce595f8ce85a788 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 15 Sep 2023 09:12:36 -0400 Subject: [PATCH 134/445] Tweak callback --- app/models/concerns/conferenceable_concern.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/models/concerns/conferenceable_concern.rb b/app/models/concerns/conferenceable_concern.rb index c08701dca99..11023c351f3 100644 --- a/app/models/concerns/conferenceable_concern.rb +++ b/app/models/concerns/conferenceable_concern.rb @@ -10,12 +10,15 @@ module ConferenceableConcern after_create :set_default_meeting_type - delegate :conference_provider, to: :meeting_type + delegate :conference_provider, to: :meeting_type, allow_nil: true end def set_default_meeting_type unless meeting_type - MeetingType.create!(service_name: DEFAULT_SERVICE, conferenceable: self) + MeetingType.create!( + service_name: created_by.conference_provider || DEFAULT_SERVICE, + conferenceable: self + ) reload_meeting_type end From bf159dddf403d2dc8a006de1bd0b50cc7a41d679 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 15 Sep 2023 09:20:01 -0400 Subject: [PATCH 135/445] Handle models without created_by attr --- app/models/concerns/conferenceable_concern.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/models/concerns/conferenceable_concern.rb b/app/models/concerns/conferenceable_concern.rb index 11023c351f3..704e4c7dfa7 100644 --- a/app/models/concerns/conferenceable_concern.rb +++ b/app/models/concerns/conferenceable_concern.rb @@ -13,10 +13,16 @@ module ConferenceableConcern delegate :conference_provider, to: :meeting_type, allow_nil: true end + def detremine_service_name + return created_by.conference_provider || DEFAULT_SERVICE if respond_to? :created_by + + DEFAULT_SERVICE + end + def set_default_meeting_type unless meeting_type MeetingType.create!( - service_name: created_by.conference_provider || DEFAULT_SERVICE, + service_name: detremine_service_name, conferenceable: self ) From a9a679f6c5f123f797a0cbc4673d084a30c1fc01 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 15 Sep 2023 09:21:48 -0400 Subject: [PATCH 136/445] Refactor --- app/models/concerns/conferenceable_concern.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/models/concerns/conferenceable_concern.rb b/app/models/concerns/conferenceable_concern.rb index 704e4c7dfa7..87316c56d04 100644 --- a/app/models/concerns/conferenceable_concern.rb +++ b/app/models/concerns/conferenceable_concern.rb @@ -14,15 +14,13 @@ module ConferenceableConcern end def detremine_service_name - return created_by.conference_provider || DEFAULT_SERVICE if respond_to? :created_by - - DEFAULT_SERVICE + created_by.conference_provider if respond_to? :created_by end def set_default_meeting_type unless meeting_type MeetingType.create!( - service_name: detremine_service_name, + service_name: detremine_service_name || DEFAULT_SERVICE, conferenceable: self ) From a6a8dae894bb4164db7f79bdace749d6cb4675da Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 15 Sep 2023 09:23:33 -0400 Subject: [PATCH 137/445] Fix typo --- app/models/concerns/conferenceable_concern.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/concerns/conferenceable_concern.rb b/app/models/concerns/conferenceable_concern.rb index 87316c56d04..fbeae7f8db7 100644 --- a/app/models/concerns/conferenceable_concern.rb +++ b/app/models/concerns/conferenceable_concern.rb @@ -13,14 +13,14 @@ module ConferenceableConcern delegate :conference_provider, to: :meeting_type, allow_nil: true end - def detremine_service_name + def determine_service_name created_by.conference_provider if respond_to? :created_by end def set_default_meeting_type unless meeting_type MeetingType.create!( - service_name: detremine_service_name || DEFAULT_SERVICE, + service_name: determine_service_name || DEFAULT_SERVICE, conferenceable: self ) From 3a70d64c1109c53360513755f61222a9d771f92b Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 15 Sep 2023 09:52:15 -0400 Subject: [PATCH 138/445] Add extra insurance --- app/models/concerns/conferenceable_concern.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/concerns/conferenceable_concern.rb b/app/models/concerns/conferenceable_concern.rb index fbeae7f8db7..4efce134464 100644 --- a/app/models/concerns/conferenceable_concern.rb +++ b/app/models/concerns/conferenceable_concern.rb @@ -3,7 +3,7 @@ module ConferenceableConcern extend ActiveSupport::Concern - DEFAULT_SERVICE = "pexip" + DEFAULT_SERVICE = ENV["DEFAULT_CONFERENCE_SERVICE"] || "pexip" included do has_one :meeting_type, as: :conferenceable @@ -14,7 +14,7 @@ module ConferenceableConcern end def determine_service_name - created_by.conference_provider if respond_to? :created_by + created_by&.conference_provider if respond_to? :created_by end def set_default_meeting_type From 6a738c7af55df019b5e5eb99ab543d27c7dbf5c6 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 15 Sep 2023 10:04:16 -0400 Subject: [PATCH 139/445] Add guard clause for VirtualHearings --- app/models/concerns/conferenceable_concern.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/models/concerns/conferenceable_concern.rb b/app/models/concerns/conferenceable_concern.rb index 4efce134464..9f854426935 100644 --- a/app/models/concerns/conferenceable_concern.rb +++ b/app/models/concerns/conferenceable_concern.rb @@ -14,6 +14,8 @@ module ConferenceableConcern end def determine_service_name + return hearing&.conference_provider if is_a? VirtualHearing + created_by&.conference_provider if respond_to? :created_by end From f3c399db9e4dd7eaefc8398cb453579c7347f0cd Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 15 Sep 2023 10:23:43 -0400 Subject: [PATCH 140/445] Add user_spec --- spec/models/user_spec.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 7b25a645c36..2b3f0449448 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -1067,4 +1067,20 @@ class AnotherFakeTask < Dispatch::Task; end end end end + + describe "#conference_provider" do + let!(:user) { create(:user, css_id: "HEARINGS_USER") } + + subject { user.conference_provider } + + it "User's initial conference provider is Pexip" do + is_expected.to eq "pexip" + end + + it "User's conference provider can be swapped" do + OrganizationsUser.update_user_conference_provider(user, "webex") + + is_expected.to eq "webex" + end + end end From f905199b6d6f8283491b09f0259a7ed1d2800034 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 15 Sep 2023 10:34:49 -0400 Subject: [PATCH 141/445] Rubocop fix --- app/models/hearings/conference_link.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/hearings/conference_link.rb b/app/models/hearings/conference_link.rb index 2ae212386e0..dfdd33a8f02 100644 --- a/app/models/hearings/conference_link.rb +++ b/app/models/hearings/conference_link.rb @@ -77,8 +77,8 @@ def generate_links_and_pins guest_pin_long: link_service.guest_pin ) rescue VirtualHearings::LinkService::PINKeyMissingError, - VirtualHearings::LinkService::URLHostMissingError, - VirtualHearings::LinkService::URLPathMissingError => error + VirtualHearings::LinkService::URLHostMissingError, + VirtualHearings::LinkService::URLPathMissingError => error Raven.capture_exception(error: error) raise error end From 253750f5c709004eab99d3c566435f51250c9f6d Mon Sep 17 00:00:00 2001 From: Prerna Devulapalli Date: Fri, 15 Sep 2023 10:45:53 -0400 Subject: [PATCH 142/445] APPEALS-25142 Fixing tests --- .../components/details/HearingLinks.jsx | 6 +- .../__snapshots__/HearingLinks.test.js.snap | 66 ++----------------- 2 files changed, 8 insertions(+), 64 deletions(-) diff --git a/client/app/hearings/components/details/HearingLinks.jsx b/client/app/hearings/components/details/HearingLinks.jsx index 4ff4c690d88..da83fb96ad2 100644 --- a/client/app/hearings/components/details/HearingLinks.jsx +++ b/client/app/hearings/components/details/HearingLinks.jsx @@ -27,10 +27,8 @@ export const VirtualHearingLinkDetails = ({ virtualHearing }) => ( - {hearing?.scheduledForIsPast || hearing?.wasVirtual ? ( -
    - N/A -
    + {hearing?.scheduledForIsPast || wasVirtual ? ( + N/A ) : ( - + + N/A +
    @@ -938,36 +911,9 @@ exports[`HearingLinks Matches snapshot when hearing was virtual and occurred 1`] } wasVirtual={true} > - + + N/A +
    From 495e31baea360fc8d8226d757f5b69a41ea34c27 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 15 Sep 2023 10:56:25 -0400 Subject: [PATCH 143/445] MeetingType spec --- spec/models/meeting_type_spec.rb | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 spec/models/meeting_type_spec.rb diff --git a/spec/models/meeting_type_spec.rb b/spec/models/meeting_type_spec.rb new file mode 100644 index 00000000000..1ab4d2384c3 --- /dev/null +++ b/spec/models/meeting_type_spec.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +describe MeetingType, :postgres do + let(:user) { create(:user, css_id: "NEW_USER") } + + it "Only a valid service_names can be used" do + expect { described_class.create!(service_name: "Invalid name") }.to raise_error do |error| + expect(error).to be_a ArgumentError + + expect(error.to_s).to eq "'Invalid name' is not a valid service_name" + end + end +end From fbcc09193fcc811a47ecfbb72324f5d783e19530 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 15 Sep 2023 16:06:44 -0400 Subject: [PATCH 144/445] Some more specs --- spec/factories/legacy_hearing.rb | 4 +++- spec/models/hearing_spec.rb | 9 +++++++ spec/models/hearings_shared_examples.rb | 32 +++++++++++++++++++++++++ spec/models/legacy_hearing_spec.rb | 9 +++++++ 4 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 spec/models/hearings_shared_examples.rb diff --git a/spec/factories/legacy_hearing.rb b/spec/factories/legacy_hearing.rb index daacf962b16..049c5b0d61e 100644 --- a/spec/factories/legacy_hearing.rb +++ b/spec/factories/legacy_hearing.rb @@ -11,6 +11,7 @@ regional_office: regional_office, request_type: regional_office.nil? ? "C" : "V") end + adding_user { nil } end hearing_location do @@ -51,7 +52,8 @@ hearing_day_id { case_hearing.vdkey } vacols_id { case_hearing.hearing_pkseq } created_by do - User.find_by_css_id("ID_FACT_LEGACYHEARING") || + adding_user || + User.find_by_css_id("ID_FACT_LEGACYHEARING") || create(:user, css_id: "ID_FACT_LEGACYHEARING", full_name: "Joe LegacyHearingFactory User") end updated_by do diff --git a/spec/models/hearing_spec.rb b/spec/models/hearing_spec.rb index 68d1ff93339..ac0b2d60841 100644 --- a/spec/models/hearing_spec.rb +++ b/spec/models/hearing_spec.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true require "models/concerns/has_virtual_hearing_examples" +require "models/hearings_shared_examples" describe Hearing, :postgres do it_should_behave_like "a model that can have a virtual hearing" do @@ -303,4 +304,12 @@ expect(hearing.aod?).to eq(false) end end + + context "#conference_provider" do + let(:hearing_type) { :hearing } + + include_context "Pexip and Webex Users" + + include_examples "Conference provider values are transferred between base entity and new hearings" + end end diff --git a/spec/models/hearings_shared_examples.rb b/spec/models/hearings_shared_examples.rb new file mode 100644 index 00000000000..0e70f9da6a7 --- /dev/null +++ b/spec/models/hearings_shared_examples.rb @@ -0,0 +1,32 @@ +# frozen_string_literal: true + +shared_context "Pexip and Webex Users" do + let!(:pexip_user) do + create(:user, css_id: "PEXIP_USER").tap { |user| user.meeting_type.update!(service_name: "pexip") } + end + let!(:webex_user) do + create(:user, css_id: "WEBEX_USER").tap { |user| user.meeting_type.update!(service_name: "webex") } + end +end + +shared_examples "Conference provider values are transferred between base entity and new hearings" do + subject { hearing.conference_provider } + + context "Pexip user schedules the hearing" do + let(:hearing) { create(hearing_type, adding_user: pexip_user) } + + it "Hearing scheduled by Pexip user is assigned a Pexip conference provider" do + is_expected.to eq pexip_user.conference_provider + is_expected.to eq "pexip" + end + end + + context "Webex user schedules the hearing" do + let(:hearing) { create(hearing_type, adding_user: webex_user) } + + it "Hearing scheduled by Webex user is assigned a User conference provider" do + is_expected.to eq webex_user.conference_provider + is_expected.to eq "webex" + end + end +end diff --git a/spec/models/legacy_hearing_spec.rb b/spec/models/legacy_hearing_spec.rb index b5d43a7bcd8..34dd24aa9af 100644 --- a/spec/models/legacy_hearing_spec.rb +++ b/spec/models/legacy_hearing_spec.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true require "models/concerns/has_virtual_hearing_examples" +require "models/hearings_shared_examples" describe LegacyHearing, :all_dbs do it_should_behave_like "a model that can have a virtual hearing" do @@ -779,4 +780,12 @@ end end end + + context "#conference_provider" do + let(:hearing_type) { :legacy_hearing } + + include_context "Pexip and Webex Users" + + include_examples "Conference provider values are transferred between base entity and new hearings" + end end From ea2644e13ed8410aa606ae37a0d8d9ab59d71e23 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 15 Sep 2023 17:23:53 -0400 Subject: [PATCH 145/445] VH spec --- spec/models/hearings/virtual_hearing_spec.rb | 91 ++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/spec/models/hearings/virtual_hearing_spec.rb b/spec/models/hearings/virtual_hearing_spec.rb index 8b09c373ac0..8a9e646c6f9 100644 --- a/spec/models/hearings/virtual_hearing_spec.rb +++ b/spec/models/hearings/virtual_hearing_spec.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require "models/hearings_shared_examples" + describe VirtualHearing do URL_HOST = "example.va.gov" URL_PATH = "/sample" @@ -383,4 +385,93 @@ def link(name) end end end + + shared_examples "Hearings inherit conf providers from provider of original scheduler at time of creation" do + it "original_scheduler creates the virtual hearing" do + virtual_hearing = create( + :virtual_hearing, + :initialized, + hearing: hearing, + created_by: original_scheduler + ) + + expect(virtual_hearing.conference_provider).to eq hearing.conference_provider + expect(virtual_hearing.conference_provider).to eq original_scheduler.conference_provider + end + + it "User with different conference provider than the original scheduler creates the virtual hearing" do + virtual_hearing = create( + :virtual_hearing, + :initialized, + hearing: hearing, + created_by: other_user + ) + + expect(virtual_hearing.conference_provider).to eq hearing.conference_provider + expect(virtual_hearing.conference_provider).to_not eq other_user.conference_provider + end + + it "Original user's provider changes between time they schedule hearing and a virtual hearing" do + original_scheduler.meeting_type.update!(service_name: other_user.conference_provider) + + virtual_hearing = create( + :virtual_hearing, + :initialized, + hearing: hearing, + created_by: original_scheduler + ) + + expect(virtual_hearing.conference_provider).to eq hearing.conference_provider + expect(virtual_hearing.conference_provider).to_not eq other_user.conference_provider + expect(virtual_hearing.conference_provider).to_not eq original_scheduler.conference_provider + end + end + + shared_context "Pexip user is original schedulder" do + let(:original_scheduler) { pexip_user } + let(:other_user) { webex_user } + let!(:hearing) { create(hearing_type, adding_user: original_scheduler) } + end + + shared_context "Webex user is original schedulder" do + let(:original_scheduler) { webex_user } + let(:other_user) { pexip_user } + let!(:hearing) { create(hearing_type, adding_user: original_scheduler) } + end + + context "#conference_provider" do + include_context "Pexip and Webex Users" + + context "For a legacy hearing" do + let(:hearing_type) { :legacy_hearing } + + context "Pexip hearing begets a Pexip virtual hearing" do + include_context "Pexip user is original schedulder" + + include_examples "Hearings inherit conf providers from provider of original scheduler at time of creation" + end + + context "Webex hearing begets a Webex virtual hearing" do + include_context "Webex user is original schedulder" + + include_examples "Hearings inherit conf providers from provider of original scheduler at time of creation" + end + end + + context "For an AMA hearing" do + let(:hearing_type) { :hearing } + + context "Pexip hearing begets a Pexip virtual hearing" do + include_context "Pexip user is original schedulder" + + include_examples "Hearings inherit conf providers from provider of original scheduler at time of creation" + end + + context "Webex hearing begets a Webex virtual hearing" do + include_context "Webex user is original schedulder" + + include_examples "Hearings inherit conf providers from provider of original scheduler at time of creation" + end + end + end end From fa11a702ad0ed8d4905ff6c05ecffe470d05f7d6 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 15 Sep 2023 22:57:33 -0400 Subject: [PATCH 146/445] Add scopes --- app/models/meeting_type.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/models/meeting_type.rb b/app/models/meeting_type.rb index a4599a5c935..de6496a2847 100644 --- a/app/models/meeting_type.rb +++ b/app/models/meeting_type.rb @@ -5,5 +5,8 @@ class MeetingType < CaseflowRecord enum service_name: { pexip: 0, webex: 1 } + scope :pexip, -> { where(service_name: "pexip") } + scope :webex, -> { where(service_name: "webex") } + alias_attribute :conference_provider, :service_name end From 83e9d7a565f0f28dde26f1b1f94aa1e3e10e5a12 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 15 Sep 2023 23:02:31 -0400 Subject: [PATCH 147/445] Fix lint issues --- client/app/queue/QueueApp.jsx | 52 +++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/client/app/queue/QueueApp.jsx b/client/app/queue/QueueApp.jsx index 3875a82e704..e733fe97331 100644 --- a/client/app/queue/QueueApp.jsx +++ b/client/app/queue/QueueApp.jsx @@ -921,22 +921,28 @@ class QueueApp extends React.PureComponent { render={this.routedAssignToUser} /> @@ -1001,7 +1007,8 @@ class QueueApp extends React.PureComponent { render={this.routedReturnToCamo} /> @@ -1091,7 +1098,8 @@ class QueueApp extends React.PureComponent { render={this.routedCavcRemandReceived} /> @@ -1121,28 +1129,32 @@ class QueueApp extends React.PureComponent { /> Date: Sun, 17 Sep 2023 00:45:48 -0400 Subject: [PATCH 148/445] Add doc comments --- app/models/concerns/conferenceable_concern.rb | 3 +++ app/models/meeting_type.rb | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/app/models/concerns/conferenceable_concern.rb b/app/models/concerns/conferenceable_concern.rb index 9f854426935..48243752f9e 100644 --- a/app/models/concerns/conferenceable_concern.rb +++ b/app/models/concerns/conferenceable_concern.rb @@ -1,5 +1,8 @@ # frozen_string_literal: true +# Any model that includes this concern will be able to be assigned a conference provider +# for use in creating virtual conference links. + module ConferenceableConcern extend ActiveSupport::Concern diff --git a/app/models/meeting_type.rb b/app/models/meeting_type.rb index de6496a2847..be1518480c6 100644 --- a/app/models/meeting_type.rb +++ b/app/models/meeting_type.rb @@ -1,5 +1,13 @@ # frozen_string_literal: true +## +# A class to repreesnt a polymorphic join table that the allow for the use of the +# conferenceable association. +# +# Any model that includes a conferenceable assoication with end up with record in this table. +# +# The service_name pertains to which video conferencing service an entity is assigned to use. + class MeetingType < CaseflowRecord belongs_to :conferenceable, polymorphic: true From fdbed9f7db4f40e07dedad3c6afabfe752ae4d23 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Sun, 17 Sep 2023 01:16:41 -0400 Subject: [PATCH 149/445] Forcing retest --- app/models/concerns/conferenceable_concern.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/concerns/conferenceable_concern.rb b/app/models/concerns/conferenceable_concern.rb index 48243752f9e..ca8d6e37f42 100644 --- a/app/models/concerns/conferenceable_concern.rb +++ b/app/models/concerns/conferenceable_concern.rb @@ -23,6 +23,7 @@ def determine_service_name end def set_default_meeting_type + unless meeting_type MeetingType.create!( service_name: determine_service_name || DEFAULT_SERVICE, From 2c36596f84d3be894bea331df35fbaa667fa1eb5 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Sun, 17 Sep 2023 01:16:50 -0400 Subject: [PATCH 150/445] Forcing retest --- app/models/concerns/conferenceable_concern.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/models/concerns/conferenceable_concern.rb b/app/models/concerns/conferenceable_concern.rb index ca8d6e37f42..48243752f9e 100644 --- a/app/models/concerns/conferenceable_concern.rb +++ b/app/models/concerns/conferenceable_concern.rb @@ -23,7 +23,6 @@ def determine_service_name end def set_default_meeting_type - unless meeting_type MeetingType.create!( service_name: determine_service_name || DEFAULT_SERVICE, From 4922e47c4b31c11d111ba1f19bbc191790032224 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Sun, 17 Sep 2023 14:49:02 -0400 Subject: [PATCH 151/445] Add docstrings --- app/models/concerns/conferenceable_concern.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/app/models/concerns/conferenceable_concern.rb b/app/models/concerns/conferenceable_concern.rb index 48243752f9e..c59aa79acc8 100644 --- a/app/models/concerns/conferenceable_concern.rb +++ b/app/models/concerns/conferenceable_concern.rb @@ -1,5 +1,6 @@ # frozen_string_literal: true +## # Any model that includes this concern will be able to be assigned a conference provider # for use in creating virtual conference links. @@ -16,12 +17,27 @@ module ConferenceableConcern delegate :conference_provider, to: :meeting_type, allow_nil: true end + # Determines which associated entity this new item should inherit its conference + # provider from. + # + # Virtual hearings will inherit their conference providers from the hearing they've + # been created for. + # + # Other items will inherit from the conference provider assigned to the user who is + # creating them. + # + # @return [String] the conference provider/service name to assign to the new object ("webex" or "pexip") def determine_service_name return hearing&.conference_provider if is_a? VirtualHearing created_by&.conference_provider if respond_to? :created_by end + # Creates an associated MeetingType record for the newly created object. + # Which conference provider will be configured within this record is determined + # by #determine_service_name + # + # @return [MeetingType] the new MeetingType object after it has been reloaded. def set_default_meeting_type unless meeting_type MeetingType.create!( From 747a40027e2a19ccf285281cdf09665af5fcedd8 Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Mon, 18 Sep 2023 15:25:16 -0400 Subject: [PATCH 152/445] removed added code in test.rb, provided environment variables necessary, within the test. --- config/environments/test.rb | 6 ------ .../virtual_hearings/delete_conference_link_job_spec.rb | 7 ++++++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/config/environments/test.rb b/config/environments/test.rb index 019cc52f900..fff81c6c7a2 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -135,10 +135,4 @@ ENV["PACMAN_API_TOKEN_SECRET"] ||= "client-secret" ENV["PACMAN_API_TOKEN_ISSUER"] ||= "issuer-of-our-token" ENV["PACMAN_API_SYS_ACCOUNT"] ||= "CSS_ID_OF_OUR_ACCOUNT" - - # Necessary vars needed to create virtual hearing links - # Used by VirtualHearings::LinkService - ENV["VIRTUAL_HEARING_PIN_KEY"] ||= "mysecretkey" - ENV["VIRTUAL_HEARING_URL_HOST"] ||= "example.va.gov" - ENV["VIRTUAL_HEARING_URL_PATH"] ||= "/sample" end diff --git a/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb b/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb index 4dfe39bb856..46d607f44cd 100644 --- a/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb +++ b/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb @@ -1,11 +1,16 @@ # frozen_string_literal: true -describe VirtualHearings::DeleteConferenceLinkJob do +describe VirtualHearings::DeleteConferenceLinkJob, :all_dbs do include ActiveJob::TestHelper let!(:current_user) { create(:user, roles: ["System Admin"]) } let!(:judge) { Judge.new(create(:user)) } + before do + allow_any_instance_of(VirtualHearings::LinkService).to receive(:pin_key).and_return("mysecretkey") + allow_any_instance_of(VirtualHearings::LinkService).to receive(:host).and_return("example.va.gov") + allow_any_instance_of(VirtualHearings::LinkService).to receive(:path).and_return("/sample") + end describe ".perform" do context "When conference links in the DB are past the date of the date the job is run" do From dc45867de68f7b8904febaaef7a059a3f97d580c Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Mon, 18 Sep 2023 22:44:15 -0400 Subject: [PATCH 153/445] Decouple service provider source identification from ConferenceableConcern and let the classes figure it out for themselves --- app/models/concerns/conferenceable_concern.rb | 27 ++++++++++--------- app/models/hearing.rb | 2 ++ app/models/hearings/virtual_hearing.rb | 2 ++ app/models/legacy_hearing.rb | 2 ++ 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/app/models/concerns/conferenceable_concern.rb b/app/models/concerns/conferenceable_concern.rb index c59aa79acc8..dcaa3883fcb 100644 --- a/app/models/concerns/conferenceable_concern.rb +++ b/app/models/concerns/conferenceable_concern.rb @@ -17,20 +17,23 @@ module ConferenceableConcern delegate :conference_provider, to: :meeting_type, allow_nil: true end - # Determines which associated entity this new item should inherit its conference - # provider from. - # - # Virtual hearings will inherit their conference providers from the hearing they've - # been created for. - # - # Other items will inherit from the conference provider assigned to the user who is - # creating them. + module ClassMethods + attr_reader :conference_provider_source + + def derives_conference_provider_from(source) + @@conference_provider_source ||= source # rubocop:disable Style/ClassVars + end + end + + # Determines which conferencing service to use based on the conference_provider_source + # class variable. # - # @return [String] the conference provider/service name to assign to the new object ("webex" or "pexip") + # @return [String] the conference provider/service name to assign to the new object ("webex" or "pexip") or nil def determine_service_name - return hearing&.conference_provider if is_a? VirtualHearing - - created_by&.conference_provider if respond_to? :created_by + if self.class.respond_to?(:conference_provider_source) && + self.class.conference_provider_source.is_a?(Symbol) + send(self.class.conference_provider_source)&.conference_provider + end end # Creates an associated MeetingType record for the newly created object. diff --git a/app/models/hearing.rb b/app/models/hearing.rb index 96cfe1abe1c..7b34e1f8932 100644 --- a/app/models/hearing.rb +++ b/app/models/hearing.rb @@ -56,6 +56,8 @@ class HearingDayFull < StandardError; end accepts_nested_attributes_for :hearing_location, reject_if: proc { |attributes| attributes.blank? } accepts_nested_attributes_for :email_recipients, reject_if: proc { |attributes| attributes.blank? } + derives_conference_provider_from :created_by + alias_attribute :location, :hearing_location UUID_REGEX = /^\h{8}-\h{4}-\h{4}-\h{4}-\h{12}$/.freeze diff --git a/app/models/hearings/virtual_hearing.rb b/app/models/hearings/virtual_hearing.rb index cc2a4e1a76d..843d575016b 100644 --- a/app/models/hearings/virtual_hearing.rb +++ b/app/models/hearings/virtual_hearing.rb @@ -55,6 +55,8 @@ def base_url alias_attribute :alias_name, :alias + derives_conference_provider_from :hearing + belongs_to :hearing, polymorphic: true belongs_to :created_by, class_name: "User" diff --git a/app/models/legacy_hearing.rb b/app/models/legacy_hearing.rb index 0ce7f44ca70..5461868c20d 100644 --- a/app/models/legacy_hearing.rb +++ b/app/models/legacy_hearing.rb @@ -79,6 +79,8 @@ class LegacyHearing < CaseflowRecord accepts_nested_attributes_for :hearing_location, reject_if: proc { |attributes| attributes.blank? } accepts_nested_attributes_for :email_recipients, reject_if: proc { |attributes| attributes.blank? } + derives_conference_provider_from :created_by + # this is used to cache appeal stream for hearings # when fetched intially. has_many :appeals, class_name: "LegacyAppeal", through: :appeal_stream_snapshots From 34468bdf1186fc12577a52f97e57902063093d96 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Mon, 18 Sep 2023 23:02:49 -0400 Subject: [PATCH 154/445] Revert "Decouple service provider source identification" This reverts commit dc45867de68f7b8904febaaef7a059a3f97d580c. --- app/models/concerns/conferenceable_concern.rb | 27 +++++++++---------- app/models/hearing.rb | 2 -- app/models/hearings/virtual_hearing.rb | 2 -- app/models/legacy_hearing.rb | 2 -- 4 files changed, 12 insertions(+), 21 deletions(-) diff --git a/app/models/concerns/conferenceable_concern.rb b/app/models/concerns/conferenceable_concern.rb index dcaa3883fcb..c59aa79acc8 100644 --- a/app/models/concerns/conferenceable_concern.rb +++ b/app/models/concerns/conferenceable_concern.rb @@ -17,23 +17,20 @@ module ConferenceableConcern delegate :conference_provider, to: :meeting_type, allow_nil: true end - module ClassMethods - attr_reader :conference_provider_source - - def derives_conference_provider_from(source) - @@conference_provider_source ||= source # rubocop:disable Style/ClassVars - end - end - - # Determines which conferencing service to use based on the conference_provider_source - # class variable. + # Determines which associated entity this new item should inherit its conference + # provider from. # - # @return [String] the conference provider/service name to assign to the new object ("webex" or "pexip") or nil + # Virtual hearings will inherit their conference providers from the hearing they've + # been created for. + # + # Other items will inherit from the conference provider assigned to the user who is + # creating them. + # + # @return [String] the conference provider/service name to assign to the new object ("webex" or "pexip") def determine_service_name - if self.class.respond_to?(:conference_provider_source) && - self.class.conference_provider_source.is_a?(Symbol) - send(self.class.conference_provider_source)&.conference_provider - end + return hearing&.conference_provider if is_a? VirtualHearing + + created_by&.conference_provider if respond_to? :created_by end # Creates an associated MeetingType record for the newly created object. diff --git a/app/models/hearing.rb b/app/models/hearing.rb index 7b34e1f8932..96cfe1abe1c 100644 --- a/app/models/hearing.rb +++ b/app/models/hearing.rb @@ -56,8 +56,6 @@ class HearingDayFull < StandardError; end accepts_nested_attributes_for :hearing_location, reject_if: proc { |attributes| attributes.blank? } accepts_nested_attributes_for :email_recipients, reject_if: proc { |attributes| attributes.blank? } - derives_conference_provider_from :created_by - alias_attribute :location, :hearing_location UUID_REGEX = /^\h{8}-\h{4}-\h{4}-\h{4}-\h{12}$/.freeze diff --git a/app/models/hearings/virtual_hearing.rb b/app/models/hearings/virtual_hearing.rb index 843d575016b..cc2a4e1a76d 100644 --- a/app/models/hearings/virtual_hearing.rb +++ b/app/models/hearings/virtual_hearing.rb @@ -55,8 +55,6 @@ def base_url alias_attribute :alias_name, :alias - derives_conference_provider_from :hearing - belongs_to :hearing, polymorphic: true belongs_to :created_by, class_name: "User" diff --git a/app/models/legacy_hearing.rb b/app/models/legacy_hearing.rb index 5461868c20d..0ce7f44ca70 100644 --- a/app/models/legacy_hearing.rb +++ b/app/models/legacy_hearing.rb @@ -79,8 +79,6 @@ class LegacyHearing < CaseflowRecord accepts_nested_attributes_for :hearing_location, reject_if: proc { |attributes| attributes.blank? } accepts_nested_attributes_for :email_recipients, reject_if: proc { |attributes| attributes.blank? } - derives_conference_provider_from :created_by - # this is used to cache appeal stream for hearings # when fetched intially. has_many :appeals, class_name: "LegacyAppeal", through: :appeal_stream_snapshots From f7cf58e56d468e4a50e4207d5584fe59aad5af38 Mon Sep 17 00:00:00 2001 From: 631862 Date: Tue, 19 Sep 2023 11:02:22 -0400 Subject: [PATCH 155/445] Changed meetingType to conferenceProvider after refactoring --- .../hearings/components/details/VirtualHearingFields.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/app/hearings/components/details/VirtualHearingFields.jsx b/client/app/hearings/components/details/VirtualHearingFields.jsx index fc6ee56db0b..a350bfa11c3 100644 --- a/client/app/hearings/components/details/VirtualHearingFields.jsx +++ b/client/app/hearings/components/details/VirtualHearingFields.jsx @@ -14,15 +14,15 @@ export const VirtualHearingFields = ( } const user = useContext(HearingsUserContext); - const meetingType = hearing.judge.meetingType; - const formattedMeetingType = meetingType.charAt(0).toUpperCase() + meetingType.slice(1); + const conferenceProvider = virtualHearing.conferenceProvider; + const formattedConferenceProvider = conferenceProvider.charAt(0).toUpperCase() + conferenceProvider.slice(1); return (
    - {formattedMeetingType} Conference + {formattedConferenceProvider} Conference
    Date: Tue, 19 Sep 2023 16:59:09 -0400 Subject: [PATCH 156/445] test in hearing day spec fixed. --- spec/models/hearing_day_spec.rb | 35 +++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/spec/models/hearing_day_spec.rb b/spec/models/hearing_day_spec.rb index c59522518b0..7ff63684714 100644 --- a/spec/models/hearing_day_spec.rb +++ b/spec/models/hearing_day_spec.rb @@ -547,7 +547,7 @@ def format_begins_at_from_db(time_string, scheduled_for) end end - context "hearing day conference link doesnt exist" do + context "hearing day in the past, conference link doesnt exist" do before do allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return "mysecretkey" allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return "example.va.gov" @@ -560,15 +560,42 @@ def format_begins_at_from_db(time_string, scheduled_for) :hearing_day, id: 1, request_type: HearingDay::REQUEST_TYPES[:central], - scheduled_for: Time.zone.local(2019, 5, 15).to_date, + scheduled_for: 1.year.ago, room: "1" ) end subject { hearing_day.conference_link } - it "Does not have a existing conference link so creates a new one" do - expect(subject.hearing_day_id).to eq(hearing_day.id) + it "Given that the hearing day does not have a existing conference + and is scheduled for the past, no conference link will be created and should return nil" do + expect(subject).to eq(nil) + end + end + + context "hearing day in the future, conference link doesnt exist" do + before do + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return "mysecretkey" + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return "example.va.gov" + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return "/sample" + end + + let(:hearing_day) do + RequestStore[:current_user] = User.create(css_id: "BVASCASPER1", station_id: 101) + create( + :hearing_day, + id: 1, + request_type: HearingDay::REQUEST_TYPES[:central], + scheduled_for: 1.year.from_now, + room: "1" + ) + end + + subject { hearing_day.conference_link } + + it "Given that the hearing day does not have a existing conference + and is scheduled for the future, a conference link will be created" do + expect(subject.hearing_day_id).to eq(1) end end end From 7932dfb2d5790795500d98b3da49740c069131d3 Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Tue, 19 Sep 2023 17:46:00 -0400 Subject: [PATCH 157/445] added functionality for a hearing_day to handle its own link removal. --- app/models/hearing_day.rb | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/app/models/hearing_day.rb b/app/models/hearing_day.rb index 444bde11b7e..5950230c0dd 100644 --- a/app/models/hearing_day.rb +++ b/app/models/hearing_day.rb @@ -225,10 +225,23 @@ def scheduled_date_passed? scheduled_for < Date.current end + def soft_link_removal + return unless conference_link + + if conference_link + conference_link.update!(update_conf_links) + conference_link.destroy + end + end + private - def cleanup_conference_links - VirtualHearings::DeleteConferenceLinkJob.new.perform + def update_conf_links + { + conference_deleted: true, + updated_by_id: RequestStore[:current_user] = User.system_user, + updated_at: Time.zone.now + } end def assign_created_by_user From 5e221fe7d9f6a0eab5d8dec162a7f49e847dc051 Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Tue, 19 Sep 2023 17:48:51 -0400 Subject: [PATCH 158/445] updated the callback. --- app/models/hearing_day.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/hearing_day.rb b/app/models/hearing_day.rb index 5950230c0dd..d3581f36d8f 100644 --- a/app/models/hearing_day.rb +++ b/app/models/hearing_day.rb @@ -52,7 +52,7 @@ class HearingDayHasChildrenRecords < StandardError; end before_create :assign_created_by_user after_update :update_children_records after_create :generate_link_on_create - before_destroy :cleanup_conference_links + before_destroy :soft_link_removal # Validates if the judge id maps to an actual record. validates :judge, presence: true, if: -> { judge_id.present? } From 6137b6377ee972fbdd6cbfaa90b32c122fd7f0d5 Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Tue, 19 Sep 2023 17:55:55 -0400 Subject: [PATCH 159/445] added macro to conf_link object. --- app/models/hearings/conference_link.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/hearings/conference_link.rb b/app/models/hearings/conference_link.rb index bdc0e1fcbab..8b307bd699c 100644 --- a/app/models/hearings/conference_link.rb +++ b/app/models/hearings/conference_link.rb @@ -3,7 +3,7 @@ class ConferenceLink < CaseflowRecord class NoAliasWithHostPresentError < StandardError; end class LinkMismatchError < StandardError; end - acts_as_paranoid + acts_as_paranoid column: :conference_deleted, sentinel_value: true include UpdatedByUserConcern include CreatedByUserConcern From 13dcbd6a62c9eb3c8394492188b0b3b8afee2320 Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Wed, 20 Sep 2023 10:30:29 -0400 Subject: [PATCH 160/445] DRY'd up some code. --- .../delete_conference_link_job.rb | 28 +------------------ app/models/hearing_day.rb | 18 ++---------- app/models/hearings/conference_link.rb | 27 +++++++++++++++++- 3 files changed, 30 insertions(+), 43 deletions(-) diff --git a/app/jobs/virtual_hearings/delete_conference_link_job.rb b/app/jobs/virtual_hearings/delete_conference_link_job.rb index a07da8cf0e5..702f7fe5409 100644 --- a/app/jobs/virtual_hearings/delete_conference_link_job.rb +++ b/app/jobs/virtual_hearings/delete_conference_link_job.rb @@ -10,8 +10,7 @@ class VirtualHearings::DeleteConferenceLinkJob < CaseflowJob def perform begin RequestStore[:current_user] = User.system_user - links_for_past_date = retreive_stale_conference_links - links_soft_removal(links_for_past_date) + retreive_stale_conference_links.each(&:soft_removal_of_link) rescue StandardError => error log_error(error) end @@ -27,29 +26,4 @@ def perform def retreive_stale_conference_links ConferenceLink.joins(:hearing_day).where("scheduled_for < ?", Date.today) end - - # Purpose: Iterates through a collection of links, updating each item and then soft_deleting. - # - # Params: An array of conference_links. - # - # Return: None - def links_soft_removal(collection) - collection.each do |old_link| - old_link.update!(update_conf_links) - old_link.destroy - end - end - - # Purpose: Updates conference_link attributes when passed into the 'update!' method. - # - # Params: None - # - # Return: Hash that will update the conference_link - def update_conf_links - { - conference_deleted: true, - updated_by_id: RequestStore[:current_user], - updated_at: Time.zone.now - } - end end diff --git a/app/models/hearing_day.rb b/app/models/hearing_day.rb index d3581f36d8f..ecbba8704fa 100644 --- a/app/models/hearing_day.rb +++ b/app/models/hearing_day.rb @@ -225,23 +225,11 @@ def scheduled_date_passed? scheduled_for < Date.current end - def soft_link_removal - return unless conference_link - - if conference_link - conference_link.update!(update_conf_links) - conference_link.destroy - end - end - private - def update_conf_links - { - conference_deleted: true, - updated_by_id: RequestStore[:current_user] = User.system_user, - updated_at: Time.zone.now - } + #called through the 'before_destroy' callback on the hearing_day object. + def soft_link_removal + conference_link&.soft_removal_of_link end def assign_created_by_user diff --git a/app/models/hearings/conference_link.rb b/app/models/hearings/conference_link.rb index 8b307bd699c..576b08d9f5a 100644 --- a/app/models/hearings/conference_link.rb +++ b/app/models/hearings/conference_link.rb @@ -3,7 +3,8 @@ class ConferenceLink < CaseflowRecord class NoAliasWithHostPresentError < StandardError; end class LinkMismatchError < StandardError; end - acts_as_paranoid column: :conference_deleted, sentinel_value: true + + acts_as_paranoid include UpdatedByUserConcern include CreatedByUserConcern @@ -60,6 +61,30 @@ def guest_link guest_hearing_link end + # Purpose: updates the conf_link and then soft_deletes them. + # + # Params: None + # + # Return: None + def soft_removal_of_link + update!(update_conf_links) + destroy + end + + + # Purpose: Updates conference_link attributes when passed into the 'update!' method. + # + # Params: None + # + # Return: Hash that will update the conference_link + def update_conf_links + { + conference_deleted: true, + updated_by_id: RequestStore[:current_user] = User.system_user, + updated_at: Time.zone.now + } + end + private def generate_links_and_pins From 10954496b4c7a863963659336d0f6b3ea2ec644b Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Wed, 20 Sep 2023 14:01:20 -0400 Subject: [PATCH 161/445] Spec fixes. --- app/models/hearing_day.rb | 2 +- app/models/hearings/conference_link.rb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/models/hearing_day.rb b/app/models/hearing_day.rb index ecbba8704fa..ca7e25b84c0 100644 --- a/app/models/hearing_day.rb +++ b/app/models/hearing_day.rb @@ -229,7 +229,7 @@ def scheduled_date_passed? #called through the 'before_destroy' callback on the hearing_day object. def soft_link_removal - conference_link&.soft_removal_of_link + ConferenceLink.where(hearing_day: self).each(&:soft_removal_of_link) end def assign_created_by_user diff --git a/app/models/hearings/conference_link.rb b/app/models/hearings/conference_link.rb index 576b08d9f5a..5a55a3dd752 100644 --- a/app/models/hearings/conference_link.rb +++ b/app/models/hearings/conference_link.rb @@ -71,7 +71,6 @@ def soft_removal_of_link destroy end - # Purpose: Updates conference_link attributes when passed into the 'update!' method. # # Params: None From a129a7f3c389a0602665ab532be28e9be7154f27 Mon Sep 17 00:00:00 2001 From: Jonathan Cohen Date: Wed, 20 Sep 2023 14:29:20 -0400 Subject: [PATCH 162/445] Linting fixes in dailydocketguestlinksection. --- .../components/dailyDocket/DailyDocketGuestLinkSection.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx b/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx index cefd62c0431..fc5897064c8 100644 --- a/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx +++ b/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx @@ -44,7 +44,8 @@ export const DailyDocketGuestLinkSection = ({ linkInfo }) => { * @param {roleAccess} - Boolean for if the current user has access to the guest link * @returns The room information */ - const renderRoomInfo = () => { return (linkInfo === null ? ( + const renderRoomInfo = () => { + return (linkInfo === null ? (

    {GUEST_LINK_LABELS.GUEST_CONFERENCE_ROOM}:N/A

    {GUEST_LINK_LABELS.GUEST_PIN}:N/A

    From 58d0323f0b0d78a156c1db22b5a70c7dbec18cfa Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Wed, 20 Sep 2023 15:18:33 -0400 Subject: [PATCH 163/445] Triggering tests --- app/models/concerns/updated_by_user_concern.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/models/concerns/updated_by_user_concern.rb b/app/models/concerns/updated_by_user_concern.rb index ffc28be9909..f063789fcd2 100644 --- a/app/models/concerns/updated_by_user_concern.rb +++ b/app/models/concerns/updated_by_user_concern.rb @@ -11,6 +11,8 @@ module UpdatedByUserConcern private + + def assign_updated_by_user return if RequestStore.store[:current_user] == User.system_user && updated_by.present? From c1756181d56a6952ce3cff8fb4ff4ed0f1669d72 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Wed, 20 Sep 2023 15:18:41 -0400 Subject: [PATCH 164/445] Triggering tests --- app/models/concerns/updated_by_user_concern.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/models/concerns/updated_by_user_concern.rb b/app/models/concerns/updated_by_user_concern.rb index f063789fcd2..ffc28be9909 100644 --- a/app/models/concerns/updated_by_user_concern.rb +++ b/app/models/concerns/updated_by_user_concern.rb @@ -11,8 +11,6 @@ module UpdatedByUserConcern private - - def assign_updated_by_user return if RequestStore.store[:current_user] == User.system_user && updated_by.present? From 055d7d42a262fbecafec8ffc643714a5e9962115 Mon Sep 17 00:00:00 2001 From: Prerna Devulapalli Date: Wed, 20 Sep 2023 16:32:37 -0400 Subject: [PATCH 165/445] Fixing js lint issues --- .../dailyDocket/DailyDocketGuestLinkSection.jsx | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx b/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx index fc5897064c8..39716725619 100644 --- a/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx +++ b/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx @@ -53,8 +53,18 @@ export const DailyDocketGuestLinkSection = ({ linkInfo }) => {
    ) : (
    -

    {GUEST_LINK_LABELS.GUEST_CONFERENCE_ROOM}:{alias || useAliasFromLink()}

    -

    {GUEST_LINK_LABELS.GUEST_PIN}:{usePinFromLink()}#

    +

    + {GUEST_LINK_LABELS.GUEST_CONFERENCE_ROOM}: + + {alias || useAliasFromLink()} + +

    +

    + {GUEST_LINK_LABELS.GUEST_PIN}: + + {usePinFromLink()}# + +

    )); From 2ae0933ba50101bda794d153b1c80c7864616836 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 21 Sep 2023 09:23:57 -0400 Subject: [PATCH 166/445] IC updates --- app/services/external_api/webex_service.rb | 19 +++- .../webex_service/create_response.rb | 2 +- lib/fakes/webex_service.rb | 87 +++++++++++-------- 3 files changed, 70 insertions(+), 38 deletions(-) diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb index e61ec7355f7..8980e1ca6ab 100644 --- a/app/services/external_api/webex_service.rb +++ b/app/services/external_api/webex_service.rb @@ -1,11 +1,28 @@ # frozen_string_literal: true -class ExternalApi::PexipService +class ExternalApi::WebexService def create_conference(*) fail NotImplementedError + + body = { + jwt: { + sub: "A unique identifier to refer to the conference with later", # Should incorporate the docket number + nbf: Time.zone.now.beginning_of_day.to_i, # Most likely will be the beginning scheduled hearing date + exp: Time.zone.now.end_of_day.to_i # Most likely will be the end scheduled hearing date + + }, + aud: "a4d886b0-979f-4e2c-a958-3e8c14605e51", + provideShortUrls: true + } end def delete_conference(*) fail NotImplementedError end + + private + + def error? + [].include? @status_code + end end diff --git a/app/services/external_api/webex_service/create_response.rb b/app/services/external_api/webex_service/create_response.rb index f77ac53d9d2..2eb7846ae4c 100644 --- a/app/services/external_api/webex_service/create_response.rb +++ b/app/services/external_api/webex_service/create_response.rb @@ -2,6 +2,6 @@ class ExternalApi::PexipService::CreateResponse < ExternalApi::PexipService::Response def data - # Hi data, I'm dad + fail NotImplementedError end end diff --git a/lib/fakes/webex_service.rb b/lib/fakes/webex_service.rb index 2c2e034cc45..3f50e547fab 100644 --- a/lib/fakes/webex_service.rb +++ b/lib/fakes/webex_service.rb @@ -1,51 +1,66 @@ # frozen_string_literal: true -require "json" -require "base64" -require "digest" - class Fakes::WebexService - include JwtGenerator + SAMPLE_CIPHER = "eyJwMnMiOiJvUlZHZENlck9OanYxWjhLeHRub3p4NklPUUNzTVdEdWFMakRXR09kLTh4Tk91OUVyWDQ1aUZ6TG5FY" \ + "nlJeTZTam40Vk1kVEZHU1pyaE5pRiIsInAyYyI6MzIzMzAsImF1ZCI6ImE0ZDg4NmIwLTk3OWYtNGUyYy1hOTU4LT" \ + "NlOGMxNDYwNWU1MSIsImlzcyI6IjU0OWRhYWNiLWJmZWUtNDkxOS1hNGU0LWMwOTQ0YTY0ZGUyNSIsImN0eSI6Ikp" \ + "XVCIsImVuYyI6IkEyNTZHQ00iLCJhbGciOiJQQkVTMi1IUzUxMitBMjU2S1cifQ.cm6FWc6Bl4vB_utAc_bswG82m" \ + "UXhxkITkI0tZDGzzh5TKdoWSS1Mjw.L8mGls6Kp3lsa8Wz.fLen-yV2sTpWlkLFCszQjcG5V9FhJVwoNB9Ky9BgCp" \ + "T46cFWUe-wmyn1yIZcGxFcDcwhhKwW3PVuQQ1xjl-z63o67esrvaWAjgglSioKiOFTJF1M94d4gVj2foSQtYKzR8S" \ + "nI6wW5X5KShcVjxjchT7xDNxnHtIZoG-Zda_aOOfz_WK18rhNcyvb-BY7cSwTMhbnuuXO0-cuJ7wNyDbvqEfWXALf" \ + "j87a2_WopcwK-x-8TQ20bzZKUrugt0FRj6VKxOCzxDhozmWDFMRu8Dpj2UrS7Fo-JQf_I1oN0O-Dwf5r8ItcNQEu5" \ + "X0tcRazhrHSNWfOL2DOaDyHawi4oxc7MqaNRxxyrpy2qYw06_TzBwRKlMFZ8fT7-GJbDlE3nqWlNw3mlRuvhu80CH" \ + "SO5RK5a1obU4sfLX0Fsxl-csC-1QjcHuKOSP_ozb6l7om-WeOdbSV99Fjy68egjH1NhMQIcVwpG0fy2j8r3sN4nz0" \ + "RSe3LXoK78JqRxk6XuaQCDkr6TmG5YjHQ2FFw1tP1ekHpNIL2oJNVAKKPgget7LRuSiM6jg.628e3hFPmZCoqXuyY" \ + "2OriQ" + + def initialize(**args) + @status_code = args[:status_code] + end def create_conference(*) - fail NotImplementedError + if error? + return ExternalApi::WebexService::CreateResponse.new( + HTTPI::Response.new(@status_code, {}, error: "Panic!") + ) + end + + ExternalApi::WebexService::CreateResponse.new( + HTTPI::Response.new( + 200, + {}, + host: link_info, + guest: link_info(args[:num_guests]), + baseUrl: "https://instant-usgov.webex.com/visit/" + ) + ) end def delete_conference(*) - fail NotImplementedError + if error? + return ExternalApi::WebexService::DeleteResponse.new(HTTPI::Response.new( + @status_code, {}, {} + )) + end + + ExternalApi::WebexService::DeleteResponse.new(HTTPI::Response.new(200, {}, {})) end private - # Purpose: Generate the JWT token - # - # Params: none - # - # Return: token needed for authentication - def generate_token - jwt_secret = "fakeSecret" - - header = { - typ: "JWT", - alg: TOKEN_ALG - }.to_json.encode("UTF-8") - - data = { - iss: SERVICE_ID, - iat: DateTime.now.strftime("%Q").to_i / 1000.floor - }.to_json.encode("UTF-8") - - token = "#{base64url(header)}.#{base64url(data)}" - signature = base64url(sOpenSSL::HMAC.digest("SHA256", jwt_secret, token)) + def link_info(num_links = 1) + Array.new(num_links).map do + { + cipher: SAMPLE_CIPHER, + short: Faker::Alphanumeric.alphanumeric(number: 7, min_alpha: 3, min_numeric: 1) + } + end + end - "#{token}.#{signature}" + def error? + [ + 400, 401, 403, 404, 405, 409, 410, + 500, 502, 503, 504 + ].include? @status_code end end - -#### -# { -# "jwt": { -# "sub": "Subject goes here." -# }, -# "aud": "a4d886b0-979f-4e2c-a958-3e8c14605e51" -# } From e0b38656d23adaf1f155bbcb284bb2d6bc25977d Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 21 Sep 2023 09:59:51 -0400 Subject: [PATCH 167/445] Errors for create route --- lib/fakes/webex_service.rb | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/lib/fakes/webex_service.rb b/lib/fakes/webex_service.rb index 3f50e547fab..4ad85da1022 100644 --- a/lib/fakes/webex_service.rb +++ b/lib/fakes/webex_service.rb @@ -16,12 +16,21 @@ class Fakes::WebexService def initialize(**args) @status_code = args[:status_code] + @error_message = args[:error_message] || "Error" end def create_conference(*) if error? return ExternalApi::WebexService::CreateResponse.new( - HTTPI::Response.new(@status_code, {}, error: "Panic!") + HTTPI::Response.new( + @status_code, + {}, + message: @error_message, + errors: [ + description: @error_message + ], + trackingId: "ROUTER_#{SecureRandom.uuid}" + ) ) end @@ -38,9 +47,11 @@ def create_conference(*) def delete_conference(*) if error? - return ExternalApi::WebexService::DeleteResponse.new(HTTPI::Response.new( - @status_code, {}, {} - )) + return ExternalApi::WebexService::DeleteResponse.new( + HTTPI::Response.new( + @status_code, {}, {} + ) + ) end ExternalApi::WebexService::DeleteResponse.new(HTTPI::Response.new(200, {}, {})) From aeb5fdd3da24fc16493fbe19cdcecd1b9b4fc59f Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 21 Sep 2023 10:01:00 -0400 Subject: [PATCH 168/445] Extract error_message --- lib/fakes/webex_service.rb | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/fakes/webex_service.rb b/lib/fakes/webex_service.rb index 4ad85da1022..5620e421855 100644 --- a/lib/fakes/webex_service.rb +++ b/lib/fakes/webex_service.rb @@ -25,11 +25,7 @@ def create_conference(*) HTTPI::Response.new( @status_code, {}, - message: @error_message, - errors: [ - description: @error_message - ], - trackingId: "ROUTER_#{SecureRandom.uuid}" + error_response ) ) end @@ -74,4 +70,14 @@ def error? 500, 502, 503, 504 ].include? @status_code end + + def error_response + { + message: @error_message, + errors: [ + description: @error_message + ], + trackingId: "ROUTER_#{SecureRandom.uuid}" + } + end end From 87035d6f296eebb4a1bed9a0e9c9476172223f37 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 21 Sep 2023 23:20:24 -0400 Subject: [PATCH 169/445] Add Meetings API impl --- lib/fakes/webex_service.rb | 134 +++++++++++++++++++++++++++++++++---- 1 file changed, 122 insertions(+), 12 deletions(-) diff --git a/lib/fakes/webex_service.rb b/lib/fakes/webex_service.rb index 5620e421855..955354548cd 100644 --- a/lib/fakes/webex_service.rb +++ b/lib/fakes/webex_service.rb @@ -14,9 +14,73 @@ class Fakes::WebexService "RSe3LXoK78JqRxk6XuaQCDkr6TmG5YjHQ2FFw1tP1ekHpNIL2oJNVAKKPgget7LRuSiM6jg.628e3hFPmZCoqXuyY" \ "2OriQ" + DEFAULT_MEETING_PROPERTIES = { + hostUserId: Faker::Alphanumeric.alphanumeric(number: 79), + hostDisplayName: "BVA Caseflow", + hostEmail: "testaccount@admindomain.com", + hostKey: "123456", + siteUrl: "test.webex.com", + webLink: "https://test.webex.com/not-real/j.php?MTID=m#{Faker::Alphanumeric.alphanumeric(number: 32).downcase}", + sipAddress: "12345678910@test.webex.com", + dialInIpAddress: "", + enabledAutoRecordMeeting: false, + allowAnyUserToBeCoHost: false, + allowFirstUserToBeCoHost: false, + allowAuthenticatedDevices: true, + enabledJoinBeforeHost: false, + joinBeforeHostMinutes: 0, + enableConnectAudioBeforeHost: false, + excludePassword: false, + publicMeeting: false, + enableAutomaticLock: false, + meetingType: "meetingSeries", + state: "active", + unlockedMeetingJoinSecurity: "allowJoinWithLobby", + meetingOptions: { + enabledChat: true, + enabledVideo: true, + enabledNote: true, + noteType: "allowAll", + enabledFileTransfer: true, + enabledUCFRichMedia: true + }, + attendeePrivileges: { + enabledShareContent: true, + enabledSaveDocument: false, + enabledPrintDocument: false, + enabledAnnotate: false, + enabledViewParticipantList: true, + enabledViewThumbnails: false, + enabledRemoteControl: true, + enabledViewAnyDocument: false, + enabledViewAnyPage: false, + enabledContactOperatorPrivately: false, + enabledChatHost: true, + enabledChatPresenter: true, + enabledChatOtherParticipants: true + }, + sessionTypeId: 3, + scheduledType: "meeting", + simultaneousInterpretation: { + enabled: false + }, + enabledBreakoutSessions: false, + audioConnectionOptions: { + audioConnectionType: "webexAudio", + enabledTollFreeCallIn: false, + enabledGlobalCallIn: true, + enabledAudienceCallBack: false, + entryAndExitTone: "beep", + allowHostToUnmuteParticipants: false, + allowAttendeeToUnmuteSelf: true, + muteAttendeeUponEntry: true + } + }.freeze + def initialize(**args) @status_code = args[:status_code] @error_message = args[:error_message] || "Error" + @instant_connect = arg[:use_instant_connect] end def create_conference(*) @@ -34,9 +98,7 @@ def create_conference(*) HTTPI::Response.new( 200, {}, - host: link_info, - guest: link_info(args[:num_guests]), - baseUrl: "https://instant-usgov.webex.com/visit/" + @instant_connect ? generate_instant_connect_conference : generate_meetings_api_conference ) ) end @@ -55,15 +117,6 @@ def delete_conference(*) private - def link_info(num_links = 1) - Array.new(num_links).map do - { - cipher: SAMPLE_CIPHER, - short: Faker::Alphanumeric.alphanumeric(number: 7, min_alpha: 3, min_numeric: 1) - } - end - end - def error? [ 400, 401, 403, 404, 405, 409, 410, @@ -80,4 +133,61 @@ def error_response trackingId: "ROUTER_#{SecureRandom.uuid}" } end + + def link_info(num_links = 1) + Array.new(num_links).map do + { + cipher: SAMPLE_CIPHER, + short: Faker::Alphanumeric.alphanumeric(number: 7, min_alpha: 3, min_numeric: 1) + } + end + end + + def generate_instant_connect_conference + { + host: link_info, + guest: link_info(args[:num_guests]), + baseUrl: "https://instant-usgov.webex.com/visit/" + } + end + + def telephony_options(conf_id, meeting_num) + { + telephony: { + accessCode: meeting_num, + callInNumbers: [ + { + label: "United States Toll", + callInNumber: Faker::PhoneNumber.phone_number, + tollType: "toll" + } + ], + links: [ + { + rel: "globalCallinNumbers", + href: "/v1/meetings/#{conf_id}/globalCallinNumbers", + method: "GET" + } + ] + } + } + end + + def generate_meetings_api_conference + conf_id = Faker::Alphanumeric.alphanumeric(number: 32).downcase + meeting_num = Faker::Number.number(digits: 11) + + { + id: conf_id, + meetingNumber: meeting_num, + title: "Example Conference", # Contains docket number of appeal, appeal id, appeal type (A/L), and hearing id + agenda: "Example Agenda", # Not sure yet + password: Faker::Alphanumeric.alphanumeric(number: 11, min_alpha: 3, min_numeric: 3), + phoneAndVideoSystemPassword: Faker::Number.number(digits: 8), + start: 30.days.from_now.iso8601, # Start of day hearing is scheduled_for + end: 31.days.from_now.iso8601, # End of day hearing is scheduled_for + timezone: "America/New_York" # Get from hearing + }.merge(telephony_options(conf_id, meeting_num)) + .merge(DEFAULT_CONFERENCE_OPTIONS) + end end From c680bfc123476389f2c02a0caa8a85e43070ce06 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 21 Sep 2023 23:31:14 -0400 Subject: [PATCH 170/445] Remove body from legit service --- app/services/external_api/webex_service.rb | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb index 8980e1ca6ab..0ba76beb7c6 100644 --- a/app/services/external_api/webex_service.rb +++ b/app/services/external_api/webex_service.rb @@ -3,17 +3,6 @@ class ExternalApi::WebexService def create_conference(*) fail NotImplementedError - - body = { - jwt: { - sub: "A unique identifier to refer to the conference with later", # Should incorporate the docket number - nbf: Time.zone.now.beginning_of_day.to_i, # Most likely will be the beginning scheduled hearing date - exp: Time.zone.now.end_of_day.to_i # Most likely will be the end scheduled hearing date - - }, - aud: "a4d886b0-979f-4e2c-a958-3e8c14605e51", - provideShortUrls: true - } end def delete_conference(*) From 68f1cb7b1adcaae8000f4d0f2b9166466a9a2db0 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 21 Sep 2023 23:35:02 -0400 Subject: [PATCH 171/445] Remove error method --- app/services/external_api/webex_service.rb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb index 0ba76beb7c6..2dcdefc4947 100644 --- a/app/services/external_api/webex_service.rb +++ b/app/services/external_api/webex_service.rb @@ -8,10 +8,4 @@ def create_conference(*) def delete_conference(*) fail NotImplementedError end - - private - - def error? - [].include? @status_code - end end From 2827c3fd416c5b7b369d5c3620e7de9c07543b3e Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 22 Sep 2023 10:05:25 -0400 Subject: [PATCH 172/445] Fix response class --- .../external_api/webex_service/response.rb | 44 ++++++++++++------- lib/caseflow/error.rb | 4 +- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/app/services/external_api/webex_service/response.rb b/app/services/external_api/webex_service/response.rb index 03567ed96a5..560604a6d38 100644 --- a/app/services/external_api/webex_service/response.rb +++ b/app/services/external_api/webex_service/response.rb @@ -1,17 +1,24 @@ # frozen_string_literal: true -class ExternalApi::PexipService::Response +class ExternalApi::WebexService::Response attr_reader :resp, :code + DEFAULT_ERROR_BODY = { + message: "Either an error message was not provided or one could not be located.", + descriptions: [] + }.freeze + def initialize(resp) @resp = resp @code = @resp.code end - def data; end + def data + fail NotImplementedError + end def error - check_for_error + check_for_errors end def success? @@ -20,23 +27,30 @@ def success? private - def check_for_error + def check_for_errors return if success? - # What error codes can we get? - msg = error_message + parsed_messages = parse_error_message - case code - in (400..499) then "400" - in (500..599) then "500" - else - "Something else" - end + Caseflow::Error::WebexApiError.new( + code: code, + message: parsed_messages.dig(:message), + descriptions: parsed_messages.dig(:descriptions) + ) end - def error_message - return "No error message from Webex" if resp.raw_body.empty? + def parse_error_message + return DEFAULT_ERROR_BODY if resp.raw_body.empty? - "TODO: I need to figure out how Webex IC will present its errors to us" + begin + body = JSON.parse(resp.raw_body) + + { + message: body.dig(:message), + descriptions: body.dig(:errors)&.pluck(:description)&.compact + } + rescue JSON::ParserError + DEFAULT_ERROR_BODY + end end end diff --git a/lib/caseflow/error.rb b/lib/caseflow/error.rb index b3639ca815d..eff1635343d 100644 --- a/lib/caseflow/error.rb +++ b/lib/caseflow/error.rb @@ -419,7 +419,9 @@ class PexipNotFoundError < PexipApiError; end class PexipBadRequestError < PexipApiError; end class PexipMethodNotAllowedError < PexipApiError; end - class WebexApiError < ConferenceCreationError; end + class WebexApiError < ConferenceCreationError + attr_accessor :descriptions + end class WorkModeCouldNotUpdateError < StandardError; end From f5cf6a8ebb27437f4e9dcd47068aa6e18453f1b0 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 22 Sep 2023 10:32:00 -0400 Subject: [PATCH 173/445] Update create response --- .../external_api/webex_service/create_response.rb | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/app/services/external_api/webex_service/create_response.rb b/app/services/external_api/webex_service/create_response.rb index 2eb7846ae4c..ee52d138c8c 100644 --- a/app/services/external_api/webex_service/create_response.rb +++ b/app/services/external_api/webex_service/create_response.rb @@ -1,7 +1,17 @@ # frozen_string_literal: true -class ExternalApi::PexipService::CreateResponse < ExternalApi::PexipService::Response +class ExternalApi::WebexService::CreateResponse < ExternalApi::WebexService::Response def data - fail NotImplementedError + begin + JSON.parse(resp.raw_body) + rescue JSON::ParserError => error + Rails.logger.error(error) + Raven.capture_exception(error) + + ConferenceCreationError.new( + code: 500, + message: "Response received from Webex could not be parsed." + ).serialize_response + end end end From 7eeb8fca52cac89a21ad27c84e6a287c106603ff Mon Sep 17 00:00:00 2001 From: Janet Lu <93942793+j-n-t-l@users.noreply.github.com> Date: Fri, 22 Sep 2023 13:00:56 -0400 Subject: [PATCH 174/445] Janet/APPEALS-25146 For each Daily Docket row add an attribute representing which conference scheduler type created the entry (Pexip scheduler or Webex Scheduler) (#19324) * APPEALS-25146 merge chagnes * APPEALS-25146 fixed organizationusers.jsx * APPEALS-25146 added div to specify hearing * APPEALS-25146 added meeting_type attribute to hearing serializers * APPEALS-25146 added meeting_type logic to hearing serializer * APPEALS-25146 added meeting type to virtual hearing links * APPEALS-25146 changed styling for virtual hearing links * APPEALS-25146 reverted changes to virtual hearing links * APPEALS-25146 fixed spacing so line is shorter * APPEALS-25146 added meetingtype to snapshot test * APPEALS-25146 removed user limit on meeting type view and included safeguard * APPEALS-25146 set pexip as default meeting type * APPEALS-25146 updated snapshot tests * APPEALS-25146 changed meeting_type attribute to conference_type in serializers * APPEALS-25146 updated props in dailydocketrow and jest test * Snapshot update --------- Co-authored-by: Matthew Thornton <99351305+ThorntonMatthew@users.noreply.github.com> Co-authored-by: Matthew Thornton --- .../hearings/hearing_serializer.rb | 1 + .../hearings/legacy_hearing_serializer.rb | 1 + .../components/dailyDocket/DailyDocketRow.jsx | 4 ++ .../__snapshots__/DailyDocketRow.test.js.snap | 42 +++++++++++++++++++ .../hearings/dailyDocket/dailyDocketProps.js | 7 ++++ 5 files changed, 55 insertions(+) diff --git a/app/serializers/hearings/hearing_serializer.rb b/app/serializers/hearings/hearing_serializer.rb index 11c6bdedac2..dd794109f17 100644 --- a/app/serializers/hearings/hearing_serializer.rb +++ b/app/serializers/hearings/hearing_serializer.rb @@ -46,6 +46,7 @@ class HearingSerializer attribute :contested_claim do |hearing| hearing.appeal.contested_claim? end + attribute :conference_provider attribute :current_issue_count attribute :disposition attribute :disposition_editable diff --git a/app/serializers/hearings/legacy_hearing_serializer.rb b/app/serializers/hearings/legacy_hearing_serializer.rb index 339bca6f189..1dd8a19aa38 100644 --- a/app/serializers/hearings/legacy_hearing_serializer.rb +++ b/app/serializers/hearings/legacy_hearing_serializer.rb @@ -39,6 +39,7 @@ class LegacyHearingSerializer attribute :contested_claim do |hearing| hearing.appeal.contested_claim end + attribute :conference_provider attribute :current_issue_count attribute :disposition attribute :disposition_editable diff --git a/client/app/hearings/components/dailyDocket/DailyDocketRow.jsx b/client/app/hearings/components/dailyDocket/DailyDocketRow.jsx index fe49f91449e..2867aa08051 100644 --- a/client/app/hearings/components/dailyDocket/DailyDocketRow.jsx +++ b/client/app/hearings/components/dailyDocket/DailyDocketRow.jsx @@ -5,6 +5,7 @@ import { css } from 'glamor'; import PropTypes from 'prop-types'; import React from 'react'; import { isUndefined, isNil, isEmpty, omitBy, get } from 'lodash'; +import StringUtil from 'app/util/StringUtil'; import HEARING_DISPOSITION_TYPES from '../../../../constants/HEARING_DISPOSITION_TYPES'; @@ -380,6 +381,9 @@ class DailyDocketRow extends React.Component { type="button" disabled={this.props.conferenceLinkError} onClick={this.conferenceLinkOnClick} > Connect to Recording System } + {
    + {StringUtil.capitalizeFirst(hearing?.conferenceProvider || 'Pexip')} hearing +
    } +
    + + Pexip + hearing + +
    +
    + + Webex + hearing + +
    +
    + + Pexip + hearing + +
    +
    + + Pexip + hearing + +
    +
    + + Webex + hearing + +
    +
    + + Webex + hearing + +
    +
    + + Pexip + hearing + +
    Date: Fri, 22 Sep 2023 13:27:14 -0400 Subject: [PATCH 175/445] Update webex_service --- .../virtual_hearings/create_conference_job.rb | 6 +--- app/services/external_api/pexip_service.rb | 6 +++- lib/fakes/webex_service.rb | 30 +++++++++++++------ 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/app/jobs/virtual_hearings/create_conference_job.rb b/app/jobs/virtual_hearings/create_conference_job.rb index a16e0f1674e..d6a30e3aa1f 100644 --- a/app/jobs/virtual_hearings/create_conference_job.rb +++ b/app/jobs/virtual_hearings/create_conference_job.rb @@ -177,11 +177,7 @@ def error_display(response) end def create_new_conference - client.create_conference( - host_pin: virtual_hearing.host_pin, - guest_pin: virtual_hearing.guest_pin, - name: virtual_hearing.alias - ) + client.create_conferencep(virtual_hearing) end def should_initialize_alias_and_pins? diff --git a/app/services/external_api/pexip_service.rb b/app/services/external_api/pexip_service.rb index 6cb26d61704..4dd48ab0f40 100644 --- a/app/services/external_api/pexip_service.rb +++ b/app/services/external_api/pexip_service.rb @@ -13,7 +13,11 @@ def initialize(host:, port: 443, user_name:, password:, client_host:) @client_host = client_host end - def create_conference(host_pin:, guest_pin:, name:) + def create_conference(virtual_hearing) + host_pin = virtual_hearing.host_pin + guest_pin = virtual_hearing.guest_pin + name = virtual_hearing.alias + body = { "aliases": [{ "alias": "BVA#{name}" }, { "alias": VirtualHearing.formatted_alias(name) }, { "alias": name }], "allow_guests": true, diff --git a/lib/fakes/webex_service.rb b/lib/fakes/webex_service.rb index 955354548cd..b7a38f8b18c 100644 --- a/lib/fakes/webex_service.rb +++ b/lib/fakes/webex_service.rb @@ -83,7 +83,7 @@ def initialize(**args) @instant_connect = arg[:use_instant_connect] end - def create_conference(*) + def create_conference(virtual_hearing) if error? return ExternalApi::WebexService::CreateResponse.new( HTTPI::Response.new( @@ -94,11 +94,17 @@ def create_conference(*) ) end + + ExternalApi::WebexService::CreateResponse.new( HTTPI::Response.new( 200, {}, - @instant_connect ? generate_instant_connect_conference : generate_meetings_api_conference + if @instant_connect + generate_instant_connect_conference(virtual_hearing) + else + generate_meetings_api_conference(virtual_hearing) + end ) ) end @@ -143,7 +149,7 @@ def link_info(num_links = 1) end end - def generate_instant_connect_conference + def generate_instant_connect_conference(virtual_hearing) { host: link_info, guest: link_info(args[:num_guests]), @@ -173,20 +179,26 @@ def telephony_options(conf_id, meeting_num) } end - def generate_meetings_api_conference + # Contains docket number of appeal, appeal id, appeal type (A/L), and hearing id + def conference_title(virtual_hearing) + appeal = virtual_hearing.hearing.appeal + + "#{appeal.docket_number}_#{appeal.id}_#{appeal.class}" + end + + def generate_meetings_api_conference(virtual_hearing) conf_id = Faker::Alphanumeric.alphanumeric(number: 32).downcase meeting_num = Faker::Number.number(digits: 11) { id: conf_id, meetingNumber: meeting_num, - title: "Example Conference", # Contains docket number of appeal, appeal id, appeal type (A/L), and hearing id - agenda: "Example Agenda", # Not sure yet + title: conference_title(virtual_hearing), password: Faker::Alphanumeric.alphanumeric(number: 11, min_alpha: 3, min_numeric: 3), phoneAndVideoSystemPassword: Faker::Number.number(digits: 8), - start: 30.days.from_now.iso8601, # Start of day hearing is scheduled_for - end: 31.days.from_now.iso8601, # End of day hearing is scheduled_for - timezone: "America/New_York" # Get from hearing + start: virtual_hearing.hearing.scheduled_for.beginning_of_day.iso8601, + end: virtual_hearing.hearing.scheduled_for.end_of_day.iso8601, + timezone: virtual_hearing.hering.scheduled_for.time_zone.name }.merge(telephony_options(conf_id, meeting_num)) .merge(DEFAULT_CONFERENCE_OPTIONS) end From 84d31e341455b12bd84576676ffb5d4755480445 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 22 Sep 2023 14:01:17 -0400 Subject: [PATCH 176/445] Fix typo --- app/jobs/virtual_hearings/create_conference_job.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jobs/virtual_hearings/create_conference_job.rb b/app/jobs/virtual_hearings/create_conference_job.rb index d6a30e3aa1f..1dc5be74ce5 100644 --- a/app/jobs/virtual_hearings/create_conference_job.rb +++ b/app/jobs/virtual_hearings/create_conference_job.rb @@ -177,7 +177,7 @@ def error_display(response) end def create_new_conference - client.create_conferencep(virtual_hearing) + client.create_conference(virtual_hearing) end def should_initialize_alias_and_pins? From 64216563a2cb40028c1534ca6aace13c42ace783 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 22 Sep 2023 19:01:52 -0400 Subject: [PATCH 177/445] Typo fix --- lib/fakes/webex_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fakes/webex_service.rb b/lib/fakes/webex_service.rb index b7a38f8b18c..ef590166486 100644 --- a/lib/fakes/webex_service.rb +++ b/lib/fakes/webex_service.rb @@ -80,7 +80,7 @@ class Fakes::WebexService def initialize(**args) @status_code = args[:status_code] @error_message = args[:error_message] || "Error" - @instant_connect = arg[:use_instant_connect] + @instant_connect = args[:use_instant_connect] end def create_conference(virtual_hearing) From 66c6668820a2f11eed111dc260e79591011046a9 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 22 Sep 2023 19:03:39 -0400 Subject: [PATCH 178/445] Fix another typo --- lib/fakes/webex_service.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/fakes/webex_service.rb b/lib/fakes/webex_service.rb index ef590166486..4dfebcbf33b 100644 --- a/lib/fakes/webex_service.rb +++ b/lib/fakes/webex_service.rb @@ -94,8 +94,6 @@ def create_conference(virtual_hearing) ) end - - ExternalApi::WebexService::CreateResponse.new( HTTPI::Response.new( 200, @@ -198,7 +196,7 @@ def generate_meetings_api_conference(virtual_hearing) phoneAndVideoSystemPassword: Faker::Number.number(digits: 8), start: virtual_hearing.hearing.scheduled_for.beginning_of_day.iso8601, end: virtual_hearing.hearing.scheduled_for.end_of_day.iso8601, - timezone: virtual_hearing.hering.scheduled_for.time_zone.name + timezone: virtual_hearing.hearing.scheduled_for.time_zone.name }.merge(telephony_options(conf_id, meeting_num)) .merge(DEFAULT_CONFERENCE_OPTIONS) end From ed6eb37a6569ba9bec25671e08170a491b06541f Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 22 Sep 2023 19:07:09 -0400 Subject: [PATCH 179/445] Fix constant name --- lib/fakes/webex_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fakes/webex_service.rb b/lib/fakes/webex_service.rb index 4dfebcbf33b..8400bd6c63c 100644 --- a/lib/fakes/webex_service.rb +++ b/lib/fakes/webex_service.rb @@ -198,6 +198,6 @@ def generate_meetings_api_conference(virtual_hearing) end: virtual_hearing.hearing.scheduled_for.end_of_day.iso8601, timezone: virtual_hearing.hearing.scheduled_for.time_zone.name }.merge(telephony_options(conf_id, meeting_num)) - .merge(DEFAULT_CONFERENCE_OPTIONS) + .merge(DEFAULT_MEETING_PROPERTIES) end end From c93bd8dc21b6394f2cc62776d77bc71b30b11e06 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 22 Sep 2023 19:16:37 -0400 Subject: [PATCH 180/445] Fix data --- .../external_api/webex_service/create_response.rb | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/app/services/external_api/webex_service/create_response.rb b/app/services/external_api/webex_service/create_response.rb index ee52d138c8c..0e77fbac355 100644 --- a/app/services/external_api/webex_service/create_response.rb +++ b/app/services/external_api/webex_service/create_response.rb @@ -2,16 +2,6 @@ class ExternalApi::WebexService::CreateResponse < ExternalApi::WebexService::Response def data - begin - JSON.parse(resp.raw_body) - rescue JSON::ParserError => error - Rails.logger.error(error) - Raven.capture_exception(error) - - ConferenceCreationError.new( - code: 500, - message: "Response received from Webex could not be parsed." - ).serialize_response - end + resp.raw_body end end From 8233e5d25bda5419191c8319f1e64df37d607709 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 22 Sep 2023 20:58:42 -0400 Subject: [PATCH 181/445] Remove IC --- lib/fakes/webex_service.rb | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/lib/fakes/webex_service.rb b/lib/fakes/webex_service.rb index 8400bd6c63c..691ad0e1254 100644 --- a/lib/fakes/webex_service.rb +++ b/lib/fakes/webex_service.rb @@ -1,19 +1,6 @@ # frozen_string_literal: true class Fakes::WebexService - SAMPLE_CIPHER = "eyJwMnMiOiJvUlZHZENlck9OanYxWjhLeHRub3p4NklPUUNzTVdEdWFMakRXR09kLTh4Tk91OUVyWDQ1aUZ6TG5FY" \ - "nlJeTZTam40Vk1kVEZHU1pyaE5pRiIsInAyYyI6MzIzMzAsImF1ZCI6ImE0ZDg4NmIwLTk3OWYtNGUyYy1hOTU4LT" \ - "NlOGMxNDYwNWU1MSIsImlzcyI6IjU0OWRhYWNiLWJmZWUtNDkxOS1hNGU0LWMwOTQ0YTY0ZGUyNSIsImN0eSI6Ikp" \ - "XVCIsImVuYyI6IkEyNTZHQ00iLCJhbGciOiJQQkVTMi1IUzUxMitBMjU2S1cifQ.cm6FWc6Bl4vB_utAc_bswG82m" \ - "UXhxkITkI0tZDGzzh5TKdoWSS1Mjw.L8mGls6Kp3lsa8Wz.fLen-yV2sTpWlkLFCszQjcG5V9FhJVwoNB9Ky9BgCp" \ - "T46cFWUe-wmyn1yIZcGxFcDcwhhKwW3PVuQQ1xjl-z63o67esrvaWAjgglSioKiOFTJF1M94d4gVj2foSQtYKzR8S" \ - "nI6wW5X5KShcVjxjchT7xDNxnHtIZoG-Zda_aOOfz_WK18rhNcyvb-BY7cSwTMhbnuuXO0-cuJ7wNyDbvqEfWXALf" \ - "j87a2_WopcwK-x-8TQ20bzZKUrugt0FRj6VKxOCzxDhozmWDFMRu8Dpj2UrS7Fo-JQf_I1oN0O-Dwf5r8ItcNQEu5" \ - "X0tcRazhrHSNWfOL2DOaDyHawi4oxc7MqaNRxxyrpy2qYw06_TzBwRKlMFZ8fT7-GJbDlE3nqWlNw3mlRuvhu80CH" \ - "SO5RK5a1obU4sfLX0Fsxl-csC-1QjcHuKOSP_ozb6l7om-WeOdbSV99Fjy68egjH1NhMQIcVwpG0fy2j8r3sN4nz0" \ - "RSe3LXoK78JqRxk6XuaQCDkr6TmG5YjHQ2FFw1tP1ekHpNIL2oJNVAKKPgget7LRuSiM6jg.628e3hFPmZCoqXuyY" \ - "2OriQ" - DEFAULT_MEETING_PROPERTIES = { hostUserId: Faker::Alphanumeric.alphanumeric(number: 79), hostDisplayName: "BVA Caseflow", @@ -80,7 +67,6 @@ class Fakes::WebexService def initialize(**args) @status_code = args[:status_code] @error_message = args[:error_message] || "Error" - @instant_connect = args[:use_instant_connect] end def create_conference(virtual_hearing) @@ -98,11 +84,7 @@ def create_conference(virtual_hearing) HTTPI::Response.new( 200, {}, - if @instant_connect - generate_instant_connect_conference(virtual_hearing) - else - generate_meetings_api_conference(virtual_hearing) - end + generate_meetings_api_conference(virtual_hearing) ) ) end @@ -138,23 +120,6 @@ def error_response } end - def link_info(num_links = 1) - Array.new(num_links).map do - { - cipher: SAMPLE_CIPHER, - short: Faker::Alphanumeric.alphanumeric(number: 7, min_alpha: 3, min_numeric: 1) - } - end - end - - def generate_instant_connect_conference(virtual_hearing) - { - host: link_info, - guest: link_info(args[:num_guests]), - baseUrl: "https://instant-usgov.webex.com/visit/" - } - end - def telephony_options(conf_id, meeting_num) { telephony: { From d7feae0f5000372a25f290b271b1c1708cb3f4aa Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 22 Sep 2023 21:39:39 -0400 Subject: [PATCH 182/445] Add support for both virtual hearings and hearing days --- lib/fakes/webex_service.rb | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/lib/fakes/webex_service.rb b/lib/fakes/webex_service.rb index 691ad0e1254..cd2604b5014 100644 --- a/lib/fakes/webex_service.rb +++ b/lib/fakes/webex_service.rb @@ -149,20 +149,44 @@ def conference_title(virtual_hearing) "#{appeal.docket_number}_#{appeal.id}_#{appeal.class}" end - def generate_meetings_api_conference(virtual_hearing) + def meeting_details_based_on_type(conferenced_item) + return meeting_details_for_hearing_day(conferenced_item) if conferenced_item.is_a?(HearingDay) + + return meeting_details_for_virtual_hearing(conferenced_item) if conferenced_item.is_a?(VirtualHearing) + + fail ArgumentError.new("Argument type passed in is not recognized: #{conferenced_item.class}") + end + + def meeting_details_for_hearing_day(hearing_day) + { + title: "Guest Link for #{hearing_day.scheduled_for}", + start: hearing_day.scheduled_for.beginning_of_day.iso8601, + end: hearing_day.scheduled_for.end_of_day.iso8601, + timezone: "America/New_York" + } + end + + def meeting_details_for_virtual_hearing(virtual_hearing) + { + title: conference_title(virtual_hearing), + start: virtual_hearing.hearing.scheduled_for.beginning_of_day.iso8601, + end: virtual_hearing.hearing.scheduled_for.end_of_day.iso8601, + timezone: virtual_hearing.hearing.scheduled_for.time_zone.name + } + end + + def generate_meetings_api_conference(conferenced_item) conf_id = Faker::Alphanumeric.alphanumeric(number: 32).downcase meeting_num = Faker::Number.number(digits: 11) { id: conf_id, meetingNumber: meeting_num, - title: conference_title(virtual_hearing), password: Faker::Alphanumeric.alphanumeric(number: 11, min_alpha: 3, min_numeric: 3), phoneAndVideoSystemPassword: Faker::Number.number(digits: 8), - start: virtual_hearing.hearing.scheduled_for.beginning_of_day.iso8601, - end: virtual_hearing.hearing.scheduled_for.end_of_day.iso8601, - timezone: virtual_hearing.hearing.scheduled_for.time_zone.name + }.merge(telephony_options(conf_id, meeting_num)) .merge(DEFAULT_MEETING_PROPERTIES) + .merge(meeting_details_based_on_type(conferenced_item)) end end From cd5a43cba583714f62f57f9da2104583920efffe Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 22 Sep 2023 21:40:42 -0400 Subject: [PATCH 183/445] Lint fix --- lib/fakes/webex_service.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/fakes/webex_service.rb b/lib/fakes/webex_service.rb index cd2604b5014..38276a7d02d 100644 --- a/lib/fakes/webex_service.rb +++ b/lib/fakes/webex_service.rb @@ -154,7 +154,7 @@ def meeting_details_based_on_type(conferenced_item) return meeting_details_for_virtual_hearing(conferenced_item) if conferenced_item.is_a?(VirtualHearing) - fail ArgumentError.new("Argument type passed in is not recognized: #{conferenced_item.class}") + fail ArgumentError, "Argument type passed in is not recognized: #{conferenced_item.class}" end def meeting_details_for_hearing_day(hearing_day) @@ -183,8 +183,7 @@ def generate_meetings_api_conference(conferenced_item) id: conf_id, meetingNumber: meeting_num, password: Faker::Alphanumeric.alphanumeric(number: 11, min_alpha: 3, min_numeric: 3), - phoneAndVideoSystemPassword: Faker::Number.number(digits: 8), - + phoneAndVideoSystemPassword: Faker::Number.number(digits: 8) }.merge(telephony_options(conf_id, meeting_num)) .merge(DEFAULT_MEETING_PROPERTIES) .merge(meeting_details_based_on_type(conferenced_item)) From 8f636e34b78f500667c66f2e9a6afbc5d30160d6 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 22 Sep 2023 21:44:13 -0400 Subject: [PATCH 184/445] Extract out conference hash creation --- app/models/hearing_day.rb | 9 +++++++++ app/models/hearings/virtual_hearing.rb | 11 +++++++++++ lib/fakes/webex_service.rb | 27 +------------------------- 3 files changed, 21 insertions(+), 26 deletions(-) diff --git a/app/models/hearing_day.rb b/app/models/hearing_day.rb index 9d559d2695c..1376da3e244 100644 --- a/app/models/hearing_day.rb +++ b/app/models/hearing_day.rb @@ -303,6 +303,15 @@ def update_schedule(updated_hearing_days) end end + def meeting_details_for_conference + { + title: "Guest Link for #{scheduled_for}", + start: scheduled_for.beginning_of_day.iso8601, + end: scheduled_for.end_of_day.iso8601, + timezone: "America/New_York" + } + end + private def current_user_css_id diff --git a/app/models/hearings/virtual_hearing.rb b/app/models/hearings/virtual_hearing.rb index 378f3bdfd36..eb312511373 100644 --- a/app/models/hearings/virtual_hearing.rb +++ b/app/models/hearings/virtual_hearing.rb @@ -277,6 +277,17 @@ def rebuild_and_save_links update!(host_hearing_link: link_service.host_link, guest_hearing_link: link_service.guest_link) end + def meeting_details_for_conference + appeal = hearing.appeal + + { + title: "#{appeal.docket_number}_#{appeal.id}_#{appeal.class}", + start: hearing.scheduled_for.beginning_of_day.iso8601, + end: hearing.scheduled_for.end_of_day.iso8601, + timezone: hearing.scheduled_for.time_zone.name + } + end + private def assign_created_by_user diff --git a/lib/fakes/webex_service.rb b/lib/fakes/webex_service.rb index 38276a7d02d..7af8f260450 100644 --- a/lib/fakes/webex_service.rb +++ b/lib/fakes/webex_service.rb @@ -142,13 +142,6 @@ def telephony_options(conf_id, meeting_num) } end - # Contains docket number of appeal, appeal id, appeal type (A/L), and hearing id - def conference_title(virtual_hearing) - appeal = virtual_hearing.hearing.appeal - - "#{appeal.docket_number}_#{appeal.id}_#{appeal.class}" - end - def meeting_details_based_on_type(conferenced_item) return meeting_details_for_hearing_day(conferenced_item) if conferenced_item.is_a?(HearingDay) @@ -157,24 +150,6 @@ def meeting_details_based_on_type(conferenced_item) fail ArgumentError, "Argument type passed in is not recognized: #{conferenced_item.class}" end - def meeting_details_for_hearing_day(hearing_day) - { - title: "Guest Link for #{hearing_day.scheduled_for}", - start: hearing_day.scheduled_for.beginning_of_day.iso8601, - end: hearing_day.scheduled_for.end_of_day.iso8601, - timezone: "America/New_York" - } - end - - def meeting_details_for_virtual_hearing(virtual_hearing) - { - title: conference_title(virtual_hearing), - start: virtual_hearing.hearing.scheduled_for.beginning_of_day.iso8601, - end: virtual_hearing.hearing.scheduled_for.end_of_day.iso8601, - timezone: virtual_hearing.hearing.scheduled_for.time_zone.name - } - end - def generate_meetings_api_conference(conferenced_item) conf_id = Faker::Alphanumeric.alphanumeric(number: 32).downcase meeting_num = Faker::Number.number(digits: 11) @@ -186,6 +161,6 @@ def generate_meetings_api_conference(conferenced_item) phoneAndVideoSystemPassword: Faker::Number.number(digits: 8) }.merge(telephony_options(conf_id, meeting_num)) .merge(DEFAULT_MEETING_PROPERTIES) - .merge(meeting_details_based_on_type(conferenced_item)) + .merge(conferenced_item.meeting_details_for_conference) end end From 684b21c11f2583c95c585a7f42fd65f5ef754400 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 22 Sep 2023 21:44:31 -0400 Subject: [PATCH 185/445] Remove method --- lib/fakes/webex_service.rb | 8 -------- 1 file changed, 8 deletions(-) diff --git a/lib/fakes/webex_service.rb b/lib/fakes/webex_service.rb index 7af8f260450..02868cdd1cd 100644 --- a/lib/fakes/webex_service.rb +++ b/lib/fakes/webex_service.rb @@ -142,14 +142,6 @@ def telephony_options(conf_id, meeting_num) } end - def meeting_details_based_on_type(conferenced_item) - return meeting_details_for_hearing_day(conferenced_item) if conferenced_item.is_a?(HearingDay) - - return meeting_details_for_virtual_hearing(conferenced_item) if conferenced_item.is_a?(VirtualHearing) - - fail ArgumentError, "Argument type passed in is not recognized: #{conferenced_item.class}" - end - def generate_meetings_api_conference(conferenced_item) conf_id = Faker::Alphanumeric.alphanumeric(number: 32).downcase meeting_num = Faker::Number.number(digits: 11) From 9b84f35eb675dcb45da097a50cc73ea85df8f5ed Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 22 Sep 2023 21:49:59 -0400 Subject: [PATCH 186/445] Some minor fixes --- lib/fakes/webex_service.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/fakes/webex_service.rb b/lib/fakes/webex_service.rb index 02868cdd1cd..63e58b380c6 100644 --- a/lib/fakes/webex_service.rb +++ b/lib/fakes/webex_service.rb @@ -69,7 +69,7 @@ def initialize(**args) @error_message = args[:error_message] || "Error" end - def create_conference(virtual_hearing) + def create_conference(conferenced_item) if error? return ExternalApi::WebexService::CreateResponse.new( HTTPI::Response.new( @@ -84,16 +84,16 @@ def create_conference(virtual_hearing) HTTPI::Response.new( 200, {}, - generate_meetings_api_conference(virtual_hearing) + generate_meetings_api_conference(conferenced_item) ) ) end - def delete_conference(*) + def delete_conference(conf_id) if error? return ExternalApi::WebexService::DeleteResponse.new( HTTPI::Response.new( - @status_code, {}, {} + @status_code, {}, error_response ) ) end From 9fd0d3580c6661968b7b8bf9e6dc22a4f4e9161f Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 22 Sep 2023 22:14:12 -0400 Subject: [PATCH 187/445] Add delete reponse --- app/services/external_api/webex_service/delete_response.rb | 3 +++ lib/fakes/webex_service.rb | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 app/services/external_api/webex_service/delete_response.rb diff --git a/app/services/external_api/webex_service/delete_response.rb b/app/services/external_api/webex_service/delete_response.rb new file mode 100644 index 00000000000..5c8be1f2f1c --- /dev/null +++ b/app/services/external_api/webex_service/delete_response.rb @@ -0,0 +1,3 @@ +# frozen_string_literal: true + +class ExternalApi::WebexService::DeleteResponse < ExternalApi::WebexService::Response; end diff --git a/lib/fakes/webex_service.rb b/lib/fakes/webex_service.rb index 63e58b380c6..49ee378d7ef 100644 --- a/lib/fakes/webex_service.rb +++ b/lib/fakes/webex_service.rb @@ -89,7 +89,7 @@ def create_conference(conferenced_item) ) end - def delete_conference(conf_id) + def delete_conference(_conf_id) if error? return ExternalApi::WebexService::DeleteResponse.new( HTTPI::Response.new( @@ -98,7 +98,7 @@ def delete_conference(conf_id) ) end - ExternalApi::WebexService::DeleteResponse.new(HTTPI::Response.new(200, {}, {})) + ExternalApi::WebexService::DeleteResponse.new(HTTPI::Response.new(204, {}, {})) end private From c4913dabc02992a4f4dbc232d286afa5e58094a7 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 22 Sep 2023 22:21:16 -0400 Subject: [PATCH 188/445] Tweak method signature --- lib/fakes/webex_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fakes/webex_service.rb b/lib/fakes/webex_service.rb index 49ee378d7ef..66ded630936 100644 --- a/lib/fakes/webex_service.rb +++ b/lib/fakes/webex_service.rb @@ -89,7 +89,7 @@ def create_conference(conferenced_item) ) end - def delete_conference(_conf_id) + def delete_conference(conference_id:) if error? return ExternalApi::WebexService::DeleteResponse.new( HTTPI::Response.new( From 499a8087a783b9b52d6424428879318aa1a69060 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 22 Sep 2023 22:35:41 -0400 Subject: [PATCH 189/445] Update pexip tests --- spec/services/external_api/pexip_service_spec.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/spec/services/external_api/pexip_service_spec.rb b/spec/services/external_api/pexip_service_spec.rb index 7e86a3ae7aa..1478c666811 100644 --- a/spec/services/external_api/pexip_service_spec.rb +++ b/spec/services/external_api/pexip_service_spec.rb @@ -29,14 +29,18 @@ "enable_overlay_text": true, "force_presenter_into_main": true, "ivr_theme": "/api/admin/configuration/v1/ivr_theme/13/", - "guest_pin": "5678901234#", + "guest_pin": "5678901", "name": "BVA1111111", - "pin": "1234567#", + "pin": "1234567", "tag": "CASEFLOW" } end - subject { pexip_service.create_conference(host_pin: "1234567#", guest_pin: "5678901234#", name: "1111111") } + let(:virtual_hearing) do + create(:virtual_hearing, host_pin: "1234567", guest_pin: "5678901", alias: "1111111") + end + + subject { pexip_service.create_conference(virtual_hearing) } let(:success_create_resp) do HTTPI::Response.new(201, { "Location" => "api/admin/configuration/v1/conference/1234" }, {}) From b5e2fd341c252cfdfb6168499e60bcfb883351da Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Sat, 23 Sep 2023 18:45:48 -0400 Subject: [PATCH 190/445] More specs --- app/models/hearing_day.rb | 18 +++++----- spec/models/hearing_day_spec.rb | 22 ++++++++++++ spec/models/hearings/virtual_hearing_spec.rb | 37 ++++++++++++++++++++ 3 files changed, 68 insertions(+), 9 deletions(-) diff --git a/app/models/hearing_day.rb b/app/models/hearing_day.rb index 1376da3e244..0e22b223d33 100644 --- a/app/models/hearing_day.rb +++ b/app/models/hearing_day.rb @@ -220,6 +220,15 @@ def conference_link @conference_link ||= find_or_create_conference_link! end + def meeting_details_for_conference + { + title: "Guest Link for #{scheduled_for.strftime("%b %e, %Y")}", + start: scheduled_for.beginning_of_day.iso8601, + end: scheduled_for.end_of_day.iso8601, + timezone: "America/New_York" + } + end + private def assign_created_by_user @@ -303,15 +312,6 @@ def update_schedule(updated_hearing_days) end end - def meeting_details_for_conference - { - title: "Guest Link for #{scheduled_for}", - start: scheduled_for.beginning_of_day.iso8601, - end: scheduled_for.end_of_day.iso8601, - timezone: "America/New_York" - } - end - private def current_user_css_id diff --git a/spec/models/hearing_day_spec.rb b/spec/models/hearing_day_spec.rb index c59522518b0..7fbf1f3965f 100644 --- a/spec/models/hearing_day_spec.rb +++ b/spec/models/hearing_day_spec.rb @@ -571,4 +571,26 @@ def format_begins_at_from_db(time_string, scheduled_for) expect(subject.hearing_day_id).to eq(hearing_day.id) end end + + context "#meeting_details_for_conference" do + let(:expected_date) { "Sep 21, 2023" } + let(:expected_date_parsed) { Date.parse(expected_date) } + let(:hearing_day) do + build( + :hearing_day, + scheduled_for: expected_date_parsed + ) + end + + subject { hearing_day.meeting_details_for_conference } + + it "returns the expected meeting conference details" do + is_expected.to eq( + title: "Guest Link for #{expected_date}", + start: expected_date_parsed.beginning_of_day.iso8601, + end: expected_date_parsed.end_of_day.iso8601, + timezone: "America/New_York" + ) + end + end end diff --git a/spec/models/hearings/virtual_hearing_spec.rb b/spec/models/hearings/virtual_hearing_spec.rb index 8b09c373ac0..d62a18fe9d6 100644 --- a/spec/models/hearings/virtual_hearing_spec.rb +++ b/spec/models/hearings/virtual_hearing_spec.rb @@ -383,4 +383,41 @@ def link(name) end end end + + context "#meeting_details_for_conference" do + let(:expected_date) { "Sep 22, 2023" } + let(:expected_date_parsed) { Date.parse(expected_date) } + let(:hearing_day) do + build(:hearing_day, scheduled_for: expected_date_parsed) + end + let(:virtual_hearing) { create(:virtual_hearing, hearing: hearing) } + + subject { virtual_hearing.meeting_details_for_conference } + + context "For an AMA Hearing" do + let(:hearing) { create(:hearing, hearing_day: hearing_day) } + + it "returns the expected meeting conference details" do + is_expected.to eq( + title: "#{hearing.appeal.docket_number}_#{hearing.appeal.id}_Appeal", + start: "2023-09-22T00:00:00-04:00", + end: "2023-09-22T23:59:59-04:00", + timezone: "America/New_York" + ) + end + end + + context "For a Legacy Hearing" do + let(:hearing) { create(:legacy_hearing, hearing_day: hearing_day) } + + it "returns the expected meeting conference details" do + is_expected.to eq( + title: "#{hearing.appeal.docket_number}_#{hearing.appeal.id}_LegacyAppeal", + start: "2023-09-22T00:00:00-04:00", + end: "2023-09-22T23:59:59-04:00", + timezone: "America/New_York" + ) + end + end + end end From faea51c7ef0b300e6187fcb5b66f4e71771b01ac Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Sat, 23 Sep 2023 21:58:36 -0400 Subject: [PATCH 191/445] Init commit --- .../hearings/hearing_day_controller.rb | 10 +-- app/models/hearing_day.rb | 31 +++++--- app/models/hearings/conference_link.rb | 75 +------------------ app/models/hearings/pexip_conference_link.rb | 75 +++++++++++++++++++ app/models/hearings/webex_conference_link.rb | 9 +++ .../hearings/hearing_day_serializer.rb | 12 +-- ...4623_add_type_column_to_conference_link.rb | 9 +++ db/schema.rb | 7 +- spec/models/hearing_day_spec.rb | 2 +- spec/models/hearings/conference_link_spec.rb | 8 +- 10 files changed, 139 insertions(+), 99 deletions(-) create mode 100644 app/models/hearings/pexip_conference_link.rb create mode 100644 app/models/hearings/webex_conference_link.rb create mode 100644 db/migrate/20230924014623_add_type_column_to_conference_link.rb diff --git a/app/controllers/hearings/hearing_day_controller.rb b/app/controllers/hearings/hearing_day_controller.rb index add4b6b27f2..7b7e8a0514d 100644 --- a/app/controllers/hearings/hearing_day_controller.rb +++ b/app/controllers/hearings/hearing_day_controller.rb @@ -40,16 +40,16 @@ def log_error(error) def show begin render json: { - hearing_day: hearing_day.to_hash(include_conference_link: true).merge( + hearing_day: hearing_day.to_hash(include_conference_links: true).merge( hearings: hearing_day.hearings_for_user(current_user).map { |hearing| hearing.quick_to_hash(current_user.id) } ) } - rescue VirtualHearings::LinkService::PINKeyMissingError, - VirtualHearings::LinkService::URLHostMissingError, - VirtualHearings::LinkService::URLPathMissingError => error + rescue VirtualHearings::LinkService::PINKeyMissingError, + VirtualHearings::LinkService::URLHostMissingError, + VirtualHearings::LinkService::URLPathMissingError => error log_error(error) render json: { - hearing_day: hearing_day.to_hash(include_conference_link: false).merge( + hearing_day: hearing_day.to_hash(include_conference_links: false).merge( hearings: hearing_day.hearings_for_user(current_user).map do |hearing| hearing.quick_to_hash(current_user.id) end diff --git a/app/models/hearing_day.rb b/app/models/hearing_day.rb index 3972fa394e5..a51fe56581c 100644 --- a/app/models/hearing_day.rb +++ b/app/models/hearing_day.rb @@ -136,7 +136,7 @@ def hearings_for_user(current_user) caseflow_and_vacols_hearings end - def to_hash(include_conference_link = false) + def to_hash(include_conference_links = false) judge_names = HearingDayJudgeNameQuery.new([self]).call video_hearing_days_request_types = if VirtualHearing::VALID_REQUEST_TYPES.include? request_type HearingDayRequestTypeQuery @@ -151,7 +151,7 @@ def to_hash(include_conference_link = false) params: { video_hearing_days_request_types: video_hearing_days_request_types, judge_names: judge_names, - include_conference_link: include_conference_link + include_conference_links: include_conference_links } ).serializable_hash[:data][:attributes] end @@ -215,9 +215,9 @@ def half_day? total_slots ? total_slots <= 5 : false end - # over write of the .conference_link method from belongs_to :conference_link to add logic to create of not there - def conference_link - @conference_link ||= find_or_create_conference_link! + # over write of the .conference_links method from belongs_to :conference_links to add logic to create of not there + def conference_links + @conference_links ||= find_or_create_conference_links! end private @@ -233,7 +233,7 @@ def log_error(error) def generate_link_on_create begin - conference_link + conference_links rescue StandardError => error log_error(error) end @@ -279,9 +279,22 @@ def combine_time_and_date(time, timezone, date) formatted_datetime_string end - # Method to get the associated conference link record if exists and if not create new one - def find_or_create_conference_link! - ConferenceLink.find_or_create_by!(hearing_day_id: id, created_by_id: created_by.id) + # Method to get the associated conference link records if they exist and if not create new ones + def find_or_create_conference_links! + { + pexip: (if FeatureToggle.enabled?(:pexip_conference_service) + PexipConferenceLink.find_or_create_by!( + hearing_day: self, + created_by: created_by + ) + end), + webex: (if FeatureToggle.enabled?(:webex_conference_service) + WebexConferenceLink.find_or_create_by!( + hearing_day: self, + created_by: created_by + ) + end) + } end class << self diff --git a/app/models/hearings/conference_link.rb b/app/models/hearings/conference_link.rb index dfdd33a8f02..757656bdab6 100644 --- a/app/models/hearings/conference_link.rb +++ b/app/models/hearings/conference_link.rb @@ -8,79 +8,8 @@ class LinkMismatchError < StandardError; end include CreatedByUserConcern include ConferenceableConcern - after_create :generate_links_and_pins - - class << self - def client_host_or_default - ENV["VIRTUAL_HEARING_URL_HOST"] || "care.evn.va.gov" - end - - def formatted_alias(alias_name) - "BVA#{alias_name}@#{client_host_or_default}" - end - - def base_url - "https://#{client_host_or_default}/bva-app/" - end - end - - alias_attribute :alias_name, :alias + after_create :generate_conference_information belongs_to :hearing_day - - # Override the host pin - def host_pin - host_pin_long || self[:host_pin] - end - - def host_link - @full_host_link ||= "#{ConferenceLink.base_url}?join=1&media=&escalate=1&" \ - "conference=#{alias_with_host}&" \ - "pin=#{host_pin}&role=host" - end - - def guest_pin - return guest_pin_long if !guest_pin_long.nil? - - link_service = VirtualHearings::LinkService.new - update!(guest_pin_long: link_service.guest_pin) - guest_pin_long - end - - def guest_link - return guest_hearing_link if !guest_hearing_link.to_s.empty? - - if !alias_name.nil? - link_service = VirtualHearings::LinkService.new(alias_name) - update!(guest_hearing_link: link_service.guest_link) - elsif !alias_with_host.nil? - link_service = VirtualHearings::LinkService.new(alias_with_host.split("@")[0].split("A")[1]) - update!(guest_hearing_link: link_service.guest_link, alias: link_service.get_conference_id) - end - guest_hearing_link - end - - private - - def generate_links_and_pins - Rails.logger.info( - "Trying to create conference links for Hearing Day Id: #{hearing_day_id}." - ) - begin - link_service = VirtualHearings::LinkService.new - update!( - alias: link_service.get_conference_id, - host_link: link_service.host_link, - host_pin_long: link_service.host_pin, - alias_with_host: link_service.alias_with_host, - guest_hearing_link: link_service.guest_link, - guest_pin_long: link_service.guest_pin - ) - rescue VirtualHearings::LinkService::PINKeyMissingError, - VirtualHearings::LinkService::URLHostMissingError, - VirtualHearings::LinkService::URLPathMissingError => error - Raven.capture_exception(error: error) - raise error - end - end + belongs_to :created_by, class_name: "User" end diff --git a/app/models/hearings/pexip_conference_link.rb b/app/models/hearings/pexip_conference_link.rb new file mode 100644 index 00000000000..2e23829f62f --- /dev/null +++ b/app/models/hearings/pexip_conference_link.rb @@ -0,0 +1,75 @@ +# frozen_string_literal: true + +class PexipConferenceLink < ConferenceLink + alias_attribute :alias_name, :alias + + class << self + def client_host_or_default + ENV["VIRTUAL_HEARING_URL_HOST"] || "care.evn.va.gov" + end + + def formatted_alias(alias_name) + "BVA#{alias_name}@#{client_host_or_default}" + end + + def base_url + "https://#{client_host_or_default}/bva-app/" + end + end + + # Override the host pin + def host_pin + host_pin_long || self[:host_pin] + end + + def host_link + @full_host_link ||= "#{ConferenceLink.base_url}?join=1&media=&escalate=1&" \ + "conference=#{alias_with_host}&" \ + "pin=#{host_pin}&role=host" + end + + def guest_pin + return guest_pin_long if !guest_pin_long.nil? + + link_service = VirtualHearings::LinkService.new + update!(guest_pin_long: link_service.guest_pin) + guest_pin_long + end + + def guest_link + return guest_hearing_link if !guest_hearing_link.to_s.empty? + + if !alias_name.nil? + link_service = VirtualHearings::LinkService.new(alias_name) + update!(guest_hearing_link: link_service.guest_link) + elsif !alias_with_host.nil? + link_service = VirtualHearings::LinkService.new(alias_with_host.split("@")[0].split("A")[1]) + update!(guest_hearing_link: link_service.guest_link, alias: link_service.get_conference_id) + end + guest_hearing_link + end + + private + + def generate_conference_information + Rails.logger.info( + "Trying to create a Pexip conference link for Hearing Day Id: #{hearing_day_id}." + ) + begin + link_service = VirtualHearings::LinkService.new + update!( + alias: link_service.get_conference_id, + host_link: link_service.host_link, + host_pin_long: link_service.host_pin, + alias_with_host: link_service.alias_with_host, + guest_hearing_link: link_service.guest_link, + guest_pin_long: link_service.guest_pin + ) + rescue VirtualHearings::LinkService::PINKeyMissingError, + VirtualHearings::LinkService::URLHostMissingError, + VirtualHearings::LinkService::URLPathMissingError => error + Raven.capture_exception(error: error) + raise error + end + end +end diff --git a/app/models/hearings/webex_conference_link.rb b/app/models/hearings/webex_conference_link.rb new file mode 100644 index 00000000000..bc2d34d9409 --- /dev/null +++ b/app/models/hearings/webex_conference_link.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class WebexConferenceLink < ConferenceLink + private + + def generate_conference_information + fail NotImplementedError + end +end diff --git a/app/serializers/hearings/hearing_day_serializer.rb b/app/serializers/hearings/hearing_day_serializer.rb index dbdbe74f32a..710b5119613 100644 --- a/app/serializers/hearings/hearing_day_serializer.rb +++ b/app/serializers/hearings/hearing_day_serializer.rb @@ -38,9 +38,9 @@ class HearingDaySerializer attribute :begins_at attribute :updated_by_id attribute :updated_at - attribute :conference_link do |hearing_day, params| - if params[:include_conference_link].present? && params[:include_conference_link][:include_conference_link] - serialize_conference_link(hearing_day.conference_link) + attribute :conference_links do |hearing_day, params| + if params[:include_conference_links].present? && params[:include_conference_links][:include_conference_links] + serialize_conference_link(hearing_day.conference_links) end end @@ -96,10 +96,10 @@ def self.serialize_collection(hearing_days) ).serializable_hash[:data].map { |hearing_day| hearing_day[:attributes] } end - def self.serialize_conference_link(conference_link) - if !conference_link.nil? + def self.serialize_conference_links(conference_links) + if !conference_links.nil? ::ConferenceLinkSerializer.new( - conference_link, + conference_links, collection: false ).serializable_hash[:data][:attributes] end diff --git a/db/migrate/20230924014623_add_type_column_to_conference_link.rb b/db/migrate/20230924014623_add_type_column_to_conference_link.rb new file mode 100644 index 00000000000..1feb4ccd1b7 --- /dev/null +++ b/db/migrate/20230924014623_add_type_column_to_conference_link.rb @@ -0,0 +1,9 @@ +class AddTypeColumnToConferenceLink < Caseflow::Migration + disable_ddl_transaction! + + def change + add_column :conference_links, :type, :string, comment: "Pexip or Webex conference link" + + add_index :conference_links, :type, algorithm: :concurrently + end +end diff --git a/db/schema.rb b/db/schema.rb index 12aa387dfd0..9c56ed0b9f6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2023_09_14_210532) do +ActiveRecord::Schema.define(version: 2023_09_24_014623) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -583,11 +583,14 @@ t.string "host_link", comment: "Conference link generated from external conference service" t.integer "host_pin", comment: "Pin for the host of the conference to get into the conference" t.string "host_pin_long", limit: 8, comment: "Generated host pin stored as a string" + t.string "meeting_type", default: "pexip", comment: "Video Conferencing Application Type" + t.string "type", comment: "Pexip or Webex conference link" t.datetime "updated_at", comment: "Date and Time record was last updated" t.bigint "updated_by_id", comment: "user id of the user to last update the record. FK on the User table" t.index ["created_by_id"], name: "index_created_by_id" t.index ["deleted_at"], name: "index_conference_links_on_deleted_at" t.index ["hearing_day_id"], name: "index_conference_links_on_hearing_day_id" + t.index ["type"], name: "index_conference_links_on_type" t.index ["updated_by_id"], name: "index_updated_by_id" end @@ -1829,6 +1832,7 @@ t.string "email" t.string "full_name" t.datetime "last_login_at", comment: "The last time the user-agent (browser) provided session credentials; see User.from_session for precision" + t.string "meeting_type", default: "pexip", comment: "Video Conferencing Application Type" t.string "roles", array: true t.string "selected_regional_office" t.string "station_id", null: false @@ -1994,6 +1998,7 @@ t.string "host_pin_long", limit: 8, comment: "Change the host pin to store a longer pin with the # sign trailing" t.string "judge_email", comment: "Judge's email address" t.boolean "judge_email_sent", default: false, null: false, comment: "Whether or not a notification email was sent to the judge" + t.string "meeting_type", default: "pexip", comment: "Video Conferencing Application Type" t.string "representative_email", comment: "Veteran's representative's email address" t.boolean "representative_email_sent", default: false, null: false, comment: "Whether or not a notification email was sent to the veteran's representative" t.datetime "representative_reminder_sent_at", comment: "The datetime the last reminder email was sent to the representative." diff --git a/spec/models/hearing_day_spec.rb b/spec/models/hearing_day_spec.rb index c59522518b0..86385441005 100644 --- a/spec/models/hearing_day_spec.rb +++ b/spec/models/hearing_day_spec.rb @@ -565,7 +565,7 @@ def format_begins_at_from_db(time_string, scheduled_for) ) end - subject { hearing_day.conference_link } + subject { hearing_day.conference_links } it "Does not have a existing conference link so creates a new one" do expect(subject.hearing_day_id).to eq(hearing_day.id) diff --git a/spec/models/hearings/conference_link_spec.rb b/spec/models/hearings/conference_link_spec.rb index 98a4d331f4e..5cdcec0a37f 100644 --- a/spec/models/hearings/conference_link_spec.rb +++ b/spec/models/hearings/conference_link_spec.rb @@ -151,17 +151,17 @@ let!(:user) { RequestStore.store[:current_user] = User.system_user } - let(:conference_link) { hearing_day.conference_link } + let(:conference_links) { hearing_day.conference_links } context "guest_pin_long property already has a pin as a value" do it "Returns the guest_pin for the conference_link" do - expect(conference_link.guest_pin_long).to eq(conference_link.guest_pin) + expect(conference_links.guest_pin_long).to eq(conference_links.guest_pin) end end context "guest_pin_long property has a value of nil." do it "checks if property is nil. If so, a new pin is created. " do - conference_link.update!(guest_pin_long: nil) - expect(conference_link.guest_pin).not_to eq(nil) + conference_links.update!(guest_pin_long: nil) + expect(conference_links.guest_pin).not_to eq(nil) end end end From 854a433361eb3fc3e3e716ac24f7d9829fd4303f Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Sat, 23 Sep 2023 22:04:01 -0400 Subject: [PATCH 192/445] Remove old columns from schema --- db/schema.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 9c56ed0b9f6..b9e761f549f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -583,7 +583,6 @@ t.string "host_link", comment: "Conference link generated from external conference service" t.integer "host_pin", comment: "Pin for the host of the conference to get into the conference" t.string "host_pin_long", limit: 8, comment: "Generated host pin stored as a string" - t.string "meeting_type", default: "pexip", comment: "Video Conferencing Application Type" t.string "type", comment: "Pexip or Webex conference link" t.datetime "updated_at", comment: "Date and Time record was last updated" t.bigint "updated_by_id", comment: "user id of the user to last update the record. FK on the User table" @@ -1832,7 +1831,6 @@ t.string "email" t.string "full_name" t.datetime "last_login_at", comment: "The last time the user-agent (browser) provided session credentials; see User.from_session for precision" - t.string "meeting_type", default: "pexip", comment: "Video Conferencing Application Type" t.string "roles", array: true t.string "selected_regional_office" t.string "station_id", null: false @@ -1998,7 +1996,6 @@ t.string "host_pin_long", limit: 8, comment: "Change the host pin to store a longer pin with the # sign trailing" t.string "judge_email", comment: "Judge's email address" t.boolean "judge_email_sent", default: false, null: false, comment: "Whether or not a notification email was sent to the judge" - t.string "meeting_type", default: "pexip", comment: "Video Conferencing Application Type" t.string "representative_email", comment: "Veteran's representative's email address" t.boolean "representative_email_sent", default: false, null: false, comment: "Whether or not a notification email was sent to the veteran's representative" t.datetime "representative_reminder_sent_at", comment: "The datetime the last reminder email was sent to the representative." From e7e40fcd07a782316dfaea7782b54b6abc2260bb Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Sat, 23 Sep 2023 22:44:19 -0400 Subject: [PATCH 193/445] Fix class method call --- app/models/hearings/pexip_conference_link.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/hearings/pexip_conference_link.rb b/app/models/hearings/pexip_conference_link.rb index 2e23829f62f..1b436e50a8a 100644 --- a/app/models/hearings/pexip_conference_link.rb +++ b/app/models/hearings/pexip_conference_link.rb @@ -23,9 +23,9 @@ def host_pin end def host_link - @full_host_link ||= "#{ConferenceLink.base_url}?join=1&media=&escalate=1&" \ - "conference=#{alias_with_host}&" \ - "pin=#{host_pin}&role=host" + "#{self.class.base_url}?join=1&media=&escalate=1&" \ + "conference=#{alias_with_host}&" \ + "pin=#{host_pin}&role=host" end def guest_pin From 478b710340f5c3c9de556615c33211feb8d38f06 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Sat, 23 Sep 2023 22:47:37 -0400 Subject: [PATCH 194/445] Add mock link creation --- app/models/hearings/webex_conference_link.rb | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/app/models/hearings/webex_conference_link.rb b/app/models/hearings/webex_conference_link.rb index bc2d34d9409..a708ab9e845 100644 --- a/app/models/hearings/webex_conference_link.rb +++ b/app/models/hearings/webex_conference_link.rb @@ -1,9 +1,21 @@ # frozen_string_literal: true class WebexConferenceLink < ConferenceLink + def guest_pin + nil + end + + def guest_link + guest_hearing_link + end + private def generate_conference_information - fail NotImplementedError + # These links are just placeholders until the service class(es) is available. + update!( + host_link: "https://test.webex.com/meeting/#{Faker::Alphanumeric.alphanumeric(number: 32).downcase}", + guest_hearing_link: "https://test.webex.com/meeting/#{Faker::Alphanumeric.alphanumeric(number: 32).downcase}" + ) end end From 3ba9edca867cc0af24e6efc072eeb6a98ceeebce Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Sat, 23 Sep 2023 23:04:32 -0400 Subject: [PATCH 195/445] Fix serializer --- app/models/hearing_day.rb | 29 ++++++++++--------- .../hearings/hearing_day_serializer.rb | 11 +++---- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/app/models/hearing_day.rb b/app/models/hearing_day.rb index a51fe56581c..f3945ce20d5 100644 --- a/app/models/hearing_day.rb +++ b/app/models/hearing_day.rb @@ -281,20 +281,21 @@ def combine_time_and_date(time, timezone, date) # Method to get the associated conference link records if they exist and if not create new ones def find_or_create_conference_links! - { - pexip: (if FeatureToggle.enabled?(:pexip_conference_service) - PexipConferenceLink.find_or_create_by!( - hearing_day: self, - created_by: created_by - ) - end), - webex: (if FeatureToggle.enabled?(:webex_conference_service) - WebexConferenceLink.find_or_create_by!( - hearing_day: self, - created_by: created_by - ) - end) - } + [].tap do |links| + if FeatureToggle.enabled?(:pexip_conference_service) + links << PexipConferenceLink.find_or_create_by!( + hearing_day: self, + created_by: created_by + ) + end + + if FeatureToggle.enabled?(:webex_conference_service) + links << WebexConferenceLink.find_or_create_by!( + hearing_day: self, + created_by: created_by + ) + end + end end class << self diff --git a/app/serializers/hearings/hearing_day_serializer.rb b/app/serializers/hearings/hearing_day_serializer.rb index 710b5119613..af4867b9414 100644 --- a/app/serializers/hearings/hearing_day_serializer.rb +++ b/app/serializers/hearings/hearing_day_serializer.rb @@ -93,15 +93,16 @@ def self.serialize_collection(hearing_days) filled_slots_count_for_days: filled_slots_count_for_days, judge_names: judge_names } - ).serializable_hash[:data].map { |hearing_day| hearing_day[:attributes] } - end + ).serializable_hash[:data] + .pluck(:attributes) def self.serialize_conference_links(conference_links) - if !conference_links.nil? + if !conference_links.empty? ::ConferenceLinkSerializer.new( conference_links, - collection: false - ).serializable_hash[:data][:attributes] + collection: true + ).serializable_hash[:data] + .pluck(:attributes) end end end From 96b5828180512053b2a4e610997b33e09ec9be1c Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Sat, 23 Sep 2023 23:13:29 -0400 Subject: [PATCH 196/445] Add type to conf link serializer --- app/serializers/hearings/conference_link_serializer.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/serializers/hearings/conference_link_serializer.rb b/app/serializers/hearings/conference_link_serializer.rb index 3797eae384d..c7b08d24afd 100644 --- a/app/serializers/hearings/conference_link_serializer.rb +++ b/app/serializers/hearings/conference_link_serializer.rb @@ -7,4 +7,5 @@ class ConferenceLinkSerializer attribute :alias, &:alias_with_host attribute :guest_pin, &:guest_pin attribute :guest_link, &:guest_link + attribute :type end From d00384ae104025d140eeaeea6367e72de2ff0bb8 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Sat, 23 Sep 2023 23:16:28 -0400 Subject: [PATCH 197/445] Fix syntax error --- app/serializers/hearings/hearing_day_serializer.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/serializers/hearings/hearing_day_serializer.rb b/app/serializers/hearings/hearing_day_serializer.rb index af4867b9414..b84096f717e 100644 --- a/app/serializers/hearings/hearing_day_serializer.rb +++ b/app/serializers/hearings/hearing_day_serializer.rb @@ -94,10 +94,11 @@ def self.serialize_collection(hearing_days) judge_names: judge_names } ).serializable_hash[:data] - .pluck(:attributes) + .pluck(:attributes) + end def self.serialize_conference_links(conference_links) - if !conference_links.empty? + unless conference_links.empty? ::ConferenceLinkSerializer.new( conference_links, collection: true From 7e387f0db473bbcb011ba6aa52df0024cc336d7e Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Sun, 24 Sep 2023 13:01:37 -0400 Subject: [PATCH 198/445] Update method name --- app/serializers/hearings/hearing_day_serializer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/serializers/hearings/hearing_day_serializer.rb b/app/serializers/hearings/hearing_day_serializer.rb index b84096f717e..c405689cfdc 100644 --- a/app/serializers/hearings/hearing_day_serializer.rb +++ b/app/serializers/hearings/hearing_day_serializer.rb @@ -40,7 +40,7 @@ class HearingDaySerializer attribute :updated_at attribute :conference_links do |hearing_day, params| if params[:include_conference_links].present? && params[:include_conference_links][:include_conference_links] - serialize_conference_link(hearing_day.conference_links) + serialize_conference_links(hearing_day.conference_links) end end From 12d6e07f29a674ae84f541afb8bf43f38e1ff0e9 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Sun, 24 Sep 2023 13:26:19 -0400 Subject: [PATCH 199/445] Tweak object creations --- app/models/hearings/conference_link.rb | 6 ++++++ spec/models/hearings/conference_link_spec.rb | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/models/hearings/conference_link.rb b/app/models/hearings/conference_link.rb index 757656bdab6..4a08513edd1 100644 --- a/app/models/hearings/conference_link.rb +++ b/app/models/hearings/conference_link.rb @@ -12,4 +12,10 @@ class LinkMismatchError < StandardError; end belongs_to :hearing_day belongs_to :created_by, class_name: "User" + + private + + def generate_conference_information + fail NotImplementedError + end end diff --git a/spec/models/hearings/conference_link_spec.rb b/spec/models/hearings/conference_link_spec.rb index 5cdcec0a37f..728c6f9c574 100644 --- a/spec/models/hearings/conference_link_spec.rb +++ b/spec/models/hearings/conference_link_spec.rb @@ -21,7 +21,7 @@ it "raises the missing PIN key error" do RequestStore[:current_user] = user expect do - described_class.create(hearing_day_id: hearing_day.id) + described_class.create(hearing_day: hearing_day) end.to raise_error VirtualHearings::LinkService::PINKeyMissingError end end @@ -36,7 +36,7 @@ it "raises the missing host error" do RequestStore[:current_user] = user expect do - described_class.create(hearing_day_id: hearing_day.id) + described_class.create(hearing_day: hearing_day) end.to raise_error VirtualHearings::LinkService::URLHostMissingError end end @@ -51,7 +51,7 @@ it "raises the missing path error" do RequestStore[:current_user] = user expect do - described_class.create(hearing_day_id: hearing_day.id) + described_class.create(hearing_day: hearing_day) end.to raise_error VirtualHearings::LinkService::URLPathMissingError end end @@ -62,7 +62,7 @@ it "raises the missing PIN key error" do RequestStore[:current_user] = user expect do - described_class.create(hearing_day_id: hearing_day.id) + described_class.create(hearing_day: hearing_day) end.to raise_error VirtualHearings::LinkService::PINKeyMissingError end end From 4c637f8bafa48f33025038f3efba1a17292d3b24 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Sun, 24 Sep 2023 13:28:19 -0400 Subject: [PATCH 200/445] Rename spec file --- spec/models/hearings/conference_link_spec.rb | 221 ------------------- 1 file changed, 221 deletions(-) delete mode 100644 spec/models/hearings/conference_link_spec.rb diff --git a/spec/models/hearings/conference_link_spec.rb b/spec/models/hearings/conference_link_spec.rb deleted file mode 100644 index 728c6f9c574..00000000000 --- a/spec/models/hearings/conference_link_spec.rb +++ /dev/null @@ -1,221 +0,0 @@ -# frozen_string_literal: true - -describe ConferenceLink do - URL_HOST = "example.va.gov" - URL_PATH = "/sample" - PIN_KEY = "mysecretkey" - - before do - allow(ENV).to receive(:[]).and_call_original - allow(ENV).to receive(:fetch).and_call_original - end - - context "#create with errors" do - context "pin key env variable is missing" do - before do - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return URL_HOST - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return URL_PATH - end - let(:hearing_day) { create(:hearing_day) } - let(:user) { create(:user) } - it "raises the missing PIN key error" do - RequestStore[:current_user] = user - expect do - described_class.create(hearing_day: hearing_day) - end.to raise_error VirtualHearings::LinkService::PINKeyMissingError - end - end - - context "url host env variable is missing" do - before do - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return PIN_KEY - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return URL_PATH - end - let(:hearing_day) { create(:hearing_day) } - let(:user) { create(:user) } - it "raises the missing host error" do - RequestStore[:current_user] = user - expect do - described_class.create(hearing_day: hearing_day) - end.to raise_error VirtualHearings::LinkService::URLHostMissingError - end - end - - context "url path env variable is missing" do - before do - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return PIN_KEY - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return URL_HOST - end - let(:hearing_day) { create(:hearing_day) } - let(:user) { create(:user) } - it "raises the missing path error" do - RequestStore[:current_user] = user - expect do - described_class.create(hearing_day: hearing_day) - end.to raise_error VirtualHearings::LinkService::URLPathMissingError - end - end - - context "all env variables are missing" do - let(:hearing_day) { create(:hearing_day) } - let(:user) { create(:user) } - it "raises the missing PIN key error" do - RequestStore[:current_user] = user - expect do - described_class.create(hearing_day: hearing_day) - end.to raise_error VirtualHearings::LinkService::PINKeyMissingError - end - end - end - context "#create" do - before do - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return "mysecretkey" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return "example.va.gov" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return "/sample" - end - - let(:hearing_day) do - create(:hearing_day, id: 1) - end - - let(:conference_link) do - create(:conference_link, hearing_day_id: hearing_day.id) - end - - subject { conference_link } - - it "Conference link was created and links generated" do - expect(subject.id).not_to eq(nil) - expect(subject.host_link).not_to eq(nil) - expect(subject.host_pin_long).not_to eq(nil) - expect(subject.alias_with_host).not_to eq(nil) - expect(subject.alias_name).not_to eq(nil) - expect(subject.created_by_id).not_to eq(nil) - expect(subject.host_pin).to eq(subject.host_pin_long) - expect(subject.host_link).to eq(subject.host_link) - expect(subject.guest_hearing_link).to eq(subject.guest_hearing_link) - expect(subject.guest_pin_long).to eq(subject.guest_pin_long) - expect(subject.updated_by_id).not_to eq(nil) - end - end - - context "update conference day" do - before do - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return "mysecretkey" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return "example.va.gov" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return "/sample" - end - - let(:hearing_day) do - create(:hearing_day, id: 1) - end - - let(:conference_link) do - create(:conference_link, hearing_day_id: hearing_day.id) - end - - let(:conference_link_hash) do - { - host_pin: 12_345_678, - host_pin_long: "12345678", - guest_pin_long: "123456789", - created_at: DateTime.new(2022, 3, 15, 10, 15, 30), - updated_at: DateTime.new(2022, 4, 27, 11, 20, 35) - } - end - - subject { conference_link.update!(conference_link_hash) } - - it "Conference link was updated" do - subject - - updated_conference_link = ConferenceLink.find(conference_link.id).reload - expect(updated_conference_link.host_pin).to eq("12345678") - expect(updated_conference_link.host_pin_long).to eq("12345678") - expect(updated_conference_link.guest_pin_long).to eq("123456789") - expect(updated_conference_link.created_at).to eq(DateTime.new(2022, 3, 15, 10, 15, 30)) - expect(updated_conference_link.updated_at).to eq(DateTime.new(2022, 4, 27, 11, 20, 35)) - expect(updated_conference_link.updated_by_id).not_to eq(nil) - expect(updated_conference_link.created_by_id).not_to eq(nil) - end - end - - describe "#guest_pin" do - before do - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return "mysecretkey" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return "example.va.gov" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return "/sample" - end - - let(:hearing_day) { create(:hearing_day) } - - let!(:user) { RequestStore.store[:current_user] = User.system_user } - - let(:conference_links) { hearing_day.conference_links } - - context "guest_pin_long property already has a pin as a value" do - it "Returns the guest_pin for the conference_link" do - expect(conference_links.guest_pin_long).to eq(conference_links.guest_pin) - end - end - context "guest_pin_long property has a value of nil." do - it "checks if property is nil. If so, a new pin is created. " do - conference_links.update!(guest_pin_long: nil) - expect(conference_links.guest_pin).not_to eq(nil) - end - end - end - - describe "#guest_link" do - before do - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return "mysecretkey" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return "example.va.gov" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return "/sample" - - allow_any_instance_of(VirtualHearings::LinkService).to receive(:conference_id).and_return expected_conference_id - allow_any_instance_of(VirtualHearings::LinkService).to receive(:guest_pin).and_return expected_pin - end - - let(:hearing_day) { create(:hearing_day) } - - let!(:user) { RequestStore.store[:current_user] = User.system_user } - - let(:conference_link) do - create(:conference_link, - hearing_day_id: hearing_day.id, - guest_hearing_link: existing_url, - guest_pin_long: nil) - end - - let(:expected_pin) { "7470125694" } - let(:expected_conference_id) { "0000001" } - - let(:existing_url) do - "https://example.va.gov/sample/?" \ - "conference=BVA#{expected_conference_id}@example.va.gov&" \ - "pin=#{expected_pin}&callType=video" - end - - context "guest_hearing_link property already has a link/string as a value" do - it "Returns the guest_pin for the conference_link" do - conference_link.guest_link - expect(conference_link.guest_hearing_link).to eq(existing_url) - end - end - context "guest_hearing_link property already has a nil value" do - it "creates and returns the updated guest_hearing_link property" do - conference_link.update!(guest_hearing_link: nil) - conference_link.guest_link - expect(conference_link.guest_hearing_link).to eq(existing_url) - end - end - context "If alias_name(aliased for the alias property) is nil AND guest_hearing_link is nil "\ - "and alias_with_host is NOT nil" do - it "creates a guest_hearing_link updates the property and updates the alias property" do - conference_link.update!(alias: nil, guest_hearing_link: nil, alias_with_host: "BVA0000001@example.va.gov") - conference_link.guest_link - expect(conference_link.guest_hearing_link).to eq(existing_url) - end - end - end -end From 9dce499496f5351bdb607310961478cdeade2599 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Sun, 24 Sep 2023 13:28:32 -0400 Subject: [PATCH 201/445] Rename spec file --- .../hearings/pexip_conference_link_spec.rb | 221 ++++++++++++++++++ 1 file changed, 221 insertions(+) create mode 100644 spec/models/hearings/pexip_conference_link_spec.rb diff --git a/spec/models/hearings/pexip_conference_link_spec.rb b/spec/models/hearings/pexip_conference_link_spec.rb new file mode 100644 index 00000000000..671447eefa5 --- /dev/null +++ b/spec/models/hearings/pexip_conference_link_spec.rb @@ -0,0 +1,221 @@ +# frozen_string_literal: true + +describe PexipConferenceLink do + URL_HOST = "example.va.gov" + URL_PATH = "/sample" + PIN_KEY = "mysecretkey" + + before do + allow(ENV).to receive(:[]).and_call_original + allow(ENV).to receive(:fetch).and_call_original + end + + context "#create with errors" do + context "pin key env variable is missing" do + before do + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return URL_HOST + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return URL_PATH + end + let(:hearing_day) { create(:hearing_day) } + let(:user) { create(:user) } + it "raises the missing PIN key error" do + RequestStore[:current_user] = user + expect do + described_class.create(hearing_day: hearing_day) + end.to raise_error VirtualHearings::LinkService::PINKeyMissingError + end + end + + context "url host env variable is missing" do + before do + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return PIN_KEY + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return URL_PATH + end + let(:hearing_day) { create(:hearing_day) } + let(:user) { create(:user) } + it "raises the missing host error" do + RequestStore[:current_user] = user + expect do + described_class.create(hearing_day: hearing_day) + end.to raise_error VirtualHearings::LinkService::URLHostMissingError + end + end + + context "url path env variable is missing" do + before do + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return PIN_KEY + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return URL_HOST + end + let(:hearing_day) { create(:hearing_day) } + let(:user) { create(:user) } + it "raises the missing path error" do + RequestStore[:current_user] = user + expect do + described_class.create(hearing_day: hearing_day) + end.to raise_error VirtualHearings::LinkService::URLPathMissingError + end + end + + context "all env variables are missing" do + let(:hearing_day) { create(:hearing_day) } + let(:user) { create(:user) } + it "raises the missing PIN key error" do + RequestStore[:current_user] = user + expect do + described_class.create(hearing_day: hearing_day) + end.to raise_error VirtualHearings::LinkService::PINKeyMissingError + end + end + end + context "#create" do + before do + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return "mysecretkey" + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return "example.va.gov" + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return "/sample" + end + + let(:hearing_day) do + create(:hearing_day, id: 1) + end + + let(:conference_link) do + create(:conference_link, hearing_day_id: hearing_day.id) + end + + subject { conference_link } + + it "Conference link was created and links generated" do + expect(subject.id).not_to eq(nil) + expect(subject.host_link).not_to eq(nil) + expect(subject.host_pin_long).not_to eq(nil) + expect(subject.alias_with_host).not_to eq(nil) + expect(subject.alias_name).not_to eq(nil) + expect(subject.created_by_id).not_to eq(nil) + expect(subject.host_pin).to eq(subject.host_pin_long) + expect(subject.host_link).to eq(subject.host_link) + expect(subject.guest_hearing_link).to eq(subject.guest_hearing_link) + expect(subject.guest_pin_long).to eq(subject.guest_pin_long) + expect(subject.updated_by_id).not_to eq(nil) + end + end + + context "update conference day" do + before do + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return "mysecretkey" + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return "example.va.gov" + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return "/sample" + end + + let(:hearing_day) do + create(:hearing_day, id: 1) + end + + let(:conference_link) do + create(:conference_link, hearing_day_id: hearing_day.id) + end + + let(:conference_link_hash) do + { + host_pin: 12_345_678, + host_pin_long: "12345678", + guest_pin_long: "123456789", + created_at: DateTime.new(2022, 3, 15, 10, 15, 30), + updated_at: DateTime.new(2022, 4, 27, 11, 20, 35) + } + end + + subject { conference_link.update!(conference_link_hash) } + + it "Conference link was updated" do + subject + + updated_conference_link = ConferenceLink.find(conference_link.id).reload + expect(updated_conference_link.host_pin).to eq("12345678") + expect(updated_conference_link.host_pin_long).to eq("12345678") + expect(updated_conference_link.guest_pin_long).to eq("123456789") + expect(updated_conference_link.created_at).to eq(DateTime.new(2022, 3, 15, 10, 15, 30)) + expect(updated_conference_link.updated_at).to eq(DateTime.new(2022, 4, 27, 11, 20, 35)) + expect(updated_conference_link.updated_by_id).not_to eq(nil) + expect(updated_conference_link.created_by_id).not_to eq(nil) + end + end + + describe "#guest_pin" do + before do + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return "mysecretkey" + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return "example.va.gov" + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return "/sample" + end + + let(:hearing_day) { create(:hearing_day) } + + let!(:user) { RequestStore.store[:current_user] = User.system_user } + + let(:conference_links) { hearing_day.conference_links } + + context "guest_pin_long property already has a pin as a value" do + it "Returns the guest_pin for the conference_link" do + expect(conference_links.guest_pin_long).to eq(conference_links.guest_pin) + end + end + context "guest_pin_long property has a value of nil." do + it "checks if property is nil. If so, a new pin is created. " do + conference_links.update!(guest_pin_long: nil) + expect(conference_links.guest_pin).not_to eq(nil) + end + end + end + + describe "#guest_link" do + before do + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return "mysecretkey" + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return "example.va.gov" + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return "/sample" + + allow_any_instance_of(VirtualHearings::LinkService).to receive(:conference_id).and_return expected_conference_id + allow_any_instance_of(VirtualHearings::LinkService).to receive(:guest_pin).and_return expected_pin + end + + let(:hearing_day) { create(:hearing_day) } + + let!(:user) { RequestStore.store[:current_user] = User.system_user } + + let(:conference_link) do + create(:conference_link, + hearing_day_id: hearing_day.id, + guest_hearing_link: existing_url, + guest_pin_long: nil) + end + + let(:expected_pin) { "7470125694" } + let(:expected_conference_id) { "0000001" } + + let(:existing_url) do + "https://example.va.gov/sample/?" \ + "conference=BVA#{expected_conference_id}@example.va.gov&" \ + "pin=#{expected_pin}&callType=video" + end + + context "guest_hearing_link property already has a link/string as a value" do + it "Returns the guest_pin for the conference_link" do + conference_link.guest_link + expect(conference_link.guest_hearing_link).to eq(existing_url) + end + end + context "guest_hearing_link property already has a nil value" do + it "creates and returns the updated guest_hearing_link property" do + conference_link.update!(guest_hearing_link: nil) + conference_link.guest_link + expect(conference_link.guest_hearing_link).to eq(existing_url) + end + end + context "If alias_name(aliased for the alias property) is nil AND guest_hearing_link is nil "\ + "and alias_with_host is NOT nil" do + it "creates a guest_hearing_link updates the property and updates the alias property" do + conference_link.update!(alias: nil, guest_hearing_link: nil, alias_with_host: "BVA0000001@example.va.gov") + conference_link.guest_link + expect(conference_link.guest_hearing_link).to eq(existing_url) + end + end + end +end From 03c80810c54328343ace80630f802e715c640b2b Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Sun, 24 Sep 2023 21:34:59 -0400 Subject: [PATCH 202/445] Fix pexip tests --- app/models/hearings/conference_link.rb | 2 ++ app/models/hearings/pexip_conference_link.rb | 2 -- spec/factories/conference_link.rb | 8 ++++++++ .../hearings/pexip_conference_link_spec.rb | 16 ++++++++++------ 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/app/models/hearings/conference_link.rb b/app/models/hearings/conference_link.rb index 4a08513edd1..b2125b92dfb 100644 --- a/app/models/hearings/conference_link.rb +++ b/app/models/hearings/conference_link.rb @@ -13,6 +13,8 @@ class LinkMismatchError < StandardError; end belongs_to :hearing_day belongs_to :created_by, class_name: "User" + alias_attribute :alias_name, :alias + private def generate_conference_information diff --git a/app/models/hearings/pexip_conference_link.rb b/app/models/hearings/pexip_conference_link.rb index 1b436e50a8a..a7832efd07c 100644 --- a/app/models/hearings/pexip_conference_link.rb +++ b/app/models/hearings/pexip_conference_link.rb @@ -1,8 +1,6 @@ # frozen_string_literal: true class PexipConferenceLink < ConferenceLink - alias_attribute :alias_name, :alias - class << self def client_host_or_default ENV["VIRTUAL_HEARING_URL_HOST"] || "care.evn.va.gov" diff --git a/spec/factories/conference_link.rb b/spec/factories/conference_link.rb index 1dd313c1af2..05dba55b1b0 100644 --- a/spec/factories/conference_link.rb +++ b/spec/factories/conference_link.rb @@ -19,5 +19,13 @@ meeting_type do create(:meeting_type, service_name: conference_provider) end + + factory :pexip_conference_link, class: PexipConferenceLink do + type { "PexipConferenceLink" } + end + + factory :webex_conference_link, class: WebexConferenceLink do + type { "WebexConferenceLink" } + end end end diff --git a/spec/models/hearings/pexip_conference_link_spec.rb b/spec/models/hearings/pexip_conference_link_spec.rb index 671447eefa5..c206d1e493d 100644 --- a/spec/models/hearings/pexip_conference_link_spec.rb +++ b/spec/models/hearings/pexip_conference_link_spec.rb @@ -79,7 +79,7 @@ end let(:conference_link) do - create(:conference_link, hearing_day_id: hearing_day.id) + create(:pexip_conference_link, hearing_day_id: hearing_day.id) end subject { conference_link } @@ -111,7 +111,7 @@ end let(:conference_link) do - create(:conference_link, hearing_day_id: hearing_day.id) + create(:pexip_conference_link, hearing_day_id: hearing_day.id) end let(:conference_link_hash) do @@ -142,6 +142,9 @@ describe "#guest_pin" do before do + FeatureToggle.enable!(:pexip_conference_service) + FeatureToggle.enable!(:webex_conference_service) + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return "mysecretkey" allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return "example.va.gov" allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return "/sample" @@ -152,16 +155,17 @@ let!(:user) { RequestStore.store[:current_user] = User.system_user } let(:conference_links) { hearing_day.conference_links } + let(:pexip_link) { conference_links.detect { |link| link.type == PexipConferenceLink.name } } context "guest_pin_long property already has a pin as a value" do it "Returns the guest_pin for the conference_link" do - expect(conference_links.guest_pin_long).to eq(conference_links.guest_pin) + expect(pexip_link.guest_pin_long).to eq(pexip_link.guest_pin) end end context "guest_pin_long property has a value of nil." do it "checks if property is nil. If so, a new pin is created. " do - conference_links.update!(guest_pin_long: nil) - expect(conference_links.guest_pin).not_to eq(nil) + pexip_link.update!(guest_pin_long: nil) + expect(pexip_link.guest_pin).not_to eq(nil) end end end @@ -181,7 +185,7 @@ let!(:user) { RequestStore.store[:current_user] = User.system_user } let(:conference_link) do - create(:conference_link, + create(:pexip_conference_link, hearing_day_id: hearing_day.id, guest_hearing_link: existing_url, guest_pin_long: nil) From b982a904aac484dabb7d7744dd6e401b621f7314 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Sun, 24 Sep 2023 21:46:04 -0400 Subject: [PATCH 203/445] Add hearing day specs --- spec/models/hearing_day_spec.rb | 40 +++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/spec/models/hearing_day_spec.rb b/spec/models/hearing_day_spec.rb index 86385441005..15dac3d7832 100644 --- a/spec/models/hearing_day_spec.rb +++ b/spec/models/hearing_day_spec.rb @@ -554,6 +554,11 @@ def format_begins_at_from_db(time_string, scheduled_for) allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return "/sample" end + after do + FeatureToggle.disable!(:pexip_conference_service) + FeatureToggle.disable!(:webex_conference_service) + end + let(:hearing_day) do RequestStore[:current_user] = User.create(css_id: "BVASCASPER1", station_id: 101) create( @@ -567,8 +572,39 @@ def format_begins_at_from_db(time_string, scheduled_for) subject { hearing_day.conference_links } - it "Does not have a existing conference link so creates a new one" do - expect(subject.hearing_day_id).to eq(hearing_day.id) + context "The Pexip and Webex services are both enabled" do + before do + FeatureToggle.enable!(:pexip_conference_service) + FeatureToggle.enable!(:webex_conference_service) + end + + it "Both conference links are created whenever requested" do + expect(subject.pluck(:type)).to match_array( + [PexipConferenceLink.name, WebexConferenceLink.name] + ) + end + end + + context "The Pexip and Webex services are both disabled" do + it "No links are created whenever they are requested" do + expect(subject).to eq [] + end + end + + context "Only the Pexip service is disabled" do + before { FeatureToggle.enable!(:pexip_conference_service) } + + it "Only the Pexip conference link is generated whenever requested" do + expect(subject.pluck(:type)).to match_array [PexipConferenceLink.name] + end + end + + context "Only the Webex service is disabled" do + before { FeatureToggle.enable!(:webex_conference_service) } + + it "Only the Webex conference link is generated whenever requested" do + expect(subject.pluck(:type)).to match_array [WebexConferenceLink.name] + end end end end From 3a32cd477c61fb4d4ed89a14bfb4f392ffa48c54 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Sun, 24 Sep 2023 21:58:00 -0400 Subject: [PATCH 204/445] Conf link serializer spec updates --- .../conference_link_serializer_spec.rb | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/spec/serializers/conference_link_serializer_spec.rb b/spec/serializers/conference_link_serializer_spec.rb index 3da0e937ad3..8778019f642 100644 --- a/spec/serializers/conference_link_serializer_spec.rb +++ b/spec/serializers/conference_link_serializer_spec.rb @@ -11,17 +11,8 @@ end let(:hearing_day) { create(:hearing_day) } - let(:conference_link) { create(:conference_link, hearing_day_id: hearing_day.id) } - - - context "Converting conference link to hash" do - subject { described_class.new(conference_link) } - before do - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return "mysecretkey" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return "example.va.gov" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return "/sample" - end + shared_examples "Serialized conferenced link attributes meet expectations" do it "calling serializable_hash gets result" do expect(subject.serializable_hash[:data][:attributes]).not_to eq(nil) end @@ -39,6 +30,28 @@ end end + context "Converting conference link to hash" do + subject { described_class.new(conference_link) } + + context "With a Pexip conference link" do + before do + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return "mysecretkey" + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return "example.va.gov" + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return "/sample" + end + + let(:conference_link) { create(:pexip_conference_link, hearing_day: hearing_day) } + + include_examples "Serialized conferenced link attributes meet expectations" + end + + context "With a Webex conference link" do + let(:conference_link) { create(:webex_conference_link, hearing_day: hearing_day) } + + include_examples "Serialized conferenced link attributes meet expectations" + end + end + context "No conference link is passed in" do subject { described_class.new(nil) } From d6f56d43df009f8fec62e1e7eacd96d4952d40bf Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Sun, 24 Sep 2023 22:02:05 -0400 Subject: [PATCH 205/445] Add conf link spec --- spec/models/hearings/conference_link.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 spec/models/hearings/conference_link.rb diff --git a/spec/models/hearings/conference_link.rb b/spec/models/hearings/conference_link.rb new file mode 100644 index 00000000000..9ad9e164694 --- /dev/null +++ b/spec/models/hearings/conference_link.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +describe ConferenceLink do + let(:hearing_day) { create(:hearing_day) } + let(:created_by_user) { create(:user) } + + it "Base ConferenceLink class records cannot be created directly" do + expect { ConferenceLink.create!(hearing_day: hearing_day, created_by: created_by_user) }.to raise_error( + NotImplementedError + ) + end +end From 773ab7e118ededbc65bef6b3a5bc04ae6a4774c3 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Mon, 25 Sep 2023 00:13:37 -0400 Subject: [PATCH 206/445] Default return --- app/serializers/hearings/hearing_day_serializer.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/serializers/hearings/hearing_day_serializer.rb b/app/serializers/hearings/hearing_day_serializer.rb index c405689cfdc..a94e1b3331c 100644 --- a/app/serializers/hearings/hearing_day_serializer.rb +++ b/app/serializers/hearings/hearing_day_serializer.rb @@ -98,12 +98,12 @@ def self.serialize_collection(hearing_days) end def self.serialize_conference_links(conference_links) - unless conference_links.empty? - ::ConferenceLinkSerializer.new( - conference_links, - collection: true - ).serializable_hash[:data] - .pluck(:attributes) - end + return [] if conference_links.empty? + + ::ConferenceLinkSerializer.new( + conference_links, + collection: true + ).serializable_hash[:data] + .pluck(:attributes) end end From 365896878167076925f653a6974e23786a089962 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Tue, 26 Sep 2023 14:50:32 -0400 Subject: [PATCH 207/445] Use service to create links --- app/models/hearings/webex_conference_link.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/models/hearings/webex_conference_link.rb b/app/models/hearings/webex_conference_link.rb index a708ab9e845..b5d841945fd 100644 --- a/app/models/hearings/webex_conference_link.rb +++ b/app/models/hearings/webex_conference_link.rb @@ -12,10 +12,11 @@ def guest_link private def generate_conference_information - # These links are just placeholders until the service class(es) is available. + conference = WebexService.new.create_conference(hearing_day) + update!( - host_link: "https://test.webex.com/meeting/#{Faker::Alphanumeric.alphanumeric(number: 32).downcase}", - guest_hearing_link: "https://test.webex.com/meeting/#{Faker::Alphanumeric.alphanumeric(number: 32).downcase}" + host_link: conference.data[:webLink], + guest_hearing_link: conference.data[:webLink] ) end end From ad1504bc63084cb78f5c08397686a6e0041cf073 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 28 Sep 2023 09:15:28 -0400 Subject: [PATCH 208/445] Add conf provider to serializer --- app/serializers/hearings/conference_link_serializer.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/serializers/hearings/conference_link_serializer.rb b/app/serializers/hearings/conference_link_serializer.rb index c7b08d24afd..4cbf1f4f55c 100644 --- a/app/serializers/hearings/conference_link_serializer.rb +++ b/app/serializers/hearings/conference_link_serializer.rb @@ -8,4 +8,5 @@ class ConferenceLinkSerializer attribute :guest_pin, &:guest_pin attribute :guest_link, &:guest_link attribute :type + attribute :conference_provider end From f6526db0de55581f44619787915dc0b01320bfbf Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 28 Sep 2023 09:21:15 -0400 Subject: [PATCH 209/445] Set service name --- app/models/hearings/webex_conference_link.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/models/hearings/webex_conference_link.rb b/app/models/hearings/webex_conference_link.rb index b5d841945fd..d93e844bdf3 100644 --- a/app/models/hearings/webex_conference_link.rb +++ b/app/models/hearings/webex_conference_link.rb @@ -12,6 +12,8 @@ def guest_link private def generate_conference_information + meeting_type.update!(service_name: "webex") + conference = WebexService.new.create_conference(hearing_day) update!( From 9515a66a3584c812e9f0a8d811d5da06648037ff Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 28 Sep 2023 11:09:25 -0400 Subject: [PATCH 210/445] Fix merge issue --- app/models/hearing_day.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/hearing_day.rb b/app/models/hearing_day.rb index a5d1abd4aca..9f5acb1d544 100644 --- a/app/models/hearing_day.rb +++ b/app/models/hearing_day.rb @@ -222,7 +222,7 @@ def scheduled_date_passed? # over write of the .conference_links method from belongs_to :conference_links to add logic to create of not there def conference_links - @conference_links ||= find_or_create_conference_links! + @conference_links ||= scheduled_date_passed? ? [] : find_or_create_conference_links! end def meeting_details_for_conference From 923991040a7adc126f43e0987649f41d92f1b90c Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 28 Sep 2023 11:10:02 -0400 Subject: [PATCH 211/445] Lint fix --- app/models/hearing_day.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/hearing_day.rb b/app/models/hearing_day.rb index 9f5acb1d544..91059a29a53 100644 --- a/app/models/hearing_day.rb +++ b/app/models/hearing_day.rb @@ -227,7 +227,7 @@ def conference_links def meeting_details_for_conference { - title: "Guest Link for #{scheduled_for.strftime("%b %e, %Y")}", + title: "Guest Link for #{scheduled_for.strftime('%b %e, %Y')}", start: scheduled_for.beginning_of_day.iso8601, end: scheduled_for.end_of_day.iso8601, timezone: "America/New_York" @@ -236,7 +236,7 @@ def meeting_details_for_conference private - #called through the 'before_destroy' callback on the hearing_day object. + # called through the 'before_destroy' callback on the hearing_day object. def soft_link_removal ConferenceLink.where(hearing_day: self).each(&:soft_removal_of_link) end From 671c4861d63e6bd501253ebea15dbc49feae4f12 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 28 Sep 2023 11:12:40 -0400 Subject: [PATCH 212/445] Update factory --- app/models/hearing_day.rb | 2 +- spec/factories/hearing_day.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/hearing_day.rb b/app/models/hearing_day.rb index 91059a29a53..0e0478d9a6d 100644 --- a/app/models/hearing_day.rb +++ b/app/models/hearing_day.rb @@ -238,7 +238,7 @@ def meeting_details_for_conference # called through the 'before_destroy' callback on the hearing_day object. def soft_link_removal - ConferenceLink.where(hearing_day: self).each(&:soft_removal_of_link) + ConferenceLink.where(hearing_day: self).find_each(&:soft_removal_of_link) end def assign_created_by_user diff --git a/spec/factories/hearing_day.rb b/spec/factories/hearing_day.rb index b20b63d7ea0..afeeff62e6d 100644 --- a/spec/factories/hearing_day.rb +++ b/spec/factories/hearing_day.rb @@ -27,14 +27,14 @@ trait :future_with_link do after(:create) do |hearing_day| - create(:conference_link, hearing_day: hearing_day) + create(:pexip_conference_link, hearing_day: hearing_day) end end trait :past_with_link do scheduled_for { 10.days.ago.to_formatted_s.split(" ")[0] } after(:create) do |hearing_day| - create(:conference_link, hearing_day: hearing_day) + create(:pexip_conference_link, hearing_day: hearing_day) end end end From f5323e14225216f5a504d47b16696dfcf4e79dad Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 28 Sep 2023 11:13:36 -0400 Subject: [PATCH 213/445] Go back to each --- app/models/hearing_day.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/hearing_day.rb b/app/models/hearing_day.rb index 0e0478d9a6d..91059a29a53 100644 --- a/app/models/hearing_day.rb +++ b/app/models/hearing_day.rb @@ -238,7 +238,7 @@ def meeting_details_for_conference # called through the 'before_destroy' callback on the hearing_day object. def soft_link_removal - ConferenceLink.where(hearing_day: self).find_each(&:soft_removal_of_link) + ConferenceLink.where(hearing_day: self).each(&:soft_removal_of_link) end def assign_created_by_user From 88929df4dc9be790b1fe76c22eef75729cb76cba Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 28 Sep 2023 11:34:42 -0400 Subject: [PATCH 214/445] Change var name --- app/jobs/virtual_hearings/delete_conferences_job.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jobs/virtual_hearings/delete_conferences_job.rb b/app/jobs/virtual_hearings/delete_conferences_job.rb index 37388dd7d5f..013b91d553c 100644 --- a/app/jobs/virtual_hearings/delete_conferences_job.rb +++ b/app/jobs/virtual_hearings/delete_conferences_job.rb @@ -141,7 +141,7 @@ def process_virtual_hearing(virtual_hearing) # Returns whether or not the conference was deleted from Pexip def delete_conference(virtual_hearing) response = client.delete_conference(conference_id: virtual_hearing.conference_id) - Rails.logger.info("#{virtual_hearing.meeting_type.capitalize} response: #{response}") + Rails.logger.info("#{virtual_hearing.conference_provider.capitalize} response: #{response}") fail response.error unless response.success? From 3073cb464b53af8b4370f21d96a50b0909de98da Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 28 Sep 2023 14:51:43 -0400 Subject: [PATCH 215/445] Add conference_provider to virtual hearing serializer --- app/serializers/hearings/virtual_hearing_serializer.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/serializers/hearings/virtual_hearing_serializer.rb b/app/serializers/hearings/virtual_hearing_serializer.rb index a3803336ccd..aee80a9d9cf 100644 --- a/app/serializers/hearings/virtual_hearing_serializer.rb +++ b/app/serializers/hearings/virtual_hearing_serializer.rb @@ -15,4 +15,5 @@ class VirtualHearingSerializer attribute :host_link, &:host_link attribute :guest_link, &:guest_link attribute :job_completed, &:job_completed? + attribute :conference_provider end From 684339ed01d6935b6a8563d8f24a3e95d9ba95af Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 28 Sep 2023 16:18:28 -0400 Subject: [PATCH 216/445] Fix tests --- spec/models/hearing_day_spec.rb | 47 +++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/spec/models/hearing_day_spec.rb b/spec/models/hearing_day_spec.rb index 0779329e713..752e59ccbe8 100644 --- a/spec/models/hearing_day_spec.rb +++ b/spec/models/hearing_day_spec.rb @@ -579,9 +579,7 @@ def format_begins_at_from_db(time_string, scheduled_for) end it "Both conference links are created whenever requested" do - expect(subject.pluck(:type)).to match_array( - [PexipConferenceLink.name, WebexConferenceLink.name] - ) + expect(subject).to eq [] end end @@ -595,7 +593,7 @@ def format_begins_at_from_db(time_string, scheduled_for) before { FeatureToggle.enable!(:pexip_conference_service) } it "Only the Pexip conference link is generated whenever requested" do - expect(subject.pluck(:type)).to match_array [PexipConferenceLink.name] + expect(subject).to eq [] end end @@ -603,7 +601,7 @@ def format_begins_at_from_db(time_string, scheduled_for) before { FeatureToggle.enable!(:webex_conference_service) } it "Only the Webex conference link is generated whenever requested" do - expect(subject.pluck(:type)).to match_array [WebexConferenceLink.name] + expect(subject).to eq [] end end end @@ -644,9 +642,6 @@ def format_begins_at_from_db(time_string, scheduled_for) allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return "mysecretkey" allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return "example.va.gov" allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return "/sample" - - FeatureToggle.enable!(:pexip_conference_service) - FeatureToggle.enable!(:webex_conference_service) end let(:hearing_day) do @@ -662,9 +657,39 @@ def format_begins_at_from_db(time_string, scheduled_for) subject { hearing_day.conference_links } - it "Given that the hearing day does not have a existing conference - and is scheduled for the future, a conference link will be created" do - expect(subject.count).to eq(2) + context "The Pexip and Webex services are both enabled" do + before do + FeatureToggle.enable!(:pexip_conference_service) + FeatureToggle.enable!(:webex_conference_service) + end + + it "Both conference links are created whenever requested" do + expect(subject.pluck(:type)).to match_array( + [PexipConferenceLink.name, WebexConferenceLink.name] + ) + end + end + + context "The Pexip and Webex services are both disabled" do + it "No links are created whenever they are requested" do + expect(subject).to eq [] + end + end + + context "Only the Pexip service is disabled" do + before { FeatureToggle.enable!(:pexip_conference_service) } + + it "Only the Pexip conference link is generated whenever requested" do + expect(subject.pluck(:type)).to match_array [PexipConferenceLink.name] + end + end + + context "Only the Webex service is disabled" do + before { FeatureToggle.enable!(:webex_conference_service) } + + it "Only the Webex conference link is generated whenever requested" do + expect(subject.pluck(:type)).to match_array [WebexConferenceLink.name] + end end end end From 32461b74b0d15a96507ed74d2b6c8194f60be785 Mon Sep 17 00:00:00 2001 From: 631862 Date: Thu, 28 Sep 2023 16:41:19 -0400 Subject: [PATCH 217/445] change meetingType to conferenceProvider --- .../components/details/VirtualHearingFields.jsx | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/client/app/hearings/components/details/VirtualHearingFields.jsx b/client/app/hearings/components/details/VirtualHearingFields.jsx index a350bfa11c3..aae423ad736 100644 --- a/client/app/hearings/components/details/VirtualHearingFields.jsx +++ b/client/app/hearings/components/details/VirtualHearingFields.jsx @@ -5,6 +5,7 @@ import { css } from 'glamor'; import { ContentSection } from '../../../components/ContentSection'; import { HearingLinks } from './HearingLinks'; import { HearingsUserContext } from '../../contexts/HearingsUserContext'; +import StringUtil from '../../../util/StringUtil'; export const VirtualHearingFields = ( { hearing, virtualHearing } @@ -14,15 +15,13 @@ export const VirtualHearingFields = ( } const user = useContext(HearingsUserContext); - const conferenceProvider = virtualHearing.conferenceProvider; - const formattedConferenceProvider = conferenceProvider.charAt(0).toUpperCase() + conferenceProvider.slice(1); return (
    - {formattedConferenceProvider} Conference + {StringUtil.capitalizeFirst(hearing.conferenceProvider)} Conference
    Date: Fri, 29 Sep 2023 12:29:23 -0400 Subject: [PATCH 218/445] update conference provider logic to account for null situations and add addittional tests for virtual hearing fields --- .../details/VirtualHearingFields.jsx | 2 +- .../details/VirtualHearingFields.test.js | 90 +- .../VirtualHearingFields.test.js.snap | 3078 +++++++++++++++++ db/schema.rb | 12 +- 4 files changed, 3173 insertions(+), 9 deletions(-) diff --git a/client/app/hearings/components/details/VirtualHearingFields.jsx b/client/app/hearings/components/details/VirtualHearingFields.jsx index bf37ed88703..72f6b08333d 100644 --- a/client/app/hearings/components/details/VirtualHearingFields.jsx +++ b/client/app/hearings/components/details/VirtualHearingFields.jsx @@ -21,7 +21,7 @@ export const VirtualHearingFields = ( header={`${hearing?.wasVirtual ? 'Previous ' : ''}Virtual Hearing Links`} >
    - {StringUtil.capitalizeFirst(hearing.conferenceProvider)} Conference + {StringUtil.capitalizeFirst(hearing.conferenceProvider || 'Pexip')} Conference
    { expect(virtualHearingForm).toMatchSnapshot(); }); -}) -; + + test('Renders webex conference when conference provider is webex', () => { + const webexHearing = { + ...amaHearing, + conferenceProvider: 'webex' + }; + + // Run the test + const virtualHearingForm = mount( + , + + { + wrappingComponent: hearingDetailsWrapper(anyUser, webexHearing), + wrappingComponentProps: { store: detailsStore } + } + ); + + // Assertions + expect(virtualHearingForm.text().includes('Webex Conference')).toBeTruthy(); + + expect(virtualHearingForm).toMatchSnapshot(); + }); + + test('Renders pexip conference when conference provider is pexip', () => { + const webexHearing = { + ...amaHearing, + conferenceProvider: 'pexip' + }; + + // Run the test + const virtualHearingForm = mount( + , + + { + wrappingComponent: hearingDetailsWrapper(anyUser, webexHearing), + wrappingComponentProps: { store: detailsStore } + } + ); + + // Assertions + expect(virtualHearingForm.text().includes('Pexip Conference')).toBeTruthy(); + + expect(virtualHearingForm).toMatchSnapshot(); + }); + + test('Renders pexip conference when conference provider is null', () => { + const webexHearing = { + ...amaHearing, + conferenceProvider: null + }; + + // Run the test + const virtualHearingForm = mount( + , + + { + wrappingComponent: hearingDetailsWrapper(anyUser, webexHearing), + wrappingComponentProps: { store: detailsStore } + } + ); + + // Assertions + expect(virtualHearingForm.text().includes('Pexip Conference')).toBeTruthy(); + + expect(virtualHearingForm).toMatchSnapshot(); + }); +}); diff --git a/client/test/app/hearings/components/details/__snapshots__/VirtualHearingFields.test.js.snap b/client/test/app/hearings/components/details/__snapshots__/VirtualHearingFields.test.js.snap index 1c0ad49c46d..d746f6f92fd 100644 --- a/client/test/app/hearings/components/details/__snapshots__/VirtualHearingFields.test.js.snap +++ b/client/test/app/hearings/components/details/__snapshots__/VirtualHearingFields.test.js.snap @@ -98,6 +98,3084 @@ exports[`VirtualHearingFields Matches snapshot with default props 1`] = ` /> `; +exports[`VirtualHearingFields Renders pexip conference 1`] = ` + + +
    +

    + Virtual Hearing Links +

    +
    +
    + + Pexip + Conference + +
    + +
    + +

    -
    -
    -
    -`; - -exports[`DailyDocketGuestLinkSection renders correctly for hearing admins and hearing management users if the hearing date is passed 1`] = ` -
    -
    -

    - Guest links for non-virtual hearings -

    -
    -

    - Conference Room - : - - N/A - -

    -

    - PIN - : - - N/A - -

    -

    - - - - -

    -
    -
    -
    -`; - -exports[`DailyDocketGuestLinkSection renders correctly for non hearing admins and hearing management users 1`] = ` -
    -
    -

    - Guest links for non-virtual hearings -

    -
    -

    - Conference Room - : - - BVA0000001@caseflow.va.gov - -

    -

    - PIN - : - - 3998472 - # - -

    -

    - - - - -

    -
    -
    -
    -`; - -exports[`DailyDocketGuestLinkSection renders correctly for non hearing admins and hearing management users if the hearing date is passed 1`] = ` -
    -
    -

    - Guest links for non-virtual hearings -

    -
    -

    - Conference Room - : - - N/A - -

    -

    - PIN - : - - N/A - -

    -

    - - - - -

    -
    -
    -
    -`; From f8c2eacaf908199e4dbdee244ad12c2057411f32 Mon Sep 17 00:00:00 2001 From: breedbah Date: Tue, 10 Oct 2023 13:09:26 -0400 Subject: [PATCH 232/445] APPEALS-25116 update positioning logic --- .../DailyDocketGuestLinkSection.jsx | 43 ++++++++++++------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx b/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx index e9ed82da193..8b1e5de55fc 100644 --- a/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx +++ b/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx @@ -99,16 +99,17 @@ export const DailyDocketGuestLinkSection = ({ linkInfo }) => { {GUEST_LINK_LABELS.GUEST_CONFERENCE_ROOM} {alias || 'N/A'} -

    - {GUEST_LINK_LABELS.GUEST_PIN} - {linkGuestPin ? ( + {linkGuestPin === 'N/A' ? ( +

    + {GUEST_LINK_LABELS.GUEST_PIN} { display: 'flex', }} > - {linkGuestPin} + N/A - ) : ( +

    + ) : ( +

    + {GUEST_LINK_LABELS.GUEST_PIN} - N/A + {linkGuestPin} - )} -

    + + )}

    Date: Wed, 11 Oct 2023 09:24:21 -0400 Subject: [PATCH 233/445] APPEALS-25116 edge case update --- .../components/dailyDocket/DailyDocketGuestLinkSection.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx b/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx index 8b1e5de55fc..8cab64a5d8b 100644 --- a/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx +++ b/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx @@ -64,7 +64,7 @@ export const DailyDocketGuestLinkSection = ({ linkInfo }) => { const renderRoomInfo = () => { return (
    - {Object.values(linkInfo).map((link, index) => { + {linkInfo && Object.values(linkInfo).map((link, index) => { const { guestLink, type } = link; CopyTextButtonProps.textToCopy = guestLink; From b42ae3fcaad1d5042bb3606f2c72be5637d7b63e Mon Sep 17 00:00:00 2001 From: breedbah Date: Wed, 11 Oct 2023 10:46:24 -0400 Subject: [PATCH 234/445] APPEALS-25116 update hearing day controller --- app/controllers/hearings/hearing_day_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/hearings/hearing_day_controller.rb b/app/controllers/hearings/hearing_day_controller.rb index 7b7e8a0514d..87ebcd3e1d4 100644 --- a/app/controllers/hearings/hearing_day_controller.rb +++ b/app/controllers/hearings/hearing_day_controller.rb @@ -89,7 +89,9 @@ def create def update hearing_day.update!(update_params) - render json: hearing_day.to_hash + render json: hearing_day.to_hash.merge( + conference_links: ::HearingDaySerializer.serialize_conference_links(hearing_day.conference_links) + ) end def destroy From a0bedfe4dcaa9743a1e23fb07c167951e08bd861 Mon Sep 17 00:00:00 2001 From: breedbah Date: Wed, 11 Oct 2023 12:03:28 -0400 Subject: [PATCH 235/445] APPEALS-25116 removed guestPin regex --- .../components/dailyDocket/DailyDocketGuestLinkSection.jsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx b/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx index 8cab64a5d8b..7ce0d114c8c 100644 --- a/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx +++ b/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx @@ -44,9 +44,7 @@ export const DailyDocketGuestLinkSection = ({ linkInfo }) => { const extractPin = (link) => { if (link.type === 'PexipConferenceLink') { - return ( - `${link.guestPin}#` || `${link.guestLink?.match(/pin=(\d+)/)?.[1]}#` - ); + return `${link.guestPin}#`; } else if (link.type === 'WebexConferenceLink') { return 'N/A'; } From 0c3b54a3daf9a8fd33711826685a839611e0011a Mon Sep 17 00:00:00 2001 From: breedbah Date: Thu, 12 Oct 2023 15:03:59 -0400 Subject: [PATCH 236/445] APPEALS-31996 removed webex-mocks and its contents --- client/mocks/webex-mocks/README.md | 59 ----- client/mocks/webex-mocks/meetingData.js | 37 --- client/mocks/webex-mocks/routes.json | 4 - .../mocks/webex-mocks/webex-mock-generator.js | 50 ---- client/mocks/webex-mocks/webex-mock-server.js | 231 ------------------ client/package.json | 4 +- 6 files changed, 1 insertion(+), 384 deletions(-) delete mode 100644 client/mocks/webex-mocks/README.md delete mode 100644 client/mocks/webex-mocks/meetingData.js delete mode 100644 client/mocks/webex-mocks/routes.json delete mode 100644 client/mocks/webex-mocks/webex-mock-generator.js delete mode 100644 client/mocks/webex-mocks/webex-mock-server.js diff --git a/client/mocks/webex-mocks/README.md b/client/mocks/webex-mocks/README.md deleted file mode 100644 index cca7ce34640..00000000000 --- a/client/mocks/webex-mocks/README.md +++ /dev/null @@ -1,59 +0,0 @@ -Setup json server - -Step 1: Open a terminal - -Step 2: Navigate to the caseflow/client - -step 3: Run command: [npm install json-server] or [yarn add json-server] - -If the [npm install json-server] or [yarn add json-server] returns an error that resembles: - -error standard@17.1.0: The engine "node" is incompatible with this module. Expected version "^12.22.0 || ^14.17.0 || >=16.0.0". Got "15.1.0" - -extra steps may need to be taken. - -for brevity These instructions will follow the happy path. While in the client directory in terminal: -[nodenv install 14.21.2] -[nodenv local 14.21.2] - -If for any reason you want to go back to the original nodenv that was used prior to this change you can run, [nodenv local 12.13.0] - -If it all succeeds you can attempt the [npm install json-server] or [yarn add json-server] once again. - -This time with no issue. -given that the install goes as expected you can continue following the rest of the directions. - -If there are still issues in getting this to operate as expected, See your tech lead for asssisstance. - -step 4: Make sure casfelow application is running - -step 5: Autogenerate test data, run this command: npm run generate-webex(This will also create the json file) - -step 6: Run command: npm run webex-server - -\*info: You will recieve all available routes within the terminal under 'Resources' - -\*info: port must be set on a different port to run due to caseflow running on port 3000 - -step 7: Open a browser window in chrome and navigate to localhost:3050 [You will get the default page] - -\*info: You can use any api endpoint software you want like Postman, but a good lightweight vs code ext. is [Thunder Client] - -\*info: reference guides -[https://github.com/typicode/json-server/blob/master/README.md] - -Tutorial Resources: -[https://www.youtube.com/watch?v=_1kNqAybxW0&list=PLC3y8-rFHvwhc9YZIdqNL5sWeTCGxF4ya&index=1] - -To create a meeting the request body must have all of the keys and hit this endpoint? -[http://localhost:3050/fake.api-usgov.webex.com/v1/meetings] - -Get all conferencelinks with this endpoint -[http://localhost:3050/api/v1/conference-links] - -Javascript API call Fetch/Axios examples -[https://jsonplaceholder.typicode.com/] - - - - diff --git a/client/mocks/webex-mocks/meetingData.js b/client/mocks/webex-mocks/meetingData.js deleted file mode 100644 index 0ed5772a76e..00000000000 --- a/client/mocks/webex-mocks/meetingData.js +++ /dev/null @@ -1,37 +0,0 @@ -const faker = require('faker'); - -const generateMeetingData = (response) => { - - return { - id: faker.random.uuid(), - jwt: { - sub: response.jwt.sub, - Nbf: response.jwt.Nbf, - Exp: response.jwt.Exp, - flow: { - id: faker.random.uuid(), - data: [ - { - uri: `${faker.internet.userName()}@intadmin.room.wbx2.com`, - }, - { - uri: `${faker.internet.userName()}@intadmin.room.wbx2.com`, - }, - ], - }, - }, - aud: faker.random.uuid(), - numGuest: faker.random.number({ min: 1, max: 10 }), - numHost: 1, - provideShortUrls: faker.random.boolean(), - verticalType: faker.company.catchPhrase(), - loginUrlForHost: faker.random.boolean(), - jweAlg: 'PBES2-HS512+A256KW', - saltLength: faker.random.number({ min: 1, max: 16 }), - iterations: faker.random.number({ min: 500, max: 2000 }), - enc: 'A256GCM', - jwsAlg: 'HS512', - }; -}; - -module.exports = generateMeetingData; diff --git a/client/mocks/webex-mocks/routes.json b/client/mocks/webex-mocks/routes.json deleted file mode 100644 index 77567effdf6..00000000000 --- a/client/mocks/webex-mocks/routes.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "/api/v1/conference-links": "/conferenceLinks", - "/api/v1/conference-links/:id": "/conferenceLinks/:id" - } diff --git a/client/mocks/webex-mocks/webex-mock-generator.js b/client/mocks/webex-mocks/webex-mock-generator.js deleted file mode 100644 index 6f8a108f5ee..00000000000 --- a/client/mocks/webex-mocks/webex-mock-generator.js +++ /dev/null @@ -1,50 +0,0 @@ -const fs = require('fs'); -const faker = require('faker'); -const generateMeetingData = require('./meetingData.js'); - -const generateConferenceLinks = () => { - let webexLinks = []; - - for (let id = 1; id <= 10; id++) { - const startDate = new Date('2021-01-01T00:00:00Z'); - const endDate = new Date('2023-01-01T00:00:00Z'); - - const randomStartDate = faker.date.between(startDate, endDate); - const randomEndDate = new Date(randomStartDate.getTime()); - - randomEndDate.setHours(randomEndDate.getHours() + 1); - - let startTime = randomStartDate.toISOString().replace('Z', ''); - let endTime = randomEndDate.toISOString().replace('Z', ''); - - let subject = faker.lorem.words(); - - let updatedValues = { - jwt: { - sub: subject, - Nbf: startTime, - Exp: endTime - } - }; - - webexLinks.push(generateMeetingData(updatedValues)); - } - - return webexLinks; -}; - -// Generate the data -const data = { - conferenceLinks: generateConferenceLinks(), - // ... other data models -}; - -// Check if the script is being run directly -if (require.main === module) { - fs.writeFileSync( - 'mocks/webex-mocks/webex-mock.json', - JSON.stringify(data, null, 2) - ); - // eslint-disable-next-line no-console - console.log("Generated new data in webex-mock.json"); -} diff --git a/client/mocks/webex-mocks/webex-mock-server.js b/client/mocks/webex-mocks/webex-mock-server.js deleted file mode 100644 index 884bf9b2810..00000000000 --- a/client/mocks/webex-mocks/webex-mock-server.js +++ /dev/null @@ -1,231 +0,0 @@ -const jsonServer = require('json-server'); -const server = jsonServer.create(); -const path = require('path'); -const router = jsonServer.router( - path.join('mocks/webex-mocks/webex-mock.json') -); -const generateMeetingData = require('./meetingData.js'); - -const middlewares = jsonServer.defaults(); -const routesRewrite = require('./routes.json'); - -server.use(middlewares); -server.use(jsonServer.bodyParser); - -// Apply the routes rewrites -server.use(jsonServer.rewriter(routesRewrite)); - -// Custom error routes and handlers -server.get('/error-400', (req, res) => { - res.status(400).json({ - message: 'The request was invalid or cannot be otherwise served.', - }); -}); - -server.get('/error-401', (req, res) => { - res.status(401).json({ - message: 'Authentication credentials were missing or incorrect.', - }); -}); - -server.get('/error-403', (req, res) => { - res.status(403).json({ - message: - 'The request is understood, but it has been refused or access is not allowed', - }); -}); - -server.get('/error-405', (req, res) => { - res.status(405).json({ - message: - 'The request was made to a resource using an HTTP request method that is not supported.', - }); -}); - -server.get('/error-409', (req, res) => { - res.status(409).json({ - message: - 'The request could not be processed because it conflicts with some established rule of the system.', - }); -}); - -server.get('/error-410', (req, res) => { - res.status(410).json({ - message: 'The requested resource is no longer available.', - }); -}); - -server.get('/error-415', (req, res) => { - res.status(415).json({ - message: - 'The request was made to a resource without specifying a media type or used a media type that is not supported.', - }); -}); - -server.get('/error-423', (req, res) => { - res.status(423).json({ - message: 'The requested resource is temporarily unavailable', - }); -}); - -server.get('/error-428', (req, res) => { - res.status(428).json({ - message: - 'File(s) cannot be scanned for malware and need to be force downloaded.', - }); -}); - -server.get('/error-429', (req, res) => { - res.status(429).json({ - message: - 'Too many requests have been sent in a given amount of time and the request has been rate limited.', - }); -}); - -server.get('/error-500', (req, res) => { - res.status(500).json({ - message: 'Something went wrong on the server.', - }); -}); - -server.get('/error-502', (req, res) => { - res.status(502).json({ - message: - 'The server received an invalid response from an upstream server while processing the request.', - }); -}); - -server.get('/error-503', (req, res) => { - res.status(503).json({ - message: 'Server is overloaded with requests. Try again later.', - }); -}); - -server.get('/error-504', (req, res) => { - res.status(504).json({ - message: - 'An upstream server failed to respond on time. If your query uses max parameter, please try to reduce it.', - }); -}); - -server.get('/health-check-yellow', (req, res) => { - res.status(200).json({ - status: 'yellow', - }); -}); - -server.get('/health-check-red', (req, res) => { - res.status(200).json({ - status: 'red', - }); -}); - -server.get('/health-check-green', (req, res) => { - res.status(200).json({ - status: 'green', - }); -}); - -const requiredKeys = [ - 'jwt', - 'aud', - 'numGuest', - 'numHost', - 'provideShortUrls', - 'verticalType', - 'loginUrlForHost', - 'jweAlg', - 'saltLength', - 'iterations', - 'enc', - 'jwsAlg' -]; - -server.post('/fake.api-usgov.webex.com/v1/meetings', (req, res) => { - const requestBody = req.body; - - // Check if all required keys are present - const missingKeys = requiredKeys.filter((key) => !(key in requestBody)); - - if (missingKeys.length > 0) { - res.status(400).json({ message: 'Missing required keys', missingKeys }); - } else if (!requestBody.jwt.sub || !requestBody.jwt.Nbf || !requestBody.jwt.Exp) { - res.status(400).json({ - message: 'Missing required params', - }); - } else { - - const db = router.db; - const conferenceLinks = db.get('conferenceLinks'); - - // Add generateMeetingData object to conferenceLinks - conferenceLinks.push(generateMeetingData(requestBody)).write(); - - res.status(200).json(generateMeetingData(requestBody)); - } -}); - -server.use(router); - -const errorRoutes = [ - '/error-400', - '/error-401', - '/error-403', - '/error-404', - '/error-405', - '/error-409', - '/error-410', - '/error-415', - '/error-423', - '/error-428', - '/error-429', - '/error-500', - '/error-502', - '/error-503', - '/error-504', - '/health-check-yellow', - '/health-check-red', - '/health-check-green', -]; - -server.listen(3050, () => { - /* eslint-disable no-console */ - console.log(' \\{^_^}/ hi!\n'); - console.log(' Loading mocks/webex-mocks/webex-mock.json'); - console.log(' Done\n'); - - console.log(' Resources:'); - - // Original routes from the database state - const originalRoutes = Object.keys(router.db.getState()); - - // Rewritten routes based on the routes.json rewrites - const rewrittenRoutes = originalRoutes.map((route) => { - for (let key in routesRewrite) { - if (routesRewrite[key] === `/${route}`) { - // returning the custom path - return key; - } - } - - return `/${route}`; - }); - - rewrittenRoutes.forEach((route) => { - console.log(` http://localhost:3050${route}`); - }); - - console.log('\n Error Routes:'); - errorRoutes.forEach((route) => { - console.log(` ${route}`); - }); - - console.log('\n Home'); - console.log(' http://localhost:3050'); - - console.log( - '\n Type s + enter at any time to create a snapshot of the database' - ); - console.log('Watching...'); - /* eslint-enable no-console */ -}); diff --git a/client/package.json b/client/package.json index 48aa510f47f..cf5659b8105 100644 --- a/client/package.json +++ b/client/package.json @@ -25,9 +25,7 @@ "dev": "yarn run dev:clear-build && NODE_ENV=development yarn run build -w", "dev:hot": "webpack-dev-server", "storybook": "start-storybook -p 6006", - "build:storybook": "build-storybook -o ../public/storybook", - "webex-server": "node mocks/webex-mocks/webex-mock-server", - "generate-webex": "node mocks/webex-mocks/webex-mock-generator.js" + "build:storybook": "build-storybook -o ../public/storybook" }, "cacheDirectories": [ "node_modules", From 2b843513b2960ce715d0a10611ba81fe2b5ac726 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 13 Oct 2023 12:12:16 -0400 Subject: [PATCH 237/445] Meetings API to IC --- config/environments/development.rb | 3 + config/environments/test.rb | 3 + lib/fakes/webex_service.rb | 155 ++++++++--------------------- 3 files changed, 50 insertions(+), 111 deletions(-) diff --git a/config/environments/development.rb b/config/environments/development.rb index 9822cd7b692..eb186e3d702 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -139,4 +139,7 @@ config.efolder_key = "token" config.google_analytics_account = "UA-74789258-5" + + # Webex Environmental Variables + ENV["WEBEX_API_URL"] ||= "https://instant-usgov.webex.com/visit/" end diff --git a/config/environments/test.rb b/config/environments/test.rb index fff81c6c7a2..01da192a423 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -135,4 +135,7 @@ ENV["PACMAN_API_TOKEN_SECRET"] ||= "client-secret" ENV["PACMAN_API_TOKEN_ISSUER"] ||= "issuer-of-our-token" ENV["PACMAN_API_SYS_ACCOUNT"] ||= "CSS_ID_OF_OUR_ACCOUNT" + + # Webex Environmental Variables + ENV["WEBEX_API_URL"] ||= "https://instant-usgov.webex.com/visit/" end diff --git a/lib/fakes/webex_service.rb b/lib/fakes/webex_service.rb index 66ded630936..5976679c672 100644 --- a/lib/fakes/webex_service.rb +++ b/lib/fakes/webex_service.rb @@ -1,82 +1,30 @@ # frozen_string_literal: true class Fakes::WebexService - DEFAULT_MEETING_PROPERTIES = { - hostUserId: Faker::Alphanumeric.alphanumeric(number: 79), - hostDisplayName: "BVA Caseflow", - hostEmail: "testaccount@admindomain.com", - hostKey: "123456", - siteUrl: "test.webex.com", - webLink: "https://test.webex.com/not-real/j.php?MTID=m#{Faker::Alphanumeric.alphanumeric(number: 32).downcase}", - sipAddress: "12345678910@test.webex.com", - dialInIpAddress: "", - enabledAutoRecordMeeting: false, - allowAnyUserToBeCoHost: false, - allowFirstUserToBeCoHost: false, - allowAuthenticatedDevices: true, - enabledJoinBeforeHost: false, - joinBeforeHostMinutes: 0, - enableConnectAudioBeforeHost: false, - excludePassword: false, - publicMeeting: false, - enableAutomaticLock: false, - meetingType: "meetingSeries", - state: "active", - unlockedMeetingJoinSecurity: "allowJoinWithLobby", - meetingOptions: { - enabledChat: true, - enabledVideo: true, - enabledNote: true, - noteType: "allowAll", - enabledFileTransfer: true, - enabledUCFRichMedia: true - }, - attendeePrivileges: { - enabledShareContent: true, - enabledSaveDocument: false, - enabledPrintDocument: false, - enabledAnnotate: false, - enabledViewParticipantList: true, - enabledViewThumbnails: false, - enabledRemoteControl: true, - enabledViewAnyDocument: false, - enabledViewAnyPage: false, - enabledContactOperatorPrivately: false, - enabledChatHost: true, - enabledChatPresenter: true, - enabledChatOtherParticipants: true - }, - sessionTypeId: 3, - scheduledType: "meeting", - simultaneousInterpretation: { - enabled: false - }, - enabledBreakoutSessions: false, - audioConnectionOptions: { - audioConnectionType: "webexAudio", - enabledTollFreeCallIn: false, - enabledGlobalCallIn: true, - enabledAudienceCallBack: false, - entryAndExitTone: "beep", - allowHostToUnmuteParticipants: false, - allowAttendeeToUnmuteSelf: true, - muteAttendeeUponEntry: true - } - }.freeze + SAMPLE_CIPHER = "eyJwMnMiOiJvUlZHZENlck9OanYxWjhLeHRub3p4NklPUUNzTVdEdWFMakRXR09kLTh4Tk91OUVyWDQ1aUZ6TG5FY" \ + "nlJeTZTam40Vk1kVEZHU1pyaE5pRiIsInAyYyI6MzIzMzAsImF1ZCI6ImE0ZDg4NmIwLTk3OWYtNGUyYy1hOTU4LT" \ + "NlOGMxNDYwNWU1MSIsImlzcyI6IjU0OWRhYWNiLWJmZWUtNDkxOS1hNGU0LWMwOTQ0YTY0ZGUyNSIsImN0eSI6Ikp" \ + "XVCIsImVuYyI6IkEyNTZHQ00iLCJhbGciOiJQQkVTMi1IUzUxMitBMjU2S1cifQ.cm6FWc6Bl4vB_utAc_bswG82m" \ + "UXhxkITkI0tZDGzzh5TKdoWSS1Mjw.L8mGls6Kp3lsa8Wz.fLen-yV2sTpWlkLFCszQjcG5V9FhJVwoNB9Ky9BgCp" \ + "T46cFWUe-wmyn1yIZcGxFcDcwhhKwW3PVuQQ1xjl-z63o67esrvaWAjgglSioKiOFTJF1M94d4gVj2foSQtYKzR8S" \ + "nI6wW5X5KShcVjxjchT7xDNxnHtIZoG-Zda_aOOfz_WK18rhNcyvb-BY7cSwTMhbnuuXO0-cuJ7wNyDbvqEfWXALf" \ + "j87a2_WopcwK-x-8TQ20bzZKUrugt0FRj6VKxOCzxDhozmWDFMRu8Dpj2UrS7Fo-JQf_I1oN0O-Dwf5r8ItcNQEu5" \ + "X0tcRazhrHSNWfOL2DOaDyHawi4oxc7MqaNRxxyrpy2qYw06_TzBwRKlMFZ8fT7-GJbDlE3nqWlNw3mlRuvhu80CH" \ + "SO5RK5a1obU4sfLX0Fsxl-csC-1QjcHuKOSP_ozb6l7om-WeOdbSV99Fjy68egjH1NhMQIcVwpG0fy2j8r3sN4nz0" \ + "RSe3LXoK78JqRxk6XuaQCDkr6TmG5YjHQ2FFw1tP1ekHpNIL2oJNVAKKPgget7LRuSiM6jg.628e3hFPmZCoqXuyY" \ + "2OriQ" def initialize(**args) - @status_code = args[:status_code] + @status_code = args[:status_code] || 200 @error_message = args[:error_message] || "Error" + @num_hosts = args[:num_hosts] || 1 + @num_guests = args[:num_guests] || 1 end - def create_conference(conferenced_item) + def create_conference(**args) if error? return ExternalApi::WebexService::CreateResponse.new( - HTTPI::Response.new( - @status_code, - {}, - error_response - ) + HTTPI::Response.new(@status_code, {}, error_response) ) end @@ -84,25 +32,46 @@ def create_conference(conferenced_item) HTTPI::Response.new( 200, {}, - generate_meetings_api_conference(conferenced_item) + build_meeting_response ) ) end - def delete_conference(conference_id:) + def delete_conference(*) if error? return ExternalApi::WebexService::DeleteResponse.new( - HTTPI::Response.new( - @status_code, {}, error_response - ) + HTTPI::Response.new(@status_code, {}, error_response) ) end - ExternalApi::WebexService::DeleteResponse.new(HTTPI::Response.new(204, {}, {})) + ExternalApi::WebexService::DeleteResponse.new( + HTTPI::Response.new( + 200, + {}, + build_meeting_response + ) + ) end private + def build_meeting_response + { + host: link_info(@num_hosts), + guest: link_info(@num_guests), + baseUrl: ENV["WEBEX_API_URL"] + } + end + + def link_info(num_links = 1) + Array.new(num_links).map do + { + cipher: SAMPLE_CIPHER, + short: Faker::Alphanumeric.alphanumeric(number: 7, min_alpha: 3, min_numeric: 1) + } + end + end + def error? [ 400, 401, 403, 404, 405, 409, 410, @@ -119,40 +88,4 @@ def error_response trackingId: "ROUTER_#{SecureRandom.uuid}" } end - - def telephony_options(conf_id, meeting_num) - { - telephony: { - accessCode: meeting_num, - callInNumbers: [ - { - label: "United States Toll", - callInNumber: Faker::PhoneNumber.phone_number, - tollType: "toll" - } - ], - links: [ - { - rel: "globalCallinNumbers", - href: "/v1/meetings/#{conf_id}/globalCallinNumbers", - method: "GET" - } - ] - } - } - end - - def generate_meetings_api_conference(conferenced_item) - conf_id = Faker::Alphanumeric.alphanumeric(number: 32).downcase - meeting_num = Faker::Number.number(digits: 11) - - { - id: conf_id, - meetingNumber: meeting_num, - password: Faker::Alphanumeric.alphanumeric(number: 11, min_alpha: 3, min_numeric: 3), - phoneAndVideoSystemPassword: Faker::Number.number(digits: 8) - }.merge(telephony_options(conf_id, meeting_num)) - .merge(DEFAULT_MEETING_PROPERTIES) - .merge(conferenced_item.meeting_details_for_conference) - end end From d8a043233dc50376f2ae2e6a2fbe8f6324f76d3b Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 13 Oct 2023 12:13:32 -0400 Subject: [PATCH 238/445] Remove env var for now --- config/environments/development.rb | 3 --- config/environments/test.rb | 3 --- lib/fakes/webex_service.rb | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/config/environments/development.rb b/config/environments/development.rb index eb186e3d702..9822cd7b692 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -139,7 +139,4 @@ config.efolder_key = "token" config.google_analytics_account = "UA-74789258-5" - - # Webex Environmental Variables - ENV["WEBEX_API_URL"] ||= "https://instant-usgov.webex.com/visit/" end diff --git a/config/environments/test.rb b/config/environments/test.rb index 01da192a423..fff81c6c7a2 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -135,7 +135,4 @@ ENV["PACMAN_API_TOKEN_SECRET"] ||= "client-secret" ENV["PACMAN_API_TOKEN_ISSUER"] ||= "issuer-of-our-token" ENV["PACMAN_API_SYS_ACCOUNT"] ||= "CSS_ID_OF_OUR_ACCOUNT" - - # Webex Environmental Variables - ENV["WEBEX_API_URL"] ||= "https://instant-usgov.webex.com/visit/" end diff --git a/lib/fakes/webex_service.rb b/lib/fakes/webex_service.rb index 5976679c672..03d53e831d3 100644 --- a/lib/fakes/webex_service.rb +++ b/lib/fakes/webex_service.rb @@ -59,7 +59,7 @@ def build_meeting_response { host: link_info(@num_hosts), guest: link_info(@num_guests), - baseUrl: ENV["WEBEX_API_URL"] + baseUrl: "https://instant-usgov.webex.com/visit/" } end From 2243e3880f680b2c2e6f43a2cb2b42ce9471c3d4 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Fri, 13 Oct 2023 14:15:52 -0400 Subject: [PATCH 239/445] Create subject_for_conference --- app/models/hearing_day.rb | 9 ++------- app/models/hearings/virtual_hearing.rb | 9 ++------- spec/models/hearing_day_spec.rb | 11 +++-------- spec/models/hearings/virtual_hearing_spec.rb | 9 +++------ 4 files changed, 10 insertions(+), 28 deletions(-) diff --git a/app/models/hearing_day.rb b/app/models/hearing_day.rb index 91059a29a53..10be623cc0e 100644 --- a/app/models/hearing_day.rb +++ b/app/models/hearing_day.rb @@ -225,13 +225,8 @@ def conference_links @conference_links ||= scheduled_date_passed? ? [] : find_or_create_conference_links! end - def meeting_details_for_conference - { - title: "Guest Link for #{scheduled_for.strftime('%b %e, %Y')}", - start: scheduled_for.beginning_of_day.iso8601, - end: scheduled_for.end_of_day.iso8601, - timezone: "America/New_York" - } + def subject_for_conference + "Guest Link for #{scheduled_for.strftime('%b %e, %Y')}" end private diff --git a/app/models/hearings/virtual_hearing.rb b/app/models/hearings/virtual_hearing.rb index 5311c6bdd2c..d4fa8e66abc 100644 --- a/app/models/hearings/virtual_hearing.rb +++ b/app/models/hearings/virtual_hearing.rb @@ -278,15 +278,10 @@ def rebuild_and_save_links update!(host_hearing_link: link_service.host_link, guest_hearing_link: link_service.guest_link) end - def meeting_details_for_conference + def subject_for_conference appeal = hearing.appeal - { - title: "#{appeal.docket_number}_#{appeal.id}_#{appeal.class}", - start: hearing.scheduled_for.beginning_of_day.iso8601, - end: hearing.scheduled_for.end_of_day.iso8601, - timezone: hearing.scheduled_for.time_zone.name - } + "#{appeal.docket_number}_#{appeal.id}_#{appeal.class}" end private diff --git a/spec/models/hearing_day_spec.rb b/spec/models/hearing_day_spec.rb index 752e59ccbe8..c6a95d0630b 100644 --- a/spec/models/hearing_day_spec.rb +++ b/spec/models/hearing_day_spec.rb @@ -606,7 +606,7 @@ def format_begins_at_from_db(time_string, scheduled_for) end end - context "#meeting_details_for_conference" do + context "#subject_for_conference" do before do FeatureToggle.enable!(:pexip_conference_service) FeatureToggle.enable!(:webex_conference_service) @@ -625,15 +625,10 @@ def format_begins_at_from_db(time_string, scheduled_for) ) end - subject { hearing_day.meeting_details_for_conference } + subject { hearing_day.subject_for_conference } it "returns the expected meeting conference details" do - is_expected.to eq( - title: "Guest Link for #{expected_date}", - start: expected_date_parsed.beginning_of_day.iso8601, - end: expected_date_parsed.end_of_day.iso8601, - timezone: "America/New_York" - ) + is_expected.to eq("Guest Link for #{expected_date}") end end diff --git a/spec/models/hearings/virtual_hearing_spec.rb b/spec/models/hearings/virtual_hearing_spec.rb index 14df29b0a16..0a86d090551 100644 --- a/spec/models/hearings/virtual_hearing_spec.rb +++ b/spec/models/hearings/virtual_hearing_spec.rb @@ -475,7 +475,7 @@ def link(name) end end - context "#meeting_details_for_conference" do + context "#subject_for_conference" do let(:expected_date) { "Sep 22, 2023" } let(:expected_date_parsed) { Date.parse(expected_date) } let(:hearing_day) do @@ -483,17 +483,14 @@ def link(name) end let(:virtual_hearing) { create(:virtual_hearing, hearing: hearing) } - subject { virtual_hearing.meeting_details_for_conference } + subject { virtual_hearing.subject_for_conference } context "For an AMA Hearing" do let(:hearing) { create(:hearing, hearing_day: hearing_day) } it "returns the expected meeting conference details" do is_expected.to eq( - title: "#{hearing.appeal.docket_number}_#{hearing.appeal.id}_Appeal", - start: "2023-09-22T00:00:00-04:00", - end: "2023-09-22T23:59:59-04:00", - timezone: "America/New_York" + "#{hearing.appeal.docket_number}_#{hearing.appeal.id}_#{hearing.appeal.class.name}" ) end end From 8064dfc998bc8a978bdf5a2ae125f6ad7682181d Mon Sep 17 00:00:00 2001 From: 631862 Date: Fri, 13 Oct 2023 15:07:12 -0400 Subject: [PATCH 240/445] update conference_client job to include the webex environment configs --- app/jobs/virtual_hearings/conference_client.rb | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/app/jobs/virtual_hearings/conference_client.rb b/app/jobs/virtual_hearings/conference_client.rb index c0920c41e8d..e0cf1c30422 100644 --- a/app/jobs/virtual_hearings/conference_client.rb +++ b/app/jobs/virtual_hearings/conference_client.rb @@ -12,15 +12,14 @@ def client client_host: ENV["PEXIP_CLIENT_HOST"] ) when "webex" - msg = "You hit the Webex Service!" - fail Caseflow::Error::WebexApiError, message: msg - # @client ||= WebexService.new( - # host: ENV["WEBEX_MANAGEMENT_NODE_HOST"], - # port: ENV["WEBEX_MANAGEMENT_NODE_PORT"], - # user_name: ENV["WEBEX_USERNAME"], - # password: ENV["WEBEX_PASSWORD"], - # client_host: ENV["WEBEX_CLIENT_HOST"] - # ) + @client ||= WebexService.new( + host: ENV["WEBEX_HOST"], + port: ENV["WEBEX_PORT"], + aud: ENV["WEBEX_ORGANIZATION"], + apikey: ENV["WEBEX_BOTTOKEN"], + domain: ENV["WEBEX_DOMAIN"], + api_endpoint: ENV["WEBEX_API"] + ) else msg = "Meeting type for the user is invalid" fail Caseflow::Error::MeetingTypeNotFoundError, message: msg From 4f77ad8f80b688e4d54be18a550de07669c3519d Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Mon, 16 Oct 2023 14:22:56 -0400 Subject: [PATCH 241/445] Adjust creation of link record --- app/models/hearings/webex_conference_link.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/models/hearings/webex_conference_link.rb b/app/models/hearings/webex_conference_link.rb index d93e844bdf3..6af05cfb3d4 100644 --- a/app/models/hearings/webex_conference_link.rb +++ b/app/models/hearings/webex_conference_link.rb @@ -16,9 +16,11 @@ def generate_conference_information conference = WebexService.new.create_conference(hearing_day) + base_url = conference.data[:baseUrl] + update!( - host_link: conference.data[:webLink], - guest_hearing_link: conference.data[:webLink] + host_link: "#{base_url}#{conference.data[:host].first[:short]}", + guest_hearing_link: "#{base_url}#{conference.data[:guest].first[:short]}", ) end end From d146a22e1054e5cad0257194c4de6b60f3ca2f10 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Thu, 19 Oct 2023 13:10:09 -0400 Subject: [PATCH 242/445] APPEALS-25117: updating the request body and adjusting start time --- .../virtual_hearings/conference_client.rb | 13 ++++-- app/services/external_api/webex_service.rb | 42 +++++-------------- 2 files changed, 21 insertions(+), 34 deletions(-) diff --git a/app/jobs/virtual_hearings/conference_client.rb b/app/jobs/virtual_hearings/conference_client.rb index 0967e928cbf..da70e7e6cd2 100644 --- a/app/jobs/virtual_hearings/conference_client.rb +++ b/app/jobs/virtual_hearings/conference_client.rb @@ -2,7 +2,7 @@ module VirtualHearings::ConferenceClient def client - case RequestStore.store[:current_user].conference_provider + case virtual_hearing.conference_provider when "pexip" @client ||= PexipService.new( host: ENV["PEXIP_MANAGEMENT_NODE_HOST"], @@ -12,9 +12,16 @@ def client client_host: ENV["PEXIP_CLIENT_HOST"] ) when "webex" - @client ||= ExternalApi::WebexService.new + @client ||= WebexService.new( + host: ENV["WEBEX_HOST"], + port: ENV["WEBEX_PORT"], + aud: ENV["WEBEX_ORGANIZATION"], + apikey: ENV["WEBEX_BOTTOKEN"], + domain: ENV["WEBEX_DOMAIN"], + api_endpoint: ENV["WEBEX_API"] + ) else - msg = "Meeting type for the user is invalid" + msg = "Conference Provider for the Virtual Hearing Not Found" fail Caseflow::Error::MeetingTypeNotFoundError, message: msg end end diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb index 1974b9767d3..52e24fd6e38 100644 --- a/app/services/external_api/webex_service.rb +++ b/app/services/external_api/webex_service.rb @@ -3,9 +3,7 @@ require "json" class ExternalApi::WebexService - CREATE_CONFERENCE_ENDPOINT = "api-usgov.webex.com/v1/meetings" - MOCK_ENDPOINT = "localhost:3050/fake.#{CREATE_CONFERENCE_ENDPOINT}" - # ENDPOINT = ApplicationController.dependencies_faked? ? MOCK_ENDPOINT : CREATE_CONFERENCE_ENDPOINT + ENDPOINT = "api-usgov.webex.com/v1/meetings" # :reek:UtilityFunction def combine_time_and_date(time, timezone, date) @@ -19,46 +17,28 @@ def combine_time_and_date(time, timezone, date) # rubocop:disable Metrics/MethodLength def create_conference(virtual_hearing) - title = virtual_hearing.alias hearing_day = HearingDay.find(virtual_hearing.hearing.hearing_day_id) hearing = Hearing.find(virtual_hearing.hearing.hearing_day_id) - start_date_time = hearing.scheduled_for.iso8601 timezone = hearing.regional_office&.timezone - end_date = hearing_day.scheduled_for + date = hearing_day.scheduled_for + start_time = "00:00:01" end_time = "23:59:59" - end_date_time = combine_time_and_date(end_time, timezone, end_date) + end_date_time = combine_time_and_date(end_time, timezone, date) + start_date_time = combine_time_and_date(start_time, timezone, date) body = { "jwt": { - "sub": title, + "sub": virtual_hearing.subject_for_conference, "Nbf": start_date_time, - "Exp": end_date_time, - "flow": { - "id": "sip-no-knock", - "data": [ - { - "uri": "example1@intadmin.room.wbx2.com" - }, - { - "uri": "example2@intadmin.room.wbx2.com" - } - ] - } + "Exp": end_date_time }, - "aud": "some stuff", + "aud": "", "numGuest": 1, "numHost": 1, - "provideShortUrls": true, - "verticalType": "gen", - "loginUrlForHost": false, - "jweAlg": "PBES2-HS512+A256KW", - "saltLength": 8, - "iterations": 1000, - "enc": "A256GCM", - "jwsAlg": "HS512" + "provideShortUrls": true } - resp = send_webex_request(MOCK_ENDPOINT, :post, body: body) + resp = send_webex_request(ENDPOINT, :post, body: body) return if resp.nil? ExternalApi::WebexService::CreateResponse.new(resp) @@ -68,7 +48,7 @@ def create_conference(virtual_hearing) def delete_conference(virtual_hearing) return if virtual_hearing.conference_id.nil? - delete_endpoint = "#{MOCK_ENDPOINT}#{conference_id}/" + delete_endpoint = "#{ENDPOINT}#{conference_id}/" resp = send_webex_request(delete_endpoint, :delete) return if resp.nil? From 08489acdb1c8877bac219c9a3f31d8360b476053 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Thu, 19 Oct 2023 15:57:02 -0400 Subject: [PATCH 243/445] APPEALS-25117: slowly fixing code climate issues --- app/jobs/virtual_hearings/delete_conferences_job.rb | 1 - app/models/hearings/webex_conference_link.rb | 2 +- app/services/external_api/webex_service/create_response.rb | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/jobs/virtual_hearings/delete_conferences_job.rb b/app/jobs/virtual_hearings/delete_conferences_job.rb index b5019a7816b..76f6bc8ab1e 100644 --- a/app/jobs/virtual_hearings/delete_conferences_job.rb +++ b/app/jobs/virtual_hearings/delete_conferences_job.rb @@ -153,7 +153,6 @@ def delete_conference(virtual_hearing) true rescue Caseflow::Error::PexipNotFoundError Rails.logger.info("Conference for hearing (#{virtual_hearing.hearing_id}) was already deleted") - rescue Caseflow::Error::WebexNotFoundError Rails.logger.info("Conference for hearing (#{virtual_hearing.hearing_id}) was already deleted") diff --git a/app/models/hearings/webex_conference_link.rb b/app/models/hearings/webex_conference_link.rb index 6af05cfb3d4..87f67cc04a4 100644 --- a/app/models/hearings/webex_conference_link.rb +++ b/app/models/hearings/webex_conference_link.rb @@ -20,7 +20,7 @@ def generate_conference_information update!( host_link: "#{base_url}#{conference.data[:host].first[:short]}", - guest_hearing_link: "#{base_url}#{conference.data[:guest].first[:short]}", + guest_hearing_link: "#{base_url}#{conference.data[:guest].first[:short]}" ) end end diff --git a/app/services/external_api/webex_service/create_response.rb b/app/services/external_api/webex_service/create_response.rb index 0c16f1c1af9..7824a2e382a 100644 --- a/app/services/external_api/webex_service/create_response.rb +++ b/app/services/external_api/webex_service/create_response.rb @@ -2,7 +2,7 @@ class ExternalApi::WebexService::CreateResponse < ExternalApi::WebexService::Response def data - #resp.raw_body + # resp.raw_body if !response.body? nil response = JSON.parse(resp.body) { "conference_id": response.first.last } From 833a45201dda43db2be98613944c504220f0b1c1 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Mon, 23 Oct 2023 09:50:25 -0400 Subject: [PATCH 244/445] APPEALS-25117: fixing merge and code climate conflicts --- .../delete_conferences_job.rb | 2 + app/models/hearings/webex_conference_link.rb | 1 + .../webex_service/create_response.rb | 1 + client/package.json | 1 - client/yarn.lock | 1406 +---------------- 5 files changed, 13 insertions(+), 1398 deletions(-) diff --git a/app/jobs/virtual_hearings/delete_conferences_job.rb b/app/jobs/virtual_hearings/delete_conferences_job.rb index 76f6bc8ab1e..db68c71ea61 100644 --- a/app/jobs/virtual_hearings/delete_conferences_job.rb +++ b/app/jobs/virtual_hearings/delete_conferences_job.rb @@ -5,6 +5,8 @@ # if the hearing type is switched from virtual to original hearing type. # It also sends cancellation emails to hearing participants if latter is case. +# add comment to run in code climate + class VirtualHearings::DeleteConferencesJob < VirtualHearings::ConferenceJob include Hearings::EnsureCurrentUserIsSet diff --git a/app/models/hearings/webex_conference_link.rb b/app/models/hearings/webex_conference_link.rb index 87f67cc04a4..4e317a4912b 100644 --- a/app/models/hearings/webex_conference_link.rb +++ b/app/models/hearings/webex_conference_link.rb @@ -4,6 +4,7 @@ class WebexConferenceLink < ConferenceLink def guest_pin nil end + # comment to run in code climate def guest_link guest_hearing_link diff --git a/app/services/external_api/webex_service/create_response.rb b/app/services/external_api/webex_service/create_response.rb index 7824a2e382a..5accf58071e 100644 --- a/app/services/external_api/webex_service/create_response.rb +++ b/app/services/external_api/webex_service/create_response.rb @@ -3,6 +3,7 @@ class ExternalApi::WebexService::CreateResponse < ExternalApi::WebexService::Response def data # resp.raw_body + # comment to run in code climate if !response.body? nil response = JSON.parse(resp.body) { "conference_id": response.first.last } diff --git a/client/package.json b/client/package.json index 017d00522eb..cf5659b8105 100644 --- a/client/package.json +++ b/client/package.json @@ -90,7 +90,6 @@ "immutability-helper": "^3.0.1", "immutable": "^3.8.2", "imports-loader": "^0.7.1", - "json-server": "^0.17.3", "lodash": "^4.17.21", "mark.js": "^8.11.0", "moment": "^2.24.0", diff --git a/client/yarn.lock b/client/yarn.lock index d7187c90c92..04317ee5922 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -2,11 +2,6 @@ # yarn lockfile v1 -"@aashutoshrathi/word-wrap@^1.2.3": - version "1.2.6" - resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" - integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== - "@babel/cli@^7.12.8": version "7.12.8" resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.12.8.tgz#3b24ed2fd5da353ee6f19e8935ff8c93b5fe8430" @@ -2666,38 +2661,6 @@ resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46" integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA== -"@eslint-community/eslint-utils@^4.2.0": - version "4.4.0" - resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" - integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA== - dependencies: - eslint-visitor-keys "^3.3.0" - -"@eslint-community/regexpp@^4.6.1": - version "4.8.0" - resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.8.0.tgz#11195513186f68d42fbf449f9a7136b2c0c92005" - integrity sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg== - -"@eslint/eslintrc@^2.1.2": - version "2.1.2" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.2.tgz#c6936b4b328c64496692f76944e755738be62396" - integrity sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g== - dependencies: - ajv "^6.12.4" - debug "^4.3.2" - espree "^9.6.0" - globals "^13.19.0" - ignore "^5.2.0" - import-fresh "^3.2.1" - js-yaml "^4.1.0" - minimatch "^3.1.2" - strip-json-comments "^3.1.1" - -"@eslint/js@8.48.0": - version "8.48.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.48.0.tgz#642633964e217905436033a2bd08bf322849b7fb" - integrity sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw== - "@fortawesome/fontawesome-free@^5.3.1": version "5.3.1" resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.3.1.tgz#5466b8f31c1f493a96754c1426c25796d0633dd9" @@ -2712,25 +2675,6 @@ resolved "https://registry.yarnpkg.com/@hookform/resolvers/-/resolvers-2.0.0-beta.5.tgz#35b8c605973d201281649e5504a2e164185b4fe4" integrity sha512-q3DqKeYJyFvqkWUo3eQ2SJenI2lECuTeBZvp8WebjS80SaRY3+npC4Vx9ILk8hm3jinT95tN7mkl9hJrjyPkuA== -"@humanwhocodes/config-array@^0.11.10": - version "0.11.11" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.11.tgz#88a04c570dbbc7dd943e4712429c3df09bc32844" - integrity sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA== - dependencies: - "@humanwhocodes/object-schema" "^1.2.1" - debug "^4.1.1" - minimatch "^3.0.5" - -"@humanwhocodes/module-importer@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" - integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== - -"@humanwhocodes/object-schema@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" - integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== - "@istanbuljs/load-nyc-config@^1.0.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" @@ -3089,7 +3033,7 @@ resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b" integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw== -"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8": +"@nodelib/fs.walk@^1.2.3": version "1.2.8" resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== @@ -4128,11 +4072,6 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== -"@types/json5@^0.0.29": - version "0.0.29" - resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" - integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== - "@types/lodash@^4.14.165": version "4.14.168" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.168.tgz#fe24632e79b7ade3f132891afff86caa5e5ce008" @@ -4623,7 +4562,7 @@ acorn-jsx@^5.2.0: resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe" integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ== -acorn-jsx@^5.3.1, acorn-jsx@^5.3.2: +acorn-jsx@^5.3.1: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== @@ -4777,7 +4716,7 @@ ajv@^6.10.0: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: +ajv@^6.12.3, ajv@^6.12.5: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -4851,11 +4790,6 @@ ansi-regex@^5.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== -ansi-regex@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" - integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== - ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" @@ -4932,11 +4866,6 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" -argparse@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" - integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== - aria-query@^4.2.2: version "4.2.2" resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz#0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b" @@ -4960,14 +4889,6 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= -array-buffer-byte-length@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead" - integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A== - dependencies: - call-bind "^1.0.2" - is-array-buffer "^3.0.1" - array-filter@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83" @@ -5008,17 +4929,6 @@ array-includes@^3.0.3, array-includes@^3.1.1: es-abstract "^1.17.0" is-string "^1.0.5" -array-includes@^3.1.6: - version "3.1.7" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.7.tgz#8cd2e01b26f7a3086cbc87271593fe921c62abda" - integrity sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - get-intrinsic "^1.2.1" - is-string "^1.0.7" - array-map@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662" @@ -5057,17 +4967,6 @@ array.prototype.find@^2.1.0: define-properties "^1.1.3" es-abstract "^1.13.0" -array.prototype.findlastindex@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz#b37598438f97b579166940814e2c0493a4f50207" - integrity sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - es-shim-unscopables "^1.0.0" - get-intrinsic "^1.2.1" - array.prototype.flat@^1.2.1: version "1.2.3" resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b" @@ -5076,16 +4975,6 @@ array.prototype.flat@^1.2.1: define-properties "^1.1.3" es-abstract "^1.17.0-next.1" -array.prototype.flat@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2" - integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" - es-shim-unscopables "^1.0.0" - array.prototype.flatmap@^1.2.1: version "1.2.3" resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.3.tgz#1c13f84a178566042dd63de4414440db9222e443" @@ -5095,16 +4984,6 @@ array.prototype.flatmap@^1.2.1: es-abstract "^1.17.0-next.1" function-bind "^1.1.1" -array.prototype.flatmap@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz#1aae7903c2100433cb8261cd4ed310aab5c4a183" - integrity sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" - es-shim-unscopables "^1.0.0" - array.prototype.map@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/array.prototype.map/-/array.prototype.map-1.0.2.tgz#9a4159f416458a23e9483078de1106b2ef68f8ec" @@ -5115,29 +4994,6 @@ array.prototype.map@^1.0.1: es-array-method-boxes-properly "^1.0.0" is-string "^1.0.4" -array.prototype.tosorted@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz#ccf44738aa2b5ac56578ffda97c03fd3e23dd532" - integrity sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" - es-shim-unscopables "^1.0.0" - get-intrinsic "^1.1.3" - -arraybuffer.prototype.slice@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz#9b5ea3868a6eebc30273da577eb888381c0044bb" - integrity sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw== - dependencies: - array-buffer-byte-length "^1.0.0" - call-bind "^1.0.2" - define-properties "^1.2.0" - get-intrinsic "^1.2.1" - is-array-buffer "^3.0.2" - is-shared-array-buffer "^1.0.2" - arrify@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa" @@ -5222,13 +5078,6 @@ async@^2.6.2: dependencies: lodash "^4.17.14" -asynciterator.prototype@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/asynciterator.prototype/-/asynciterator.prototype-1.0.0.tgz#8c5df0514936cdd133604dfcc9d3fb93f09b2b62" - integrity sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg== - dependencies: - has-symbols "^1.0.3" - asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -5257,11 +5106,6 @@ autoprefixer@^9.8.6: postcss "^7.0.32" postcss-value-parser "^4.1.0" -available-typed-arrays@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" - integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== - aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" @@ -5582,13 +5426,6 @@ base@^0.11.1: mixin-deep "^1.2.0" pascalcase "^0.1.1" -basic-auth@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a" - integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg== - dependencies: - safe-buffer "5.1.2" - batch-processor@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/batch-processor/-/batch-processor-1.0.0.tgz#75c95c32b748e0850d10c2b168f6bdbe9891ace8" @@ -5677,24 +5514,6 @@ body-parser@1.19.0: raw-body "2.4.0" type-is "~1.6.17" -body-parser@^1.19.0: - version "1.20.2" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd" - integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA== - dependencies: - bytes "3.1.2" - content-type "~1.0.5" - debug "2.6.9" - depd "2.0.0" - destroy "1.2.0" - http-errors "2.0.0" - iconv-lite "0.4.24" - on-finished "2.4.1" - qs "6.11.0" - raw-body "2.5.2" - type-is "~1.6.18" - unpipe "1.0.0" - bonjour@^3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5" @@ -5991,13 +5810,6 @@ builtin-status-codes@^3.0.0: resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug= -builtins@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9" - integrity sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ== - dependencies: - semver "^7.0.0" - bytes@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" @@ -6008,11 +5820,6 @@ bytes@3.1.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== -bytes@3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" - integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== - cacache@^12.0.2: version "12.0.4" resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c" @@ -6219,14 +6026,6 @@ chalk@^4.0.0, chalk@^4.1.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" - integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - char-regex@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" @@ -6455,15 +6254,6 @@ cliui@^6.0.0: strip-ansi "^6.0.0" wrap-ansi "^6.2.0" -cliui@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" - integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.1" - wrap-ansi "^7.0.0" - clone-deep@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" @@ -6707,11 +6497,6 @@ connect-history-api-fallback@^1.6.0: resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg== -connect-pause@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/connect-pause/-/connect-pause-0.1.1.tgz#b269b2bb82ddb1ac3db5099c0fb582aba99fb37a" - integrity sha512-a1gSWQBQD73krFXdUEYJom2RTFrWUL3YvXDCRkyv//GVXc79cdW9MngtRuN9ih4FDKBtfJAJId+BbDuX+1rh2w== - console-browserify@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" @@ -6742,11 +6527,6 @@ content-type@~1.0.4: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== -content-type@~1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" - integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== - convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" @@ -6868,14 +6648,6 @@ core-util-is@1.0.2, core-util-is@~1.0.0: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= -cors@^2.8.5: - version "2.8.5" - resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29" - integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g== - dependencies: - object-assign "^4" - vary "^1" - cosmiconfig@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" @@ -7180,13 +6952,6 @@ date-fns@^2.16.1: resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.16.1.tgz#05775792c3f3331da812af253e1a935851d3834b" integrity sha512-sAJVKx/FqrLYHAQeN7VpJrPhagZc9R4ImZIWYRFZaaohR3KzmuK88touwsSwSVT8Qcbd4zoDsnGfX4GFB4imyQ== -debug@*, debug@^4.3.2: - version "4.3.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== - dependencies: - ms "2.1.2" - debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -7194,13 +6959,6 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9: dependencies: ms "2.0.0" -debug@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" - integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== - dependencies: - ms "2.0.0" - debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" @@ -7208,13 +6966,6 @@ debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5: dependencies: ms "^2.1.1" -debug@^3.2.7: - version "3.2.7" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" - integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== - dependencies: - ms "^2.1.1" - debug@^4.0.0: version "4.2.0" resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1" @@ -7287,14 +7038,6 @@ define-properties@^1.1.2, define-properties@^1.1.3: dependencies: object-keys "^1.0.12" -define-properties@^1.1.4, define-properties@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5" - integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA== - dependencies: - has-property-descriptors "^1.0.0" - object-keys "^1.1.1" - define-property@^0.2.5: version "0.2.5" resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" @@ -7349,11 +7092,6 @@ delegates@^1.0.0: resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= -depd@2.0.0, depd@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" - integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== - depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" @@ -7376,11 +7114,6 @@ des.js@^1.0.0: inherits "^2.0.1" minimalistic-assert "^1.0.0" -destroy@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" - integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== - destroy@~1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" @@ -8014,14 +7747,6 @@ error-stack-parser@^2.0.6: dependencies: stackframe "^1.1.1" -errorhandler@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/errorhandler/-/errorhandler-1.5.1.tgz#b9ba5d17cf90744cd1e851357a6e75bf806a9a91" - integrity sha512-rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A== - dependencies: - accepts "~1.3.7" - escape-html "~1.0.3" - es-abstract@^1.13.0: version "1.16.3" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.3.tgz#52490d978f96ff9f89ec15b5cf244304a5bca161" @@ -8055,51 +7780,6 @@ es-abstract@^1.17.0, es-abstract@^1.17.0-next.0, es-abstract@^1.17.0-next.1, es- string.prototype.trimend "^1.0.1" string.prototype.trimstart "^1.0.1" -es-abstract@^1.20.4, es-abstract@^1.22.1: - version "1.22.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.1.tgz#8b4e5fc5cefd7f1660f0f8e1a52900dfbc9d9ccc" - integrity sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw== - dependencies: - array-buffer-byte-length "^1.0.0" - arraybuffer.prototype.slice "^1.0.1" - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - es-set-tostringtag "^2.0.1" - es-to-primitive "^1.2.1" - function.prototype.name "^1.1.5" - get-intrinsic "^1.2.1" - get-symbol-description "^1.0.0" - globalthis "^1.0.3" - gopd "^1.0.1" - has "^1.0.3" - has-property-descriptors "^1.0.0" - has-proto "^1.0.1" - has-symbols "^1.0.3" - internal-slot "^1.0.5" - is-array-buffer "^3.0.2" - is-callable "^1.2.7" - is-negative-zero "^2.0.2" - is-regex "^1.1.4" - is-shared-array-buffer "^1.0.2" - is-string "^1.0.7" - is-typed-array "^1.1.10" - is-weakref "^1.0.2" - object-inspect "^1.12.3" - object-keys "^1.1.1" - object.assign "^4.1.4" - regexp.prototype.flags "^1.5.0" - safe-array-concat "^1.0.0" - safe-regex-test "^1.0.0" - string.prototype.trim "^1.2.7" - string.prototype.trimend "^1.0.6" - string.prototype.trimstart "^1.0.6" - typed-array-buffer "^1.0.0" - typed-array-byte-length "^1.0.0" - typed-array-byte-offset "^1.0.0" - typed-array-length "^1.0.4" - unbox-primitive "^1.0.2" - which-typed-array "^1.1.10" - es-abstract@^1.6.1: version "1.9.0" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.9.0.tgz#690829a07cae36b222e7fd9b75c0d0573eb25227" @@ -8128,42 +7808,6 @@ es-get-iterator@^1.0.2: is-string "^1.0.5" isarray "^2.0.5" -es-iterator-helpers@^1.0.12: - version "1.0.14" - resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.0.14.tgz#19cd7903697d97e21198f3293b55e8985791c365" - integrity sha512-JgtVnwiuoRuzLvqelrvN3Xu7H9bu2ap/kQ2CrM62iidP8SKuD99rWU3CJy++s7IVL2qb/AjXPGR/E7i9ngd/Cw== - dependencies: - asynciterator.prototype "^1.0.0" - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - es-set-tostringtag "^2.0.1" - function-bind "^1.1.1" - get-intrinsic "^1.2.1" - globalthis "^1.0.3" - has-property-descriptors "^1.0.0" - has-proto "^1.0.1" - has-symbols "^1.0.3" - internal-slot "^1.0.5" - iterator.prototype "^1.1.0" - safe-array-concat "^1.0.0" - -es-set-tostringtag@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8" - integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg== - dependencies: - get-intrinsic "^1.1.3" - has "^1.0.3" - has-tostringtag "^1.0.0" - -es-shim-unscopables@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241" - integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w== - dependencies: - has "^1.0.3" - es-to-primitive@^1.1.1, es-to-primitive@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" @@ -8234,11 +7878,6 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -escape-string-regexp@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== - escodegen@^1.14.1: version "1.14.1" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457" @@ -8263,16 +7902,6 @@ escodegen@^2.0.0: optionalDependencies: source-map "~0.6.1" -eslint-config-standard-jsx@^11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/eslint-config-standard-jsx/-/eslint-config-standard-jsx-11.0.0.tgz#70852d395731a96704a592be5b0bfaccfeded239" - integrity sha512-+1EV/R0JxEK1L0NGolAr8Iktm3Rgotx3BKwgaX+eAuSX8D952LULKtjgZD3F+e6SvibONnhLwoTi9DPxN5LvvQ== - -eslint-config-standard@17.1.0: - version "17.1.0" - resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz#40ffb8595d47a6b242e07cbfd49dc211ed128975" - integrity sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q== - eslint-import-resolver-node@^0.3.2: version "0.3.3" resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz#dbaa52b6b2816b50bc6711af75422de808e98404" @@ -8281,15 +7910,6 @@ eslint-import-resolver-node@^0.3.2: debug "^2.6.9" resolve "^1.13.1" -eslint-import-resolver-node@^0.3.7: - version "0.3.9" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac" - integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g== - dependencies: - debug "^3.2.7" - is-core-module "^2.13.0" - resolve "^1.22.4" - eslint-import-resolver-webpack@^0.13.0: version "0.13.0" resolved "https://registry.yarnpkg.com/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.13.0.tgz#5cb19cf4b6996c8a2514aeb10f909e2c70488dc3" @@ -8314,13 +7934,6 @@ eslint-module-utils@^2.4.1: debug "^2.6.9" pkg-dir "^2.0.0" -eslint-module-utils@^2.8.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz#e439fee65fc33f6bba630ff621efc38ec0375c49" - integrity sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw== - dependencies: - debug "^3.2.7" - eslint-plugin-babel@^5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-5.3.0.tgz#2e7f251ccc249326da760c1a4c948a91c32d0023" @@ -8328,14 +7941,6 @@ eslint-plugin-babel@^5.3.0: dependencies: eslint-rule-composer "^0.3.0" -eslint-plugin-es@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz#f0822f0c18a535a97c3e714e89f88586a7641ec9" - integrity sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ== - dependencies: - eslint-utils "^2.0.0" - regexpp "^3.0.0" - eslint-plugin-import@^2.20.1: version "2.20.1" resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz#802423196dcb11d9ce8435a5fc02a6d3b46939b3" @@ -8354,29 +7959,6 @@ eslint-plugin-import@^2.20.1: read-pkg-up "^2.0.0" resolve "^1.12.0" -eslint-plugin-import@^2.27.5: - version "2.28.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz#63b8b5b3c409bfc75ebaf8fb206b07ab435482c4" - integrity sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A== - dependencies: - array-includes "^3.1.6" - array.prototype.findlastindex "^1.2.2" - array.prototype.flat "^1.3.1" - array.prototype.flatmap "^1.3.1" - debug "^3.2.7" - doctrine "^2.1.0" - eslint-import-resolver-node "^0.3.7" - eslint-module-utils "^2.8.0" - has "^1.0.3" - is-core-module "^2.13.0" - is-glob "^4.0.3" - minimatch "^3.1.2" - object.fromentries "^2.0.6" - object.groupby "^1.0.0" - object.values "^1.1.6" - semver "^6.3.1" - tsconfig-paths "^3.14.2" - eslint-plugin-jest@^23.19.0: version "23.19.0" resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.19.0.tgz#da9c45a629bf3180269c7d5033afd7f8b910bde5" @@ -8390,25 +7972,6 @@ eslint-plugin-mocha@^4.11.0: dependencies: ramda "^0.24.1" -eslint-plugin-n@^15.7.0: - version "15.7.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz#e29221d8f5174f84d18f2eb94765f2eeea033b90" - integrity sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q== - dependencies: - builtins "^5.0.1" - eslint-plugin-es "^4.1.0" - eslint-utils "^3.0.0" - ignore "^5.1.1" - is-core-module "^2.11.0" - minimatch "^3.1.2" - resolve "^1.22.1" - semver "^7.3.8" - -eslint-plugin-promise@^6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz#269a3e2772f62875661220631bd4dafcb4083816" - integrity sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig== - eslint-plugin-react@^7.19.0: version "7.19.0" resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.19.0.tgz#6d08f9673628aa69c5559d33489e855d83551666" @@ -8427,28 +7990,6 @@ eslint-plugin-react@^7.19.0: string.prototype.matchall "^4.0.2" xregexp "^4.3.0" -eslint-plugin-react@^7.32.2: - version "7.33.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz#69ee09443ffc583927eafe86ffebb470ee737608" - integrity sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw== - dependencies: - array-includes "^3.1.6" - array.prototype.flatmap "^1.3.1" - array.prototype.tosorted "^1.1.1" - doctrine "^2.1.0" - es-iterator-helpers "^1.0.12" - estraverse "^5.3.0" - jsx-ast-utils "^2.4.1 || ^3.0.0" - minimatch "^3.1.2" - object.entries "^1.1.6" - object.fromentries "^2.0.6" - object.hasown "^1.1.2" - object.values "^1.1.6" - prop-types "^15.8.1" - resolve "^2.0.0-next.4" - semver "^6.3.1" - string.prototype.matchall "^4.0.8" - eslint-rule-composer@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9" @@ -8478,14 +8019,6 @@ eslint-scope@^5.0.0: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-scope@^7.2.2: - version "7.2.2" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f" - integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg== - dependencies: - esrecurse "^4.3.0" - estraverse "^5.2.0" - eslint-utils@^1.3.1: version "1.4.3" resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f" @@ -8500,28 +8033,11 @@ eslint-utils@^2.0.0: dependencies: eslint-visitor-keys "^1.1.0" -eslint-utils@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" - integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== - dependencies: - eslint-visitor-keys "^2.0.0" - eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A== -eslint-visitor-keys@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" - integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== - -eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3: - version "3.4.3" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800" - integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== - eslint@^5.0.0: version "5.16.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea" @@ -8606,49 +8122,6 @@ eslint@^7.0.0: text-table "^0.2.0" v8-compile-cache "^2.0.3" -eslint@^8.41.0: - version "8.48.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.48.0.tgz#bf9998ba520063907ba7bfe4c480dc8be03c2155" - integrity sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg== - dependencies: - "@eslint-community/eslint-utils" "^4.2.0" - "@eslint-community/regexpp" "^4.6.1" - "@eslint/eslintrc" "^2.1.2" - "@eslint/js" "8.48.0" - "@humanwhocodes/config-array" "^0.11.10" - "@humanwhocodes/module-importer" "^1.0.1" - "@nodelib/fs.walk" "^1.2.8" - ajv "^6.12.4" - chalk "^4.0.0" - cross-spawn "^7.0.2" - debug "^4.3.2" - doctrine "^3.0.0" - escape-string-regexp "^4.0.0" - eslint-scope "^7.2.2" - eslint-visitor-keys "^3.4.3" - espree "^9.6.1" - esquery "^1.4.2" - esutils "^2.0.2" - fast-deep-equal "^3.1.3" - file-entry-cache "^6.0.1" - find-up "^5.0.0" - glob-parent "^6.0.2" - globals "^13.19.0" - graphemer "^1.4.0" - ignore "^5.2.0" - imurmurhash "^0.1.4" - is-glob "^4.0.0" - is-path-inside "^3.0.3" - js-yaml "^4.1.0" - json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.4.1" - lodash.merge "^4.6.2" - minimatch "^3.1.2" - natural-compare "^1.4.0" - optionator "^0.9.3" - strip-ansi "^6.0.1" - text-table "^0.2.0" - espree@^3.5.2: version "3.5.4" resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7" @@ -8675,15 +8148,6 @@ espree@^7.0.0: acorn-jsx "^5.2.0" eslint-visitor-keys "^1.1.0" -espree@^9.6.0, espree@^9.6.1: - version "9.6.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f" - integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ== - dependencies: - acorn "^8.9.0" - acorn-jsx "^5.3.2" - eslint-visitor-keys "^3.4.1" - esprima@^4.0.0, esprima@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" @@ -8709,13 +8173,6 @@ esquery@^1.2.0: dependencies: estraverse "^5.1.0" -esquery@^1.4.2: - version "1.5.0" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b" - integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg== - dependencies: - estraverse "^5.1.0" - esrecurse@^4.1.0: version "4.2.1" resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf" @@ -8723,13 +8180,6 @@ esrecurse@^4.1.0: dependencies: estraverse "^4.1.0" -esrecurse@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" - integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== - dependencies: - estraverse "^5.2.0" - estraverse@^4.0.0: version "4.2.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" @@ -8749,11 +8199,6 @@ estraverse@^5.2.0: resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== -estraverse@^5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" - integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== - esutils@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" @@ -8884,14 +8329,6 @@ expose-loader@^0.7.3: version "0.7.3" resolved "https://registry.yarnpkg.com/expose-loader/-/expose-loader-0.7.3.tgz#35fbd3659789e4faa81f59de8b7e9fc39e466d51" -express-urlrewrite@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/express-urlrewrite/-/express-urlrewrite-1.4.0.tgz#985ee022773bac7ed32126f1cf9ec8ee48e1290a" - integrity sha512-PI5h8JuzoweS26vFizwQl6UTF25CAHSggNv0J25Dn/IKZscJHWZzPrI5z2Y2jgOzIaw2qh8l6+/jUcig23Z2SA== - dependencies: - debug "*" - path-to-regexp "^1.0.3" - express@^4.17.1: version "4.17.1" resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" @@ -9125,13 +8562,6 @@ file-entry-cache@^5.0.1: dependencies: flat-cache "^2.0.1" -file-entry-cache@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" - integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== - dependencies: - flat-cache "^3.0.4" - file-loader@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-2.0.0.tgz#39749c82f020b9e85901dcff98e8004e6401cfde" @@ -9311,13 +8741,6 @@ font-awesome@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133" -for-each@^0.3.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" - integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw== - dependencies: - is-callable "^1.1.3" - for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -9531,16 +8954,6 @@ function.prototype.name@^1.1.0, function.prototype.name@^1.1.1: es-abstract "^1.17.0-next.1" functions-have-names "^1.2.0" -function.prototype.name@^1.1.5: - version "1.1.6" - resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd" - integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - functions-have-names "^1.2.3" - functional-red-black-tree@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" @@ -9550,11 +8963,6 @@ functions-have-names@^1.2.0: resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.1.tgz#a981ac397fa0c9964551402cdc5533d7a4d52f91" integrity sha512-j48B/ZI7VKs3sgeI2cZp7WXWmZXu7Iq5pl5/vptV5N2mq+DGFuS/ulaDjtaoLpYzuD6u8UgrUKHfgo7fDTSiBA== -functions-have-names@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" - integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== - fuse.js@^3.6.1: version "3.6.1" resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-3.6.1.tgz#7de85fdd6e1b3377c23ce010892656385fd9b10c" @@ -9600,7 +9008,7 @@ get-caller-file@^1.0.1: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w== -get-caller-file@^2.0.1, get-caller-file@^2.0.5: +get-caller-file@^2.0.1: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== @@ -9614,16 +9022,6 @@ get-intrinsic@^1.0.2: has "^1.0.3" has-symbols "^1.0.1" -get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82" - integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw== - dependencies: - function-bind "^1.1.1" - has "^1.0.3" - has-proto "^1.0.1" - has-symbols "^1.0.3" - get-package-type@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" @@ -9653,14 +9051,6 @@ get-stream@^5.0.0: dependencies: pump "^3.0.0" -get-symbol-description@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" - integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.1" - get-symbol-from-current-process-h@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/get-symbol-from-current-process-h/-/get-symbol-from-current-process-h-1.0.2.tgz#510af52eaef873f7028854c3377f47f7bb200265" @@ -9739,13 +9129,6 @@ glob-parent@^5.1.2: dependencies: is-glob "^4.0.1" -glob-parent@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" - integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== - dependencies: - is-glob "^4.0.3" - glob-promise@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/glob-promise/-/glob-promise-3.4.0.tgz#b6b8f084504216f702dc2ce8c9bc9ac8866fdb20" @@ -9838,13 +9221,6 @@ globals@^12.1.0: dependencies: type-fest "^0.8.1" -globals@^13.19.0: - version "13.21.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.21.0.tgz#163aae12f34ef502f5153cfbdd3600f36c63c571" - integrity sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg== - dependencies: - type-fest "^0.20.2" - globalthis@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.1.tgz#40116f5d9c071f9e8fb0037654df1ab3a83b7ef9" @@ -9852,13 +9228,6 @@ globalthis@^1.0.0: dependencies: define-properties "^1.1.3" -globalthis@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf" - integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA== - dependencies: - define-properties "^1.1.3" - globby@11.0.1: version "11.0.1" resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357" @@ -9923,28 +9292,11 @@ good-listener@^1.2.2: dependencies: delegate "^3.1.2" -gopd@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" - integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== - dependencies: - get-intrinsic "^1.1.3" - graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.4: version "4.2.4" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== -graceful-fs@^4.1.3: - version "4.2.11" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" - integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== - -graphemer@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6" - integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag== - growly@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" @@ -10000,11 +9352,6 @@ has-ansi@^2.0.0: dependencies: ansi-regex "^2.0.0" -has-bigints@^1.0.1, has-bigints@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa" - integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ== - has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -10022,28 +9369,11 @@ has-glob@^1.0.0: dependencies: is-glob "^3.0.0" -has-property-descriptors@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861" - integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ== - dependencies: - get-intrinsic "^1.1.1" - -has-proto@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" - integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg== - has-symbols@^1.0.1, has-symbols@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== -has-symbols@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" - integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== - has-tostringtag@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" @@ -10405,17 +9735,6 @@ http-errors@1.7.2: statuses ">= 1.5.0 < 2" toidentifier "1.0.0" -http-errors@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" - integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ== - dependencies: - depd "2.0.0" - inherits "2.0.4" - setprototypeof "1.2.0" - statuses "2.0.1" - toidentifier "1.0.1" - http-errors@~1.6.2: version "1.6.3" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" @@ -10530,11 +9849,6 @@ ignore@^4.0.3, ignore@^4.0.6: resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== -ignore@^5.1.1, ignore@^5.2.0: - version "5.2.4" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" - integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== - ignore@^5.1.4: version "5.1.8" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" @@ -10757,15 +10071,6 @@ internal-slot@^1.0.2: has "^1.0.3" side-channel "^1.0.2" -internal-slot@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986" - integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ== - dependencies: - get-intrinsic "^1.2.0" - has "^1.0.3" - side-channel "^1.0.4" - interpret@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296" @@ -10849,34 +10154,11 @@ is-arguments@^1.0.4: resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3" integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA== -is-array-buffer@^3.0.1, is-array-buffer@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe" - integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.2.0" - is-typed-array "^1.1.10" - is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= -is-async-function@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.0.0.tgz#8e4418efd3e5d3a6ebb0164c05ef5afb69aa9646" - integrity sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA== - dependencies: - has-tostringtag "^1.0.0" - -is-bigint@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" - integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== - dependencies: - has-bigints "^1.0.1" - is-binary-path@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" @@ -10895,14 +10177,6 @@ is-boolean-object@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.0.tgz#98f8b28030684219a95f375cfbd88ce3405dff93" -is-boolean-object@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" - integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - is-buffer@^1.1.0: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" @@ -10917,11 +10191,6 @@ is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.0: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb" integrity sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw== -is-callable@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" - integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== - is-ci@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" @@ -10929,13 +10198,6 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" -is-core-module@^2.11.0, is-core-module@^2.13.0, is-core-module@^2.9.0: - version "2.13.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db" - integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ== - dependencies: - has "^1.0.3" - is-core-module@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz#d341652e3408bca69c4671b79a0954a3d349f887" @@ -10962,13 +10224,6 @@ is-date-object@^1.0.1: resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== -is-date-object@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" - integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== - dependencies: - has-tostringtag "^1.0.0" - is-decimal@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5" @@ -11059,13 +10314,6 @@ is-generator-fn@^2.0.0: resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118" integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ== -is-generator-function@^1.0.10: - version "1.0.10" - resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72" - integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A== - dependencies: - has-tostringtag "^1.0.0" - is-glob@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" @@ -11087,13 +10335,6 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: dependencies: is-extglob "^2.1.1" -is-glob@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" - integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== - dependencies: - is-extglob "^2.1.1" - is-hexadecimal@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7" @@ -11104,22 +10345,10 @@ is-map@^2.0.1: resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.1.tgz#520dafc4307bb8ebc33b813de5ce7c9400d644a1" integrity sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw== -is-negative-zero@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" - integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== - is-number-object@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.3.tgz#f265ab89a9f445034ef6aff15a8f00b00f551799" -is-number-object@^1.0.4: - version "1.0.7" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc" - integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ== - dependencies: - has-tostringtag "^1.0.0" - is-number@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" @@ -11156,11 +10385,6 @@ is-path-inside@^2.1.0: dependencies: path-is-inside "^1.0.2" -is-path-inside@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" - integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== - is-plain-obj@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" @@ -11183,11 +10407,6 @@ is-potential-custom-element-name@^1.0.0: resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397" integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c= -is-promise@^2.1.0: - version "2.2.2" - resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1" - integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ== - is-regex@^1.0.4, is-regex@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz#ece38e389e490df0dc21caea2bd596f987f767ff" @@ -11195,7 +10414,7 @@ is-regex@^1.0.4, is-regex@^1.1.0: dependencies: has-symbols "^1.0.1" -is-regex@^1.1.2, is-regex@^1.1.4: +is-regex@^1.1.2: version "1.1.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== @@ -11213,13 +10432,6 @@ is-set@^2.0.1: resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.1.tgz#d1604afdab1724986d30091575f54945da7e5f43" integrity sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA== -is-shared-array-buffer@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" - integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA== - dependencies: - call-bind "^1.0.2" - is-stream@^1.0.1, is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" @@ -11235,13 +10447,6 @@ is-string@^1.0.4, is-string@^1.0.5: resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ== -is-string@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" - integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== - dependencies: - has-tostringtag "^1.0.0" - is-subset@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6" @@ -11253,13 +10458,6 @@ is-symbol@^1.0.2, is-symbol@^1.0.3: dependencies: has-symbols "^1.0.1" -is-typed-array@^1.1.10, is-typed-array@^1.1.9: - version "1.1.12" - resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a" - integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg== - dependencies: - which-typed-array "^1.1.11" - is-typedarray@^1.0.0, is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" @@ -11410,16 +10608,6 @@ iterate-value@^1.0.0: es-get-iterator "^1.0.2" iterate-iterator "^1.0.1" -iterator.prototype@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.1.tgz#ab5b790e23ec00658f5974e032a2b05188bd3a5c" - integrity sha512-9E+nePc8C9cnQldmNl6bgpTY6zI4OPRZd97fhJ/iVZ1GifIUDVV5F6x1nEDqpe8KaMEZGT4xgrwKQDxXnjOIZQ== - dependencies: - define-properties "^1.2.0" - get-intrinsic "^1.2.1" - has-symbols "^1.0.3" - reflect.getprototypeof "^1.0.3" - jest-axe@^3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/jest-axe/-/jest-axe-3.5.0.tgz#a8c88c1f1411e57626c488a2bc44ff23d79b1426" @@ -11967,11 +11155,6 @@ jest@^26.4.1: import-local "^3.0.2" jest-cli "^26.4.1" -jju@^1.1.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/jju/-/jju-1.4.0.tgz#a3abe2718af241a2b2904f84a625970f389ae32a" - integrity sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA== - js-base64@^2.1.8: version "2.6.4" resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4" @@ -12003,13 +11186,6 @@ js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" -js-yaml@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" - integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== - dependencies: - argparse "^2.0.1" - jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" @@ -12057,7 +11233,7 @@ jsesc@~0.5.0: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= -json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: +json-parse-better-errors@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== @@ -12067,13 +11243,6 @@ json-parse-even-better-errors@^2.3.0: resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== -json-parse-helpfulerror@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz#13f14ce02eed4e981297b64eb9e3b932e2dd13dc" - integrity sha512-XgP0FGR77+QhUxjXkwOMkC94k3WtqEBfcnjWqhRd82qTat4SWKRE+9kUnynz/shm3I4ea2+qISvTIeGTNU7kJg== - dependencies: - jju "^1.1.0" - json-schema-traverse@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" @@ -12084,32 +11253,6 @@ json-schema@0.2.3: resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= -json-server@^0.17.3: - version "0.17.3" - resolved "https://registry.yarnpkg.com/json-server/-/json-server-0.17.3.tgz#c641884189aad59f101f7ad9f519fa3c4c3cff14" - integrity sha512-LDNOvleTv3rPAcefzXZpXMDZshV0FtSzWo8ZjnTOhKm4OCiUvsYGrGrfz4iHXIFd+UbRgFHm6gcOHI/BSZ/3fw== - dependencies: - body-parser "^1.19.0" - chalk "^4.1.2" - compression "^1.7.4" - connect-pause "^0.1.1" - cors "^2.8.5" - errorhandler "^1.5.1" - express "^4.17.1" - express-urlrewrite "^1.4.0" - json-parse-helpfulerror "^1.0.3" - lodash "^4.17.21" - lodash-id "^0.14.1" - lowdb "^1.0.0" - method-override "^3.0.0" - morgan "^1.10.0" - nanoid "^3.1.23" - please-upgrade-node "^3.2.0" - pluralize "^8.0.0" - server-destroy "^1.0.1" - standard "^17.0.0" - yargs "^17.0.1" - json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" @@ -12142,13 +11285,6 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" - integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA== - dependencies: - minimist "^1.2.0" - json5@^2.1.2: version "2.1.3" resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43" @@ -12206,16 +11342,6 @@ jsx-ast-utils@^2.2.3: array-includes "^3.0.3" object.assign "^4.1.0" -"jsx-ast-utils@^2.4.1 || ^3.0.0": - version "3.3.5" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz#4766bd05a8e2a11af222becd19e15575e52a853a" - integrity sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ== - dependencies: - array-includes "^3.1.6" - array.prototype.flat "^1.3.1" - object.assign "^4.1.4" - object.values "^1.1.6" - junk@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/junk/-/junk-3.1.0.tgz#31499098d902b7e98c5d9b9c80f43457a88abfa1" @@ -12338,17 +11464,6 @@ load-json-file@^2.0.0: pify "^2.0.0" strip-bom "^3.0.0" -load-json-file@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-5.3.0.tgz#4d3c1e01fa1c03ea78a60ac7af932c9ce53403f3" - integrity sha512-cJGP40Jc/VXUsp8/OrnyKyTZ1y6v/dphm3bioS+RrKXjK2BB6wHUd6JptZEFDGgGahMT+InnZO5i1Ei9mpC8Bw== - dependencies: - graceful-fs "^4.1.15" - parse-json "^4.0.0" - pify "^4.0.1" - strip-bom "^3.0.0" - type-fest "^0.3.0" - loader-runner@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" @@ -12429,11 +11544,6 @@ lodash-es@^4.2.0, lodash-es@^4.2.1: resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78" integrity sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ== -lodash-id@^0.14.1: - version "0.14.1" - resolved "https://registry.yarnpkg.com/lodash-id/-/lodash-id-0.14.1.tgz#dffa1f1f8b90d1803bb0d70b7d7547e10751e80b" - integrity sha512-ikQPBTiq/d5m6dfKQlFdIXFzvThPi2Be9/AHxktOnDSfSxE1j9ICbBT5Elk1ke7HSTgM38LHTpmJovo9/klnLg== - lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" @@ -12523,17 +11633,6 @@ loud-rejection@^1.0.0: currently-unhandled "^0.4.1" signal-exit "^3.0.0" -lowdb@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lowdb/-/lowdb-1.0.0.tgz#5243be6b22786ccce30e50c9a33eac36b20c8064" - integrity sha512-2+x8esE/Wb9SQ1F9IHaYWfsC9FIecLOPrK4g17FGEayjUWH172H6nwicRovGvSE2CPZouc2MCIqCI7h9d+GftQ== - dependencies: - graceful-fs "^4.1.3" - is-promise "^2.1.0" - lodash "4" - pify "^3.0.0" - steno "^0.4.1" - lower-case@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz#39eeb36e396115cc05e29422eaea9e692c9408c7" @@ -12860,16 +11959,6 @@ merge2@^1.2.3, merge2@^1.3.0: resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== -method-override@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/method-override/-/method-override-3.0.0.tgz#6ab0d5d574e3208f15b0c9cf45ab52000468d7a2" - integrity sha512-IJ2NNN/mSl9w3kzWB92rcdHpz+HjkxhDJWNDBqSlas+zQdP8wBiJzITPg08M/k2uVvMow7Sk41atndNtt/PHSA== - dependencies: - debug "3.1.0" - methods "~1.1.2" - parseurl "~1.3.2" - vary "~1.1.2" - methods@^1.1.1, methods@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" @@ -13253,17 +12342,6 @@ moment@^2.24.0: resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b" integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg== -morgan@^1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7" - integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ== - dependencies: - basic-auth "~2.0.1" - debug "2.6.9" - depd "~2.0.0" - on-finished "~2.3.0" - on-headers "~1.0.2" - move-concurrently@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" @@ -13326,11 +12404,6 @@ nanoclone@^0.2.1: resolved "https://registry.yarnpkg.com/nanoclone/-/nanoclone-0.2.1.tgz#dd4090f8f1a110d26bb32c49ed2f5b9235209ed4" integrity sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA== -nanoid@^3.1.23: - version "3.3.6" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" - integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== - nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -13642,7 +12715,7 @@ oauth-sign@~0.9.0: resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== -object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: +object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= @@ -13656,11 +12729,6 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-inspect@^1.12.3: - version "1.12.3" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" - integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g== - object-inspect@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b" @@ -13706,16 +12774,6 @@ object.assign@^4.1.0: has-symbols "^1.0.1" object-keys "^1.1.1" -object.assign@^4.1.4: - version "4.1.4" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f" - integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - has-symbols "^1.0.3" - object-keys "^1.1.1" - object.entries@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.0.4.tgz#1bf9a4dd2288f5b33f3a993d257661f05d161a5f" @@ -13744,15 +12802,6 @@ object.entries@^1.1.1: function-bind "^1.1.1" has "^1.0.3" -object.entries@^1.1.6: - version "1.1.7" - resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.7.tgz#2b47760e2a2e3a752f39dd874655c61a7f03c131" - integrity sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - "object.fromentries@^2.0.0 || ^1.0.0", object.fromentries@^2.0.1, object.fromentries@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9" @@ -13763,15 +12812,6 @@ object.entries@^1.1.6: function-bind "^1.1.1" has "^1.0.3" -object.fromentries@^2.0.6: - version "2.0.7" - resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.7.tgz#71e95f441e9a0ea6baf682ecaaf37fa2a8d7e616" - integrity sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - object.getownpropertydescriptors@^2.0.3: version "2.1.0" resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649" @@ -13780,24 +12820,6 @@ object.getownpropertydescriptors@^2.0.3: define-properties "^1.1.3" es-abstract "^1.17.0-next.1" -object.groupby@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.1.tgz#d41d9f3c8d6c778d9cbac86b4ee9f5af103152ee" - integrity sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - get-intrinsic "^1.2.1" - -object.hasown@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.3.tgz#6a5f2897bb4d3668b8e79364f98ccf971bda55ae" - integrity sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA== - dependencies: - define-properties "^1.2.0" - es-abstract "^1.22.1" - object.pick@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" @@ -13824,15 +12846,6 @@ object.values@^1.1.0, object.values@^1.1.1: function-bind "^1.1.1" has "^1.0.3" -object.values@^1.1.6: - version "1.1.7" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.7.tgz#617ed13272e7e1071b43973aa1655d9291b8442a" - integrity sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - objectorarray@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/objectorarray/-/objectorarray-1.0.4.tgz#d69b2f0ff7dc2701903d308bb85882f4ddb49483" @@ -13847,13 +12860,6 @@ obuf@^1.1.2: resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== -on-finished@2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" - integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg== - dependencies: - ee-first "1.1.1" - on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" @@ -13941,18 +12947,6 @@ optionator@^0.9.1: type-check "^0.4.0" word-wrap "^1.2.3" -optionator@^0.9.3: - version "0.9.3" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64" - integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg== - dependencies: - "@aashutoshrathi/word-wrap" "^1.2.3" - deep-is "^0.1.3" - fast-levenshtein "^2.0.6" - levn "^0.4.1" - prelude-ls "^1.2.1" - type-check "^0.4.0" - options@>=0.0.5: version "0.0.6" resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f" @@ -14226,14 +13220,6 @@ parse-json@^2.2.0: dependencies: error-ex "^1.2.0" -parse-json@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" - integrity sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw== - dependencies: - error-ex "^1.3.1" - json-parse-better-errors "^1.0.1" - parse-json@^5.0.0: version "5.2.0" resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" @@ -14342,11 +13328,6 @@ path-parse@^1.0.6: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== -path-parse@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" - integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== - path-platform@~0.11.15: version "0.11.15" resolved "https://registry.yarnpkg.com/path-platform/-/path-platform-0.11.15.tgz#e864217f74c36850f0852b78dc7bf7d4a5721bf2" @@ -14356,13 +13337,6 @@ path-to-regexp@0.1.7: resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= -path-to-regexp@^1.0.3: - version "1.8.0" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" - integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA== - dependencies: - isarray "0.0.1" - path-to-regexp@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d" @@ -14470,14 +13444,6 @@ pirates@^4.0.0, pirates@^4.0.1: dependencies: node-modules-regexp "^1.0.0" -pkg-conf@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/pkg-conf/-/pkg-conf-3.1.0.tgz#d9f9c75ea1bae0e77938cde045b276dac7cc69ae" - integrity sha512-m0OTbR/5VPNPqO1ph6Fqbj7Hv6QU7gR/tQW40ZqrL1rjgCU85W6C1bJn0BItuJqnR98PWzw7Z8hHeChD1WrgdQ== - dependencies: - find-up "^3.0.0" - load-json-file "^5.2.0" - pkg-dir@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" @@ -14513,22 +13479,10 @@ pkg-up@3.1.0: dependencies: find-up "^3.0.0" -please-upgrade-node@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" - integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg== - dependencies: - semver-compare "^1.0.0" - pluralize@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" -pluralize@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1" - integrity sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA== - pnp-webpack-plugin@1.6.4: version "1.6.4" resolved "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz#c9711ac4dc48a685dabafc86f8b6dd9f8df84149" @@ -14837,15 +13791,6 @@ prop-types@^15.0.0, prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0, object-assign "^4.1.1" react-is "^16.8.1" -prop-types@^15.8.1: - version "15.8.1" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" - integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== - dependencies: - loose-envify "^1.4.0" - object-assign "^4.1.1" - react-is "^16.13.1" - property-expr@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-2.0.4.tgz#37b925478e58965031bb612ec5b3260f8241e910" @@ -14933,13 +13878,6 @@ punycode@^2.1.0, punycode@^2.1.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -qs@6.11.0: - version "6.11.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" - integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== - dependencies: - side-channel "^1.0.4" - qs@6.7.0: version "6.7.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" @@ -15041,16 +13979,6 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" -raw-body@2.5.2: - version "2.5.2" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a" - integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA== - dependencies: - bytes "3.1.2" - http-errors "2.0.0" - iconv-lite "0.4.24" - unpipe "1.0.0" - raw-loader@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.2.tgz#1aac6b7d1ad1501e66efdac1522c73e59a584eb6" @@ -15246,7 +14174,7 @@ react-is@^16.10.2, react-is@^16.8.6, react-is@^16.9.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c" integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q== -react-is@^16.12.0, react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.1: +react-is@^16.12.0, react-is@^16.7.0, react-is@^16.8.1: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== @@ -15702,18 +14630,6 @@ redux@^4.0.0, redux@^4.0.5: loose-envify "^1.4.0" symbol-observable "^1.2.0" -reflect.getprototypeof@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.4.tgz#aaccbf41aca3821b87bb71d9dcbc7ad0ba50a3f3" - integrity sha512-ECkTw8TmJwW60lOTR+ZkODISW6RQ8+2CL3COqtiJKLd6MmB45hN51HprHFziKLGkAuTGQhBb91V8cy+KHlaCjw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - get-intrinsic "^1.2.1" - globalthis "^1.0.3" - which-builtin-type "^1.1.3" - reflect.ownkeys@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz#749aceec7f3fdf8b63f927a04809e90c5c0b3460" @@ -15778,25 +14694,11 @@ regexp.prototype.flags@^1.3.0: define-properties "^1.1.3" es-abstract "^1.17.0-next.1" -regexp.prototype.flags@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb" - integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - functions-have-names "^1.2.3" - regexpp@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== -regexpp@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" - integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== - regexpp@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" @@ -16131,24 +15033,6 @@ resolve@^1.17.0, resolve@^1.3.2: dependencies: path-parse "^1.0.6" -resolve@^1.22.1, resolve@^1.22.4: - version "1.22.4" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.4.tgz#1dc40df46554cdaf8948a486a10f6ba1e2026c34" - integrity sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg== - dependencies: - is-core-module "^2.13.0" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" - -resolve@^2.0.0-next.4: - version "2.0.0-next.4" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.4.tgz#3d37a113d6429f496ec4752d2a2e58efb1fd4660" - integrity sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ== - dependencies: - is-core-module "^2.9.0" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" - restore-cursor@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" @@ -16253,16 +15137,6 @@ rxjs@^6.6.0: dependencies: tslib "^1.9.0" -safe-array-concat@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.0.tgz#2064223cba3c08d2ee05148eedbc563cd6d84060" - integrity sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.2.0" - has-symbols "^1.0.3" - isarray "^2.0.5" - safe-buffer@5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" @@ -16278,15 +15152,6 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -safe-regex-test@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295" - integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.3" - is-regex "^1.1.4" - safe-regex@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" @@ -16443,11 +15308,6 @@ selfsigned@^1.10.7: dependencies: node-forge "0.9.0" -semver-compare@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" - integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow== - "semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" @@ -16468,18 +15328,6 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^6.3.1: - version "6.3.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" - integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== - -semver@^7.0.0, semver@^7.3.8: - version "7.5.4" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" - integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== - dependencies: - lru-cache "^6.0.0" - semver@^7.2.1, semver@^7.3.2: version "7.3.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" @@ -16566,11 +15414,6 @@ serve-static@1.14.1: parseurl "~1.3.3" send "0.17.1" -server-destroy@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/server-destroy/-/server-destroy-1.0.1.tgz#f13bf928e42b9c3e79383e61cc3998b5d14e6cdd" - integrity sha512-rb+9B5YBIEzYcD6x2VKidaa+cqYBJQKnU4oe4E3ANwRRN56yk/ua1YCJT1n21NTS8w6CcOclAKNP3PhdCXKYtQ== - set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" @@ -16608,11 +15451,6 @@ setprototypeof@1.1.1: resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== -setprototypeof@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" - integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== - sha.js@^2.4.0, sha.js@^2.4.8, sha.js@~2.4.4: version "2.4.11" resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" @@ -16988,31 +15826,6 @@ stackframe@^1.1.1: resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.2.0.tgz#52429492d63c62eb989804c11552e3d22e779303" integrity sha512-GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA== -standard-engine@^15.0.0: - version "15.1.0" - resolved "https://registry.yarnpkg.com/standard-engine/-/standard-engine-15.1.0.tgz#717409a002edd13cd57f6554fdd3464d9a22a774" - integrity sha512-VHysfoyxFu/ukT+9v49d4BRXIokFRZuH3z1VRxzFArZdjSCFpro6rEIU3ji7e4AoAtuSfKBkiOmsrDqKW5ZSRw== - dependencies: - get-stdin "^8.0.0" - minimist "^1.2.6" - pkg-conf "^3.1.0" - xdg-basedir "^4.0.0" - -standard@^17.0.0: - version "17.1.0" - resolved "https://registry.yarnpkg.com/standard/-/standard-17.1.0.tgz#829eeeb3139ad50714294d3531592d60ad1286af" - integrity sha512-jaDqlNSzLtWYW4lvQmU0EnxWMUGQiwHasZl5ZEIwx3S/ijZDjZOzs1y1QqKwKs5vqnFpGtizo4NOYX2s0Voq/g== - dependencies: - eslint "^8.41.0" - eslint-config-standard "17.1.0" - eslint-config-standard-jsx "^11.0.0" - eslint-plugin-import "^2.27.5" - eslint-plugin-n "^15.7.0" - eslint-plugin-promise "^6.1.1" - eslint-plugin-react "^7.32.2" - standard-engine "^15.0.0" - version-guard "^1.1.1" - state-toggle@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.3.tgz#e123b16a88e143139b09c6852221bc9815917dfe" @@ -17026,11 +15839,6 @@ static-extend@^0.1.1: define-property "^0.2.5" object-copy "^0.1.0" -statuses@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" - integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== - "statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" @@ -17048,13 +15856,6 @@ stealthy-require@^1.1.1: resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks= -steno@^0.4.1: - version "0.4.4" - resolved "https://registry.yarnpkg.com/steno/-/steno-0.4.4.tgz#071105bdfc286e6615c0403c27e9d7b5dcb855cb" - integrity sha512-EEHMVYHNXFHfGtgjNITnka0aHhiAlo93F7z2/Pwd+g0teG9CnM3JIINM7hVVB5/rhw9voufD7Wukwgtw2uqh6w== - dependencies: - graceful-fs "^4.1.3" - store2@^2.12.0: version "2.12.0" resolved "https://registry.yarnpkg.com/store2/-/store2-2.12.0.tgz#e1f1b7e1a59b6083b2596a8d067f6ee88fd4d3cf" @@ -17155,15 +15956,6 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" -string-width@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - "string.prototype.matchall@^4.0.0 || ^3.0.1", string.prototype.matchall@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e" @@ -17176,20 +15968,6 @@ string-width@^4.2.3: regexp.prototype.flags "^1.3.0" side-channel "^1.0.2" -string.prototype.matchall@^4.0.8: - version "4.0.9" - resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.9.tgz#148779de0f75d36b13b15885fec5cadde994520d" - integrity sha512-6i5hL3MqG/K2G43mWXWgP+qizFW/QH/7kCNN13JrJS5q48FN5IKksLDscexKP3dnmB6cdm9jlNgAsWNLpSykmA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - get-intrinsic "^1.2.1" - has-symbols "^1.0.3" - internal-slot "^1.0.5" - regexp.prototype.flags "^1.5.0" - side-channel "^1.0.4" - string.prototype.padend@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.0.tgz#dc08f57a8010dc5c153550318f67e13adbb72ac3" @@ -17215,15 +15993,6 @@ string.prototype.trim@^1.1.2: es-abstract "^1.13.0" function-bind "^1.1.1" -string.prototype.trim@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz#a68352740859f6893f14ce3ef1bb3037f7a90533" - integrity sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" - string.prototype.trimend@^1.0.0, string.prototype.trimend@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913" @@ -17232,15 +16001,6 @@ string.prototype.trimend@^1.0.0, string.prototype.trimend@^1.0.1: define-properties "^1.1.3" es-abstract "^1.17.5" -string.prototype.trimend@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533" - integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" - string.prototype.trimleft@^2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc" @@ -17267,15 +16027,6 @@ string.prototype.trimstart@^1.0.0, string.prototype.trimstart@^1.0.1: define-properties "^1.1.3" es-abstract "^1.17.5" -string.prototype.trimstart@^1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298" - integrity sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - string_decoder@^1.0.0, string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" @@ -17322,13 +16073,6 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - strip-bom@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" @@ -17380,11 +16124,6 @@ strip-json-comments@^3.1.0: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.0.tgz#7638d31422129ecf4457440009fba03f9f9ac180" integrity sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w== -strip-json-comments@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" - integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== - style-loader@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.0.1.tgz#aec6d4c61d0ed8d0a442faed741d4dfc6573888a" @@ -17485,11 +16224,6 @@ supports-hyperlinks@^2.0.0: has-flag "^4.0.0" supports-color "^7.0.0" -supports-preserve-symlinks-flag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" - integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== - svg-loader@^0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/svg-loader/-/svg-loader-0.0.2.tgz#601ab2fdaa1dadae3ca9975b550de92a07e1d92b" @@ -17769,11 +16503,6 @@ toidentifier@1.0.0: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== -toidentifier@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" - integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== - toposort@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330" @@ -17850,16 +16579,6 @@ ts-pnp@^1.1.6: resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92" integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw== -tsconfig-paths@^3.14.2: - version "3.14.2" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088" - integrity sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g== - dependencies: - "@types/json5" "^0.0.29" - json5 "^1.0.2" - minimist "^1.2.6" - strip-bom "^3.0.0" - tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0: version "1.13.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043" @@ -17936,16 +16655,6 @@ type-fest@^0.11.0: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== -type-fest@^0.20.2: - version "0.20.2" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" - integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== - -type-fest@^0.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1" - integrity sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ== - type-fest@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" @@ -17974,45 +16683,6 @@ type@^2.7.2: resolved "https://registry.yarnpkg.com/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0" integrity sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw== -typed-array-buffer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz#18de3e7ed7974b0a729d3feecb94338d1472cd60" - integrity sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.2.1" - is-typed-array "^1.1.10" - -typed-array-byte-length@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0" - integrity sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA== - dependencies: - call-bind "^1.0.2" - for-each "^0.3.3" - has-proto "^1.0.1" - is-typed-array "^1.1.10" - -typed-array-byte-offset@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b" - integrity sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg== - dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - for-each "^0.3.3" - has-proto "^1.0.1" - is-typed-array "^1.1.10" - -typed-array-length@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb" - integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng== - dependencies: - call-bind "^1.0.2" - for-each "^0.3.3" - is-typed-array "^1.1.9" - typedarray-to-buffer@^3.1.5: version "3.1.5" resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" @@ -18056,16 +16726,6 @@ umd@^3.0.0: version "3.0.3" resolved "https://registry.yarnpkg.com/umd/-/umd-3.0.3.tgz#aa9fe653c42b9097678489c01000acb69f0b26cf" -unbox-primitive@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e" - integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw== - dependencies: - call-bind "^1.0.2" - has-bigints "^1.0.2" - has-symbols "^1.0.3" - which-boxed-primitive "^1.0.2" - undeclared-identifiers@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/undeclared-identifiers/-/undeclared-identifiers-1.1.2.tgz#7d850a98887cff4bd0bf64999c014d08ed6d1acc" @@ -18433,7 +17093,7 @@ value-equal@^0.4.0: resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz#c5bdd2f54ee093c04839d71ce2e4758a6890abc7" integrity sha512-x+cYdNnaA3CxvMaTX0INdTCN8m8aF2uY9BvEqmxuYp8bL09cs/kWVQPVGcA35fMktdOsP69IgU7wFj/61dJHEw== -vary@^1, vary@~1.1.2: +vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= @@ -18447,11 +17107,6 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -version-guard@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/version-guard/-/version-guard-1.1.1.tgz#7a6e87a1babff1b43d6a7b0fd239731e278262fa" - integrity sha512-MGQLX89UxmYHgDvcXyjBI0cbmoW+t/dANDppNPrno64rYr8nH4SHSuElQuSYdXGEs0mUzdQe1BY+FhVPNsAmJQ== - vfile-location@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-3.0.1.tgz#d78677c3546de0f7cd977544c367266764d31bb3" @@ -18817,17 +17472,6 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= -which-typed-array@^1.1.10, which-typed-array@^1.1.11, which-typed-array@^1.1.9: - version "1.1.11" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.11.tgz#99d691f23c72aab6768680805a271b69761ed61a" - integrity sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew== - dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - for-each "^0.3.3" - gopd "^1.0.1" - has-tostringtag "^1.0.0" - which@1, which@^1.2.14, which@^1.2.9, which@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" @@ -18906,15 +17550,6 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" @@ -18945,11 +17580,6 @@ ws@^1.1.5, ws@^6.2.1, ws@^7.2.3, ws@^7.3.1: options ">=0.0.5" ultron "1.0.x" -xdg-basedir@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" - integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q== - xml-name-validator@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" @@ -18986,11 +17616,6 @@ y18n@^3.2.1: resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== -y18n@^5.0.5: - version "5.0.8" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" - integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== - yallist@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" @@ -19102,19 +17727,6 @@ yargs@^15.3.1: y18n "^4.0.0" yargs-parser "^18.1.1" -yargs@^17.0.1: - version "17.7.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" - integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== - dependencies: - cliui "^8.0.1" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.3" - y18n "^5.0.5" - yargs-parser "^21.1.1" - yargs@^7.0.0: version "7.1.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.2.tgz#63a0a5d42143879fdbb30370741374e0641d55db" From 6dcb58ce4c5e8694ca62d25671fdd06a14f17697 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Mon, 23 Oct 2023 09:51:46 -0400 Subject: [PATCH 245/445] APPEALS-25117: rogue bang operator in comment --- app/services/external_api/webex_service/response.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/external_api/webex_service/response.rb b/app/services/external_api/webex_service/response.rb index 073792c341a..2c86033a43c 100644 --- a/app/services/external_api/webex_service/response.rb +++ b/app/services/external_api/webex_service/response.rb @@ -67,7 +67,7 @@ def parse_error_message # end # def success? -# !resp.error? +# not resp.error? # end # private From 90aa2946d8cd09059db819e7bf53be629885e8c1 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Mon, 23 Oct 2023 10:07:34 -0400 Subject: [PATCH 246/445] APPEALS-25117: code climate issues --- app/jobs/virtual_hearings/delete_conferences_job.rb | 2 -- app/models/hearings/webex_conference_link.rb | 1 - app/services/external_api/webex_service/create_response.rb | 1 - 3 files changed, 4 deletions(-) diff --git a/app/jobs/virtual_hearings/delete_conferences_job.rb b/app/jobs/virtual_hearings/delete_conferences_job.rb index db68c71ea61..76f6bc8ab1e 100644 --- a/app/jobs/virtual_hearings/delete_conferences_job.rb +++ b/app/jobs/virtual_hearings/delete_conferences_job.rb @@ -5,8 +5,6 @@ # if the hearing type is switched from virtual to original hearing type. # It also sends cancellation emails to hearing participants if latter is case. -# add comment to run in code climate - class VirtualHearings::DeleteConferencesJob < VirtualHearings::ConferenceJob include Hearings::EnsureCurrentUserIsSet diff --git a/app/models/hearings/webex_conference_link.rb b/app/models/hearings/webex_conference_link.rb index 4e317a4912b..87f67cc04a4 100644 --- a/app/models/hearings/webex_conference_link.rb +++ b/app/models/hearings/webex_conference_link.rb @@ -4,7 +4,6 @@ class WebexConferenceLink < ConferenceLink def guest_pin nil end - # comment to run in code climate def guest_link guest_hearing_link diff --git a/app/services/external_api/webex_service/create_response.rb b/app/services/external_api/webex_service/create_response.rb index 5accf58071e..7824a2e382a 100644 --- a/app/services/external_api/webex_service/create_response.rb +++ b/app/services/external_api/webex_service/create_response.rb @@ -3,7 +3,6 @@ class ExternalApi::WebexService::CreateResponse < ExternalApi::WebexService::Response def data # resp.raw_body - # comment to run in code climate if !response.body? nil response = JSON.parse(resp.body) { "conference_id": response.first.last } From 13097635c62ce2720660a1c8c46566733458a16d Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Mon, 23 Oct 2023 10:24:50 -0400 Subject: [PATCH 247/445] Some CC fixes --- app/jobs/virtual_hearings/delete_conference_link_job.rb | 2 +- app/models/concerns/conferenceable_concern.rb | 2 +- app/models/hearing_day.rb | 3 ++- app/models/hearings/virtual_hearing.rb | 1 + app/models/hearings/webex_conference_link.rb | 2 +- lib/fakes/webex_service.rb | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/jobs/virtual_hearings/delete_conference_link_job.rb b/app/jobs/virtual_hearings/delete_conference_link_job.rb index 702f7fe5409..10889d0ed97 100644 --- a/app/jobs/virtual_hearings/delete_conference_link_job.rb +++ b/app/jobs/virtual_hearings/delete_conference_link_job.rb @@ -24,6 +24,6 @@ def perform # # Return: A collection of links for hearing days that have passed. def retreive_stale_conference_links - ConferenceLink.joins(:hearing_day).where("scheduled_for < ?", Date.today) + ConferenceLink.joins(:hearing_day).where("scheduled_for < ?", Time.zone.today) end end diff --git a/app/models/concerns/conferenceable_concern.rb b/app/models/concerns/conferenceable_concern.rb index c59aa79acc8..e25de7cb259 100644 --- a/app/models/concerns/conferenceable_concern.rb +++ b/app/models/concerns/conferenceable_concern.rb @@ -30,7 +30,7 @@ module ConferenceableConcern def determine_service_name return hearing&.conference_provider if is_a? VirtualHearing - created_by&.conference_provider if respond_to? :created_by + created_by&.try(:conference_provider) end # Creates an associated MeetingType record for the newly created object. diff --git a/app/models/hearing_day.rb b/app/models/hearing_day.rb index 10be623cc0e..4de206bdfe4 100644 --- a/app/models/hearing_day.rb +++ b/app/models/hearing_day.rb @@ -137,6 +137,7 @@ def hearings_for_user(current_user) caseflow_and_vacols_hearings end + # :reek:BooleanParameter def to_hash(include_conference_links = false) judge_names = HearingDayJudgeNameQuery.new([self]).call video_hearing_days_request_types = if VirtualHearing::VALID_REQUEST_TYPES.include? request_type @@ -233,7 +234,7 @@ def subject_for_conference # called through the 'before_destroy' callback on the hearing_day object. def soft_link_removal - ConferenceLink.where(hearing_day: self).each(&:soft_removal_of_link) + ConferenceLink.where(hearing_day: self).find_each(&:soft_removal_of_link) end def assign_created_by_user diff --git a/app/models/hearings/virtual_hearing.rb b/app/models/hearings/virtual_hearing.rb index d4fa8e66abc..8f8c4cb7591 100644 --- a/app/models/hearings/virtual_hearing.rb +++ b/app/models/hearings/virtual_hearing.rb @@ -278,6 +278,7 @@ def rebuild_and_save_links update!(host_hearing_link: link_service.host_link, guest_hearing_link: link_service.guest_link) end + # :reek:FeatureEnvy def subject_for_conference appeal = hearing.appeal diff --git a/app/models/hearings/webex_conference_link.rb b/app/models/hearings/webex_conference_link.rb index 6af05cfb3d4..87f67cc04a4 100644 --- a/app/models/hearings/webex_conference_link.rb +++ b/app/models/hearings/webex_conference_link.rb @@ -20,7 +20,7 @@ def generate_conference_information update!( host_link: "#{base_url}#{conference.data[:host].first[:short]}", - guest_hearing_link: "#{base_url}#{conference.data[:guest].first[:short]}", + guest_hearing_link: "#{base_url}#{conference.data[:guest].first[:short]}" ) end end diff --git a/lib/fakes/webex_service.rb b/lib/fakes/webex_service.rb index 03d53e831d3..12d781c5275 100644 --- a/lib/fakes/webex_service.rb +++ b/lib/fakes/webex_service.rb @@ -21,7 +21,7 @@ def initialize(**args) @num_guests = args[:num_guests] || 1 end - def create_conference(**args) + def create_conference(*) if error? return ExternalApi::WebexService::CreateResponse.new( HTTPI::Response.new(@status_code, {}, error_response) From 813bfa836196fd000dc1e06414ede3f556bf9c9c Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Mon, 23 Oct 2023 11:13:29 -0400 Subject: [PATCH 248/445] Move update_conf_links to be private --- app/models/hearings/conference_link.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/hearings/conference_link.rb b/app/models/hearings/conference_link.rb index a3964971f06..58e9de9370d 100644 --- a/app/models/hearings/conference_link.rb +++ b/app/models/hearings/conference_link.rb @@ -27,6 +27,8 @@ def soft_removal_of_link destroy end + private + # Purpose: Updates conference_link attributes when passed into the 'update!' method. # # Params: None @@ -40,8 +42,6 @@ def update_conf_links } end - private - def generate_conference_information fail NotImplementedError end From 94f9a56b4f19f163dc6ce412bc64d6754179d5d8 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Mon, 23 Oct 2023 11:14:02 -0400 Subject: [PATCH 249/445] APPEALS-25117: fixing test issues --- .../virtual_hearings/delete_conferences_job.rb | 2 +- app/services/external_api/webex_service.rb | 17 ++++++++++++----- .../webex_service/create_response.rb | 10 +++++----- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/app/jobs/virtual_hearings/delete_conferences_job.rb b/app/jobs/virtual_hearings/delete_conferences_job.rb index 76f6bc8ab1e..76a394fe93e 100644 --- a/app/jobs/virtual_hearings/delete_conferences_job.rb +++ b/app/jobs/virtual_hearings/delete_conferences_job.rb @@ -87,7 +87,7 @@ def log_virtual_hearing_state(virtual_hearing) Rails.logger.info("Cancelled?: (#{virtual_hearing.cancelled?})") Rails.logger.info("Conference id: (#{virtual_hearing.conference_id?})") - Rails.logger.info("Meeting Type: (#{virtual_hearing.meeting_type?})") + Rails.logger.info("Meeting Type: (#{virtual_hearing.conference_provider?})") end def send_cancellation_emails(virtual_hearing) diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb index 52e24fd6e38..f92ec1e1992 100644 --- a/app/services/external_api/webex_service.rb +++ b/app/services/external_api/webex_service.rb @@ -3,7 +3,14 @@ require "json" class ExternalApi::WebexService - ENDPOINT = "api-usgov.webex.com/v1/meetings" + def initialize(host:, port:, aud:, apikey:, domain:, api_endpoint:) + @host = host + @port = port + @aud = aud + @apikey = apikey + @domain = domain + @api_endpoint = api_endpoint + end # :reek:UtilityFunction def combine_time_and_date(time, timezone, date) @@ -32,7 +39,7 @@ def create_conference(virtual_hearing) "Nbf": start_date_time, "Exp": end_date_time }, - "aud": "", + "aud": aud, "numGuest": 1, "numHost": 1, "provideShortUrls": true @@ -48,7 +55,7 @@ def create_conference(virtual_hearing) def delete_conference(virtual_hearing) return if virtual_hearing.conference_id.nil? - delete_endpoint = "#{ENDPOINT}#{conference_id}/" + delete_endpoint = "#{api_endpoint}#{conference_id}/" resp = send_webex_request(delete_endpoint, :delete) return if resp.nil? @@ -59,7 +66,7 @@ def delete_conference(virtual_hearing) # :nocov: def send_webex_request(endpoint, method, body: nil) - url = "http://#{endpoint}" + url = "http://#{host}:#{port}/#{endpoint}" request = HTTPI::Request.new(url) request.open_timeout = 300 request.read_timeout = 300 @@ -68,7 +75,7 @@ def send_webex_request(endpoint, method, body: nil) request.headers["Content-Type"] = "application/json" if method == :post MetricsService.record( - "api-usgov.webex #{method.to_s.upcase} request to #{url}", + "#{host} #{method.to_s.upcase} request to #{url}", service: :webex, name: endpoint ) do diff --git a/app/services/external_api/webex_service/create_response.rb b/app/services/external_api/webex_service/create_response.rb index 7824a2e382a..0c6e5da8bd2 100644 --- a/app/services/external_api/webex_service/create_response.rb +++ b/app/services/external_api/webex_service/create_response.rb @@ -2,10 +2,10 @@ class ExternalApi::WebexService::CreateResponse < ExternalApi::WebexService::Response def data - # resp.raw_body - if !response.body? nil - response = JSON.parse(resp.body) - { "conference_id": response.first.last } - end + resp.raw_body + # if !resp.body? nil + # response = JSON.parse(resp.body) + # { "conference_id": response.first.last } + # end end end From 83864447e3c2dc441fa5a245661418d9e982ef57 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Mon, 23 Oct 2023 11:15:57 -0400 Subject: [PATCH 250/445] Ignore feature envy --- app/services/external_api/pexip_service.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/services/external_api/pexip_service.rb b/app/services/external_api/pexip_service.rb index 4dd48ab0f40..1c593943986 100644 --- a/app/services/external_api/pexip_service.rb +++ b/app/services/external_api/pexip_service.rb @@ -13,6 +13,7 @@ def initialize(host:, port: 443, user_name:, password:, client_host:) @client_host = client_host end + # :reek:FeatureEnvy def create_conference(virtual_hearing) host_pin = virtual_hearing.host_pin guest_pin = virtual_hearing.guest_pin From 7f1fafff07f4c13a2a330c697e80e5026bb59c64 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Mon, 23 Oct 2023 11:16:43 -0400 Subject: [PATCH 251/445] Ignore another feature envy --- app/models/hearings/pexip_conference_link.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/hearings/pexip_conference_link.rb b/app/models/hearings/pexip_conference_link.rb index a7832efd07c..359f0a0ff7f 100644 --- a/app/models/hearings/pexip_conference_link.rb +++ b/app/models/hearings/pexip_conference_link.rb @@ -49,6 +49,7 @@ def guest_link private + # :reek:FeatureEnvy def generate_conference_information Rails.logger.info( "Trying to create a Pexip conference link for Hearing Day Id: #{hearing_day_id}." From 82b6d780af8e135b3f2ce855cb43c67d74c40b4a Mon Sep 17 00:00:00 2001 From: 631862 Date: Mon, 23 Oct 2023 11:22:23 -0400 Subject: [PATCH 252/445] update spec for legacy hearing so the expected to get only the title back (similar to AMA return) --- spec/models/hearings/virtual_hearing_spec.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/spec/models/hearings/virtual_hearing_spec.rb b/spec/models/hearings/virtual_hearing_spec.rb index 0a86d090551..c955ee95e7e 100644 --- a/spec/models/hearings/virtual_hearing_spec.rb +++ b/spec/models/hearings/virtual_hearing_spec.rb @@ -500,10 +500,7 @@ def link(name) it "returns the expected meeting conference details" do is_expected.to eq( - title: "#{hearing.appeal.docket_number}_#{hearing.appeal.id}_LegacyAppeal", - start: "2023-09-22T00:00:00-04:00", - end: "2023-09-22T23:59:59-04:00", - timezone: "America/New_York" + "#{hearing.appeal.docket_number}_#{hearing.appeal.id}_LegacyAppeal" ) end end From ef0dd27444fff24d2caeba2784ae8d3f2ad0c3e9 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Mon, 23 Oct 2023 11:33:25 -0400 Subject: [PATCH 253/445] APPEALS-25117: fixing test issues --- .../external_api/webex_service/create_response.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/services/external_api/webex_service/create_response.rb b/app/services/external_api/webex_service/create_response.rb index 0c6e5da8bd2..646ad0dcc08 100644 --- a/app/services/external_api/webex_service/create_response.rb +++ b/app/services/external_api/webex_service/create_response.rb @@ -2,10 +2,10 @@ class ExternalApi::WebexService::CreateResponse < ExternalApi::WebexService::Response def data - resp.raw_body - # if !resp.body? nil - # response = JSON.parse(resp.body) - # { "conference_id": response.first.last } - # end + # resp.raw_body + if !resp.body? nil + response = JSON.parse(resp.body) + { "conference_id": response.first.last } + end end end From cf30c60e3e46b3e6eef1dd7b11f70d7cfcf035c8 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Mon, 23 Oct 2023 11:58:40 -0400 Subject: [PATCH 254/445] Dry up contexts --- app/models/concerns/conferenceable_concern.rb | 2 +- spec/models/hearing_day_spec.rb | 27 ++++-------------- .../hearings/pexip_conference_link_spec.rb | 28 ++++--------------- .../conference_link_serializer_spec.rb | 6 +--- 4 files changed, 13 insertions(+), 50 deletions(-) diff --git a/app/models/concerns/conferenceable_concern.rb b/app/models/concerns/conferenceable_concern.rb index e25de7cb259..0d37f1aec9d 100644 --- a/app/models/concerns/conferenceable_concern.rb +++ b/app/models/concerns/conferenceable_concern.rb @@ -30,7 +30,7 @@ module ConferenceableConcern def determine_service_name return hearing&.conference_provider if is_a? VirtualHearing - created_by&.try(:conference_provider) + try(:created_by).try(:conference_provider) end # Creates an associated MeetingType record for the newly created object. diff --git a/spec/models/hearing_day_spec.rb b/spec/models/hearing_day_spec.rb index c6a95d0630b..2191c5fafcf 100644 --- a/spec/models/hearing_day_spec.rb +++ b/spec/models/hearing_day_spec.rb @@ -548,11 +548,7 @@ def format_begins_at_from_db(time_string, scheduled_for) end context "hearing day in the past, conference link doesnt exist" do - before do - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return "mysecretkey" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return "example.va.gov" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return "/sample" - end + include_context "Mock Pexip service env vars" after do FeatureToggle.disable!(:pexip_conference_service) @@ -573,10 +569,7 @@ def format_begins_at_from_db(time_string, scheduled_for) subject { hearing_day.conference_links } context "The Pexip and Webex services are both enabled" do - before do - FeatureToggle.enable!(:pexip_conference_service) - FeatureToggle.enable!(:webex_conference_service) - end + include_context "Enable both conference services" it "Both conference links are created whenever requested" do expect(subject).to eq [] @@ -607,14 +600,8 @@ def format_begins_at_from_db(time_string, scheduled_for) end context "#subject_for_conference" do - before do - FeatureToggle.enable!(:pexip_conference_service) - FeatureToggle.enable!(:webex_conference_service) - - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return "mysecretkey" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return "example.va.gov" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return "/sample" - end + include_context "Enable both conference services" + include_context "Mock Pexip service env vars" let(:expected_date) { "Sep 21, 2023" } let(:expected_date_parsed) { Date.parse(expected_date) } @@ -633,11 +620,7 @@ def format_begins_at_from_db(time_string, scheduled_for) end context "hearing day in the future, conference link doesnt exist" do - before do - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return "mysecretkey" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return "example.va.gov" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return "/sample" - end + include_context "Mock Pexip service env vars" let(:hearing_day) do RequestStore[:current_user] = User.create(css_id: "BVASCASPER1", station_id: 101) diff --git a/spec/models/hearings/pexip_conference_link_spec.rb b/spec/models/hearings/pexip_conference_link_spec.rb index c206d1e493d..fcb0a9f7c54 100644 --- a/spec/models/hearings/pexip_conference_link_spec.rb +++ b/spec/models/hearings/pexip_conference_link_spec.rb @@ -68,11 +68,7 @@ end end context "#create" do - before do - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return "mysecretkey" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return "example.va.gov" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return "/sample" - end + include_context "Mock Pexip service env vars" let(:hearing_day) do create(:hearing_day, id: 1) @@ -100,11 +96,7 @@ end context "update conference day" do - before do - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return "mysecretkey" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return "example.va.gov" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return "/sample" - end + include_context "Mock Pexip service env vars" let(:hearing_day) do create(:hearing_day, id: 1) @@ -141,14 +133,8 @@ end describe "#guest_pin" do - before do - FeatureToggle.enable!(:pexip_conference_service) - FeatureToggle.enable!(:webex_conference_service) - - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return "mysecretkey" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return "example.va.gov" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return "/sample" - end + include_context "Mock Pexip service env vars" + include_context "Enable both conference services" let(:hearing_day) { create(:hearing_day) } @@ -171,11 +157,9 @@ end describe "#guest_link" do - before do - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return "mysecretkey" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return "example.va.gov" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return "/sample" + include_context "Mock Pexip service env vars" + before do allow_any_instance_of(VirtualHearings::LinkService).to receive(:conference_id).and_return expected_conference_id allow_any_instance_of(VirtualHearings::LinkService).to receive(:guest_pin).and_return expected_pin end diff --git a/spec/serializers/conference_link_serializer_spec.rb b/spec/serializers/conference_link_serializer_spec.rb index 8778019f642..f4cf2d90a70 100644 --- a/spec/serializers/conference_link_serializer_spec.rb +++ b/spec/serializers/conference_link_serializer_spec.rb @@ -34,11 +34,7 @@ subject { described_class.new(conference_link) } context "With a Pexip conference link" do - before do - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return "mysecretkey" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return "example.va.gov" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return "/sample" - end + include_context "Mock Pexip service env vars" let(:conference_link) { create(:pexip_conference_link, hearing_day: hearing_day) } From 44908d8d67e495d5a1da5339d4adddcb57f87e44 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Mon, 23 Oct 2023 11:59:10 -0400 Subject: [PATCH 255/445] Dry up contexts 2 --- spec/requests/hearing_day_spec.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/spec/requests/hearing_day_spec.rb b/spec/requests/hearing_day_spec.rb index de86b004e56..ce9b29153c1 100644 --- a/spec/requests/hearing_day_spec.rb +++ b/spec/requests/hearing_day_spec.rb @@ -150,11 +150,8 @@ end describe "Show a hearing day with its children hearings" do - before do - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return "mysecretkey" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return "example.va.gov" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return "/sample" - end + include_context "Mock Pexip service env vars" + let!(:regional_office) do create(:staff, stafkey: "RO13", stc4: 11) end From c1ac08017118697a4d56cfc0269ea3f3d4525adf Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Mon, 23 Oct 2023 12:27:54 -0400 Subject: [PATCH 256/445] Add shared context file --- .../shared_context_conference_link.rb | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 spec/support/shared_context/models/hearings/shared_context_conference_link.rb diff --git a/spec/support/shared_context/models/hearings/shared_context_conference_link.rb b/spec/support/shared_context/models/hearings/shared_context_conference_link.rb new file mode 100644 index 00000000000..81a9699bb4b --- /dev/null +++ b/spec/support/shared_context/models/hearings/shared_context_conference_link.rb @@ -0,0 +1,21 @@ +# frozen_string_literal: true + +RSpec.shared_context "Mock Pexip service env vars" do + before do + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return "mysecretkey" + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return "example.va.gov" + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return "/sample" + end +end + +RSpec.shared_context "Enable both conference services" do + before do + FeatureToggle.enable!(:pexip_conference_service) + FeatureToggle.enable!(:webex_conference_service) + end + + after do + FeatureToggle.disable!(:pexip_conference_service) + FeatureToggle.disable!(:webex_conference_service) + end +end From f981048ef1ad69f67f649f7cf2651ef0650bf21c Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Mon, 23 Oct 2023 13:47:26 -0400 Subject: [PATCH 257/445] Trigger CI --- config/initializers/scheduled_jobs.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/initializers/scheduled_jobs.rb b/config/initializers/scheduled_jobs.rb index a0da56302f9..a91e47d7a10 100644 --- a/config/initializers/scheduled_jobs.rb +++ b/config/initializers/scheduled_jobs.rb @@ -52,4 +52,6 @@ "change_hearing_request_type_task_cancellation_job" => ChangeHearingRequestTypeTaskCancellationJob, "cannot_delete_contention_remediation_job" => CannotDeleteContentionRemediationJob, "contention_not_found_remediation_job" => ContentionNotFoundRemediationJob + + }.freeze From 69d81b57209da1525c7ca329ef9f005d72497545 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Mon, 23 Oct 2023 13:47:45 -0400 Subject: [PATCH 258/445] Trigger CI --- config/initializers/scheduled_jobs.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/initializers/scheduled_jobs.rb b/config/initializers/scheduled_jobs.rb index a91e47d7a10..a0da56302f9 100644 --- a/config/initializers/scheduled_jobs.rb +++ b/config/initializers/scheduled_jobs.rb @@ -52,6 +52,4 @@ "change_hearing_request_type_task_cancellation_job" => ChangeHearingRequestTypeTaskCancellationJob, "cannot_delete_contention_remediation_job" => CannotDeleteContentionRemediationJob, "contention_not_found_remediation_job" => ContentionNotFoundRemediationJob - - }.freeze From 04fe69738a0726bea1278b6bfeee2dc8ee325fb0 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Mon, 23 Oct 2023 15:06:33 -0400 Subject: [PATCH 259/445] Fix test --- spec/models/hearings/virtual_hearing_spec.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/spec/models/hearings/virtual_hearing_spec.rb b/spec/models/hearings/virtual_hearing_spec.rb index 0a86d090551..c955ee95e7e 100644 --- a/spec/models/hearings/virtual_hearing_spec.rb +++ b/spec/models/hearings/virtual_hearing_spec.rb @@ -500,10 +500,7 @@ def link(name) it "returns the expected meeting conference details" do is_expected.to eq( - title: "#{hearing.appeal.docket_number}_#{hearing.appeal.id}_LegacyAppeal", - start: "2023-09-22T00:00:00-04:00", - end: "2023-09-22T23:59:59-04:00", - timezone: "America/New_York" + "#{hearing.appeal.docket_number}_#{hearing.appeal.id}_LegacyAppeal" ) end end From 70c385024fe1faacb7516380c9d34478af699762 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Mon, 30 Oct 2023 13:07:23 -0400 Subject: [PATCH 260/445] APPEALS-25117: delete conferences job spec passing --- .../virtual_hearings/conference_client.rb | 2 +- .../virtual_hearings/create_conference_job.rb | 2 +- .../delete_conferences_job.rb | 50 ++++++++++--------- app/services/external_api/pexip_service.rb | 4 +- app/services/external_api/webex_service.rb | 28 ++--------- .../webex_service/create_response.rb | 10 ++-- 6 files changed, 39 insertions(+), 57 deletions(-) diff --git a/app/jobs/virtual_hearings/conference_client.rb b/app/jobs/virtual_hearings/conference_client.rb index da70e7e6cd2..f4ed5212278 100644 --- a/app/jobs/virtual_hearings/conference_client.rb +++ b/app/jobs/virtual_hearings/conference_client.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module VirtualHearings::ConferenceClient - def client + def client(virtual_hearing) case virtual_hearing.conference_provider when "pexip" @client ||= PexipService.new( diff --git a/app/jobs/virtual_hearings/create_conference_job.rb b/app/jobs/virtual_hearings/create_conference_job.rb index f2e645f0579..7ce9973caf2 100644 --- a/app/jobs/virtual_hearings/create_conference_job.rb +++ b/app/jobs/virtual_hearings/create_conference_job.rb @@ -176,7 +176,7 @@ def error_display(response) end def create_new_conference - client.create_conference(virtual_hearing) + client(virtual_hearing).create_conference(virtual_hearing) end def should_initialize_alias_and_pins? diff --git a/app/jobs/virtual_hearings/delete_conferences_job.rb b/app/jobs/virtual_hearings/delete_conferences_job.rb index 76a394fe93e..4f6cb0a7603 100644 --- a/app/jobs/virtual_hearings/delete_conferences_job.rb +++ b/app/jobs/virtual_hearings/delete_conferences_job.rb @@ -87,7 +87,7 @@ def log_virtual_hearing_state(virtual_hearing) Rails.logger.info("Cancelled?: (#{virtual_hearing.cancelled?})") Rails.logger.info("Conference id: (#{virtual_hearing.conference_id?})") - Rails.logger.info("Meeting Type: (#{virtual_hearing.conference_provider?})") + # Rails.logger.info("Meeting Type: (#{virtual_hearing.conference_provider?})") end def send_cancellation_emails(virtual_hearing) @@ -145,18 +145,20 @@ def process_virtual_hearing(virtual_hearing) # Returns whether or not the conference was deleted from Pexip or Webex def delete_conference(virtual_hearing) - response = client.delete_conference(conference_id: virtual_hearing.conference_id) - Rails.logger.info("#{virtual_hearing.conference_provider.capitalize} response: #{response}") + if virtual_hearing.conference_provider == "pexip" + response = client(virtual_hearing).delete_conference(virtual_hearing) + Rails.logger.info("#{virtual_hearing.conference_provider.capitalize} response: #{response}") - fail response.error unless response.success? + fail response.error unless response.success? - true + true + end rescue Caseflow::Error::PexipNotFoundError Rails.logger.info("Conference for hearing (#{virtual_hearing.hearing_id}) was already deleted") - rescue Caseflow::Error::WebexNotFoundError - Rails.logger.info("Conference for hearing (#{virtual_hearing.hearing_id}) was already deleted") + # rescue Caseflow::Error::WebexNotFoundError + # Rails.logger.info("Conference for hearing (#{virtual_hearing.hearing_id}) was already deleted") - # Assume the conference was already deleted if it's no longer in Pexip or Webex. + # Assume the conference was already deleted if it's no longer in Pexip. true rescue Caseflow::Error::PexipApiError => error Rails.logger.error("Failed to delete conference from Pexip for hearing (#{virtual_hearing.hearing_id})" \ @@ -175,21 +177,21 @@ def delete_conference(virtual_hearing) ) false - rescue Caseflow::Error::WebexApiError => error - Rails.logger.error("Failed to delete conference from Webex for hearing (#{virtual_hearing.hearing_id})" \ - " with error: (#{error.code}) #{error.message}") - - (exception_list[Caseflow::Error::WebexApiError] ||= []) << virtual_hearing - - capture_exception( - error: error, - extra: { - hearing_id: virtual_hearing.hearing_id, - virtual_hearing_id: virtual_hearing.id, - webex_conference_Id: virtual_hearing.conference_id - } - ) - - false + # rescue Caseflow::Error::WebexApiError => error + # Rails.logger.error("Failed to delete conference from Webex for hearing (#{virtual_hearing.hearing_id})" \ + # " with error: (#{error.code}) #{error.message}") + + # (exception_list[Caseflow::Error::WebexApiError] ||= []) << virtual_hearing + + # capture_exception( + # error: error, + # extra: { + # hearing_id: virtual_hearing.hearing_id, + # virtual_hearing_id: virtual_hearing.id, + # webex_conference_Id: virtual_hearing.conference_id + # } + # ) + + # false end end diff --git a/app/services/external_api/pexip_service.rb b/app/services/external_api/pexip_service.rb index 4dd48ab0f40..7bf49c4c99d 100644 --- a/app/services/external_api/pexip_service.rb +++ b/app/services/external_api/pexip_service.rb @@ -39,8 +39,8 @@ def create_conference(virtual_hearing) ExternalApi::PexipService::CreateResponse.new(resp) end - def delete_conference(conference_id:) - return if conference_id.nil? + def delete_conference(virtual_hearing) + return if virtual_hearing.conference_id.nil? delete_endpoint = "#{CONFERENCES_ENDPOINT}#{conference_id}/" resp = send_pexip_request(delete_endpoint, :delete) diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb index f92ec1e1992..7e4762f7406 100644 --- a/app/services/external_api/webex_service.rb +++ b/app/services/external_api/webex_service.rb @@ -12,32 +12,12 @@ def initialize(host:, port:, aud:, apikey:, domain:, api_endpoint:) @api_endpoint = api_endpoint end - # :reek:UtilityFunction - def combine_time_and_date(time, timezone, date) - time_with_zone = time.in_time_zone(timezone) - time_and_date_string = "#{date.strftime('%F')} #{time_with_zone.strftime('%T')}" - combined_datetime = time_and_date_string.in_time_zone(timezone) - formatted_datetime_string = combined_datetime.iso8601 - - formatted_datetime_string - end - - # rubocop:disable Metrics/MethodLength def create_conference(virtual_hearing) - hearing_day = HearingDay.find(virtual_hearing.hearing.hearing_day_id) - hearing = Hearing.find(virtual_hearing.hearing.hearing_day_id) - timezone = hearing.regional_office&.timezone - date = hearing_day.scheduled_for - start_time = "00:00:01" - end_time = "23:59:59" - end_date_time = combine_time_and_date(end_time, timezone, date) - start_date_time = combine_time_and_date(start_time, timezone, date) - body = { "jwt": { "sub": virtual_hearing.subject_for_conference, - "Nbf": start_date_time, - "Exp": end_date_time + "Nbf": virtual_hearing.hearing.scheduled_for.beginning_of_day.to_i, + "Exp": virtual_hearing.hearing.scheduled_for.end_of_day.to_i }, "aud": aud, "numGuest": 1, @@ -45,13 +25,13 @@ def create_conference(virtual_hearing) "provideShortUrls": true } - resp = send_webex_request(ENDPOINT, :post, body: body) + resp = send_webex_request(api_endpoint, :post, body: body) return if resp.nil? ExternalApi::WebexService::CreateResponse.new(resp) end - # rubocop:enable Metrics/MethodLength + # won't even need this method at all def delete_conference(virtual_hearing) return if virtual_hearing.conference_id.nil? diff --git a/app/services/external_api/webex_service/create_response.rb b/app/services/external_api/webex_service/create_response.rb index 646ad0dcc08..9399d6ddafd 100644 --- a/app/services/external_api/webex_service/create_response.rb +++ b/app/services/external_api/webex_service/create_response.rb @@ -2,10 +2,10 @@ class ExternalApi::WebexService::CreateResponse < ExternalApi::WebexService::Response def data - # resp.raw_body - if !resp.body? nil - response = JSON.parse(resp.body) - { "conference_id": response.first.last } - end + resp.raw_body + # if !resp.body.nil? + # response = JSON.parse(resp.body) + # { "conference_id": response.first.last } + # end end end From d7f61afec6017ea9888686e2ee5ad8561d6ba8bc Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Mon, 30 Oct 2023 16:25:04 -0400 Subject: [PATCH 261/445] APPEALS-25117: pexip service spec passing --- .../delete_conferences_job.rb | 46 +++++++++---------- app/services/external_api/pexip_service.rb | 2 +- lib/caseflow/error.rb | 10 ++-- .../external_api/pexip_service_spec.rb | 5 +- 4 files changed, 31 insertions(+), 32 deletions(-) diff --git a/app/jobs/virtual_hearings/delete_conferences_job.rb b/app/jobs/virtual_hearings/delete_conferences_job.rb index 4f6cb0a7603..dca003cf982 100644 --- a/app/jobs/virtual_hearings/delete_conferences_job.rb +++ b/app/jobs/virtual_hearings/delete_conferences_job.rb @@ -145,18 +145,16 @@ def process_virtual_hearing(virtual_hearing) # Returns whether or not the conference was deleted from Pexip or Webex def delete_conference(virtual_hearing) - if virtual_hearing.conference_provider == "pexip" - response = client(virtual_hearing).delete_conference(virtual_hearing) - Rails.logger.info("#{virtual_hearing.conference_provider.capitalize} response: #{response}") + response = client(virtual_hearing).delete_conference(virtual_hearing) + Rails.logger.info("#{virtual_hearing.conference_provider.capitalize} response: #{response}") - fail response.error unless response.success? + fail response.error unless response.success? - true - end + true rescue Caseflow::Error::PexipNotFoundError Rails.logger.info("Conference for hearing (#{virtual_hearing.hearing_id}) was already deleted") - # rescue Caseflow::Error::WebexNotFoundError - # Rails.logger.info("Conference for hearing (#{virtual_hearing.hearing_id}) was already deleted") + rescue Caseflow::Error::WebexNotFoundError + Rails.logger.info("Conference for hearing (#{virtual_hearing.hearing_id}) was already deleted") # Assume the conference was already deleted if it's no longer in Pexip. true @@ -177,21 +175,21 @@ def delete_conference(virtual_hearing) ) false - # rescue Caseflow::Error::WebexApiError => error - # Rails.logger.error("Failed to delete conference from Webex for hearing (#{virtual_hearing.hearing_id})" \ - # " with error: (#{error.code}) #{error.message}") - - # (exception_list[Caseflow::Error::WebexApiError] ||= []) << virtual_hearing - - # capture_exception( - # error: error, - # extra: { - # hearing_id: virtual_hearing.hearing_id, - # virtual_hearing_id: virtual_hearing.id, - # webex_conference_Id: virtual_hearing.conference_id - # } - # ) - - # false + rescue Caseflow::Error::WebexApiError => error + Rails.logger.error("Failed to delete conference from Webex for hearing (#{virtual_hearing.hearing_id})" \ + " with error: (#{error.code}) #{error.message}") + + (exception_list[Caseflow::Error::WebexApiError] ||= []) << virtual_hearing + + capture_exception( + error: error, + extra: { + hearing_id: virtual_hearing.hearing_id, + virtual_hearing_id: virtual_hearing.id, + webex_conference_Id: virtual_hearing.conference_id + } + ) + + false end end diff --git a/app/services/external_api/pexip_service.rb b/app/services/external_api/pexip_service.rb index 7bf49c4c99d..71ca8415eeb 100644 --- a/app/services/external_api/pexip_service.rb +++ b/app/services/external_api/pexip_service.rb @@ -42,7 +42,7 @@ def create_conference(virtual_hearing) def delete_conference(virtual_hearing) return if virtual_hearing.conference_id.nil? - delete_endpoint = "#{CONFERENCES_ENDPOINT}#{conference_id}/" + delete_endpoint = "#{CONFERENCES_ENDPOINT}#{virtual_hearing.conference_id}/" resp = send_pexip_request(delete_endpoint, :delete) return if resp.nil? diff --git a/lib/caseflow/error.rb b/lib/caseflow/error.rb index 87a836d1cd7..2079a2f5f00 100644 --- a/lib/caseflow/error.rb +++ b/lib/caseflow/error.rb @@ -419,12 +419,10 @@ class PexipNotFoundError < PexipApiError; end class PexipBadRequestError < PexipApiError; end class PexipMethodNotAllowedError < PexipApiError; end - class WebexApiError < ConferenceCreationError - attr_accessor :descriptions - end - # class WebexNotFoundError < WebexApiError; end - # class WebexBadRequestError < WebexApiError; end - # class WebexMethodNotAllowedError < WebexApiError; end + class WebexApiError < ConferenceCreationError; end + class WebexNotFoundError < WebexApiError; end + class WebexBadRequestError < WebexApiError; end + class WebexMethodNotAllowedError < WebexApiError; end class WorkModeCouldNotUpdateError < StandardError; end diff --git a/spec/services/external_api/pexip_service_spec.rb b/spec/services/external_api/pexip_service_spec.rb index 1478c666811..21bd17b8d57 100644 --- a/spec/services/external_api/pexip_service_spec.rb +++ b/spec/services/external_api/pexip_service_spec.rb @@ -93,7 +93,10 @@ end describe "#delete_conference" do - subject { pexip_service.delete_conference(conference_id: "123") } + let(:virtual_hearing) do + create(:virtual_hearing, conference_id: "123") + end + subject { pexip_service.delete_conference(virtual_hearing) } let(:success_del_resp) { HTTPI::Response.new(204, {}, {}) } let(:error_del_resp) { HTTPI::Response.new(404, {}, {}) } From 11757d4e8a35f90f0cb41d1e659f2d1538b4f0e7 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Mon, 30 Oct 2023 17:09:49 -0400 Subject: [PATCH 262/445] APPEALS-25117: rspec fix + add docket and id as conference id --- .../virtual_hearings/create_conference_job.rb | 8 +++++++- app/services/external_api/webex_service.rb | 15 ++++++++++++--- .../create_conference_job_spec.rb | 6 ------ 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/app/jobs/virtual_hearings/create_conference_job.rb b/app/jobs/virtual_hearings/create_conference_job.rb index 7ce9973caf2..1cea83825c6 100644 --- a/app/jobs/virtual_hearings/create_conference_job.rb +++ b/app/jobs/virtual_hearings/create_conference_job.rb @@ -155,7 +155,13 @@ def create_conference DataDogService.increment_counter(metric_name: "created_conference.successful", **create_conference_datadog_tags) - virtual_hearing.update(conference_id: create_conference_response.data[:conference_id]) + if virtual_hearing.conference_provider == "pexip" + virtual_hearing.update(conference_id: create_conference_response.data[:conference_id]) + else + response = "#{virtual_hearing.hearing.hearing.docket_number}#{virtual_hearing.hearing.id}" + response = response.delete "-" + virtual_hearing.update(conference_id: response.to_i) + end end end diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb index 7e4762f7406..144674b8f7b 100644 --- a/app/services/external_api/webex_service.rb +++ b/app/services/external_api/webex_service.rb @@ -35,9 +35,18 @@ def create_conference(virtual_hearing) def delete_conference(virtual_hearing) return if virtual_hearing.conference_id.nil? - delete_endpoint = "#{api_endpoint}#{conference_id}/" - resp = send_webex_request(delete_endpoint, :delete) - return if resp.nil? + body = { + "jwt": { + "sub": virtual_hearing.subject_for_conference, + "nbf": "0", + "exp": "0" + }, + "aud": aud, + "numGuest": 1, + "numHost": 1, + "provideShortUrls": true + } + resp = send_webex_request(api_endpoint, :post, body: body) ExternalApi::WebexService::DeleteResponse.new(resp) end diff --git a/spec/jobs/virtual_hearings/create_conference_job_spec.rb b/spec/jobs/virtual_hearings/create_conference_job_spec.rb index 8f1733847d5..ea4297cedfb 100644 --- a/spec/jobs/virtual_hearings/create_conference_job_spec.rb +++ b/spec/jobs/virtual_hearings/create_conference_job_spec.rb @@ -97,12 +97,6 @@ expect(virtual_hearing.guest_pin.to_s.length).to eq(11) end - it "fails when meeting type is webex" do - current_user.meeting_type.update!(service_name: "webex") - - expect { subject.perform_now }.to raise_exception(Caseflow::Error::WebexApiError) - end - include_examples "confirmation emails are sent" include_examples "sent email event objects are created" From 8cd66f57a4ab85ffca056a93db6aba40b8e1754b Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Wed, 1 Nov 2023 12:38:42 -0400 Subject: [PATCH 263/445] APPEALS-25117: final service updates --- .../virtual_hearings/conference_client.rb | 6 +- .../virtual_hearings/create_conference_job.rb | 15 ++++ .../delete_conferences_job.rb | 4 +- app/services/external_api/webex_service.rb | 25 +++--- .../webex_service/create_response.rb | 4 - .../external_api/webex_service/response.rb | 90 ++++--------------- 6 files changed, 48 insertions(+), 96 deletions(-) diff --git a/app/jobs/virtual_hearings/conference_client.rb b/app/jobs/virtual_hearings/conference_client.rb index f4ed5212278..e76fe604cb9 100644 --- a/app/jobs/virtual_hearings/conference_client.rb +++ b/app/jobs/virtual_hearings/conference_client.rb @@ -13,12 +13,12 @@ def client(virtual_hearing) ) when "webex" @client ||= WebexService.new( - host: ENV["WEBEX_HOST"], + host: ENV["WEBEX_HOST_IC"], port: ENV["WEBEX_PORT"], aud: ENV["WEBEX_ORGANIZATION"], apikey: ENV["WEBEX_BOTTOKEN"], - domain: ENV["WEBEX_DOMAIN"], - api_endpoint: ENV["WEBEX_API"] + domain: ENV["WEBEX_DOMAIN_IC"], + api_endpoint: ENV["WEBEX_API_IC"] ) else msg = "Conference Provider for the Virtual Hearing Not Found" diff --git a/app/jobs/virtual_hearings/create_conference_job.rb b/app/jobs/virtual_hearings/create_conference_job.rb index 1cea83825c6..1abd94fad04 100644 --- a/app/jobs/virtual_hearings/create_conference_job.rb +++ b/app/jobs/virtual_hearings/create_conference_job.rb @@ -53,6 +53,20 @@ class VirtualHearingLinkGenerationFailed < StandardError; end Raven.capture_exception(exception, extra: extra) end + # Retry if Webex returns an invalid response. + retry_on(Caseflow::Error::WebexApiError, attempts: 10, wait: :exponentially_longer) do |job, exception| + Rails.logger.error("#{job.class.name} (#{job.job_id}) failed with error: #{exception}") + + kwargs = job.arguments.first + extra = { + application: job.class.app_name.to_s, + hearing_id: kwargs[:hearing_id], + hearing_type: kwargs[:hearing_type] + } + + Raven.capture_exception(exception, extra: extra) + end + # Log the timezone of the job. This is primarily used for debugging context around times # that appear in the hearings notification emails. before_perform do |job| @@ -158,6 +172,7 @@ def create_conference if virtual_hearing.conference_provider == "pexip" virtual_hearing.update(conference_id: create_conference_response.data[:conference_id]) else + # Manually adds the subject of the body for the Webex IC Request as the conference id(int only) response = "#{virtual_hearing.hearing.hearing.docket_number}#{virtual_hearing.hearing.id}" response = response.delete "-" virtual_hearing.update(conference_id: response.to_i) diff --git a/app/jobs/virtual_hearings/delete_conferences_job.rb b/app/jobs/virtual_hearings/delete_conferences_job.rb index dca003cf982..55fb9c7a979 100644 --- a/app/jobs/virtual_hearings/delete_conferences_job.rb +++ b/app/jobs/virtual_hearings/delete_conferences_job.rb @@ -86,8 +86,8 @@ def log_virtual_hearing_state(virtual_hearing) super Rails.logger.info("Cancelled?: (#{virtual_hearing.cancelled?})") - Rails.logger.info("Conference id: (#{virtual_hearing.conference_id?})") - # Rails.logger.info("Meeting Type: (#{virtual_hearing.conference_provider?})") + Rails.logger.info("Conference id: (#{virtual_hearing.conference_id})") + Rails.logger.info("Meeting Type: (#{virtual_hearing.conference_provider})") end def send_cancellation_emails(virtual_hearing) diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb index 144674b8f7b..c08abe74eba 100644 --- a/app/services/external_api/webex_service.rb +++ b/app/services/external_api/webex_service.rb @@ -25,7 +25,7 @@ def create_conference(virtual_hearing) "provideShortUrls": true } - resp = send_webex_request(api_endpoint, :post, body: body) + resp = send_webex_request(body: body) return if resp.nil? ExternalApi::WebexService::CreateResponse.new(resp) @@ -38,15 +38,15 @@ def delete_conference(virtual_hearing) body = { "jwt": { "sub": virtual_hearing.subject_for_conference, - "nbf": "0", - "exp": "0" + "Nbf": "0", + "Exp": "0" }, "aud": aud, "numGuest": 1, "numHost": 1, "provideShortUrls": true } - resp = send_webex_request(api_endpoint, :post, body: body) + resp = send_webex_request(body: body) ExternalApi::WebexService::DeleteResponse.new(resp) end @@ -54,26 +54,21 @@ def delete_conference(virtual_hearing) private # :nocov: - def send_webex_request(endpoint, method, body: nil) - url = "http://#{host}:#{port}/#{endpoint}" + def send_webex_request(body: nil) + url = "https://#{host}#{domain}/#{api_endpoint}" request = HTTPI::Request.new(url) request.open_timeout = 300 request.read_timeout = 300 request.body = body.to_json unless body.nil? - request.headers["Content-Type"] = "application/json" if method == :post + request.headers["Authorization"] = "Bearer #{apikey}" MetricsService.record( - "#{host} #{method.to_s.upcase} request to #{url}", + "#{host} POST request to #{url}", service: :webex, - name: endpoint + name: api_endpoint ) do - case method - when :delete - HTTPI.delete(request) - when :post - HTTPI.post(request) - end + HTTPI.post(request) end end # :nocov: diff --git a/app/services/external_api/webex_service/create_response.rb b/app/services/external_api/webex_service/create_response.rb index 9399d6ddafd..0e77fbac355 100644 --- a/app/services/external_api/webex_service/create_response.rb +++ b/app/services/external_api/webex_service/create_response.rb @@ -3,9 +3,5 @@ class ExternalApi::WebexService::CreateResponse < ExternalApi::WebexService::Response def data resp.raw_body - # if !resp.body.nil? - # response = JSON.parse(resp.body) - # { "conference_id": response.first.last } - # end end end diff --git a/app/services/external_api/webex_service/response.rb b/app/services/external_api/webex_service/response.rb index 2c86033a43c..a774a10e367 100644 --- a/app/services/external_api/webex_service/response.rb +++ b/app/services/external_api/webex_service/response.rb @@ -3,19 +3,12 @@ class ExternalApi::WebexService::Response attr_reader :resp, :code - DEFAULT_ERROR_BODY = { - message: "Either an error message was not provided or one could not be located.", - descriptions: [] - }.freeze - def initialize(resp) @resp = resp @code = @resp.code end - def data - fail NotImplementedError - end + def data; end def error check_for_errors @@ -30,75 +23,28 @@ def success? def check_for_errors return if success? - parsed_messages = parse_error_message - - Caseflow::Error::WebexApiError.new( - code: code, - message: parsed_messages.dig(:message), - descriptions: parsed_messages.dig(:descriptions) - ) + msg = error_message + case code + when 400 + Caseflow::Error::WebexBadRequestError.new(code: code, message: msg) + when 501 + Caseflow::Error::WebexApiError.new(code: code, message: msg) + when 404 + Caseflow::Error::WebexNotFoundError.new(code: code, message: msg) + when 405 + Caseflow::Error::WebexMethodNotAllowedError.new(code: code, message: msg) + else + Caseflow::Error::WebexApiError.new(code: code, message: msg) + end end - def parse_error_message - return DEFAULT_ERROR_BODY if resp.raw_body.empty? + def error_message + return "No error message from Webex" if resp.raw_body.empty? begin - body = JSON.parse(resp.raw_body) - - { - message: body.dig(:message), - descriptions: body.dig(:errors)&.pluck(:description)&.compact - } + JSON.parse(resp.raw_body)["message"] rescue JSON::ParserError - DEFAULT_ERROR_BODY + "No error message from Webex" end end end - -# def initialize(resp) -# @resp = resp -# @code = @resp.code -# end - -# def data; end - -# def error -# check_for_error -# end - -# def success? -# not resp.error? -# end - -# private - -# # :nocov: -# def check_for_error -# return if success? - -# msg = error_message -# case code -# when 400 -# Caseflow::Error::WebexBadRequestError.new(code: code, message: msg) -# when 501 -# Caseflow::Error::WebexApiError.new(code: code, message: msg) -# when 404 -# Caseflow::Error::WebexNotFoundError.new(code: code, message: msg) -# when 405 -# Caseflow::Error::WebexMethodNotAllowedError.new(code: code, message: msg) -# else -# Caseflow::Error::WebexApiError.new(code: code, message: msg) -# end -# end - -# def error_message -# return "No error message from Webex" if resp.raw_body.empty? - -# begin -# JSON.parse(resp.raw_body)["message"] -# rescue JSON::ParserError -# "No error message from Webex" -# end -# end -# # :nocov: -# end From 12ca6b28f71f103825e7a41c948a4e01dfe86b42 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Wed, 1 Nov 2023 18:24:15 -0400 Subject: [PATCH 264/445] APPEALS-25117: adds webex service rspec and comments to create conference job spec, needs further review --- app/services/external_api/webex_service.rb | 20 ++- lib/fakes/webex_service.rb | 4 +- .../create_conference_job_spec.rb | 21 +++ .../external_api/webex_service_spec.rb | 136 ++++++++++++++++++ 4 files changed, 168 insertions(+), 13 deletions(-) create mode 100644 spec/services/external_api/webex_service_spec.rb diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb index c08abe74eba..46a19e19f17 100644 --- a/app/services/external_api/webex_service.rb +++ b/app/services/external_api/webex_service.rb @@ -19,7 +19,7 @@ def create_conference(virtual_hearing) "Nbf": virtual_hearing.hearing.scheduled_for.beginning_of_day.to_i, "Exp": virtual_hearing.hearing.scheduled_for.end_of_day.to_i }, - "aud": aud, + "aud": @aud, "numGuest": 1, "numHost": 1, "provideShortUrls": true @@ -31,22 +31,20 @@ def create_conference(virtual_hearing) ExternalApi::WebexService::CreateResponse.new(resp) end - # won't even need this method at all def delete_conference(virtual_hearing) - return if virtual_hearing.conference_id.nil? - body = { "jwt": { "sub": virtual_hearing.subject_for_conference, - "Nbf": "0", - "Exp": "0" + "Nbf": 0, + "Exp": 0 }, - "aud": aud, + "aud": @aud, "numGuest": 1, "numHost": 1, "provideShortUrls": true } resp = send_webex_request(body: body) + return if resp.nil? ExternalApi::WebexService::DeleteResponse.new(resp) end @@ -55,18 +53,18 @@ def delete_conference(virtual_hearing) # :nocov: def send_webex_request(body: nil) - url = "https://#{host}#{domain}/#{api_endpoint}" + url = "https://#{@host}#{@domain}#{@api_endpoint}" request = HTTPI::Request.new(url) request.open_timeout = 300 request.read_timeout = 300 request.body = body.to_json unless body.nil? - request.headers["Authorization"] = "Bearer #{apikey}" + request.headers["Authorization"] = "Bearer #{@apikey}" MetricsService.record( - "#{host} POST request to #{url}", + "#{@host} POST request to #{url}", service: :webex, - name: api_endpoint + name: @api_endpoint ) do HTTPI.post(request) end diff --git a/lib/fakes/webex_service.rb b/lib/fakes/webex_service.rb index 03d53e831d3..d2b6a56313d 100644 --- a/lib/fakes/webex_service.rb +++ b/lib/fakes/webex_service.rb @@ -21,7 +21,7 @@ def initialize(**args) @num_guests = args[:num_guests] || 1 end - def create_conference(**args) + def create_conference(virtual_hearing) if error? return ExternalApi::WebexService::CreateResponse.new( HTTPI::Response.new(@status_code, {}, error_response) @@ -37,7 +37,7 @@ def create_conference(**args) ) end - def delete_conference(*) + def delete_conference(virtual_hearing) if error? return ExternalApi::WebexService::DeleteResponse.new( HTTPI::Response.new(@status_code, {}, error_response) diff --git a/spec/jobs/virtual_hearings/create_conference_job_spec.rb b/spec/jobs/virtual_hearings/create_conference_job_spec.rb index ea4297cedfb..f6cf92c926e 100644 --- a/spec/jobs/virtual_hearings/create_conference_job_spec.rb +++ b/spec/jobs/virtual_hearings/create_conference_job_spec.rb @@ -97,6 +97,27 @@ expect(virtual_hearing.guest_pin.to_s.length).to eq(11) end + # For feature toggle testing... + # Should we have implemented a feature toggle check in the create conference job create method + # That points to either service based on feature toggle that would bypass the conference client? + # Otherwise, to my understanding, there doesnt seem to be a reason for feature toggle tests + # Unless we wanted to ensure that no matter what the users conference provider is, if the feature toggle + # Is turned to pexip only pexip conferences can be created and if its webex only webex conferences could be created? + # Because that would change the create conference job entirely.... + + # Having trouble trying to update the conference provider, I think it has to be done by updating + # The users conference provider and then creating the virtual hearing.... + + # describe "for webex" do + # let(:virtual_hearing) { create(:virtual_hearing, conference_provider: "webex") } + # it "creates a webex conference" do + # conference_id = "#{virtual_hearing.hearing.hearing.docket_number}#{virtual_hearing.hearing.id}" + # conference_id = conference_id.delete "-" + # subject.perform_now + # expect(virtual_hearing.conference_id).to eq(conference_id.to_i) + # end + # end + include_examples "confirmation emails are sent" include_examples "sent email event objects are created" diff --git a/spec/services/external_api/webex_service_spec.rb b/spec/services/external_api/webex_service_spec.rb new file mode 100644 index 00000000000..85c639fe0d0 --- /dev/null +++ b/spec/services/external_api/webex_service_spec.rb @@ -0,0 +1,136 @@ +# frozen_string_literal: true + +describe ExternalApi::WebexService do + let(:host) { "fake-broker." } + let(:port) { "0000" } + let(:aud) { "1234abcd" } + let(:apikey) { SecureRandom.uuid.to_s } + let(:domain) { "gov.fake.com" } + let(:api_endpoint) { "/api/v2/fake" } + + let(:webex_service) do + ExternalApi::WebexService.new( + host: host, + domain: domain, + api_endpoint: api_endpoint, + aud: aud, + apikey: apikey, + port: port + ) + end + + describe "webex requests" do + let(:virtual_hearing) do + create(:virtual_hearing) + end + + let(:success_create_resp) do + HTTPI::Response.new(200, {}, {}) + end + + let(:error_create_resp) do + HTTPI::Response.new(400, {}, {}) + end + + describe "create conference" do + let(:body) do + { + "jwt": { + "sub": virtual_hearing.subject_for_conference, + "Nbf": virtual_hearing.hearing.scheduled_for.beginning_of_day.to_i, + "Exp": virtual_hearing.hearing.scheduled_for.end_of_day.to_i + }, + "aud": aud, + "numGuest": 1, + "numHost": 1, + "provideShortUrls": true + } + end + + subject { webex_service.create_conference(virtual_hearing) } + + it "calls send_webex_request and passes the correct body" do + expect(webex_service).to receive(:send_webex_request).with(body: body) + subject + end + + it "returns a successful instance of CreateResponse class" do + allow(webex_service).to receive(:send_webex_request).with(body: body).and_return(success_create_resp) + + expect(subject).to be_instance_of(ExternalApi::WebexService::CreateResponse) + expect(subject.code).to eq(200) + expect(subject.success?).to eq(true) + end + + it "returns error response" do + allow(webex_service).to receive(:send_webex_request).with(body: body).and_return(error_create_resp) + + expect(subject.code).to eq(400) + expect(subject.success?).to eq(false) + expect(subject.error).to eq(Caseflow::Error::WebexBadRequestError.new(code: 400)) + end + + describe "with fakes" do + let(:webex_service) do + Fakes::WebexService.new + end + + it "creates a conference" do + expect(subject.code).to eq(200) + expect(subject.resp.body[:baseUrl]).to eq("https://instant-usgov.webex.com/visit/") + subject + end + end + end + + describe "delete conference" do + let(:body) do + { + "jwt": { + "sub": virtual_hearing.subject_for_conference, + "Nbf": 0, + "Exp": 0 + }, + "aud": aud, + "numGuest": 1, + "numHost": 1, + "provideShortUrls": true + } + end + subject { webex_service.delete_conference(virtual_hearing) } + + it "calls send_webex_request and passes correct body" do + expect(webex_service).to receive(:send_webex_request).with(body: body) + subject + end + + it "returns a successful instance of CreateResponse class" do + allow(webex_service).to receive(:send_webex_request).with(body: body).and_return(success_create_resp) + + expect(subject).to be_instance_of(ExternalApi::WebexService::DeleteResponse) + expect(subject.code).to eq(200) + expect(subject.success?).to eq(true) + end + + it "returns error response" do + allow(webex_service).to receive(:send_webex_request).with(body: body).and_return(error_create_resp) + + expect(subject.code).to eq(400) + expect(subject.success?).to eq(false) + expect(subject.error).to eq(Caseflow::Error::WebexBadRequestError.new(code: 400)) + end + + describe "with fakes" do + let(:webex_service) do + Fakes::WebexService.new + end + + it "deletes a conference" do + expect(subject.code).to eq(200) + expect(subject.resp.body[:baseUrl]).to eq("https://instant-usgov.webex.com/visit/") + subject + end + end + end + end +end From d33f31edd4f12fe5ce4b2de9dd4aed4864fa2455 Mon Sep 17 00:00:00 2001 From: breedbah Date: Thu, 2 Nov 2023 11:03:02 -0400 Subject: [PATCH 265/445] APPEALS-25117 spec update --- .../create_conference_job_spec.rb | 29 ++++++------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/spec/jobs/virtual_hearings/create_conference_job_spec.rb b/spec/jobs/virtual_hearings/create_conference_job_spec.rb index f6cf92c926e..b43af606eb9 100644 --- a/spec/jobs/virtual_hearings/create_conference_job_spec.rb +++ b/spec/jobs/virtual_hearings/create_conference_job_spec.rb @@ -97,26 +97,15 @@ expect(virtual_hearing.guest_pin.to_s.length).to eq(11) end - # For feature toggle testing... - # Should we have implemented a feature toggle check in the create conference job create method - # That points to either service based on feature toggle that would bypass the conference client? - # Otherwise, to my understanding, there doesnt seem to be a reason for feature toggle tests - # Unless we wanted to ensure that no matter what the users conference provider is, if the feature toggle - # Is turned to pexip only pexip conferences can be created and if its webex only webex conferences could be created? - # Because that would change the create conference job entirely.... - - # Having trouble trying to update the conference provider, I think it has to be done by updating - # The users conference provider and then creating the virtual hearing.... - - # describe "for webex" do - # let(:virtual_hearing) { create(:virtual_hearing, conference_provider: "webex") } - # it "creates a webex conference" do - # conference_id = "#{virtual_hearing.hearing.hearing.docket_number}#{virtual_hearing.hearing.id}" - # conference_id = conference_id.delete "-" - # subject.perform_now - # expect(virtual_hearing.conference_id).to eq(conference_id.to_i) - # end - # end + describe "for webex" do + let(:virtual_hearing) { create(:virtual_hearing, conference_provider: "webex") } + it "creates a webex conference" do + conference_id = "#{virtual_hearing.hearing.hearing.docket_number}#{virtual_hearing.hearing.id}" + conference_id = conference_id.delete "-" + subject.perform_now + expect(virtual_hearing.conference_id).to eq(conference_id.to_i) + end + end include_examples "confirmation emails are sent" From ea62037249c12e421154bfe8ae39fb628817b78d Mon Sep 17 00:00:00 2001 From: breedbah Date: Thu, 2 Nov 2023 13:40:46 -0400 Subject: [PATCH 266/445] APPEALS-25117 update test --- db/schema.rb | 42 ++++++++++++++++--- .../create_conference_job_spec.rb | 7 +++- 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index bada9b305fe..6d581d076d4 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -91,7 +91,7 @@ t.boolean "appeal_docketed", default: false, null: false, comment: "When true, appeal has been docketed" t.bigint "appeal_id", null: false, comment: "AMA or Legacy Appeal ID" t.string "appeal_type", null: false, comment: "Appeal Type (Appeal or LegacyAppeal)" - t.datetime "created_at", null: false + t.datetime "created_at", null: false, comment: "Date and Time the record was inserted into the table" t.bigint "created_by_id", null: false, comment: "User id of the user that inserted the record" t.boolean "decision_mailed", default: false, null: false, comment: "When true, appeal has decision mail request complete" t.boolean "hearing_postponed", default: false, null: false, comment: "When true, appeal has hearing postponed and no hearings scheduled" @@ -100,7 +100,7 @@ t.boolean "privacy_act_complete", default: false, null: false, comment: "When true, appeal has a privacy act request completed" t.boolean "privacy_act_pending", default: false, null: false, comment: "When true, appeal has a privacy act request still open" t.boolean "scheduled_in_error", default: false, null: false, comment: "When true, hearing was scheduled in error and none scheduled" - t.datetime "updated_at" + t.datetime "updated_at", comment: "Date and time the record was last updated" t.bigint "updated_by_id", comment: "User id of the last user that updated the record" t.boolean "vso_ihp_complete", default: false, null: false, comment: "When true, appeal has a VSO IHP request completed" t.boolean "vso_ihp_pending", default: false, null: false, comment: "When true, appeal has a VSO IHP request pending" @@ -220,7 +220,7 @@ t.index ["veteran_file_number"], name: "index_available_hearing_locations_on_veteran_file_number" end - create_table "batch_processes", primary_key: "batch_id", id: :uuid, default: -> { "uuid_generate_v4()" }, comment: "The unique id of the created batch", comment: "A generalized table for batching and processing records within caseflow", force: :cascade do |t| + create_table "batch_processes", primary_key: "batch_id", id: :uuid, default: -> { "uuid_generate_v4()" }, comment: "A generalized table for batching and processing records within caseflow", force: :cascade do |t| t.string "batch_type", null: false, comment: "Indicates what type of record is being batched" t.datetime "created_at", null: false, comment: "Date and Time that batch was created." t.datetime "ended_at", comment: "The date/time that the batch finsished processing" @@ -627,6 +627,8 @@ t.string "diagnostic_code", comment: "If a decision resulted in a rating, this is the rating issue's diagnostic code." t.string "disposition", comment: "The disposition for a decision issue. Dispositions made in Caseflow and dispositions made in VBMS can have different values." t.date "end_product_last_action_date", comment: "After an end product gets synced with a status of CLR (cleared), the end product's last_action_date is saved on any decision issues that are created as a result. This is used as a proxy for decision date for non-rating issues that are processed in VBMS because they don't have a rating profile date, and the exact decision date is not available." + t.boolean "mst_status", default: false, comment: "Indicates if decision issue is related to Military Sexual Trauma (MST)" + t.boolean "pact_status", default: false, comment: "Indicates if decision issue is related to Promise to Address Comprehensive Toxics (PACT) Act" t.string "participant_id", null: false, comment: "The Veteran's participant id." t.string "percent_number", comment: "percent_number from RatingIssue (prcntNo from Rating Profile)" t.string "rating_issue_reference_id", comment: "Identifies the specific issue on the rating that resulted from the decision issue (a rating issue can be connected to multiple contentions)." @@ -1304,7 +1306,7 @@ t.string "appeals_type", null: false, comment: "Type of Appeal" t.datetime "created_at", comment: "Timestamp of when Noticiation was Created" t.boolean "email_enabled", default: true, null: false - t.string "email_notification_content", comment: "Full Email Text Content of Notification" + t.text "email_notification_content", comment: "Full Email Text Content of Notification" t.string "email_notification_external_id", comment: "VA Notify Notification Id for the email notification send through their API " t.string "email_notification_status", comment: "Status of the Email Notification" t.date "event_date", null: false, comment: "Date of Event" @@ -1315,8 +1317,8 @@ t.string "participant_id", comment: "ID of Participant" t.string "recipient_email", comment: "Participant's Email Address" t.string "recipient_phone_number", comment: "Participants Phone Number" - t.string "sms_notification_content", comment: "Full SMS Text Content of Notification" - t.string "sms_notification_external_id", comment: "VA Notify Notification Id for the sms notification send through their API " + t.text "sms_notification_content", comment: "Full SMS Text Content of Notification" + t.string "sms_notification_external_id" t.string "sms_notification_status", comment: "Status of SMS/Text Notification" t.datetime "updated_at", comment: "TImestamp of when Notification was Updated" t.index ["appeals_id", "appeals_type"], name: "index_appeals_notifications_on_appeals_id_and_appeals_type" @@ -1524,9 +1526,13 @@ t.string "ineligible_reason", comment: "The reason for a Request Issue being ineligible. If a Request Issue has an ineligible_reason, it is still captured, but it will not get a contention in VBMS or a decision." t.boolean "is_predocket_needed", comment: "Indicates whether or not an issue has been selected to go to the pre-docket queue opposed to normal docketing." t.boolean "is_unidentified", comment: "Indicates whether a Request Issue is unidentified, meaning it wasn't found in the list of contestable issues, and is not a new nonrating issue. Contentions for unidentified issues are created on a rating End Product if processed in VBMS but without the issue description, and someone is required to edit it in Caseflow before proceeding with the decision." + t.boolean "mst_status", default: false, comment: "Indicates if issue is related to Military Sexual Trauma (MST)" + t.text "mst_status_update_reason_notes", comment: "The reason for why Request Issue is Military Sexual Trauma (MST)" t.string "nonrating_issue_category", comment: "The category selected for nonrating request issues. These vary by business line." t.string "nonrating_issue_description", comment: "The user entered description if the issue is a nonrating issue" t.text "notes", comment: "Notes added by the Claims Assistant when adding request issues. This may be used to capture handwritten notes on the form, or other comments the CA wants to capture." + t.boolean "pact_status", default: false, comment: "Indicates if issue is related to Promise to Address Comprehensive Toxics (PACT) Act" + t.text "pact_status_update_reason_notes", comment: "The reason for why Request Issue is Promise to Address Comprehensive Toxics (PACT) Act" t.string "ramp_claim_id", comment: "If a rating issue was created as a result of an issue intaken for a RAMP Review, it will be connected to the former RAMP issue by its End Product's claim ID." t.datetime "rating_issue_associated_at", comment: "Timestamp when a contention and its contested rating issue are associated in VBMS." t.string "split_issue_status", comment: "If a request issue is part of a split, on_hold status applies to the original request issues while active are request issues on splitted appeals" @@ -1537,6 +1543,8 @@ t.datetime "updated_at", comment: "Automatic timestamp whenever the record changes." t.string "vacols_id", comment: "The vacols_id of the legacy appeal that had an issue found to match the request issue." t.integer "vacols_sequence_id", comment: "The vacols_sequence_id, for the specific issue on the legacy appeal which the Claims Assistant determined to match the request issue on the Decision Review. A combination of the vacols_id (for the legacy appeal), and vacols_sequence_id (for which issue on the legacy appeal), is required to identify the issue being opted-in." + t.boolean "vbms_mst_status", default: false, comment: "Indicates if issue is related to Military Sexual Trauma (MST) and was imported from VBMS" + t.boolean "vbms_pact_status", default: false, comment: "Indicates if issue is related to Promise to Address Comprehensive Toxics (PACT) Act and was imported from VBMS" t.boolean "verified_unidentified_issue", comment: "A verified unidentified issue allows an issue whose rating data is missing to be intaken as a regular rating issue. In order to be marked as verified, a VSR needs to confirm that they were able to find the record of the decision for the issue." t.string "veteran_participant_id", comment: "The veteran participant ID. This should be unique in upstream systems and used in the future to reconcile duplicates." t.index ["closed_at"], name: "index_request_issues_on_closed_at" @@ -1562,6 +1570,8 @@ t.integer "edited_request_issue_ids", comment: "An array of the request issue IDs that were edited during this request issues update", array: true t.string "error", comment: "The error message if the last attempt at processing the request issues update was not successful." t.datetime "last_submitted_at", comment: "Timestamp for when the processing for the request issues update was last submitted. Used to determine how long to continue retrying the processing job. Can be reset to allow for additional retries." + t.integer "mst_edited_request_issue_ids", comment: "An array of the request issue IDs that were updated to be associated with MST in request issues update", array: true + t.integer "pact_edited_request_issue_ids", comment: "An array of the request issue IDs that were updated to be associated with PACT in request issues update", array: true t.datetime "processed_at", comment: "Timestamp for when the request issue update successfully completed processing." t.bigint "review_id", null: false, comment: "The ID of the decision review edited." t.string "review_type", null: false, comment: "The type of the decision review edited." @@ -1610,6 +1620,26 @@ t.index ["sent_by_id"], name: "index_sent_hearing_email_events_on_sent_by_id" end + create_table "special_issue_changes", force: :cascade do |t| + t.bigint "appeal_id", null: false, comment: "AMA or Legacy Appeal ID that the issue is tied to" + t.string "appeal_type", null: false, comment: "Appeal Type (Appeal or LegacyAppeal)" + t.string "change_category", null: false, comment: "Type of change that occured to the issue (Established Issue, Added Issue, Edited Issue, Removed Issue)" + t.datetime "created_at", null: false, comment: "Date the special issue change was made" + t.string "created_by_css_id", null: false, comment: "CSS ID of the user that made the special issue change" + t.bigint "created_by_id", null: false, comment: "User ID of the user that made the special issue change" + t.bigint "decision_issue_id", comment: "ID of the decision issue that had a special issue change from its corresponding request issue" + t.bigint "issue_id", null: false, comment: "ID of the issue that was changed" + t.boolean "mst_from_vbms", comment: "Indication that the MST status originally came from VBMS on intake" + t.string "mst_reason_for_change", comment: "Reason for changing the MST status on an issue" + t.boolean "original_mst_status", null: false, comment: "Original MST special issue status of the issue" + t.boolean "original_pact_status", null: false, comment: "Original PACT special issue status of the issue" + t.boolean "pact_from_vbms" + t.string "pact_reason_for_change", comment: "Reason for changing the PACT status on an issue" + t.bigint "task_id", null: false, comment: "Task ID of the IssueUpdateTask or EstablishmentTask used to log this issue in the case timeline" + t.boolean "updated_mst_status", comment: "Updated MST special issue status of the issue" + t.boolean "updated_pact_status", comment: "Updated PACT special issue status of the issue" + end + create_table "special_issue_lists", comment: "Associates special issues to an AMA or legacy appeal for Caseflow Queue. Caseflow Dispatch uses special issues stored in legacy_appeals. They are intentionally disconnected.", force: :cascade do |t| t.bigint "appeal_id", comment: "The ID of the appeal associated with this record" t.string "appeal_type", comment: "The type of appeal associated with this record" diff --git a/spec/jobs/virtual_hearings/create_conference_job_spec.rb b/spec/jobs/virtual_hearings/create_conference_job_spec.rb index b43af606eb9..ae38de4464f 100644 --- a/spec/jobs/virtual_hearings/create_conference_job_spec.rb +++ b/spec/jobs/virtual_hearings/create_conference_job_spec.rb @@ -98,7 +98,12 @@ end describe "for webex" do - let(:virtual_hearing) { create(:virtual_hearing, conference_provider: "webex") } + let(:virtual_hearing) do + create(:virtual_hearing).tap do |virtual_hearing| + virtual_hearing.meeting_type.update(service_name: "webex") + end + end + it "creates a webex conference" do conference_id = "#{virtual_hearing.hearing.hearing.docket_number}#{virtual_hearing.hearing.id}" conference_id = conference_id.delete "-" From 56e0ed57fd36d4b4d99123c8823a898de12b498f Mon Sep 17 00:00:00 2001 From: breedbah Date: Thu, 2 Nov 2023 15:26:42 -0400 Subject: [PATCH 267/445] APPEALS-25117 finish spec update --- spec/jobs/virtual_hearings/create_conference_job_spec.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/jobs/virtual_hearings/create_conference_job_spec.rb b/spec/jobs/virtual_hearings/create_conference_job_spec.rb index ae38de4464f..6ef90f28720 100644 --- a/spec/jobs/virtual_hearings/create_conference_job_spec.rb +++ b/spec/jobs/virtual_hearings/create_conference_job_spec.rb @@ -101,11 +101,12 @@ let(:virtual_hearing) do create(:virtual_hearing).tap do |virtual_hearing| virtual_hearing.meeting_type.update(service_name: "webex") + virtual_hearing.update(conference_id: 23_110_155) end end it "creates a webex conference" do - conference_id = "#{virtual_hearing.hearing.hearing.docket_number}#{virtual_hearing.hearing.id}" + conference_id = "#{virtual_hearing.hearing.docket_number}#{virtual_hearing.hearing.id}" conference_id = conference_id.delete "-" subject.perform_now expect(virtual_hearing.conference_id).to eq(conference_id.to_i) From 60b7856a7b1d0b1c0134a9c890f5ff250fbe6b86 Mon Sep 17 00:00:00 2001 From: breedbah Date: Thu, 2 Nov 2023 16:46:11 -0400 Subject: [PATCH 268/445] APPEALS-25117 correct schema --- db/schema.rb | 42 ++++++------------------------------------ 1 file changed, 6 insertions(+), 36 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 6d581d076d4..bada9b305fe 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -91,7 +91,7 @@ t.boolean "appeal_docketed", default: false, null: false, comment: "When true, appeal has been docketed" t.bigint "appeal_id", null: false, comment: "AMA or Legacy Appeal ID" t.string "appeal_type", null: false, comment: "Appeal Type (Appeal or LegacyAppeal)" - t.datetime "created_at", null: false, comment: "Date and Time the record was inserted into the table" + t.datetime "created_at", null: false t.bigint "created_by_id", null: false, comment: "User id of the user that inserted the record" t.boolean "decision_mailed", default: false, null: false, comment: "When true, appeal has decision mail request complete" t.boolean "hearing_postponed", default: false, null: false, comment: "When true, appeal has hearing postponed and no hearings scheduled" @@ -100,7 +100,7 @@ t.boolean "privacy_act_complete", default: false, null: false, comment: "When true, appeal has a privacy act request completed" t.boolean "privacy_act_pending", default: false, null: false, comment: "When true, appeal has a privacy act request still open" t.boolean "scheduled_in_error", default: false, null: false, comment: "When true, hearing was scheduled in error and none scheduled" - t.datetime "updated_at", comment: "Date and time the record was last updated" + t.datetime "updated_at" t.bigint "updated_by_id", comment: "User id of the last user that updated the record" t.boolean "vso_ihp_complete", default: false, null: false, comment: "When true, appeal has a VSO IHP request completed" t.boolean "vso_ihp_pending", default: false, null: false, comment: "When true, appeal has a VSO IHP request pending" @@ -220,7 +220,7 @@ t.index ["veteran_file_number"], name: "index_available_hearing_locations_on_veteran_file_number" end - create_table "batch_processes", primary_key: "batch_id", id: :uuid, default: -> { "uuid_generate_v4()" }, comment: "A generalized table for batching and processing records within caseflow", force: :cascade do |t| + create_table "batch_processes", primary_key: "batch_id", id: :uuid, default: -> { "uuid_generate_v4()" }, comment: "The unique id of the created batch", comment: "A generalized table for batching and processing records within caseflow", force: :cascade do |t| t.string "batch_type", null: false, comment: "Indicates what type of record is being batched" t.datetime "created_at", null: false, comment: "Date and Time that batch was created." t.datetime "ended_at", comment: "The date/time that the batch finsished processing" @@ -627,8 +627,6 @@ t.string "diagnostic_code", comment: "If a decision resulted in a rating, this is the rating issue's diagnostic code." t.string "disposition", comment: "The disposition for a decision issue. Dispositions made in Caseflow and dispositions made in VBMS can have different values." t.date "end_product_last_action_date", comment: "After an end product gets synced with a status of CLR (cleared), the end product's last_action_date is saved on any decision issues that are created as a result. This is used as a proxy for decision date for non-rating issues that are processed in VBMS because they don't have a rating profile date, and the exact decision date is not available." - t.boolean "mst_status", default: false, comment: "Indicates if decision issue is related to Military Sexual Trauma (MST)" - t.boolean "pact_status", default: false, comment: "Indicates if decision issue is related to Promise to Address Comprehensive Toxics (PACT) Act" t.string "participant_id", null: false, comment: "The Veteran's participant id." t.string "percent_number", comment: "percent_number from RatingIssue (prcntNo from Rating Profile)" t.string "rating_issue_reference_id", comment: "Identifies the specific issue on the rating that resulted from the decision issue (a rating issue can be connected to multiple contentions)." @@ -1306,7 +1304,7 @@ t.string "appeals_type", null: false, comment: "Type of Appeal" t.datetime "created_at", comment: "Timestamp of when Noticiation was Created" t.boolean "email_enabled", default: true, null: false - t.text "email_notification_content", comment: "Full Email Text Content of Notification" + t.string "email_notification_content", comment: "Full Email Text Content of Notification" t.string "email_notification_external_id", comment: "VA Notify Notification Id for the email notification send through their API " t.string "email_notification_status", comment: "Status of the Email Notification" t.date "event_date", null: false, comment: "Date of Event" @@ -1317,8 +1315,8 @@ t.string "participant_id", comment: "ID of Participant" t.string "recipient_email", comment: "Participant's Email Address" t.string "recipient_phone_number", comment: "Participants Phone Number" - t.text "sms_notification_content", comment: "Full SMS Text Content of Notification" - t.string "sms_notification_external_id" + t.string "sms_notification_content", comment: "Full SMS Text Content of Notification" + t.string "sms_notification_external_id", comment: "VA Notify Notification Id for the sms notification send through their API " t.string "sms_notification_status", comment: "Status of SMS/Text Notification" t.datetime "updated_at", comment: "TImestamp of when Notification was Updated" t.index ["appeals_id", "appeals_type"], name: "index_appeals_notifications_on_appeals_id_and_appeals_type" @@ -1526,13 +1524,9 @@ t.string "ineligible_reason", comment: "The reason for a Request Issue being ineligible. If a Request Issue has an ineligible_reason, it is still captured, but it will not get a contention in VBMS or a decision." t.boolean "is_predocket_needed", comment: "Indicates whether or not an issue has been selected to go to the pre-docket queue opposed to normal docketing." t.boolean "is_unidentified", comment: "Indicates whether a Request Issue is unidentified, meaning it wasn't found in the list of contestable issues, and is not a new nonrating issue. Contentions for unidentified issues are created on a rating End Product if processed in VBMS but without the issue description, and someone is required to edit it in Caseflow before proceeding with the decision." - t.boolean "mst_status", default: false, comment: "Indicates if issue is related to Military Sexual Trauma (MST)" - t.text "mst_status_update_reason_notes", comment: "The reason for why Request Issue is Military Sexual Trauma (MST)" t.string "nonrating_issue_category", comment: "The category selected for nonrating request issues. These vary by business line." t.string "nonrating_issue_description", comment: "The user entered description if the issue is a nonrating issue" t.text "notes", comment: "Notes added by the Claims Assistant when adding request issues. This may be used to capture handwritten notes on the form, or other comments the CA wants to capture." - t.boolean "pact_status", default: false, comment: "Indicates if issue is related to Promise to Address Comprehensive Toxics (PACT) Act" - t.text "pact_status_update_reason_notes", comment: "The reason for why Request Issue is Promise to Address Comprehensive Toxics (PACT) Act" t.string "ramp_claim_id", comment: "If a rating issue was created as a result of an issue intaken for a RAMP Review, it will be connected to the former RAMP issue by its End Product's claim ID." t.datetime "rating_issue_associated_at", comment: "Timestamp when a contention and its contested rating issue are associated in VBMS." t.string "split_issue_status", comment: "If a request issue is part of a split, on_hold status applies to the original request issues while active are request issues on splitted appeals" @@ -1543,8 +1537,6 @@ t.datetime "updated_at", comment: "Automatic timestamp whenever the record changes." t.string "vacols_id", comment: "The vacols_id of the legacy appeal that had an issue found to match the request issue." t.integer "vacols_sequence_id", comment: "The vacols_sequence_id, for the specific issue on the legacy appeal which the Claims Assistant determined to match the request issue on the Decision Review. A combination of the vacols_id (for the legacy appeal), and vacols_sequence_id (for which issue on the legacy appeal), is required to identify the issue being opted-in." - t.boolean "vbms_mst_status", default: false, comment: "Indicates if issue is related to Military Sexual Trauma (MST) and was imported from VBMS" - t.boolean "vbms_pact_status", default: false, comment: "Indicates if issue is related to Promise to Address Comprehensive Toxics (PACT) Act and was imported from VBMS" t.boolean "verified_unidentified_issue", comment: "A verified unidentified issue allows an issue whose rating data is missing to be intaken as a regular rating issue. In order to be marked as verified, a VSR needs to confirm that they were able to find the record of the decision for the issue." t.string "veteran_participant_id", comment: "The veteran participant ID. This should be unique in upstream systems and used in the future to reconcile duplicates." t.index ["closed_at"], name: "index_request_issues_on_closed_at" @@ -1570,8 +1562,6 @@ t.integer "edited_request_issue_ids", comment: "An array of the request issue IDs that were edited during this request issues update", array: true t.string "error", comment: "The error message if the last attempt at processing the request issues update was not successful." t.datetime "last_submitted_at", comment: "Timestamp for when the processing for the request issues update was last submitted. Used to determine how long to continue retrying the processing job. Can be reset to allow for additional retries." - t.integer "mst_edited_request_issue_ids", comment: "An array of the request issue IDs that were updated to be associated with MST in request issues update", array: true - t.integer "pact_edited_request_issue_ids", comment: "An array of the request issue IDs that were updated to be associated with PACT in request issues update", array: true t.datetime "processed_at", comment: "Timestamp for when the request issue update successfully completed processing." t.bigint "review_id", null: false, comment: "The ID of the decision review edited." t.string "review_type", null: false, comment: "The type of the decision review edited." @@ -1620,26 +1610,6 @@ t.index ["sent_by_id"], name: "index_sent_hearing_email_events_on_sent_by_id" end - create_table "special_issue_changes", force: :cascade do |t| - t.bigint "appeal_id", null: false, comment: "AMA or Legacy Appeal ID that the issue is tied to" - t.string "appeal_type", null: false, comment: "Appeal Type (Appeal or LegacyAppeal)" - t.string "change_category", null: false, comment: "Type of change that occured to the issue (Established Issue, Added Issue, Edited Issue, Removed Issue)" - t.datetime "created_at", null: false, comment: "Date the special issue change was made" - t.string "created_by_css_id", null: false, comment: "CSS ID of the user that made the special issue change" - t.bigint "created_by_id", null: false, comment: "User ID of the user that made the special issue change" - t.bigint "decision_issue_id", comment: "ID of the decision issue that had a special issue change from its corresponding request issue" - t.bigint "issue_id", null: false, comment: "ID of the issue that was changed" - t.boolean "mst_from_vbms", comment: "Indication that the MST status originally came from VBMS on intake" - t.string "mst_reason_for_change", comment: "Reason for changing the MST status on an issue" - t.boolean "original_mst_status", null: false, comment: "Original MST special issue status of the issue" - t.boolean "original_pact_status", null: false, comment: "Original PACT special issue status of the issue" - t.boolean "pact_from_vbms" - t.string "pact_reason_for_change", comment: "Reason for changing the PACT status on an issue" - t.bigint "task_id", null: false, comment: "Task ID of the IssueUpdateTask or EstablishmentTask used to log this issue in the case timeline" - t.boolean "updated_mst_status", comment: "Updated MST special issue status of the issue" - t.boolean "updated_pact_status", comment: "Updated PACT special issue status of the issue" - end - create_table "special_issue_lists", comment: "Associates special issues to an AMA or legacy appeal for Caseflow Queue. Caseflow Dispatch uses special issues stored in legacy_appeals. They are intentionally disconnected.", force: :cascade do |t| t.bigint "appeal_id", comment: "The ID of the appeal associated with this record" t.string "appeal_type", comment: "The type of appeal associated with this record" From 4116e6708d9503df4f2128912e435901cee2a6d4 Mon Sep 17 00:00:00 2001 From: breedbah Date: Mon, 6 Nov 2023 10:30:03 -0500 Subject: [PATCH 269/445] APPEALS-34501 update arguments --- app/models/hearings/webex_conference_link.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/models/hearings/webex_conference_link.rb b/app/models/hearings/webex_conference_link.rb index 87f67cc04a4..e648aeda7ec 100644 --- a/app/models/hearings/webex_conference_link.rb +++ b/app/models/hearings/webex_conference_link.rb @@ -14,7 +14,13 @@ def guest_link def generate_conference_information meeting_type.update!(service_name: "webex") - conference = WebexService.new.create_conference(hearing_day) + conference = WebexService.new( + host: ENV["WEBEX_HOST_IC"], + aud: ENV["WEBEX_ORGANIZATION"], + apikey: ENV["WEBEX_BOTTOKEN"], + domain: ENV["WEBEX_DOMAIN_IC"], + api_endpoint: ENV["WEBEX_API_IC"] + ).create_conference(hearing_day) base_url = conference.data[:baseUrl] From 8f8d6da8098c2dc307a8a75f6dae16f457760a15 Mon Sep 17 00:00:00 2001 From: breedbah Date: Mon, 6 Nov 2023 10:47:19 -0500 Subject: [PATCH 270/445] APPEALS-34501 added port env var --- app/models/hearings/webex_conference_link.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/hearings/webex_conference_link.rb b/app/models/hearings/webex_conference_link.rb index e648aeda7ec..dfa74933f34 100644 --- a/app/models/hearings/webex_conference_link.rb +++ b/app/models/hearings/webex_conference_link.rb @@ -16,6 +16,7 @@ def generate_conference_information conference = WebexService.new( host: ENV["WEBEX_HOST_IC"], + port: ENV["WEBEX_PORT"], aud: ENV["WEBEX_ORGANIZATION"], apikey: ENV["WEBEX_BOTTOKEN"], domain: ENV["WEBEX_DOMAIN_IC"], From 5093e513f54a2333c3beeacf20772d3e5547566f Mon Sep 17 00:00:00 2001 From: breedbah Date: Mon, 6 Nov 2023 12:58:57 -0500 Subject: [PATCH 271/445] APPEALS-34501 updated the feature toggle --- app/views/queue/index.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/queue/index.html.erb b/app/views/queue/index.html.erb index 79bda70a0b4..7349d42abfd 100644 --- a/app/views/queue/index.html.erb +++ b/app/views/queue/index.html.erb @@ -55,7 +55,8 @@ cavc_dashboard_workflow: FeatureToggle.enabled?(:cavc_dashboard_workflow, user: current_user), cc_appeal_workflow: FeatureToggle.enabled?(:cc_appeal_workflow, user: current_user), cc_vacatur_visibility: FeatureToggle.enabled?(:cc_vacatur_visibility, user: current_user), - conference_selection_visibility: FeatureToggle.enabled?(:conference_selection_visibility,user: current_user) + conference_selection_visibility: (FeatureToggle.enabled?(:pexip_conference_service) && + FeatureToggle.enabled?(:webex_conference_service)) } }) %> <% end %> From ed095a4ce09c8cf9a2f139d93c523ba63a0f871a Mon Sep 17 00:00:00 2001 From: breedbah Date: Mon, 6 Nov 2023 13:56:38 -0500 Subject: [PATCH 272/445] APPEALS-34501 update spec --- spec/jobs/virtual_hearings/create_conference_job_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/jobs/virtual_hearings/create_conference_job_spec.rb b/spec/jobs/virtual_hearings/create_conference_job_spec.rb index 6ef90f28720..cd5a2bf2aff 100644 --- a/spec/jobs/virtual_hearings/create_conference_job_spec.rb +++ b/spec/jobs/virtual_hearings/create_conference_job_spec.rb @@ -101,7 +101,7 @@ let(:virtual_hearing) do create(:virtual_hearing).tap do |virtual_hearing| virtual_hearing.meeting_type.update(service_name: "webex") - virtual_hearing.update(conference_id: 23_110_155) + virtual_hearing.update(conference_id: 23_110_511) end end From 2c4921c481534d60e47ca0ea9b09627521b6acbe Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Tue, 7 Nov 2023 11:22:02 -0500 Subject: [PATCH 273/445] Add helper methods to ExternalApi::WebexService::CreateRespons --- .../external_api/webex_service/create_response.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/services/external_api/webex_service/create_response.rb b/app/services/external_api/webex_service/create_response.rb index 0e77fbac355..559dd67d29a 100644 --- a/app/services/external_api/webex_service/create_response.rb +++ b/app/services/external_api/webex_service/create_response.rb @@ -4,4 +4,16 @@ class ExternalApi::WebexService::CreateResponse < ExternalApi::WebexService::Res def data resp.raw_body end + + def base_url + data[:baseUrl] + end + + def host_link + "#{base_url}#{data.dig(:host, 0, :short)}" + end + + def guest_link + "#{base_url}#{data.dig(:guest, 0, :short)}" + end end From 761d897049ecd52ac65e1882016e8d1bca3dce82 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Tue, 7 Nov 2023 12:37:03 -0500 Subject: [PATCH 274/445] Add create_webex_conference --- .../virtual_hearings/create_conference_job.rb | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/app/jobs/virtual_hearings/create_conference_job.rb b/app/jobs/virtual_hearings/create_conference_job.rb index 1abd94fad04..ff1fb15e9aa 100644 --- a/app/jobs/virtual_hearings/create_conference_job.rb +++ b/app/jobs/virtual_hearings/create_conference_job.rb @@ -142,42 +142,42 @@ def create_conference_datadog_tags end def create_conference - if FeatureToggle.enabled?(:virtual_hearings_use_new_links, user: virtual_hearing.updated_by) - generate_links_and_pins - else - assign_virtual_hearing_alias_and_pins if should_initialize_alias_and_pins? + return generate_links_and_pins if virtual_hearing.conference_provider == "pexip" - Rails.logger.info( - "Trying to create conference for hearing (#{virtual_hearing.hearing_type} " \ - "[#{virtual_hearing.hearing_id}])..." - ) + create_webex_conference + end + + def create_webex_conference + Rails.logger.info( + "Trying to create Webex conference for hearing (#{virtual_hearing.hearing_type} " \ + "[#{virtual_hearing.hearing_id}])..." + ) + + create_webex_conference_response = create_new_conference + + Rails.logger.info("Create Webex Conference Response: #{create_webex_conference_response.inspect}") - create_conference_response = create_new_conference + conference_creation_error(create_webex_conference_response) if create_webex_conference_response.error - Rails.logger.info("Create Conference Response: #{create_conference_response.inspect}") - if create_conference_response.error - error_display = error_display(create_conference_response) + DataDogService.increment_counter(metric_name: "created_conference.successful", **create_conference_datadog_tags) - Rails.logger.error("CreateConferenceJob failed: #{error_display}") + virtual_hearing.update( + conference_id: 1, + host_hearing_link: create_webex_conference_response.host_link, + guest_hearing_link: create_webex_conference_response.guest_link + ) + end - virtual_hearing.establishment.update_error!(error_display) + def conference_creation_error(create_conference_response) + error_display = error_display(create_conference_response) - DataDogService.increment_counter(metric_name: "created_conference.failed", **create_conference_datadog_tags) + Rails.logger.error("CreateConferenceJob failed: #{error_display}") - fail create_conference_response.error - end + virtual_hearing.establishment.update_error!(error_display) - DataDogService.increment_counter(metric_name: "created_conference.successful", **create_conference_datadog_tags) + DataDogService.increment_counter(metric_name: "created_conference.failed", **create_conference_datadog_tags) - if virtual_hearing.conference_provider == "pexip" - virtual_hearing.update(conference_id: create_conference_response.data[:conference_id]) - else - # Manually adds the subject of the body for the Webex IC Request as the conference id(int only) - response = "#{virtual_hearing.hearing.hearing.docket_number}#{virtual_hearing.hearing.id}" - response = response.delete "-" - virtual_hearing.update(conference_id: response.to_i) - end - end + fail create_conference_response.error end def send_emails(email_type) From 3a8c6c251ec12100485043a17a9d2985374cf3af Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Tue, 7 Nov 2023 12:50:06 -0500 Subject: [PATCH 275/445] Conference ID to string --- ...107173746_convert_conference_ids_to_strings.rb | 15 +++++++++++++++ db/schema.rb | 8 ++++---- 2 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 db/migrate/20231107173746_convert_conference_ids_to_strings.rb diff --git a/db/migrate/20231107173746_convert_conference_ids_to_strings.rb b/db/migrate/20231107173746_convert_conference_ids_to_strings.rb new file mode 100644 index 00000000000..60277a50c9d --- /dev/null +++ b/db/migrate/20231107173746_convert_conference_ids_to_strings.rb @@ -0,0 +1,15 @@ +class ConvertConferenceIdsToStrings < Caseflow::Migration + def up + safety_assured do + change_column :conference_links, :conference_id, :string + change_column :virtual_hearings, :conference_id, :string + end + end + + def down + safety_assured do + change_column :conference_links, :conference_id, :integer + change_column :virtual_hearings, :conference_id, :integer + end + end +end diff --git a/db/schema.rb b/db/schema.rb index bada9b305fe..63ad7ab05fd 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2023_09_24_014623) do +ActiveRecord::Schema.define(version: 2023_11_07_173746) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -220,7 +220,7 @@ t.index ["veteran_file_number"], name: "index_available_hearing_locations_on_veteran_file_number" end - create_table "batch_processes", primary_key: "batch_id", id: :uuid, default: -> { "uuid_generate_v4()" }, comment: "The unique id of the created batch", comment: "A generalized table for batching and processing records within caseflow", force: :cascade do |t| + create_table "batch_processes", primary_key: "batch_id", id: :uuid, default: -> { "uuid_generate_v4()" }, comment: "A generalized table for batching and processing records within caseflow", force: :cascade do |t| t.string "batch_type", null: false, comment: "Indicates what type of record is being batched" t.datetime "created_at", null: false, comment: "Date and Time that batch was created." t.datetime "ended_at", comment: "The date/time that the batch finsished processing" @@ -573,7 +573,7 @@ t.string "alias", comment: "Alias of the conference" t.string "alias_with_host", comment: "Alieas of the conference for the host" t.boolean "conference_deleted", default: false, null: false, comment: "Flag to represent if a con ference has been deleted" - t.integer "conference_id", comment: "Id of the conference" + t.string "conference_id", comment: "Id of the conference" t.datetime "created_at", null: false, comment: "Date and Time of creation" t.bigint "created_by_id", null: false, comment: "User id of the user who created the record. FK on User table" t.datetime "deleted_at", comment: "Needed column to make use of the paranoia gem." @@ -1983,7 +1983,7 @@ t.datetime "appellant_reminder_sent_at", comment: "The datetime the last reminder email was sent to the appellant." t.string "appellant_tz", limit: 50, comment: "Stores appellant timezone" t.boolean "conference_deleted", default: false, null: false, comment: "Whether or not the conference was deleted from Pexip" - t.integer "conference_id", comment: "ID of conference from Pexip" + t.string "conference_id", comment: "ID of conference from Pexip" t.datetime "created_at", null: false, comment: "Automatic timestamp of when virtual hearing was created" t.bigint "created_by_id", null: false, comment: "User who created the virtual hearing" t.string "guest_hearing_link", comment: "Link used by appellants and/or representatives to join virtual hearing conference" From 76bed1d12e158156ceeba25127deef62a88de052 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Tue, 7 Nov 2023 13:12:20 -0500 Subject: [PATCH 276/445] Set conference_id back --- app/jobs/virtual_hearings/create_conference_job.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jobs/virtual_hearings/create_conference_job.rb b/app/jobs/virtual_hearings/create_conference_job.rb index ff1fb15e9aa..ccef146af00 100644 --- a/app/jobs/virtual_hearings/create_conference_job.rb +++ b/app/jobs/virtual_hearings/create_conference_job.rb @@ -162,7 +162,7 @@ def create_webex_conference DataDogService.increment_counter(metric_name: "created_conference.successful", **create_conference_datadog_tags) virtual_hearing.update( - conference_id: 1, + conference_id: "#{virtual_hearing.hearing.docket_number}#{virtual_hearing.hearing.id}", host_hearing_link: create_webex_conference_response.host_link, guest_hearing_link: create_webex_conference_response.guest_link ) From 012c31115f8532f96378c635da8aa0a4bf06e1d1 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Tue, 7 Nov 2023 13:24:18 -0500 Subject: [PATCH 277/445] Rename LinkService to PexipLinkService --- app/controllers/hearings/hearing_day_controller.rb | 6 +++--- app/jobs/virtual_hearings/create_conference_job.rb | 2 +- app/models/hearings/pexip_conference_link.rb | 14 +++++++------- app/models/hearings/virtual_hearing.rb | 6 +++--- .../{link_service.rb => pexip_link_service.rb} | 2 +- config/environments/development.rb | 2 +- .../delete_conference_link_job_spec.rb | 6 +++--- spec/models/hearings/pexip_conference_link_spec.rb | 12 ++++++------ spec/models/hearings/virtual_hearing_spec.rb | 2 +- ..._service_spec.rb => pexip_link_service_spec.rb} | 8 ++++---- 10 files changed, 30 insertions(+), 30 deletions(-) rename app/services/virtual_hearings/{link_service.rb => pexip_link_service.rb} (97%) rename spec/services/virtual_hearings/{link_service_spec.rb => pexip_link_service_spec.rb} (96%) diff --git a/app/controllers/hearings/hearing_day_controller.rb b/app/controllers/hearings/hearing_day_controller.rb index 87ebcd3e1d4..30ee49f7b68 100644 --- a/app/controllers/hearings/hearing_day_controller.rb +++ b/app/controllers/hearings/hearing_day_controller.rb @@ -44,9 +44,9 @@ def show hearings: hearing_day.hearings_for_user(current_user).map { |hearing| hearing.quick_to_hash(current_user.id) } ) } - rescue VirtualHearings::LinkService::PINKeyMissingError, - VirtualHearings::LinkService::URLHostMissingError, - VirtualHearings::LinkService::URLPathMissingError => error + rescue VirtualHearings::PexipLinkService::PINKeyMissingError, + VirtualHearings::PexipLinkService::URLHostMissingError, + VirtualHearings::PexipLinkService::URLPathMissingError => error log_error(error) render json: { hearing_day: hearing_day.to_hash(include_conference_links: false).merge( diff --git a/app/jobs/virtual_hearings/create_conference_job.rb b/app/jobs/virtual_hearings/create_conference_job.rb index ccef146af00..9172c3f6f91 100644 --- a/app/jobs/virtual_hearings/create_conference_job.rb +++ b/app/jobs/virtual_hearings/create_conference_job.rb @@ -223,7 +223,7 @@ def generate_links_and_pins "[#{virtual_hearing.hearing_id}])..." ) begin - link_service = VirtualHearings::LinkService.new + link_service = VirtualHearings::PexipLinkService.new virtual_hearing.update!( host_hearing_link: link_service.host_link, guest_hearing_link: link_service.guest_link, diff --git a/app/models/hearings/pexip_conference_link.rb b/app/models/hearings/pexip_conference_link.rb index a7832efd07c..ea8e75932b2 100644 --- a/app/models/hearings/pexip_conference_link.rb +++ b/app/models/hearings/pexip_conference_link.rb @@ -29,7 +29,7 @@ def host_link def guest_pin return guest_pin_long if !guest_pin_long.nil? - link_service = VirtualHearings::LinkService.new + link_service = VirtualHearings::PexipLinkService.new update!(guest_pin_long: link_service.guest_pin) guest_pin_long end @@ -38,10 +38,10 @@ def guest_link return guest_hearing_link if !guest_hearing_link.to_s.empty? if !alias_name.nil? - link_service = VirtualHearings::LinkService.new(alias_name) + link_service = VirtualHearings::PexipLinkService.new(alias_name) update!(guest_hearing_link: link_service.guest_link) elsif !alias_with_host.nil? - link_service = VirtualHearings::LinkService.new(alias_with_host.split("@")[0].split("A")[1]) + link_service = VirtualHearings::PexipLinkService.new(alias_with_host.split("@")[0].split("A")[1]) update!(guest_hearing_link: link_service.guest_link, alias: link_service.get_conference_id) end guest_hearing_link @@ -54,7 +54,7 @@ def generate_conference_information "Trying to create a Pexip conference link for Hearing Day Id: #{hearing_day_id}." ) begin - link_service = VirtualHearings::LinkService.new + link_service = VirtualHearings::PexipLinkService.new update!( alias: link_service.get_conference_id, host_link: link_service.host_link, @@ -63,9 +63,9 @@ def generate_conference_information guest_hearing_link: link_service.guest_link, guest_pin_long: link_service.guest_pin ) - rescue VirtualHearings::LinkService::PINKeyMissingError, - VirtualHearings::LinkService::URLHostMissingError, - VirtualHearings::LinkService::URLPathMissingError => error + rescue VirtualHearings::PexipLinkService::PINKeyMissingError, + VirtualHearings::PexipLinkService::URLHostMissingError, + VirtualHearings::PexipLinkService::URLPathMissingError => error Raven.capture_exception(error: error) raise error end diff --git a/app/models/hearings/virtual_hearing.rb b/app/models/hearings/virtual_hearing.rb index d4fa8e66abc..40ba05af865 100644 --- a/app/models/hearings/virtual_hearing.rb +++ b/app/models/hearings/virtual_hearing.rb @@ -182,10 +182,10 @@ def host_link def test_link(title) if use_vc_test_link? if ENV["VIRTUAL_HEARING_URL_HOST"].blank? - fail(VirtualHearings::LinkService::URLHostMissingError, message: COPY::URL_HOST_MISSING_ERROR_MESSAGE) + fail(VirtualHearings::PexipLinkService::URLHostMissingError, message: COPY::URL_HOST_MISSING_ERROR_MESSAGE) end if ENV["VIRTUAL_HEARING_URL_PATH"].blank? - fail(VirtualHearings::LinkService::URLPathMissingError, message: COPY::URL_PATH_MISSING_ERROR_MESSAGE) + fail(VirtualHearings::PexipLinkService::URLPathMissingError, message: COPY::URL_PATH_MISSING_ERROR_MESSAGE) end host_and_path = "#{ENV['VIRTUAL_HEARING_URL_HOST']}#{ENV['VIRTUAL_HEARING_URL_PATH']}" @@ -265,7 +265,7 @@ def rebuild_and_save_links fail NoAliasWithHostPresentError if alias_with_host.blank? conference_id = alias_with_host[/BVA(\d+)@/, 1] - link_service = VirtualHearings::LinkService.new(conference_id) + link_service = VirtualHearings::PexipLinkService.new(conference_id) # confirm that we extracted the conference ID correctly, # and that the original link was generated with the link service diff --git a/app/services/virtual_hearings/link_service.rb b/app/services/virtual_hearings/pexip_link_service.rb similarity index 97% rename from app/services/virtual_hearings/link_service.rb rename to app/services/virtual_hearings/pexip_link_service.rb index 70cc23ce9cf..a4de5bfda65 100644 --- a/app/services/virtual_hearings/link_service.rb +++ b/app/services/virtual_hearings/pexip_link_service.rb @@ -5,7 +5,7 @@ ## # Service for generating new guest and host virtual hearings links ## -class VirtualHearings::LinkService +class VirtualHearings::PexipLinkService class PINKeyMissingError < StandardError; end class URLHostMissingError < StandardError; end class URLPathMissingError < StandardError; end diff --git a/config/environments/development.rb b/config/environments/development.rb index 9822cd7b692..d1013cd23ca 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -89,7 +89,7 @@ ENV["BATCH_PROCESS_MAX_ERRORS_BEFORE_STUCK"] ||= "3" # When record errors for X time, it's declared stuck # Necessary vars needed to create virtual hearing links - # Used by VirtualHearings::LinkService + # Used by VirtualHearings::PexipLinkService ENV["VIRTUAL_HEARING_PIN_KEY"] ||= "mysecretkey" ENV["VIRTUAL_HEARING_URL_HOST"] ||= "example.va.gov" ENV["VIRTUAL_HEARING_URL_PATH"] ||= "/sample" diff --git a/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb b/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb index 46d607f44cd..6d683fa683a 100644 --- a/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb +++ b/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb @@ -7,9 +7,9 @@ let!(:judge) { Judge.new(create(:user)) } before do - allow_any_instance_of(VirtualHearings::LinkService).to receive(:pin_key).and_return("mysecretkey") - allow_any_instance_of(VirtualHearings::LinkService).to receive(:host).and_return("example.va.gov") - allow_any_instance_of(VirtualHearings::LinkService).to receive(:path).and_return("/sample") + allow_any_instance_of(VirtualHearings::PexipLinkService).to receive(:pin_key).and_return("mysecretkey") + allow_any_instance_of(VirtualHearings::PexipLinkService).to receive(:host).and_return("example.va.gov") + allow_any_instance_of(VirtualHearings::PexipLinkService).to receive(:path).and_return("/sample") end describe ".perform" do diff --git a/spec/models/hearings/pexip_conference_link_spec.rb b/spec/models/hearings/pexip_conference_link_spec.rb index c206d1e493d..46b8b1e79d3 100644 --- a/spec/models/hearings/pexip_conference_link_spec.rb +++ b/spec/models/hearings/pexip_conference_link_spec.rb @@ -22,7 +22,7 @@ RequestStore[:current_user] = user expect do described_class.create(hearing_day: hearing_day) - end.to raise_error VirtualHearings::LinkService::PINKeyMissingError + end.to raise_error VirtualHearings::PexipLinkService::PINKeyMissingError end end @@ -37,7 +37,7 @@ RequestStore[:current_user] = user expect do described_class.create(hearing_day: hearing_day) - end.to raise_error VirtualHearings::LinkService::URLHostMissingError + end.to raise_error VirtualHearings::PexipLinkService::URLHostMissingError end end @@ -52,7 +52,7 @@ RequestStore[:current_user] = user expect do described_class.create(hearing_day: hearing_day) - end.to raise_error VirtualHearings::LinkService::URLPathMissingError + end.to raise_error VirtualHearings::PexipLinkService::URLPathMissingError end end @@ -63,7 +63,7 @@ RequestStore[:current_user] = user expect do described_class.create(hearing_day: hearing_day) - end.to raise_error VirtualHearings::LinkService::PINKeyMissingError + end.to raise_error VirtualHearings::PexipLinkService::PINKeyMissingError end end end @@ -176,8 +176,8 @@ allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return "example.va.gov" allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return "/sample" - allow_any_instance_of(VirtualHearings::LinkService).to receive(:conference_id).and_return expected_conference_id - allow_any_instance_of(VirtualHearings::LinkService).to receive(:guest_pin).and_return expected_pin + allow_any_instance_of(VirtualHearings::PexipLinkService).to receive(:conference_id).and_return expected_conference_id + allow_any_instance_of(VirtualHearings::PexipLinkService).to receive(:guest_pin).and_return expected_pin end let(:hearing_day) { create(:hearing_day) } diff --git a/spec/models/hearings/virtual_hearing_spec.rb b/spec/models/hearings/virtual_hearing_spec.rb index c955ee95e7e..ee802fba74c 100644 --- a/spec/models/hearings/virtual_hearing_spec.rb +++ b/spec/models/hearings/virtual_hearing_spec.rb @@ -356,7 +356,7 @@ # these pass because the values hard-coded into the virtual hearing factory # with trait link_generation_initialized are consistent with the values - # algorithmically generated by VirtualHearings::LinkService + # algorithmically generated by VirtualHearings::PexipLinkService expect(virtual_hearing.host_hearing_link).to include alias_with_host expect(virtual_hearing.host_hearing_link).to include host_pin_long diff --git a/spec/services/virtual_hearings/link_service_spec.rb b/spec/services/virtual_hearings/pexip_link_service_spec.rb similarity index 96% rename from spec/services/virtual_hearings/link_service_spec.rb rename to spec/services/virtual_hearings/pexip_link_service_spec.rb index 9feef35a647..ef9da8730c5 100644 --- a/spec/services/virtual_hearings/link_service_spec.rb +++ b/spec/services/virtual_hearings/pexip_link_service_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -describe VirtualHearings::LinkService do +describe VirtualHearings::PexipLinkService do URL_HOST = "example.va.gov" URL_PATH = "/sample" PIN_KEY = "mysecretkey" @@ -18,7 +18,7 @@ end it "raises the missing PIN key error" do - expect { described_class.new.host_link }.to raise_error VirtualHearings::LinkService::PINKeyMissingError + expect { described_class.new.host_link }.to raise_error VirtualHearings::PexipLinkService::PINKeyMissingError end end @@ -29,7 +29,7 @@ end it "raises the missing host error" do - expect { described_class.new.host_link }.to raise_error VirtualHearings::LinkService::URLHostMissingError + expect { described_class.new.host_link }.to raise_error VirtualHearings::PexipLinkService::URLHostMissingError end end @@ -40,7 +40,7 @@ end it "raises the missing path error" do - expect { described_class.new.host_link }.to raise_error VirtualHearings::LinkService::URLPathMissingError + expect { described_class.new.host_link }.to raise_error VirtualHearings::PexipLinkService::URLPathMissingError end end From 754d2a6717845d0a5dcbc29f9ad4df3ef70e0154 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Wed, 8 Nov 2023 09:30:09 -0500 Subject: [PATCH 278/445] Remove conference_id setting since we dont use it --- app/jobs/virtual_hearings/create_conference_job.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/jobs/virtual_hearings/create_conference_job.rb b/app/jobs/virtual_hearings/create_conference_job.rb index 9172c3f6f91..0555e831bcc 100644 --- a/app/jobs/virtual_hearings/create_conference_job.rb +++ b/app/jobs/virtual_hearings/create_conference_job.rb @@ -162,7 +162,6 @@ def create_webex_conference DataDogService.increment_counter(metric_name: "created_conference.successful", **create_conference_datadog_tags) virtual_hearing.update( - conference_id: "#{virtual_hearing.hearing.docket_number}#{virtual_hearing.hearing.id}", host_hearing_link: create_webex_conference_response.host_link, guest_hearing_link: create_webex_conference_response.guest_link ) From f1503dcd00dab0f4878a05513e3b2b68ad765b4a Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Wed, 8 Nov 2023 11:31:50 -0500 Subject: [PATCH 279/445] Add env vars to controller spec --- config/environments/test.rb | 15 +++++++++++++++ spec/controllers/hearings_controller_spec.rb | 2 ++ 2 files changed, 17 insertions(+) diff --git a/config/environments/test.rb b/config/environments/test.rb index fff81c6c7a2..c36b2d9afc6 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -135,4 +135,19 @@ ENV["PACMAN_API_TOKEN_SECRET"] ||= "client-secret" ENV["PACMAN_API_TOKEN_ISSUER"] ||= "issuer-of-our-token" ENV["PACMAN_API_SYS_ACCOUNT"] ||= "CSS_ID_OF_OUR_ACCOUNT" + + # Webex environment variables + ENV["WEBEX_PORT"] ||= "443" + ENV["WEBEX_HOST_IC"] ||= "mtg-broker." + ENV["WEBEX_HOST_MAIN"] ||= "api-usgov." + ENV["WEBEX_HOST_STATS"] ||= "status." + ENV["WEBEX_DOMAIN_IC"] ||= "gov.ciscospark.com" + ENV["WEBEX_DOMAIN_MAIN"] ||= "webex.com" + ENV["WEBEX_API_IC"] ||= "/api/v2/joseencrypt" + ENV["WEBEX_API_MAIN"] ||= "/v1/" + + # Pexip environment variables + ENV["VIRTUAL_HEARING_PIN_KEY"] ||= "mysecretkey" + ENV["VIRTUAL_HEARING_URL_HOST"] ||= "example.va.gov" + ENV["VIRTUAL_HEARING_URL_PATH"] ||= "/sample" end diff --git a/spec/controllers/hearings_controller_spec.rb b/spec/controllers/hearings_controller_spec.rb index aa3546a0646..d6490cb984e 100644 --- a/spec/controllers/hearings_controller_spec.rb +++ b/spec/controllers/hearings_controller_spec.rb @@ -12,6 +12,8 @@ let(:disposition) { nil } let!(:vso_participant_id) { "12345" } + include_context "Enable both conference services" + describe "PATCH update" do it "should be successful", :aggregate_failures do params = { From 318ab51db241533df85e47889ff1ab1d3179b61e Mon Sep 17 00:00:00 2001 From: Jeff Marks Date: Wed, 8 Nov 2023 13:00:08 -0500 Subject: [PATCH 280/445] Fix failing tests in pexip_conference_link_spec --- .../hearings/pexip_conference_link_spec.rb | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/spec/models/hearings/pexip_conference_link_spec.rb b/spec/models/hearings/pexip_conference_link_spec.rb index 34f401e64d9..74de50f5149 100644 --- a/spec/models/hearings/pexip_conference_link_spec.rb +++ b/spec/models/hearings/pexip_conference_link_spec.rb @@ -12,14 +12,11 @@ context "#create with errors" do context "pin key env variable is missing" do - before do - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return URL_HOST - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return URL_PATH - end let(:hearing_day) { create(:hearing_day) } let(:user) { create(:user) } it "raises the missing PIN key error" do RequestStore[:current_user] = user + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return(nil) expect do described_class.create(hearing_day: hearing_day) end.to raise_error VirtualHearings::PexipLinkService::PINKeyMissingError @@ -27,14 +24,11 @@ end context "url host env variable is missing" do - before do - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return PIN_KEY - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return URL_PATH - end let(:hearing_day) { create(:hearing_day) } let(:user) { create(:user) } it "raises the missing host error" do RequestStore[:current_user] = user + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return(nil) expect do described_class.create(hearing_day: hearing_day) end.to raise_error VirtualHearings::PexipLinkService::URLHostMissingError @@ -42,14 +36,11 @@ end context "url path env variable is missing" do - before do - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return PIN_KEY - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return URL_HOST - end let(:hearing_day) { create(:hearing_day) } let(:user) { create(:user) } it "raises the missing path error" do RequestStore[:current_user] = user + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return(nil) expect do described_class.create(hearing_day: hearing_day) end.to raise_error VirtualHearings::PexipLinkService::URLPathMissingError @@ -60,6 +51,7 @@ let(:hearing_day) { create(:hearing_day) } let(:user) { create(:user) } it "raises the missing PIN key error" do + allow(ENV).to receive(:[]).with(anything).and_return(nil) RequestStore[:current_user] = user expect do described_class.create(hearing_day: hearing_day) @@ -67,6 +59,7 @@ end end end + context "#create" do include_context "Mock Pexip service env vars" From e03870ccb3f7782f44b8efd6f20281c3a35b9ee1 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Wed, 8 Nov 2023 13:29:15 -0500 Subject: [PATCH 281/445] Remove nil check --- spec/controllers/hearings_controller_spec.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/spec/controllers/hearings_controller_spec.rb b/spec/controllers/hearings_controller_spec.rb index d6490cb984e..387b77948e9 100644 --- a/spec/controllers/hearings_controller_spec.rb +++ b/spec/controllers/hearings_controller_spec.rb @@ -222,7 +222,6 @@ subject expect(VirtualHearing.first.establishment.submitted?).to eq(true) expect(VirtualHearing.first.status).to eq(:active) - expect(VirtualHearing.first.conference_id).to_not eq(nil) expect(VirtualHearing.first.appellant_email_sent).to eq(true) expect(VirtualHearing.first.judge_email_sent).to eq(true) expect(VirtualHearing.first.representative_email_sent).to eq(true) From 8f8c9f0906fb8b8d08fe2f969502a01891b16f41 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Wed, 8 Nov 2023 13:42:37 -0500 Subject: [PATCH 282/445] Fix pexip_link_service_spec failures --- spec/services/virtual_hearings/pexip_link_service_spec.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spec/services/virtual_hearings/pexip_link_service_spec.rb b/spec/services/virtual_hearings/pexip_link_service_spec.rb index ef9da8730c5..197457b1049 100644 --- a/spec/services/virtual_hearings/pexip_link_service_spec.rb +++ b/spec/services/virtual_hearings/pexip_link_service_spec.rb @@ -15,6 +15,7 @@ before do allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return URL_HOST allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return URL_PATH + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return nil end it "raises the missing PIN key error" do @@ -24,6 +25,7 @@ context "url host env variable is missing" do before do + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return nil allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return PIN_KEY allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return URL_PATH end @@ -37,6 +39,7 @@ before do allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return PIN_KEY allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return URL_HOST + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return nil end it "raises the missing path error" do From ee7882aefeded1cfabc63b45eb944975f9aa9f7b Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Wed, 8 Nov 2023 13:46:13 -0500 Subject: [PATCH 283/445] Clean up test file a bit --- .../pexip_link_service_spec.rb | 24 +++---------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/spec/services/virtual_hearings/pexip_link_service_spec.rb b/spec/services/virtual_hearings/pexip_link_service_spec.rb index 197457b1049..31755772337 100644 --- a/spec/services/virtual_hearings/pexip_link_service_spec.rb +++ b/spec/services/virtual_hearings/pexip_link_service_spec.rb @@ -1,9 +1,9 @@ # frozen_string_literal: true describe VirtualHearings::PexipLinkService do - URL_HOST = "example.va.gov" - URL_PATH = "/sample" - PIN_KEY = "mysecretkey" + URL_HOST = ENV["VIRTUAL_HEARING_URL_HOST"] + URL_PATH = ENV["VIRTUAL_HEARING_URL_PATH"] + PIN_KEY = ENV["VIRTUAL_HEARING_PIN_KEY"] before do allow(ENV).to receive(:[]).and_call_original @@ -13,8 +13,6 @@ describe ".host_link" do context "pin key env variable is missing" do before do - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return URL_HOST - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return URL_PATH allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return nil end @@ -26,8 +24,6 @@ context "url host env variable is missing" do before do allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return nil - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return PIN_KEY - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return URL_PATH end it "raises the missing host error" do @@ -37,8 +33,6 @@ context "url path env variable is missing" do before do - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return PIN_KEY - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return URL_HOST allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return nil end @@ -48,12 +42,6 @@ end context "all env variables are present" do - before do - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return PIN_KEY - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return URL_HOST - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return URL_PATH - end - context "the sequence returns '0000001'" do before do allow(VirtualHearings::SequenceConferenceId).to receive(:next).and_return "0000001" @@ -98,12 +86,6 @@ describe ".guest_link" do context "all env variables are present" do - before do - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return PIN_KEY - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return URL_HOST - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return URL_PATH - end - context "the sequence returns '0000001'" do before do allow(VirtualHearings::SequenceConferenceId).to receive(:next).and_return "0000001" From 884e088605aa6000e74b9d65fb83bf310c04f359 Mon Sep 17 00:00:00 2001 From: breedbah Date: Wed, 8 Nov 2023 15:36:12 -0500 Subject: [PATCH 284/445] APPEALS-34517 render correct data guestlinks --- .../DailyDocketGuestLinkSection.jsx | 78 +++++++------------ 1 file changed, 29 insertions(+), 49 deletions(-) diff --git a/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx b/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx index 7ce0d114c8c..7afb6af97fe 100644 --- a/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx +++ b/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx @@ -34,9 +34,9 @@ export const DailyDocketGuestLinkSection = ({ linkInfo }) => { link.alias || link.guestLink?.match(/pin=\d+/)[0]?.split('=')[1] || null ); } else if (link.type === 'WebexConferenceLink') { - const newLink = 'instant-usgov'; + const webexGuestLink = link.guestLink; - return link.alias || newLink || null; + return link.alias || webexGuestLink || null; } return null; @@ -46,7 +46,7 @@ export const DailyDocketGuestLinkSection = ({ linkInfo }) => { if (link.type === 'PexipConferenceLink') { return `${link.guestPin}#`; } else if (link.type === 'WebexConferenceLink') { - return 'N/A'; + return null; } return null; @@ -74,65 +74,45 @@ export const DailyDocketGuestLinkSection = ({ linkInfo }) => {

    - {type === 'PexipConferenceLink' ? - GUEST_LINK_LABELS.PEXIP_GUEST_LINK_SECTION_LABEL : - GUEST_LINK_LABELS.WEBEX_GUEST_LINK_SECTION_LABEL} + {type === "PexipConferenceLink" + ? GUEST_LINK_LABELS.PEXIP_GUEST_LINK_SECTION_LABEL + : GUEST_LINK_LABELS.WEBEX_GUEST_LINK_SECTION_LABEL}

    {GUEST_LINK_LABELS.GUEST_CONFERENCE_ROOM} - {alias || 'N/A'} + {alias || "N/A"}

    - {linkGuestPin === 'N/A' ? ( + {type === "PexipConferenceLink" && (

    {GUEST_LINK_LABELS.GUEST_PIN} - N/A - -

    - ) : ( -

    - {GUEST_LINK_LABELS.GUEST_PIN} - {linkGuestPin} @@ -141,10 +121,10 @@ export const DailyDocketGuestLinkSection = ({ linkInfo }) => { )}

    From f6cea9af7570fc0b3d89a4e22adb8ca912acfe46 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Wed, 8 Nov 2023 15:53:32 -0500 Subject: [PATCH 285/445] Fix test link --- app/models/hearings/virtual_hearing.rb | 2 ++ spec/mailers/hearing_mailer_spec.rb | 18 ++++++++++++++++++ spec/models/hearings/virtual_hearing_spec.rb | 10 ++++++++++ 3 files changed, 30 insertions(+) diff --git a/app/models/hearings/virtual_hearing.rb b/app/models/hearings/virtual_hearing.rb index 6549fef6757..31d191f1925 100644 --- a/app/models/hearings/virtual_hearing.rb +++ b/app/models/hearings/virtual_hearing.rb @@ -180,6 +180,8 @@ def host_link end def test_link(title) + return "https://instant-usgov.webex.com/mediatest" if conference_provider == "webex" + if use_vc_test_link? if ENV["VIRTUAL_HEARING_URL_HOST"].blank? fail(VirtualHearings::PexipLinkService::URLHostMissingError, message: COPY::URL_HOST_MISSING_ERROR_MESSAGE) diff --git a/spec/mailers/hearing_mailer_spec.rb b/spec/mailers/hearing_mailer_spec.rb index 13e1b11a9bb..eba5c3f9feb 100644 --- a/spec/mailers/hearing_mailer_spec.rb +++ b/spec/mailers/hearing_mailer_spec.rb @@ -187,6 +187,18 @@ end end + shared_context "test link for a webex conference" do + let!(:virtual_hearing) do + create(:virtual_hearing).tap do |vh| + vh.meeting_type.update!(service_name: "webex") + end + end + + it "Webex test link appears" do + expect(subject.html_part.body).to include("https://instant-usgov.webex.com/mediatest") + end + end + shared_examples "appellant virtual reminder intro" do it "displays virtual hearing reminder email intro" do expect(subject.body).to include("You're scheduled for a hearing with a " \ @@ -647,6 +659,8 @@ "pin=#{virtual_hearing.guest_pin}&role=guest" ) end + + include_context "test link for a webex conference" end context "regional office is in eastern timezone" do @@ -726,6 +740,8 @@ "pin=#{virtual_hearing.guest_pin}&role=guest" ) end + + include_context "test link for a webex conference" end context "regional office is in eastern timezone" do @@ -1206,6 +1222,8 @@ "pin=#{virtual_hearing.guest_pin}&role=guest" ) end + + include_context "test link for a webex conference" end context "regional office is in eastern timezone" do diff --git a/spec/models/hearings/virtual_hearing_spec.rb b/spec/models/hearings/virtual_hearing_spec.rb index ee802fba74c..39471503dc0 100644 --- a/spec/models/hearings/virtual_hearing_spec.rb +++ b/spec/models/hearings/virtual_hearing_spec.rb @@ -383,6 +383,16 @@ def link(name) include_context "virtual hearing not created with new link generation" include_examples "all test link behaviors" end + + context "for a webex conference" do + let(:virtual_hearing) do + create(:virtual_hearing).tap { |vh| vh.meeting_type.update!(service_name: "webex") } + end + + it "returns the webex test link" do + expect(virtual_hearing.test_link(nil)).to eq "https://instant-usgov.webex.com/mediatest" + end + end end end From 9717abc210fcb45f4f3daadff3067738cbdac477 Mon Sep 17 00:00:00 2001 From: Jeff Marks Date: Wed, 8 Nov 2023 16:09:06 -0500 Subject: [PATCH 286/445] Add fixes and fiel changes to create_conference_job_spec --- app/models/hearings/virtual_hearing.rb | 2 +- .../external_api/webex_service/response.rb | 6 +- .../create_conference_job_spec.rb | 148 +++++++++--------- 3 files changed, 78 insertions(+), 78 deletions(-) diff --git a/app/models/hearings/virtual_hearing.rb b/app/models/hearings/virtual_hearing.rb index 6549fef6757..9a77b7515a2 100644 --- a/app/models/hearings/virtual_hearing.rb +++ b/app/models/hearings/virtual_hearing.rb @@ -216,7 +216,7 @@ def pending? # Determines if the hearing conference has been created def active? # the conference has been created the virtual hearing is active - conference_id.present? || (guest_hearing_link.present? && host_hearing_link.present?) + guest_hearing_link.present? && host_hearing_link.present? end # Determines if the conference was deleted diff --git a/app/services/external_api/webex_service/response.rb b/app/services/external_api/webex_service/response.rb index a774a10e367..eaf14790e50 100644 --- a/app/services/external_api/webex_service/response.rb +++ b/app/services/external_api/webex_service/response.rb @@ -41,10 +41,6 @@ def check_for_errors def error_message return "No error message from Webex" if resp.raw_body.empty? - begin - JSON.parse(resp.raw_body)["message"] - rescue JSON::ParserError - "No error message from Webex" - end + resp.raw_body.with_indifferent_access["message"] end end diff --git a/spec/jobs/virtual_hearings/create_conference_job_spec.rb b/spec/jobs/virtual_hearings/create_conference_job_spec.rb index cd5a2bf2aff..29e84d06760 100644 --- a/spec/jobs/virtual_hearings/create_conference_job_spec.rb +++ b/spec/jobs/virtual_hearings/create_conference_job_spec.rb @@ -20,6 +20,11 @@ let(:pexip_url) { "fake.va.gov" } before do stub_const("ENV", "PEXIP_CLIENT_HOST" => pexip_url) + allow(ENV).to receive(:[]).and_call_original + allow(ENV).to receive(:fetch).and_call_original + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return PIN_KEY + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return URL_HOST + allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return URL_PATH User.authenticate!(user: current_user) end @@ -89,46 +94,95 @@ subject.perform_now virtual_hearing.reload - expect(virtual_hearing.conference_id).to eq(9001) expect(virtual_hearing.status).to eq(:active) - expect(virtual_hearing.alias).to eq("0000001") - expect(virtual_hearing.alias_with_host).to eq("BVA0000001@#{pexip_url}") - expect(virtual_hearing.host_pin.to_s.length).to eq(8) - expect(virtual_hearing.guest_pin.to_s.length).to eq(11) + expect(virtual_hearing.alias_with_host).to eq("BVA0000001@#{URL_HOST}") + expect(virtual_hearing.host_pin.to_s.length).to eq(7) + expect(virtual_hearing.guest_pin.to_s.length).to eq(10) end describe "for webex" do let(:virtual_hearing) do - create(:virtual_hearing).tap do |virtual_hearing| + create(:virtual_hearing, hearing: hearing).tap do |virtual_hearing| virtual_hearing.meeting_type.update(service_name: "webex") - virtual_hearing.update(conference_id: 23_110_511) end end + let(:base_url) { "https://instant-usgov.webex.com/visit/" } it "creates a webex conference" do - conference_id = "#{virtual_hearing.hearing.docket_number}#{virtual_hearing.hearing.id}" - conference_id = conference_id.delete "-" subject.perform_now - expect(virtual_hearing.conference_id).to eq(conference_id.to_i) + + virtual_hearing.reload + expect(virtual_hearing.host_hearing_link).to include(base_url) + expect(virtual_hearing.guest_hearing_link).to include(base_url) end - end - include_examples "confirmation emails are sent" + it "logs success to datadog" do + expect(DataDogService).to receive(:increment_counter).with( + hash_including( + metric_name: "created_conference.successful", + metric_group: Constants.DATADOG_METRICS.HEARINGS.VIRTUAL_HEARINGS_GROUP_NAME, + attrs: { hearing_id: hearing.id } + ) + ) - include_examples "sent email event objects are created" + subject.perform_now + end - it "logs success to datadog" do - expect(DataDogService).to receive(:increment_counter).with( - hash_including( - metric_name: "created_conference.successful", - metric_group: Constants.DATADOG_METRICS.HEARINGS.VIRTUAL_HEARINGS_GROUP_NAME, - attrs: { hearing_id: hearing.id } - ) - ) + context "conference creation fails" do + let(:fake_webex) { Fakes::WebexService.new(status_code: 400) } - subject.perform_now + before do + allow(WebexService).to receive(:new).and_return(fake_webex) + end + + after do + clear_enqueued_jobs + end + + it "job goes back on queue and logs if error", :aggregate_failures do + expect(Rails.logger).to receive(:error).exactly(11).times + + expect do + perform_enqueued_jobs do + VirtualHearings::CreateConferenceJob.perform_later(subject.arguments.first) + end + end.to( + have_performed_job(VirtualHearings::CreateConferenceJob) + .exactly(10) + .times + ) + + virtual_hearing.establishment.reload + expect(virtual_hearing.establishment.error.nil?).to eq(false) + expect(virtual_hearing.establishment.attempted?).to eq(true) + expect(virtual_hearing.establishment.processed?).to eq(false) + end + + it "logs failure to datadog" do + expect(DataDogService).to receive(:increment_counter).with( + hash_including( + metric_name: "created_conference.failed", + metric_group: Constants.DATADOG_METRICS.HEARINGS.VIRTUAL_HEARINGS_GROUP_NAME, + attrs: { hearing_id: hearing.id } + ) + ) + + subject.perform_now + end + + it "does not create sent email events" do + subject.perform_now + + virtual_hearing.reload + expect(virtual_hearing.hearing.email_events.count).to eq(0) + end + end end + include_examples "confirmation emails are sent" + + include_examples "sent email event objects are created" + context "appellant email fails to send" do before do expected_mailer_args = { @@ -158,56 +212,6 @@ include_examples "job is retried" end - context "conference creation fails" do - let(:fake_pexip) { Fakes::PexipService.new(status_code: 400) } - - before do - allow(PexipService).to receive(:new).and_return(fake_pexip) - end - - after do - clear_enqueued_jobs - end - - it "job goes back on queue and logs if error", :aggregate_failures do - expect(Rails.logger).to receive(:error).exactly(11).times - - expect do - perform_enqueued_jobs do - VirtualHearings::CreateConferenceJob.perform_later(subject.arguments.first) - end - end.to( - have_performed_job(VirtualHearings::CreateConferenceJob) - .exactly(10) - .times - ) - - virtual_hearing.establishment.reload - expect(virtual_hearing.establishment.error.nil?).to eq(false) - expect(virtual_hearing.establishment.attempted?).to eq(true) - expect(virtual_hearing.establishment.processed?).to eq(false) - end - - it "logs failure to datadog" do - expect(DataDogService).to receive(:increment_counter).with( - hash_including( - metric_name: "created_conference.failed", - metric_group: Constants.DATADOG_METRICS.HEARINGS.VIRTUAL_HEARINGS_GROUP_NAME, - attrs: { hearing_id: hearing.id } - ) - ) - - subject.perform_now - end - - it "does not create sent email events" do - subject.perform_now - - virtual_hearing.reload - expect(virtual_hearing.hearing.email_events.count).to eq(0) - end - end - context "when the virtual hearing is not immediately available" do let(:virtual_hearing) { nil } From 63500fdc674bcc06c9a0104117ddfd720cc37217 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Wed, 8 Nov 2023 18:26:09 -0500 Subject: [PATCH 287/445] Whittle down create_conference_job --- .../virtual_hearings/create_conference_job_spec.rb | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/spec/jobs/virtual_hearings/create_conference_job_spec.rb b/spec/jobs/virtual_hearings/create_conference_job_spec.rb index 29e84d06760..1eeb09c8519 100644 --- a/spec/jobs/virtual_hearings/create_conference_job_spec.rb +++ b/spec/jobs/virtual_hearings/create_conference_job_spec.rb @@ -19,12 +19,10 @@ end let(:pexip_url) { "fake.va.gov" } before do - stub_const("ENV", "PEXIP_CLIENT_HOST" => pexip_url) + stub_const("ENV", ENV.to_hash.merge("PEXIP_CLIENT_HOST" => pexip_url)) allow(ENV).to receive(:[]).and_call_original allow(ENV).to receive(:fetch).and_call_original - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return PIN_KEY - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return URL_HOST - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return URL_PATH + User.authenticate!(user: current_user) end @@ -303,9 +301,6 @@ let(:expected_conference_id) { "0000001" } before do - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return PIN_KEY - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return URL_HOST - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return URL_PATH allow(VirtualHearings::SequenceConferenceId).to receive(:next).and_return expected_conference_id end @@ -337,6 +332,8 @@ end context "when all required env variables are not set" do + before { allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return nil } + include_examples "raises error", VirtualHearings::CreateConferenceJob::VirtualHearingLinkGenerationFailed include_examples "does not retry job" end From 2aa47a6d78308a8364578883b29a7845881fac46 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Wed, 8 Nov 2023 18:31:14 -0500 Subject: [PATCH 288/445] Remove env vars that can come back out --- .../virtual_hearings/delete_conference_link_job_spec.rb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb b/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb index 6d683fa683a..83bcdcbe79a 100644 --- a/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb +++ b/spec/jobs/virtual_hearings/delete_conference_link_job_spec.rb @@ -6,12 +6,6 @@ let!(:current_user) { create(:user, roles: ["System Admin"]) } let!(:judge) { Judge.new(create(:user)) } - before do - allow_any_instance_of(VirtualHearings::PexipLinkService).to receive(:pin_key).and_return("mysecretkey") - allow_any_instance_of(VirtualHearings::PexipLinkService).to receive(:host).and_return("example.va.gov") - allow_any_instance_of(VirtualHearings::PexipLinkService).to receive(:path).and_return("/sample") - end - describe ".perform" do context "When conference links in the DB are past the date of the date the job is run" do let!(:future_hearing_day_with_link) { create(:hearing_day, :virtual, :future_with_link) } From 1977ff2cfa6bbbcc6973f24ea70847358049c648 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Wed, 8 Nov 2023 18:50:48 -0500 Subject: [PATCH 289/445] Add FTs to conf job --- spec/jobs/virtual_hearings/create_conference_job_spec.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/jobs/virtual_hearings/create_conference_job_spec.rb b/spec/jobs/virtual_hearings/create_conference_job_spec.rb index 1eeb09c8519..4d574659922 100644 --- a/spec/jobs/virtual_hearings/create_conference_job_spec.rb +++ b/spec/jobs/virtual_hearings/create_conference_job_spec.rb @@ -7,6 +7,8 @@ URL_PATH = "/sample" PIN_KEY = "mysecretkey" + include_context "Enable both conference services" + context ".perform" do let(:current_user) { create(:user, roles: ["Build HearSched"]) } let(:hearing) { create(:hearing, regional_office: "RO06") } @@ -93,7 +95,7 @@ virtual_hearing.reload expect(virtual_hearing.status).to eq(:active) - expect(virtual_hearing.alias_with_host).to eq("BVA0000001@#{URL_HOST}") + expect(virtual_hearing.alias_with_host).to eq("BVA0000002@#{URL_HOST}") expect(virtual_hearing.host_pin.to_s.length).to eq(7) expect(virtual_hearing.guest_pin.to_s.length).to eq(10) end From 54974cf6a0f4a3f9d36817d4c21a82472213b77c Mon Sep 17 00:00:00 2001 From: breedbah Date: Wed, 8 Nov 2023 20:29:05 -0500 Subject: [PATCH 290/445] APPEALS-34517 updated tests and guestLink DailyDocket --- .../DailyDocketGuestLinkSection.jsx | 142 +++++++++--------- client/app/hearings/constants.js | 4 +- .../DailyDocketGuestLinkSection.test.js | 35 ++--- 3 files changed, 91 insertions(+), 90 deletions(-) diff --git a/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx b/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx index 7afb6af97fe..1383631d7c7 100644 --- a/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx +++ b/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx @@ -1,9 +1,38 @@ -/* eslint-disable id-length */ import React from 'react'; import PropTypes from 'prop-types'; import CopyTextButton from '../../../components/CopyTextButton'; import { GUEST_LINK_LABELS } from '../../constants'; +const H3Styled = ({ children, style }) => ( +

    + {children} +

    +); + +const SpanStyled = ({ children }) => ( + + {children} + +); + +const ConferenceRoom = ({ type, alias }) => ( + + {type === 'PexipConferenceLink' ? + GUEST_LINK_LABELS.PEXIP_GUEST_CONFERENCE_ROOM : + GUEST_LINK_LABELS.WEBEX_GUEST_CONFERENCE_ROOM} + {alias || 'N/A'} + +); + export const DailyDocketGuestLinkSection = ({ linkInfo }) => { const containerStyle = { marginLeft: '-40px', @@ -59,10 +88,10 @@ export const DailyDocketGuestLinkSection = ({ linkInfo }) => { * @param {roleAccess} - Boolean for if the current user has access to the guest link * @returns The room information */ - const renderRoomInfo = () => { - return ( -
    - {linkInfo && Object.values(linkInfo).map((link, index) => { + const renderRoomInfo = () => ( +
    + {linkInfo && + Object.values(linkInfo).map((link, index) => { const { guestLink, type } = link; CopyTextButtonProps.textToCopy = guestLink; @@ -72,77 +101,56 @@ export const DailyDocketGuestLinkSection = ({ linkInfo }) => { return (
    -

    - {type === "PexipConferenceLink" - ? GUEST_LINK_LABELS.PEXIP_GUEST_LINK_SECTION_LABEL - : GUEST_LINK_LABELS.WEBEX_GUEST_LINK_SECTION_LABEL} -

    - -

    - {GUEST_LINK_LABELS.GUEST_CONFERENCE_ROOM} - {alias || "N/A"} -

    - {type === "PexipConferenceLink" && ( -

    + + {type === 'PexipConferenceLink' ? + GUEST_LINK_LABELS.PEXIP_GUEST_LINK_SECTION_LABEL : + GUEST_LINK_LABELS.WEBEX_GUEST_LINK_SECTION_LABEL} + + + + + {type === 'PexipConferenceLink' && ( + {GUEST_LINK_LABELS.GUEST_PIN} - - {linkGuestPin} - -

    + {linkGuestPin} + )} -

    + + -

    +
    ); })} -
    - ); - }; +
    + ); return
    {renderRoomInfo()}
    ; }; +H3Styled.propTypes = { + children: PropTypes.node, + style: PropTypes.object, +}; + +SpanStyled.propTypes = { + children: PropTypes.node, +}; + +ConferenceRoom.propTypes = { + type: PropTypes.string, + alias: PropTypes.string, + children: PropTypes.node, + style: PropTypes.object, +}; + DailyDocketGuestLinkSection.propTypes = { - linkInfo: PropTypes.shape({ - guestLink: PropTypes.string, - guestPin: PropTypes.string, - alias: PropTypes.string, - }), + linkInfo: PropTypes.arrayOf( + PropTypes.shape({ + guestLink: PropTypes.string, + guestPin: PropTypes.string, + alias: PropTypes.string, + type: PropTypes.string, + }) + ), }; diff --git a/client/app/hearings/constants.js b/client/app/hearings/constants.js index 8ea3271e81f..2d0e5b95f03 100644 --- a/client/app/hearings/constants.js +++ b/client/app/hearings/constants.js @@ -96,9 +96,11 @@ export const GUEST_LINK_LABELS = { COPY_GUEST_LINK: 'Copy Guest Link', PEXIP_GUEST_LINK_SECTION_LABEL: 'Pexip Guest link for non-virtual hearings', WEBEX_GUEST_LINK_SECTION_LABEL: 'Webex Guest link for non-virtual hearings', + PEXIP_GUEST_CONFERENCE_ROOM:'Conference Room:', + WEBEX_GUEST_CONFERENCE_ROOM:'URL:', GUEST_CONFERENCE_ROOM: 'Conference Room:', GUEST_PIN: 'PIN:', -}; +}; export const SPREADSHEET_TYPES = { RoSchedulePeriod: { diff --git a/client/test/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.test.js b/client/test/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.test.js index eb380a01145..ab64f5ecf5a 100644 --- a/client/test/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.test.js +++ b/client/test/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.test.js @@ -1,52 +1,43 @@ + import React from 'react'; import { render, screen } from '@testing-library/react'; import { DailyDocketGuestLinkSection } from 'app/hearings/components/dailyDocket/DailyDocketGuestLinkSection'; describe('DailyDocketGuestLinkSection', () => { - const linkInfo = { - link1: { + const linkInfo = [ + { guestLink: 'https://example.com/guestLink1?pin=123456', guestPin: '123456', alias: 'Room 1', type: 'PexipConferenceLink', }, - link2: { + { guestLink: 'https://example.com/guestLink2?meetingID=123456789', guestPin: '', alias: 'Room 2', type: 'WebexConferenceLink', }, - }; + ]; it('renders the guest link information', async () => { render(); - const link1Alias = await screen.getAllByText('Conference Room:'); - const pexipLinkText = await screen.findByText( - 'Pexip Guest link for non-virtual hearings' - ); + const link1Alias = await screen.findByText('Room 1'); + const pexipLinkText = await screen.findByText('Pexip Guest link for non-virtual hearings'); const link1Pin = await screen.findByText('123456#'); - const link1CopyButtons = screen.getAllByRole('button', { - name: 'Copy Guest Link', - }); + const link1CopyButtons = screen.getAllByRole('button', { name: 'Copy Guest Link' }); - const webexLinkText = await screen.findByText( - 'Webex Guest link for non-virtual hearings' - ); - const link2Alias = await screen.getAllByText('Conference Room:'); - const link2Pin = await screen.findByText('N/A'); - const link2CopyButton = screen.getAllByRole('button', { - name: 'Copy Guest Link', - }); + const link2Alias = await screen.findByText('Room 2'); + const webexLinkText = await screen.findByText('Webex Guest link for non-virtual hearings'); + const link2CopyButton = screen.getAllByRole('button', { name: 'Copy Guest Link' }); expect(pexipLinkText).toBeInTheDocument(); - expect(link1Alias[0]).toBeInTheDocument(); + expect(link1Alias).toBeInTheDocument(); expect(link1Pin).toBeInTheDocument(); expect(link1CopyButtons[0]).toBeInTheDocument(); expect(webexLinkText).toBeInTheDocument(); - expect(link2Alias[1]).toBeInTheDocument(); - expect(link2Pin).toBeInTheDocument(); + expect(link2Alias).toBeInTheDocument(); expect(link2CopyButton[1]).toBeInTheDocument(); }); }); From 04f15ccff2f2aa739a9945a2721e0526b5a6eabf Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Wed, 8 Nov 2023 22:31:46 -0500 Subject: [PATCH 291/445] Lint --- client/app/hearings/constants.js | 4 ++-- .../dailyDocket/DailyDocketGuestLinkSection.test.js | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/client/app/hearings/constants.js b/client/app/hearings/constants.js index 2d0e5b95f03..1678ad54efb 100644 --- a/client/app/hearings/constants.js +++ b/client/app/hearings/constants.js @@ -96,8 +96,8 @@ export const GUEST_LINK_LABELS = { COPY_GUEST_LINK: 'Copy Guest Link', PEXIP_GUEST_LINK_SECTION_LABEL: 'Pexip Guest link for non-virtual hearings', WEBEX_GUEST_LINK_SECTION_LABEL: 'Webex Guest link for non-virtual hearings', - PEXIP_GUEST_CONFERENCE_ROOM:'Conference Room:', - WEBEX_GUEST_CONFERENCE_ROOM:'URL:', + PEXIP_GUEST_CONFERENCE_ROOM: 'Conference Room:', + WEBEX_GUEST_CONFERENCE_ROOM: 'URL:', GUEST_CONFERENCE_ROOM: 'Conference Room:', GUEST_PIN: 'PIN:', }; diff --git a/client/test/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.test.js b/client/test/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.test.js index ab64f5ecf5a..3737b4eace4 100644 --- a/client/test/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.test.js +++ b/client/test/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.test.js @@ -1,4 +1,3 @@ - import React from 'react'; import { render, screen } from '@testing-library/react'; import { DailyDocketGuestLinkSection } from 'app/hearings/components/dailyDocket/DailyDocketGuestLinkSection'; From 74dfa20c55ebef6e74e8c2f2aa703fcf234552a5 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Wed, 8 Nov 2023 23:07:18 -0500 Subject: [PATCH 292/445] Remove unused mocks --- spec/feature/hearings/hearing_details_spec.rb | 2 ++ spec/models/hearing_day_spec.rb | 10 ---------- spec/models/hearings/pexip_conference_link_spec.rb | 9 --------- spec/requests/hearing_day_spec.rb | 2 -- spec/serializers/conference_link_serializer_spec.rb | 2 -- .../models/hearings/shared_context_conference_link.rb | 8 -------- 6 files changed, 2 insertions(+), 31 deletions(-) diff --git a/spec/feature/hearings/hearing_details_spec.rb b/spec/feature/hearings/hearing_details_spec.rb index 6eb472e4e2e..fd7bf784208 100644 --- a/spec/feature/hearings/hearing_details_spec.rb +++ b/spec/feature/hearings/hearing_details_spec.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true RSpec.feature "Hearing Details", :all_dbs do + include_context "Enable both conference services" + before do # VSO users require this task to be active on an appeal for them to access its hearings. TrackVeteranTask.create!(appeal: hearing.appeal, parent: hearing.appeal.root_task, assigned_to: vso_org) diff --git a/spec/models/hearing_day_spec.rb b/spec/models/hearing_day_spec.rb index 2191c5fafcf..783ca5668c8 100644 --- a/spec/models/hearing_day_spec.rb +++ b/spec/models/hearing_day_spec.rb @@ -548,13 +548,6 @@ def format_begins_at_from_db(time_string, scheduled_for) end context "hearing day in the past, conference link doesnt exist" do - include_context "Mock Pexip service env vars" - - after do - FeatureToggle.disable!(:pexip_conference_service) - FeatureToggle.disable!(:webex_conference_service) - end - let(:hearing_day) do RequestStore[:current_user] = User.create(css_id: "BVASCASPER1", station_id: 101) create( @@ -601,7 +594,6 @@ def format_begins_at_from_db(time_string, scheduled_for) context "#subject_for_conference" do include_context "Enable both conference services" - include_context "Mock Pexip service env vars" let(:expected_date) { "Sep 21, 2023" } let(:expected_date_parsed) { Date.parse(expected_date) } @@ -620,8 +612,6 @@ def format_begins_at_from_db(time_string, scheduled_for) end context "hearing day in the future, conference link doesnt exist" do - include_context "Mock Pexip service env vars" - let(:hearing_day) do RequestStore[:current_user] = User.create(css_id: "BVASCASPER1", station_id: 101) create( diff --git a/spec/models/hearings/pexip_conference_link_spec.rb b/spec/models/hearings/pexip_conference_link_spec.rb index 74de50f5149..df15be2c69d 100644 --- a/spec/models/hearings/pexip_conference_link_spec.rb +++ b/spec/models/hearings/pexip_conference_link_spec.rb @@ -61,8 +61,6 @@ end context "#create" do - include_context "Mock Pexip service env vars" - let(:hearing_day) do create(:hearing_day, id: 1) end @@ -89,8 +87,6 @@ end context "update conference day" do - include_context "Mock Pexip service env vars" - let(:hearing_day) do create(:hearing_day, id: 1) end @@ -126,7 +122,6 @@ end describe "#guest_pin" do - include_context "Mock Pexip service env vars" include_context "Enable both conference services" let(:hearing_day) { create(:hearing_day) } @@ -150,15 +145,11 @@ end describe "#guest_link" do - include_context "Mock Pexip service env vars" - before do allow_any_instance_of(VirtualHearings::PexipLinkService).to receive(:conference_id).and_return expected_conference_id allow_any_instance_of(VirtualHearings::PexipLinkService).to receive(:guest_pin).and_return expected_pin end - let(:hearing_day) { create(:hearing_day) } - let!(:user) { RequestStore.store[:current_user] = User.system_user } let(:conference_link) do diff --git a/spec/requests/hearing_day_spec.rb b/spec/requests/hearing_day_spec.rb index ce9b29153c1..77c00b9d507 100644 --- a/spec/requests/hearing_day_spec.rb +++ b/spec/requests/hearing_day_spec.rb @@ -150,8 +150,6 @@ end describe "Show a hearing day with its children hearings" do - include_context "Mock Pexip service env vars" - let!(:regional_office) do create(:staff, stafkey: "RO13", stc4: 11) end diff --git a/spec/serializers/conference_link_serializer_spec.rb b/spec/serializers/conference_link_serializer_spec.rb index f4cf2d90a70..30fc1853d34 100644 --- a/spec/serializers/conference_link_serializer_spec.rb +++ b/spec/serializers/conference_link_serializer_spec.rb @@ -34,8 +34,6 @@ subject { described_class.new(conference_link) } context "With a Pexip conference link" do - include_context "Mock Pexip service env vars" - let(:conference_link) { create(:pexip_conference_link, hearing_day: hearing_day) } include_examples "Serialized conferenced link attributes meet expectations" diff --git a/spec/support/shared_context/models/hearings/shared_context_conference_link.rb b/spec/support/shared_context/models/hearings/shared_context_conference_link.rb index 81a9699bb4b..2272f2c4bca 100644 --- a/spec/support/shared_context/models/hearings/shared_context_conference_link.rb +++ b/spec/support/shared_context/models/hearings/shared_context_conference_link.rb @@ -1,13 +1,5 @@ # frozen_string_literal: true -RSpec.shared_context "Mock Pexip service env vars" do - before do - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_PIN_KEY").and_return "mysecretkey" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_HOST").and_return "example.va.gov" - allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return "/sample" - end -end - RSpec.shared_context "Enable both conference services" do before do FeatureToggle.enable!(:pexip_conference_service) From 8b706d84d03a7a24b7148e26910ae63dc4a3911c Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Wed, 8 Nov 2023 23:38:18 -0500 Subject: [PATCH 293/445] Fix conf link tests --- spec/feature/hearings/hearing_details_spec.rb | 2 -- spec/models/hearings/pexip_conference_link_spec.rb | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/spec/feature/hearings/hearing_details_spec.rb b/spec/feature/hearings/hearing_details_spec.rb index fd7bf784208..6eb472e4e2e 100644 --- a/spec/feature/hearings/hearing_details_spec.rb +++ b/spec/feature/hearings/hearing_details_spec.rb @@ -1,8 +1,6 @@ # frozen_string_literal: true RSpec.feature "Hearing Details", :all_dbs do - include_context "Enable both conference services" - before do # VSO users require this task to be active on an appeal for them to access its hearings. TrackVeteranTask.create!(appeal: hearing.appeal, parent: hearing.appeal.root_task, assigned_to: vso_org) diff --git a/spec/models/hearings/pexip_conference_link_spec.rb b/spec/models/hearings/pexip_conference_link_spec.rb index df15be2c69d..e0bc937e7c5 100644 --- a/spec/models/hearings/pexip_conference_link_spec.rb +++ b/spec/models/hearings/pexip_conference_link_spec.rb @@ -149,7 +149,7 @@ allow_any_instance_of(VirtualHearings::PexipLinkService).to receive(:conference_id).and_return expected_conference_id allow_any_instance_of(VirtualHearings::PexipLinkService).to receive(:guest_pin).and_return expected_pin end - + let(:hearing_day) { create(:hearing_day) } let!(:user) { RequestStore.store[:current_user] = User.system_user } let(:conference_link) do From df8176788a89257f7a012629aae65fad9e04d75c Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 9 Nov 2023 00:30:47 -0500 Subject: [PATCH 294/445] Maybe fix some tests --- spec/feature/hearings/hearing_details_spec.rb | 21 ++++++++++++++++--- .../virtual_hearings/daily_docket_spec.rb | 5 ++++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/spec/feature/hearings/hearing_details_spec.rb b/spec/feature/hearings/hearing_details_spec.rb index 6eb472e4e2e..a5e5365ab61 100644 --- a/spec/feature/hearings/hearing_details_spec.rb +++ b/spec/feature/hearings/hearing_details_spec.rb @@ -299,7 +299,7 @@ def ensure_link_present(link, disable) let!(:virtual_hearing) do create( :virtual_hearing, - :initialized, + :link_generation_initialized, :all_emails_sent, :timezones_initialized, status: :active, @@ -391,7 +391,9 @@ def ensure_link_present(link, disable) end context "Links display correctly when scheduling Virtual Hearings" do - let!(:virtual_hearing) { create(:virtual_hearing, :all_emails_sent, hearing: hearing) } + let!(:virtual_hearing) do + create(:virtual_hearing, :all_emails_sent, hearing: hearing) + end scenario "displays in progress when the virtual hearing is being scheduled" do visit "hearings/" + hearing.external_id.to_s + "/details" @@ -407,6 +409,10 @@ def ensure_link_present(link, disable) context "after the virtual hearing is scheduled" do let!(:hearing_day) { create(:hearing_day, scheduled_for: Date.yesterday - 2) } + let!(:virtual_hearing) do + create(:virtual_hearing, :all_emails_sent, :link_generation_initialized, hearing: hearing) + end + before do # Mock the conference details virtual_hearing.alias_name = rand(1..9).to_s[0..6] @@ -447,7 +453,9 @@ def ensure_link_present(link, disable) end context "Hearing type dropdown and vet and poa fields are disabled while async job is running" do - let!(:virtual_hearing) { create(:virtual_hearing, :all_emails_sent, hearing: hearing) } + let!(:virtual_hearing) do + create(:virtual_hearing, :all_emails_sent, :link_generation_initialized, hearing: hearing) + end scenario "async job is not completed" do visit "hearings/" + hearing.external_id.to_s + "/details" @@ -478,6 +486,7 @@ def ensure_link_present(link, disable) :virtual_hearing, :all_emails_sent, :timezones_initialized, + :link_generation_initialized, status: :active, hearing: hearing ) @@ -530,6 +539,7 @@ def ensure_link_present(link, disable) :virtual_hearing, :all_emails_sent, :timezones_initialized, + :link_generation_initialized, status: :active, hearing: hearing ) @@ -590,6 +600,7 @@ def ensure_link_present(link, disable) :virtual_hearing, :all_emails_sent, :timezones_initialized, + :link_generation_initialized, status: :active, hearing: hearing ) @@ -626,6 +637,7 @@ def ensure_link_present(link, disable) create(:virtual_hearing, :all_emails_sent, :timezones_initialized, + :link_generation_initialized, status: :active, hearing: hearing) end @@ -660,6 +672,7 @@ def ensure_link_present(link, disable) create(:virtual_hearing, :all_emails_sent, :timezones_initialized, + :link_generation_initialized, status: :active, hearing: hearing) end @@ -695,6 +708,7 @@ def ensure_link_present(link, disable) create(:virtual_hearing, :all_emails_sent, :timezones_initialized, + :link_generation_initialized, status: :active, hearing: hearing) end @@ -733,6 +747,7 @@ def ensure_link_present(link, disable) create(:virtual_hearing, :all_emails_sent, :timezones_initialized, + :link_generation_initialized, status: :active, hearing: hearing) end diff --git a/spec/feature/hearings/virtual_hearings/daily_docket_spec.rb b/spec/feature/hearings/virtual_hearings/daily_docket_spec.rb index 331a774beef..74b0a779dfe 100644 --- a/spec/feature/hearings/virtual_hearings/daily_docket_spec.rb +++ b/spec/feature/hearings/virtual_hearings/daily_docket_spec.rb @@ -7,7 +7,9 @@ let(:regional_office_key) { "RO59" } # Honolulu, HI let(:regional_office_timezone) { RegionalOffice.new(regional_office_key).timezone } let!(:hearing) { create(:hearing, :with_tasks, regional_office: regional_office_key, scheduled_time: "9:00AM") } - let!(:virtual_hearing) { create(:virtual_hearing, :all_emails_sent, status: :active, hearing: hearing) } + let!(:virtual_hearing) do + create(:virtual_hearing, :all_emails_sent, :link_generation_initialized, status: :active, hearing: hearing) + end let(:updated_hearing_time) { "11:00 am" } let(:updated_virtual_hearing_time) { "11:00 AM Eastern Time (US & Canada)" } let(:updated_video_hearing_time) { "11:00 AM Hawaii" } @@ -74,6 +76,7 @@ def check_email_events(hearing, current_user) let!(:central_virtual_hearing) do create(:virtual_hearing, :all_emails_sent, + :link_generation_initialized, :timezones_initialized, status: :active, hearing: central_hearing) From c073eadb3d19241d6c40eb8b9ac7b6cd3db31465 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 9 Nov 2023 08:50:28 -0500 Subject: [PATCH 295/445] Controller spec fixes --- spec/controllers/hearings_controller_spec.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spec/controllers/hearings_controller_spec.rb b/spec/controllers/hearings_controller_spec.rb index 387b77948e9..74bd2d9c82d 100644 --- a/spec/controllers/hearings_controller_spec.rb +++ b/spec/controllers/hearings_controller_spec.rb @@ -147,6 +147,7 @@ create( :virtual_hearing, :initialized, + :link_generation_initialized, status: :active, hearing: hearing, appellant_email: "existing_veteran_email@caseflow.gov", @@ -234,6 +235,7 @@ create( :virtual_hearing, :initialized, + :link_generation_initialized, status: :active, hearing: hearing, appellant_email: "existing_veteran_email@caseflow.gov", @@ -263,6 +265,7 @@ create( :virtual_hearing, :all_emails_sent, + :link_generation_initialized, status: :active, hearing: hearing, conference_id: "000000" @@ -398,6 +401,7 @@ create( :virtual_hearing, :initialized, + :link_generation_initialized, status: :active, hearing: hearing, appellant_email: "existing_veteran_email@caseflow.gov", From 13ee39221ce686ed04cda350fd7190b35661a15c Mon Sep 17 00:00:00 2001 From: Jeff Marks Date: Thu, 9 Nov 2023 10:25:06 -0500 Subject: [PATCH 296/445] Add fix to virtual hearing spec and update factory and model --- app/models/hearings/virtual_hearing.rb | 2 +- spec/factories/virtual_hearing.rb | 8 +- spec/models/hearings/virtual_hearing_spec.rb | 135 ++++++------------- 3 files changed, 44 insertions(+), 101 deletions(-) diff --git a/app/models/hearings/virtual_hearing.rb b/app/models/hearings/virtual_hearing.rb index 15077b14c33..8ee959264ff 100644 --- a/app/models/hearings/virtual_hearing.rb +++ b/app/models/hearings/virtual_hearing.rb @@ -228,7 +228,7 @@ def active? # require us to delete the conference but not set `request_cancelled`. def closed? # the conference has been created the virtual hearing was deleted - conference_id.present? && conference_deleted? + conference_deleted? end # Determines the status of the Virtual Hearing based on the establishment diff --git a/spec/factories/virtual_hearing.rb b/spec/factories/virtual_hearing.rb index 39384e79a3f..538687828a2 100644 --- a/spec/factories/virtual_hearing.rb +++ b/spec/factories/virtual_hearing.rb @@ -28,12 +28,6 @@ status { nil } end - trait :initialized do - alias_name { format("%07d", id: rand(99..10_001)) } - conference_id { rand(1..9) } - after(:build, &:generate_conference_pins) - end - trait :timezones_initialized do appellant_tz { "America/Denver" } representative_tz { "America/Los_Angeles" } @@ -45,7 +39,7 @@ judge_email_sent { true } end - trait :link_generation_initialized do + trait :initialized do alias_with_host { "BVA0000001@example.va.gov" } host_pin_long { "3998472" } guest_pin_long { "7470125694" } diff --git a/spec/models/hearings/virtual_hearing_spec.rb b/spec/models/hearings/virtual_hearing_spec.rb index 39471503dc0..305eebf60b4 100644 --- a/spec/models/hearings/virtual_hearing_spec.rb +++ b/spec/models/hearings/virtual_hearing_spec.rb @@ -35,20 +35,7 @@ end end - shared_context "virtual hearing created with new link generation" do - let(:virtual_hearing) do - build( - :virtual_hearing, - :link_generation_initialized, - hearing: build( - :hearing, - hearing_day: build(:hearing_day, request_type: HearingDay::REQUEST_TYPES[:central]) - ) - ) - end - end - - shared_context "virtual hearing not created with new link generation" do + shared_context "virtual hearing created with link generation" do let(:virtual_hearing) do build( :virtual_hearing, @@ -104,9 +91,9 @@ it "returns the aliased pins when set" do expect(virtual_hearing_aliased[:guest_pin]).to eq nil - expect(virtual_hearing_aliased.guest_pin.to_s.length).to eq 11 + expect(virtual_hearing_aliased.guest_pin.to_s.length).to eq 10 expect(virtual_hearing_aliased[:host_pin]).to eq nil - expect(virtual_hearing_aliased.host_pin.to_s.length).to eq 8 + expect(virtual_hearing_aliased.host_pin.to_s.length).to eq 7 end end @@ -233,6 +220,7 @@ expect(subject).to eq(status) end end + subject { virtual_hearing.status } context "cancelled" do @@ -268,15 +256,8 @@ end context "active" do - context "vh created with new link generation" do - include_context "virtual hearing created with new link generation" - include_examples "returns correct status", :active - end - - context "vh not created with new link generation" do - include_context "virtual hearing not created with new link generation" - include_examples "returns correct status", :active - end + include_context "virtual hearing created with link generation" + include_examples "returns correct status", :active end context "pending" do @@ -301,86 +282,54 @@ allow(ENV).to receive(:[]).with("VIRTUAL_HEARING_URL_PATH").and_return URL_PATH end - context "with old link generation virtual hearing" do - include_context "virtual hearing not created with new link generation" + include_context "virtual hearing created with link generation" - it "raises an error" do - virtual_hearing.update!(alias_with_host: "BVA#{virtual_hearing.alias_name}@nowhere.va.gov") - virtual_hearing.reload + it "rebuilds and saves the links as expected" do + # update virtual_hearing with old-style link + old_style_host_link = "https://example.va.gov/sample/?conference=BVA0000001@example.va.gov" \ + "&name=Judge&pin=3998472&callType=video&join=1" + old_style_guest_link = "https://example.va.gov/sample/?conference=BVA0000001@example.va.gov" \ + "&name=Guest&pin=7470125694&callType=video&join=1" + virtual_hearing.update!(host_hearing_link: old_style_host_link, guest_hearing_link: old_style_guest_link) - expect { virtual_hearing.rebuild_and_save_links } - .to raise_error(VirtualHearing::LinkMismatchError) - end + virtual_hearing.reload + expect(virtual_hearing.host_hearing_link).to eq old_style_host_link + expect(virtual_hearing.guest_hearing_link).to eq old_style_guest_link - context "with a virtual hearing that has a nil alias_with_host" do - it "raises an error" do - virtual_hearing.update!(alias_with_host: nil) - virtual_hearing.reload + alias_with_host = virtual_hearing.alias_with_host + host_pin_long = virtual_hearing.host_pin_long + guest_pin_long = virtual_hearing.guest_pin_long - expect { virtual_hearing.rebuild_and_save_links }.to raise_error(VirtualHearing::NoAliasWithHostPresentError) - end - end - end + virtual_hearing.rebuild_and_save_links + virtual_hearing.reload - context "with new link generation virtual hearing" do - include_context "virtual hearing created with new link generation" - - it "rebuilds and saves the links as expected" do - # update virtual_hearing with old-style link - old_style_host_link = "https://example.va.gov/sample/?conference=BVA0000001@example.va.gov" \ - "&name=Judge&pin=3998472&callType=video&join=1" - old_style_guest_link = "https://example.va.gov/sample/?conference=BVA0000001@example.va.gov" \ - "&name=Guest&pin=7470125694&callType=video&join=1" - virtual_hearing.update!(host_hearing_link: old_style_host_link, guest_hearing_link: old_style_guest_link) - - virtual_hearing.reload - expect(virtual_hearing.host_hearing_link).to eq old_style_host_link - expect(virtual_hearing.guest_hearing_link).to eq old_style_guest_link - - alias_with_host = virtual_hearing.alias_with_host - host_pin_long = virtual_hearing.host_pin_long - guest_pin_long = virtual_hearing.guest_pin_long - - virtual_hearing.rebuild_and_save_links - virtual_hearing.reload - - current_style_host_link = "https://example.va.gov/sample/?conference=BVA0000001@example.va.gov" \ - "&pin=3998472&callType=video" - current_style_guest_link = "https://example.va.gov/sample/?conference=BVA0000001@example.va.gov" \ - "&pin=7470125694&callType=video" - - expect(virtual_hearing.host_hearing_link).not_to eq old_style_host_link - expect(virtual_hearing.guest_hearing_link).not_to eq old_style_guest_link - expect(virtual_hearing.host_hearing_link).to eq current_style_host_link - expect(virtual_hearing.guest_hearing_link).to eq current_style_guest_link - - # these pass because the values hard-coded into the virtual hearing factory - # with trait link_generation_initialized are consistent with the values - # algorithmically generated by VirtualHearings::PexipLinkService - expect(virtual_hearing.host_hearing_link).to include alias_with_host - expect(virtual_hearing.host_hearing_link).to include host_pin_long - - expect(virtual_hearing.guest_hearing_link).to include alias_with_host - expect(virtual_hearing.guest_hearing_link).to include guest_pin_long - end + current_style_host_link = "https://example.va.gov/sample/?conference=BVA0000001@example.va.gov" \ + "&pin=3998472&callType=video" + current_style_guest_link = "https://example.va.gov/sample/?conference=BVA0000001@example.va.gov" \ + "&pin=7470125694&callType=video" + + expect(virtual_hearing.host_hearing_link).not_to eq old_style_host_link + expect(virtual_hearing.guest_hearing_link).not_to eq old_style_guest_link + expect(virtual_hearing.host_hearing_link).to eq current_style_host_link + expect(virtual_hearing.guest_hearing_link).to eq current_style_guest_link + + # these pass because the values hard-coded into the virtual hearing factory + # with trait link_generation_initialized are consistent with the values + # algorithmically generated by VirtualHearings::PexipLinkService + expect(virtual_hearing.host_hearing_link).to include alias_with_host + expect(virtual_hearing.host_hearing_link).to include host_pin_long + + expect(virtual_hearing.guest_hearing_link).to include alias_with_host + expect(virtual_hearing.guest_hearing_link).to include guest_pin_long end + context "#test_link" do - context "vh created with new link generation" do + context "vh created with link generation" do def link(name) "https://#{URL_HOST}#{URL_PATH}?conference=test_call&name=#{name}&join=1" end - include_context "virtual hearing created with new link generation" - include_examples "all test link behaviors" - end - - context "vh not created with new link generation" do - def link(name) - "https://care.va.gov/webapp2/conference/test_call?name=#{name}&join=1" - end - - include_context "virtual hearing not created with new link generation" include_examples "all test link behaviors" end From 96aaf76831c6cb8d24974f5201496109b5c4d6a6 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 9 Nov 2023 10:26:03 -0500 Subject: [PATCH 297/445] Remove defunct check for host link --- spec/feature/hearings/virtual_hearings/daily_docket_spec.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/spec/feature/hearings/virtual_hearings/daily_docket_spec.rb b/spec/feature/hearings/virtual_hearings/daily_docket_spec.rb index 74b0a779dfe..f66856c7c3a 100644 --- a/spec/feature/hearings/virtual_hearings/daily_docket_spec.rb +++ b/spec/feature/hearings/virtual_hearings/daily_docket_spec.rb @@ -166,7 +166,6 @@ def check_email_events(hearing, current_user) visit "hearings/schedule/docket/" + hearing.hearing_day.id.to_s expect(page).to have_content(vlj_virtual_hearing_link) - expect(page).to have_xpath "//a[contains(@href,'role=host')]" end end context "VLJ view" do @@ -176,7 +175,6 @@ def check_email_events(hearing, current_user) visit "hearings/schedule/docket/" + hearing.hearing_day.id.to_s expect(page).to have_content(vlj_virtual_hearing_link) - expect(page).to have_xpath "//a[contains(@href,'role=host')]" end end end From 0b29f77b77eed028e7d25aae41af92d544b34118 Mon Sep 17 00:00:00 2001 From: Jeff Marks Date: Thu, 9 Nov 2023 10:56:23 -0500 Subject: [PATCH 298/445] Update link_generation_initialized trait across app --- app/models/hearings/virtual_hearing.rb | 3 +-- spec/controllers/hearings_controller_spec.rb | 5 +---- spec/feature/hearings/hearing_details_spec.rb | 20 +++++++++---------- spec/models/hearings/virtual_hearing_spec.rb | 2 +- .../virtual_hearing_repository_spec.rb | 8 ++++---- 5 files changed, 17 insertions(+), 21 deletions(-) diff --git a/app/models/hearings/virtual_hearing.rb b/app/models/hearings/virtual_hearing.rb index 8ee959264ff..2c299fbc3d6 100644 --- a/app/models/hearings/virtual_hearing.rb +++ b/app/models/hearings/virtual_hearing.rb @@ -68,8 +68,7 @@ def base_url lambda { joins(:establishment) .where(" - conference_deleted = false AND - conference_id IS NOT NULL AND ( + conference_deleted = false AND ( request_cancelled = true OR virtual_hearing_establishments.processed_at IS NOT NULL )") diff --git a/spec/controllers/hearings_controller_spec.rb b/spec/controllers/hearings_controller_spec.rb index 74bd2d9c82d..4376f022472 100644 --- a/spec/controllers/hearings_controller_spec.rb +++ b/spec/controllers/hearings_controller_spec.rb @@ -147,7 +147,6 @@ create( :virtual_hearing, :initialized, - :link_generation_initialized, status: :active, hearing: hearing, appellant_email: "existing_veteran_email@caseflow.gov", @@ -235,7 +234,6 @@ create( :virtual_hearing, :initialized, - :link_generation_initialized, status: :active, hearing: hearing, appellant_email: "existing_veteran_email@caseflow.gov", @@ -265,7 +263,7 @@ create( :virtual_hearing, :all_emails_sent, - :link_generation_initialized, + :initialized, status: :active, hearing: hearing, conference_id: "000000" @@ -401,7 +399,6 @@ create( :virtual_hearing, :initialized, - :link_generation_initialized, status: :active, hearing: hearing, appellant_email: "existing_veteran_email@caseflow.gov", diff --git a/spec/feature/hearings/hearing_details_spec.rb b/spec/feature/hearings/hearing_details_spec.rb index a5e5365ab61..73fd5049cec 100644 --- a/spec/feature/hearings/hearing_details_spec.rb +++ b/spec/feature/hearings/hearing_details_spec.rb @@ -299,7 +299,7 @@ def ensure_link_present(link, disable) let!(:virtual_hearing) do create( :virtual_hearing, - :link_generation_initialized, + :initialized, :all_emails_sent, :timezones_initialized, status: :active, @@ -410,7 +410,7 @@ def ensure_link_present(link, disable) context "after the virtual hearing is scheduled" do let!(:hearing_day) { create(:hearing_day, scheduled_for: Date.yesterday - 2) } let!(:virtual_hearing) do - create(:virtual_hearing, :all_emails_sent, :link_generation_initialized, hearing: hearing) + create(:virtual_hearing, :all_emails_sent, :initialized, hearing: hearing) end before do @@ -454,7 +454,7 @@ def ensure_link_present(link, disable) context "Hearing type dropdown and vet and poa fields are disabled while async job is running" do let!(:virtual_hearing) do - create(:virtual_hearing, :all_emails_sent, :link_generation_initialized, hearing: hearing) + create(:virtual_hearing, :all_emails_sent, :initialized, hearing: hearing) end scenario "async job is not completed" do @@ -486,7 +486,7 @@ def ensure_link_present(link, disable) :virtual_hearing, :all_emails_sent, :timezones_initialized, - :link_generation_initialized, + :initialized, status: :active, hearing: hearing ) @@ -539,7 +539,7 @@ def ensure_link_present(link, disable) :virtual_hearing, :all_emails_sent, :timezones_initialized, - :link_generation_initialized, + :initialized, status: :active, hearing: hearing ) @@ -600,7 +600,7 @@ def ensure_link_present(link, disable) :virtual_hearing, :all_emails_sent, :timezones_initialized, - :link_generation_initialized, + :initialized, status: :active, hearing: hearing ) @@ -637,7 +637,7 @@ def ensure_link_present(link, disable) create(:virtual_hearing, :all_emails_sent, :timezones_initialized, - :link_generation_initialized, + :initialized, status: :active, hearing: hearing) end @@ -672,7 +672,7 @@ def ensure_link_present(link, disable) create(:virtual_hearing, :all_emails_sent, :timezones_initialized, - :link_generation_initialized, + :initialized, status: :active, hearing: hearing) end @@ -708,7 +708,7 @@ def ensure_link_present(link, disable) create(:virtual_hearing, :all_emails_sent, :timezones_initialized, - :link_generation_initialized, + :initialized, status: :active, hearing: hearing) end @@ -747,7 +747,7 @@ def ensure_link_present(link, disable) create(:virtual_hearing, :all_emails_sent, :timezones_initialized, - :link_generation_initialized, + :initialized, status: :active, hearing: hearing) end diff --git a/spec/models/hearings/virtual_hearing_spec.rb b/spec/models/hearings/virtual_hearing_spec.rb index 305eebf60b4..1dc922b0c0c 100644 --- a/spec/models/hearings/virtual_hearing_spec.rb +++ b/spec/models/hearings/virtual_hearing_spec.rb @@ -314,7 +314,7 @@ expect(virtual_hearing.guest_hearing_link).to eq current_style_guest_link # these pass because the values hard-coded into the virtual hearing factory - # with trait link_generation_initialized are consistent with the values + # with trait :initialized are consistent with the values # algorithmically generated by VirtualHearings::PexipLinkService expect(virtual_hearing.host_hearing_link).to include alias_with_host expect(virtual_hearing.host_hearing_link).to include host_pin_long diff --git a/spec/repositories/virtual_hearing_repository_spec.rb b/spec/repositories/virtual_hearing_repository_spec.rb index 58da5138a96..b1b1a00f0a8 100644 --- a/spec/repositories/virtual_hearing_repository_spec.rb +++ b/spec/repositories/virtual_hearing_repository_spec.rb @@ -64,7 +64,7 @@ end context "for a virtual hearing created with new link generation" do - let(:virtual_hearing) { create(:virtual_hearing, :link_generation_initialized, hearing: hearing) } + let(:virtual_hearing) { create(:virtual_hearing, :initialized, hearing: hearing) } it "does not return the virtual hearing" do expect(subject).to eq [] @@ -130,7 +130,7 @@ end context "for a virtual hearing created with new link generation" do - let(:virtual_hearing) { create(:virtual_hearing, :link_generation_initialized, hearing: hearing) } + let(:virtual_hearing) { create(:virtual_hearing, :initialized, hearing: hearing) } it "does not return the virtual hearing" do expect(subject).to eq [] @@ -192,7 +192,7 @@ let!(:vh_with_all_pending_emails) do create( :virtual_hearing, - :link_generation_initialized, + :initialized, status: :active, hearing: create(:hearing) ) @@ -200,7 +200,7 @@ let!(:vh_in_good_state) do create( :virtual_hearing, - :link_generation_initialized, + :initialized, :all_emails_sent, hearing: create(:hearing) ) From 11f92bfc76b4dba0cb93a8718c54df3ce7a90bfa Mon Sep 17 00:00:00 2001 From: Jeff Marks Date: Thu, 9 Nov 2023 10:59:12 -0500 Subject: [PATCH 299/445] Resolve daily docket spec with new trait name --- spec/feature/hearings/virtual_hearings/daily_docket_spec.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/spec/feature/hearings/virtual_hearings/daily_docket_spec.rb b/spec/feature/hearings/virtual_hearings/daily_docket_spec.rb index f66856c7c3a..63f0ba1a4c5 100644 --- a/spec/feature/hearings/virtual_hearings/daily_docket_spec.rb +++ b/spec/feature/hearings/virtual_hearings/daily_docket_spec.rb @@ -8,7 +8,7 @@ let(:regional_office_timezone) { RegionalOffice.new(regional_office_key).timezone } let!(:hearing) { create(:hearing, :with_tasks, regional_office: regional_office_key, scheduled_time: "9:00AM") } let!(:virtual_hearing) do - create(:virtual_hearing, :all_emails_sent, :link_generation_initialized, status: :active, hearing: hearing) + create(:virtual_hearing, :all_emails_sent, :initialized, status: :active, hearing: hearing) end let(:updated_hearing_time) { "11:00 am" } let(:updated_virtual_hearing_time) { "11:00 AM Eastern Time (US & Canada)" } @@ -76,7 +76,7 @@ def check_email_events(hearing, current_user) let!(:central_virtual_hearing) do create(:virtual_hearing, :all_emails_sent, - :link_generation_initialized, + :initialized, :timezones_initialized, status: :active, hearing: central_hearing) @@ -166,6 +166,7 @@ def check_email_events(hearing, current_user) visit "hearings/schedule/docket/" + hearing.hearing_day.id.to_s expect(page).to have_content(vlj_virtual_hearing_link) + expect(page).to have_xpath "//a[contains(@href,'role=host')]" end end context "VLJ view" do @@ -175,6 +176,7 @@ def check_email_events(hearing, current_user) visit "hearings/schedule/docket/" + hearing.hearing_day.id.to_s expect(page).to have_content(vlj_virtual_hearing_link) + expect(page).to have_xpath "//a[contains(@href,'role=host')]" end end end From a8bb47a7e564b4f22f3ddaf419461ada990480e5 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 9 Nov 2023 12:59:36 -0500 Subject: [PATCH 300/445] Adjust StuckVirtualHearingsChecker --- .../stuck_virtual_hearings_checker_spec.rb | 64 ++++--------------- 1 file changed, 14 insertions(+), 50 deletions(-) diff --git a/spec/services/stuck_virtual_hearings_checker_spec.rb b/spec/services/stuck_virtual_hearings_checker_spec.rb index 15ada3afc21..4075e4521cd 100644 --- a/spec/services/stuck_virtual_hearings_checker_spec.rb +++ b/spec/services/stuck_virtual_hearings_checker_spec.rb @@ -77,6 +77,8 @@ end context "there is a virtual hearing where all emails haven't sent" do + before { stub_const("ENV", ENV.to_hash.merge("VIRTUAL_HEARING_PIN_KEY" => nil)) } + let!(:virtual_hearing) do create( :virtual_hearing, :initialized, :all_emails_sent, @@ -86,7 +88,7 @@ end let!(:virtual_hearing_no_emails) do create( - :virtual_hearing, :initialized, + :virtual_hearing, updated_at: Time.zone.now - 3.hours, hearing: create(:hearing, hearing_day: hearing_day, regional_office: "RO13") ) @@ -99,7 +101,7 @@ expect(report_lines).to include("Found 1 stuck virtual hearing: ") pending_line = report_lines[1] expect(pending_line).to include "VirtualHearing.find(#{virtual_hearing_no_emails.id})" - expect(pending_line).to include "last attempted: never" + expect(pending_line).to include "less than a minute ago" display_scheduled_for = virtual_hearing_no_emails.hearing.scheduled_for.strftime("%a %m/%d") expect(pending_line).to include "scheduled for: #{display_scheduled_for}" expect(pending_line).to include "updated by: #{virtual_hearing_no_emails.updated_by.css_id}" @@ -113,13 +115,16 @@ let(:scheduled_time) { (time_now - 20.hours).strftime("%I:%M%p") } let!(:virtual_hearing_no_emails) do create( - :virtual_hearing, :initialized, + :virtual_hearing, updated_at: time_now - 3.hours, hearing: create(:hearing, hearing_day: hearing_day, regional_office: "RO13", scheduled_time: scheduled_time) ) end - before { Timecop.freeze(time_now) } + before do + Timecop.freeze(time_now) + stub_const("ENV", ENV.to_hash.merge("VIRTUAL_HEARING_PIN_KEY" => nil)) + end after { Timecop.return } it "includes the hearing in the report", :aggregate_failures do @@ -129,7 +134,7 @@ expect(report_lines).to include("Found 1 stuck virtual hearing: ") pending_line = report_lines[1] expect(pending_line).to include "VirtualHearing.find(#{virtual_hearing_no_emails.id})" - expect(pending_line).to include "last attempted: never" + expect(pending_line).to include "less than a minute ago" display_scheduled_for = virtual_hearing_no_emails.hearing.scheduled_for.strftime("%a %m/%d") expect(pending_line).to include "scheduled for: #{display_scheduled_for}" expect(pending_line).to include "updated by: #{virtual_hearing_no_emails.updated_by.css_id}" @@ -138,9 +143,11 @@ end context "there is an eligible legacy virtual hearing" do + before { stub_const("ENV", ENV.to_hash.merge("VIRTUAL_HEARING_PIN_KEY" => nil)) } + let!(:virtual_hearing_no_emails) do create( - :virtual_hearing, :initialized, + :virtual_hearing, updated_at: Time.zone.now - 3.hours, hearing: create(:legacy_hearing, hearing_day: hearing_day, regional_office: "RO13") ) @@ -153,54 +160,11 @@ expect(report_lines).to include("Found 1 stuck virtual hearing: ") pending_line = report_lines[1] expect(pending_line).to include "VirtualHearing.find(#{virtual_hearing_no_emails.id})" - expect(pending_line).to include "last attempted: never" + expect(pending_line).to include "less than a minute ago" display_scheduled_for = virtual_hearing_no_emails.hearing.scheduled_for.strftime("%a %m/%d") expect(pending_line).to include "scheduled for: #{display_scheduled_for}" expect(pending_line).to include "updated by: #{virtual_hearing_no_emails.updated_by.css_id}" expect(pending_line).to include "VACOLS ID: #{virtual_hearing_no_emails.hearing.vacols_id}" end end - - context "there are virtual hearings with pending conference and all emails haven't sent" do - let!(:virtual_hearing) do - create( - :virtual_hearing, :initialized, :all_emails_sent, - updated_at: Time.zone.now - 3.hours, - hearing: create(:hearing, regional_office: "RO13") - ) - end - - let!(:virtual_hearing_pending) do - create( - :virtual_hearing, :all_emails_sent, - updated_at: Time.zone.now - 3.hours, - hearing: create(:hearing, regional_office: "RO13") - ) - end - - let!(:virtual_hearing_no_emails) do - create( - :virtual_hearing, :initialized, - updated_at: Time.zone.now - 3.hours, - hearing: create(:hearing, hearing_day: hearing_day, regional_office: "RO13") - ) - end - - it "builds a report containing one where all emails haven't sent" do - virtual_hearing_pending.establishment.attempted! - virtual_hearing_no_emails.establishment.update!(attempted_at: 4.days.ago) - - subject.call - - report_lines = subject.report.split("\n") - expect(report_lines).to include("Found 1 stuck virtual hearing: ") - pending_line = report_lines[1] - expect(pending_line).to include "VirtualHearing.find(#{virtual_hearing_no_emails.id})" - expect(pending_line).to match(/last attempted\:( about | )4 days ago/) - display_scheduled_for = virtual_hearing_no_emails.hearing.scheduled_for.strftime("%a %m/%d") - expect(pending_line).to include "scheduled for: #{display_scheduled_for}" - expect(pending_line).to include "updated by: #{virtual_hearing_no_emails.updated_by.css_id}" - expect(pending_line).to include "UUID: #{virtual_hearing_no_emails.hearing.uuid}" - end - end end From d7e159849c5645dd55743aaf5d09e41370924204 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 9 Nov 2023 13:22:06 -0500 Subject: [PATCH 301/445] Adjust daily docket --- spec/feature/hearings/virtual_hearings/daily_docket_spec.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/spec/feature/hearings/virtual_hearings/daily_docket_spec.rb b/spec/feature/hearings/virtual_hearings/daily_docket_spec.rb index 63f0ba1a4c5..b8d5d4ce859 100644 --- a/spec/feature/hearings/virtual_hearings/daily_docket_spec.rb +++ b/spec/feature/hearings/virtual_hearings/daily_docket_spec.rb @@ -166,7 +166,6 @@ def check_email_events(hearing, current_user) visit "hearings/schedule/docket/" + hearing.hearing_day.id.to_s expect(page).to have_content(vlj_virtual_hearing_link) - expect(page).to have_xpath "//a[contains(@href,'role=host')]" end end context "VLJ view" do @@ -176,7 +175,6 @@ def check_email_events(hearing, current_user) visit "hearings/schedule/docket/" + hearing.hearing_day.id.to_s expect(page).to have_content(vlj_virtual_hearing_link) - expect(page).to have_xpath "//a[contains(@href,'role=host')]" end end end From 1fd7de84947bd79139331bb93afdde03246f66f5 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 9 Nov 2023 14:01:38 -0500 Subject: [PATCH 302/445] Fix async pending tests --- spec/feature/hearings/hearing_details_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/feature/hearings/hearing_details_spec.rb b/spec/feature/hearings/hearing_details_spec.rb index 73fd5049cec..bbb9935739d 100644 --- a/spec/feature/hearings/hearing_details_spec.rb +++ b/spec/feature/hearings/hearing_details_spec.rb @@ -454,7 +454,7 @@ def ensure_link_present(link, disable) context "Hearing type dropdown and vet and poa fields are disabled while async job is running" do let!(:virtual_hearing) do - create(:virtual_hearing, :all_emails_sent, :initialized, hearing: hearing) + create(:virtual_hearing, :all_emails_sent, hearing: hearing) end scenario "async job is not completed" do From d3ed695ae1456f95ca6638efaf7c1aa464b1df6e Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Thu, 9 Nov 2023 14:45:57 -0500 Subject: [PATCH 303/445] APPEALS-34673: added conditional based on hearing conference provider to display links --- .../components/details/HearingLinks.jsx | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/client/app/hearings/components/details/HearingLinks.jsx b/client/app/hearings/components/details/HearingLinks.jsx index da83fb96ad2..b684f936ab5 100644 --- a/client/app/hearings/components/details/HearingLinks.jsx +++ b/client/app/hearings/components/details/HearingLinks.jsx @@ -39,14 +39,18 @@ export const VirtualHearingLinkDetails = ({ hearing={hearing} /> )} -
    - Conference Room: - {`${aliasWithHost}`} -
    -
    - PIN: - {pin} -
    + {hearing.conferenceProvider === 'pexip' ? + (<>
    + Conference Room: + {`${aliasWithHost}`} +
    +
    + PIN: + {pin} +
    ) : (
    + {link} +
    ) + } {!hearing?.scheduledForIsPast && !wasVirtual && ( )} From 5136ed2ed79ad9e0adce8713d7dbba2032571e90 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 9 Nov 2023 14:46:28 -0500 Subject: [PATCH 304/445] Add update for links --- spec/feature/hearings/hearing_details_spec.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spec/feature/hearings/hearing_details_spec.rb b/spec/feature/hearings/hearing_details_spec.rb index bbb9935739d..dc37368f770 100644 --- a/spec/feature/hearings/hearing_details_spec.rb +++ b/spec/feature/hearings/hearing_details_spec.rb @@ -465,6 +465,11 @@ def ensure_link_present(link, disable) end scenario "async job is completed" do + virtual_hearing.update!( + host_hearing_link: "https://example.va.gov/sample/?conference", + guest_hearing_link: "https://example.va.gov/sample/?conference" + ) + # Mock the conference details virtual_hearing.alias_name = rand(1..9).to_s[0..6] virtual_hearing.guest_pin = rand(1..9).to_s[0..3].to_i From 6b3f75ac8d1308b33754659c0d8d700df9c14f10 Mon Sep 17 00:00:00 2001 From: breedbah Date: Thu, 9 Nov 2023 15:30:21 -0500 Subject: [PATCH 305/445] Update to guestLink rendering --- .../dailyDocket/DailyDocketGuestLinkSection.jsx | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx b/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx index 1383631d7c7..b7eda79feb4 100644 --- a/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx +++ b/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx @@ -24,7 +24,7 @@ const SpanStyled = ({ children }) => ( const ConferenceRoom = ({ type, alias }) => ( {type === 'PexipConferenceLink' ? GUEST_LINK_LABELS.PEXIP_GUEST_CONFERENCE_ROOM : @@ -109,12 +109,10 @@ export const DailyDocketGuestLinkSection = ({ linkInfo }) => { - {type === 'PexipConferenceLink' && ( - - {GUEST_LINK_LABELS.GUEST_PIN} - {linkGuestPin} - - )} + + {type === 'PexipConferenceLink' && GUEST_LINK_LABELS.GUEST_PIN} + {linkGuestPin} + From 51f30ab73b8678a2a0374e693f2ad74c24bbc9dc Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Thu, 9 Nov 2023 16:24:17 -0500 Subject: [PATCH 306/445] APPEALS-34673: update snapshot tests, add hearing links to test runs --- .../components/details/HearingLinks.jsx | 1 + .../CaseWorkerIndex.test.js.snap | 89 +++++++++---------- .../__snapshots__/HearingLinks.test.js.snap | 64 ++----------- .../VirtualHearingFields.test.js.snap | 28 +----- 4 files changed, 55 insertions(+), 127 deletions(-) diff --git a/client/app/hearings/components/details/HearingLinks.jsx b/client/app/hearings/components/details/HearingLinks.jsx index b684f936ab5..a8f1350838b 100644 --- a/client/app/hearings/components/details/HearingLinks.jsx +++ b/client/app/hearings/components/details/HearingLinks.jsx @@ -39,6 +39,7 @@ export const VirtualHearingLinkDetails = ({ hearing={hearing} /> )} + {/* depending on the user being pexip or webex shows the correct links */} {hearing.conferenceProvider === 'pexip' ? (<>
    Conference Room: diff --git a/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap b/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap index a467c6c7045..72a7022346d 100644 --- a/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap +++ b/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap @@ -14,58 +14,53 @@ exports[`CaseWorkerIndex renders correctly 1`] = ` class="cf-push-left" data-css-1vh8afw="" > - -

    - - - - - - - - - Caseflow - - + + + + + Caseflow + + + - - Dispatch - - -

    - + Dispatch + + +

    diff --git a/client/test/app/hearings/components/details/__snapshots__/HearingLinks.test.js.snap b/client/test/app/hearings/components/details/__snapshots__/HearingLinks.test.js.snap index 53d8ec1bddd..20ad6319279 100644 --- a/client/test/app/hearings/components/details/__snapshots__/HearingLinks.test.js.snap +++ b/client/test/app/hearings/components/details/__snapshots__/HearingLinks.test.js.snap @@ -188,21 +188,9 @@ exports[`HearingLinks Matches snapshot when hearing is virtual and in progress 1
    - - Conference Room: - - BVA#00000001@localhost -
    -
    - - PIN: - - 1234567890# -
    + />
    - - Conference Room: - - BVA#00000001@localhost -
    -
    - - PIN: - - 12345678# -
    + />
    - - Conference Room: - - BVA#00000001@localhost -
    -
    - - PIN: - - 1234567890# -
    + />
    @@ -915,21 +879,9 @@ exports[`HearingLinks Matches snapshot when hearing was virtual and occurred 1`] N/A
    - - Conference Room: - - BVA#00000001@localhost -
    -
    - - PIN: - - 12345678# -
    + />
    diff --git a/client/test/app/hearings/components/details/__snapshots__/VirtualHearingFields.test.js.snap b/client/test/app/hearings/components/details/__snapshots__/VirtualHearingFields.test.js.snap index 3876837cd91..be94450fb05 100644 --- a/client/test/app/hearings/components/details/__snapshots__/VirtualHearingFields.test.js.snap +++ b/client/test/app/hearings/components/details/__snapshots__/VirtualHearingFields.test.js.snap @@ -936,20 +936,10 @@ exports[`VirtualHearingFields Renders pexip conference when conference provider
    - - Conference Room: - - BVA0000009@care.evn.va.gov -
    -
    - - PIN: - - 2684353125# + https://care.evn.va.gov/bva-app/?join=1&media=&escalate=1&conference=BVA0000009@care.evn.va.gov&pin=2684353125#&role=guest
    - - Conference Room: - - BVA0000009@care.evn.va.gov -
    -
    - - PIN: - - 2684353125# + https://care.evn.va.gov/bva-app/?join=1&media=&escalate=1&conference=BVA0000009@care.evn.va.gov&pin=2684353125#&role=guest
    Date: Mon, 13 Nov 2023 11:58:09 -0500 Subject: [PATCH 307/445] APPEALS-34673: revert caseworkerindex snapshot and remove comment --- .../components/details/HearingLinks.jsx | 1 - .../CaseWorkerIndex.test.js.snap | 91 ++++++++++--------- 2 files changed, 48 insertions(+), 44 deletions(-) diff --git a/client/app/hearings/components/details/HearingLinks.jsx b/client/app/hearings/components/details/HearingLinks.jsx index a8f1350838b..b684f936ab5 100644 --- a/client/app/hearings/components/details/HearingLinks.jsx +++ b/client/app/hearings/components/details/HearingLinks.jsx @@ -39,7 +39,6 @@ export const VirtualHearingLinkDetails = ({ hearing={hearing} /> )} - {/* depending on the user being pexip or webex shows the correct links */} {hearing.conferenceProvider === 'pexip' ? (<>
    Conference Room: diff --git a/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap b/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap index 72a7022346d..7954cf2e2fc 100644 --- a/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap +++ b/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap @@ -14,53 +14,58 @@ exports[`CaseWorkerIndex renders correctly 1`] = ` class="cf-push-left" data-css-1vh8afw="" > -

    - - - - - - - - - Caseflow - - - + + + + + + Caseflow + + - Dispatch - - -

    + + Dispatch + + +

    +
    @@ -90,7 +95,7 @@ exports[`CaseWorkerIndex renders correctly 1`] = `
    - +
    From 93f256ce7679c6d7d25f015c2157cd7de6fca3a9 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Mon, 13 Nov 2023 12:12:18 -0500 Subject: [PATCH 308/445] APPEALS-34673: update snapshot - passes locally --- .../CaseWorkerIndex.test.js.snap | 91 +++++++++---------- 1 file changed, 43 insertions(+), 48 deletions(-) diff --git a/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap b/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap index 7954cf2e2fc..72a7022346d 100644 --- a/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap +++ b/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap @@ -14,58 +14,53 @@ exports[`CaseWorkerIndex renders correctly 1`] = ` class="cf-push-left" data-css-1vh8afw="" > - -

    - - - - - - - - - Caseflow - - + + + + + Caseflow + + + - - Dispatch - - -

    - + Dispatch + + +

    @@ -95,7 +90,7 @@ exports[`CaseWorkerIndex renders correctly 1`] = `
    - +
    From 58759df84913b1bc92c809a5de1362c120a7dc99 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Mon, 13 Nov 2023 13:47:29 -0500 Subject: [PATCH 309/445] APPEALS-34673: updates to snapshot --- .../CaseWorkerIndex.test.js.snap | 91 ++++++++++--------- 1 file changed, 48 insertions(+), 43 deletions(-) diff --git a/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap b/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap index 72a7022346d..7954cf2e2fc 100644 --- a/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap +++ b/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap @@ -14,53 +14,58 @@ exports[`CaseWorkerIndex renders correctly 1`] = ` class="cf-push-left" data-css-1vh8afw="" > -

    - - - - - - - - - Caseflow - - - + + + + + + Caseflow + + - Dispatch - - -

    + + Dispatch + + +

    +
    @@ -90,7 +95,7 @@ exports[`CaseWorkerIndex renders correctly 1`] = `
    - +
    From 69c8918501c214a9cfd47b645fcabe70e267ee4a Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Mon, 13 Nov 2023 13:58:32 -0500 Subject: [PATCH 310/445] APPEALS-34673: updates to snapshot --- .../CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap | 1 - 1 file changed, 1 deletion(-) diff --git a/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap b/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap index 7954cf2e2fc..2c2de1d1813 100644 --- a/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap +++ b/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap @@ -95,7 +95,6 @@ exports[`CaseWorkerIndex renders correctly 1`] = `
    -
    From 3029e4f567acb4744ef6c8766d2d077eee38f41b Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Mon, 13 Nov 2023 14:27:27 -0500 Subject: [PATCH 311/445] APPEALS-34673: updates to snapshot --- .../CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap | 1 + 1 file changed, 1 insertion(+) diff --git a/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap b/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap index 2c2de1d1813..a467c6c7045 100644 --- a/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap +++ b/client/test/app/containers/CaseWorker/__snapshots__/CaseWorkerIndex.test.js.snap @@ -95,6 +95,7 @@ exports[`CaseWorkerIndex renders correctly 1`] = `
    +

    From 0916f7f2c785170a07da699eb8f23331648afc8a Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Tue, 14 Nov 2023 13:38:54 -0500 Subject: [PATCH 312/445] APPEALS-34880: added nbf and exp methods to hearing day and virtual hearing --- app/models/hearing_day.rb | 8 ++++++++ app/models/hearings/virtual_hearing.rb | 8 ++++++++ app/services/external_api/webex_service.rb | 4 ++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/app/models/hearing_day.rb b/app/models/hearing_day.rb index 4de206bdfe4..862eded87dd 100644 --- a/app/models/hearing_day.rb +++ b/app/models/hearing_day.rb @@ -230,6 +230,14 @@ def subject_for_conference "Guest Link for #{scheduled_for.strftime('%b %e, %Y')}" end + def nbf + scheduled_for.beginning_of_day.to_i + end + + def exp + scheduled_for.end_of_day.to_i + end + private # called through the 'before_destroy' callback on the hearing_day object. diff --git a/app/models/hearings/virtual_hearing.rb b/app/models/hearings/virtual_hearing.rb index 2c299fbc3d6..27bc4dc0ed6 100644 --- a/app/models/hearings/virtual_hearing.rb +++ b/app/models/hearings/virtual_hearing.rb @@ -286,6 +286,14 @@ def subject_for_conference "#{appeal.docket_number}_#{appeal.id}_#{appeal.class}" end + def nbf + hearing.scheduled_for.beginning_of_day.to_i + end + + def exp + hearing.scheduled_for.end_of_day.to_i + end + private def assign_created_by_user diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb index 46a19e19f17..0fa666247d6 100644 --- a/app/services/external_api/webex_service.rb +++ b/app/services/external_api/webex_service.rb @@ -16,8 +16,8 @@ def create_conference(virtual_hearing) body = { "jwt": { "sub": virtual_hearing.subject_for_conference, - "Nbf": virtual_hearing.hearing.scheduled_for.beginning_of_day.to_i, - "Exp": virtual_hearing.hearing.scheduled_for.end_of_day.to_i + "Nbf": virtual_hearing.nbf, + "Exp": virtual_hearing.exp }, "aud": @aud, "numGuest": 1, From 3c43f3d403ab2249b147cb8b802c6ab8590c1630 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Tue, 14 Nov 2023 14:43:23 -0500 Subject: [PATCH 313/445] APPEALS-34880: added nbf exp rspec to virtual hearing spec --- app/models/hearing_day.rb | 1 + app/models/hearings/virtual_hearing.rb | 1 + spec/models/hearings/virtual_hearing_spec.rb | 21 +++++++++++++++++++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/app/models/hearing_day.rb b/app/models/hearing_day.rb index 862eded87dd..dbbbd3c9ff2 100644 --- a/app/models/hearing_day.rb +++ b/app/models/hearing_day.rb @@ -230,6 +230,7 @@ def subject_for_conference "Guest Link for #{scheduled_for.strftime('%b %e, %Y')}" end + # adding comment so gha can run def nbf scheduled_for.beginning_of_day.to_i end diff --git a/app/models/hearings/virtual_hearing.rb b/app/models/hearings/virtual_hearing.rb index 27bc4dc0ed6..714f010fe01 100644 --- a/app/models/hearings/virtual_hearing.rb +++ b/app/models/hearings/virtual_hearing.rb @@ -286,6 +286,7 @@ def subject_for_conference "#{appeal.docket_number}_#{appeal.id}_#{appeal.class}" end + # adding comment so gha can run def nbf hearing.scheduled_for.beginning_of_day.to_i end diff --git a/spec/models/hearings/virtual_hearing_spec.rb b/spec/models/hearings/virtual_hearing_spec.rb index 1dc922b0c0c..068268d58e2 100644 --- a/spec/models/hearings/virtual_hearing_spec.rb +++ b/spec/models/hearings/virtual_hearing_spec.rb @@ -442,10 +442,11 @@ def link(name) end let(:virtual_hearing) { create(:virtual_hearing, hearing: hearing) } - subject { virtual_hearing.subject_for_conference } + context "For an AMA Hearing" do let(:hearing) { create(:hearing, hearing_day: hearing_day) } + subject { virtual_hearing.subject_for_conference } it "returns the expected meeting conference details" do is_expected.to eq( @@ -456,6 +457,7 @@ def link(name) context "For a Legacy Hearing" do let(:hearing) { create(:legacy_hearing, hearing_day: hearing_day) } + subject { virtual_hearing.subject_for_conference } it "returns the expected meeting conference details" do is_expected.to eq( @@ -463,5 +465,22 @@ def link(name) ) end end + + context "nbf and exp" do + let(:hearing) { create(:hearing, hearing_day: hearing_day) } + subject { virtual_hearing.nbf } + + it "returns correct nbf" do + expect subject == 1695355200 + end + + before do + subject { virtual_hearing.exp } + end + + it "returns correct exp" do + expect subject == 1695427199 + end + end end end From 081d7959bb51b1009006f33f7d0c1c599aa11967 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Tue, 14 Nov 2023 14:57:13 -0500 Subject: [PATCH 314/445] APPEALS-34880: added hearing day spec test for nbf and exp and removed comments --- spec/models/hearing_day_spec.rb | 16 ++++++++++++++++ spec/models/hearings/virtual_hearing_spec.rb | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/spec/models/hearing_day_spec.rb b/spec/models/hearing_day_spec.rb index 783ca5668c8..2b849b8ed58 100644 --- a/spec/models/hearing_day_spec.rb +++ b/spec/models/hearing_day_spec.rb @@ -609,6 +609,22 @@ def format_begins_at_from_db(time_string, scheduled_for) it "returns the expected meeting conference details" do is_expected.to eq("Guest Link for #{expected_date}") end + + context "nbf and exp" do + subject { hearing_day.nbf } + + it "returns correct nbf" do + expect subject == 1_695_254_400 + end + + before do + subject { hearing_day.exp } + end + + it "returns correct exp" do + expect subject == 1_695_340_799 + end + end end context "hearing day in the future, conference link doesnt exist" do diff --git a/spec/models/hearings/virtual_hearing_spec.rb b/spec/models/hearings/virtual_hearing_spec.rb index 068268d58e2..36bd1cbb411 100644 --- a/spec/models/hearings/virtual_hearing_spec.rb +++ b/spec/models/hearings/virtual_hearing_spec.rb @@ -471,7 +471,7 @@ def link(name) subject { virtual_hearing.nbf } it "returns correct nbf" do - expect subject == 1695355200 + expect subject == 1_695_355_200 end before do @@ -479,7 +479,7 @@ def link(name) end it "returns correct exp" do - expect subject == 1695427199 + expect subject == 1_695_427_199 end end end From 7b02a90874eb69e82c7bfcd93d166920097d251b Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Tue, 14 Nov 2023 14:57:55 -0500 Subject: [PATCH 315/445] APPEALS-34880: removed comments --- app/models/hearing_day.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/models/hearing_day.rb b/app/models/hearing_day.rb index dbbbd3c9ff2..862eded87dd 100644 --- a/app/models/hearing_day.rb +++ b/app/models/hearing_day.rb @@ -230,7 +230,6 @@ def subject_for_conference "Guest Link for #{scheduled_for.strftime('%b %e, %Y')}" end - # adding comment so gha can run def nbf scheduled_for.beginning_of_day.to_i end From 0342f075fbd7ed7fca994a2f397b06ea424cf1eb Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Tue, 14 Nov 2023 14:58:10 -0500 Subject: [PATCH 316/445] APPEALS-34880: removed comments --- app/models/hearings/virtual_hearing.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/models/hearings/virtual_hearing.rb b/app/models/hearings/virtual_hearing.rb index 714f010fe01..27bc4dc0ed6 100644 --- a/app/models/hearings/virtual_hearing.rb +++ b/app/models/hearings/virtual_hearing.rb @@ -286,7 +286,6 @@ def subject_for_conference "#{appeal.docket_number}_#{appeal.id}_#{appeal.class}" end - # adding comment so gha can run def nbf hearing.scheduled_for.beginning_of_day.to_i end From 3cc403789523ed0d613b28ff8cd641ea8b75cec5 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Tue, 14 Nov 2023 16:08:15 -0500 Subject: [PATCH 317/445] APPEALS-34880: removed spacing in rspec --- spec/models/hearings/virtual_hearing_spec.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/spec/models/hearings/virtual_hearing_spec.rb b/spec/models/hearings/virtual_hearing_spec.rb index 36bd1cbb411..37f9b164cbc 100644 --- a/spec/models/hearings/virtual_hearing_spec.rb +++ b/spec/models/hearings/virtual_hearing_spec.rb @@ -442,8 +442,6 @@ def link(name) end let(:virtual_hearing) { create(:virtual_hearing, hearing: hearing) } - - context "For an AMA Hearing" do let(:hearing) { create(:hearing, hearing_day: hearing_day) } subject { virtual_hearing.subject_for_conference } From 0f53e18cfbf5b1d3a28e118df7949cb52f4ab840 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Wed, 15 Nov 2023 11:17:27 -0500 Subject: [PATCH 318/445] APPEALS-34908: added one liners --- app/services/external_api/webex_service.rb | 3 ++- app/services/external_api/webex_service/create_response.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb index 0fa666247d6..922d9518237 100644 --- a/app/services/external_api/webex_service.rb +++ b/app/services/external_api/webex_service.rb @@ -41,7 +41,8 @@ def delete_conference(virtual_hearing) "aud": @aud, "numGuest": 1, "numHost": 1, - "provideShortUrls": true + "provideShortUrls": true, + "verticalType": "gen" } resp = send_webex_request(body: body) return if resp.nil? diff --git a/app/services/external_api/webex_service/create_response.rb b/app/services/external_api/webex_service/create_response.rb index 559dd67d29a..7e674754c00 100644 --- a/app/services/external_api/webex_service/create_response.rb +++ b/app/services/external_api/webex_service/create_response.rb @@ -2,7 +2,7 @@ class ExternalApi::WebexService::CreateResponse < ExternalApi::WebexService::Response def data - resp.raw_body + JSON.parse(resp.raw_body) end def base_url From a191fbffb13b09db5dde146872e2c605b49e2bba Mon Sep 17 00:00:00 2001 From: breedbah Date: Wed, 15 Nov 2023 11:44:35 -0500 Subject: [PATCH 319/445] APPEALS-34908 update resp --- app/services/external_api/webex_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb index 922d9518237..8d39f66ca03 100644 --- a/app/services/external_api/webex_service.rb +++ b/app/services/external_api/webex_service.rb @@ -44,7 +44,7 @@ def delete_conference(virtual_hearing) "provideShortUrls": true, "verticalType": "gen" } - resp = send_webex_request(body: body) + resp = send_webex_request(body) return if resp.nil? ExternalApi::WebexService::DeleteResponse.new(resp) From ffd161a9d3968273e441f32cbb8ecf742cfcea44 Mon Sep 17 00:00:00 2001 From: breedbah Date: Wed, 15 Nov 2023 11:47:27 -0500 Subject: [PATCH 320/445] APPEALS-34908 update json parse --- app/services/external_api/webex_service/response.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/external_api/webex_service/response.rb b/app/services/external_api/webex_service/response.rb index eaf14790e50..1179bb514ed 100644 --- a/app/services/external_api/webex_service/response.rb +++ b/app/services/external_api/webex_service/response.rb @@ -41,6 +41,6 @@ def check_for_errors def error_message return "No error message from Webex" if resp.raw_body.empty? - resp.raw_body.with_indifferent_access["message"] + JSON.parse(resp.raw_body).with_indifferent_access["message"] end end From 9a875bcc57aa0659f600ee0bc5bcdd8726f3bbd1 Mon Sep 17 00:00:00 2001 From: breedbah Date: Wed, 15 Nov 2023 11:50:25 -0500 Subject: [PATCH 321/445] APPEALS-34908 update send_webex method nil --- app/services/external_api/webex_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb index 8d39f66ca03..86687cab660 100644 --- a/app/services/external_api/webex_service.rb +++ b/app/services/external_api/webex_service.rb @@ -53,7 +53,7 @@ def delete_conference(virtual_hearing) private # :nocov: - def send_webex_request(body: nil) + def send_webex_request(body = nil) url = "https://#{@host}#{@domain}#{@api_endpoint}" request = HTTPI::Request.new(url) request.open_timeout = 300 From b593cc90c3d8fc63c2149b9988cc3e9a93ffcd5f Mon Sep 17 00:00:00 2001 From: breedbah Date: Wed, 15 Nov 2023 11:59:15 -0500 Subject: [PATCH 322/445] APPEALS-34908 update webex_conference_link to string --- app/models/hearings/webex_conference_link.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/hearings/webex_conference_link.rb b/app/models/hearings/webex_conference_link.rb index dfa74933f34..6bde528fa01 100644 --- a/app/models/hearings/webex_conference_link.rb +++ b/app/models/hearings/webex_conference_link.rb @@ -23,11 +23,11 @@ def generate_conference_information api_endpoint: ENV["WEBEX_API_IC"] ).create_conference(hearing_day) - base_url = conference.data[:baseUrl] + base_url = conference.data["baseUrl"] update!( - host_link: "#{base_url}#{conference.data[:host].first[:short]}", - guest_hearing_link: "#{base_url}#{conference.data[:guest].first[:short]}" + host_link: "#{base_url}#{conference.data['host'].first['short']}", + guest_hearing_link: "#{base_url}#{conference.data['guest'].first['short']}" ) end end From 9df614aeec2678b84a15cbc85e88d02dffd760f7 Mon Sep 17 00:00:00 2001 From: breedbah Date: Wed, 15 Nov 2023 12:03:00 -0500 Subject: [PATCH 323/445] APPEALS-34908 update create_response.rb sym to string --- app/services/external_api/webex_service/create_response.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/services/external_api/webex_service/create_response.rb b/app/services/external_api/webex_service/create_response.rb index 7e674754c00..941571006af 100644 --- a/app/services/external_api/webex_service/create_response.rb +++ b/app/services/external_api/webex_service/create_response.rb @@ -6,14 +6,14 @@ def data end def base_url - data[:baseUrl] + data["baseUrl"] end def host_link - "#{base_url}#{data.dig(:host, 0, :short)}" + "#{base_url}#{data.dig('host', 0, 'short')}" end def guest_link - "#{base_url}#{data.dig(:guest, 0, :short)}" + "#{base_url}#{data.dig('guest', 0, 'short')}" end end From 38b0e1b5d5ad0d57d58d6f8e303f350ed5bf8518 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Wed, 15 Nov 2023 12:14:47 -0500 Subject: [PATCH 324/445] DRY up generate_conference_information --- app/models/hearings/webex_conference_link.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/models/hearings/webex_conference_link.rb b/app/models/hearings/webex_conference_link.rb index 6bde528fa01..49ea9feaa3e 100644 --- a/app/models/hearings/webex_conference_link.rb +++ b/app/models/hearings/webex_conference_link.rb @@ -14,7 +14,7 @@ def guest_link def generate_conference_information meeting_type.update!(service_name: "webex") - conference = WebexService.new( + conference_response = WebexService.new( host: ENV["WEBEX_HOST_IC"], port: ENV["WEBEX_PORT"], aud: ENV["WEBEX_ORGANIZATION"], @@ -23,11 +23,9 @@ def generate_conference_information api_endpoint: ENV["WEBEX_API_IC"] ).create_conference(hearing_day) - base_url = conference.data["baseUrl"] - update!( - host_link: "#{base_url}#{conference.data['host'].first['short']}", - guest_hearing_link: "#{base_url}#{conference.data['guest'].first['short']}" + host_link: conference_response.host_link, + guest_hearing_link: conference_response.guest_link ) end end From 9700c1281971da5cc3f95d4a979d2cb038782975 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Wed, 15 Nov 2023 12:28:12 -0500 Subject: [PATCH 325/445] APPEALS-34908: service and fakes updates --- app/services/external_api/webex_service.rb | 2 +- lib/fakes/webex_service.rb | 19 +------------------ 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb index 86687cab660..f82900a60cb 100644 --- a/app/services/external_api/webex_service.rb +++ b/app/services/external_api/webex_service.rb @@ -60,7 +60,7 @@ def send_webex_request(body = nil) request.read_timeout = 300 request.body = body.to_json unless body.nil? - request.headers["Authorization"] = "Bearer #{@apikey}" + request.headers = { "Authorization": "Bearer #{@apikey}", "Content-Type": "application/json" } MetricsService.record( "#{@host} POST request to #{url}", diff --git a/lib/fakes/webex_service.rb b/lib/fakes/webex_service.rb index d2b6a56313d..2e14257e3fe 100644 --- a/lib/fakes/webex_service.rb +++ b/lib/fakes/webex_service.rb @@ -1,19 +1,6 @@ # frozen_string_literal: true class Fakes::WebexService - SAMPLE_CIPHER = "eyJwMnMiOiJvUlZHZENlck9OanYxWjhLeHRub3p4NklPUUNzTVdEdWFMakRXR09kLTh4Tk91OUVyWDQ1aUZ6TG5FY" \ - "nlJeTZTam40Vk1kVEZHU1pyaE5pRiIsInAyYyI6MzIzMzAsImF1ZCI6ImE0ZDg4NmIwLTk3OWYtNGUyYy1hOTU4LT" \ - "NlOGMxNDYwNWU1MSIsImlzcyI6IjU0OWRhYWNiLWJmZWUtNDkxOS1hNGU0LWMwOTQ0YTY0ZGUyNSIsImN0eSI6Ikp" \ - "XVCIsImVuYyI6IkEyNTZHQ00iLCJhbGciOiJQQkVTMi1IUzUxMitBMjU2S1cifQ.cm6FWc6Bl4vB_utAc_bswG82m" \ - "UXhxkITkI0tZDGzzh5TKdoWSS1Mjw.L8mGls6Kp3lsa8Wz.fLen-yV2sTpWlkLFCszQjcG5V9FhJVwoNB9Ky9BgCp" \ - "T46cFWUe-wmyn1yIZcGxFcDcwhhKwW3PVuQQ1xjl-z63o67esrvaWAjgglSioKiOFTJF1M94d4gVj2foSQtYKzR8S" \ - "nI6wW5X5KShcVjxjchT7xDNxnHtIZoG-Zda_aOOfz_WK18rhNcyvb-BY7cSwTMhbnuuXO0-cuJ7wNyDbvqEfWXALf" \ - "j87a2_WopcwK-x-8TQ20bzZKUrugt0FRj6VKxOCzxDhozmWDFMRu8Dpj2UrS7Fo-JQf_I1oN0O-Dwf5r8ItcNQEu5" \ - "X0tcRazhrHSNWfOL2DOaDyHawi4oxc7MqaNRxxyrpy2qYw06_TzBwRKlMFZ8fT7-GJbDlE3nqWlNw3mlRuvhu80CH" \ - "SO5RK5a1obU4sfLX0Fsxl-csC-1QjcHuKOSP_ozb6l7om-WeOdbSV99Fjy68egjH1NhMQIcVwpG0fy2j8r3sN4nz0" \ - "RSe3LXoK78JqRxk6XuaQCDkr6TmG5YjHQ2FFw1tP1ekHpNIL2oJNVAKKPgget7LRuSiM6jg.628e3hFPmZCoqXuyY" \ - "2OriQ" - def initialize(**args) @status_code = args[:status_code] || 200 @error_message = args[:error_message] || "Error" @@ -56,11 +43,7 @@ def delete_conference(virtual_hearing) private def build_meeting_response - { - host: link_info(@num_hosts), - guest: link_info(@num_guests), - baseUrl: "https://instant-usgov.webex.com/visit/" - } + "{\"host\":[{\"cipher\":\"abc123\",\"short\":\"hjASGlI\"}],\"guest\":[{\"cipher\":\"123abc\",\"short\":\"pi9P6TL\"}],\"baseUrl\":\https://instant-usgov.webex.com/visit/\}\"" end def link_info(num_links = 1) From f9c87a8e93f359540dc89a14bce3e9106a1c80a4 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Wed, 15 Nov 2023 13:05:17 -0500 Subject: [PATCH 326/445] APPEALS-34908: update request body --- app/services/external_api/webex_service.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb index f82900a60cb..695025ed4d6 100644 --- a/app/services/external_api/webex_service.rb +++ b/app/services/external_api/webex_service.rb @@ -22,7 +22,8 @@ def create_conference(virtual_hearing) "aud": @aud, "numGuest": 1, "numHost": 1, - "provideShortUrls": true + "provideShortUrls": true, + "verticalType": "gen" } resp = send_webex_request(body: body) From 58f0a8999cb490e1971ebc838ea5232f66071ea4 Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Wed, 15 Nov 2023 13:22:30 -0500 Subject: [PATCH 327/445] Change param passing --- app/services/external_api/webex_service.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb index 695025ed4d6..eef6e4287bd 100644 --- a/app/services/external_api/webex_service.rb +++ b/app/services/external_api/webex_service.rb @@ -20,13 +20,12 @@ def create_conference(virtual_hearing) "Exp": virtual_hearing.exp }, "aud": @aud, - "numGuest": 1, "numHost": 1, "provideShortUrls": true, "verticalType": "gen" } - resp = send_webex_request(body: body) + resp = send_webex_request(body) return if resp.nil? ExternalApi::WebexService::CreateResponse.new(resp) @@ -40,7 +39,6 @@ def delete_conference(virtual_hearing) "Exp": 0 }, "aud": @aud, - "numGuest": 1, "numHost": 1, "provideShortUrls": true, "verticalType": "gen" From c2b75bcddeb47386c314e48aabe7b7cc8b67c9d7 Mon Sep 17 00:00:00 2001 From: breedbah Date: Wed, 15 Nov 2023 13:53:38 -0500 Subject: [PATCH 328/445] APPEALS-34908 rspec test fix --- lib/fakes/webex_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fakes/webex_service.rb b/lib/fakes/webex_service.rb index 2e14257e3fe..b60718bcf64 100644 --- a/lib/fakes/webex_service.rb +++ b/lib/fakes/webex_service.rb @@ -43,7 +43,7 @@ def delete_conference(virtual_hearing) private def build_meeting_response - "{\"host\":[{\"cipher\":\"abc123\",\"short\":\"hjASGlI\"}],\"guest\":[{\"cipher\":\"123abc\",\"short\":\"pi9P6TL\"}],\"baseUrl\":\https://instant-usgov.webex.com/visit/\}\"" + "{\"host\":[{\"cipher\":\"abc123\",\"short\":\"hjASGlI\"}],\"guest\":[{\"cipher\":\"123abc\",\"short\":\"pi9P6TL\"}],\"baseUrl\":\"https://instant-usgov.webex.com/visit/\"}" end def link_info(num_links = 1) From 5bbb3c8b7fa7fb2bd53f00aa54a9770160821e4f Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Wed, 15 Nov 2023 14:06:50 -0500 Subject: [PATCH 329/445] APPEALS-34908: updated webex service spec --- .../external_api/webex_service_spec.rb | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/spec/services/external_api/webex_service_spec.rb b/spec/services/external_api/webex_service_spec.rb index 85c639fe0d0..bfb2dd0b327 100644 --- a/spec/services/external_api/webex_service_spec.rb +++ b/spec/services/external_api/webex_service_spec.rb @@ -41,21 +41,21 @@ "Exp": virtual_hearing.hearing.scheduled_for.end_of_day.to_i }, "aud": aud, - "numGuest": 1, "numHost": 1, - "provideShortUrls": true + "provideShortUrls": true, + "verticalType": "gen" } end subject { webex_service.create_conference(virtual_hearing) } it "calls send_webex_request and passes the correct body" do - expect(webex_service).to receive(:send_webex_request).with(body: body) + expect(webex_service).to receive(:send_webex_request).with(body) subject end it "returns a successful instance of CreateResponse class" do - allow(webex_service).to receive(:send_webex_request).with(body: body).and_return(success_create_resp) + allow(webex_service).to receive(:send_webex_request).with(body).and_return(success_create_resp) expect(subject).to be_instance_of(ExternalApi::WebexService::CreateResponse) expect(subject.code).to eq(200) @@ -63,7 +63,7 @@ end it "returns error response" do - allow(webex_service).to receive(:send_webex_request).with(body: body).and_return(error_create_resp) + allow(webex_service).to receive(:send_webex_request).with(body).and_return(error_create_resp) expect(subject.code).to eq(400) expect(subject.success?).to eq(false) @@ -77,7 +77,7 @@ it "creates a conference" do expect(subject.code).to eq(200) - expect(subject.resp.body[:baseUrl]).to eq("https://instant-usgov.webex.com/visit/") + expect(JSON.parse(subject.resp.body)["baseUrl"]).to eq("https://instant-usgov.webex.com/visit/") subject end end @@ -92,20 +92,20 @@ "Exp": 0 }, "aud": aud, - "numGuest": 1, "numHost": 1, - "provideShortUrls": true + "provideShortUrls": true, + "verticalType": "gen" } end subject { webex_service.delete_conference(virtual_hearing) } it "calls send_webex_request and passes correct body" do - expect(webex_service).to receive(:send_webex_request).with(body: body) + expect(webex_service).to receive(:send_webex_request).with(body) subject end it "returns a successful instance of CreateResponse class" do - allow(webex_service).to receive(:send_webex_request).with(body: body).and_return(success_create_resp) + allow(webex_service).to receive(:send_webex_request).with(body).and_return(success_create_resp) expect(subject).to be_instance_of(ExternalApi::WebexService::DeleteResponse) expect(subject.code).to eq(200) @@ -113,7 +113,7 @@ end it "returns error response" do - allow(webex_service).to receive(:send_webex_request).with(body: body).and_return(error_create_resp) + allow(webex_service).to receive(:send_webex_request).with(body).and_return(error_create_resp) expect(subject.code).to eq(400) expect(subject.success?).to eq(false) @@ -127,7 +127,7 @@ it "deletes a conference" do expect(subject.code).to eq(200) - expect(subject.resp.body[:baseUrl]).to eq("https://instant-usgov.webex.com/visit/") + expect(JSON.parse(subject.resp.body)["baseUrl"]).to eq("https://instant-usgov.webex.com/visit/") subject end end From fe1038e807cd4e20490af8eba0489805cc93f10a Mon Sep 17 00:00:00 2001 From: msteele Date: Wed, 15 Nov 2023 14:13:09 -0500 Subject: [PATCH 330/445] APPEALS-34908 converted hash to json in fake --- lib/fakes/webex_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fakes/webex_service.rb b/lib/fakes/webex_service.rb index b60718bcf64..b597f264e4a 100644 --- a/lib/fakes/webex_service.rb +++ b/lib/fakes/webex_service.rb @@ -69,6 +69,6 @@ def error_response description: @error_message ], trackingId: "ROUTER_#{SecureRandom.uuid}" - } + }.to_json end end From 9932abaaf7f7d6b04c597fa10437ddac849551cc Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Thu, 16 Nov 2023 13:41:56 -0500 Subject: [PATCH 331/445] Change some names --- app/services/external_api/webex_service.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb index eef6e4287bd..c31b37eaaa8 100644 --- a/app/services/external_api/webex_service.rb +++ b/app/services/external_api/webex_service.rb @@ -12,12 +12,12 @@ def initialize(host:, port:, aud:, apikey:, domain:, api_endpoint:) @api_endpoint = api_endpoint end - def create_conference(virtual_hearing) + def create_conference(conferenced_item) body = { "jwt": { - "sub": virtual_hearing.subject_for_conference, - "Nbf": virtual_hearing.nbf, - "Exp": virtual_hearing.exp + "sub": conferenced_item.subject_for_conference, + "Nbf": conferenced_item.nbf, + "Exp": conferenced_item.exp }, "aud": @aud, "numHost": 1, @@ -31,10 +31,10 @@ def create_conference(virtual_hearing) ExternalApi::WebexService::CreateResponse.new(resp) end - def delete_conference(virtual_hearing) + def delete_conference(conferenced_item) body = { "jwt": { - "sub": virtual_hearing.subject_for_conference, + "sub": conferenced_item.subject_for_conference, "Nbf": 0, "Exp": 0 }, From d8379ec22313f1d7cda5bfc4d7cfd013fb1b4b5c Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Mon, 20 Nov 2023 10:28:46 -0500 Subject: [PATCH 332/445] APPEALS-35033: change casing for Nbf Exp to nbf exp --- app/services/external_api/webex_service.rb | 8 ++++---- spec/services/external_api/webex_service_spec.rb | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb index 0fa666247d6..a672ebcee5d 100644 --- a/app/services/external_api/webex_service.rb +++ b/app/services/external_api/webex_service.rb @@ -16,8 +16,8 @@ def create_conference(virtual_hearing) body = { "jwt": { "sub": virtual_hearing.subject_for_conference, - "Nbf": virtual_hearing.nbf, - "Exp": virtual_hearing.exp + "nbf": virtual_hearing.nbf, + "exp": virtual_hearing.exp }, "aud": @aud, "numGuest": 1, @@ -35,8 +35,8 @@ def delete_conference(virtual_hearing) body = { "jwt": { "sub": virtual_hearing.subject_for_conference, - "Nbf": 0, - "Exp": 0 + "nbf": 0, + "exp": 0 }, "aud": @aud, "numGuest": 1, diff --git a/spec/services/external_api/webex_service_spec.rb b/spec/services/external_api/webex_service_spec.rb index 85c639fe0d0..16fb101c723 100644 --- a/spec/services/external_api/webex_service_spec.rb +++ b/spec/services/external_api/webex_service_spec.rb @@ -37,8 +37,8 @@ { "jwt": { "sub": virtual_hearing.subject_for_conference, - "Nbf": virtual_hearing.hearing.scheduled_for.beginning_of_day.to_i, - "Exp": virtual_hearing.hearing.scheduled_for.end_of_day.to_i + "nbf": virtual_hearing.hearing.scheduled_for.beginning_of_day.to_i, + "exp": virtual_hearing.hearing.scheduled_for.end_of_day.to_i }, "aud": aud, "numGuest": 1, @@ -88,8 +88,8 @@ { "jwt": { "sub": virtual_hearing.subject_for_conference, - "Nbf": 0, - "Exp": 0 + "nbf": 0, + "exp": 0 }, "aud": aud, "numGuest": 1, From 62ea35b687c9b539357d671b699c9bc42fe234cd Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Mon, 20 Nov 2023 13:50:02 -0500 Subject: [PATCH 333/445] Correct spec file name --- .../hearings/{conference_link.rb => conference_link_spec.rb} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename spec/models/hearings/{conference_link.rb => conference_link_spec.rb} (100%) diff --git a/spec/models/hearings/conference_link.rb b/spec/models/hearings/conference_link_spec.rb similarity index 100% rename from spec/models/hearings/conference_link.rb rename to spec/models/hearings/conference_link_spec.rb From 452c5abe25315f69cdadb3f7adef6a77a15eaacf Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Mon, 20 Nov 2023 13:52:39 -0500 Subject: [PATCH 334/445] Remove .gitignore diff --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index b655037991d..18884fd4e16 100644 --- a/.gitignore +++ b/.gitignore @@ -26,7 +26,6 @@ client/junit.xml !/reports/sql_queries !/reports/.keep credstash.log -client/mocks/webex-mocks/webex-mock.json # Ignore MS Office temp files ~$* From 02675601d1f23469240dd96ad1aa5e0520160ccb Mon Sep 17 00:00:00 2001 From: Matthew Thornton Date: Mon, 20 Nov 2023 14:03:45 -0500 Subject: [PATCH 335/445] Use .to_json --- app/services/external_api/webex_service.rb | 8 ++++---- lib/fakes/webex_service.rb | 19 ++++++++++++++++++- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb index 9cc7054b2c9..0819780b937 100644 --- a/app/services/external_api/webex_service.rb +++ b/app/services/external_api/webex_service.rb @@ -15,9 +15,9 @@ def initialize(host:, port:, aud:, apikey:, domain:, api_endpoint:) def create_conference(conferenced_item) body = { "jwt": { - "sub": virtual_hearing.subject_for_conference, - "nbf": virtual_hearing.nbf, - "exp": virtual_hearing.exp + "sub": conferenced_item.subject_for_conference, + "nbf": conferenced_item.nbf, + "exp": conferenced_item.exp }, "aud": @aud, "numHost": 1, @@ -34,7 +34,7 @@ def create_conference(conferenced_item) def delete_conference(conferenced_item) body = { "jwt": { - "sub": virtual_hearing.subject_for_conference, + "sub": conferenced_item.subject_for_conference, "nbf": 0, "exp": 0 }, diff --git a/lib/fakes/webex_service.rb b/lib/fakes/webex_service.rb index b597f264e4a..49203e22888 100644 --- a/lib/fakes/webex_service.rb +++ b/lib/fakes/webex_service.rb @@ -1,6 +1,19 @@ # frozen_string_literal: true class Fakes::WebexService + SAMPLE_CIPHER = "eyJwMnMiOiJvUlZHZENlck9OanYxWjhLeHRub3p4NklPUUNzTVdEdWFMakRXR09kLTh4Tk91OUVyWDQ1aUZ6TG5FY" \ + "nlJeTZTam40Vk1kVEZHU1pyaE5pRiIsInAyYyI6MzIzMzAsImF1ZCI6ImE0ZDg4NmIwLTk3OWYtNGUyYy1hOTU4LT" \ + "NlOGMxNDYwNWU1MSIsImlzcyI6IjU0OWRhYWNiLWJmZWUtNDkxOS1hNGU0LWMwOTQ0YTY0ZGUyNSIsImN0eSI6Ikp" \ + "XVCIsImVuYyI6IkEyNTZHQ00iLCJhbGciOiJQQkVTMi1IUzUxMitBMjU2S1cifQ.cm6FWc6Bl4vB_utAc_bswG82m" \ + "UXhxkITkI0tZDGzzh5TKdoWSS1Mjw.L8mGls6Kp3lsa8Wz.fLen-yV2sTpWlkLFCszQjcG5V9FhJVwoNB9Ky9BgCp" \ + "T46cFWUe-wmyn1yIZcGxFcDcwhhKwW3PVuQQ1xjl-z63o67esrvaWAjgglSioKiOFTJF1M94d4gVj2foSQtYKzR8S" \ + "nI6wW5X5KShcVjxjchT7xDNxnHtIZoG-Zda_aOOfz_WK18rhNcyvb-BY7cSwTMhbnuuXO0-cuJ7wNyDbvqEfWXALf" \ + "j87a2_WopcwK-x-8TQ20bzZKUrugt0FRj6VKxOCzxDhozmWDFMRu8Dpj2UrS7Fo-JQf_I1oN0O-Dwf5r8ItcNQEu5" \ + "X0tcRazhrHSNWfOL2DOaDyHawi4oxc7MqaNRxxyrpy2qYw06_TzBwRKlMFZ8fT7-GJbDlE3nqWlNw3mlRuvhu80CH" \ + "SO5RK5a1obU4sfLX0Fsxl-csC-1QjcHuKOSP_ozb6l7om-WeOdbSV99Fjy68egjH1NhMQIcVwpG0fy2j8r3sN4nz0" \ + "RSe3LXoK78JqRxk6XuaQCDkr6TmG5YjHQ2FFw1tP1ekHpNIL2oJNVAKKPgget7LRuSiM6jg.628e3hFPmZCoqXuyY" \ + "2OriQ" + def initialize(**args) @status_code = args[:status_code] || 200 @error_message = args[:error_message] || "Error" @@ -43,7 +56,11 @@ def delete_conference(virtual_hearing) private def build_meeting_response - "{\"host\":[{\"cipher\":\"abc123\",\"short\":\"hjASGlI\"}],\"guest\":[{\"cipher\":\"123abc\",\"short\":\"pi9P6TL\"}],\"baseUrl\":\"https://instant-usgov.webex.com/visit/\"}" + { + host: link_info(@num_hosts), + guest: link_info(@num_guests), + baseUrl: "https://instant-usgov.webex.com/visit/" + }.to_json end def link_info(num_links = 1) From 4387c757f66af3117416e03fd97e2a8f13982b4b Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Tue, 21 Nov 2023 15:01:31 -0500 Subject: [PATCH 336/445] APPEALS-35195: update sub to use unique hearing day id --- app/models/hearing_day.rb | 2 +- spec/models/hearing_day_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/hearing_day.rb b/app/models/hearing_day.rb index 862eded87dd..c4dddfb905e 100644 --- a/app/models/hearing_day.rb +++ b/app/models/hearing_day.rb @@ -227,7 +227,7 @@ def conference_links end def subject_for_conference - "Guest Link for #{scheduled_for.strftime('%b %e, %Y')}" + "#{id}_#{scheduled_for.strftime('%b %e, %Y')}" end def nbf diff --git a/spec/models/hearing_day_spec.rb b/spec/models/hearing_day_spec.rb index 2b849b8ed58..8278e936fc4 100644 --- a/spec/models/hearing_day_spec.rb +++ b/spec/models/hearing_day_spec.rb @@ -607,7 +607,7 @@ def format_begins_at_from_db(time_string, scheduled_for) subject { hearing_day.subject_for_conference } it "returns the expected meeting conference details" do - is_expected.to eq("Guest Link for #{expected_date}") + is_expected.to eq("#{hearing_day.id}_#{expected_date}") end context "nbf and exp" do From ca377b1bb21cce7b4aa772f778f7214203e9e158 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Tue, 21 Nov 2023 15:49:32 -0500 Subject: [PATCH 337/445] APPEALS-35195: update hearing day spec to have specific id for hearing day --- spec/models/hearing_day_spec.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/models/hearing_day_spec.rb b/spec/models/hearing_day_spec.rb index 8278e936fc4..a417f0c78f6 100644 --- a/spec/models/hearing_day_spec.rb +++ b/spec/models/hearing_day_spec.rb @@ -596,11 +596,13 @@ def format_begins_at_from_db(time_string, scheduled_for) include_context "Enable both conference services" let(:expected_date) { "Sep 21, 2023" } + let(:id) { 2_000_006_656 } let(:expected_date_parsed) { Date.parse(expected_date) } let(:hearing_day) do build( :hearing_day, - scheduled_for: expected_date_parsed + scheduled_for: expected_date_parsed, + id: id ) end From 7311a8e0e4fd1af54144b02fca8f3f3e5398aec9 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Wed, 22 Nov 2023 12:48:51 -0500 Subject: [PATCH 338/445] APPEALS-35195: change date format --- app/models/hearing_day.rb | 2 +- spec/models/hearing_day_spec.rb | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/models/hearing_day.rb b/app/models/hearing_day.rb index c4dddfb905e..0e9faea081f 100644 --- a/app/models/hearing_day.rb +++ b/app/models/hearing_day.rb @@ -227,7 +227,7 @@ def conference_links end def subject_for_conference - "#{id}_#{scheduled_for.strftime('%b %e, %Y')}" + "#{id}_#{scheduled_for.strftime('%m %e, %Y')}" end def nbf diff --git a/spec/models/hearing_day_spec.rb b/spec/models/hearing_day_spec.rb index a417f0c78f6..635ed237cba 100644 --- a/spec/models/hearing_day_spec.rb +++ b/spec/models/hearing_day_spec.rb @@ -595,9 +595,9 @@ def format_begins_at_from_db(time_string, scheduled_for) context "#subject_for_conference" do include_context "Enable both conference services" - let(:expected_date) { "Sep 21, 2023" } + let(:assigned_date) { "Sep 21, 2023" } let(:id) { 2_000_006_656 } - let(:expected_date_parsed) { Date.parse(expected_date) } + let(:expected_date_parsed) { Date.parse(assigned_date) } let(:hearing_day) do build( :hearing_day, @@ -609,6 +609,7 @@ def format_begins_at_from_db(time_string, scheduled_for) subject { hearing_day.subject_for_conference } it "returns the expected meeting conference details" do + expected_date = "09 21, 2023" is_expected.to eq("#{hearing_day.id}_#{expected_date}") end From d5be7e4859ea5599d7b0ff088de6590dbbbfff61 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Thu, 30 Nov 2023 15:27:19 -0500 Subject: [PATCH 339/445] APPEALS-35728: initial updates to daily docket row --- .../components/dailyDocket/DailyDocketRow.jsx | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/client/app/hearings/components/dailyDocket/DailyDocketRow.jsx b/client/app/hearings/components/dailyDocket/DailyDocketRow.jsx index 58e5263976c..97cd22d8944 100644 --- a/client/app/hearings/components/dailyDocket/DailyDocketRow.jsx +++ b/client/app/hearings/components/dailyDocket/DailyDocketRow.jsx @@ -274,9 +274,11 @@ class DailyDocketRow extends React.Component { isLegacyHearing = () => this.props.hearing?.docketName === 'legacy'; conferenceLinkOnClick = () => { - const { conferenceLink } = this.props; + const { conferenceLinks, hearing } = this.props; - window.open(conferenceLink?.hostLink, 'Recording Session').focus(); + const linkType = hearing.conferenceProvider === conferenceLinks[0].conferenceProvider ? 0 : 1; + + window.open(conferenceLinks[linkType].hostLink, 'Recording Session').focus(); } @@ -503,7 +505,8 @@ DailyDocketRow.propTypes = { externalId: PropTypes.string, disposition: PropTypes.string, scheduledForIsPast: PropTypes.bool, - scheduledTimeString: PropTypes.string + scheduledTimeString: PropTypes.string, + conferenceProvider: PropTypes.string }), user: PropTypes.shape({ userCanAssignHearingSchedule: PropTypes.bool, @@ -518,13 +521,13 @@ DailyDocketRow.propTypes = { onReceiveAlerts: PropTypes.func, onReceiveTransitioningAlert: PropTypes.func, transitionAlert: PropTypes.func, - conferenceLink: PropTypes.object, + conferenceLinks: PropTypes.object, conferenceLinkError: PropTypes.bool }; const mapStateToProps = (state, props) => ({ hearing: { ...props.hearing, ...state.dailyDocket.hearings[props.hearingId] }, - conferenceLink: state.dailyDocket.hearingDay.conferenceLink, + conferenceLinks: state.dailyDocket.hearingDay.conferenceLinks, conferenceLinkError: state.dailyDocket.conferenceLinkError }); From 4e34c22c7197cc9d6aa4db541f1857bb67a6fa07 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Fri, 1 Dec 2023 11:46:57 -0500 Subject: [PATCH 340/445] APPEALS-35728: update logic for type vs conferenceProvider --- .../app/hearings/components/dailyDocket/DailyDocketRow.jsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/client/app/hearings/components/dailyDocket/DailyDocketRow.jsx b/client/app/hearings/components/dailyDocket/DailyDocketRow.jsx index 97cd22d8944..6c0c79cf10c 100644 --- a/client/app/hearings/components/dailyDocket/DailyDocketRow.jsx +++ b/client/app/hearings/components/dailyDocket/DailyDocketRow.jsx @@ -276,9 +276,10 @@ class DailyDocketRow extends React.Component { conferenceLinkOnClick = () => { const { conferenceLinks, hearing } = this.props; - const linkType = hearing.conferenceProvider === conferenceLinks[0].conferenceProvider ? 0 : 1; + const linkType = hearing.conferenceProvider === 'webex' ? 'WebexConferenceLink' : 'PexipConferenceLink'; + const link = conferenceLinks[0].type === linkType ? 0 : 1; - window.open(conferenceLinks[linkType].hostLink, 'Recording Session').focus(); + window.open(conferenceLinks[link].hostLink, 'Recording Session').focus(); } From 6b222c075820d1d35d5cfc7300ae3423f10f10fd Mon Sep 17 00:00:00 2001 From: Ariana Konhilas Date: Tue, 5 Dec 2023 15:27:35 -0500 Subject: [PATCH 341/445] APPEALS-35728: updates to test, props, store, snapshot --- .../dailyDocket/DailyDocketRow.test.js | 16 +++- .../__snapshots__/DailyDocketRow.test.js.snap | 92 ++++++++++--------- .../hearings/dailyDocket/dailyDocketProps.js | 2 +- .../dailyDocket/store/dailyDocketStore.js | 2 +- 4 files changed, 65 insertions(+), 47 deletions(-) diff --git a/client/test/app/hearings/components/dailyDocket/DailyDocketRow.test.js b/client/test/app/hearings/components/dailyDocket/DailyDocketRow.test.js index 0be3b8be180..e303092edc9 100644 --- a/client/test/app/hearings/components/dailyDocket/DailyDocketRow.test.js +++ b/client/test/app/hearings/components/dailyDocket/DailyDocketRow.test.js @@ -1,5 +1,5 @@ import React from 'react'; -import { render } from '@testing-library/react'; +import { render, screen } from '@testing-library/react'; import { axe } from 'jest-axe'; import { BrowserRouter as Router } from 'react-router-dom'; import { Provider } from 'react-redux'; @@ -36,7 +36,7 @@ describe('DailyDocketRow', () => { expect(container).toMatchSnapshot(); }); - // noelle's area + it('renders correctly for non virtual, judge', () => { const { container } = render( @@ -49,6 +49,18 @@ describe('DailyDocketRow', () => { expect(container).toMatchSnapshot(); }); + it('connect to recording renders correctly', () => { + render( + + + + + + ); + + expect(screen.getByRole('button', { class: 'usa-button-secondary usa-button', name: 'Connect to Recording System' })).toBeInTheDocument(); + }); + it('renders correctly for non virtual, attorney', () => { const { container } = render( diff --git a/client/test/app/hearings/components/dailyDocket/__snapshots__/DailyDocketRow.test.js.snap b/client/test/app/hearings/components/dailyDocket/__snapshots__/DailyDocketRow.test.js.snap index d45e705f801..b469d251c93 100644 --- a/client/test/app/hearings/components/dailyDocket/__snapshots__/DailyDocketRow.test.js.snap +++ b/client/test/app/hearings/components/dailyDocket/__snapshots__/DailyDocketRow.test.js.snap @@ -249,11 +249,14 @@ exports[`DailyDocketRow renders correctly for non virtual, DVC 1`] = `
    -
    - - Host Link: N/A - -
    + + +
    Pexip @@ -838,11 +841,14 @@ exports[`DailyDocketRow renders correctly for non virtual, Transcriber 1`] = `
    -
    - - Host Link: N/A - -
    + + +
    Webex @@ -1200,14 +1206,13 @@ exports[`DailyDocketRow renders correctly for non virtual, Transcriber 1`] = ` >
    Date: Tue, 16 Jan 2024 12:39:27 -0500 Subject: [PATCH 343/445] Merge branch 'feature/APPEALS-26734' into feature/APPEALS-35295 Resolves [Jira Issue Title](https://jira.devops.va.gov/browse/JIRA-12345) # Description Please explain the changes you made here. ## Acceptance Criteria - [ ] Code compiles correctly ## Testing Plan 1. Go to [Jira Issue/Test Plan Link](https://jira.devops.va.gov/browse/JIRA-12345) or list them below - [ ] For feature branches merging into master: Was this deployed to UAT? # Frontend ## User Facing Changes - [ ] Screenshots of UI changes added to PR & Original Issue BEFORE|AFTER ---|--- ## Storybook Story *For Frontend (Presentation) Components* * [ ] Add a [Storybook](https://github.com/department-of-veterans-affairs/caseflow/wiki/Documenting-React-Components-with-Storybook) file alongside the component file (e.g. create `MyComponent.stories.js` alongside `MyComponent.jsx`) * [ ] Give it a title that reflects the component's location within the overall Caseflow hierarchy * [ ] Write a separate story (within the same file) for each discrete variation of the component # Backend ## Database Changes *Only for Schema Changes* * [ ] Add typical timestamps (`created_at`, `updated_at`) for new tables * [ ] Update column comments; include a "PII" prefix to indicate definite or potential [PII data content](https://github.com/department-of-veterans-affairs/appeals-team/blob/master/caseflow-team/0-how-we-work/pii-handbook.md#what-is-pii) * [ ] Have your migration classes inherit from `Caseflow::Migration`, especially when adding indexes (use `add_safe_index`) (see [Writing DB migrations](https://github.com/department-of-veterans-affairs/caseflow/wiki/Writing-DB-migrations)) * [ ] Verify that `migrate:rollback` works as desired ([`change` supported functions](https://edgeguides.rubyonrails.org/active_record_migrations.html#using-the-change-method)) * [ ] Perform query profiling (eyeball Rails log, check bullet and fasterer output) * [ ] For queries using raw sql was an explain plan run by System Team * [ ] Add appropriate indexes (especially for foreign keys, polymorphic columns, unique constraints, and Rails scopes) * [ ] Run `make check-fks`; add any missing foreign keys or add to `config/initializers/immigrant.rb` (see [Record associations and Foreign Keys](https://github.com/department-of-veterans-affairs/caseflow/wiki/Record-associations-and-Foreign-Keys)) * [ ] Add `belongs_to` for associations to enable the [schema diagrams](https://department-of-veterans-affairs.github.io/caseflow/task_trees/schema/schema_diagrams) to be automatically updated * [ ] Document any non-obvious semantics or logic useful for interpreting database data at [Caseflow Data Model and Dictionary](https://github.com/department-of-veterans-affairs/caseflow/wiki/Caseflow-Data-Model-and-Dictionary) ## Integrations: Adding endpoints for external APIs * [ ] Check that Caseflow's external API code for the endpoint matches the code in the relevant integration repo * [ ] Request: Service name, method name, input field names * [ ] Response: Check expected data structure * [ ] Check that calls are wrapped in MetricService record block * [ ] Check that all configuration is coming from ENV variables * [ ] Listed all new ENV variables in description * [ ] Worked with or notified System Team that new ENV variables need to be set * [ ] Update Fakes * [ ] For feature branches: Was this tested in Caseflow UAT # Best practices ## Code Documentation Updates - [ ] Add or update code comments at the top of the class, module, and/or component. ## Tests ### Test Coverage Did you include any test coverage for your code? Check below: - [ ] RSpec - [ ] Jest - [ ] Other ### Code Climate Your code does not add any new code climate offenses? If so why? - [ ] No new code climate issues added ## Monitoring, Logging, Auditing, Error, and Exception Handling Checklist ### Monitoring - [ ] Are performance metrics (e.g., response time, throughput) being tracked? - [ ] Are key application components monitored (e.g., database, cache, queues)? - [ ] Is there a system in place for setting up alerts based on performance thresholds? ### Logging - [ ] Are logs being produced at appropriate log levels (debug, info, warn, error, fatal)? - [ ] Are logs structured (e.g., using log tags) for easier querying and analysis? - [ ] Are sensitive data (e.g., passwords, tokens) redacted or omitted from logs? - [ ] Is log retention and rotation configured correctly? - [ ] Are logs being forwarded to a centralized logging system if needed? ### Auditing - [ ] Are user actions being logged for audit purposes? - [ ] Are changes to critical data being tracked ? - [ ] Are logs being securely stored and protected from tampering or exposing protected data? ### Error Handling - [ ] Are errors being caught and handled gracefully? - [ ] Are appropriate error messages being displayed to users? - [ ] Are critical errors being reported to an error tracking system (e.g., Sentry, ELK)? - [ ] Are unhandled exceptions being caught at the application level ? ### Exception Handling - [ ] Are custom exceptions defined and used where appropriate? - [ ] Is exception handling consistent throughout the codebase? - [ ] Are exceptions logged with relevant context and stack trace information? - [ ] Are exceptions being grouped and categorized for easier analysis and resolution? --- client/app/hearings/components/details/HearingLinks.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/client/app/hearings/components/details/HearingLinks.jsx b/client/app/hearings/components/details/HearingLinks.jsx index b684f936ab5..e1f4b9ddd8b 100644 --- a/client/app/hearings/components/details/HearingLinks.jsx +++ b/client/app/hearings/components/details/HearingLinks.jsx @@ -97,6 +97,7 @@ export const LinkContainer = (
    ); + LinkContainer.propTypes = { hearing: PropTypes.object, isVirtual: PropTypes.bool, From 8ae765ccdc4466b69014e6d77ff54b0729cac5d3 Mon Sep 17 00:00:00 2001 From: breedbah Date: Tue, 16 Jan 2024 20:19:13 -0500 Subject: [PATCH 344/445] APPEALS-31618 add migration files --- .../20240117011716_add_co_host_link_to_virtual_hearings.rb | 5 +++++ .../20240117011846_add_co_host_link_to_conference_links.rb | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 db/migrate/20240117011716_add_co_host_link_to_virtual_hearings.rb create mode 100644 db/migrate/20240117011846_add_co_host_link_to_conference_links.rb diff --git a/db/migrate/20240117011716_add_co_host_link_to_virtual_hearings.rb b/db/migrate/20240117011716_add_co_host_link_to_virtual_hearings.rb new file mode 100644 index 00000000000..6926b44c06a --- /dev/null +++ b/db/migrate/20240117011716_add_co_host_link_to_virtual_hearings.rb @@ -0,0 +1,5 @@ +class AddCoHostLinkToVirtualHearings < ActiveRecord::Migration[5.2] + def change + add_column :virtual_hearings, :co_host_hearing_link, :string + end +end diff --git a/db/migrate/20240117011846_add_co_host_link_to_conference_links.rb b/db/migrate/20240117011846_add_co_host_link_to_conference_links.rb new file mode 100644 index 00000000000..c7d3dd16387 --- /dev/null +++ b/db/migrate/20240117011846_add_co_host_link_to_conference_links.rb @@ -0,0 +1,5 @@ +class AddCoHostLinkToConferenceLinks < ActiveRecord::Migration[5.2] + def change + add_column :conference_links, :co_host_hearing_link, :string + end +end From f795c673bf4cde826af13d4bc2a3f47e6dafcc13 Mon Sep 17 00:00:00 2001 From: breedbah Date: Tue, 16 Jan 2024 22:00:10 -0500 Subject: [PATCH 345/445] APPEALS-31618 rmove migration --- .../20240117011716_add_co_host_link_to_virtual_hearings.rb | 5 ----- .../20240117011846_add_co_host_link_to_conference_links.rb | 5 ----- 2 files changed, 10 deletions(-) delete mode 100644 db/migrate/20240117011716_add_co_host_link_to_virtual_hearings.rb delete mode 100644 db/migrate/20240117011846_add_co_host_link_to_conference_links.rb diff --git a/db/migrate/20240117011716_add_co_host_link_to_virtual_hearings.rb b/db/migrate/20240117011716_add_co_host_link_to_virtual_hearings.rb deleted file mode 100644 index 6926b44c06a..00000000000 --- a/db/migrate/20240117011716_add_co_host_link_to_virtual_hearings.rb +++ /dev/null @@ -1,5 +0,0 @@ -class AddCoHostLinkToVirtualHearings < ActiveRecord::Migration[5.2] - def change - add_column :virtual_hearings, :co_host_hearing_link, :string - end -end diff --git a/db/migrate/20240117011846_add_co_host_link_to_conference_links.rb b/db/migrate/20240117011846_add_co_host_link_to_conference_links.rb deleted file mode 100644 index c7d3dd16387..00000000000 --- a/db/migrate/20240117011846_add_co_host_link_to_conference_links.rb +++ /dev/null @@ -1,5 +0,0 @@ -class AddCoHostLinkToConferenceLinks < ActiveRecord::Migration[5.2] - def change - add_column :conference_links, :co_host_hearing_link, :string - end -end From 593472671f27517a62ca6cc480c2a59b3bb40792 Mon Sep 17 00:00:00 2001 From: breedbah Date: Tue, 16 Jan 2024 22:04:37 -0500 Subject: [PATCH 346/445] APPEALS-31618 0fficial add co_host_hearing_link --- .../20240117030132_add_co_host_link_to_virtual_hearings.rb | 5 +++++ db/schema.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20240117030132_add_co_host_link_to_virtual_hearings.rb diff --git a/db/migrate/20240117030132_add_co_host_link_to_virtual_hearings.rb b/db/migrate/20240117030132_add_co_host_link_to_virtual_hearings.rb new file mode 100644 index 00000000000..6926b44c06a --- /dev/null +++ b/db/migrate/20240117030132_add_co_host_link_to_virtual_hearings.rb @@ -0,0 +1,5 @@ +class AddCoHostLinkToVirtualHearings < ActiveRecord::Migration[5.2] + def change + add_column :virtual_hearings, :co_host_hearing_link, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index afba1ee4089..cb0e905bfd6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2023_11_07_173746) do +ActiveRecord::Schema.define(version: 2024_01_17_030132) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -2015,6 +2015,7 @@ t.boolean "appellant_email_sent", default: false, null: false, comment: "Determines whether or not a notification email was sent to the appellant" t.datetime "appellant_reminder_sent_at", comment: "The datetime the last reminder email was sent to the appellant." t.string "appellant_tz", limit: 50, comment: "Stores appellant timezone" + t.string "co_host_hearing_link" t.boolean "conference_deleted", default: false, null: false, comment: "Whether or not the conference was deleted from Pexip" t.string "conference_id", comment: "ID of conference from Pexip" t.datetime "created_at", null: false, comment: "Automatic timestamp of when virtual hearing was created" From 2dcbb63a0701eb799a5b6355742fe801c889c4c1 Mon Sep 17 00:00:00 2001 From: breedbah Date: Tue, 16 Jan 2024 22:06:50 -0500 Subject: [PATCH 347/445] APPEALS-31618 Add co_host_link to conference_links --- .../20240117030548_add_co_host_link_to_conference_links.rb | 5 +++++ db/schema.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20240117030548_add_co_host_link_to_conference_links.rb diff --git a/db/migrate/20240117030548_add_co_host_link_to_conference_links.rb b/db/migrate/20240117030548_add_co_host_link_to_conference_links.rb new file mode 100644 index 00000000000..7af5e633690 --- /dev/null +++ b/db/migrate/20240117030548_add_co_host_link_to_conference_links.rb @@ -0,0 +1,5 @@ +class AddCoHostLinkToConferenceLinks < ActiveRecord::Migration[5.2] + def change + add_column :conference_links, :co_host_link, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index cb0e905bfd6..1f60910bf14 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2024_01_17_030132) do +ActiveRecord::Schema.define(version: 2024_01_17_030548) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -572,6 +572,7 @@ create_table "conference_links", force: :cascade do |t| t.string "alias", comment: "Alias of the conference" t.string "alias_with_host", comment: "Alieas of the conference for the host" + t.string "co_host_link" t.boolean "conference_deleted", default: false, null: false, comment: "Flag to represent if a con ference has been deleted" t.string "conference_id", comment: "Id of the conference" t.datetime "created_at", null: false, comment: "Date and Time of creation" From 2d74322ac804fb4a3874e11dad42a3e80c12f836 Mon Sep 17 00:00:00 2001 From: breedbah Date: Wed, 17 Jan 2024 10:12:03 -0500 Subject: [PATCH 348/445] APPEALS-31618 added code for co-host --- .../virtual_hearings/create_conference_job.rb | 1 + app/models/hearings/virtual_hearing.rb | 4 + .../hearings/virtual_hearing_serializer.rb | 1 + app/services/external_api/webex_service.rb | 4 +- .../webex_service/create_response.rb | 4 + client/COPY.json | 1 + .../components/details/HearingLinks.jsx | 74 ++++++++++++------- lib/fakes/webex_service.rb | 2 +- .../external_api/webex_service_spec.rb | 4 +- 9 files changed, 65 insertions(+), 30 deletions(-) diff --git a/app/jobs/virtual_hearings/create_conference_job.rb b/app/jobs/virtual_hearings/create_conference_job.rb index 0555e831bcc..e85c301ad4e 100644 --- a/app/jobs/virtual_hearings/create_conference_job.rb +++ b/app/jobs/virtual_hearings/create_conference_job.rb @@ -163,6 +163,7 @@ def create_webex_conference virtual_hearing.update( host_hearing_link: create_webex_conference_response.host_link, + co_host_hearing_link: create_webex_conference_response.co_host_link, guest_hearing_link: create_webex_conference_response.guest_link ) end diff --git a/app/models/hearings/virtual_hearing.rb b/app/models/hearings/virtual_hearing.rb index 27bc4dc0ed6..7605b8def7f 100644 --- a/app/models/hearings/virtual_hearing.rb +++ b/app/models/hearings/virtual_hearing.rb @@ -170,6 +170,10 @@ def guest_link "pin=#{guest_pin}&role=guest" end + def co_host_hearing_link + self[:co_host_hearing_link] + end + def host_link return host_hearing_link if host_hearing_link.present? diff --git a/app/serializers/hearings/virtual_hearing_serializer.rb b/app/serializers/hearings/virtual_hearing_serializer.rb index aee80a9d9cf..ae8c15d118b 100644 --- a/app/serializers/hearings/virtual_hearing_serializer.rb +++ b/app/serializers/hearings/virtual_hearing_serializer.rb @@ -14,6 +14,7 @@ class VirtualHearingSerializer attribute :guest_pin attribute :host_link, &:host_link attribute :guest_link, &:guest_link + attribute :co_host_hearing_link, &:co_host_hearing_link attribute :job_completed, &:job_completed? attribute :conference_provider end diff --git a/app/services/external_api/webex_service.rb b/app/services/external_api/webex_service.rb index 0819780b937..519cb68a6fe 100644 --- a/app/services/external_api/webex_service.rb +++ b/app/services/external_api/webex_service.rb @@ -20,7 +20,7 @@ def create_conference(conferenced_item) "exp": conferenced_item.exp }, "aud": @aud, - "numHost": 1, + "numHost": 2, "provideShortUrls": true, "verticalType": "gen" } @@ -39,7 +39,7 @@ def delete_conference(conferenced_item) "exp": 0 }, "aud": @aud, - "numHost": 1, + "numHost": 2, "provideShortUrls": true, "verticalType": "gen" } diff --git a/app/services/external_api/webex_service/create_response.rb b/app/services/external_api/webex_service/create_response.rb index 941571006af..da955bd8bf8 100644 --- a/app/services/external_api/webex_service/create_response.rb +++ b/app/services/external_api/webex_service/create_response.rb @@ -13,6 +13,10 @@ def host_link "#{base_url}#{data.dig('host', 0, 'short')}" end + def co_host_link + "#{base_url}#{data.dig('host', 1, 'short')}" + end + def guest_link "#{base_url}#{data.dig('guest', 0, 'short')}" end diff --git a/client/COPY.json b/client/COPY.json index cd211988aa1..7e05aa82b8c 100644 --- a/client/COPY.json +++ b/client/COPY.json @@ -1190,6 +1190,7 @@ "VLJ_VIRTUAL_HEARING_LINK_LABEL": "VLJ Link", "GUEST_VIRTUAL_HEARING_LINK_LABEL": "Guest Link", "REPRESENTATIVE_VIRTUAL_HEARING_LINK_LABEL": "Virtual Hearing Link", + "HC_VIRTUAL_HEARING_LINK_LABEL": "Hearing Coordinator Link", "VLJ_VIRTUAL_HEARINGS_LINK_TEXT": "Start Virtual Hearing", "GUEST_VIRTUAL_HEARINGS_LINK_TEXT": "Join Virtual Hearing", "PIN_KEY_MISSING_ERROR_MESSAGE": "Cannot generate a virtual hearing URL without a valid PIN key", diff --git a/client/app/hearings/components/details/HearingLinks.jsx b/client/app/hearings/components/details/HearingLinks.jsx index e1f4b9ddd8b..c2556870b67 100644 --- a/client/app/hearings/components/details/HearingLinks.jsx +++ b/client/app/hearings/components/details/HearingLinks.jsx @@ -24,7 +24,7 @@ export const VirtualHearingLinkDetails = ({ isVirtual, user, label, - virtualHearing + virtualHearing, }) => ( {hearing?.scheduledForIsPast || wasVirtual ? ( @@ -39,20 +39,28 @@ export const VirtualHearingLinkDetails = ({ hearing={hearing} /> )} - {hearing.conferenceProvider === 'pexip' ? - (<>
    - Conference Room: - {`${aliasWithHost}`} -
    -
    - PIN: - {pin} -
    ) : (
    + {hearing.conferenceProvider === "pexip" ? ( + <> +
    + Conference Room: + {`${aliasWithHost}`} +
    +
    + PIN: + {pin} +
    + + ) : ( +
    {link} -
    ) - } +
    + )} {!hearing?.scheduledForIsPast && !wasVirtual && ( - + )}     ); @@ -97,7 +105,6 @@ export const LinkContainer = (
    ); - LinkContainer.propTypes = { hearing: PropTypes.object, isVirtual: PropTypes.bool, @@ -119,17 +126,34 @@ export const HearingLinks = ({ hearing, virtualHearing, isVirtual, wasVirtual, u return (
    - {showHostLink && } + {showHostLink && ( + <> + + {hearing.conferenceProvider === "webex" && ( + + )} + + )} Date: Wed, 17 Jan 2024 12:09:17 -0500 Subject: [PATCH 349/445] APPEALS-31618 remove attribute conferencelinks --- client/COPY.json | 4 +- .../components/details/HearingLinks.jsx | 1 - ...48_add_co_host_link_to_conference_links.rb | 5 --- db/schema.rb | 43 ++++++++++++++++++- 4 files changed, 43 insertions(+), 10 deletions(-) delete mode 100644 db/migrate/20240117030548_add_co_host_link_to_conference_links.rb diff --git a/client/COPY.json b/client/COPY.json index 7e05aa82b8c..e7daf1d4aeb 100644 --- a/client/COPY.json +++ b/client/COPY.json @@ -1191,8 +1191,8 @@ "GUEST_VIRTUAL_HEARING_LINK_LABEL": "Guest Link", "REPRESENTATIVE_VIRTUAL_HEARING_LINK_LABEL": "Virtual Hearing Link", "HC_VIRTUAL_HEARING_LINK_LABEL": "Hearing Coordinator Link", - "VLJ_VIRTUAL_HEARINGS_LINK_TEXT": "Start Virtual Hearing", - "GUEST_VIRTUAL_HEARINGS_LINK_TEXT": "Join Virtual Hearing", + "VLJ_VIRTUAL_HEARINGS_LINK_TEXT": "Start Hearing", + "GUEST_VIRTUAL_HEARINGS_LINK_TEXT": "Join Hearing", "PIN_KEY_MISSING_ERROR_MESSAGE": "Cannot generate a virtual hearing URL without a valid PIN key", "URL_HOST_MISSING_ERROR_MESSAGE": "Cannot generate a virtual hearing URL without a valid URL host", "URL_PATH_MISSING_ERROR_MESSAGE": "Cannot generate a virtual hearing URL without a valid URL path", diff --git a/client/app/hearings/components/details/HearingLinks.jsx b/client/app/hearings/components/details/HearingLinks.jsx index c2556870b67..aaa8c3970bc 100644 --- a/client/app/hearings/components/details/HearingLinks.jsx +++ b/client/app/hearings/components/details/HearingLinks.jsx @@ -165,7 +165,6 @@ export const HearingLinks = ({ hearing, virtualHearing, isVirtual, wasVirtual, u virtualHearing={virtualHearing} wasVirtual={wasVirtual} /> -
    ); }; diff --git a/db/migrate/20240117030548_add_co_host_link_to_conference_links.rb b/db/migrate/20240117030548_add_co_host_link_to_conference_links.rb deleted file mode 100644 index 7af5e633690..00000000000 --- a/db/migrate/20240117030548_add_co_host_link_to_conference_links.rb +++ /dev/null @@ -1,5 +0,0 @@ -class AddCoHostLinkToConferenceLinks < ActiveRecord::Migration[5.2] - def change - add_column :conference_links, :co_host_link, :string - end -end diff --git a/db/schema.rb b/db/schema.rb index 1f60910bf14..acb3b93dfb3 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2024_01_17_030548) do +ActiveRecord::Schema.define(version: 2024_01_17_030132) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -572,7 +572,6 @@ create_table "conference_links", force: :cascade do |t| t.string "alias", comment: "Alias of the conference" t.string "alias_with_host", comment: "Alieas of the conference for the host" - t.string "co_host_link" t.boolean "conference_deleted", default: false, null: false, comment: "Flag to represent if a con ference has been deleted" t.string "conference_id", comment: "Id of the conference" t.datetime "created_at", null: false, comment: "Date and Time of creation" @@ -1939,6 +1938,46 @@ t.index ["vbms_communication_package_id"], name: "index_vbms_distributions_on_vbms_communication_package_id" end + create_table "vbms_ext_claim", primary_key: "CLAIM_ID", id: :decimal, precision: 38, force: :cascade do |t| + t.string "ALLOW_POA_ACCESS", limit: 5 + t.decimal "CLAIMANT_PERSON_ID", precision: 38 + t.datetime "CLAIM_DATE" + t.string "CLAIM_SOJ", limit: 25 + t.integer "CONTENTION_COUNT" + t.datetime "CREATEDDT", null: false + t.string "EP_CODE", limit: 25 + t.datetime "ESTABLISHMENT_DATE" + t.datetime "EXPIRATIONDT" + t.string "INTAKE_SITE", limit: 25 + t.datetime "LASTUPDATEDT", null: false + t.string "LEVEL_STATUS_CODE", limit: 25 + t.datetime "LIFECYCLE_STATUS_CHANGE_DATE" + t.string "LIFECYCLE_STATUS_NAME", limit: 50 + t.string "ORGANIZATION_NAME", limit: 100 + t.string "ORGANIZATION_SOJ", limit: 25 + t.string "PAYEE_CODE", limit: 25 + t.string "POA_CODE", limit: 25 + t.integer "PREVENT_AUDIT_TRIG", limit: 2, default: 0, null: false + t.string "PRE_DISCHARGE_IND", limit: 5 + t.string "PRE_DISCHARGE_TYPE_CODE", limit: 10 + t.string "PRIORITY", limit: 10 + t.string "PROGRAM_TYPE_CODE", limit: 10 + t.string "RATING_SOJ", limit: 25 + t.string "SERVICE_TYPE_CODE", limit: 10 + t.string "SUBMITTER_APPLICATION_CODE", limit: 25 + t.string "SUBMITTER_ROLE_CODE", limit: 25 + t.datetime "SUSPENSE_DATE" + t.string "SUSPENSE_REASON_CODE", limit: 25 + t.string "SUSPENSE_REASON_COMMENTS", limit: 1000 + t.decimal "SYNC_ID", precision: 38, null: false + t.string "TEMPORARY_CLAIM_SOJ", limit: 25 + t.string "TYPE_CODE", limit: 25 + t.decimal "VERSION", precision: 38, null: false + t.decimal "VETERAN_PERSON_ID", precision: 15 + t.index ["CLAIM_ID"], name: "claim_id_index" + t.index ["LEVEL_STATUS_CODE"], name: "level_status_code_index" + end + create_table "vbms_uploaded_documents", force: :cascade do |t| t.bigint "appeal_id", comment: "Appeal/LegacyAppeal ID; use as FK to appeals/legacy_appeals" t.string "appeal_type", comment: "'Appeal' or 'LegacyAppeal'" From 43ab31e9af11c56ce769784824b5f4eb2693d314 Mon Sep 17 00:00:00 2001 From: breedbah Date: Wed, 17 Jan 2024 12:30:22 -0500 Subject: [PATCH 350/445] APPEALS-31618 update tests --- .../components/details/HearingLinks.test.js | 8 ++--- .../__snapshots__/HearingLinks.test.js.snap | 35 +++++++++---------- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/client/test/app/hearings/components/details/HearingLinks.test.js b/client/test/app/hearings/components/details/HearingLinks.test.js index 0592224e90a..36c1194bdbd 100644 --- a/client/test/app/hearings/components/details/HearingLinks.test.js +++ b/client/test/app/hearings/components/details/HearingLinks.test.js @@ -33,12 +33,12 @@ describe('HearingLinks', () => { ); expect(form).toMatchSnapshot(); - expect(form.find(VirtualHearingLink)).toHaveLength(2); + expect(form.find('LinkContainer')).toHaveLength(2); expect( - form.find(VirtualHearingLink).exists({ label: 'Join Virtual Hearing' }) + form.find('VirtualHearingLinkDetails').exists({ label: 'Join Hearing' }) ).toBe(true); expect( - form.find(VirtualHearingLink).exists({ label: 'Start Virtual Hearing' }) + form.find('VirtualHearingLinkDetails').exists({ label: 'Start Hearing' }) ).toBe(true); }); @@ -73,5 +73,5 @@ describe('HearingLinks', () => { expect(form.find(VirtualHearingLink)).toHaveLength(1); // Ensure it's the guest link expect(form.find(VirtualHearingLink).prop('link')).toEqual(amaHearing.virtualHearing.guestLink) - }) + }); }); diff --git a/client/test/app/hearings/components/details/__snapshots__/HearingLinks.test.js.snap b/client/test/app/hearings/components/details/__snapshots__/HearingLinks.test.js.snap index 20ad6319279..10f8bd9d620 100644 --- a/client/test/app/hearings/components/details/__snapshots__/HearingLinks.test.js.snap +++ b/client/test/app/hearings/components/details/__snapshots__/HearingLinks.test.js.snap @@ -40,7 +40,7 @@ exports[`HearingLinks Matches snapshot when hearing is virtual and in progress 1 } isVirtual={true} label="VLJ Link" - linkText="Start Virtual Hearing" + linkText="Start Hearing" role="VLJ" user={ Object { @@ -78,7 +78,7 @@ exports[`HearingLinks Matches snapshot when hearing is virtual and in progress 1 } } isVirtual={true} - label="Start Virtual Hearing" + label="Start Hearing" pin="1234567890#" role="VLJ" user={ @@ -108,7 +108,7 @@ exports[`HearingLinks Matches snapshot when hearing is virtual and in progress 1 } } isVirtual={true} - label="Start Virtual Hearing" + label="Start Hearing" newWindow={true} showFullLink={false} user={ @@ -139,7 +139,7 @@ exports[`HearingLinks Matches snapshot when hearing is virtual and in progress 1 type={null} > - Start Virtual Hearing + Start Hearing - Join Virtual Hearing + Join Hearing
    -
    `; @@ -734,7 +733,7 @@ exports[`HearingLinks Matches snapshot when hearing was virtual and occurred 1`] } } label="VLJ Link" - linkText="Start Virtual Hearing" + linkText="Start Hearing" role="VLJ" user={ Object { @@ -772,7 +771,7 @@ exports[`HearingLinks Matches snapshot when hearing was virtual and occurred 1`] "scheduledForIsPast": false, } } - label="Start Virtual Hearing" + label="Start Hearing" pin="1234567890#" role="VLJ" user={ @@ -813,7 +812,7 @@ exports[`HearingLinks Matches snapshot when hearing was virtual and occurred 1`] } } label="Guest Link" - linkText="Join Virtual Hearing" + linkText="Join Hearing" role="Guest" user={ Object { @@ -851,7 +850,7 @@ exports[`HearingLinks Matches snapshot when hearing was virtual and occurred 1`] "scheduledForIsPast": false, } } - label="Join Virtual Hearing" + label="Join Hearing" pin="12345678#" role="Guest" user={ @@ -885,7 +884,6 @@ exports[`HearingLinks Matches snapshot when hearing was virtual and occurred 1`]
    -
    `; @@ -1168,7 +1166,7 @@ exports[`HearingLinks Only displays Guest Link when user is not a host 1`] = ` isVirtual={true} label="Guest Link" link="https://care.evn.va.gov/bva-app/?join=1&media=&escalate=1&conference=BVA0000009@care.evn.va.gov&pin=2684353125#&role=guest" - linkText="Join Virtual Hearing" + linkText="Join Hearing" role="Guest" user={ Object { @@ -1329,7 +1327,7 @@ exports[`HearingLinks Only displays Guest Link when user is not a host 1`] = ` } } isVirtual={true} - label="Join Virtual Hearing" + label="Join Hearing" link="https://care.evn.va.gov/bva-app/?join=1&media=&escalate=1&conference=BVA0000009@care.evn.va.gov&pin=2684353125#&role=guest" pin="2684353125#" role="Guest" @@ -1483,7 +1481,7 @@ exports[`HearingLinks Only displays Guest Link when user is not a host 1`] = ` } } isVirtual={true} - label="Join Virtual Hearing" + label="Join Hearing" link="https://care.evn.va.gov/bva-app/?join=1&media=&escalate=1&conference=BVA0000009@care.evn.va.gov&pin=2684353125#&role=guest" newWindow={true} showFullLink={false} @@ -1528,7 +1526,7 @@ exports[`HearingLinks Only displays Guest Link when user is not a host 1`] = ` type={null} > - Join Virtual Hearing + Join Hearing
    -
    `; From d2738e46b2528a99e3ac170cf65d8bb2e2cf8b2c Mon Sep 17 00:00:00 2001 From: breedbah Date: Wed, 17 Jan 2024 12:49:53 -0500 Subject: [PATCH 351/445] APPEALS-31618 update lint --- client/app/hearings/components/details/HearingLinks.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/app/hearings/components/details/HearingLinks.jsx b/client/app/hearings/components/details/HearingLinks.jsx index aaa8c3970bc..099d448d7f3 100644 --- a/client/app/hearings/components/details/HearingLinks.jsx +++ b/client/app/hearings/components/details/HearingLinks.jsx @@ -39,7 +39,7 @@ export const VirtualHearingLinkDetails = ({ hearing={hearing} /> )} - {hearing.conferenceProvider === "pexip" ? ( + {hearing.conferenceProvider === 'pexip' ? ( <>
    Conference Room: @@ -139,7 +139,7 @@ export const HearingLinks = ({ hearing, virtualHearing, isVirtual, wasVirtual, u virtualHearing={virtualHearing} wasVirtual={wasVirtual} /> - {hearing.conferenceProvider === "webex" && ( + {hearing.conferenceProvider === 'webex' && ( Date: Wed, 17 Jan 2024 13:12:57 -0500 Subject: [PATCH 352/445] APPEALS-31618 update VirtualHearingsFields snapshot --- .../VirtualHearingFields.test.js.snap | 39 ++++++++----------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/client/test/app/hearings/components/details/__snapshots__/VirtualHearingFields.test.js.snap b/client/test/app/hearings/components/details/__snapshots__/VirtualHearingFields.test.js.snap index 0ebb0305e68..704bd46fbcc 100644 --- a/client/test/app/hearings/components/details/__snapshots__/VirtualHearingFields.test.js.snap +++ b/client/test/app/hearings/components/details/__snapshots__/VirtualHearingFields.test.js.snap @@ -534,7 +534,7 @@ exports[`VirtualHearingFields Renders pexip conference when conference provider isVirtual={true} label="Guest Link" link="https://care.evn.va.gov/bva-app/?join=1&media=&escalate=1&conference=BVA0000009@care.evn.va.gov&pin=2684353125#&role=guest" - linkText="Join Virtual Hearing" + linkText="Join Hearing" role="Guest" user={ Object { @@ -693,7 +693,7 @@ exports[`VirtualHearingFields Renders pexip conference when conference provider } } isVirtual={true} - label="Join Virtual Hearing" + label="Join Hearing" link="https://care.evn.va.gov/bva-app/?join=1&media=&escalate=1&conference=BVA0000009@care.evn.va.gov&pin=2684353125#&role=guest" pin="2684353125#" role="Guest" @@ -845,7 +845,7 @@ exports[`VirtualHearingFields Renders pexip conference when conference provider } } isVirtual={true} - label="Join Virtual Hearing" + label="Join Hearing" link="https://care.evn.va.gov/bva-app/?join=1&media=&escalate=1&conference=BVA0000009@care.evn.va.gov&pin=2684353125#&role=guest" newWindow={true} showFullLink={false} @@ -887,7 +887,7 @@ exports[`VirtualHearingFields Renders pexip conference when conference provider type={null} > - Join Virtual Hearing + Join Hearing
    -

    @@ -1555,7 +1554,7 @@ exports[`VirtualHearingFields Renders pexip conference when conference provider isVirtual={true} label="Guest Link" link="https://care.evn.va.gov/bva-app/?join=1&media=&escalate=1&conference=BVA0000009@care.evn.va.gov&pin=2684353125#&role=guest" - linkText="Join Virtual Hearing" + linkText="Join Hearing" role="Guest" user={ Object { @@ -1714,7 +1713,7 @@ exports[`VirtualHearingFields Renders pexip conference when conference provider } } isVirtual={true} - label="Join Virtual Hearing" + label="Join Hearing" link="https://care.evn.va.gov/bva-app/?join=1&media=&escalate=1&conference=BVA0000009@care.evn.va.gov&pin=2684353125#&role=guest" pin="2684353125#" role="Guest" @@ -1866,7 +1865,7 @@ exports[`VirtualHearingFields Renders pexip conference when conference provider } } isVirtual={true} - label="Join Virtual Hearing" + label="Join Hearing" link="https://care.evn.va.gov/bva-app/?join=1&media=&escalate=1&conference=BVA0000009@care.evn.va.gov&pin=2684353125#&role=guest" newWindow={true} showFullLink={false} @@ -1908,7 +1907,7 @@ exports[`VirtualHearingFields Renders pexip conference when conference provider type={null} > - Join Virtual Hearing + Join Hearing -
    @@ -2586,7 +2584,7 @@ exports[`VirtualHearingFields Renders webex conference when conference provider isVirtual={true} label="Guest Link" link="https://care.evn.va.gov/bva-app/?join=1&media=&escalate=1&conference=BVA0000009@care.evn.va.gov&pin=2684353125#&role=guest" - linkText="Join Virtual Hearing" + linkText="Join Hearing" role="Guest" user={ Object { @@ -2745,7 +2743,7 @@ exports[`VirtualHearingFields Renders webex conference when conference provider } } isVirtual={true} - label="Join Virtual Hearing" + label="Join Hearing" link="https://care.evn.va.gov/bva-app/?join=1&media=&escalate=1&conference=BVA0000009@care.evn.va.gov&pin=2684353125#&role=guest" pin="2684353125#" role="Guest" @@ -2897,7 +2895,7 @@ exports[`VirtualHearingFields Renders webex conference when conference provider } } isVirtual={true} - label="Join Virtual Hearing" + label="Join Hearing" link="https://care.evn.va.gov/bva-app/?join=1&media=&escalate=1&conference=BVA0000009@care.evn.va.gov&pin=2684353125#&role=guest" newWindow={true} showFullLink={false} @@ -2939,7 +2937,7 @@ exports[`VirtualHearingFields Renders webex conference when conference provider type={null} > - Join Virtual Hearing + Join Hearing -
    @@ -3607,7 +3604,7 @@ exports[`VirtualHearingFields Shows hearing details with virtualHearing 1`] = ` isVirtual={true} label="Guest Link" link="https://care.evn.va.gov/bva-app/?join=1&media=&escalate=1&conference=BVA0000009@care.evn.va.gov&pin=2684353125#&role=guest" - linkText="Join Virtual Hearing" + linkText="Join Hearing" role="Guest" user={ Object { @@ -3766,7 +3763,7 @@ exports[`VirtualHearingFields Shows hearing details with virtualHearing 1`] = ` } } isVirtual={true} - label="Join Virtual Hearing" + label="Join Hearing" link="https://care.evn.va.gov/bva-app/?join=1&media=&escalate=1&conference=BVA0000009@care.evn.va.gov&pin=2684353125#&role=guest" pin="2684353125#" role="Guest" @@ -3918,7 +3915,7 @@ exports[`VirtualHearingFields Shows hearing details with virtualHearing 1`] = ` } } isVirtual={true} - label="Join Virtual Hearing" + label="Join Hearing" link="https://care.evn.va.gov/bva-app/?join=1&media=&escalate=1&conference=BVA0000009@care.evn.va.gov&pin=2684353125#&role=guest" newWindow={true} showFullLink={false} @@ -3960,7 +3957,7 @@ exports[`VirtualHearingFields Shows hearing details with virtualHearing 1`] = ` type={null} > - Join Virtual Hearing + Join Hearing -
    @@ -4601,7 +4597,7 @@ exports[`VirtualHearingFields Shows only hearing links with no virtualHearing 1` } isVirtual={true} label="Guest Link" - linkText="Join Virtual Hearing" + linkText="Join Hearing" role="Guest" user={ Object { @@ -4629,7 +4625,6 @@ exports[`VirtualHearingFields Shows only hearing links with no virtualHearing 1`     -
    From d70ee41d49c88e07eda0df21966827ccf1001b0e Mon Sep 17 00:00:00 2001 From: breedbah Date: Wed, 17 Jan 2024 14:01:15 -0500 Subject: [PATCH 353/445] APPEALS-31618 update details.test.js snapshot --- .../__snapshots__/Details.test.js.snap | 18 ++++++++---------- .../create_conference_job_spec.rb | 2 +- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/client/test/app/hearings/components/__snapshots__/Details.test.js.snap b/client/test/app/hearings/components/__snapshots__/Details.test.js.snap index f69f1bb69d8..14eab55954f 100644 --- a/client/test/app/hearings/components/__snapshots__/Details.test.js.snap +++ b/client/test/app/hearings/components/__snapshots__/Details.test.js.snap @@ -139526,7 +139526,7 @@ exports[`Details Displays VirtualHearing details when there is a virtual hearing isVirtual={true} label="Guest Link" link="https://care.evn.va.gov/bva-app/?join=1&media=&escalate=1&conference=BVA0000009@care.evn.va.gov&pin=2684353125#&role=guest" - linkText="Join Virtual Hearing" + linkText="Join Hearing" role="Guest" user={ Object { @@ -139691,7 +139691,7 @@ exports[`Details Displays VirtualHearing details when there is a virtual hearing } } isVirtual={true} - label="Join Virtual Hearing" + label="Join Hearing" link="https://care.evn.va.gov/bva-app/?join=1&media=&escalate=1&conference=BVA0000009@care.evn.va.gov&pin=2684353125#&role=guest" pin="2684353125#" role="Guest" @@ -139849,7 +139849,7 @@ exports[`Details Displays VirtualHearing details when there is a virtual hearing } } isVirtual={true} - label="Join Virtual Hearing" + label="Join Hearing" link="https://care.evn.va.gov/bva-app/?join=1&media=&escalate=1&conference=BVA0000009@care.evn.va.gov&pin=2684353125#&role=guest" newWindow={true} showFullLink={false} @@ -139891,7 +139891,7 @@ exports[`Details Displays VirtualHearing details when there is a virtual hearing type={null} > - Join Virtual Hearing + Join Hearing -
    @@ -187923,7 +187922,7 @@ exports[`Details Does not display EmailConfirmationModal when updating transcrip isVirtual={true} label="Guest Link" link="https://care.evn.va.gov/bva-app/?join=1&media=&escalate=1&conference=BVA0000009@care.evn.va.gov&pin=2684353125#&role=guest" - linkText="Join Virtual Hearing" + linkText="Join Hearing" role="Guest" user={ Object { @@ -188088,7 +188087,7 @@ exports[`Details Does not display EmailConfirmationModal when updating transcrip } } isVirtual={true} - label="Join Virtual Hearing" + label="Join Hearing" link="https://care.evn.va.gov/bva-app/?join=1&media=&escalate=1&conference=BVA0000009@care.evn.va.gov&pin=2684353125#&role=guest" pin="2684353125#" role="Guest" @@ -188246,7 +188245,7 @@ exports[`Details Does not display EmailConfirmationModal when updating transcrip } } isVirtual={true} - label="Join Virtual Hearing" + label="Join Hearing" link="https://care.evn.va.gov/bva-app/?join=1&media=&escalate=1&conference=BVA0000009@care.evn.va.gov&pin=2684353125#&role=guest" newWindow={true} showFullLink={false} @@ -188288,7 +188287,7 @@ exports[`Details Does not display EmailConfirmationModal when updating transcrip type={null} > - Join Virtual Hearing + Join Hearing -
    diff --git a/spec/jobs/virtual_hearings/create_conference_job_spec.rb b/spec/jobs/virtual_hearings/create_conference_job_spec.rb index 4d574659922..9d53a8f5ecf 100644 --- a/spec/jobs/virtual_hearings/create_conference_job_spec.rb +++ b/spec/jobs/virtual_hearings/create_conference_job_spec.rb @@ -95,7 +95,7 @@ virtual_hearing.reload expect(virtual_hearing.status).to eq(:active) - expect(virtual_hearing.alias_with_host).to eq("BVA0000002@#{URL_HOST}") + expect(virtual_hearing.alias_with_host).to eq("BVA0000003@#{URL_HOST}") expect(virtual_hearing.host_pin.to_s.length).to eq(7) expect(virtual_hearing.guest_pin.to_s.length).to eq(10) end From f81a4fceaa0c9146be669f7f22e44a0b560459a6 Mon Sep 17 00:00:00 2001 From: breedbah Date: Wed, 17 Jan 2024 15:17:36 -0500 Subject: [PATCH 354/445] APPEALS-31618 update create_conference_job_spec --- spec/jobs/virtual_hearings/create_conference_job_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/jobs/virtual_hearings/create_conference_job_spec.rb b/spec/jobs/virtual_hearings/create_conference_job_spec.rb index 9d53a8f5ecf..4d574659922 100644 --- a/spec/jobs/virtual_hearings/create_conference_job_spec.rb +++ b/spec/jobs/virtual_hearings/create_conference_job_spec.rb @@ -95,7 +95,7 @@ virtual_hearing.reload expect(virtual_hearing.status).to eq(:active) - expect(virtual_hearing.alias_with_host).to eq("BVA0000003@#{URL_HOST}") + expect(virtual_hearing.alias_with_host).to eq("BVA0000002@#{URL_HOST}") expect(virtual_hearing.host_pin.to_s.length).to eq(7) expect(virtual_hearing.guest_pin.to_s.length).to eq(10) end From 549ef2506c74ed4e552a06049a724ff00c52a4a1 Mon Sep 17 00:00:00 2001 From: breedbah Date: Thu, 18 Jan 2024 15:03:12 -0500 Subject: [PATCH 355/445] APPEALS-31618 updated Marcs sugestions rnd 1 --- client/app/hearings/components/details/HearingLinks.jsx | 2 +- .../20240117030132_add_co_host_link_to_virtual_hearings.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/app/hearings/components/details/HearingLinks.jsx b/client/app/hearings/components/details/HearingLinks.jsx index 099d448d7f3..902f5b70798 100644 --- a/client/app/hearings/components/details/HearingLinks.jsx +++ b/client/app/hearings/components/details/HearingLinks.jsx @@ -24,7 +24,7 @@ export const VirtualHearingLinkDetails = ({ isVirtual, user, label, - virtualHearing, + virtualHearing }) => ( {hearing?.scheduledForIsPast || wasVirtual ? ( diff --git a/db/migrate/20240117030132_add_co_host_link_to_virtual_hearings.rb b/db/migrate/20240117030132_add_co_host_link_to_virtual_hearings.rb index 6926b44c06a..9b249fcf90e 100644 --- a/db/migrate/20240117030132_add_co_host_link_to_virtual_hearings.rb +++ b/db/migrate/20240117030132_add_co_host_link_to_virtual_hearings.rb @@ -1,4 +1,4 @@ -class AddCoHostLinkToVirtualHearings < ActiveRecord::Migration[5.2] +class AddCoHostLinkToVirtualHearings < Caseflow::Migration[5.2] def change add_column :virtual_hearings, :co_host_hearing_link, :string end From e054f326472077f941f86463dfb5556ce538ee1c Mon Sep 17 00:00:00 2001 From: Jeff Marks <106996298+jefftmarks@users.noreply.github.com> Date: Thu, 18 Jan 2024 16:30:50 -0500 Subject: [PATCH 356/445] jefftmarks/APPEALS-31619 (#20515) * APPEALS-31619 Created migration * APPEALS-31619 Add xls column to migration * APPEALS-31619 Update index name * APPEALS-31619 Change null options on migration * APPEALS-31619 Refactor transcription files table * APPEALS-31619 Remove old migration --- ...240118165914_create_transcription_files.rb | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 db/migrate/20240118165914_create_transcription_files.rb diff --git a/db/migrate/20240118165914_create_transcription_files.rb b/db/migrate/20240118165914_create_transcription_files.rb new file mode 100644 index 00000000000..11b3b0fbcc0 --- /dev/null +++ b/db/migrate/20240118165914_create_transcription_files.rb @@ -0,0 +1,35 @@ +class CreateTranscriptionFiles < Caseflow::Migration + def change + create_table :transcription_files do |t| + t.string :file_name, null: false, comment: "File name, with extension, of the transcription file migrated by caseflow" + t.string :file_type, null: false, comment: "One of mp4, vtt, mp3, rtf, pdf, xls" + t.bigint :appeal_id, comment: "ID of the appeal associated with this record" + t.string :appeal_type, comment: "Type of appeal associated with this record" + t.string :docket_number, null: false, comment: "Docket number of associated appeal" + t.string :file_status, comment: "Status of the file, could be one of nil, 'Successful retrieval (Webex), Failed retrieval (Webex), Sucessful conversion, Failed conversion, Successful upload (AWS), Failed upload (AWS)'" + t.string :aws_link, comment: "Link to be used by HMB to download original or transformed file" + + t.datetime :date_receipt_webex, comment: "Timestamp when file was added to webex" + t.date :date_converted, comment: "Timestamp when file was converted from vtt to rtf or mp4 to mp3" + t.datetime :date_upload_box, comment: "Timestamp when file was added to box" + t.datetime :date_upload_aws, comment: "Timestamp when file was loaded to AWS" + + t.bigint :created_by_id, comment: "The user who created the transcription record" + t.bigint :updated_by_id, comment: "The user who most recently updated the transcription file" + t.timestamps + end + + add_index :transcription_files, + [:appeal_id, :appeal_type, :docket_number, :file_name], + unique: true, + name: "idx_transcription_files_on_file_name_and_docket_num_and_appeal" + add_index :transcription_files, + [:appeal_id, :appeal_type, :docket_number], + unique: true, + name: "index_transcription_files_on_docket_number_and_appeal" + add_index :transcription_files, [:appeal_id, :appeal_type], unique: true + add_index :transcription_files, [:docket_number], unique: true + add_index :transcription_files, [:file_type], unique: true + add_index :transcription_files, [:aws_link], unique: true + end +end From 1bf0e64084f674a585788394a7e204e6d60a1b20 Mon Sep 17 00:00:00 2001 From: breedbah Date: Fri, 19 Jan 2024 11:37:55 -0500 Subject: [PATCH 357/445] APPEALS-31618 updated migration inheritance --- .../20240117030132_add_co_host_link_to_virtual_hearings.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20240117030132_add_co_host_link_to_virtual_hearings.rb b/db/migrate/20240117030132_add_co_host_link_to_virtual_hearings.rb index 9b249fcf90e..ce2ee79ff54 100644 --- a/db/migrate/20240117030132_add_co_host_link_to_virtual_hearings.rb +++ b/db/migrate/20240117030132_add_co_host_link_to_virtual_hearings.rb @@ -1,4 +1,4 @@ -class AddCoHostLinkToVirtualHearings < Caseflow::Migration[5.2] +class AddCoHostLinkToVirtualHearings < Caseflow::Migration def change add_column :virtual_hearings, :co_host_hearing_link, :string end From d75ec57f4b36d205e09e15ea5cf4dd993a6bf61b Mon Sep 17 00:00:00 2001 From: minhazur9 <65432922+minhazur9@users.noreply.github.com> Date: Fri, 19 Jan 2024 12:39:15 -0500 Subject: [PATCH 358/445] Min/APPEALS-31621 (#20523) * APPEALS-31621 added the table * APPEALS-31621 moved model under hearings folder * APPEALS-31621 reverted schema back from testing table * APPEALS-31621 added transcriptions association * APPEALS-31621 fixed typo * APPEALS-31621 removed migration file * APPEALS-31621 added additional template methods in model and comments * APPEALS-31621 fixed transcription typo * APPEALS-31621 added additional template methods * APPEALS-31621 changed name of model and controller * APPEALS-31621 removed transcript association --- .../transcription_files_controller.rb | 15 ++++++++++ app/models/hearings/transcription_file.rb | 28 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 app/controllers/hearings/transcription_files_controller.rb create mode 100644 app/models/hearings/transcription_file.rb diff --git a/app/controllers/hearings/transcription_files_controller.rb b/app/controllers/hearings/transcription_files_controller.rb new file mode 100644 index 00000000000..04ebe751a72 --- /dev/null +++ b/app/controllers/hearings/transcription_files_controller.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +class TranscriptionFilesController < ApplicationController + def index + nil + end + + def update + nil + end + + def create + nil + end +end diff --git a/app/models/hearings/transcription_file.rb b/app/models/hearings/transcription_file.rb new file mode 100644 index 00000000000..19ffd6c6a6a --- /dev/null +++ b/app/models/hearings/transcription_file.rb @@ -0,0 +1,28 @@ +# frozen_string_literal: true + +class TranscriptionFile < CaseflowRecord + include BelongsToPolymorphicAppealConcern + belongs_to_polymorphic_appeal :appeal + belongs_to :transcription + belongs_to :docket + + # Upload audio files + def upload_audio_transcript + nil + end + + # Upload raw VTT files + def upload_raw_transcript + nil + end + + # Update transcription file status + def update_file_status + nil + end + + # Download transcription files from S3 + def download_transcription_files + nil + end +end From e124cadaba89395beea7b2c43268c1893f59ea09 Mon Sep 17 00:00:00 2001 From: Jeff Marks <106996298+jefftmarks@users.noreply.github.com> Date: Fri, 19 Jan 2024 16:21:00 -0500 Subject: [PATCH 359/445] hotfix/APPEALS-35296-flaky-conference-job-test (#20555) --- spec/jobs/virtual_hearings/create_conference_job_spec.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/jobs/virtual_hearings/create_conference_job_spec.rb b/spec/jobs/virtual_hearings/create_conference_job_spec.rb index 4d574659922..1753997b145 100644 --- a/spec/jobs/virtual_hearings/create_conference_job_spec.rb +++ b/spec/jobs/virtual_hearings/create_conference_job_spec.rb @@ -91,11 +91,13 @@ end it "creates a conference", :aggregate_failures do + allow(VirtualHearings::SequenceConferenceId).to receive(:next).and_return "0000001" + subject.perform_now virtual_hearing.reload expect(virtual_hearing.status).to eq(:active) - expect(virtual_hearing.alias_with_host).to eq("BVA0000002@#{URL_HOST}") + expect(virtual_hearing.alias_with_host).to eq("BVA0000001@#{URL_HOST}") expect(virtual_hearing.host_pin.to_s.length).to eq(7) expect(virtual_hearing.guest_pin.to_s.length).to eq(10) end From c529c5de1229a6340b6cc31b1e89c5686a9abab9 Mon Sep 17 00:00:00 2001 From: Ariana Konhilas <109693628+konhilas-ariana@users.noreply.github.com> Date: Mon, 22 Jan 2024 17:10:00 -0500 Subject: [PATCH 360/445] akonhilas/APPEALS-31820 (#20510) * APPEALS-31820: create transcription transactions serializer with outline until model complete * APPEALS-31820: update aws link attributes * APPEALS-31820: removed methods and has many relationship, change file name * APPEALS-31820: updated file tree * Revert "APPEALS-31820: updated file tree" This reverts commit 4b58d5a93c3922582b97447e6b40c5cb1b087083. * APPEALS-31820: updated serializer to match new db columns and updated AC --- .../hearings/transcription_file_serializer.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 app/serializers/hearings/transcription_file_serializer.rb diff --git a/app/serializers/hearings/transcription_file_serializer.rb b/app/serializers/hearings/transcription_file_serializer.rb new file mode 100644 index 00000000000..e57a9e6c2e0 --- /dev/null +++ b/app/serializers/hearings/transcription_file_serializer.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +class TranscriptionFileSerializer + include FastJsonapi::ObjectSerializer + + attribute :docket_number + attribute :date_upload_aws + attribute :file_name + attribute :file_type + attribute :aws_link + attribute :file_status +end From cb6565607ddb4398116ef64ea50d634edb3161e1 Mon Sep 17 00:00:00 2001 From: breedbah Date: Thu, 25 Jan 2024 08:41:50 -0500 Subject: [PATCH 361/445] APPEALS-35177 adjust spacing --- .../DailyDocketGuestLinkSection.jsx | 73 ++++++++++--------- 1 file changed, 40 insertions(+), 33 deletions(-) diff --git a/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx b/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx index b7eda79feb4..32d0a913df8 100644 --- a/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx +++ b/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx @@ -1,14 +1,14 @@ -import React from 'react'; -import PropTypes from 'prop-types'; -import CopyTextButton from '../../../components/CopyTextButton'; -import { GUEST_LINK_LABELS } from '../../constants'; +import React from "react"; +import PropTypes from "prop-types"; +import CopyTextButton from "../../../components/CopyTextButton"; +import { GUEST_LINK_LABELS } from "../../constants"; const H3Styled = ({ children, style }) => (

    @@ -17,52 +17,59 @@ const H3Styled = ({ children, style }) => ( ); const SpanStyled = ({ children }) => ( - + {children} ); const ConferenceRoom = ({ type, alias }) => ( - {type === 'PexipConferenceLink' ? - GUEST_LINK_LABELS.PEXIP_GUEST_CONFERENCE_ROOM : - GUEST_LINK_LABELS.WEBEX_GUEST_CONFERENCE_ROOM} - {alias || 'N/A'} + {type === "PexipConferenceLink" + ? GUEST_LINK_LABELS.PEXIP_GUEST_CONFERENCE_ROOM + : GUEST_LINK_LABELS.WEBEX_GUEST_CONFERENCE_ROOM} + {alias || "N/A"} ); export const DailyDocketGuestLinkSection = ({ linkInfo }) => { const containerStyle = { - marginLeft: '-40px', - marginRight: '-40px', + marginLeft: "-40px", + marginRight: "-40px", }; const roomInfoStyle = (index) => ({ - backgroundColor: index === 0 ? '#f1f1f1' : 'white', - justifyContent: 'space-between', - display: 'flex', - width: '100%', - height: '50px', + backgroundColor: index === 0 ? "#f1f1f1" : "white", + justifyContent: "space-between", + display: "flex", + width: "100%", + height: "50px", }); // Props needed for the copy text button component const CopyTextButtonProps = { text: GUEST_LINK_LABELS.COPY_GUEST_LINK, label: GUEST_LINK_LABELS.COPY_GUEST_LINK, - textToCopy: '', + textToCopy: "", }; // Takes pin from guestLink // const usePinFromLink = () => guestLink?.match(/pin=\d+/)[0]?.split('=')[1]; // Takes alias from guestLink const useAliasFromLink = (link) => { - if (link.type === 'PexipConferenceLink') { + if (link.type === "PexipConferenceLink") { return ( - link.alias || link.guestLink?.match(/pin=\d+/)[0]?.split('=')[1] || null + link.alias || link.guestLink?.match(/pin=\d+/)[0]?.split("=")[1] || null ); - } else if (link.type === 'WebexConferenceLink') { + } else if (link.type === "WebexConferenceLink") { const webexGuestLink = link.guestLink; return link.alias || webexGuestLink || null; @@ -72,9 +79,9 @@ export const DailyDocketGuestLinkSection = ({ linkInfo }) => { }; const extractPin = (link) => { - if (link.type === 'PexipConferenceLink') { + if (link.type === "PexipConferenceLink") { return `${link.guestPin}#`; - } else if (link.type === 'WebexConferenceLink') { + } else if (link.type === "WebexConferenceLink") { return null; } @@ -101,20 +108,20 @@ export const DailyDocketGuestLinkSection = ({ linkInfo }) => { return (
    - - {type === 'PexipConferenceLink' ? - GUEST_LINK_LABELS.PEXIP_GUEST_LINK_SECTION_LABEL : - GUEST_LINK_LABELS.WEBEX_GUEST_LINK_SECTION_LABEL} + + {type === "PexipConferenceLink" + ? GUEST_LINK_LABELS.PEXIP_GUEST_LINK_SECTION_LABEL + : GUEST_LINK_LABELS.WEBEX_GUEST_LINK_SECTION_LABEL} - - {type === 'PexipConferenceLink' && GUEST_LINK_LABELS.GUEST_PIN} + + {type === "PexipConferenceLink" && GUEST_LINK_LABELS.GUEST_PIN} {linkGuestPin} - +
    From 0b5e6ea31f7f421d5ab5b6fd1237e3ca71f48f46 Mon Sep 17 00:00:00 2001 From: breedbah Date: Thu, 25 Jan 2024 08:47:41 -0500 Subject: [PATCH 362/445] APPEALS-35177 fix lint --- .../DailyDocketGuestLinkSection.jsx | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx b/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx index 32d0a913df8..a7202a52b90 100644 --- a/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx +++ b/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx @@ -1,14 +1,14 @@ -import React from "react"; -import PropTypes from "prop-types"; -import CopyTextButton from "../../../components/CopyTextButton"; -import { GUEST_LINK_LABELS } from "../../constants"; +import React from 'react'; +import PropTypes from 'prop-types'; +import CopyTextButton from '../../../components/CopyTextButton'; +import { GUEST_LINK_LABELS } from '../../constants'; const H3Styled = ({ children, style }) => (

    @@ -19,10 +19,10 @@ const H3Styled = ({ children, style }) => ( const SpanStyled = ({ children }) => ( {children} @@ -31,45 +31,45 @@ const SpanStyled = ({ children }) => ( const ConferenceRoom = ({ type, alias }) => ( - {type === "PexipConferenceLink" - ? GUEST_LINK_LABELS.PEXIP_GUEST_CONFERENCE_ROOM - : GUEST_LINK_LABELS.WEBEX_GUEST_CONFERENCE_ROOM} - {alias || "N/A"} + {type === 'PexipConferenceLink' ? + GUEST_LINK_LABELS.PEXIP_GUEST_CONFERENCE_ROOM : + GUEST_LINK_LABELS.WEBEX_GUEST_CONFERENCE_ROOM} + {alias || 'N/A'} ); export const DailyDocketGuestLinkSection = ({ linkInfo }) => { const containerStyle = { - marginLeft: "-40px", - marginRight: "-40px", + marginLeft: '-40px', + marginRight: '-40px', }; const roomInfoStyle = (index) => ({ - backgroundColor: index === 0 ? "#f1f1f1" : "white", - justifyContent: "space-between", - display: "flex", - width: "100%", - height: "50px", + backgroundColor: index === 0 ? '#f1f1f1' : 'white', + justifyContent: 'space-between', + display: 'flex', + width: '100%', + height: '50px', }); // Props needed for the copy text button component const CopyTextButtonProps = { text: GUEST_LINK_LABELS.COPY_GUEST_LINK, label: GUEST_LINK_LABELS.COPY_GUEST_LINK, - textToCopy: "", + textToCopy: '', }; // Takes pin from guestLink // const usePinFromLink = () => guestLink?.match(/pin=\d+/)[0]?.split('=')[1]; // Takes alias from guestLink const useAliasFromLink = (link) => { - if (link.type === "PexipConferenceLink") { + if (link.type === 'PexipConferenceLink') { return ( - link.alias || link.guestLink?.match(/pin=\d+/)[0]?.split("=")[1] || null + link.alias || link.guestLink?.match(/pin=\d+/)[0]?.split('=')[1] || null ); - } else if (link.type === "WebexConferenceLink") { + } else if (link.type === 'WebexConferenceLink') { const webexGuestLink = link.guestLink; return link.alias || webexGuestLink || null; @@ -79,9 +79,9 @@ export const DailyDocketGuestLinkSection = ({ linkInfo }) => { }; const extractPin = (link) => { - if (link.type === "PexipConferenceLink") { + if (link.type === 'PexipConferenceLink') { return `${link.guestPin}#`; - } else if (link.type === "WebexConferenceLink") { + } else if (link.type === 'WebexConferenceLink') { return null; } @@ -108,20 +108,20 @@ export const DailyDocketGuestLinkSection = ({ linkInfo }) => { return (
    - - {type === "PexipConferenceLink" - ? GUEST_LINK_LABELS.PEXIP_GUEST_LINK_SECTION_LABEL - : GUEST_LINK_LABELS.WEBEX_GUEST_LINK_SECTION_LABEL} + + {type === 'PexipConferenceLink' ? + GUEST_LINK_LABELS.PEXIP_GUEST_LINK_SECTION_LABEL : + GUEST_LINK_LABELS.WEBEX_GUEST_LINK_SECTION_LABEL} - - {type === "PexipConferenceLink" && GUEST_LINK_LABELS.GUEST_PIN} + + {type === 'PexipConferenceLink' && GUEST_LINK_LABELS.GUEST_PIN} {linkGuestPin} - +
    From 04b06a2f2e8cca282c5df18e37e593a2322bf60b Mon Sep 17 00:00:00 2001 From: breedbah Date: Thu, 25 Jan 2024 09:38:40 -0500 Subject: [PATCH 363/445] APPEALS-35177 made final positioning adjustments --- .../dailyDocket/DailyDocketGuestLinkSection.jsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx b/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx index a7202a52b90..c5126396601 100644 --- a/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx +++ b/client/app/hearings/components/dailyDocket/DailyDocketGuestLinkSection.jsx @@ -44,6 +44,8 @@ export const DailyDocketGuestLinkSection = ({ linkInfo }) => { const containerStyle = { marginLeft: '-40px', marginRight: '-40px', + marginTop: '20px', + marginBottom: '75px' }; const roomInfoStyle = (index) => ({ @@ -52,6 +54,8 @@ export const DailyDocketGuestLinkSection = ({ linkInfo }) => { display: 'flex', width: '100%', height: '50px', + marginBottom: '20px', + marginTop: '20px', }); // Props needed for the copy text button component @@ -108,7 +112,7 @@ export const DailyDocketGuestLinkSection = ({ linkInfo }) => { return (
    - + {type === 'PexipConferenceLink' ? GUEST_LINK_LABELS.PEXIP_GUEST_LINK_SECTION_LABEL : GUEST_LINK_LABELS.WEBEX_GUEST_LINK_SECTION_LABEL} @@ -121,7 +125,7 @@ export const DailyDocketGuestLinkSection = ({ linkInfo }) => { {linkGuestPin} - +
    From d2b5ee369db870b99b5b67d7cac4bbd80abd10dd Mon Sep 17 00:00:00 2001 From: Adam Ducker Date: Fri, 26 Jan 2024 11:15:33 -0600 Subject: [PATCH 364/445] APPEALS-35176 - Pull radio buttons closer and tidy up the CSS --- client/app/queue/OrganizationUsers.jsx | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/client/app/queue/OrganizationUsers.jsx b/client/app/queue/OrganizationUsers.jsx index fcd647d7ada..021720c871f 100644 --- a/client/app/queue/OrganizationUsers.jsx +++ b/client/app/queue/OrganizationUsers.jsx @@ -36,20 +36,19 @@ const buttonStyle = css({ paddingRight: '1rem', display: 'inline-block' }); -const buttonContainerStyle = css({ - borderBottom: '1rem solid gray', - borderWidth: '1px', - padding: '.5rem 7rem 2rem 0', +const userContainerStyle = css({ + borderBottom: '1px solid gray', + padding: '.5rem 0 2rem', display: 'flex', - justifyContent: 'space-between', flexWrap: 'wrap' }); +const buttonContainerStyle = css({ + paddingBottom: '1rem', + minWidth: '44rem' +}); const listStyle = css({ listStyle: 'none' }); -const radioContainerStyle = css({ - padding: '-5rem 5rem 2rem 2rem', -}); export default class OrganizationUsers extends React.PureComponent { constructor(props) { @@ -277,14 +276,14 @@ export default class OrganizationUsers extends React.PureComponent { {(judgeTeam || dvcTeam) && admin ? (
    ) : ( -
    -
    +
    +
    {judgeTeam || dvcTeam ? '' : this.adminButton(user, admin)} {this.removeUserButton(user)}
    {this.state.organizationName === 'Hearings Management' && conferenceSelectionVisibility && ( -
    +
    Date: Fri, 26 Jan 2024 17:18:08 -0500 Subject: [PATCH 365/445] jefftmarks/APPEALS-31619 Remove unique contraints on indexes (#20620) * APPEALS-31619 Created migration * APPEALS-31619 Add xls column to migration * APPEALS-31619 Update index name * APPEALS-31619 Change null options on migration * APPEALS-31619 Refactor transcription files table * APPEALS-31619 Remove old migration * APPEALS-31619 Remove unique contraints on indexes * APPEALS-31619 Change index order * APPEALS-31619 Move docket number in index --- db/migrate/20240118165914_create_transcription_files.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/db/migrate/20240118165914_create_transcription_files.rb b/db/migrate/20240118165914_create_transcription_files.rb index 11b3b0fbcc0..d95ba76b302 100644 --- a/db/migrate/20240118165914_create_transcription_files.rb +++ b/db/migrate/20240118165914_create_transcription_files.rb @@ -20,16 +20,15 @@ def change end add_index :transcription_files, - [:appeal_id, :appeal_type, :docket_number, :file_name], + [:file_name, :docket_number, :appeal_id, :appeal_type], unique: true, name: "idx_transcription_files_on_file_name_and_docket_num_and_appeal" add_index :transcription_files, [:appeal_id, :appeal_type, :docket_number], - unique: true, name: "index_transcription_files_on_docket_number_and_appeal" - add_index :transcription_files, [:appeal_id, :appeal_type], unique: true - add_index :transcription_files, [:docket_number], unique: true - add_index :transcription_files, [:file_type], unique: true + add_index :transcription_files, [:appeal_id, :appeal_type] + add_index :transcription_files, [:docket_number] + add_index :transcription_files, [:file_type] add_index :transcription_files, [:aws_link], unique: true end end From 00f222968b276d82d589f6573d1fa94eb3aa65d7 Mon Sep 17 00:00:00 2001 From: 631862 Date: Mon, 29 Jan 2024 14:10:05 -0500 Subject: [PATCH 366/445] Allow NonVirtual Webex hearings to display the HC link on the Hearing Details page --- .../components/details/HearingLinks.jsx | 22 +++++++++++++++++-- .../details/VirtualHearingFields.jsx | 2 +- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/client/app/hearings/components/details/HearingLinks.jsx b/client/app/hearings/components/details/HearingLinks.jsx index 902f5b70798..7820e13c411 100644 --- a/client/app/hearings/components/details/HearingLinks.jsx +++ b/client/app/hearings/components/details/HearingLinks.jsx @@ -118,8 +118,26 @@ LinkContainer.propTypes = { }; export const HearingLinks = ({ hearing, virtualHearing, isVirtual, wasVirtual, user }) => { - if (!isVirtual && !wasVirtual) { + if (!hearing?.conferenceProvider && !isVirtual && !wasVirtual) { return null; + } else if (hearing?.conferenceProvider && !isVirtual && !wasVirtual) { + return ( +
    + {hearing?.conferenceProvider && ( + + )} +
    + ); } const showHostLink = virtualHearingRoleForUser(user, hearing) === VIRTUAL_HEARING_HOST; @@ -139,7 +157,7 @@ export const HearingLinks = ({ hearing, virtualHearing, isVirtual, wasVirtual, u virtualHearing={virtualHearing} wasVirtual={wasVirtual} /> - {hearing.conferenceProvider === 'webex' && ( + {hearing?.conferenceProvider && ( { - if (!hearing?.isVirtual && !hearing?.wasVirtual) { + if (!hearing?.conferenceProvider && !hearing?.isVirtual && !hearing?.wasVirtual) { return null; } From aa3f0d6fb99903a1a1729a4c6d7ddf915ffde8c6 Mon Sep 17 00:00:00 2001 From: breedbah Date: Wed, 31 Jan 2024 11:27:16 -0500 Subject: [PATCH 367/445] APPEALS-36652 Backend changes --- app/models/hearing.rb | 7 +++++++ app/models/hearings/webex_conference_link.rb | 1 + app/serializers/hearings/conference_link_serializer.rb | 1 + app/serializers/hearings/hearing_serializer.rb | 1 + .../20240130191529_add_co_host_link_to_conference_links.rb | 5 +++++ db/schema.rb | 3 ++- 6 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20240130191529_add_co_host_link_to_conference_links.rb diff --git a/app/models/hearing.rb b/app/models/hearing.rb index 96cfe1abe1c..0121fe55e85 100644 --- a/app/models/hearing.rb +++ b/app/models/hearing.rb @@ -186,6 +186,13 @@ def advance_on_docket_motion .first end + def daily_docket_conference_links + hearing_day = self.hearing_day + conference_links = hearing_day.conference_links if hearing_day + + conference_links + end + def scheduled_for return nil unless hearing_day diff --git a/app/models/hearings/webex_conference_link.rb b/app/models/hearings/webex_conference_link.rb index 49ea9feaa3e..4dd265aa41c 100644 --- a/app/models/hearings/webex_conference_link.rb +++ b/app/models/hearings/webex_conference_link.rb @@ -25,6 +25,7 @@ def generate_conference_information update!( host_link: conference_response.host_link, + co_host_link: conference_response.co_host_link, guest_hearing_link: conference_response.guest_link ) end diff --git a/app/serializers/hearings/conference_link_serializer.rb b/app/serializers/hearings/conference_link_serializer.rb index 4cbf1f4f55c..5cc550e1a20 100644 --- a/app/serializers/hearings/conference_link_serializer.rb +++ b/app/serializers/hearings/conference_link_serializer.rb @@ -7,6 +7,7 @@ class ConferenceLinkSerializer attribute :alias, &:alias_with_host attribute :guest_pin, &:guest_pin attribute :guest_link, &:guest_link + attribute :co_host_link, &:co_host_link attribute :type attribute :conference_provider end diff --git a/app/serializers/hearings/hearing_serializer.rb b/app/serializers/hearings/hearing_serializer.rb index dd794109f17..841b35cc915 100644 --- a/app/serializers/hearings/hearing_serializer.rb +++ b/app/serializers/hearings/hearing_serializer.rb @@ -4,6 +4,7 @@ class HearingSerializer include FastJsonapi::ObjectSerializer include HearingSerializerBase + attribute :daily_docket_conference_links attribute :aod, &:aod? attribute :advance_on_docket_motion do |hearing| if hearing.aod? diff --git a/db/migrate/20240130191529_add_co_host_link_to_conference_links.rb b/db/migrate/20240130191529_add_co_host_link_to_conference_links.rb new file mode 100644 index 00000000000..7af5e633690 --- /dev/null +++ b/db/migrate/20240130191529_add_co_host_link_to_conference_links.rb @@ -0,0 +1,5 @@ +class AddCoHostLinkToConferenceLinks < ActiveRecord::Migration[5.2] + def change + add_column :conference_links, :co_host_link, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index acb3b93dfb3..a02cffd5a05 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2024_01_17_030132) do +ActiveRecord::Schema.define(version: 2024_01_30_191529) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -572,6 +572,7 @@ create_table "conference_links", force: :cascade do |t| t.string "alias", comment: "Alias of the conference" t.string "alias_with_host", comment: "Alieas of the conference for the host" + t.string "co_host_link" t.boolean "conference_deleted", default: false, null: false, comment: "Flag to represent if a con ference has been deleted" t.string "conference_id", comment: "Id of the conference" t.datetime "created_at", null: false, comment: "Date and Time of creation" From 1f808b25de17bfa062d5967cf9732e7aecc02691 Mon Sep 17 00:00:00 2001 From: 631862 Date: Wed, 31 Jan 2024 13:41:57 -0500 Subject: [PATCH 368/445] Display only Virtual Hearing Links for virtual hearings and only Hearing Links for nonvirtual hearings --- client/app/hearings/components/details/VirtualHearingFields.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/app/hearings/components/details/VirtualHearingFields.jsx b/client/app/hearings/components/details/VirtualHearingFields.jsx index fdbfc4ebf13..6c9d00fc786 100644 --- a/client/app/hearings/components/details/VirtualHearingFields.jsx +++ b/client/app/hearings/components/details/VirtualHearingFields.jsx @@ -18,7 +18,7 @@ export const VirtualHearingFields = ( return (
    {StringUtil.capitalizeFirst(hearing.conferenceProvider || 'Pexip')} hearing From cca3a8c7ba41e40f25348af4c7fce14b7aedd881 Mon Sep 17 00:00:00 2001 From: breedbah Date: Wed, 31 Jan 2024 16:01:29 -0500 Subject: [PATCH 369/445] APPEALS-36652 --- app/models/hearing.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/hearing.rb b/app/models/hearing.rb index 0121fe55e85..a1bf41aac91 100644 --- a/app/models/hearing.rb +++ b/app/models/hearing.rb @@ -187,8 +187,9 @@ def advance_on_docket_motion end def daily_docket_conference_links - hearing_day = self.hearing_day - conference_links = hearing_day.conference_links if hearing_day + hearing = Hearing.find(id) + hearing_day = hearing.hearing_day + conference_links = hearing_day.conference_links conference_links end From c0a5860917844bb8dfeabcb03b1df4fd741bd64f Mon Sep 17 00:00:00 2001 From: Adam Ducker Date: Thu, 1 Feb 2024 08:11:41 -0600 Subject: [PATCH 370/445] APPEALS-35176 - Update html and css to better match the figma design --- client/app/queue/OrganizationUsers.jsx | 188 +++++++++++++------------ 1 file changed, 95 insertions(+), 93 deletions(-) diff --git a/client/app/queue/OrganizationUsers.jsx b/client/app/queue/OrganizationUsers.jsx index 021720c871f..f1e8c60b279 100644 --- a/client/app/queue/OrganizationUsers.jsx +++ b/client/app/queue/OrganizationUsers.jsx @@ -4,7 +4,6 @@ import React from 'react'; import PropTypes from 'prop-types'; import { css } from 'glamor'; import { sprintf } from 'sprintf-js'; - import AppSegment from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/AppSegment'; import ApiUtil from '../util/ApiUtil'; @@ -18,36 +17,44 @@ import LoadingDataDisplay from '../components/LoadingDataDisplay'; import MembershipRequestTable from './MembershipRequestTable'; import SelectConferenceTypeRadioField from './SelectConferenceTypeRadioField'; -const userStyle = css({ - margin: '.5rem 0 .5rem', - padding: '.5rem 0 .5rem', - listStyle: 'none' -}); -const topUserStyle = css({ - borderTop: '.1rem solid gray', - margin: '.5rem 0 .5rem', - padding: '1rem 0 .5rem', - listStyle: 'none' +const addDropdownStyle = css({ + padding: '3rem 0 4rem' }); -const topUserBorder = css({ - borderBottom: '.1rem solid gray', + +const instructionListStyle = css({ + listStyle: 'none', + margin: '0 0 0 3rem', + padding: '1.5rem 0 2rem 0', + fontSize: '19px', + borderBottom: '.1rem solid black', }); -const buttonStyle = css({ - paddingRight: '1rem', - display: 'inline-block' + +const userListStyle = css({ + margin: '0' }); -const userContainerStyle = css({ - borderBottom: '1px solid gray', - padding: '.5rem 0 2rem', + +const userListItemStyle = css({ display: 'flex', - flexWrap: 'wrap' + flexWrap: 'wrap', + borderTop: '.1rem solid black', + padding: '4rem 0 2rem', + margin: '0', + ':first-child': { + borderTop: 'none', + } }); -const buttonContainerStyle = css({ - paddingBottom: '1rem', - minWidth: '44rem' + +const titleButtonsStyle = css({ + width: '60rem' }); -const listStyle = css({ - listStyle: 'none' + +const radioButtonsStyle = css({ + paddingBottom: '2rem' +}); + +const buttonStyle = css({ + padding: '1rem 2.5rem 2rem 0', + display: 'inline-block' }); export default class OrganizationUsers extends React.PureComponent { @@ -249,89 +256,84 @@ export default class OrganizationUsers extends React.PureComponent { mainContent = () => { const judgeTeam = this.state.judgeTeam; const dvcTeam = this.state.dvcTeam; - const listOfUsers = this.state.organizationUsers.map((user, i) => { + const listOfUsers = this.state.organizationUsers.map((user) => { const { dvc, admin } = user.attributes; - const style = i === 0 ? topUserStyle : userStyle; const { conferenceSelectionVisibility } = this.props; + let altLabel = ''; + + if (judgeTeam && admin) { + altLabel = COPY.USER_MANAGEMENT_JUDGE_LABEL; + } + if (dvcTeam && dvc) { + altLabel = COPY.USER_MANAGEMENT_DVC_LABEL; + } + if (judgeTeam && !admin) { + altLabel = COPY.USER_MANAGEMENT_ATTORNEY_LABEL; + } + if ((judgeTeam || dvcTeam) && admin) { + altLabel = COPY.USER_MANAGEMENT_ADMIN_LABEL; + } return ( - -
    -
      -
    • - {this.formatName(user)} - {judgeTeam && admin && ( - ( {COPY.USER_MANAGEMENT_JUDGE_LABEL} ) - )} - {dvcTeam && dvc && ( - ( {COPY.USER_MANAGEMENT_DVC_LABEL} ) - )} - {judgeTeam && !admin && ( - ( {COPY.USER_MANAGEMENT_ATTORNEY_LABEL} ) - )} - {(judgeTeam || dvcTeam) && admin && ( - ( {COPY.USER_MANAGEMENT_ADMIN_LABEL} ) - )} -
      • - {(judgeTeam || dvcTeam) && admin ? ( -
      - ) : ( -
      -
      - {judgeTeam || dvcTeam ? '' : this.adminButton(user, admin)} - {this.removeUserButton(user)} -
      - {this.state.organizationName === 'Hearings Management' && + +
    • +
      + {this.formatName(user)} + {altLabel !== '' && (
      ( {altLabel} )
      )} +
      + {judgeTeam || dvcTeam ? '' : this.adminButton(user, admin)} + {this.removeUserButton(user)} +
      +
      +
      + {this.state.organizationName === 'Hearings Management' && conferenceSelectionVisibility && ( -
      - -
      - )} +
      +
      )} -
    -
    +
    + ); }); return

    {COPY.USER_MANAGEMENT_ADD_USER_TO_ORG_DROPDOWN_LABEL}

    - + -
    + COPY.USER_MANAGEMENT_ADD_USER_TO_ORG_DROPDOWN_TEXT + } + noResultsText={COPY.TEAM_MANAGEMENT_DROPDOWN_LABEL} + value={null} + onChange={this.addUser} + async={this.asyncLoadUser} /> +
    -
    -

    {COPY.USER_MANAGEMENT_EDIT_USER_IN_ORG_LABEL}

    -
      - { (judgeTeam || dvcTeam) ? '' :
      • {COPY.USER_MANAGEMENT_ADMIN_RIGHTS_HEADING}{COPY.USER_MANAGEMENT_ADMIN_RIGHTS_DESCRIPTION}
      } -
      • {COPY.USER_MANAGEMENT_REMOVE_USER_HEADING}{ judgeTeam ? - COPY.USER_MANAGEMENT_JUDGE_TEAM_REMOVE_USER_DESCRIPTION : - COPY.USER_MANAGEMENT_REMOVE_USER_DESCRIPTION }
      -
    -
    -
      {listOfUsers}
    +

    {COPY.USER_MANAGEMENT_EDIT_USER_IN_ORG_LABEL}

    +
      + { (judgeTeam || dvcTeam) ? '' :
    • {COPY.USER_MANAGEMENT_ADMIN_RIGHTS_HEADING}{COPY.USER_MANAGEMENT_ADMIN_RIGHTS_DESCRIPTION}
      • } +
    • {COPY.USER_MANAGEMENT_REMOVE_USER_HEADING}{ judgeTeam ? + COPY.USER_MANAGEMENT_JUDGE_TEAM_REMOVE_USER_DESCRIPTION : + COPY.USER_MANAGEMENT_REMOVE_USER_DESCRIPTION }
      • +
    +
      {listOfUsers}
    ; } From 1ab7e30a44f1c29b84d34164c610730058ef120c Mon Sep 17 00:00:00 2001 From: 631862 Date: Thu, 1 Feb 2024 13:04:35 -0500 Subject: [PATCH 371/445] Refine conference provider search so that correct links show up for pexip conferences --- client/app/hearings/components/details/HearingLinks.jsx | 4 ++-- .../app/hearings/components/details/VirtualHearingFields.jsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/app/hearings/components/details/HearingLinks.jsx b/client/app/hearings/components/details/HearingLinks.jsx index 7820e13c411..60e96dbf099 100644 --- a/client/app/hearings/components/details/HearingLinks.jsx +++ b/client/app/hearings/components/details/HearingLinks.jsx @@ -123,7 +123,7 @@ export const HearingLinks = ({ hearing, virtualHearing, isVirtual, wasVirtual, u } else if (hearing?.conferenceProvider && !isVirtual && !wasVirtual) { return (
    - {hearing?.conferenceProvider && ( + {(hearing.conferenceProvider === 'webex') && ( - {hearing?.conferenceProvider && ( + {(hearing.conferenceProvider === 'webex') && ( { - if (!hearing?.conferenceProvider && !hearing?.isVirtual && !hearing?.wasVirtual) { + if ((hearing?.conferenceProvider !== 'webex') && !hearing?.isVirtual && !hearing?.wasVirtual) { return null; } @@ -21,7 +21,7 @@ export const VirtualHearingFields = ( header={`${hearing?.isVirtual ? 'Virtual ' : ''}Hearing Links`} >
    - {StringUtil.capitalizeFirst(hearing.conferenceProvider || 'Pexip')} hearing + {StringUtil.capitalizeFirst(hearing.conferenceProvider)} hearing
    Date: Thu, 1 Feb 2024 13:06:09 -0600 Subject: [PATCH 372/445] APPEALS-35176 - Update radio button to align better with label --- client/app/styles/_commons.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/app/styles/_commons.scss b/client/app/styles/_commons.scss index 0654f7f833e..97dc29d0b7d 100644 --- a/client/app/styles/_commons.scss +++ b/client/app/styles/_commons.scss @@ -1174,7 +1174,7 @@ ul { &::before { position: absolute; left: 3px; - top: 2px; + top: 6px; } } } From 2725ea1db8d385da438b76816e85bc5e9fd4a013 Mon Sep 17 00:00:00 2001 From: 631862 Date: Fri, 2 Feb 2024 09:25:54 -0500 Subject: [PATCH 373/445] Add daily docket conference links to legacy appeals --- app/models/hearing.rb | 6 +----- app/models/legacy_hearing.rb | 4 ++++ app/serializers/hearings/legacy_hearing_serializer.rb | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/models/hearing.rb b/app/models/hearing.rb index a1bf41aac91..c9dee83e65d 100644 --- a/app/models/hearing.rb +++ b/app/models/hearing.rb @@ -187,11 +187,7 @@ def advance_on_docket_motion end def daily_docket_conference_links - hearing = Hearing.find(id) - hearing_day = hearing.hearing_day - conference_links = hearing_day.conference_links - - conference_links + hearing_day.conference_links end def scheduled_for diff --git a/app/models/legacy_hearing.rb b/app/models/legacy_hearing.rb index 0ce7f44ca70..6f981225d38 100644 --- a/app/models/legacy_hearing.rb +++ b/app/models/legacy_hearing.rb @@ -345,6 +345,10 @@ def vacols_hearing_exists? end end + def daily_docket_conference_links + hearing_day.conference_links + end + class << self def venues RegionalOffice::CITIES.merge(RegionalOffice::SATELLITE_OFFICES) diff --git a/app/serializers/hearings/legacy_hearing_serializer.rb b/app/serializers/hearings/legacy_hearing_serializer.rb index 1dd8a19aa38..9f33a50fe51 100644 --- a/app/serializers/hearings/legacy_hearing_serializer.rb +++ b/app/serializers/hearings/legacy_hearing_serializer.rb @@ -41,6 +41,7 @@ class LegacyHearingSerializer end attribute :conference_provider attribute :current_issue_count + attribute :daily_docket_conference_links attribute :disposition attribute :disposition_editable attribute :docket_name From 971d1b045f5bbf0c730352510e3fcc8bb130bbd5 Mon Sep 17 00:00:00 2001 From: 631862 Date: Fri, 2 Feb 2024 09:27:01 -0500 Subject: [PATCH 374/445] Add daily docket conference link to the nonvirtual webex hearing links --- client/app/hearings/components/details/HearingLinks.jsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/app/hearings/components/details/HearingLinks.jsx b/client/app/hearings/components/details/HearingLinks.jsx index 60e96dbf099..24ea7a43573 100644 --- a/client/app/hearings/components/details/HearingLinks.jsx +++ b/client/app/hearings/components/details/HearingLinks.jsx @@ -118,17 +118,17 @@ LinkContainer.propTypes = { }; export const HearingLinks = ({ hearing, virtualHearing, isVirtual, wasVirtual, user }) => { - if (!hearing?.conferenceProvider && !isVirtual && !wasVirtual) { + if ((hearing.conferenceProvider === 'pexip') && !isVirtual && !wasVirtual) { return null; - } else if (hearing?.conferenceProvider && !isVirtual && !wasVirtual) { + } else if ((hearing.conferenceProvider === 'webex') && !isVirtual && !wasVirtual) { return ( -
    +
    {(hearing.conferenceProvider === 'webex') && ( Date: Fri, 2 Feb 2024 10:28:03 -0500 Subject: [PATCH 375/445] Show non virtual webex HC link --- .../components/details/HearingLinks.jsx | 38 ++++++++----------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/client/app/hearings/components/details/HearingLinks.jsx b/client/app/hearings/components/details/HearingLinks.jsx index 24ea7a43573..2e4f0d23a53 100644 --- a/client/app/hearings/components/details/HearingLinks.jsx +++ b/client/app/hearings/components/details/HearingLinks.jsx @@ -2,7 +2,6 @@ import { css } from 'glamor'; import PropTypes from 'prop-types'; import React from 'react'; -import { COLORS } from '../../../constants/AppConstants'; import { VIRTUAL_HEARING_HOST, virtualHearingRoleForUser } from '../../utils'; import { rowThirds, @@ -82,26 +81,21 @@ VirtualHearingLinkDetails.propTypes = { }; export const LinkContainer = ( - { link, linkText, user, hearing, isVirtual, wasVirtual, virtualHearing, role, label } + { link, linkText, user, hearing, isVirtual, wasVirtual, virtualHearing, role } ) => (
    - {label}: - {!virtualHearing || virtualHearing?.status === 'pending' ? ( - {COPY.VIRTUAL_HEARING_SCHEDULING_IN_PROGRESS} - ) : ( - - )} +
    ); @@ -118,12 +112,14 @@ LinkContainer.propTypes = { }; export const HearingLinks = ({ hearing, virtualHearing, isVirtual, wasVirtual, user }) => { + const showHostLink = virtualHearingRoleForUser(user, hearing) === VIRTUAL_HEARING_HOST; + if ((hearing.conferenceProvider === 'pexip') && !isVirtual && !wasVirtual) { return null; } else if ((hearing.conferenceProvider === 'webex') && !isVirtual && !wasVirtual) { return (
    - {(hearing.conferenceProvider === 'webex') && ( + {showHostLink && ( {showHostLink && ( From 76d60c2ac7499405fd68d0978fb23b6183a43237 Mon Sep 17 00:00:00 2001 From: Adam Ducker Date: Mon, 5 Feb 2024 07:25:18 -0600 Subject: [PATCH 376/445] APPEALS-35176 - Make margins more consistent across browsers --- client/app/queue/OrganizationUsers.jsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/client/app/queue/OrganizationUsers.jsx b/client/app/queue/OrganizationUsers.jsx index f1e8c60b279..425fb595b70 100644 --- a/client/app/queue/OrganizationUsers.jsx +++ b/client/app/queue/OrganizationUsers.jsx @@ -49,7 +49,10 @@ const titleButtonsStyle = css({ }); const radioButtonsStyle = css({ - paddingBottom: '2rem' + paddingBottom: '2rem', + '& legend': { + margin: '0' + } }); const buttonStyle = css({ From 1267c042023f4c3d661079417eb9f2d20fdb983c Mon Sep 17 00:00:00 2001 From: 631862 Date: Tue, 6 Feb 2024 16:14:30 -0500 Subject: [PATCH 377/445] Update feature tests to remove old conditions --- spec/feature/hearings/hearing_details_spec.rb | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/spec/feature/hearings/hearing_details_spec.rb b/spec/feature/hearings/hearing_details_spec.rb index dc37368f770..a844d702b82 100644 --- a/spec/feature/hearings/hearing_details_spec.rb +++ b/spec/feature/hearings/hearing_details_spec.rb @@ -73,14 +73,12 @@ def check_email_event_table(hearing, row_count) def check_virtual_hearings_links_expired(virtual_hearing) within "#vlj-hearings-link" do - find("span", text: "N/A") expect(page).to have_content( "Conference Room: #{virtual_hearing.formatted_alias_or_alias_with_host}\n" \ "PIN: #{virtual_hearing.host_pin}" ) end within "#guest-hearings-link" do - find("span", text: "N/A") expect(page).to have_content( "Conference Room: #{virtual_hearing.formatted_alias_or_alias_with_host}\n" \ "PIN: #{virtual_hearing.guest_pin}" @@ -150,24 +148,12 @@ def ensure_link_present(link, disable) click_button("Save") - expect(page).to have_no_content(expected_alert) expect(page).to have_content(virtual_hearing_alert) # expect VSO checkboxes to not be present for non-VSO users expect(page).to_not have_content(COPY::CONVERT_HEARING_TYPE_CHECKBOX_AFFIRM_ACCESS) expect(page).to_not have_content(COPY::CONVERT_HEARING_TYPE_CHECKBOX_AFFIRM_PERMISSION) - # Test the links are not present - within "#vlj-hearings-link" do - expect(page).to have_content("Scheduling in progress") - end - within "#guest-hearings-link" do - expect(page).to have_content("Scheduling in progress") - end - - expect(page).to have_content(expected_alert) - check_virtual_hearings_links(hearing.reload.virtual_hearing) - # Check the Email Notification History check_email_event_table(hearing, 2) @@ -395,18 +381,6 @@ def ensure_link_present(link, disable) create(:virtual_hearing, :all_emails_sent, hearing: hearing) end - scenario "displays in progress when the virtual hearing is being scheduled" do - visit "hearings/" + hearing.external_id.to_s + "/details" - - # Test the links are not present - within "#vlj-hearings-link" do - expect(page).to have_content("Scheduling in progress") - end - within "#guest-hearings-link" do - expect(page).to have_content("Scheduling in progress") - end - end - context "after the virtual hearing is scheduled" do let!(:hearing_day) { create(:hearing_day, scheduled_for: Date.yesterday - 2) } let!(:virtual_hearing) do From f05cdba08911d4238dd7b715179fd9d269b70e5f Mon Sep 17 00:00:00 2001 From: breedbah Date: Wed, 7 Feb 2024 08:40:36 -0500 Subject: [PATCH 378/445] APPEALS-36652 heearing_spec update --- spec/models/hearing_spec.rb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/spec/models/hearing_spec.rb b/spec/models/hearing_spec.rb index ac0b2d60841..a6ab1d17840 100644 --- a/spec/models/hearing_spec.rb +++ b/spec/models/hearing_spec.rb @@ -312,4 +312,18 @@ include_examples "Conference provider values are transferred between base entity and new hearings" end + + context "#daily_docket_conference_links" do + let(:hearing_day) { create(:hearing_day) } + let(:hearing) { create(:hearing, hearing_day: hearing_day) } + let(:conference_links) { "https://example.com" } + + before do + allow(hearing_day).to receive(:conference_links).and_return(conference_links) + end + + it "returns the conference links of the hearing day" do + expect(hearing.daily_docket_conference_links).to eq(conference_links) + end + end end From 5416f3dccbb73e0a7459d355f5bc8b9f8e73f9b3 Mon Sep 17 00:00:00 2001 From: 631862 Date: Wed, 7 Feb 2024 13:04:11 -0500 Subject: [PATCH 379/445] Updated jest testing in progress --- .../components/details/HearingLinks.test.js | 41 +- .../__snapshots__/HearingLinks.test.js.snap | 776 +++++++++++++++++- client/test/data/hearings.js | 112 +++ 3 files changed, 895 insertions(+), 34 deletions(-) diff --git a/client/test/app/hearings/components/details/HearingLinks.test.js b/client/test/app/hearings/components/details/HearingLinks.test.js index 36c1194bdbd..fd8c62d5193 100644 --- a/client/test/app/hearings/components/details/HearingLinks.test.js +++ b/client/test/app/hearings/components/details/HearingLinks.test.js @@ -3,7 +3,7 @@ import React from 'react'; import { HearingLinks } from 'app/hearings/components/details/HearingLinks'; import { anyUser, vsoUser } from 'test/data/user'; import { inProgressvirtualHearing } from 'test/data/virtualHearings'; -import { virtualHearing, amaHearing } from 'test/data/hearings'; +import { virtualHearing, amaHearing, virtualWebexHearing, nonVirtualWebexHearing } from 'test/data/hearings'; import { mount } from 'enzyme'; import VirtualHearingLink from 'app/hearings/components/VirtualHearingLink'; @@ -13,16 +13,7 @@ const hearing = { }; describe('HearingLinks', () => { - test('Matches snapshot with default props when passed in', () => { - const form = mount( - - ); - - expect(form).toMatchSnapshot(); - expect(form.find(VirtualHearingLink)).toHaveLength(0); - }); - - test('Matches snapshot when hearing is virtual and in progress', () => { + test('Matches snapshot when hearing is virtual, pexip, and in progress', () => { const form = mount( { ).toHaveLength(2); }); + test('Matches snapshot when hearing is virtual, webex, and in progress', () => { + const form = mount( + + ); + + expect(form).toMatchSnapshot(); + expect(form.find('HearingLinks')).toHaveLength(3); + expect( + form.find('VirtualHearingLinkDetails').exists({ label: 'Join Hearing' }) + ).toBe(true); + expect( + form.find('VirtualHearingLinkDetails').exists({ label: 'Start Hearing' }) + ).toBe(true); + }) + + // test('Matches snapshot when hearing is non-virtual, webex, and in progress', () => { + // const form = mount( + // + // ) + // }); + test('Only displays Guest Link when user is not a host', () => { const form = mount( - - VLJ Link - : - - - Guest Link - : - `; +exports[`HearingLinks Matches snapshot when hearing is virtual, webex, and in progress 1`] = ` + +
    + +