Skip to content

Commit 6e291aa

Browse files
Merge pull request #120 from nscuro/analysis-details-tweaks
Make analysis details visible to `VIEW_VULNERABILITY`, add tooltips for analysis fields to explain their cause
2 parents 74e5118 + 8841560 commit 6e291aa

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

src/i18n/locales/en.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,9 @@
114114
"project_cloning_in_progress": "The project is being created with the cloning options specified",
115115
"vulnerability": "Vulnerability",
116116
"analysis": "Analysis",
117+
"analysis_tooltip": "The current state of an occurrence of a vulnerability",
117118
"justification": "Justification",
119+
"justification_tooltip": "The rationale of why the impact analysis state was asserted to be \"Not Affected\"",
118120
"title": "Title",
119121
"subtitle": "Subtitle",
120122
"recommendation": "Recommendation",
@@ -149,7 +151,8 @@
149151
"rollback": "Rollback",
150152
"workaround_available": "Workaround available",
151153
"response": "Vendor Response (project)",
152-
"analysis_details": "Details (explanation, workaround details, and other impact information)",
154+
"response_tooltip": "A response to the vulnerability by the manufacturer, supplier, or project responsible for the affected component or service",
155+
"analysis_details_tooltip": "Details (explanation, workaround details, and other impact information)",
153156
"updated": "Updated",
154157
"add_component": "Add Component",
155158
"remove_component": "Remove Component",

src/views/portfolio/projects/ProjectFindings.vue

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,29 +192,31 @@
192192
</b-form-group>
193193
<b-form-group id="fieldset-9" v-if="this.isPermitted(this.PERMISSIONS.VULNERABILITY_ANALYSIS)" :label="this.$t('message.analysis')" label-for="input-9">
194194
<b-input-group id="input-9">
195-
<b-form-select v-model="analysisState" :options="analysisChoices" @change="makeAnalysis" style="flex:0 1 auto; width:auto; margin-right:2rem;"/>
195+
<b-form-select v-model="analysisState" :options="analysisChoices" @change="makeAnalysis" style="flex:0 1 auto; width:auto; margin-right:2rem;" v-b-tooltip.hover :title="this.$t('message.analysis_tooltip')"/>
196196
<bootstrap-toggle v-model="isSuppressed" :options="{ on: 'Suppressed', off: 'Suppress', onstyle: 'warning', offstyle: 'outline-disabled'}" :disabled="false" />
197197
</b-input-group>
198198
</b-form-group>
199199
<b-row v-if="this.isPermitted(this.PERMISSIONS.VULNERABILITY_ANALYSIS)">
200200
<b-col sm="6">
201201
<b-form-group id="fieldset-10" :label="this.$t('message.justification')" label-for="input-10">
202202
<b-input-group id="input-10">
203-
<b-form-select v-model="analysisJustification" :options="justificationChoices" @change="makeAnalysis" :disabled="analysisState !== 'NOT_AFFECTED'"/>
203+
<b-form-select v-model="analysisJustification" :options="justificationChoices" @change="makeAnalysis" :disabled="analysisState !== 'NOT_AFFECTED'" v-b-tooltip.hover :title="$t('message.justification_tooltip')" />
204204
</b-input-group>
205205
</b-form-group>
206206
</b-col>
207207
<b-col sm="6">
208208
<b-form-group id="fieldset-11" :label="this.$t('message.response')" label-for="input-11">
209209
<b-input-group id="input-11">
210-
<b-form-select v-model="analysisResponse" :options="responseChoices" @change="makeAnalysis"/>
210+
<b-form-select v-model="analysisResponse" :options="responseChoices" @change="makeAnalysis" v-b-tooltip.hover :title="this.$t('message.response_tooltip')" />
211211
</b-input-group>
212212
</b-form-group>
213213
</b-col>
214214
</b-row>
215-
<b-form-group id="fieldset-12" v-if="this.isPermitted(this.PERMISSIONS.VULNERABILITY_ANALYSIS)" :label="this.$t('message.details')" label-for="analysisDetailsField">
216-
<b-form-textarea id="analysisDetailsField" v-model="analysisDetails" rows="7" class="form-control"
217-
v-debounce:750ms="makeAnalysis" :debounce-events="'keyup'"/>
215+
<b-form-group id="fieldset-12" v-if="this.isPermitted(this.PERMISSIONS.VIEW_VULNERABILITY)" :label="this.$t('message.details')" label-for="analysisDetailsField">
216+
<b-form-textarea id="analysisDetailsField" v-model="analysisDetails" rows="7" class="form-control" :disabled="!this.isPermitted(this.PERMISSIONS.VULNERABILITY_ANALYSIS)" v-b-tooltip.hover :title="this.$t('message.analysis_details_tooltip')" />
217+
<div class="pull-right">
218+
<b-button v-if="this.isPermitted(this.PERMISSIONS.VULNERABILITY_ANALYSIS)" size="sm" variant="outline-primary" @click="makeAnalysis"><span class="fa fa-comment-o"></span> Update Details</b-button>
219+
</div>
218220
</b-form-group>
219221
</b-col>
220222
</b-row>

0 commit comments

Comments
 (0)