Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: Align Bioportal and AgroPortal - part 2.2 and 3 #340

Merged
merged 18 commits into from
Oct 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
08bbab0
remove ontology bridge code
syphax-bouazzouni Oct 12, 2024
a977d44
Add selected UI view components code for turbo frame, tabs, loaders a…
syphax-bouazzouni Oct 12, 2024
b440e5a
add concept show action
syphax-bouazzouni Oct 12, 2024
d353339
remove not used js code
syphax-bouazzouni Oct 12, 2024
317c380
use load-chart stimulus controller to show the Visits chart
syphax-bouazzouni Oct 12, 2024
ec94ae7
replace application-esbuild call with default application call, and s…
syphax-bouazzouni Oct 12, 2024
6a5218a
move ontology viewer sections (properties, mappings, widget, ..) unde…
syphax-bouazzouni Oct 12, 2024
de89a07
extract tree view partial from the classes visualize view
syphax-bouazzouni Oct 12, 2024
1c20fdd
update ontology viewer to use the TabsComponent
syphax-bouazzouni Oct 12, 2024
f4f72bd
extract sub helpers from the build_tree helper
syphax-bouazzouni Oct 12, 2024
4f7058b
move js code from old js file to the views directly
syphax-bouazzouni Oct 12, 2024
d19a83e
remove some old js code replaced with useSimpleTree, TabsContainer, ...
syphax-bouazzouni Oct 12, 2024
c3ae5b3
Merge branch 'upstream' into pr/feature/add-a-subset-of-aggroportal-v…
syphax-bouazzouni Oct 19, 2024
bed5842
remove some custom bioportal styles
syphax-bouazzouni Oct 19, 2024
0f5f9c2
Merge branch 'upstream' into pr/align-bioportal-agroportal-part-2
syphax-bouazzouni Oct 19, 2024
0e42984
add again the multilingual feature to the classes tab
syphax-bouazzouni Oct 19, 2024
3e366ae
Merge pull request #25 from ontoportal-lirmm/pr/feature/add-a-subset-…
alexskr Oct 23, 2024
1173da8
Merge pull request #23 from ontoportal-lirmm/pr/align-bioportal-agrop…
alexskr Oct 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ UI_URL=http://localhost:3000
API_URL=http://localhost:9393
API_KEY=

UI_THEME=ontoportal
UI_THEME=bioportal

BIOMIXER_URL=
BIOMIXER_APIKEY=
Expand Down
2 changes: 2 additions & 0 deletions app/assets/config/manifest.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@
//= link bp_annotator.js
//= link bp_annotatorplus.js
//= link vendor.js
//= link_tree ../images
//= link_directory ../javascripts .js
//= link_directory ../stylesheets .css
7 changes: 3 additions & 4 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,13 @@
//
//= require bioportal
//= require admin/licenses
//= require bp_class_tree
//= require bp_ajax_controller
//= require bp_ontology_viewer
//= require bp_notes
//= require bp_ontolobridge
//= require bp_form_complete
//= require bp_create_mappings
//= require bp_analytics
//= require bp_search
//= require bp_mappings
//= require bp_visualize
//= require bp_admin
//= require bp_recommender
//= require bp_property_tree
Expand All @@ -32,3 +28,6 @@
//= require projects
//= require submissions

//= require application_esbuild


16 changes: 0 additions & 16 deletions app/assets/javascripts/bioportal.js.erb
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,6 @@ var cache = new Object();
var que= new Array();
var queIndex = 0;
var thread=0;
var currentOntology;
var currentConcept;

function setOntology(ontology){
currentOntology = ontology;
}
function setConcept(concept){
currentConcept = concept;
}

function getOntology(){
return currentOntology;
}
function getConcept(){
return currentConcept;
}

// Invalidate and Refetch
function refreshCache(nodeID){
Expand Down
209 changes: 0 additions & 209 deletions app/assets/javascripts/bp_class_tree.js.erb

This file was deleted.

32 changes: 1 addition & 31 deletions app/assets/javascripts/bp_notes.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,6 @@
var ontNotesTable;
var ont_columns = { archived: 3, date: 7, subjectSort: 2 };

jQuery(".ontologies.show").ready(function(){
setupNotesFaceboxSizing();
bindAddCommentClick();
bindAddProposalClick();
bindProposalChange();
bindReplyClick();
bindReplyCancelClick();
bindReplySaveClick();

jQuery("a.subscribe_to_notes").live("click", function(){
subscribeToNotes(this);
});

jQuery("#hide_archived_ont").click(function(){
hideOrUnhideArchivedOntNotes();
});

wireOntTable(jQuery("#ontology_notes_list"));
});

NOTES_PROPOSAL_TYPES = {
"ProposalNewClass": "New Class Proposal",
Expand All @@ -38,7 +19,7 @@ function setupNotesFacebox() {
jQuery(this).facebox();
jQuery(this).data().faceboxInit = true;
}
});;
})
}

function setupNotesFaceboxSizing() {
Expand Down Expand Up @@ -118,17 +99,6 @@ function bindReplySaveClick() {
});
}

function validateReply(button) {

}

function validateNote(button) {

}

function validateProposal(button) {

}

var displayError = function(button) {
jQuery(button).parent().children(".reply_status").html("Error, please try again");
Expand Down
Loading