Skip to content

Commit

Permalink
472 (#572)
Browse files Browse the repository at this point in the history 
* prevent record being open twice; auto replace second record

* splice bugfixes

* reset the div on on record close

* persist unsaved changes detetction on refresh display

Co-authored-by: jbukhari <[email protected]>
  • Loading branch information
@jbukhari
jbukhari and jbukhari authored Aug 16, 2022
1 parent d09eb14 commit b6ad5e2
Show file tree
Hide file tree
Showing 2 changed files with 77 additions and 30 deletions.
37 changes: 25 additions & 12 deletions dlx_rest/static/js/basket.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ export let basketcomponent = {
this.$root.$refs.basketcomponent = this;
this.buildBasket();
},
/* // Removed
mounted: async function() {
this.timer = setInterval(this.rebuildBasket, 20000)
//this.timer = setInterval(this.rebuildBasket, 20000) // Removed

this.editor = this.$root.$refs.multiplemarcrecordcomponent; // other components not avaialble before mounted
},
*/
methods: {
removeRecordFromRecordDisplayed(recordToDelete){
const index = this.recordDisplayed.indexOf(recordToDelete);
Expand All @@ -65,21 +65,34 @@ export let basketcomponent = {
// Check if the record is already displayed
const len = this.recordDisplayed.length;

if (len===2) {
this.callChangeStyling("Please remove one record from the editor!!!", "row alert alert-warning")
if (this.editor.currentRecordObjects.filter(x => x.collection == myCollection && x.recordId == myRecord).length > 0) {
// the record is already open
//this.callChangeStyling("Record already open", "row alert alert-danger")
return
}

if (this.editor.currentRecordObjects.length === 2) {
//this.callChangeStyling("Please remove one record from the editor!!!", "row alert alert-warning")

// close the second record
let toRemove = this.editor.currentRecordObjects[1];
this.callChangeStyling(`Removing ${toRemove.collection}/${toRemove.recordId}`, "row alert alert-warning");
await new Promise(r => setTimeout(r, 750));
if (! this.editor.userClose(toRemove)) return // the close may have been cancelled by the user
}
else
{
this.$root.$refs.multiplemarcrecordcomponent.recordlist.push(`${myCollection}/${myRecord}`);
let jmarc = await Jmarc.get(myCollection, myRecord);
this.$root.$refs.multiplemarcrecordcomponent.displayMarcRecord(jmarc)

this.editor.recordlist.push(`${myCollection}/${myRecord}`);
let jmarc = await Jmarc.get(myCollection, myRecord);

if (this.editor.displayMarcRecord(jmarc)) {
// add record displayed
this.recordDisplayed.push(jmarc.recordId)
// this.forceUpdate()
this.callChangeStyling("Record added to the editor", "row alert alert-success")

} else {
// the record did not display for some reason
this.editor.recordlist.splice(this.editor.recordlist.indexOf(`${myCollection}/${myRecord}`), 1);
}

},
callChangeStyling(myText, myStyle) {
this.$root.$refs.messagecomponent.changeStyling(myText, myStyle)
Expand Down
70 changes: 52 additions & 18 deletions dlx_rest/static/js/record.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,8 @@ export let multiplemarcrecordcomponent = {
shiftPressed: false,
controlPressed: false,
commandPressed: false,
isFiltered:false
isFiltered:false,
currentRecordObjects: []
}
},

Expand Down Expand Up @@ -588,7 +589,7 @@ export let multiplemarcrecordcomponent = {
let i = this.copiedFields.indexOf(field);

if (typeof i !== 'undefined') {
this.copiedFields.splice(i);
this.copiedFields.splice(i, 1);
}

// Manage virtual indicators
Expand Down Expand Up @@ -1387,6 +1388,15 @@ export let multiplemarcrecordcomponent = {
}

this.removeRecordFromEditor(jmarc)
let otherRecord = this.currentRecordObjects[0];

if (otherRecord) {
// reset the div
this.removeRecordFromEditor(otherRecord);
this.displayMarcRecord(otherRecord);
}

return true
},
removeRecordFromEditor(jmarc,keepDataInVector=false) {

Expand Down Expand Up @@ -1417,7 +1427,7 @@ export let multiplemarcrecordcomponent = {
if (keepDataInVector==false) {
this.callChangeStyling("Record removed from the editor", "row alert alert-success")
}

}
else if (divID === "record2") {
this.removeJmarcTodisplayedJmarcObject(this.record2)
Expand All @@ -1431,6 +1441,9 @@ export let multiplemarcrecordcomponent = {
this.callChangeStyling("Record removed from the editor", "row alert alert-success")
}
}

this.currentRecordObjects.splice(this.currentRecordObjects.indexOf(jmarc), 1);

// optimize the display
this.selectedRecord=""
this.optimizeEditorDisplay(this.targetedTable)
Expand Down Expand Up @@ -1467,19 +1480,13 @@ export let multiplemarcrecordcomponent = {

//console.log(this.recordlist.indexOf(`${jmarc.collection}/${jmarc.recordId}`));
// needed?
this.recordlist.splice(this.recordlist.indexOf(`${jmarc.collection}/${jmarc.recordId}`));
this.recordlist.splice(this.recordlist.indexOf(`${jmarc.collection}/${jmarc.recordId}`), 1);

return true
},
displayMarcRecord(jmarc, readOnly,reload=false) {
let myDivId;

// change the color of the background of the item in the basket
const myId=jmarc.collection + '--' + jmarc.recordId
const selectedItem=document.getElementById(myId)

// set the styling only if the Div exists
if (selectedItem) selectedItem.setAttribute("style", "background-color: #d5e1f5;");


if (this.isRecordOneDisplayed == false) {
myDivId = "record1";
this.isRecordOneDisplayed = true;
Expand All @@ -1492,19 +1499,42 @@ export let multiplemarcrecordcomponent = {
this.record2 = jmarc.recordId;
this.collectionRecord2 = jmarc.collection; // used for auth merge
}
else {
// replace record?
}


if (reload==false){
jmarc.addUndoredoEntry()
}

jmarc.div = document.getElementById(myDivId);

// the display may have been aborted
if (! jmarc.div) return

// change the color of the background of the item in the basket
const myId=jmarc.collection + '--' + jmarc.recordId
const selectedItem=document.getElementById(myId)

// set the styling only if the Div exists
if (selectedItem) selectedItem.setAttribute("style", "background-color: #d5e1f5;");

// build the record display

let table = this.buildRecordTable(jmarc,readOnly);

jmarc.div.appendChild(table);
this.selectRecord(jmarc)
this.selectRecord(jmarc);
this.currentRecordObjects.push(jmarc);

// trigger unsaved changes detection
for (let field of jmarc.getDataFields()) {
field.tagSpan.focus();
field.ind1Span.focus();
field.ind2Span.focus();

for (let subfield of field.subfields) {
subfield.codeSpan.focus();
subfield.valueSpan.focus();
subfield.valueSpan.blur();
}
}

// add the jmarc inside the list of jmarc objects displayed
// only if the array size is under 2
Expand Down Expand Up @@ -1534,6 +1564,7 @@ export let multiplemarcrecordcomponent = {
}
})

return true
},
buildRecordTable(jmarc, readOnly) {
let component = this;
Expand Down Expand Up @@ -1917,6 +1948,7 @@ export let multiplemarcrecordcomponent = {
ind1Cell.append(ind1Div);
ind1Div.className = "indicators";
let ind1Span = document.createElement("span");
field.ind1Span = ind1Span;
ind1Div.append(ind1Span);
ind1Span.className = "mx-1";
ind1Span.tabIndex = 0;
Expand All @@ -1928,6 +1960,7 @@ export let multiplemarcrecordcomponent = {
ind2Cell.append(ind2Div);
ind2Div.className = "indicators";
let ind2Span = document.createElement("span");
field.ind2Span = ind2Span;
ind2Div.append(ind2Span);
ind2Span.className = "mx-1";
ind2Span.tabIndex = 0;
Expand Down Expand Up @@ -2409,6 +2442,7 @@ export let multiplemarcrecordcomponent = {
}
}

valSpan.addEventListener("focus", checkState); // allows triggering arbitrarily
valCell.addEventListener("input", checkState);
valCell.addEventListener("mousedown", checkState); // auth control selection

Expand Down

0 comments on commit b6ad5e2

Please sign in to comment.