Skip to content

Commit

Permalink
send tiles to remove, remove many unneeded vars, re #11117
Browse files Browse the repository at this point in the history
  • Loading branch information
@apeters
apeters committed Jul 30, 2024
1 parent 054ec1f commit bb40de4
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 48 deletions.
58 changes: 13 additions & 45 deletions arches/app/media/js/views/components/etl_modules/bulk_edit_concept.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,8 @@ define([
this.moduleId = params.etlmoduleid;
this.previewing = ko.observable();
this.formData = new window.FormData();
this.saveid = ko.observableArray();
this.savenode = ko.observableArray();
this.searchUrl = ko.observable();
this.dropdownnodes = ko.observableArray();
this.allinformationTable = ko.observableArray();
this.selectedNode = ko.observable();
this.dropdowngraph = ko.observableArray();
this.selectedGraph = ko.observable();
Expand All @@ -32,10 +29,7 @@ define([
this.conceptNewLang = ko.observable();
this.rdmCollection = null;
this.rdmCollectionLanguages = ko.observableArray();
this.defaultLanguage = ko.observable();
this.showPreviewTalbe = ko.observable(true);
this.showPreview = ko.observable(false);
this.reportUrl = ko.observable(window.location.href.split('/').slice(0, 3).join('/')+'/report/');
//paging
this.currentPageIndex = ko.observable(0);
this.tilesToRemove = ko.observableArray();
Expand All @@ -47,35 +41,20 @@ define([
this.alert = params.alert || ko.observable();

this.addAllFormData = () => {
self.formData = new window.FormData();
self.formData.append('load_id', self.loadId);
self.formData.append('module', self.moduleId);
if (self.selectedGraph()) { self.formData.append('selectedGraph', self.selectedGraph()); }
if (self.saveid()) { self.formData.append('saveid', self.saveid()); }
if (self.savenode()) { self.formData.append('savenode', self.savenode()); }
if (self.conceptOld()) { self.formData.append('conceptOld', self.conceptOld()); }
if (self.conceptNew()) { self.formData.append('conceptNew', self.conceptNew()); }
if (self.conceptOldLang()) { self.formData.append('conceptOldLang', self.conceptOldLang()); }
if (self.conceptNewLang()) { self.formData.append('conceptNewLang', self.conceptNewLang()); }
if (self.selectedNode()) { self.formData.append('selectedNode', JSON.stringify(self.selectedNode())); }
if (self.allinformationTable()) { self.formData.append('table', self.allinformationTable()); }
if (self.searchUrl()) { self.formData.append('search_url', self.searchUrl()); }
if (self.rdmCollection) { self.formData.append('rdmCollection', self.rdmCollection); }
self.formData.append('currentPageIndex', self.currentPageIndex());
self.formData.append('tilesToRemove', self.tilesToRemove);
};
self.deleteAllFormData = () => {
self.formData.delete('selectedGraph');
self.formData.delete('saveid');
self.formData.delete('savenode');
self.formData.delete('conceptOld');
self.formData.delete('conceptNew');
self.formData.delete('conceptOldLang');
self.formData.delete('conceptNewLang');
self.formData.delete('selectedNode');
self.formData.delete('table');
self.formData.delete('search_url');
self.formData.delete('rdmCollection');
self.formData.delete('currentPageIndex');
self.formData.append('tilesToRemove', self.tilesToRemove());
};
//lenght table

//length table
self.listLength = ko.observable();

//paging
Expand Down Expand Up @@ -105,7 +84,7 @@ define([

//make url
self.constructReportUrl = function(dataItem) {
return self.reportUrl() + dataItem.resourceid;
return arches.urls.reports + dataItem.resourceid;
};

this.ready = ko.computed(() => {
Expand All @@ -121,10 +100,11 @@ define([
this.clearResults = ko.computed(() => {
// if any of these values change then clear the preview results
self.showPreview(false);
//self.allinformationTable.removeAll();
self.tilesToRemove.removeAll();
// we don't actually care about the results of the following
let clearResults = '';
[self.selectedGraph(),
[
self.selectedGraph(),
self.selectedNode(),
self.conceptOldLang(),
self.conceptNewLang(),
Expand All @@ -149,13 +129,12 @@ define([

//delete Row in table
this.addToList = function(tileid) {
self.tilesToRemove.push(tileid);
const list = new Set([...self.tilesToRemove(), tileid]);
self.tilesToRemove(list);
};

//call python code to display the change
this.getPreviewData = function() {
self.addAllFormData();
self.allinformationTable.removeAll();
self.showPreview(true);
self.submit('preview').then(data => {
self.listLength(data.result.number_of_tiles);
Expand All @@ -172,7 +151,6 @@ define([
);
}).always(function() {
self.previewing(false);
self.deleteAllFormData();
});
};

Expand All @@ -183,7 +161,6 @@ define([

if(!!node){
self.rdmCollection = node.rdmCollection;
self.addAllFormData();

self.submit('get_collection_languages').then(data => {
self.rdmCollectionLanguages(data.result);
Expand All @@ -210,9 +187,7 @@ define([

//select nodes and take the specific value
this.selectedGraph.subscribe((graphid) => {
self.addAllFormData();
self.dropdownnodes.removeAll();
self.savenode.removeAll();
self.conceptNew(undefined);
self.conceptOld(undefined);
self.selectedNode(undefined);
Expand Down Expand Up @@ -241,11 +216,8 @@ define([

//take the graphs
this.allgraph = function() {
self.addAllFormData();
self.dropdowngraph.removeAll();
self.saveid.removeAll();
self.dropdownnodes.removeAll();
self.savenode.removeAll();
self.showPreview(false);

self.submit('get_graphs').then(data => {
Expand All @@ -270,10 +242,7 @@ define([
if (!self.allowEditOperation()) {
return;
}

self.showPreview(false);
self.showPreviewTalbe(false);
self.addAllFormData();
params.activeTab("import");
self.submit('write').then(data => {
}).fail( function(err) {
Expand All @@ -289,9 +258,8 @@ define([
};

this.submit = function(action, data) {
self.addAllFormData();
self.formData.append('action', action);
self.formData.append('load_id', self.loadId);
self.formData.append('module', self.moduleId);
return $.ajax({
type: "POST",
url: arches.urls.etl_manager,
Expand Down
5 changes: 2 additions & 3 deletions arches/app/templates/views/components/etl_modules/bulk_edit_concept.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ <h3 style="margin-top: 0px;">
<th>Name</th>
<th>Old</th>
<th>New</th>
<th>Action</th>
<th>Remove from Edit Queue</th>
</tr>
</thead>
<tbody data-bind="foreach: paginatedRows">
Expand All @@ -142,8 +142,7 @@ <h3 style="margin-top: 0px;">
<td data-bind="text: $data.displayname"></td>
<td data-bind="text: $data.original_preflabels"></td>
<td data-bind="text: $data.new_preflabels"></td>
<td><input type="checkbox" data-bind="click: $parent.addToList($data.tileid), value: !$parent.inTileList"></td>
<td><button data-bind="click: $parent.deleteRow" style="background-color: #ff6347; color: white; border: none; padding: 7px 14px; border-radius: 4px; cursor: pointer;">Remove</button></td>
<td><input type="checkbox" data-bind="checkedValue: $data.tileid, checked: $parent.tilesToRemove"></td>
</tr>
</tbody>
</table>
Expand Down

0 comments on commit bb40de4

Please sign in to comment.