Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

MM-19142 - Update webapp dependencies #4128

Merged
merged 22 commits into from
Nov 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
49905f3
Merge pull request #1 from mattermost/master
reflog Mar 25, 2019
5a7c33d
Merge branch 'master' of github.com:reflog/mattermost-webapp
reflog Mar 31, 2019
5408ca2
Merge branch 'master' of github.com:reflog/mattermost-webapp
reflog Apr 2, 2019
2356c9c
Merge branch 'master' of github.com:reflog/mattermost-webapp
reflog Apr 16, 2019
08e0221
Merge branch 'master' of github.com:reflog/mattermost-webapp
reflog May 28, 2019
c2df40f
Merge branch 'master' of github.com:reflog/mattermost-webapp
reflog Jun 11, 2019
deb4afe
Merge branch 'master' of github.com:reflog/mattermost-webapp
reflog Jun 17, 2019
d17130f
Merge branch 'master' of github.com:reflog/mattermost-webapp
reflog Jul 3, 2019
a2cf0d0
Merge branch 'master' of github.com:reflog/mattermost-webapp
reflog Jul 4, 2019
2881205
Merge branch 'master' of github.com:reflog/mattermost-webapp
reflog Jul 7, 2019
33a751c
Merge branch 'master' of github.com:reflog/mattermost-webapp
reflog Oct 21, 2019
afd61f0
Fist pass on upgrading packages
reflog Nov 4, 2019
b6c4f8d
Second pass
reflog Nov 4, 2019
7e01688
Second pass
reflog Nov 4, 2019
f70aa62
Merge remote-tracking branch 'upstream/master' into MM-19142
reflog Nov 5, 2019
8e03c16
snapshots
reflog Nov 5, 2019
4cc7687
fixes eslint errors
reflog Nov 5, 2019
53e3b49
sass loader fix, tsc fix
reflog Nov 5, 2019
d253048
storybook fix, removed redundand test - it's handled by typescript
reflog Nov 5, 2019
9d40a5c
silly lint
reflog Nov 5, 2019
0b43c97
Merge remote-tracking branch 'upstream/master' into MM-19142
reflog Nov 5, 2019
d16f20c
reorg dependencies
reflog Nov 5, 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
3 changes: 3 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
},
"rules": {
"import/no-unresolved": 2,
"comma-dangle": 0,
"import/order": [
"error",
{
Expand Down Expand Up @@ -77,8 +78,10 @@
"plugin:cypress/recommended"
],
"rules": {
"comma-dangle": 0,
"@typescript-eslint/no-non-null-assertion": 0,
"@typescript-eslint/no-var-requires": 0,
"@typescript-eslint/no-empty-function": 0,
"@typescript-eslint/prefer-interface": 0,
"@typescript-eslint/explicit-function-return-type": 0,
"@typescript-eslint/indent": [
Expand Down
4 changes: 3 additions & 1 deletion .storybook/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ module.exports = async ({config, mode}) => {
{
loader: 'sass-loader',
options: {
includePaths: ['node_modules/compass-mixins/lib', 'sass'],
sassOptions: {
includePaths: ['node_modules/compass-mixins/lib', 'sass'],
},
},
},
],
Expand Down
4 changes: 2 additions & 2 deletions components/analytics/doughnut_chart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ export default class DoughnutChart extends React.PureComponent<Props> {
if (!this.refs.canvas) {
return;
}
var el = ReactDOM.findDOMNode(this.refs.canvas) as HTMLCanvasElement;
var ctx = el.getContext('2d') as CanvasRenderingContext2D;
const el = ReactDOM.findDOMNode(this.refs.canvas) as HTMLCanvasElement;
const ctx = el.getContext('2d') as CanvasRenderingContext2D;
const dataCopy = JSON.parse(JSON.stringify(this.props.data));
this.chart = new Chart(ctx, {type: 'doughnut', data: dataCopy, options: {}});
if (update && this.chart) {
Expand Down
12 changes: 6 additions & 6 deletions components/analytics/format.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export function formatPostDoughtnutData(filePosts: any, hashtagPosts: any, total
}

export function formatPostsPerDayData(data: any) {
var chartData = {
const chartData = {
labels: [] as any,
datasets: [{
fillColor: 'rgba(151,187,205,0.2)',
Expand All @@ -49,9 +49,9 @@ export function formatPostsPerDayData(data: any) {
}],
};

for (var index in data) {
for (const index in data) {
if (data[index]) {
var row = data[index];
const row = data[index];
chartData.labels.push(row.name);
chartData.datasets[0].data.push(row.value);
}
Expand All @@ -61,7 +61,7 @@ export function formatPostsPerDayData(data: any) {
}

export function formatUsersWithPostsPerDayData(data: any) {
var chartData = {
const chartData = {
labels: [] as any,
datasets: [{
label: '',
Expand All @@ -75,9 +75,9 @@ export function formatUsersWithPostsPerDayData(data: any) {
}],
};

for (var index in data) {
for (const index in data) {
if (data[index]) {
var row = data[index];
const row = data[index];
chartData.labels.push(row.name);
chartData.datasets[0].data.push(row.value);
}
Expand Down
2 changes: 0 additions & 2 deletions components/color_input.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,6 @@ describe('components/ColorInput', () => {

const newColorData: any = {hex: '#ccc'};

// Ignoring for now since this test won't matter after TS conversion
// @ts-ignore
wrapper.instance().handleChange(newColorData);

expect(onChange).toHaveBeenCalledTimes(1);
Expand Down
2 changes: 1 addition & 1 deletion components/color_input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class ColorInput extends React.PureComponent<Props, State> {
this.setState({isOpened: !this.state.isOpened});
};

private handleChange = (newColorData: ColorResult) => {
public handleChange = (newColorData: ColorResult) => {
const {hex} = newColorData;
const {onChange: handleChange} = this.props;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,15 @@ exports[`components/CopyUrlContextMenu should copy absolute url on click 1`] = `
onHide={[Function]}
onMouseLeave={[Function]}
onShow={[Function]}
preventHideOnContextMenu={false}
preventHideOnResize={false}
preventHideOnScroll={false}
rtl={false}
style={Object {}}
>
<MenuItem
attributes={Object {}}
className=""
data={Object {}}
disabled={false}
divider={false}
Expand All @@ -38,6 +42,7 @@ exports[`components/CopyUrlContextMenu should copy absolute url on click 1`] = `
disableIfShiftIsPressed={false}
holdToDisplay={-1}
id="copy-url-context-menuresource"
mouseButton={2}
posX={0}
posY={0}
renderTag="div"
Expand All @@ -59,11 +64,15 @@ exports[`components/CopyUrlContextMenu should copy relative url on click 1`] = `
onHide={[Function]}
onMouseLeave={[Function]}
onShow={[Function]}
preventHideOnContextMenu={false}
preventHideOnResize={false}
preventHideOnScroll={false}
rtl={false}
style={Object {}}
>
<MenuItem
attributes={Object {}}
className=""
data={Object {}}
disabled={false}
divider={false}
Expand All @@ -87,6 +96,7 @@ exports[`components/CopyUrlContextMenu should copy relative url on click 1`] = `
disableIfShiftIsPressed={false}
holdToDisplay={-1}
id="copy-url-context-menuresource"
mouseButton={2}
posX={0}
posY={0}
renderTag="div"
Expand Down
2 changes: 1 addition & 1 deletion components/error_page/error_page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default class ErrorPage extends React.PureComponent<Props> {
const params: URLSearchParams = new URLSearchParams(this.props.location.search);
const signature = params.get('s');

var trustParams = false;
let trustParams = false;
if (signature) {
params.delete('s');

Expand Down
2 changes: 1 addition & 1 deletion components/multiselect/multiselect.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ describe('components/multiselect/multiselect', () => {
const totalCount = 8;
const optionsNumber = 8;
const users = [];
for (var i = 0; i < optionsNumber; i++) {
for (let i = 0; i < optionsNumber; i++) {
users.push({id: `${i}`, label: `${i}`, value: `${i}`});
}

Expand Down
4 changes: 2 additions & 2 deletions components/multiselect/multiselect_list.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export default class MultiSelectList extends React.Component<Props, State> {
onAction: () => null,
};

private toSelect: number = -1
private toSelect = -1
private listRef = React.createRef<HTMLDivElement>()
private selectedRef = React.createRef<HTMLDivElement>()

Expand Down Expand Up @@ -126,7 +126,7 @@ export default class MultiSelectList extends React.Component<Props, State> {
}

private defaultOptionRenderer = (option: Value, isSelected: boolean, onAdd: Props['onAdd']) => {
var rowSelected = '';
let rowSelected = '';
if (isSelected) {
rowSelected = 'more-modal__row--selected';
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -226,13 +226,16 @@ exports[`components/select_team/components/SelectTeamItem should match snapshot,
"useCallback": [Function],
"useContext": [Function],
"useDebugValue": [Function],
"useDeferredValue": [Function],
"useEffect": [Function],
"useImperativeHandle": [Function],
"useLayoutEffect": [Function],
"useMemo": [Function],
"useReducer": [Function],
"useRef": [Function],
"useResponder": [Function],
"useState": [Function],
"useTransition": [Function],
},
"_element": <SelectTeamItem
canJoinPrivateTeams={false}
Expand Down
14 changes: 0 additions & 14 deletions components/widgets/admin_console/admin_header.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,4 @@ describe('components/widgets/admin_console/AdminHeader', () => {
`
);
});

test('children prop is mandatory', () => {
const originalError = console.error;
console.error = jest.fn();

// Ignoring since this is a prop check which will go away with TS conversion
// @ts-ignore
shallow(<AdminHeader/>);

expect(console.error).toBeCalledTimes(1);
expect(console.error).toBeCalledWith('Warning: Failed prop type: The prop `children` is marked as required in `AdminHeader`, but its value is `undefined`.\n in AdminHeader');

console.error = originalError;
});
});
2 changes: 1 addition & 1 deletion components/widgets/admin_console/admin_header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import React from 'react';

type Props = {
children: React.ReactNode;
children: JSX.Element[] | JSX.Element | string;
};

export default class AdminHeader extends React.Component<Props> {
Expand Down
Loading