(nifi) branch main updated: NIFI-13098: (#8701)
This is an automated email from the ASF dual-hosted git repository.
rfellows 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 a1610cf129 NIFI-13098: (#8701)
a1610cf129 is described below
commit a1610cf1292620b6f504fbace9cb5b765706cdf7
Author: Matt Gilman
AuthorDate: Fri Apr 26 15:19:39 2024 -0400
NIFI-13098: (#8701)
- Updating error handling in Global and Component Policy pages.
This closes #8701
---
.../state/access-policy/access-policy.actions.ts | 4 +-
.../state/access-policy/access-policy.effects.ts | 51 +-
.../state/access-policy/access-policy.reducer.ts | 10 ++---
.../access-policies/state/access-policy/index.ts | 1 -
.../state/policy-component/index.ts| 3 +-
.../policy-component/policy-component.actions.ts | 5 ---
.../policy-component/policy-component.effects.ts | 10 +++--
.../policy-component/policy-component.reducer.ts | 13 +-
.../pages/access-policies/state/tenants/index.ts | 3 +-
.../state/tenants/tenants.actions.ts | 2 -
.../state/tenants/tenants.effects.ts | 8 ++--
.../state/tenants/tenants.reducer.ts | 8 +---
.../component-access-policies.component.html | 7 ++-
.../component-access-policies.component.ts | 2 +
.../component-access-policies.module.ts| 4 +-
.../global-access-policies.component.html | 1 +
.../global-access-policies.component.ts| 2 +
.../global-access-policies.module.ts | 4 +-
18 files changed, 69 insertions(+), 69 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.actions.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.actions.ts
index 182b975bff..2bb1c79fd2 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.actions.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.actions.ts
@@ -97,8 +97,8 @@ export const resetAccessPolicy = createAction(
props<{ response: ResetAccessPolicy }>()
);
-export const accessPolicyApiError = createAction(
-`${ACCESS_POLICY_PREFIX} Access Policy Api Error`,
+export const accessPolicyApiBannerError = createAction(
+`${ACCESS_POLICY_PREFIX} Access Policy Api Banner Error`,
props<{ response: LoadAccessPolicyError }>()
);
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.effects.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.effects.ts
index c2d1595c2a..9037ed0ece 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.effects.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.effects.ts
@@ -22,6 +22,7 @@ import { NiFiState } from '../../../../state';
import { Store } from '@ngrx/store';
import { Router } from '@angular/router';
import * as AccessPolicyActions from './access-policy.actions';
+import * as ErrorActions from '../../../../state/error/error.actions';
import { catchError, from, map, of, switchMap, take, tap } from 'rxjs';
import { MatDialog } from '@angular/material/dialog';
import { AccessPolicyService } from '../../service/access-policy.service';
@@ -34,6 +35,7 @@ import { AddTenantsToPolicyRequest } from './index';
import { selectUserGroups, selectUsers } from '../tenants/tenants.selectors';
import { OverridePolicyDialog } from
'../../ui/common/override-policy-dialog/override-policy-dialog.component';
import { MEDIUM_DIALOG, SMALL_DIALOG } from '../../../../index';
+import { HttpErrorResponse } from '@angular/common/http';
@Injectable()
export class AccessPolicyEffects {
@@ -105,11 +107,11 @@ export class AccessPolicyEffects {
}
});
}),
-catchError((error) => {
+catchError((errorResponse: HttpErrorResponse) => {
let policyStatus: PolicyStatus | undefined;
-if (error.status === 404) {
+if (errorResponse.status === 404) {
policyStatus = PolicyStatus.NotFound;
-} else if (error.status === 403) {
+
(nifi) 01/01: NIFI-13006 solr component marked as deprecated
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch NIFI-13006
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 63ca5c9aa6e8c08f52885dc24751aa0934843f6c
Author: Joseph Witt
AuthorDate: Fri Apr 26 11:01:46 2024 -0700
NIFI-13006 solr component marked as deprecated
---
.../src/main/java/org/apache/nifi/processors/solr/GetSolr.java | 2 ++
.../main/java/org/apache/nifi/processors/solr/PutSolrContentStream.java | 2 ++
.../src/main/java/org/apache/nifi/processors/solr/PutSolrRecord.java| 2 ++
.../src/main/java/org/apache/nifi/processors/solr/QuerySolr.java| 2 ++
4 files changed, 8 insertions(+)
diff --git
a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/GetSolr.java
b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/GetSolr.java
index ce6e3fd993..ec556fe929 100644
---
a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/GetSolr.java
+++
b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/GetSolr.java
@@ -23,6 +23,7 @@ import
org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
import org.apache.nifi.annotation.behavior.Stateful;
import org.apache.nifi.annotation.configuration.DefaultSchedule;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.DeprecationNotice;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.components.AllowableValue;
@@ -96,6 +97,7 @@ import static
org.apache.nifi.processors.solr.SolrUtils.ZK_CONNECTION_TIMEOUT;
@CapabilityDescription("Queries Solr and outputs the results as a FlowFile in
the format of XML or using a Record Writer")
@Stateful(scopes = {Scope.CLUSTER}, description = "Stores latest date of Date
Field so that the same data will not be fetched multiple times.")
@DefaultSchedule(strategy = SchedulingStrategy.TIMER_DRIVEN, period = "1 min")
+@DeprecationNotice(reason = "The SOLR processors are deprecated and will be
removed in NiFi 2.x.")
public class GetSolr extends SolrProcessor {
public static final String STATE_MANAGER_FILTER = "stateManager_filter";
diff --git
a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/PutSolrContentStream.java
b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/PutSolrContentStream.java
index 5bfc7b7a0b..a116cb6cb7 100644
---
a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/PutSolrContentStream.java
+++
b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/PutSolrContentStream.java
@@ -22,6 +22,7 @@ import org.apache.nifi.annotation.behavior.DynamicProperty;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import org.apache.nifi.annotation.documentation.DeprecationNotice;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.expression.ExpressionLanguageScope;
@@ -77,6 +78,7 @@ import static
org.apache.nifi.processors.solr.SolrUtils.ZK_CONNECTION_TIMEOUT;
@CapabilityDescription("Sends the contents of a FlowFile as a ContentStream to
Solr")
@DynamicProperty(name="A Solr request parameter name", value="A Solr request
parameter value",
description="These parameters will be passed to Solr on the request")
+@DeprecationNotice(reason = "The SOLR processors are deprecated and will be
removed in NiFi 2.x.")
public class PutSolrContentStream extends SolrProcessor {
public static final PropertyDescriptor CONTENT_STREAM_PATH = new
PropertyDescriptor
diff --git
a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/PutSolrRecord.java
b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/PutSolrRecord.java
index 90dccfd91a..ea2dcfe635 100644
---
a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/PutSolrRecord.java
+++
b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/PutSolrRecord.java
@@ -22,6 +22,7 @@ import org.apache.nifi.annotation.behavior.DynamicProperty;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
+import
(nifi) branch NIFI-13006 created (now 63ca5c9aa6)
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a change to branch NIFI-13006 in repository https://gitbox.apache.org/repos/asf/nifi.git at 63ca5c9aa6 NIFI-13006 solr component marked as deprecated This branch includes the following new commits: new 63ca5c9aa6 NIFI-13006 solr component marked as deprecated The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(nifi) branch main updated (9098c013f2 -> a20c5d9dff)
This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 9098c013f2 NIFI-12300 Add OAuth2 Support to RestLookupService (#8462) add a20c5d9dff NIFI-13073 Changed Flow Version from int to String No new revisions were added by this update. Summary of changes: .../nifi/flow/VersionedExternalFlowMetadata.java | 6 +-- .../apache/nifi/flow/VersionedFlowCoordinates.java | 6 +-- .../nifi/registry/flow/FlowRegistryClient.java | 14 +++--- .../apache/nifi/registry/flow/RegisterAction.java | 15 +++ .../nifi/registry/flow/RegisteredFlowSnapshot.java | 7 ++- .../flow/RegisteredFlowSnapshotMetadata.java | 6 +-- .../flow/NifiRegistryFlowRegistryClient.java | 39 +++- .../nifi/registry/flow/NifiRegistryUtil.java | 4 +- .../web/api/dto/VersionControlInformationDTO.java | 6 +-- .../StandardVersionedComponentSynchronizer.java| 2 +- .../apache/nifi/groups/StandardProcessGroup.java | 10 ++--- .../flow/FlowAnalyzingRegistryClientNode.java | 9 ++-- .../flow/StandardFlowRegistryClientNode.java | 13 +++--- .../flow/StandardVersionControlInformation.java| 10 ++--- .../flow/FlowAnalyzingRegistryClientNodeTest.java | 20 ++--- .../nifi/registry/flow/FlowRegistryClientNode.java | 7 +-- .../registry/flow/GhostFlowRegistryClient.java | 9 ++-- .../registry/flow/VersionControlInformation.java | 2 +- .../flow/mapping/NiFiRegistryFlowMapperTest.java | 2 +- .../org/apache/nifi/web/NiFiServiceFacade.java | 5 ++- .../apache/nifi/web/StandardNiFiServiceFacade.java | 21 - .../org/apache/nifi/web/api/VersionsResource.java | 2 +- .../nifi/web/dao/impl/StandardFlowRegistryDAO.java | 3 +- .../apache/nifi/web/api/TestVersionsResource.java | 2 +- .../app/pages/flow-designer/state/flow/index.ts| 17 +-- .../change-version-dialog.spec.ts | 6 +-- .../change-version-dialog/change-version-dialog.ts | 12 - .../import-from-registry.component.ts | 28 ++-- .../local-changes-dialog.spec.ts | 2 +- .../_save-version-dialog.component-theme.scss | 5 --- .../save-version-dialog.component.html | 10 ++--- .../save-version-dialog.component.scss | 9 .../nifi/src/app/service/nifi-common.service.ts| 13 ++ .../src/main/nifi/src/app/state/shared/index.ts| 2 +- .../partials/canvas/save-flow-version-dialog.jsp | 1 - .../nifi-web-ui/src/main/webapp/css/dialog.css | 11 - .../main/webapp/js/nf/canvas/nf-flow-version.js| 36 +++ .../nifi-web-ui/src/main/webapp/js/nf/nf-common.js | 18 .../nifi/registry/VersionedFlowConverter.java | 2 +- .../diff/ConciseEvolvingDifferenceDescriptor.java | 2 +- .../flow/diff/StaticDifferenceDescriptor.java | 2 +- .../nifi/registry/flow/InMemoryFlowRegistry.java | 14 +++--- .../apache/nifi/stateless/core/RegistryUtil.java | 2 +- .../nifi/stateless/core/TestRegistryUtil.java | 4 +- .../registry/FileSystemFlowRegistryClient.java | 34 -- .../apache/nifi/tests/system/NiFiClientUtil.java | 6 +-- .../tests/system/registry/RegistryClientIT.java| 35 +++ .../tests/system/stateless/StatelessBasicsIT.java | 4 +- .../cli/impl/command/nifi/pg/PGChangeVersion.java | 20 ++--- .../toolkit/cli/impl/command/nifi/pg/PGImport.java | 2 +- .../VersionedFlowSnapshotMetadataSetResult.java| 52 +- 51 files changed, 320 insertions(+), 249 deletions(-) copy minifi/minifi-toolkit/minifi-toolkit-schema/src/main/java/org/apache/nifi/minifi/toolkit/schema/FunnelSchema.java => nifi-api/src/main/java/org/apache/nifi/registry/flow/RegisterAction.java (75%)
