Skip to content

Commit

Permalink
Merge pull request #2811 from mitre/feature/rename-facts
Browse files Browse the repository at this point in the history 
Add option to rename facts
  • Loading branch information
@elegantmoose
elegantmoose authored Sep 12, 2023
2 parents b76090f + 3fc955f commit e7b2d8c
Showing 1 changed file with 17 additions and 9 deletions.
26 changes: 17 additions & 9 deletions templates/sources.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ <h2>Fact Sources</h2>
</div>
</div>
</div>
<div class="field is-flex is-horizontal is-flex is-align-items-center">
<div class="field is-flex is-horizontal is-flex is-align-items-center is-flex-direction-column">
<div class="field-label is-small is-flex-grow-2">
<label class="label pt-2">Values</label>
</div>
Expand Down Expand Up @@ -161,9 +161,10 @@ <h2>Fact Sources</h2>
<template x-for="(fact, index) in filteredFacts" :key="fact.trait">
<div class="box sources mb-2 mr-2 p-3 is-flex is-justify-content-center is-align-items-center is-flex-direction-column"
@click="($event) => editCard = ($event.target.id !== 'cancel-edit-fact') ? fact.trait : null"
x-data="{editedValues: {}, editedScores: {}, newTags: []}">
x-data="{editedValues: {}, editedScores: {}, newTags: [], editedNames: {}}">
<div>
<p x-bind:class="{'has-background-warning has-text-black': editCard === fact.trait}" class="p-1" x-text="fact.trait"></p>
<p x-show="editCard !== fact.trait" x-bind:class="{'has-background-warning has-text-black': editCard === fact.trait}" class="p-1" x-text="fact.trait"></p>
<input class="input is-small" x-show="editCard === fact.trait" x-model="editedNames[fact.trait]" x-init="editedNames[fact.trait] = fact.trait">
<template x-if="editCard === fact.trait">
<button class="button is-danger is-outlined is-small delete-card-button" @click="deleteFact(fact.trait)"><span class="icon"><em class="fas fa-trash"></em></span></button>
</template>
Expand All @@ -175,7 +176,7 @@ <h2>Fact Sources</h2>
<div class="field is-grouped is-grouped-multiline is-flex is-align-items-center is-justify-content-center">
<template x-for="(score) in fact.scores"
:key="fact.trait + score.score"
x-init="$watch('filteredFacts', updated => {if (updated && updated[index]) fact.scores = updated[index].scores})">
x-init="$watch('filteredFacts', updated => {if (updated && updated[index]) fact.scores = updated[index].scores;})">
<div>
<div class="is-flex is-justify-content-center is-align-items-center is-flex-direction-row is-flex-wrap-wrap">
<span x-show-="editCard !== fact.trait"
Expand All @@ -202,7 +203,7 @@ <h2>Fact Sources</h2>
pattern="[0-9]*"
placeholder="1"
x-bind:value="score.score">
<button @click="deleteFactValue(fact.trait, score.unique, val)"
<button @click="score.values.splice(index, 1) && deleteFactValue(fact.trait, score.unique, val)"
class="delete is-small"></button>
</span>
</div>
Expand Down Expand Up @@ -249,7 +250,7 @@ <h2>Fact Sources</h2>
<span id="cancel-edit-fact">Cancel</span>
</button>
<button class="button is-small is-primary ml-2"
@click="updateFact(editedValues, editedScores, newTags); newTags = []; $event.stopPropagation();">
@click="updateFact(editedValues, editedScores, newTags, editedNames); newTags = []; $event.stopPropagation();">
<span class="icon"><i class="fas fa-save"></i></span>
<span>Save</span>
</button>
Expand Down Expand Up @@ -1134,10 +1135,10 @@ <h2>Fact Sources</h2>
toast('Added new fact.', true);
},

updateFact(editedValues, editedScores, newTags) {
updateFact(editedValues, editedScores, newTags, editedNames) {
// Do a comparison of facts and new facts--replace uniques with ones in the new one
let updated = this.selectedSource.facts.map((f) => {
if (!editedValues[f.unique] && !editedScores[f.unique]) {
if (!editedValues[f.unique] && !editedScores[f.unique] && !editedNames[f.name]) {
return f; // return original fact
}
let fact = { trait: f.trait };
Expand All @@ -1151,6 +1152,12 @@ <h2>Fact Sources</h2>
} else {
fact.score = f.score;
}
if (editedNames[f.name]) {
fact.name = editedNames[f.name];
fact.trait = editedNames[f.name];
} else {
fact.name = f.name;
}
return fact;
});

Expand All @@ -1162,7 +1169,7 @@ <h2>Fact Sources</h2>

deleteFactValue(trait, unique, value) {
this.selectedSource.facts = this.selectedSource.facts.filter((f) => {
return (f.unique !== unique || f.value !== value);
return (f.value !== value);
});
if (this.selectedSource.facts.filter((f) => f.trait === trait).length < 1) this.deleteFact(trait); // delete fact if it doesn't have any values
this.updateFactSource(this.selectedSource);
Expand Down Expand Up @@ -1349,6 +1356,7 @@ <h2>Fact Sources</h2>

#sourcePage .box.sources .field-body {
flex-grow: 4 !important;
flex-direction: column !important;
}

#sourcePage .box.sources {
Expand Down

0 comments on commit e7b2d8c

Please sign in to comment.