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.

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

Port app-modal to harvester shell (backport #1163) (Target v1.3, Testing) #1197

Open
wants to merge 4 commits into
base: release-harvester-v1.3
Choose a base branch
from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 15, 2024

Summary

Rancher dashboard has already replace <modal> to <app-modal> in below two PRs

PR Checklist

  • Is this a multi-tenancy feature/bug?
    • Yes, the relevant RBAC changes are at:
  • Do we need to backport changes to the old Rancher UI, such as RKE1?
    • Yes, the relevant PR is at:
  • Are backend engineers aware of UI changes?
    • Yes, the backend owner is:

Related Issue #
[BUG] Can't select the harvester version to upgrade in Rancher UI
[BUG] Rancher doesn't use dark mode in popup modals when in Harvester UI

Screenshot/Video

I've tested harvester

  • upgrade modal ✅
  • all modals in vm edit page ✅
  • generate support bundle modal✅
  • Novnc customKey modal✅

Test on embedded mode

Screenshot 2024-09-23 at 8 40 18 PM image
This is an automatic backport of pull request #1163 done by [Mergify](https://mergify.com).

Signed-off-by: andy.lee <[email protected]>
(cherry picked from commit 85b311d)

# Conflicts:
#	pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue
#	pkg/harvester/l10n/en-us.yaml
Signed-off-by: andy.lee <[email protected]>
(cherry picked from commit 5f65595)

# Conflicts:
#	pkg/harvester/l10n/en-us.yaml
Signed-off-by: andy.lee <[email protected]>
(cherry picked from commit 874e191)

# Conflicts:
#	pkg/harvester/edit/harvesterhci.io.host/HarvesterDisk.vue
@mergify mergify bot added the Conflicts label Oct 15, 2024
Copy link
Author

mergify bot commented Oct 15, 2024

Cherry-pick of 85b311d has failed:

On branch mergify/bp/release-harvester-v1.3/pr-1163
Your branch is up to date with 'origin/release-harvester-v1.3'.

You are currently cherry-picking commit 85b311da3.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   cypress/e2e/po/prompts/promptRemove.po.ts
	modified:   jest.setup.js
	modified:   package.json
	modified:   pkg/harvester/components/HarvesterUpgrade.vue
	modified:   pkg/harvester/components/novnc/NovncConsoleCustomKeys.vue
	modified:   pkg/harvester/components/novnc/NovncConsoleWrapper.vue
	modified:   pkg/harvester/dialog/HarvesterSupportBundle.vue
	modified:   pkg/harvester/dialog/RestartVMDialog.vue
	modified:   pkg/harvester/edit/harvesterhci.io.host/HarvesterSeeder.vue
	modified:   pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineAccessCredentials/AccessCredentialsUsers.vue
	modified:   pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineCloudConfig/index.vue
	modified:   pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineSSHKey.vue
	modified:   pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/index.vue
	modified:   shell/assets/styles/app.scss
	deleted:    shell/assets/styles/vendor/vue-js-modal.scss
	new file:   shell/components/AppModal.vue
	modified:   shell/components/AssignTo.vue
	modified:   shell/components/CommunityLinks.vue
	modified:   shell/components/Dialog.vue
	modified:   shell/components/DisableAuthProviderModal.vue
	modified:   shell/components/Inactivity.vue
	modified:   shell/components/ModalWithCard.vue
	modified:   shell/components/MoveModal.vue
	modified:   shell/components/PromptChangePassword.vue
	modified:   shell/components/PromptModal.vue
	modified:   shell/components/PromptRemove.vue
	modified:   shell/components/PromptRestore.vue
	modified:   shell/components/ResourceCancelModal.vue
	modified:   shell/components/nav/Header.vue
	modified:   shell/initialize/index.js
	modified:   shell/list/management.cattle.io.feature.vue
	modified:   shell/package.json
	modified:   shell/pages/c/_cluster/uiplugins/CatalogList/CatalogLoadDialog.vue
	modified:   shell/pages/c/_cluster/uiplugins/DeveloperInstallDialog.vue
	modified:   shell/pages/c/_cluster/uiplugins/InstallDialog.vue
	modified:   shell/pages/c/_cluster/uiplugins/RemoveUIPlugins.vue
	modified:   shell/pages/c/_cluster/uiplugins/SetupUIPlugins.vue
	modified:   shell/pages/c/_cluster/uiplugins/UninstallDialog.vue
	deleted:    shell/plugins/vue-js-modal.js
	modified:   shell/public/index.html
	new file:   storybook/stories/components/AppModal.stories.mdx
	modified:   yarn.lock

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue
	both modified:   pkg/harvester/l10n/en-us.yaml

Cherry-pick of 5f65595 has failed:

On branch mergify/bp/release-harvester-v1.3/pr-1163
Your branch is ahead of 'origin/release-harvester-v1.3' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 5f6559533.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/harvester/l10n/en-us.yaml

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 874e191 has failed:

On branch mergify/bp/release-harvester-v1.3/pr-1163
Your branch is ahead of 'origin/release-harvester-v1.3' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 874e19146.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   pkg/harvester/components/novnc/NovncConsoleCustomKeys.vue

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/harvester/edit/harvesterhci.io.host/HarvesterDisk.vue

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Oct 15, 2024
3 tasks
Signed-off-by: andy.lee <[email protected]>
@a110605 a110605 changed the title Port app-modal to harvester shell (backport #1163) Port app-modal to harvester shell (backport #1163) (WIP) Oct 15, 2024
@a110605 a110605 removed the Conflicts label Oct 16, 2024
@a110605 a110605 self-assigned this Oct 16, 2024
@a110605 a110605 changed the title Port app-modal to harvester shell (backport #1163) (WIP) Port app-modal to harvester shell (backport #1163) (Target v1.3, Testing) Oct 21, 2024
@a110605
Copy link
Collaborator

a110605 commented Oct 30, 2024

I am still testing this PR change against v1.3.2 release.

Copy link
Collaborator

@torchiaf torchiaf left a comment

Choose a reason for hiding this comment

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

LG

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants