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.

Sign up for GitHub

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

Jump to bottom

315 added toggle for stig id to srg id #516

Merged
merged 2 commits into from
Jan 19, 2023
Merged

315 added toggle for stig id to srg id #516

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fde1858
315 added toggle for stig id to srg id
rlakey Jan 18, 2023
8eacc8c
eslint
vanessuniq Jan 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 45 additions & 31 deletions app/javascript/components/rules/RuleNavigator.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,19 @@
</b-form-checkbox>
</b-form-group>

<!-- Toggle STIG ID/SRG ID -->
<b-form-group class="mt-3">
<b-form-checkbox
id="showSRGIdChecked"
v-model="filters.showSRGIdChecked"
class="mb-1 unselectable"
switch
name="showSRGIdChecked-fitler"
>
Show SRG ID
</b-form-checkbox>
</b-form-group>

<!-- Find & Replace -->
<FindAndReplace :component-id="componentId" :project-prefix="projectPrefix" :rules="rules" />

Expand Down Expand Up @@ -144,24 +157,22 @@
:class="ruleRowClass(rule)"
@click="ruleSelected(rule)"
>
<i
class="mdi mdi-close closeRuleButton"
aria-hidden="true"
@click.stop="ruleDeselected(rule)"
/>
{{ formatRuleId(rule.rule_id) }}
<i
v-if="rule.review_requestor_id"
class="mdi mdi-file-find float-right"
aria-hidden="true"
/>
<i v-if="rule.locked" class="mdi mdi-lock float-right" aria-hidden="true" />
<i v-if="rule.changes_requested" class="mdi mdi-delta float-right" aria-hidden="true" />
<i
v-if="rule.satisfied_by.length > 0"
class="mdi mdi-content-copy float-right"
aria-hidden="true"
/>
<div v-if="filters.showSRGIdChecked">
<i class="mdi mdi-close closeRuleButton" aria-hidden="true" @click.stop="ruleDeselected(rule)" />
{{ rule.version }}
<i v-if="rule.review_requestor_id" class="mdi mdi-file-find float-right" aria-hidden="true" />
<i v-if="rule.locked" class="mdi mdi-lock float-right" aria-hidden="true" />
<i v-if="rule.changes_requested" class="mdi mdi-delta float-right" aria-hidden="true" />
<i v-if="rule.satisfied_by.length > 0" class="mdi mdi-content-copy float-right" aria-hidden="true" />
</div>
<div v-else>
<i class="mdi mdi-close closeRuleButton" aria-hidden="true" @click.stop="ruleDeselected(rule)" />
{{ formatRuleId(rule.rule_id) }}
<i v-if="rule.review_requestor_id" class="mdi mdi-file-find float-right" aria-hidden="true" />
<i v-if="rule.locked" class="mdi mdi-lock float-right" aria-hidden="true" />
<i v-if="rule.changes_requested" class="mdi mdi-delta float-right" aria-hidden="true" />
<i v-if="rule.satisfied_by.length > 0" class="mdi mdi-content-copy float-right" aria-hidden="true" />
</div>
</div>
</div>

Expand Down Expand Up @@ -191,19 +202,20 @@
:class="ruleRowClass(rule)"
@click="ruleSelected(rule)"
>
{{ formatRuleId(rule.rule_id) }}
<i
v-if="rule.review_requestor_id"
class="mdi mdi-file-find float-right"
aria-hidden="true"
/>
<i v-if="rule.locked" class="mdi mdi-lock float-right" aria-hidden="true" />
<i v-if="rule.changes_requested" class="mdi mdi-delta float-right" aria-hidden="true" />
<i
v-if="rule.satisfied_by.length > 0"
class="mdi mdi-content-copy float-right"
aria-hidden="true"
/>
<div v-if="filters.showSRGIdChecked">
{{ rule.version }}
<i v-if="rule.review_requestor_id" class="mdi mdi-file-find float-right" aria-hidden="true" />
<i v-if="rule.locked" class="mdi mdi-lock float-right" aria-hidden="true" />
<i v-if="rule.changes_requested" class="mdi mdi-delta float-right" aria-hidden="true" />
<i v-if="rule.satisfied_by.length > 0" class="mdi mdi-content-copy float-right" aria-hidden="true" />
</div>
<div v-else>
{{ formatRuleId(rule.rule_id) }}
<i v-if="rule.review_requestor_id" class="mdi mdi-file-find float-right" aria-hidden="true" />
<i v-if="rule.locked" class="mdi mdi-lock float-right" aria-hidden="true" />
<i v-if="rule.changes_requested" class="mdi mdi-delta float-right" aria-hidden="true" />
<i v-if="rule.satisfied_by.length > 0" class="mdi mdi-content-copy float-right" aria-hidden="true" />
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -270,6 +282,7 @@ export default {
urFilterChecked: true, // Under review
lckFilterChecked: true, // Locked
showDuplicatesChecked: false, // Show duplicates
showSRGIdChecked: false, // Show SRG ID instead of STIG ID
},
};
},
Expand Down Expand Up @@ -518,6 +531,7 @@ export default {
urFilterChecked: true, // Under review
lckFilterChecked: true, // Locked
showDuplicatesChecked: false, // Show duplicates
showSRGIdChecked: false, // Show SRG ID instead of STIG ID
};
},
handleScroll: function () {
Expand Down