UI: Fix the issue that new version is not loaded after upgrade #4140

ChengYanJin · 2023-09-06T13:51:58Z

Component: UI

Context: We had issue that the UI doesn't load the new version after upgrade.

Summary: We don't cache deployed-ui-apps, and we add version search query parameters when fetching micro-app-configuration and runtime-app-configuration

Acceptance criteria:

bert-e · 2023-09-06T13:52:01Z

Hello chengyanjin,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

bert-e · 2023-09-06T13:52:11Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade into
development/125.0
w/126.0/bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade will be merged into development/126.0

The following branches will NOT be impacted:

development/123.0
development/124.0
development/124.1
development/2.0
development/2.1
development/2.10
development/2.11
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

bert-e · 2023-09-06T13:52:14Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

JBWatenbergScality

LGTM !!

bert-e · 2023-09-08T09:26:35Z

Conflict

A conflict has been raised during the update of
integration branch w/126.0/bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade with contents from bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade
and development/126.0.

Please resolve the conflict on the integration branch (w/126.0/bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade).

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout w/126.0/bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade
 $ git pull  # or "git reset --hard origin/w/126.0/bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade"
 $ git merge origin/development/126.0
 $ # <intense conflict resolution>
 $ git commit
 $ git merge origin/bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/126.0/bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade

bert-e · 2023-09-08T10:17:57Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

JBWatenbergScality

LGTM !

ChengYanJin · 2023-09-08T15:00:56Z

/approve

bert-e · 2023-09-08T15:01:10Z

Build failed

The build for commit did not succeed in branch bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade.

The following options are set: approve

bert-e · 2023-09-08T15:50:59Z

Build failed

The build for commit did not succeed in branch w/126.0/bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade.

The following options are set: approve

bert-e · 2023-09-08T15:51:32Z

Build failed

The build for commit did not succeed in branch bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade.

The following options are set: approve

bert-e · 2023-09-11T07:59:40Z

History mismatch

Merge commit #22c15e0c44ca1dd329f078a9d6c78be083eed6a1 on the integration branch
w/126.0/bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade is merging a branch which is neither the current
branch bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade nor the development branch
development/126.0.

It is likely due to a rebase of the branch bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: approve

JBWatenbergScality · 2023-09-11T08:10:27Z

/reset

bert-e · 2023-09-11T08:10:33Z

Lossy reset warning

There seems to be manual commits on integration branches (e.g. conflict
resolutions) that will be lost if you chose to reset.

You can use the force_reset command if you still want me
to delete those branches.

The following options are set: approve

bert-e · 2023-09-11T08:10:40Z

History mismatch

Merge commit #22c15e0c44ca1dd329f078a9d6c78be083eed6a1 on the integration branch
w/126.0/bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade is merging a branch which is neither the current
branch bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade nor the development branch
development/126.0.

It is likely due to a rebase of the branch bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: approve

bert-e · 2023-09-12T08:13:04Z

History mismatch

Merge commit #163016d9c234e820d5578a88927f181c1bcd8c90 on the integration branch
w/126.0/bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade is merging a branch which is neither the current
branch bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade nor the development branch
development/126.0.

It is likely due to a rebase of the branch bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: approve

ChengYanJin · 2023-09-12T08:13:15Z

/reset

bert-e · 2023-09-12T08:13:22Z

Lossy reset warning

There seems to be manual commits on integration branches (e.g. conflict
resolutions) that will be lost if you chose to reset.

You can use the force_reset command if you still want me
to delete those branches.

The following options are set: approve

bert-e · 2023-09-12T08:13:29Z

History mismatch

Merge commit #163016d9c234e820d5578a88927f181c1bcd8c90 on the integration branch
w/126.0/bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade is merging a branch which is neither the current
branch bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade nor the development branch
development/126.0.

It is likely due to a rebase of the branch bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: approve

ChengYanJin · 2023-09-12T08:14:47Z

/force_reset

bert-e · 2023-09-12T08:14:55Z

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: approve

bert-e · 2023-09-12T08:15:03Z

Conflict

A conflict has been raised during the creation of
integration branch w/126.0/bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade with contents from bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade
and development/126.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/126.0/bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade origin/development/126.0
 $ git merge origin/bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/126.0/bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade

The following options are set: approve

ChengYanJin · 2023-09-12T08:18:02Z

/status

bert-e · 2023-09-12T08:18:07Z

Status

Status report is not available.

The following options are set: approve

bert-e · 2023-09-12T08:59:31Z

Build failed

The build for commit did not succeed in branch w/126.0/bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade.

The following options are set: approve

bert-e · 2023-09-13T08:55:06Z

History mismatch

Merge commit #99efc337e6b7f5b316769530277f2e70e5ee64f6 on the integration branch
w/126.0/bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade is merging a branch which is neither the current
branch bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade nor the development branch
development/126.0.

It is likely due to a rebase of the branch bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: approve

ui/src/ducks/app/nodes.ts

bert-e · 2023-09-13T09:00:00Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: approve

…tion with version in the search params

bert-e · 2023-09-13T09:01:55Z

History mismatch

Merge commit #99efc337e6b7f5b316769530277f2e70e5ee64f6 on the integration branch
w/126.0/bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade is merging a branch which is neither the current
branch bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade nor the development branch
development/126.0.

It is likely due to a rebase of the branch bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: approve

ChengYanJin · 2023-09-13T09:03:51Z

/reset

bert-e · 2023-09-13T09:04:00Z

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: approve

bert-e · 2023-09-13T09:04:11Z

Conflict

A conflict has been raised during the creation of
integration branch w/126.0/bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade with contents from bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade
and development/126.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/126.0/bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade origin/development/126.0
 $ git merge origin/bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/126.0/bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade

The following options are set: approve

bert-e · 2023-09-13T11:22:22Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: approve

bert-e · 2023-09-14T09:11:30Z

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

✔️ development/125.0
✔️ development/126.0

The following branches will NOT be impacted:

development/123.0
development/124.0
development/124.1
development/2.0
development/2.1
development/2.10
development/2.11
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

Any commit you add on the source branch will trigger a new cycle after the
current queue is merged.
Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

bert-e · 2023-09-14T11:27:12Z

I have successfully merged the changeset of this pull request
into targetted development branches:

✔️ development/125.0
✔️ development/126.0

The following branches have NOT changed:

development/123.0
development/124.0
development/124.1
development/2.0
development/2.1
development/2.10
development/2.11
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

Please check the status of the associated issue None.

Goodbye chengyanjin.

ChengYanJin requested a review from a team as a code owner September 6, 2023 13:51

JBWatenbergScality previously approved these changes Sep 6, 2023

View reviewed changes

ChengYanJin dismissed JBWatenbergScality’s stale review via 68ed96e September 6, 2023 16:27

ChengYanJin force-pushed the bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade branch from 3ea103e to 2429149 Compare September 8, 2023 09:38

JBWatenbergScality previously approved these changes Sep 8, 2023

View reviewed changes

ChengYanJin force-pushed the bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade branch from 22c15e0 to 2429149 Compare September 11, 2023 07:59

ChengYanJin force-pushed the bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade branch from 2429149 to b7f55bd Compare September 12, 2023 08:12

ChengYanJin dismissed JBWatenbergScality’s stale review via a0a4bfe September 13, 2023 08:54

ChengYanJin force-pushed the bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade branch from b7f55bd to a0a4bfe Compare September 13, 2023 08:54

github-advanced-security bot found potential problems Sep 13, 2023

View reviewed changes

ui/src/ducks/app/nodes.ts Fixed Show fixed Hide fixed

ChengYanJin force-pushed the bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade branch from a0a4bfe to b7f55bd Compare September 13, 2023 08:59

ChengYanJin added 6 commits September 13, 2023 11:01

shell-ui: not cache deployed-ui-apps since it includes version

c9e66fe

shell-ui: Fetch the micro-app-configuration and runtime-app-configura…

97c0ed4

…tion with version in the search params

shell-ui: add version within remoteEntry

ee54901

shell-ui: Add hash for main.js

27bc7d6

shell-ui: Add the contenthash for the js

e2b4b14

ui: improve the typing for useAlerts

6759877

ChengYanJin force-pushed the bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade branch from b7f55bd to 6759877 Compare September 13, 2023 09:01

JBWatenbergScality approved these changes Sep 14, 2023

View reviewed changes

bert-e merged commit 6759877 into development/125.0 Sep 14, 2023

bert-e deleted the bugfix/fix-the-issue-that-new-version-is-not-loaded-after-upgrade branch September 14, 2023 11:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

UI: Fix the issue that new version is not loaded after upgrade #4140

UI: Fix the issue that new version is not loaded after upgrade #4140

ChengYanJin commented Sep 6, 2023

bert-e commented Sep 6, 2023

bert-e commented Sep 6, 2023

bert-e commented Sep 6, 2023

JBWatenbergScality left a comment

bert-e commented Sep 8, 2023

bert-e commented Sep 8, 2023

JBWatenbergScality left a comment

ChengYanJin commented Sep 8, 2023

bert-e commented Sep 8, 2023

bert-e commented Sep 8, 2023

bert-e commented Sep 8, 2023

bert-e commented Sep 11, 2023

JBWatenbergScality commented Sep 11, 2023

bert-e commented Sep 11, 2023

bert-e commented Sep 11, 2023

bert-e commented Sep 12, 2023

ChengYanJin commented Sep 12, 2023

bert-e commented Sep 12, 2023

bert-e commented Sep 12, 2023

ChengYanJin commented Sep 12, 2023

bert-e commented Sep 12, 2023

bert-e commented Sep 12, 2023

ChengYanJin commented Sep 12, 2023

bert-e commented Sep 12, 2023

bert-e commented Sep 12, 2023

bert-e commented Sep 13, 2023

bert-e commented Sep 13, 2023

bert-e commented Sep 13, 2023

ChengYanJin commented Sep 13, 2023

bert-e commented Sep 13, 2023

bert-e commented Sep 13, 2023

bert-e commented Sep 13, 2023

bert-e commented Sep 14, 2023

bert-e commented Sep 14, 2023

UI: Fix the issue that new version is not loaded after upgrade #4140

UI: Fix the issue that new version is not loaded after upgrade #4140

Conversation

ChengYanJin commented Sep 6, 2023

bert-e commented Sep 6, 2023

Hello chengyanjin,

bert-e commented Sep 6, 2023

Integration data created

bert-e commented Sep 6, 2023

Waiting for approval

JBWatenbergScality left a comment

Choose a reason for hiding this comment

bert-e commented Sep 8, 2023

Conflict

bert-e commented Sep 8, 2023

Waiting for approval

JBWatenbergScality left a comment

Choose a reason for hiding this comment

ChengYanJin commented Sep 8, 2023

bert-e commented Sep 8, 2023

Build failed

bert-e commented Sep 8, 2023

Build failed

bert-e commented Sep 8, 2023

Build failed

bert-e commented Sep 11, 2023

History mismatch

JBWatenbergScality commented Sep 11, 2023

bert-e commented Sep 11, 2023

Lossy reset warning

bert-e commented Sep 11, 2023

History mismatch

bert-e commented Sep 12, 2023

History mismatch

ChengYanJin commented Sep 12, 2023

bert-e commented Sep 12, 2023

Lossy reset warning

bert-e commented Sep 12, 2023

History mismatch

ChengYanJin commented Sep 12, 2023

bert-e commented Sep 12, 2023

Reset complete

bert-e commented Sep 12, 2023

Conflict

ChengYanJin commented Sep 12, 2023

bert-e commented Sep 12, 2023

Status

bert-e commented Sep 12, 2023

Build failed

bert-e commented Sep 13, 2023

History mismatch

bert-e commented Sep 13, 2023

Waiting for approval

bert-e commented Sep 13, 2023

History mismatch

ChengYanJin commented Sep 13, 2023

bert-e commented Sep 13, 2023

Reset complete

bert-e commented Sep 13, 2023

Conflict

bert-e commented Sep 13, 2023

Waiting for approval

bert-e commented Sep 14, 2023

In the queue

bert-e commented Sep 14, 2023