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

Fix links action on role list page #8272

Merged
merged 7 commits into from Oct 15, 2020
Merged

Conversation

MattieBelt
Copy link
Collaborator

Description of what you did:

Fixes #8262

The icon alignment slightly changes, see images:

Before
image

After
image

The before alignment could be realized with:

    if (checkCanDeleteRole(role)) {
      links.push({
        icon: <FontAwesomeIcon icon="trash-alt" />,
        onClick: e => {
          e.preventDefault();
          setModalDelete(role.id);
          e.stopPropagation();
        },
      });
    } else {
      links.push({ icon: null });
    }

Fixes strapi#8262

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>
Copy link
Contributor

@soupette soupette left a comment

Choose a reason for hiding this comment

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

LGTM!

Thanks a lot for your contribution!

@soupette soupette added source: plugin:users-permissions Source is plugin/users-permissions package issue: bug Issue reporting a bug labels Oct 12, 2020
@soupette soupette requested a review from a team as a code owner October 12, 2020 09:52
@codecov
Copy link

codecov bot commented Oct 12, 2020

Codecov Report

Merging #8272 into master will increase coverage by 0.00%.
The diff coverage is 76.19%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #8272   +/-   ##
=======================================
  Coverage   33.20%   33.20%           
=======================================
  Files        1220     1220           
  Lines       13610    13616    +6     
  Branches     1355     1356    +1     
=======================================
+ Hits         4519     4521    +2     
- Misses       8208     8211    +3     
- Partials      883      884    +1     
Flag Coverage Δ
#front 24.72% <0.00%> (-0.01%) ⬇️
#unit 54.48% <91.42%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...sions/admin/src/containers/Roles/ListPage/index.js 0.00% <0.00%> (ø)
packages/strapi-plugin-graphql/services/utils.js 25.00% <25.00%> (+0.30%) ⬆️
packages/strapi-admin/services/user.js 83.89% <100.00%> (ø)
...ages/strapi-utils/lib/convert-rest-query-params.js 94.59% <100.00%> (+0.07%) ⬆️
packages/strapi-utils/lib/index.js 100.00% <100.00%> (ø)
packages/strapi/lib/commands/admin-reset.js 100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e53b54c...69876b9. Read the comment docs.

@petersg83 petersg83 added this to the 3.2.4 milestone Oct 12, 2020
Copy link
Contributor

@HichamELBSI HichamELBSI left a comment

Choose a reason for hiding this comment

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

LGTM thank you for your contribution.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
issue: bug Issue reporting a bug source: plugin:users-permissions Source is plugin/users-permissions package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Can delete Public and Authenticated Roles from the UI even though it should be impossible
5 participants