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

Create logical definition #78

Merged
merged 82 commits into from
Oct 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
f317c9d
Replace spotify docker plugin with maven-exec plugin
matthewhorridge Jul 30, 2024
a995d80
Use maven-exec for docker push
matthewhorridge Aug 1, 2024
afd22e3
Fixes #46
matthewhorridge Aug 2, 2024
d87997a
Merge pull request #47 from protegeproject/fix-issues-46
matthewhorridge Aug 3, 2024
af5fc8a
ci: version bump 6.0.2
Aug 3, 2024
2bc5e4d
Merge pull request #44 from protegeproject/replace-spotify-docker-plugin
matthewhorridge Aug 5, 2024
bec587d
ci: version bump 6.0.3
Aug 5, 2024
10aa8cc
Moved tab presenter and related interfaces/classes to the tab package…
matthewhorridge Aug 5, 2024
03fb8cf
Genericized TabBarPresenter and associated classes
matthewhorridge Aug 5, 2024
b334594
Use maven-exec for docker build and push
matthewhorridge Aug 5, 2024
3e6316b
Merge branch 'master' into docker-push-changes
matthewhorridge Aug 5, 2024
f721649
Merge pull request #49 from protegeproject/docker-push-changes
matthewhorridge Aug 5, 2024
1c49e28
ci: version bump 6.0.4
Aug 5, 2024
62e7625
-am is required
matthewhorridge Aug 6, 2024
9fa6157
Merge branch 'master' into docker-push-changes
matthewhorridge Aug 6, 2024
0e88426
Merge pull request #50 from protegeproject/docker-push-changes
matthewhorridge Aug 6, 2024
c26874d
ci: version bump 6.0.5
Aug 6, 2024
4fa7aa2
Merge branch 'master' into factor-out-tabs-from-forms
matthewhorridge Aug 6, 2024
d5cc278
Merge pull request #48 from protegeproject/factor-out-tabs-from-forms
matthewhorridge Aug 6, 2024
b35afe0
ci: version bump 6.0.6
Aug 6, 2024
d275146
Fixes #56
matthewhorridge Sep 5, 2024
279a4ef
Merge pull request #58 from protegeproject/Fix-56
matthewhorridge Sep 5, 2024
d11a4c1
ci: version bump 6.0.7
Sep 5, 2024
21a3038
Fixes #57
matthewhorridge Sep 5, 2024
c5d1b15
Merge pull request #60 from protegeproject/Fix-57
matthewhorridge Sep 5, 2024
4cfb074
ci: version bump 6.0.8
Sep 5, 2024
49ce7d3
Fixes #59
matthewhorridge Sep 6, 2024
ee50396
Merge pull request #61 from protegeproject/Fix-59
matthewhorridge Sep 6, 2024
1c2e548
ci: version bump 6.0.9
Sep 6, 2024
139a206
Fixes #63
matthewhorridge Sep 10, 2024
bb4737f
Merge pull request #64 from protegeproject/Fix-63
matthewhorridge Sep 10, 2024
341b6cc
ci: version bump 6.0.10
Sep 10, 2024
0df0ea5
Fixes #65
matthewhorridge Sep 10, 2024
19ce5a6
Merge pull request #66 from protegeproject/Fix-65
matthewhorridge Sep 10, 2024
0915cd3
ci: version bump 6.0.11
Sep 10, 2024
1b473a8
added postcoordination file upload
alexsilaghi Sep 16, 2024
21badc3
added reading post coordination table. fetching scale value from backend
alexsilaghi Sep 23, 2024
be89b6a
reset on entity change.
alexsilaghi Sep 23, 2024
2c33c37
reset on entity change.
alexsilaghi Sep 25, 2024
3d2f6a7
save entity
alexsilaghi Sep 26, 2024
7ff2c93
Merge branch 'master-who' of https://github.com/protegeproject/webpro…
soimugeo Sep 26, 2024
5487851
pulled from master-who added missing classes to Action.java Result.ja…
soimugeo Sep 26, 2024
9bf2bb2
fixed get scale value card values for postcoordination
soimugeo Sep 27, 2024
f94362a
added edit buttons.
alexsilaghi Sep 27, 2024
4a341b4
Merge remote-tracking branch 'origin/upload-postcoordination-file' in…
alexsilaghi Sep 27, 2024
56cd47f
fixed scale value card header row padding
soimugeo Sep 27, 2024
eb8e8f2
partially fix edit action for scale value cards. will finish it on Mo…
soimugeo Sep 27, 2024
170ae0b
moved the default sync to cell. fixed serialization issue
alexsilaghi Sep 30, 2024
564a081
Merge remote-tracking branch 'origin/upload-postcoordination-file' in…
alexsilaghi Sep 30, 2024
1723e62
added some fixes for edit mode of post coordination table and scale v…
soimugeo Sep 30, 2024
0ed274a
Merge branch 'upload-postcoordination-file' of https://github.com/pro…
soimugeo Sep 30, 2024
c28ffbd
fixed a bug where initial state of scale value cards is not read only
soimugeo Sep 30, 2024
ff14dc3
renamed postcoordination specifications field
alexsilaghi Sep 30, 2024
2cb7242
Merge remote-tracking branch 'origin/upload-postcoordination-file' in…
alexsilaghi Sep 30, 2024
69e2ae0
wip scale value cards selection view
soimugeo Oct 1, 2024
80053df
added tooltip.
alexsilaghi Oct 1, 2024
97d4242
added icons for scale values selection mode (#73)
soimugeoWB Oct 1, 2024
3391804
Merge branch 'upload-postcoordination-file' of https://github.com/pro…
soimugeo Oct 1, 2024
806c572
removed tooltip from svg. ordering the rows and centered the labels.
alexsilaghi Oct 2, 2024
8da034d
Merge remote-tracking branch 'origin/upload-postcoordination-file' in…
alexsilaghi Oct 2, 2024
d6f7a0f
added check on moving from entity.
alexsilaghi Oct 2, 2024
80a4119
In the customization of scales, show info about the cardinality of th…
soimugeoWB Oct 3, 2024
a13542d
added correct ordering of the scale value cards (#75)
soimugeoWB Oct 3, 2024
69bd389
Merge branch 'upload-postcoordination-file' of https://github.com/pro…
soimugeo Oct 3, 2024
e78eb11
38 fix postcoordinationportletpresenter to load data upon refresh pag…
soimugeoWB Oct 3, 2024
cfa4cc2
Merge branch 'upload-postcoordination-file' of https://github.com/pro…
soimugeo Oct 3, 2024
170e443
scaffolding and ancestor fetching.
alexsilaghi Oct 3, 2024
44c4277
wip ScaleValueSelectionView
soimugeo Oct 3, 2024
0e90371
added scale value selection modal
soimugeo Oct 4, 2024
45cd6a4
Merge branch 'master' of https://github.com/protegeproject/webprotege…
soimugeo Oct 4, 2024
5cb72d6
finished save of scale values in PostCoordinationPortletPresenter
soimugeo Oct 4, 2024
550cce1
fixed a bug that was causing scale value cards to be save incorrectly.
soimugeo Oct 7, 2024
d3694d3
partial commit
alexsilaghi Oct 7, 2024
26960f0
Merge remote-tracking branch 'origin/upload-postcoordination-file' in…
alexsilaghi Oct 7, 2024
2b3db6f
partial commit.
alexsilaghi Oct 9, 2024
58a7fcf
finished the table.
alexsilaghi Oct 10, 2024
f403c02
Merge branch 'master-who' into create-logical-definition
alexsilaghi Oct 10, 2024
e93dcc2
saving the values.
alexsilaghi Oct 14, 2024
363ca00
fixed fetching data from BE
alexsilaghi Oct 14, 2024
2916c6f
Merge remote-tracking branch 'origin/master-who' into create-logical-…
alexsilaghi Oct 14, 2024
a2056ec
fixing the update call.
alexsilaghi Oct 17, 2024
5a4c8b9
fixed showing multiple rows.
alexsilaghi Oct 17, 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
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
import edu.stanford.bmir.protege.web.client.library.modal.ModalViewImpl;
import edu.stanford.bmir.protege.web.client.library.msgbox.InputBoxView;
import edu.stanford.bmir.protege.web.client.library.msgbox.InputBoxViewImpl;
import edu.stanford.bmir.protege.web.client.linearization.*;
import edu.stanford.bmir.protege.web.client.login.LoginView;
import edu.stanford.bmir.protege.web.client.login.LoginViewImpl;
import edu.stanford.bmir.protege.web.client.login.SignInRequestHandler;
Expand Down Expand Up @@ -496,26 +495,6 @@ EntityTagsSelectorView provideEntityTagsSelectorView(EntityTagsSelectorViewImpl
EditorPortletView provideEditorPortletView(EditorPortletViewImpl impl) {
return impl;
}
@Provides
LinearizationParentView provideLinearizationParentView(LinearizationParentViewImpl impl) {
return impl;
}


@Provides
LinearizationPortletView provideLinearizationPortletView(LinearizationPortletViewImpl impl) {
return impl;
}

@Provides
PostCoordinationPortletView providePostCoordinationPortletView(PostCoordinationPortletViewImpl impl){
return impl;
}

@Provides
LinearizationCommentsView provideLienarizationCommentsView(LinearizationCommentsViewImpl impl){
return impl;
}

@Provides
ProjectTagsView provideProjectTagsView(ProjectTagsViewImpl impl) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,23 @@
import edu.stanford.bmir.protege.web.client.individualslist.*;
import edu.stanford.bmir.protege.web.client.lang.*;
import edu.stanford.bmir.protege.web.client.library.tokenfield.*;
import edu.stanford.bmir.protege.web.client.linearization.*;
import edu.stanford.bmir.protege.web.client.list.*;
import edu.stanford.bmir.protege.web.client.logicaldefinition.LogicalDefinitionPortletView;
import edu.stanford.bmir.protege.web.client.logicaldefinition.LogicalDefinitionPortletViewImpl;
import edu.stanford.bmir.protege.web.client.logicaldefinition.LogicalDefinitionTableWrapper;
import edu.stanford.bmir.protege.web.client.logicaldefinition.LogicalDefinitionTableWrapperImpl;
import edu.stanford.bmir.protege.web.client.match.*;
import edu.stanford.bmir.protege.web.client.ontology.annotations.*;
import edu.stanford.bmir.protege.web.client.permissions.*;
import edu.stanford.bmir.protege.web.client.perspective.*;
import edu.stanford.bmir.protege.web.client.portlet.*;
import edu.stanford.bmir.protege.web.client.postcoordination.PostCoordinationChangesHandler;
import edu.stanford.bmir.protege.web.client.postcoordination.PostCoordinationChangesHandlerImpl;
import edu.stanford.bmir.protege.web.client.postcoordination.PostCoordinationPortletView;
import edu.stanford.bmir.protege.web.client.postcoordination.PostCoordinationPortletViewImpl;
import edu.stanford.bmir.protege.web.client.postcoordination.PostCoordinationChangesHandler;
import edu.stanford.bmir.protege.web.client.postcoordination.PostCoordinationChangesHandlerImpl;
import edu.stanford.bmir.protege.web.client.project.*;
import edu.stanford.bmir.protege.web.client.projectsettings.*;
import edu.stanford.bmir.protege.web.client.renderer.*;
Expand Down Expand Up @@ -217,6 +226,39 @@ NumericValueCriteriaView provideNumericValueCriteriaView(NumericValueCriteriaVie
return impl;
}


@Provides
LogicalDefinitionPortletView provideLogicalDefinitionPortletView(LogicalDefinitionPortletViewImpl impl) {
return impl;
}

/* @Provides
LogicalDefinitionTableWrapper provideLogicalDefinitionTableWrapper(LogicalDefinitionTableWrapperImpl impl) {
return impl;
}*/

@Provides
LinearizationParentView provideLinearizationParentView(LinearizationParentViewImpl impl) {
return impl;
}


@Provides
LinearizationPortletView provideLinearizationPortletView(LinearizationPortletViewImpl impl) {
return impl;
}

@Provides
PostCoordinationPortletView providePostCoordinationPortletView(PostCoordinationPortletViewImpl impl){
return impl;
}


@Provides
LinearizationCommentsView provideLienarizationCommentsView(LinearizationCommentsViewImpl impl){
return impl;
}

@Provides
LangTagMatchesCriteriaView provideLangTagMatchesCriteriaView(LangTagMatchesCriteriaViewImpl impl) {
return impl;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

import java.util.Iterator;
import java.util.List;
import java.util.logging.Logger;


public class LinearizationParentViewImpl extends Composite implements LinearizationParentView {

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
.superClassTable {
overflow: hidden;
margin-top: 15px;
border-collapse: collapse;
padding: 3px;
width: 50%;
}

.tableText {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
vertical-align: middle;
}

.definitionsEmptyState {
height: 300px;
background-repeat: no-repeat;
background-position: center;
}

.tableText > div {
display: flex;
justify-content: start;
align-content: center;
text-align: left;
max-width: 350px;
margin: 8px;

}

.logicalDefinitionDropdown {
background-color: white;
margin: 5px;
padding: 3px;
}

.superClassTableHeader .tableText > div {
font-size: 14px;
font-weight: bold;
}

.customRowStyle {

border-bottom: 1px solid #f2f2f2;
}

.removeButtonCell {
width: 20px;
height: 20px;
align-self: center;
}

.removeButtonCell > div {
margin-top: 2px;
margin-bottom: 2px;
}


.superClassTableHeader {
font-size: 18px;
color: #fff;
line-height: 1.4;
background-color: #186cd4;
font-family: "Helvetica Neue", "Lucida Grande", "Segoe UI", Arial, Helvetica, Verdana, sans-serif;
}

.dropDownMandatory{
color: red;
margin: 2px;
font-size: bold;
}

.dropDownAllowed {
color: green;
margin: 2px;
font-size: bold;
}

.dropDownNotSet{
margin: 2px;
}

.superClassName {
font-size: 12px;
font-weight: bold;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
package edu.stanford.bmir.protege.web.client.logicaldefinition;

import edu.stanford.bmir.protege.web.client.dispatch.DispatchServiceManager;
import edu.stanford.bmir.protege.web.client.lang.DisplayNameRenderer;
import edu.stanford.bmir.protege.web.client.portlet.AbstractWebProtegePortletPresenter;
import edu.stanford.bmir.protege.web.client.portlet.PortletUi;
import edu.stanford.bmir.protege.web.client.selection.SelectionModel;
import edu.stanford.bmir.protege.web.shared.event.WebProtegeEventBus;
import edu.stanford.bmir.protege.web.shared.project.ProjectId;
import edu.stanford.bmir.protege.web.shared.renderer.GetEntityRenderingAction;
import edu.stanford.webprotege.shared.annotations.Portlet;
import org.semanticweb.owlapi.model.OWLEntity;

import javax.annotation.Nonnull;
import javax.inject.Inject;
import java.util.Optional;

@Portlet(id = "portlets.LogicalDefinition",
title = "iCat-X Logical Definition",
tooltip = "Displays the existing logical definitions on the current entity.")
public class LogicalDefinitionPortletPresenter extends AbstractWebProtegePortletPresenter {


private LogicalDefinitionPortletView view;

private DispatchServiceManager dispatch;

@Inject
public LogicalDefinitionPortletPresenter(@Nonnull SelectionModel selectionModel,
@Nonnull ProjectId projectId,
@Nonnull DisplayNameRenderer displayNameRenderer,
@Nonnull DispatchServiceManager dispatch,
@Nonnull LogicalDefinitionPortletView view) {
super(selectionModel, projectId, displayNameRenderer, dispatch);
this.view = view;
this.dispatch = dispatch;
}

@Override
public void startPortlet(PortletUi portletUi,
WebProtegeEventBus eventBus) {
setDisplaySelectedEntityNameAsSubtitle(true);
portletUi.setWidget(view.asWidget());

}

@Override
protected void handleReloadRequest() {

}

@Override
protected void handleAfterSetEntity(Optional<OWLEntity> entityData) {
if(!entityData.isPresent()) {
setNothingSelectedVisible(true);
setDisplayedEntity(Optional.empty());
} else {
setNothingSelectedVisible(false);
dispatch.execute(GetEntityRenderingAction.create(getProjectId(), entityData.get()),
(result) -> setDisplayedEntity(Optional.of(result.getEntityData())));
view.setEntity(entityData.get(), getProjectId());
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package edu.stanford.bmir.protege.web.client.logicaldefinition;

import com.google.gwt.user.client.ui.AcceptsOneWidget;
import com.google.gwt.user.client.ui.IsWidget;
import edu.stanford.bmir.protege.web.shared.HasDispose;
import edu.stanford.bmir.protege.web.shared.project.ProjectId;
import org.semanticweb.owlapi.model.OWLEntity;

public interface LogicalDefinitionPortletView extends AcceptsOneWidget, IsWidget, HasDispose {

void setEntity(OWLEntity owlEntity, ProjectId projectId);
}
Loading
Loading