Skip to content

fix: upgrade argo-ui components to latest -- 3.4 backport #12998

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

Merged
agilgur5 merged 1 commit into from
May 4, 2024
Merged

fix: upgrade argo-ui components to latest -- 3.4 backport #12998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"node": ">=20"
},
"dependencies": {
"argo-ui": "https://github.com/argoproj/argo-ui.git#v2.5.0",
"argo-ui": "git+https://github.com/argoproj/argo-ui.git#87d27fb1cb4f6e3ac4a49f85747e471b2efa7512",
"chart.js": "^2.9.4",
"chartjs-plugin-annotation": "^0.5.7",
"classnames": "^2.3.2",
Expand Down Expand Up @@ -60,12 +60,13 @@
"@types/react-router-dom": "^4.2.3",
"@types/superagent": "^4.1.16",
"@types/swagger-ui-react": "^4.11.0",
"babel-jest": "^29.5.0",
"@types/uuid": "^9.0.1",
"babel-jest": "^29.6.2",
"babel-loader": "^8.3.0",
"copy-webpack-plugin": "^5.1.2",
"copyfiles": "^2.4.1",
"file-loader": "^6.2.0",
"glob": "^9.3.2",
"glob": "^10.3.3",
Copy link
Copy Markdown

@agilgur5 agilgur5 May 4, 2024

Choose a reason for hiding this comment

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

Hmm glob and babel-jest weren't changed in #11585 and you didn't mention them in your PR description -- possible incorrect merge conflict resolution?

I do see that #11585 already had them at these versions though, not sure if you intentionally bumped them?

Copy link
Copy Markdown

@agilgur5 agilgur5 May 4, 2024

Choose a reason for hiding this comment

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

babel-jest looks like all dependabot updates and only patches and minors: #11307 and #11478

Copy link
Copy Markdown

@agilgur5 agilgur5 May 4, 2024

Choose a reason for hiding this comment

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

Looks like glob was also all dependabot updates, including dependabot doing a breaking change (i.e. one of the reasons I disabled it for non-security in #12487). #10862, #10915, and several more until #11328

Copy link
Copy Markdown

@agilgur5 agilgur5 May 4, 2024

Choose a reason for hiding this comment

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

Oh right, and then I removed glob in #11630 anyway as it was unused

"html-webpack-plugin": "^4.5.2",
"jest": "^26.6.3",
"monaco-editor-webpack-plugin": "^6.0.0",
Expand Down Expand Up @@ -95,6 +96,7 @@
"prismjs": "1.27.0",
"@types/react": "16.8.5",
"autolinker": "3.16.1",
"fast-json-patch": "3.1.1"
"fast-json-patch": "3.1.1",
"react-toastify": "9.0.3"
}
}
2 changes: 1 addition & 1 deletion ...app/archived-workflows/components/archived-workflow-details/archived-workflow-details.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {NotificationType, Page, SlidingPanel} from 'argo-ui';
import * as classNames from 'classnames';
import classNames from 'classnames';
import * as React from 'react';
import {useContext, useEffect, useState} from 'react';
import {RouteComponentProps} from 'react-router';
Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/event-sources/components/event-source-list/event-source-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Page, SlidingPanel, Tabs} from 'argo-ui';
import * as classNames from 'classnames';
import classNames from 'classnames';
import * as React from 'react';
import {useContext, useEffect, useState} from 'react';
import {Link, RouteComponentProps} from 'react-router-dom';
Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/sensors/components/sensor-list/sensor-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Page, SlidingPanel} from 'argo-ui';
import * as classNames from 'classnames';
import classNames from 'classnames';
import * as React from 'react';
import {useContext, useEffect, useState} from 'react';
import {Link, RouteComponentProps} from 'react-router-dom';
Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/shared/components/dropdown/dropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as classNames from 'classnames';
import classNames from 'classnames';
import * as React from 'react';
import * as ReactDOM from 'react-dom';
import {BehaviorSubject, fromEvent, merge, Subscription} from 'rxjs';
Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/shared/components/filter-drop-down.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Checkbox} from 'argo-ui';
import * as classNames from 'classnames';
import classNames from 'classnames';
import * as React from 'react';
import {DropDown} from './dropdown/dropdown';

Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/shared/components/phase-icon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as classNames from 'classnames';
import classNames from 'classnames';
import * as React from 'react';
import {Utils} from '../utils';

Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/shared/components/tags-input/tags-input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as classNames from 'classnames';
import classNames from 'classnames';
import * as React from 'react';

import {Autocomplete, AutocompleteApi, AutocompleteOption} from 'argo-ui';
Expand Down
1 change: 1 addition & 0 deletions ui/src/app/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"sourceMap": true,
"noImplicitAny": true,
"module": "commonjs",
"esModuleInterop": true,
"target": "es5",
"jsx": "react",
"experimentalDecorators": true,
Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/workflows/components/workflow-details/workflow-details.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Page, SlidingPanel} from 'argo-ui';
import * as classNames from 'classnames';
import classNames from 'classnames';
import * as React from 'react';
import {useContext, useEffect, useRef, useState} from 'react';
import {RouteComponentProps} from 'react-router';
Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/workflows/components/workflow-node-info/workflow-node-info.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Tabs, Ticker, Tooltip} from 'argo-ui';
import * as moment from 'moment';
import moment from 'moment';
import * as React from 'react';

import * as models from '../../../../models';
Expand Down
4 changes: 2 additions & 2 deletions ui/src/app/workflows/components/workflow-timeline/workflow-timeline.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as classNames from 'classnames';
import * as moment from 'moment';
import classNames from 'classnames';
import moment from 'moment';
import * as React from 'react';
import {fromEvent, interval, Subscription} from 'rxjs';

Expand Down
Loading