Skip to content

Commit

Permalink
Merge pull request #150 from reagan-meant/ISSUE-149
Browse files Browse the repository at this point in the history
ISSUE-149: Automatch screen should only show automatches
  • Loading branch information
ashaban authored Aug 27, 2024
2 parents 59546fe + 7070e44 commit 5cefc2e
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion server/gui/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/crux/favicon.ico"><title>crux</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"><link href="/crux/css/app.85a562fa.css" rel="preload" as="style"><link href="/crux/css/chunk-vendors.e376e9e7.css" rel="preload" as="style"><link href="/crux/js/app.8ff30568.js" rel="preload" as="script"><link href="/crux/js/chunk-vendors.4b1b7d85.js" rel="preload" as="script"><link href="/crux/css/chunk-vendors.e376e9e7.css" rel="stylesheet"><link href="/crux/css/app.85a562fa.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but crux doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/crux/js/chunk-vendors.4b1b7d85.js"></script><script src="/crux/js/app.8ff30568.js"></script></body></html>
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/crux/favicon.ico"><title>crux</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"><link href="/crux/css/app.85a562fa.css" rel="preload" as="style"><link href="/crux/css/chunk-vendors.e376e9e7.css" rel="preload" as="style"><link href="/crux/js/app.31eb993f.js" rel="preload" as="script"><link href="/crux/js/chunk-vendors.d546b80f.js" rel="preload" as="script"><link href="/crux/css/chunk-vendors.e376e9e7.css" rel="stylesheet"><link href="/crux/css/app.85a562fa.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but crux doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/crux/js/chunk-vendors.d546b80f.js"></script><script src="/crux/js/app.31eb993f.js"></script></body></html>
2 changes: 2 additions & 0 deletions server/gui/js/app.31eb993f.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions server/gui/js/app.31eb993f.js.map

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions server/gui/js/app.8ff30568.js

This file was deleted.

1 change: 0 additions & 1 deletion server/gui/js/app.8ff30568.js.map

This file was deleted.

1 change: 0 additions & 1 deletion server/gui/js/chunk-vendors.4b1b7d85.js.map

This file was deleted.

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions server/gui/js/chunk-vendors.d546b80f.js.map

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions ui/src/views/Resolve.vue
Original file line number Diff line number Diff line change
Expand Up @@ -336,8 +336,8 @@ export default {
let matchingKeys = [];
for (let i = 0; i < resp.data.length; i++) {
const dataObject = resp.data[i];
for (let i = 0; i < responseData.length; i++) {
const dataObject = responseData[i];
for (let key in dataObject) {
if (extRegexPattern.test(key)) {
matchingKeys.push(key);
Expand All @@ -348,15 +348,15 @@ export default {
let idRegexPattern = /^identifier/;
for (let key in resp.data[0]) {
for (let key in responseData[0]) {
if (idRegexPattern.test(key)) {
this.$set(this.fields, key, this.$t(key));
}
}
this.resolves = resp.data
this.resolves = responseData
shuffle(this.available_nicknames)
this.organizeResolves(true)
Expand All @@ -373,7 +373,7 @@ export default {
cridHeader: function() {
return this.useNickname ? this.$t('Temporary_cr_id') + ( this.includeCRID ? " / Actual CR ID" : "") : "CR ID"
},
filteredScores(scores) {
filteredScores() {
return (data) => {
const filteredScores = {};
Expand Down

0 comments on commit 5cefc2e

Please sign in to comment.