Skip to content
This repository has been archived by the owner on May 7, 2021. It is now read-only.

Merge Master into staging, V1.1.0 #1699

Merged
merged 33 commits into from
Mar 19, 2020
Merged

Merge Master into staging, V1.1.0 #1699

merged 33 commits into from
Mar 19, 2020

Conversation

sastels
Copy link
Contributor

@sastels sastels commented Mar 19, 2020

Description

merge master into staging

To create this PR, I clicked "New pull request" on the main page, then chose the branches appropriately (ie from master and into release-rcmp-staging"

anikbrazeau and others added 30 commits March 6, 2020 15:35
* adding one word on the info page

* fix
Snyk has created this PR to upgrade mongodb from 3.5.2 to 3.5.3.

See this package in NPM:
https://www.npmjs.com/package/mongodb

See this project in Snyk:
https://app.snyk.io/org/cds-snc/project/232bd9dd-228e-4143-add6-b03510d9d062?utm_source=github&utm_medium=upgrade-pr

Co-authored-by: Steve Astels <sastels@users.noreply.github.com>
Snyk has created this PR to upgrade react-scripts from 3.3.1 to 3.4.0.

See this package in NPM:
https://www.npmjs.com/package/react-scripts

See this project in Snyk:
https://app.snyk.io/org/cds-snc/project/232bd9dd-228e-4143-add6-b03510d9d062?utm_source=github&utm_medium=upgrade-pr

Co-authored-by: Steve Astels <sastels@users.noreply.github.com>
It was noticed today that we need to specify the subscription when configuring logging to write to a Log analytics workspace which isn't within the same subscription.
* more detailed p and text stories

* modified the PR template to ensure we document our code

* added periods
* added list to sb doc

* links added to sb
* added getting started page to storybook

* checkbox stories
Yesterday CAFC moved to HTTPS, this broke our allowed origins.

Co-authored-by: dhcdn <51758091+davidheerema@users.noreply.github.com>
* clean up logging a bit

* refactor a bit and fix linting

Co-authored-by: dhcdn <51758091+davidheerema@users.noreply.github.com>
…" button (#1666)

* chang "go back" button's height to the same height as "cancel report" button on confirmCancel page

* delete the unneeded line
* added Messages component. Exports different message types: alerts and wells. Needs a test

* added tests to Message components

* updated all pages and forms using alerts

* linted
* 1st attmpt, code doesn't work yet

* 2nd attmpt, app is crush but able to return number of reports between two submit time

* use system current date for query the database

* set number of submission with query result

* create async function for availableData

* check number of submission at landing page and remove unused code for checkIfAvailable.js

* remove unused logging

* fixed logging message

* removed unnecessary log

* remove more log

Co-authored-by: Kevin Yang <kevinyang@Kevins-RCMP-MacBook-Pro.local>
Co-authored-by: Kevin Yang <kevinyang@Kevins-RCMP-MBP.ross.rcmp-grc.gc.ca>
* working FormArrayControl component and Adapters for radio and checkboxes

* broken, but added a Field component to ease markup

* rebuilt the howdiditstart page using checkbox component.

* lint and passing tests. Not all new components have tests

* added a test for FormArrayControl

* cleaned up inputs, they also work properly now.

* tweaked input and text-area to accept attributes from react-final-form

* passing tests

* added condition to prevent rendering of node if conditional field doesn't exist

* some tweaks to ensure correct labelling of fields

* #1312-  Added the privacy consent checkbox fixes

* #1312-  Added whatWasAffected checkbox fixes

* cleanups

* Added the money lost checkbox fixes

* Added the missing UI container

* Added the information page checkbox fixes

* Added the conditional form for single field

* Merge conflicts

* Added missing dependencies

* validation appearance

* draft of validation error component. whatwasaffectedpage

* added translations

* ErrorSummary component. Needs a test

* added a test for error summary

* merged and fixed translations on wwaffected page

* fixed lgtm issues

* linted

* a11y fix for aria-atomic

* removed ref in what happened form

* scroll to error summary on render

Co-authored-by: Khalid El Aggan <khalid.elaggan@cds-snc.ca>
Co-authored-by: khalid elaggan <khalidelaggan@users.noreply.github.com>
Co-authored-by: Kevin Yang <kevinyang@Kevins-RCMP-MacBook-Pro.local>
Co-authored-by: ngosset <norman.gosset@cds-snc.ca>
Co-authored-by: DianeLiu2019 <51336707+DianeLiu2019@users.noreply.github.com>
davidheerema and others added 3 commits March 18, 2020 18:20
The Continuous deployment was not working.  I need to add these IP ranges as specified by MS in order to allow communication from the ACR.  See bit.ly/2xGlegR for details.
* 1st attmpt, code need debug

* fixed rendering error

* implement onSubmit with validation

* remove unnecessary console log

Co-authored-by: Kevin Yang <kevinyang@Kevins-RCMP-MacBook-Pro.local>
Co-authored-by: ngosset <norman.gosset@cds-snc.ca>
* [WIP] cypress pack initial commit

* Added the first 101 test for RCMP QC training

* remove unwanted tests

* working FormArrayControl component and Adapters for radio and checkboxes

* broken, but added a Field component to ease markup

* rebuilt the howdiditstart page using checkbox component.

* lint and passing tests. Not all new components have tests

* added a test for FormArrayControl

* Resolved Merge Conflict with deleted dev dependencies

* [RCMP QC] 101 demo and training tests

* [RCMP QC Training] How to read fixture data

* Merge Master into Cypress

* Added a simple step definition file + cleanups

* Generate e2e test report for RCMP QC team demo

* Enabled only HTML output format

* Added Staging url placeholder

* Added axe checks to the HP

* Added visual test folders

* Added the correct verb

* updated with direct path as this won't work on windows

* [Testing] Adding tests - configs

* Adding the missing scripts

* Added to the correct workflow

* Syntax error -  try again

* Syntax error -

* Another check failed

* another fail testing

* Added to ignore

* Added start-server-and-test

* More tweaks

* Testing the CLI

* Another test to debug things

* Updated

* Update the lock file

* Updated with recent cypress dependencies

* Cypress dependencies

* Testing the action log

* Github actions to run local instance

* Debugging - Initiate a test without the reference

* Debugging - added back the step definition config

* Debugging - another failed attempt -  not reading the cucumber preprocessor in CI build

* Testing smart tagging in CI

* simplifying the test further

* Testing the new upgrade + Firefox support added

* Removed testing reports for now

* Testing smoke tag with QC

* Trigger another test

* Added a11y tracker + misc

* Added a11y

* cleanup

* Cleanup + add new tests

* Update the package-lock

* Fixed merge conflict

* Prepare for minimal testing

* Updated a fresh copy

* Running a minimal test in CI

* No needed for this release

* file sync

* Adding more config to properly run a11y

* Testing configs for a11y

* typo

* Remove the fake passport images

Co-authored-by: Philippe Caron <amazingphilippe@gmail.com>
@sastels sastels temporarily deployed to rac-prototyp-master-vlfd2bsfmr March 19, 2020 14:28 Inactive
@lgtm-com
Copy link

lgtm-com bot commented Mar 19, 2020

This pull request introduces 1 alert when merging 9650471 into 6195d7a - view on LGTM.com

new alerts:

  • 1 for Unused variable, import, function or class

@sastels sastels requested a review from lmcbhvu March 19, 2020 14:34
Copy link
Contributor

@davidheerema davidheerema left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@sastels sastels merged commit 8063d3a into release-rcmp-staging Mar 19, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants