This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push: new 7540991a59 Revert "NIFI-12973 Add Process Group scope to Flow Analysis rules" After commentary in the JIRA regarding UX and nifi-api considerations needing further discussion and resolution. 7540991a59 is described below commit 7540991a591539aea3562ea100f4c42986cc8ba2 Author: Joseph Witt <joew...@apache.org> AuthorDate: Mon May 6 12:39:27 2024 -0700 Revert "NIFI-12973 Add Process Group scope to Flow Analysis rules" After commentary in the JIRA regarding UX and nifi-api considerations needing further discussion and resolution. This reverts commit bc75ef108c13cf5e75c4fbb20634c906f65c10d4. --- .../nifi/flow/VersionedFlowAnalysisRule.java | 10 ------- .../nifi/web/api/dto/FlowAnalysisRuleDTO.java | 9 ------ .../flowanalysis/AbstractFlowAnalysisRuleNode.java | 12 -------- .../StandardVersionedComponentSynchronizer.java | 1 - .../flow/mapping/NiFiRegistryFlowMapper.java | 1 - .../nifi/controller/FlowAnalysisRuleNode.java | 4 --- .../org/apache/nifi/controller/FlowController.java | 2 +- .../serialization/VersionedFlowSynchronizer.java | 1 - .../nifi/flowanalysis/StandardFlowAnalyzer.java | 34 +--------------------- .../apache/nifi/audit/FlowAnalysisRuleAuditor.java | 22 -------------- .../org/apache/nifi/web/api/dto/DtoFactory.java | 1 - .../web/dao/impl/StandardFlowAnalysisRuleDAO.java | 4 --- .../canvas/flow-analysis-rule-configuration.jsp | 12 -------- .../webapp/js/nf/canvas/nf-flow-analysis-rule.js | 9 ------ 14 files changed, 2 insertions(+), 120 deletions(-) diff --git a/nifi-api/src/main/java/org/apache/nifi/flow/VersionedFlowAnalysisRule.java b/nifi-api/src/main/java/org/apache/nifi/flow/VersionedFlowAnalysisRule.java index 1b715dddd4..0d5abd829b 100644 --- a/nifi-api/src/main/java/org/apache/nifi/flow/VersionedFlowAnalysisRule.java +++ b/nifi-api/src/main/java/org/apache/nifi/flow/VersionedFlowAnalysisRule.java @@ -25,8 +25,6 @@ public class VersionedFlowAnalysisRule extends VersionedConfigurableExtension { private ScheduledState scheduledState; private EnforcementPolicy enforcementPolicy; - private String scope; - @Schema(description = "How to handle violations.") public EnforcementPolicy getEnforcementPolicy() { return enforcementPolicy; @@ -36,14 +34,6 @@ public class VersionedFlowAnalysisRule extends VersionedConfigurableExtension { this.enforcementPolicy = enforcementPolicy; } - public String getScope() { - return scope; - } - - public void setScope(String scope) { - this.scope = scope; - } - @Override public ComponentType getComponentType() { return ComponentType.FLOW_ANALYSIS_RULE; diff --git a/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowAnalysisRuleDTO.java b/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowAnalysisRuleDTO.java index 20c964f4b5..33e2058214 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowAnalysisRuleDTO.java +++ b/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/FlowAnalysisRuleDTO.java @@ -42,7 +42,6 @@ public class FlowAnalysisRuleDTO extends ComponentDTO { private Boolean supportsSensitiveDynamicProperties; private String enforcementPolicy; - private String scope; private Map<String, String> properties; private Map<String, PropertyDescriptorDTO> descriptors; @@ -209,14 +208,6 @@ public class FlowAnalysisRuleDTO extends ComponentDTO { this.enforcementPolicy = enforcementPolicy; } - public String getScope() { - return scope; - } - - public void setScope(String scope) { - this.scope = scope; - } - /** * @return flow analysis rule's properties */ diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/flowanalysis/AbstractFlowAnalysisRuleNode.java b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/flowanalysis/AbstractFlowAnalysisRuleNode.java index 13c617002e..02fe471646 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/flowanalysis/AbstractFlowAnalysisRuleNode.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/flowanalysis/AbstractFlowAnalysisRuleNode.java @@ -77,8 +77,6 @@ public abstract class AbstractFlowAnalysisRuleNode extends AbstractComponentNode private volatile String comment; private EnforcementPolicy enforcementPolicy; - private String scope; - private volatile FlowAnalysisRuleState state = FlowAnalysisRuleState.DISABLED; public AbstractFlowAnalysisRuleNode(final LoggableComponent<FlowAnalysisRule> flowAnalysisRule, final String id, @@ -116,16 +114,6 @@ public abstract class AbstractFlowAnalysisRuleNode extends AbstractComponentNode this.enforcementPolicy = enforcementPolicy; } - @Override - public String getScope() { - return scope; - } - - @Override - public void setScope(String scope) { - this.scope = scope; - } - @Override public ConfigurableComponent getComponent() { return flowAnalysisRuleRef.get().getFlowAnalysisRule(); diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java index 0bd0334088..c2f78c870f 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java @@ -3624,7 +3624,6 @@ public class StandardVersionedComponentSynchronizer implements VersionedComponen flowAnalysisRule.setName(proposed.getName()); flowAnalysisRule.setComments(proposed.getComments()); flowAnalysisRule.setEnforcementPolicy(proposed.getEnforcementPolicy()); - flowAnalysisRule.setScope(proposed.getScope()); if (!isEqual(flowAnalysisRule.getBundleCoordinate(), proposed.getBundle())) { final BundleCoordinate newBundleCoordinate = toCoordinate(proposed.getBundle()); diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/mapping/NiFiRegistryFlowMapper.java b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/mapping/NiFiRegistryFlowMapper.java index fb156389e6..6920fe9e97 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/mapping/NiFiRegistryFlowMapper.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/mapping/NiFiRegistryFlowMapper.java @@ -427,7 +427,6 @@ public class NiFiRegistryFlowMapper { versionedRule.setProperties(mapProperties(flowAnalysisRuleNode, serviceProvider)); versionedRule.setPropertyDescriptors(mapPropertyDescriptors(flowAnalysisRuleNode, serviceProvider, Collections.emptySet(), Collections.emptyMap())); versionedRule.setEnforcementPolicy(flowAnalysisRuleNode.getEnforcementPolicy()); - versionedRule.setScope(flowAnalysisRuleNode.getScope()); versionedRule.setType(flowAnalysisRuleNode.getCanonicalClassName()); versionedRule.setScheduledState(flowMappingOptions.getStateLookup().getState(flowAnalysisRuleNode)); diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/FlowAnalysisRuleNode.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/FlowAnalysisRuleNode.java index 1f33aa7d7c..302e21800b 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/FlowAnalysisRuleNode.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/FlowAnalysisRuleNode.java @@ -38,10 +38,6 @@ public interface FlowAnalysisRuleNode extends ComponentNode { */ EnforcementPolicy getEnforcementPolicy(); - String getScope(); - - void setScope(String scope); - void setFlowAnalysisRule(LoggableComponent<FlowAnalysisRule> flowAnalysisRule); FlowAnalysisRuleContext getFlowAnalysisRuleContext(); diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java index c7479a6684..8c28496a4d 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java @@ -591,7 +591,7 @@ public class FlowController implements ReportingTaskProvider, FlowAnalysisRulePr ruleViolationsManager ); if (flowAnalyzer != null) { - flowAnalyzer.initialize(flowManager, controllerServiceProvider); + flowAnalyzer.initialize(controllerServiceProvider); } final CronSchedulingAgent cronSchedulingAgent = new CronSchedulingAgent(this, timerDrivenEngineRef.get(), repositoryContextFactory); diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/VersionedFlowSynchronizer.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/VersionedFlowSynchronizer.java index 2f525cd14f..d4b5c78ab4 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/VersionedFlowSynchronizer.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/VersionedFlowSynchronizer.java @@ -694,7 +694,6 @@ public class VersionedFlowSynchronizer implements FlowSynchronizer { ruleNode.setName(flowAnalysisRule.getName()); ruleNode.setComments(flowAnalysisRule.getComments()); ruleNode.setEnforcementPolicy(flowAnalysisRule.getEnforcementPolicy()); - ruleNode.setScope(flowAnalysisRule.getScope()); final Set<String> sensitiveDynamicPropertyNames = getSensitiveDynamicPropertyNames(ruleNode, flowAnalysisRule); final Map<String, String> decryptedProperties = decryptProperties(flowAnalysisRule.getProperties(), controller.getEncryptor()); diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/flowanalysis/StandardFlowAnalyzer.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/flowanalysis/StandardFlowAnalyzer.java index 6b29c42e5f..1b8ca8e566 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/flowanalysis/StandardFlowAnalyzer.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/flowanalysis/StandardFlowAnalyzer.java @@ -18,7 +18,6 @@ package org.apache.nifi.flowanalysis; import org.apache.nifi.controller.FlowAnalysisRuleNode; import org.apache.nifi.controller.ProcessorNode; -import org.apache.nifi.controller.flow.StandardFlowManager; import org.apache.nifi.controller.flowanalysis.FlowAnalysisRuleProvider; import org.apache.nifi.controller.flowanalysis.FlowAnalysisUtil; import org.apache.nifi.controller.flowanalysis.FlowAnalyzer; @@ -30,7 +29,6 @@ import org.apache.nifi.flow.VersionedConnection; import org.apache.nifi.flow.VersionedControllerService; import org.apache.nifi.flow.VersionedProcessGroup; import org.apache.nifi.flow.VersionedProcessor; -import org.apache.nifi.groups.ProcessGroup; import org.apache.nifi.nar.ExtensionManager; import org.apache.nifi.registry.flow.mapping.NiFiRegistryFlowMapper; import org.apache.nifi.validation.RuleViolation; @@ -38,7 +36,6 @@ import org.apache.nifi.validation.RuleViolationsManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -60,7 +57,6 @@ public class StandardFlowAnalyzer implements FlowAnalyzer { private final FlowAnalysisRuleProvider flowAnalysisRuleProvider; private final ExtensionManager extensionManager; - private StandardFlowManager flowManager; private ControllerServiceProvider controllerServiceProvider; private volatile boolean flowAnalysisRequired; @@ -75,11 +71,7 @@ public class StandardFlowAnalyzer implements FlowAnalyzer { this.extensionManager = extensionManager; } - public void initialize( - final StandardFlowManager flowManager, - final ControllerServiceProvider controllerServiceProvider - ) { - this.flowManager = flowManager; + public void initialize(final ControllerServiceProvider controllerServiceProvider) { this.controllerServiceProvider = controllerServiceProvider; } @@ -135,7 +127,6 @@ public class StandardFlowAnalyzer implements FlowAnalyzer { Set<RuleViolation> violations = flowAnalysisRules.stream() .filter(FlowAnalysisRuleNode::isEnabled) - .filter(ruleNode -> isWithinScope(ruleNode, component.getGroupIdentifier())) .flatMap(flowAnalysisRuleNode -> { String ruleId = flowAnalysisRuleNode.getIdentifier(); @@ -204,7 +195,6 @@ public class StandardFlowAnalyzer implements FlowAnalyzer { flowAnalysisRules.stream() .filter(FlowAnalysisRuleNode::isEnabled) - .filter(ruleNode -> isWithinScope(ruleNode, groupId)) .forEach(flowAnalysisRuleNode -> { String ruleId = flowAnalysisRuleNode.getIdentifier(); @@ -260,28 +250,6 @@ public class StandardFlowAnalyzer implements FlowAnalyzer { processGroup.getProcessGroups().forEach(childProcessGroup -> analyzeProcessGroup(childProcessGroup, flowAnalysisRules, groupViolations, componentToRuleViolations)); } - private boolean isWithinScope(FlowAnalysisRuleNode ruleNode, String groupIdentifier) { - final String ruleScope = ruleNode.getScope(); - - while (groupIdentifier != null) { - if (ruleScope == null || ruleScope.isBlank()) { - return true; - } - - final HashSet<String> scopedProcessGroupIds = new HashSet<>(Arrays.asList(ruleScope.split("\\s*,\\s*"))); - if (scopedProcessGroupIds.contains(groupIdentifier)) { - return true; - } - - groupIdentifier = Optional.ofNullable(flowManager.getGroup(groupIdentifier)) - .map(ProcessGroup::getParent) - .map(ProcessGroup::getIdentifier) - .orElse(null); - } - - return false; - } - private String getDisplayName(VersionedComponent component) { final String displayName; diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/FlowAnalysisRuleAuditor.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/FlowAnalysisRuleAuditor.java index 89a8e53bb7..aceae7ade9 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/FlowAnalysisRuleAuditor.java +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/FlowAnalysisRuleAuditor.java @@ -44,7 +44,6 @@ import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.Map; -import java.util.Objects; import java.util.Set; /** @@ -60,7 +59,6 @@ public class FlowAnalysisRuleAuditor extends NiFiAuditor { private static final String ANNOTATION_DATA = "Annotation Data"; private static final String EXTENSION_VERSION = "Extension Version"; private static final String ENFORCEMENT_POLICY = "Enforcement Policy"; - private static final String SCOPE = "Scope"; /** * Audits the creation of flow analysis rule via createFlowAnalysisRule(). @@ -108,7 +106,6 @@ public class FlowAnalysisRuleAuditor extends NiFiAuditor { final Map<String, String> values = extractConfiguredPropertyValues(flowAnalysisRule, flowAnalysisRuleDTO); final FlowAnalysisRuleState state = flowAnalysisRule.getState(); final EnforcementPolicy enforcementPolicy = flowAnalysisRule.getEnforcementPolicy(); - final String scope = flowAnalysisRule.getScope(); // update the flow analysis rule state final FlowAnalysisRuleNode updatedFlowAnalysisRule = (FlowAnalysisRuleNode) proceedingJoinPoint.proceed(); @@ -205,25 +202,6 @@ public class FlowAnalysisRuleAuditor extends NiFiAuditor { actions.add(configurationAction); } - final String updatedScope = flowAnalysisRule.getScope(); - if (!Objects.equals(updatedScope, scope)) { - final FlowChangeConfigureDetails actionDetails = new FlowChangeConfigureDetails(); - actionDetails.setName(SCOPE); - actionDetails.setValue(String.valueOf(updatedScope)); - actionDetails.setPreviousValue(String.valueOf(scope)); - - final FlowChangeAction configurationAction = new FlowChangeAction(); - configurationAction.setUserIdentity(user.getIdentity()); - configurationAction.setOperation(Operation.Configure); - configurationAction.setTimestamp(actionTimestamp); - configurationAction.setSourceId(flowAnalysisRule.getIdentifier()); - configurationAction.setSourceName(flowAnalysisRule.getName()); - configurationAction.setSourceType(Component.FlowAnalysisRule); - configurationAction.setComponentDetails(ruleDetails); - configurationAction.setActionDetails(actionDetails); - actions.add(configurationAction); - } - // determine the new state final FlowAnalysisRuleState updatedState = flowAnalysisRule.getState(); diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java index 5eb69903a1..87c77d92a7 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java @@ -4986,7 +4986,6 @@ public final class DtoFactory { final FlowAnalysisRuleDTO dto = new FlowAnalysisRuleDTO(); dto.setId(flowAnalysisRuleNode.getIdentifier()); dto.setEnforcementPolicy(flowAnalysisRuleNode.getEnforcementPolicy().name()); - dto.setScope(flowAnalysisRuleNode.getScope()); dto.setName(flowAnalysisRuleNode.getName()); dto.setType(flowAnalysisRuleNode.getCanonicalClassName()); dto.setBundle(createBundleDto(bundleCoordinate)); diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardFlowAnalysisRuleDAO.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardFlowAnalysisRuleDAO.java index 02e375b369..50ad24d165 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardFlowAnalysisRuleDAO.java +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardFlowAnalysisRuleDAO.java @@ -304,7 +304,6 @@ public class StandardFlowAnalysisRuleDAO extends ComponentDAO implements FlowAna final String name = flowAnalysisRuleDTO.getName(); final String comments = flowAnalysisRuleDTO.getComments(); final String enforcementPolicy = flowAnalysisRuleDTO.getEnforcementPolicy(); - final String scope = flowAnalysisRuleDTO.getScope(); final Map<String, String> properties = flowAnalysisRuleDTO.getProperties(); flowAnalysisRule.pauseValidationTrigger(); // avoid triggering validation multiple times @@ -312,9 +311,6 @@ public class StandardFlowAnalysisRuleDAO extends ComponentDAO implements FlowAna if (isNotNull(enforcementPolicy)) { flowAnalysisRule.setEnforcementPolicy(EnforcementPolicy.valueOf(enforcementPolicy)); } - if (isNotNull(scope)) { - flowAnalysisRule.setScope(scope); - } if (isNotNull(name)) { flowAnalysisRule.setName(name); } diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flow-analysis-rule-configuration.jsp b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flow-analysis-rule-configuration.jsp index 7a1e5d56c4..21b1015b63 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flow-analysis-rule-configuration.jsp +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flow-analysis-rule-configuration.jsp @@ -61,18 +61,6 @@ <span id="read-only-flow-analysis-rule-enforcement-policy"></span> </div> </div> - <div class="setting"> - <div class="setting-name"> - Scope - <div class="fa fa-question-circle" alt="Info" title="A comma-separated list of ids of the process groups to which this rule should be limited to."></div> - </div> - <div class="flow-analysis-rule-editable setting-field"> - <input type="text" id="flow-analysis-rule-scope" name="flow-analysis-rule-scope"/> - </div> - <div class="flow-analysis-rule-read-only setting-field hidden"> - <span id="read-only-flow-analysis-rule-scope"></span> - </div> - </div> </div> <div class="clear"></div> </div> diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-analysis-rule.js b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-analysis-rule.js index 7f83821a54..72874d4005 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-analysis-rule.js +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-analysis-rule.js @@ -108,10 +108,6 @@ return true; } - if ($('#flow-analysis-rule-scope').val() !== entity.component['scope']) { - return true; - } - // defer to the properties return $('#flow-analysis-rule-properties').propertytable('isSaveRequired'); }; @@ -131,7 +127,6 @@ flowAnalysisRuleDto['name'] = $('#flow-analysis-rule-name').val(); flowAnalysisRuleDto['comments'] = $('#flow-analysis-rule-comments').val(); flowAnalysisRuleDto['enforcementPolicy'] = enforcementPolicy; - flowAnalysisRuleDto['scope'] = $('#flow-analysis-rule-scope').val(); // set the properties if ($.isEmptyObject(properties) === false) { @@ -480,8 +475,6 @@ } }); - $('#flow-analysis-rule-scope').val(flowAnalysisRule['scope']); - var buttons = [{ buttonText: 'Apply', color: { @@ -657,8 +650,6 @@ } nfCommon.populateField('read-only-flow-analysis-rule-enforcement-policy', enforcementPolicy); - nfCommon.populateField('read-only-flow-analysis-rule-scope', flowAnalysisRule['scope']); - var buttons = [{ buttonText: 'Ok', color: {