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.

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

Jump to bottom

[NAE-1156] View Deprecation and All Data #86

Merged
merged 15 commits into from
Sep 12, 2022
Merged

[NAE-1156] View Deprecation and All Data #86

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
91b10f5
[NAE-1156] View Deprecation and All Data
Kovy95 Aug 2, 2022
30fbcaf
[NAE-1156] View Deprecation and All Data
Kovy95 Aug 8, 2022
7682c51
[NAE-1625] PetriNetService cache
Kovy95 Aug 19, 2022
13f2e6a
Merge remote-tracking branch 'origin/release/6.2.0' into NAE-1625
Kovy95 Aug 19, 2022
dac7647
[NAE-1625] PetriNetService cache
Kovy95 Aug 31, 2022
fe00c1c
Merge remote-tracking branch 'origin/release/6.2.0' into NAE-1625
Kovy95 Aug 31, 2022
54f671e
[NAE-1625] PetriNetService cache
Kovy95 Aug 31, 2022
c479b38
[NAE-1625] PetriNetService cache
Kovy95 Aug 31, 2022
91d9ba7
[NAE-1625] PetriNetService cache
Kovy95 Aug 31, 2022
3178bbd
[NAE-1625] PetriNetService cache
tuplle Sep 9, 2022
9b98fbe
[NAE-1625] PetriNetService cache
machacjozef Sep 11, 2022
7b1e6f7
Merge remote-tracking branch 'origin/release/6.2.0' into NAE-1625
machacjozef Sep 11, 2022
53264b1
Merge remote-tracking branch 'origin/release/6.2.0' into NAE-1156_2
machacjozef Sep 11, 2022
6eb1196
Merge remote-tracking branch 'origin/NAE-1625' into NAE-1156_2
machacjozef Sep 11, 2022
31f79ad
[NAE-1156] View Deprecation and All Data
machacjozef Sep 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 0 additions & 15 deletions src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/Field.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ package com.netgrif.application.engine.petrinet.domain.dataset
import com.fasterxml.jackson.annotation.JsonIgnore
import com.fasterxml.jackson.databind.node.ObjectNode
import com.netgrif.application.engine.petrinet.domain.dataset.logic.action.Action
import com.netgrif.application.engine.petrinet.domain.dataset.logic.action.runner.Expression
import com.netgrif.application.engine.petrinet.domain.dataset.logic.validation.Validation
import com.netgrif.application.engine.petrinet.domain.events.DataEvent
import com.netgrif.application.engine.petrinet.domain.Component
import com.netgrif.application.engine.petrinet.domain.Format
import com.netgrif.application.engine.petrinet.domain.I18nString
Expand All @@ -15,7 +12,6 @@ import com.netgrif.application.engine.petrinet.domain.dataset.logic.action.runne
import com.netgrif.application.engine.petrinet.domain.dataset.logic.validation.Validation
import com.netgrif.application.engine.petrinet.domain.events.DataEvent
import com.netgrif.application.engine.petrinet.domain.events.DataEventType
import com.netgrif.application.engine.petrinet.domain.views.View
import com.querydsl.core.annotations.PropertyType
import com.querydsl.core.annotations.QueryType
import org.bson.types.ObjectId
Expand Down Expand Up @@ -57,8 +53,6 @@ abstract class Field<T> extends Imported {

private Format format

private View view

private Integer length

private Component component
Expand Down Expand Up @@ -303,14 +297,6 @@ abstract class Field<T> extends Imported {
this.format = format
}

View getView() {
return view
}

void setView(View view) {
this.view = view
}

Integer getLength() {
return length
}
Expand Down Expand Up @@ -340,7 +326,6 @@ abstract class Field<T> extends Imported {
clone.immediate = this.immediate
clone.events = this.events
clone.encryption = this.encryption
clone.view = this.view
clone.format = this.format
clone.length = this.length
clone.component = this.component
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/netgrif/application/engine/importer/service/FieldFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,9 @@ Field getField(Data data, Importer importer) throws IllegalArgumentException, Mi
field.setFormat(format);
}
if (data.getView() != null) {
log.warn("Data attribute [view] is deprecated.");
minop marked this conversation as resolved.
Show resolved Hide resolved
View view = viewFactory.buildView(data);
field.setView(view);
field.setComponent(new Component(view.getValue()));
}

if (data.getComponent() != null) {
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/com/netgrif/application/engine/workflow/web/responsebodies/LocalisedField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import com.netgrif.application.engine.petrinet.domain.dataset.logic.FieldLayout;
import com.netgrif.application.engine.petrinet.domain.dataset.logic.validation.LocalizedValidation;
import com.netgrif.application.engine.petrinet.domain.dataset.logic.validation.Validation;
import com.netgrif.application.engine.petrinet.domain.views.View;
import lombok.Data;

import java.util.ArrayList;
Expand Down Expand Up @@ -38,8 +37,6 @@ public class LocalisedField {

private Format formatFilter;

private View view;

private Integer length;

private Component component;
Expand All @@ -64,7 +61,6 @@ public LocalisedField(Field field, Locale locale) {
value = field.getValue();
order = field.getOrder();
formatFilter = field.getFormat();
view = field.getView();
length = field.getLength();
component = field.getComponent();
validations = loadValidations(field, locale);
Expand Down