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

create single 'Get Token' button for all local repos #1257

Merged
merged 2 commits into from
Dec 2, 2021

Conversation

ShaiahWren
Copy link
Contributor

@ShaiahWren ShaiahWren commented Nov 18, 2021

Issue: https://issues.redhat.com/browse/AAH-903

Assignment:

  1. Only one "Get Token" button for the list view in the header. Only when 'local' repos tab is selected
  2. Button does not redirect to a new tab

Before:
Screen Shot 2021-11-18 at 4 09 15 PM

After:
Screen Shot 2021-11-30 at 4 16 16 PM

@@ -179,6 +181,13 @@ class RepositoryList extends React.Component<RouteComponentProps, IState> {
/>
</div>
</div>
{params.tab == 'local' && (
Copy link
Member

Choose a reason for hiding this comment

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

@ShaiahWren This should be in BaseHeader param pageControls. See

<BaseHeader
title={
editPermissions && params.tab == 'permissions'
? t`Edit group permissions`
: group.name
}
breadcrumbs={
<Breadcrumbs
links={[
{ url: Paths.groupList, name: t`Groups` },
{ name: group.name },
]}
/>
}
pageControls={this.renderControls()}
>
for reference.

After moving it there shouldn't be any need for new CSS and it should consistent with similar pages.

@awcrosby
Copy link
Contributor

awcrosby commented Dec 1, 2021

(adding this to a few recently updated PRs…) We need CI in this repo that enforces this, but for now please:

  • Add a line to at least one of your commits that says Issue: AAH-#### (in the future it is best to be the first commit as it gets included in the initial PR description by default)
  • Ensure when merging that the Issue: AAH-#### is part of commit message via the “Squash ‘n’ Merge” description

Copy link
Member

@ZitaNemeckova ZitaNemeckova left a comment

Choose a reason for hiding this comment

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

LGTM 👍 Don't forget to fix a commit according to Andrew's comment before merging :)

@ZitaNemeckova ZitaNemeckova removed the request for review from himdel December 2, 2021 11:12
@ShaiahWren
Copy link
Contributor Author

Issue: AAH-903

@ShaiahWren ShaiahWren merged commit 0fad2f9 into ansible:master Dec 2, 2021
@ShaiahWren ShaiahWren deleted the API-Token-redirect branch December 2, 2021 20:46
@newswangerd newswangerd added the backport-4.4 This PR should be backported to stable-4.4 (2.1) label Dec 10, 2021
@patchback
Copy link

patchback bot commented Dec 10, 2021

Backport to stable-4.4: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 0fad2f9 on top of patchback/backports/stable-4.4/0fad2f9766807b5c55cd9442e5dd3ac69152a9e7/pr-1257

Backporting merged PR #1257 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible/ansible-hub-ui.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-4.4/0fad2f9766807b5c55cd9442e5dd3ac69152a9e7/pr-1257 upstream/stable-4.4
  4. Now, cherry-pick PR create single 'Get Token' button for all local repos #1257 contents into that branch:
    $ git cherry-pick -x 0fad2f9766807b5c55cd9442e5dd3ac69152a9e7
    If it'll yell at you with something like fatal: Commit 0fad2f9766807b5c55cd9442e5dd3ac69152a9e7 is a merge but no -m option was given., add -m 1 as follows intead:
    $ git cherry-pick -m1 -x 0fad2f9766807b5c55cd9442e5dd3ac69152a9e7
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR create single 'Get Token' button for all local repos #1257 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-4.4/0fad2f9766807b5c55cd9442e5dd3ac69152a9e7/pr-1257
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@himdel
Copy link
Collaborator

himdel commented Dec 13, 2021

(backport failed because of a conflict with (missing) #1259 , backporting that one first => #1371)

@himdel himdel added backport-4.4 This PR should be backported to stable-4.4 (2.1) and removed backport-4.4 This PR should be backported to stable-4.4 (2.1) labels Dec 14, 2021
@patchback
Copy link

patchback bot commented Dec 14, 2021

Backport to stable-4.4: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-4.4/0fad2f9766807b5c55cd9442e5dd3ac69152a9e7/pr-1257

Backported as #1375

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Dec 14, 2021
* create single button for all local repos

* add button logic to page controls

Issue: AAH-903
(cherry picked from commit 0fad2f9)
himdel pushed a commit that referenced this pull request Dec 14, 2021
* create single button for all local repos

* add button logic to page controls

Issue: AAH-903
(cherry picked from commit 0fad2f9)

Co-authored-by: Shaiah Emigh-Doyle <64337863+ShaiahWren@users.noreply.github.com>
@github-actions github-actions bot added the backported-4.4 This PR has been backported to stable-4.4 (2.1) label Dec 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-4.4 This PR should be backported to stable-4.4 (2.1) backported-4.4 This PR has been backported to stable-4.4 (2.1)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants