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

Revert profiles.html and rename showAbilityModal. #2351

Merged
merged 4 commits into from
Nov 9, 2021

Conversation

cyber-arsenull
Copy link
Contributor

Rename to showAbilityChoiceModal.

Description

PR for bug #2350
Revert of profiles.html as the showAbilityModal was replaced with the one from abilities.html which has a different purpose. Also change name to showAbilityChoiceModal to differentiate and avoid name collisions in Alpine if both tabs are loaded.

Type of change

Please delete options that are not relevant.

  • [X ] Bug fix (non-breaking change which fixes an issue)

How Has This Been Tested?

  1. Start adversary
  2. Click Add Ability
  3. Check if modal appears correctly.

Checklist:

  • [X ] My code follows the style guidelines of this project
  • [X ] I have performed a self-review of my own code

Rename to showAbilityChoiceModal.
@codecov
Copy link

codecov bot commented Nov 5, 2021

Codecov Report

Merging #2351 (8bd711f) into master (7cb868d) will increase coverage by 1.15%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2351      +/-   ##
==========================================
+ Coverage   71.44%   72.60%   +1.15%     
==========================================
  Files         110      110              
  Lines        7634     7946     +312     
==========================================
+ Hits         5454     5769     +315     
+ Misses       2180     2177       -3     
Impacted Files Coverage Δ
app/contacts/contact_ftp.py 50.95% <0.00%> (-0.33%) ⬇️
app/objects/c_objective.py 100.00% <0.00%> (ø)
app/utility/base_service.py 100.00% <0.00%> (ø)
app/api/v2/handlers/health_api.py 100.00% <0.00%> (ø)
app/objects/secondclass/c_rule.py 100.00% <0.00%> (ø)
app/api/v2/security.py 97.36% <0.00%> (+0.07%) ⬆️
app/objects/secondclass/c_fact.py 98.70% <0.00%> (+0.10%) ⬆️
app/api/v2/managers/base_api_manager.py 96.46% <0.00%> (+0.12%) ⬆️
app/contacts/contact_dns.py 80.59% <0.00%> (+0.13%) ⬆️
app/service/learning_svc.py 87.32% <0.00%> (+0.18%) ⬆️
... and 61 more

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 7cb868d...8bd711f. Read the comment docs.

Copy link
Contributor

@argaudreau argaudreau left a comment

Choose a reason for hiding this comment

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

Other than the small issue with the cleanup commands it looks great! No more errors in the console when I tested it out.

templates/profiles.html Outdated Show resolved Hide resolved
Buttons under class field act like a form submitter, so they need to have type button to avoid refreshing the page.
@cyber-arsenull
Copy link
Contributor Author

cyber-arsenull commented Nov 8, 2021

Sonarcloud doesn't like using <i> tags, and wants to use <em> tags. However, it only complains about this as a "bug" in two places, eventhough <i> are used in several places.
@argaudreau @wbooth
Preference on resolving that part?

@wbooth
Copy link
Contributor

wbooth commented Nov 9, 2021

@cyber-arsenull soanrcloud is checking only "new" code, so I would fix to the standard and then update the others as we go

argaudreau
argaudreau previously approved these changes Nov 9, 2021
Required by sonarcloud for code changes.
@sonarcloud
Copy link

sonarcloud bot commented Nov 9, 2021

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@wbooth wbooth merged commit 0ba7e82 into master Nov 9, 2021
@wbooth wbooth deleted the bugfix/add_adversary_ability branch November 9, 2021 18:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Alpine name collision prevents adding ability to an adversary
3 participants