Skip to content

IIA-1971 New Path added in STAMP Module #464

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.

Sign up for GitHub

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

Merged
bhharsh13 merged 6 commits into from
May 15, 2025
Merged

IIA-1971 New Path added in STAMP Module #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9228487
Update version to start feature: IIA-1971-new-path-stamp-module
bhharsh13 May 12, 2025
bfe8224
Merge branch 'main' of https://github.com/bhharsh13/komet into featur…
bhharsh13 May 13, 2025
499645d
Fixed issue for New Path getting added in STAMP Module
bhharsh13 May 14, 2025
5ff602b
Merge branch 'main' of https://github.com/bhharsh13/komet into featur…
bhharsh13 May 14, 2025
aa615a5
Update version to finish feature: IIA-1971-new-path-stamp-module
bhharsh13 May 14, 2025
bd7b0ea
updated findAllModules findAllPaths with fetchDescendentsOfConcets
bhharsh13 May 15, 2025
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
18 changes: 8 additions & 10 deletions kview/src/main/java/dev/ikm/komet/kview/mvvm/view/details/DetailsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@
import static dev.ikm.komet.kview.fxutils.SlideOutTrayHelper.slideOut;
import static dev.ikm.komet.kview.fxutils.ViewportHelper.clipChildren;
import static dev.ikm.komet.kview.lidr.mvvm.viewmodel.DeviceViewModel.DEVICE_ENTITY;
import static dev.ikm.komet.kview.mvvm.model.DataModelHelper.addToMembershipPattern;
import static dev.ikm.komet.kview.mvvm.model.DataModelHelper.getMembershipPatterns;
import static dev.ikm.komet.kview.mvvm.model.DataModelHelper.isInMembershipPattern;
import static dev.ikm.komet.kview.mvvm.model.DataModelHelper.removeFromMembershipPattern;
import static dev.ikm.komet.kview.mvvm.model.DataModelHelper.*;
import static dev.ikm.komet.kview.mvvm.viewmodel.ConceptViewModel.AXIOM;
import static dev.ikm.komet.kview.mvvm.viewmodel.ConceptViewModel.CONCEPT_STAMP_VIEW_MODEL;
import static dev.ikm.komet.kview.mvvm.viewmodel.ConceptViewModel.CREATE;
Expand Down Expand Up @@ -783,9 +780,10 @@ public void updateView() {
if (conceptViewModel.getPropertyValue(CONCEPT_STAMP_VIEW_MODEL) == null) {

// add a new stamp view model to the concept view model
//Populate from database
stampViewModel.setPropertyValue(MODE, EDIT)
.setPropertyValues(MODULES_PROPERTY, stampViewModel.findAllModules(viewProperties), true)
.setPropertyValues(PATHS_PROPERTY, stampViewModel.findAllPaths(viewProperties), true);
.setPropertyValues(MODULES_PROPERTY, fetchDescendentsOfConcept(getViewProperties(), TinkarTerm.MODULE.publicId()))
.setPropertyValues(PATHS_PROPERTY, fetchDescendentsOfConcept(getViewProperties(), TinkarTerm.PATH.publicId()));

conceptViewModel.setPropertyValue(CONCEPT_STAMP_VIEW_MODEL,stampViewModel);
}
Expand Down Expand Up @@ -1416,11 +1414,11 @@ public void popupStampEdit(ActionEvent event) {

// refresh modules
stampViewModel.getObservableList(MODULES_PROPERTY).clear();
stampViewModel.getObservableList(MODULES_PROPERTY).addAll(stampViewModel.findAllModules(getViewProperties()));
stampViewModel.getObservableList(MODULES_PROPERTY).addAll(DataModelHelper.fetchDescendentsOfConcept(viewProperties, TinkarTerm.PATH.publicId()));

// refresh path
stampViewModel.getObservableList(PATHS_PROPERTY).clear();
stampViewModel.getObservableList(PATHS_PROPERTY).addAll(stampViewModel.findAllPaths(getViewProperties()));
stampViewModel.getObservableList(PATHS_PROPERTY).addAll(DataModelHelper.fetchDescendentsOfConcept(viewProperties, TinkarTerm.PATH.publicId()));

stampEdit.show((Node) event.getSource());
stampEditController.selectActiveStatusToggle();
Expand All @@ -1430,8 +1428,8 @@ public void popupStampEdit(ActionEvent event) {
StampViewModel stampViewModel = new StampViewModel();

// Populate from database
stampViewModel.setPropertyValue(PATHS_PROPERTY, stampViewModel.findAllPaths(getViewProperties()), true)
.setPropertyValue(MODULES_PROPERTY, stampViewModel.findAllModules(getViewProperties()), true);
stampViewModel.setPropertyValue(PATHS_PROPERTY, DataModelHelper.fetchDescendentsOfConcept(viewProperties, TinkarTerm.PATH.publicId()))
.setPropertyValue(MODULES_PROPERTY, DataModelHelper.fetchDescendentsOfConcept(viewProperties, TinkarTerm.PATH.publicId()));

// setup mode
if (getConceptViewModel().getPropertyValue(CURRENT_ENTITY) != null) {
Expand Down
33 changes: 4 additions & 29 deletions kview/src/main/java/dev/ikm/komet/kview/mvvm/viewmodel/StampViewModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,15 @@
import static dev.ikm.tinkar.coordinate.stamp.StampFields.STATUS;
import static dev.ikm.tinkar.coordinate.stamp.StampFields.TIME;
import dev.ikm.komet.framework.view.ViewProperties;
import dev.ikm.tinkar.common.id.IntIdSet;
import dev.ikm.komet.kview.mvvm.model.DataModelHelper;
import dev.ikm.tinkar.entity.ConceptEntity;
import dev.ikm.tinkar.entity.ConceptEntityVersion;
import dev.ikm.tinkar.entity.Entity;
import dev.ikm.tinkar.entity.EntityService;
import dev.ikm.tinkar.entity.EntityVersion;
import dev.ikm.tinkar.entity.SemanticEntity;
import dev.ikm.tinkar.entity.SemanticEntityVersion;
import dev.ikm.tinkar.terms.State;
import dev.ikm.tinkar.terms.TinkarTerm;
import javafx.beans.property.ReadOnlyObjectProperty;
import org.carlfx.cognitive.validator.MessageType;
import org.carlfx.cognitive.validator.ValidationMessage;
import org.carlfx.cognitive.viewmodel.ViewModel;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

Expand Down Expand Up @@ -76,33 +69,15 @@ public StampViewModel save(boolean force) {

public List<ConceptEntity> findAllModules(ViewProperties viewProperties) {
try {
Entity<? extends EntityVersion> moduleEntity = EntityService.get().getEntityFast(TinkarTerm.MODULE);
IntIdSet moduleDescendents = viewProperties.calculator().descendentsOf(moduleEntity.nid());

// get all descendant modules
List<ConceptEntity> allModules =
moduleDescendents.intStream()
.mapToObj(moduleNid -> (ConceptEntity) Entity.getFast(moduleNid))
.toList();
return allModules;
return DataModelHelper.fetchDescendentsOfConcept(viewProperties, TinkarTerm.MODULE.publicId()).stream().toList();
} catch (Throwable th) {
addValidator(MODULES_PROPERTY, "Module Entities", (Void prop, ViewModel vm) -> new ValidationMessage(MessageType.ERROR, "PrimitiveData services are not up. Attempting to retrieve ${%s}. Must call start().".formatted(MODULES_PROPERTY), th));
return List.of();
}
}
public List<ConceptEntity<ConceptEntityVersion>> findAllPaths(ViewProperties viewProperties) {
public List<ConceptEntity> findAllPaths(ViewProperties viewProperties) {
try {
//List of Concepts that represent available Paths in the data
List<ConceptEntity<ConceptEntityVersion>> paths = new ArrayList<>();
//Get all Path semantics from the Paths Pattern
int[] pathSemanticNids = EntityService.get().semanticNidsOfPattern(TinkarTerm.PATHS_PATTERN.nid());
//For each Path semantic get the concept that the semantic is referencing
for (int pathSemanticNid : pathSemanticNids) {
SemanticEntity<SemanticEntityVersion> semanticEntity = Entity.getFast(pathSemanticNid);
int pathConceptNid = semanticEntity.referencedComponentNid();
paths.add(EntityService.get().getEntityFast(pathConceptNid));
}
return paths;
return DataModelHelper.fetchDescendentsOfConcept(viewProperties, TinkarTerm.PATH.publicId()).stream().toList();
} catch (Throwable th) {
addValidator(PATHS_PROPERTY, "Path Entities", (Void prop, ViewModel vm) -> new ValidationMessage(MessageType.ERROR, "PrimitiveData services are not up. Attempting to retrieve ${%s}. Must call start().".formatted(PATHS_PROPERTY), th));
return List.of();
Expand Down