Revert "UIEXT-2324: Add initial triggers within array layout updates …

…where necessary" This reverts commit 2ac6523.
knime · Dec 4, 2024 · b9b0e18 · b9b0e18
1 parent 2ac6523
commit b9b0e18
Show file tree

Hide file tree

Showing 7 changed files with 144 additions and 205 deletions.
diff --git a/..._snapshots/org.knime.base.node.preproc.filter.row3.RowFilterNodeSettingsSnapshotTest.snap b/..._snapshots/org.knime.base.node.preproc.filter.row3.RowFilterNodeSettingsSnapshotTest.snap
@@ -353,15 +353,6 @@
     } ]
   } ],
   "globalUpdates" : [ {
-    "trigger" : {
-      "id" : "after-open-dialog",
-      "triggerInitially" : true
-    },
-    "dependencies" : [ {
-      "scopes" : [ "#/properties/model/properties/predicates", "#/properties/column" ],
-      "id" : "org.knime.base.node.preproc.filter.row3.AbstractRowFilterNodeSettings$FilterCriterion$SelectedColumnRef"
-    } ]
-  }, {
     "trigger" : {
       "id" : "org.knime.base.node.preproc.filter.row3.AbstractRowFilterNodeSettings$FilterCriterion$OperatorRef",
       "scopes" : [ "#/properties/model/properties/predicates", "#/properties/operator" ]

diff --git a/...napshots/org.knime.base.node.preproc.filter.row3.RowSplitterNodeSettingsSnapshotTest.snap b/...napshots/org.knime.base.node.preproc.filter.row3.RowSplitterNodeSettingsSnapshotTest.snap
@@ -354,15 +354,6 @@
     } ]
   } ],
   "globalUpdates" : [ {
-    "trigger" : {
-      "id" : "after-open-dialog",
-      "triggerInitially" : true
-    },
-    "dependencies" : [ {
-      "scopes" : [ "#/properties/model/properties/predicates", "#/properties/column" ],
-      "id" : "org.knime.base.node.preproc.filter.row3.AbstractRowFilterNodeSettings$FilterCriterion$SelectedColumnRef"
-    } ]
-  }, {
     "trigger" : {
       "id" : "org.knime.base.node.preproc.filter.row3.AbstractRowFilterNodeSettings$FilterCriterion$OperatorRef",
       "scopes" : [ "#/properties/model/properties/predicates", "#/properties/operator" ]

diff --git a/org.knime.base.tests/src/org/knime/base/node/preproc/filter/row3/FilterOperatorTest.java b/org.knime.base.tests/src/org/knime/base/node/preproc/filter/row3/FilterOperatorTest.java
@@ -193,11 +193,6 @@ public <T> Supplier<T> computeFromValueSupplier(final Class<? extends Reference<
                 throw new IllegalStateException("Unexpected dependency \"%s\"".formatted(ref.getName()));
             }
 
-            @Override
-            public void computeAfterOpenDialog() {
-                // Do nothing
-            }
-
         });
 
         final var choices = new TypeBasedOperatorChoices();
@@ -213,6 +208,10 @@ public void computeAfterOpenDialog() {
                     "Unexpected provider class \"%s\"".formatted(stateProviderClass.getName()));
             }
 
+            @Override
+            public void computeBeforeOpenDialog() {
+                // expected to be called
+            }
         });
 
         return Arrays.stream(choices.computeState(ctx)).map(idAndText -> FilterOperator.valueOf(idAndText.id()))

diff --git a/...knime.base/src/org/knime/base/node/preproc/filter/row3/AbstractRowFilterNodeSettings.java b/...knime.base/src/org/knime/base/node/preproc/filter/row3/AbstractRowFilterNodeSettings.java
@@ -496,7 +496,6 @@ static class TypeBasedOperatorsProvider implements StateProvider<List<FilterOper
 
         @Override
         public void init(final StateProviderInitializer initializer) {
-            initializer.computeAfterOpenDialog();
             m_columnSelection = initializer.computeFromValueSupplier(SelectedColumnRef.class);
         }
 

diff --git a/...est_snapshots/org.knime.time.node.extract.datetime.ExtractDateTimeFieldsSettingsTest.snap b/...est_snapshots/org.knime.time.node.extract.datetime.ExtractDateTimeFieldsSettingsTest.snap
@@ -207,10 +207,6 @@
     }
   },
   "initialUpdates" : [ {
-    "scopes" : null,
-    "id" : "org.knime.time.node.extract.datetime.ExtractDateTimeFieldsSettings$ColumnNameProvider",
-    "values" : [ ]
-  }, {
     "scopes" : null,
     "id" : "org.knime.time.node.extract.datetime.ExtractDateTimeFieldsSettings$DefaultExtractFieldProvider",
     "values" : [ {

diff --git a/...st_snapshots/org.knime.time.node.extract.datetime.ExtractDateTimeFieldsSettingsTest1.snap b/...st_snapshots/org.knime.time.node.extract.datetime.ExtractDateTimeFieldsSettingsTest1.snap
@@ -249,52 +249,6 @@
     }
   },
   "initialUpdates" : [ {
-    "scopes" : null,
-    "id" : "org.knime.time.node.extract.datetime.ExtractDateTimeFieldsSettings$ColumnNameProvider",
-    "values" : [ {
-      "indices" : [ 0 ],
-      "value" : "Year"
-    }, {
-      "indices" : [ 1 ],
-      "value" : "Year (Week-based)"
-    }, {
-      "indices" : [ 10 ],
-      "value" : "Second"
-    }, {
-      "indices" : [ 11 ],
-      "value" : "Microsecond"
-    }, {
-      "indices" : [ 12 ],
-      "value" : "Time Zone Name"
-    }, {
-      "indices" : [ 13 ],
-      "value" : "Time Zone Offset"
-    }, {
-      "indices" : [ 2 ],
-      "value" : "Quarter"
-    }, {
-      "indices" : [ 3 ],
-      "value" : "Month (Number)"
-    }, {
-      "indices" : [ 4 ],
-      "value" : "Week"
-    }, {
-      "indices" : [ 5 ],
-      "value" : "Day of Month"
-    }, {
-      "indices" : [ 6 ],
-      "value" : "Day of Week (Number)"
-    }, {
-      "indices" : [ 7 ],
-      "value" : "Day of Week (Name)"
-    }, {
-      "indices" : [ 8 ],
-      "value" : "Hour"
-    }, {
-      "indices" : [ 9 ],
-      "value" : "Minute"
-    } ]
-  }, {
     "scopes" : null,
     "id" : "org.knime.time.node.extract.datetime.ExtractDateTimeFieldsSettings$DefaultExtractFieldProvider",
     "values" : [ {