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

Use solutions navbar in metalk8s UI #3110

Merged

Conversation

JBWatenbergScality
Copy link
Contributor

@JBWatenbergScality JBWatenbergScality commented Feb 11, 2021

Component:

ui

Context:

This PR replace authentication code and internal navbar with the common Solution navbar.

Refs: #3104

@bert-e
Copy link
Contributor

bert-e commented Feb 11, 2021

Hello jbwatenbergscality,

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
Copy link
Contributor

bert-e commented Feb 11, 2021

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 JBWatenbergScality changed the base branch from development/2.8 to improvement/introduce-common-navbar February 11, 2021 17:41
@JBWatenbergScality JBWatenbergScality force-pushed the improvement/use-solutions-navbar-in-metalk8s-ui branch from 977a4ab to fcb5487 Compare February 11, 2021 17:44
@JBWatenbergScality JBWatenbergScality force-pushed the improvement/introduce-common-navbar branch 3 times, most recently from f2af053 to 18f0a53 Compare February 12, 2021 11:36
Base automatically changed from improvement/introduce-common-navbar to development/2.8 February 15, 2021 11:44
@bert-e
Copy link
Contributor

bert-e commented Feb 15, 2021

Conflict

There is a conflict between your branch improvement/use-solutions-navbar-in-metalk8s-ui and the
destination branch development/2.8.

Please resolve the conflict on the feature branch (improvement/use-solutions-navbar-in-metalk8s-ui).

 $ git fetch
 $ git checkout origin/improvement/use-solutions-navbar-in-metalk8s-ui
 $ git merge origin/development/2.8
 $ # <intense conflict resolution>
 $ git commit
 $ git push origin HEAD:improvement/use-solutions-navbar-in-metalk8s-ui

@JBWatenbergScality JBWatenbergScality force-pushed the improvement/use-solutions-navbar-in-metalk8s-ui branch 2 times, most recently from b3687b4 to 8c1b6c1 Compare February 16, 2021 09:16
@bert-e
Copy link
Contributor

bert-e commented Feb 16, 2021

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 JBWatenbergScality force-pushed the improvement/use-solutions-navbar-in-metalk8s-ui branch 14 times, most recently from ed32a1e to 5290ed8 Compare February 19, 2021 16:33
@bert-e
Copy link
Contributor

bert-e commented Feb 19, 2021

Integration data created

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

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7

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
Copy link
Contributor

bert-e commented Feb 19, 2021

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 JBWatenbergScality force-pushed the improvement/use-solutions-navbar-in-metalk8s-ui branch from 5290ed8 to 84db571 Compare February 19, 2021 17:24
@JBWatenbergScality JBWatenbergScality force-pushed the improvement/use-solutions-navbar-in-metalk8s-ui branch 3 times, most recently from 0a7bd93 to d695076 Compare March 8, 2021 15:11
@JBWatenbergScality
Copy link
Contributor Author

…ectly following to solution navbar integration
…components

New bundles size are as followed :
  571.11 KB  build/static/js/4.25b92d7b.chunk.js
  36.11 KB   build/static/js/15.8684c3a2.chunk.js
  30 KB      build/static/js/main.20da19d4.chunk.js
  19.76 KB   build/static/js/1.c5d9f7f7.chunk.js
  12.88 KB   build/static/css/4.023dbf36.chunk.css
  9.85 KB    build/static/js/12.e6067137.chunk.js
  6.91 KB    build/static/js/14.3bd7ce01.chunk.js
  5.62 KB    build/static/js/0.69f7df4d.chunk.js
  2.65 KB    build/static/js/6.8d8d1636.chunk.js
  2.28 KB    build/static/js/7.06fb1003.chunk.js
  1.99 KB    build/static/js/5.c144a469.chunk.js
  1.7 KB     build/static/js/10.39e394e2.chunk.js
  1.3 KB     build/static/js/runtime-main.33ce3b79.js
  1.2 KB     build/static/js/11.e2755908.chunk.js
  1009 B     build/static/js/9.a5906d8a.chunk.js
  489 B      build/static/js/8.5381719b.chunk.js
  441 B      build/static/css/main.9707ba81.chunk.css
  329 B      build/static/js/13.dc12452d.chunk.js

We should investigate in bundling core ui in chunks per components to go further because for now all core-ui components are bundled in metalk8s ui even if they are not used.

Refs: #3124
@JBWatenbergScality JBWatenbergScality force-pushed the improvement/use-solutions-navbar-in-metalk8s-ui branch from d695076 to 73e4a52 Compare March 9, 2021 18:12
@JBWatenbergScality
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Mar 9, 2021

Build failed

The build for commit did not succeed in branch improvement/use-solutions-navbar-in-metalk8s-ui.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Mar 10, 2021

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/2.9

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8

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
Copy link
Contributor

bert-e commented Mar 10, 2021

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

  • ✔️ development/2.9

The following branches have NOT changed:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8

Please check the status of the associated issue None.

Goodbye jbwatenbergscality.

@bert-e bert-e merged commit 7da43ba into development/2.9 Mar 10, 2021
@bert-e bert-e deleted the improvement/use-solutions-navbar-in-metalk8s-ui branch March 10, 2021 15:44
@bert-e bert-e restored the improvement/use-solutions-navbar-in-metalk8s-ui branch March 10, 2021 15:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
topic:build Anything related to building steps topic:ui UI-related issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants