-
Notifications
You must be signed in to change notification settings - Fork 6.9k
fix(ui): avoid reloading PodView quickstarts on rerender #26829
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.
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
Open
Vedant-Mhatre
wants to merge
3
commits into
argoproj:master
Choose a base branch
from
Vedant-Mhatre:fix-podview-quickstart-rerenders
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+270
−17
Open
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
127 changes: 127 additions & 0 deletions
127
ui/src/app/applications/components/utils.quickstart.test.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| import * as React from 'react'; | ||
| import * as renderer from 'react-test-renderer'; | ||
| import {BehaviorSubject, Subscription} from 'rxjs'; | ||
|
|
||
| import {ContextApis} from '../../shared/context'; | ||
| import {AbstractApplication, Application, ApplicationTree, ResourceNode} from '../../shared/models'; | ||
| import {services} from '../../shared/services'; | ||
| import {renderResourceButtons} from './utils'; | ||
|
|
||
| describe('renderResourceButtons', () => { | ||
| const resource = { | ||
| uid: 'apps/Deployment/default/guestbook', | ||
| group: 'apps', | ||
| kind: 'Deployment', | ||
| namespace: 'default', | ||
| name: 'guestbook' | ||
| } as ResourceNode; | ||
|
|
||
| const otherResource = { | ||
| ...resource, | ||
| uid: 'apps/Deployment/default/guestbook-canary', | ||
| name: 'guestbook-canary' | ||
| } as ResourceNode; | ||
|
|
||
| const application = { | ||
| kind: 'Application', | ||
| metadata: {name: 'guestbook', namespace: 'argocd'}, | ||
| spec: {project: 'default'}, | ||
| status: { | ||
| resources: [ | ||
| { | ||
| group: resource.group, | ||
| kind: resource.kind, | ||
| namespace: resource.namespace, | ||
| name: resource.name | ||
| } | ||
| ] | ||
| } | ||
| } as Application; | ||
|
|
||
| const tree = { | ||
| nodes: [resource] | ||
| } as ApplicationTree; | ||
|
|
||
| const apis = { | ||
| popup: {prompt: jest.fn()}, | ||
| notifications: {show: jest.fn()}, | ||
| navigation: {goto: jest.fn()}, | ||
| baseHref: '' | ||
| } as unknown as ContextApis; | ||
|
|
||
| afterEach(() => { | ||
| jest.restoreAllMocks(); | ||
| }); | ||
|
|
||
| function QuickStartWrapper(props: {resourceNode: ResourceNode; version: number; appChanged: BehaviorSubject<AbstractApplication>}) { | ||
| return <div data-version={props.version}>{renderResourceButtons(props.resourceNode, application, tree, apis, props.appChanged)}</div>; | ||
| } | ||
|
|
||
| it('does not reload quickstart actions on unrelated parent rerenders', () => { | ||
| const canISpy = jest.spyOn(services.accounts, 'canI').mockResolvedValue(false); | ||
| const appChanged = new BehaviorSubject<AbstractApplication>(application); | ||
| const subscription: Subscription = appChanged.subscribe(() => undefined); | ||
| let rendered: renderer.ReactTestRenderer | undefined; | ||
|
|
||
| try { | ||
| renderer.act(() => { | ||
| rendered = renderer.create(<QuickStartWrapper resourceNode={resource} version={0} appChanged={appChanged} />); | ||
| }); | ||
|
|
||
| expect(canISpy).toHaveBeenCalledTimes(1); | ||
|
|
||
| renderer.act(() => { | ||
| rendered!.update(<QuickStartWrapper resourceNode={resource} version={1} appChanged={appChanged} />); | ||
| }); | ||
|
|
||
| expect(canISpy).toHaveBeenCalledTimes(1); | ||
| } finally { | ||
| subscription.unsubscribe(); | ||
| } | ||
| }); | ||
|
|
||
| it('reloads quickstart actions when the resource changes', () => { | ||
| const canISpy = jest.spyOn(services.accounts, 'canI').mockResolvedValue(false); | ||
| const appChanged = new BehaviorSubject<AbstractApplication>(application); | ||
| const subscription: Subscription = appChanged.subscribe(() => undefined); | ||
| let rendered: renderer.ReactTestRenderer | undefined; | ||
|
|
||
| try { | ||
| renderer.act(() => { | ||
| rendered = renderer.create(<QuickStartWrapper resourceNode={resource} version={0} appChanged={appChanged} />); | ||
| }); | ||
|
|
||
| renderer.act(() => { | ||
| rendered!.update(<QuickStartWrapper resourceNode={otherResource} version={0} appChanged={appChanged} />); | ||
| }); | ||
|
|
||
| expect(canISpy).toHaveBeenCalledTimes(2); | ||
| } finally { | ||
| subscription.unsubscribe(); | ||
| } | ||
| }); | ||
|
|
||
| it('reloads quickstart actions when the appChanged subject identity changes', () => { | ||
| const canISpy = jest.spyOn(services.accounts, 'canI').mockResolvedValue(false); | ||
| const firstAppChanged = new BehaviorSubject<AbstractApplication>(application); | ||
| const secondAppChanged = new BehaviorSubject<AbstractApplication>(application); | ||
| const firstSubscription: Subscription = firstAppChanged.subscribe(() => undefined); | ||
| const secondSubscription: Subscription = secondAppChanged.subscribe(() => undefined); | ||
| let rendered: renderer.ReactTestRenderer | undefined; | ||
|
|
||
| try { | ||
| renderer.act(() => { | ||
| rendered = renderer.create(<QuickStartWrapper resourceNode={resource} version={0} appChanged={firstAppChanged} />); | ||
| }); | ||
|
|
||
| renderer.act(() => { | ||
| rendered!.update(<QuickStartWrapper resourceNode={resource} version={0} appChanged={secondAppChanged} />); | ||
| }); | ||
|
|
||
| expect(canISpy).toHaveBeenCalledTimes(2); | ||
| } finally { | ||
| firstSubscription.unsubscribe(); | ||
| secondSubscription.unsubscribe(); | ||
| } | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Generally, this looks good to me.
I wonder if quick start actions could still reload on unrelated watch-driven resource tree updates, since input still includes the full application and tree. Would it make sense to narrow input to only the fields needed to resolve quick start actions?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good point. I narrowed the
DataLoaderinput in the latest update so it no longer depends on the fullapplication/treeobjects.It now keys off only the fields that affect quickstart resolution for this path:
apismanagers andappChangedI also added regression coverage for the case you called out: refreshed
application/treeobjects that do not change the effective quickstart behavior no longer reload quickstart actions.There was one similar issue with the recreated
apiswrapper as well, and I narrowed that too. The latest push includes both fixes; checks are rerunning on it now.