Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Package Audit #748

Merged
merged 9 commits into from
Nov 20, 2019
Merged

Package Audit #748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
23a6da6
Update react and react-redux as part of security audit
ericnewcomer Nov 13, 2019
314f4a1
Remove FlipMove, rewrite Webook test in RTL
ericnewcomer Nov 13, 2019
2d85cb7
Update to latest react-select
ericnewcomer Nov 14, 2019
391035b
More updates for new react-select
ericnewcomer Nov 14, 2019
f6386a6
Merge branch 'master' into package_update
ericnewcomer Nov 20, 2019
dce15cf
Switch to flexbox for action title bars
ericnewcomer Nov 20, 2019
5d6df06
Update tests to reflect flexbox layout
ericnewcomer Nov 20, 2019
f7bc2c1
Fix missing option labels and scroll speed with latest react-select
ericnewcomer Nov 20, 2019
8098183
Update snapshots for asset selector defaults
ericnewcomer Nov 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@
"@types/react-addons-shallow-compare": "0.14.22",
"@types/react-dom": "16.8.4",
"@types/react-modal": "^3.8.1",
"@types/react-redux": "5.0.15",
"@types/react-select": "2.0.19",
"@types/react-redux": "7.1.3",
"@types/react-select": "3.0.8",
"@types/redux-mock-store": "^1.0.0",
"@types/textarea-caret": "3.0.0",
"@types/uniqid": "^4.1.2",
Expand Down Expand Up @@ -130,16 +130,17 @@
"raf": "^3.4.0",
"react-addons-shallow-compare": "15.6.2",
"react-autosize-textarea": "4.0.0",
"react-flip-move": "3.0.3",
"react-flip-move": "3.0.4",
"react-flip-toolkit": "7.0.7",
"react-i18next": "11.0.1",
"react-markdown": "4.0.8",
"react-media-player": "0.7.6",
"react-modal": "3.8.1",
"react-page-visibility": "3.2.1",
"react-player": "1.9.3",
"react-redux": "5.0.7",
"react-redux": "7.1.3",
"react-scripts": "3.0.1",
"react-select": "2.4.4",
"react-select": "3.0.8",
"react-sortable-hoc": "1.9.1",
"redux": "3.7.2",
"redux-devtools-extension": "^2.13.5",
Expand Down
8 changes: 3 additions & 5 deletions src/components/flow/Flow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ export class Flow extends React.Component<FlowStoreProps, {}> {
this.Plumber.reset();
}

public componentWillUpdate(prevProps: FlowStoreProps): void {
public UNSAFE_componentWillUpdate(prevProps: FlowStoreProps): void {
if (
prevProps.editorState.activityInterval === this.props.editorState.activityInterval &&
this.props.editorState.activityInterval !== ACTIVITY_INTERVAL
Expand Down Expand Up @@ -219,6 +219,7 @@ export class Flow extends React.Component<FlowStoreProps, {}> {
*/
private onConnectorDrop(event: ConnectionEvent): boolean {
const { ghostNode } = this.props.editorState;

// Don't show the node editor if we a dragging back to where we were
if (isRealValue(ghostNode) && !isDraggingBack(event)) {
// Wire up the drag from to our ghost node
Expand All @@ -229,10 +230,7 @@ export class Flow extends React.Component<FlowStoreProps, {}> {

// Save our position for later
const { left, top } = (this.ghost &&
snapToGrid(
this.ghost.wrappedInstance.ele.offsetLeft,
this.ghost.wrappedInstance.ele.offsetTop
)) || { left: 0, top: 0 };
snapToGrid(this.ghost.ele.offsetLeft, this.ghost.ele.offsetTop)) || { left: 0, top: 0 };

this.props.editorState.ghostNode.ui.position = { left, top };
let originalAction = null;
Expand Down
4 changes: 3 additions & 1 deletion src/components/flow/actions/action/Action.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,9 @@ const mapDispatchToProps = (dispatch: DispatchWithState) =>

const ConnectedActionWrapper = connect(
mapStateToProps,
mapDispatchToProps
mapDispatchToProps,
null,
{ forwardRef: true }
)(ActionWrapper);

export default ConnectedActionWrapper;
110 changes: 55 additions & 55 deletions src/components/flow/actions/startsession/__snapshots__/StartSessionForm.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,28 +177,28 @@ exports[`StartSessionForm render should render 1`] = `
class="ele"
>
<div
class="css-1pcexqc-container react-select selection"
class="react-select selection css-2b097c-container"
>
<div
class="css-en22e2-control"
class=" css-1h1mxjq-control"
>
<div
class="css-1hwfws3"
class=" css-1hwfws3"
>
<div
class="css-8ql5qv-multiValue"
class="css-bgswfd-multiValue"
>
<div
class="css-12jo7m5"
>
Cat Fanciers
</div>
<div
class="css-1alnv5e"
class="css-xb97g8"
>
<svg
aria-hidden="true"
class="css-19bqh2r"
class="css-6q0nyr-Svg"
focusable="false"
height="14"
viewBox="0 0 20 20"
Expand All @@ -211,19 +211,19 @@ exports[`StartSessionForm render should render 1`] = `
</div>
</div>
<div
class="css-8ql5qv-multiValue"
class="css-bgswfd-multiValue"
>
<div
class="css-12jo7m5"
>
Norbert Kwizera
</div>
<div
class="css-1alnv5e"
class="css-xb97g8"
>
<svg
aria-hidden="true"
class="css-19bqh2r"
class="css-6q0nyr-Svg"
focusable="false"
height="14"
viewBox="0 0 20 20"
Expand All @@ -236,19 +236,19 @@ exports[`StartSessionForm render should render 1`] = `
</div>
</div>
<div
class="css-8ql5qv-multiValue"
class="css-bgswfd-multiValue"
>
<div
class="css-12jo7m5"
>
Rowan Seymour
</div>
<div
class="css-1alnv5e"
class="css-xb97g8"
>
<svg
aria-hidden="true"
class="css-19bqh2r"
class="css-6q0nyr-Svg"
focusable="false"
height="14"
viewBox="0 0 20 20"
Expand All @@ -261,7 +261,7 @@ exports[`StartSessionForm render should render 1`] = `
</div>
</div>
<div
class="css-10fb2c7"
class="css-1al1kbh-Input"
>
<div
class=""
Expand All @@ -286,15 +286,15 @@ exports[`StartSessionForm render should render 1`] = `
</div>
</div>
<div
class="css-1wy0on6"
class=" css-1hb7zxy-IndicatorsContainer"
>
<div
aria-hidden="true"
class="css-16pqwjk-indicatorContainer"
class=" css-tlfecz-indicatorContainer"
>
<svg
aria-hidden="true"
class="css-19bqh2r"
class="css-6q0nyr-Svg"
focusable="false"
height="20"
viewBox="0 0 20 20"
Expand All @@ -306,15 +306,15 @@ exports[`StartSessionForm render should render 1`] = `
</svg>
</div>
<span
class="css-bgvzuu-indicatorSeparator"
class=" css-1okebmr-indicatorSeparator"
/>
<div
aria-hidden="true"
class="css-16pqwjk-indicatorContainer"
class=" css-tlfecz-indicatorContainer"
>
<svg
aria-hidden="true"
class="css-19bqh2r"
class="css-6q0nyr-Svg"
focusable="false"
height="20"
viewBox="0 0 20 20"
Expand All @@ -335,21 +335,21 @@ exports[`StartSessionForm render should render 1`] = `
class="ele"
>
<div
class="css-1pcexqc-container react-select selection"
class="react-select selection css-2b097c-container"
>
<div
class="css-en22e2-control"
class=" css-1h1mxjq-control"
>
<div
class="css-1hwfws3"
class=" css-1hwfws3"
>
<div
class="css-whijrq-singleValue"
class=" css-1sdgdfu-singleValue"
>
Flow to Start
</div>
<div
class="css-10fb2c7"
class="css-1al1kbh-Input"
>
<div
class=""
Expand All @@ -374,18 +374,18 @@ exports[`StartSessionForm render should render 1`] = `
</div>
</div>
<div
class="css-1wy0on6"
class=" css-1hb7zxy-IndicatorsContainer"
>
<span
class="css-bgvzuu-indicatorSeparator"
class=" css-1okebmr-indicatorSeparator"
/>
<div
aria-hidden="true"
class="css-16pqwjk-indicatorContainer"
class=" css-tlfecz-indicatorContainer"
>
<svg
aria-hidden="true"
class="css-19bqh2r"
class="css-6q0nyr-Svg"
focusable="false"
height="20"
viewBox="0 0 20 20"
Expand Down Expand Up @@ -830,21 +830,21 @@ exports[`StartSessionForm render should render contact query 1`] = `
class="ele"
>
<div
class="css-1pcexqc-container react-select selection"
class="react-select selection css-2b097c-container"
>
<div
class="css-en22e2-control"
class=" css-1h1mxjq-control"
>
<div
class="css-1hwfws3"
class=" css-1hwfws3"
>
<div
class="css-whijrq-singleValue"
class=" css-1sdgdfu-singleValue"
>
Flow to Start
</div>
<div
class="css-10fb2c7"
class="css-1al1kbh-Input"
>
<div
class=""
Expand All @@ -869,18 +869,18 @@ exports[`StartSessionForm render should render contact query 1`] = `
</div>
</div>
<div
class="css-1wy0on6"
class=" css-1hb7zxy-IndicatorsContainer"
>
<span
class="css-bgvzuu-indicatorSeparator"
class=" css-1okebmr-indicatorSeparator"
/>
<div
aria-hidden="true"
class="css-16pqwjk-indicatorContainer"
class=" css-tlfecz-indicatorContainer"
>
<svg
aria-hidden="true"
class="css-19bqh2r"
class="css-6q0nyr-Svg"
focusable="false"
height="20"
viewBox="0 0 20 20"
Expand Down Expand Up @@ -1118,21 +1118,21 @@ exports[`StartSessionForm render should render create new contacts 1`] = `
class="ele"
>
<div
class="css-1pcexqc-container react-select selection"
class="react-select selection css-2b097c-container"
>
<div
class="css-en22e2-control"
class=" css-1h1mxjq-control"
>
<div
class="css-1hwfws3"
class=" css-1hwfws3"
>
<div
class="css-whijrq-singleValue"
class=" css-1sdgdfu-singleValue"
>
Flow to Start
</div>
<div
class="css-10fb2c7"
class="css-1al1kbh-Input"
>
<div
class=""
Expand All @@ -1157,18 +1157,18 @@ exports[`StartSessionForm render should render create new contacts 1`] = `
</div>
</div>
<div
class="css-1wy0on6"
class=" css-1hb7zxy-IndicatorsContainer"
>
<span
class="css-bgvzuu-indicatorSeparator"
class=" css-1okebmr-indicatorSeparator"
/>
<div
aria-hidden="true"
class="css-16pqwjk-indicatorContainer"
class=" css-tlfecz-indicatorContainer"
>
<svg
aria-hidden="true"
class="css-19bqh2r"
class="css-6q0nyr-Svg"
focusable="false"
height="20"
viewBox="0 0 20 20"
Expand Down Expand Up @@ -1626,21 +1626,21 @@ exports[`StartSessionForm render should warn about invalid fields in contact que
class="ele"
>
<div
class="css-1pcexqc-container react-select selection"
class="react-select selection css-2b097c-container"
>
<div
class="css-en22e2-control"
class=" css-1h1mxjq-control"
>
<div
class="css-1hwfws3"
class=" css-1hwfws3"
>
<div
class="css-whijrq-singleValue"
class=" css-1sdgdfu-singleValue"
>
Flow to Start
</div>
<div
class="css-10fb2c7"
class="css-1al1kbh-Input"
>
<div
class=""
Expand All @@ -1665,18 +1665,18 @@ exports[`StartSessionForm render should warn about invalid fields in contact que
</div>
</div>
<div
class="css-1wy0on6"
class=" css-1hb7zxy-IndicatorsContainer"
>
<span
class="css-bgvzuu-indicatorSeparator"
class=" css-1okebmr-indicatorSeparator"
/>
<div
aria-hidden="true"
class="css-16pqwjk-indicatorContainer"
class=" css-tlfecz-indicatorContainer"
>
<svg
aria-hidden="true"
class="css-19bqh2r"
class="css-6q0nyr-Svg"
focusable="false"
height="20"
viewBox="0 0 20 20"
Expand Down
Loading