You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2021/01/13 17:13:55 UTC
[archiva] branch master updated (c860d26 -> debc1d3)
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git.
from c860d26 Fixing layout issues
new 80f8684 Changing autocomplete attributes
new debc1d3 Trying to fix multicast problem
The 2 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.
Summary of changes:
.../manage-roles-edit/manage-roles-edit.component.html | 16 ++++++++--------
.../ldap-security/ldap-security.component.html | 4 ++--
.../manage-users-add/manage-users-add.component.html | 8 ++++----
.../manage-users-edit/manage-users-edit.component.html | 2 +-
.../paginated-entities/paginated-entities.component.html | 15 +++++++++++----
.../paginated-entities/paginated-entities.component.ts | 10 +++++-----
.../main/archiva-web/src/app/services/toast.service.ts | 2 +-
7 files changed, 32 insertions(+), 25 deletions(-)
[archiva] 01/02: Changing autocomplete attributes
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
commit 80f8684a5d3dba1c11dc0af0cebe385805b3568e
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Wed Jan 13 11:59:01 2021 +0100
Changing autocomplete attributes
---
.../ldap-security/ldap-security.component.html | 4 ++--
.../users/manage-users-add/manage-users-add.component.html | 8 ++++----
.../users/manage-users-edit/manage-users-edit.component.html | 2 +-
.../src/main/archiva-web/src/app/services/toast.service.ts | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/security-configuration/ldap-security/ldap-security.component.html b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/security-configuration/ldap-security/ldap-security.component.html
index b4f55f5..d4a8bdd 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/security-configuration/ldap-security/ldap-security.component.html
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/security-configuration/ldap-security/ldap-security.component.html
@@ -16,7 +16,7 @@
~ under the License.
-->
-<form class="mt-3 mb-3" [formGroup]="userForm" (ngSubmit)="onSubmit()" autocomplete="new-password">
+<form class="mt-3 mb-3" [formGroup]="userForm" (ngSubmit)="onSubmit()" autocomplete="off">
<p class="row col-md-10">{{'security.config.ldap.explain'|translate}}</p>
<div class="form-group row col-md-10"
*ngFor="let attName of ['host_name','port','base_dn','groups_base_dn','bind_dn','bind_password']">
@@ -29,7 +29,7 @@
<input [attr.type]="attName=='bind_password'?'password':'text'" formControlName="{{attName}}"
id="{{attName}}"
[ngClass]="getInputClasses(attName)"
- autocomplete="new-password"
+ [attr.autocomplete]="attName=='bind_password'?'new-password':'off'"
>
</div>
</div>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-add/manage-users-add.component.html b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-add/manage-users-add.component.html
index c04ee50..22f2516 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-add/manage-users-add.component.html
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-add/manage-users-add.component.html
@@ -16,7 +16,7 @@
~ under the License.
-->
-<form class="mt-3 mb-3" [formGroup]="userForm" (ngSubmit)="onSubmit()">
+<form class="mt-3 mb-3" [formGroup]="userForm" (ngSubmit)="onSubmit()" autocomplete="off">
<div class="form-group col-md-8">
<label for="user_id">{{'users.attributes.user_id' |translate}}</label>
<input type="text" class="form-control" formControlName="user_id" id="user_id"
@@ -47,13 +47,13 @@
<label for="email">{{'users.attributes.email' |translate}}</label>
<input type="text" class="form-control" formControlName="email" id="email"
[ngClass]="valid('email')"
- placeholder="{{'users.input.email'|translate}}">
+ placeholder="{{'users.input.email'|translate}}" autocomplete="off">
</div>
<div class="form-group col-md-8">
<label for="password">{{'users.attributes.password' |translate}}</label>
<input type="password" class="form-control" formControlName="password" id="password"
[ngClass]="valid('password')"
- placeholder="{{'users.input.password'|translate}}">
+ placeholder="{{'users.input.password'|translate}}" autocomplete="new-password">
<div *ngFor="let error of getErrorsFor('password')" class="invalid-feedback">
{{error}}
</div>
@@ -62,7 +62,7 @@
<label for="confirm_password">{{'users.attributes.confirm_password' |translate}}</label>
<input type="password" class="form-control" formControlName="confirm_password" id="confirm_password"
[ngClass]="valid('confirm_password')"
- placeholder="{{'users.input.confirm_password'|translate}}">
+ placeholder="{{'users.input.confirm_password'|translate}}" autocomplete="new-password">
</div>
<div class="form-group col-md-8">
<div class="form-check">
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-edit/manage-users-edit.component.html b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-edit/manage-users-edit.component.html
index 8f12e3b..37bf41e 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-edit/manage-users-edit.component.html
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/users/manage-users-edit/manage-users-edit.component.html
@@ -16,7 +16,7 @@
~ under the License.
-->
-<form class="mt-3 mb-3" [formGroup]="userForm" (ngSubmit)="onSubmit()">
+<form class="mt-3 mb-3" [formGroup]="userForm" (ngSubmit)="onSubmit()" autocomplete="off">
<div class="form-group row col-md-8" *ngIf="!editUser.permanent">
<div class="col-md-1">{{'form.edit' |translate}} <span class="fas fa-edit"></span></div>
<div class="col-md-6">
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/toast.service.ts b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/toast.service.ts
index 2d515f8..f4955ef 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/toast.service.ts
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/services/toast.service.ts
@@ -87,7 +87,7 @@ export class ToastService {
options.classname=['alert','alert-info']
options.type='success'
if (!options.delay) {
- options.delay=80000
+ options.delay=8000
}
this.show(origin,textOrTpl,options)
}
[archiva] 02/02: Trying to fix multicast problem
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
commit debc1d3c2a55646940aff0f51341af70edf7898c
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Wed Jan 13 17:07:14 2021 +0100
Trying to fix multicast problem
---
.../manage-roles-edit/manage-roles-edit.component.html | 16 ++++++++--------
.../paginated-entities/paginated-entities.component.html | 15 +++++++++++----
.../paginated-entities/paginated-entities.component.ts | 10 +++++-----
3 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/roles/manage-roles-edit/manage-roles-edit.component.html b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/roles/manage-roles-edit/manage-roles-edit.component.html
index cd1e9b0..bdbf7da 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/roles/manage-roles-edit/manage-roles-edit.component.html
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/roles/manage-roles-edit/manage-roles-edit.component.html
@@ -166,14 +166,14 @@
[id]="'userParentSection'"
#userParentSection>
- <ng-container *ngIf="userParentSection.items$ |async as itemLoader">
- <ng-template [ngIf]="itemLoader.loading">
+ <ng-container *ngIf="userParentSection.items$ |async as userParentItemLoader">
+ <ng-template [ngIf]="userParentItemLoader.loading">
<div class="spinner-border text-primary" role="status">
<span class="sr-only">Loading...</span>
</div>
</ng-template>
</ng-container>
- <ng-container *ngIf="userParentSection.items$ |stripLoading|async as userItem">
+ <ng-container *ngIf="userParentSection.items$ |stripLoading|async as parentUserItem">
<table class="table table-striped table-bordered">
<thead class="thead-light">
<tr sorted [sortFieldEmitter]="userParentSection.sortFieldChange"
@@ -186,11 +186,11 @@
</tr>
</thead>
<tbody>
- <tr *ngFor="let user of userItem.data">
+ <tr *ngFor="let parentUser of parentUserItem.data">
<td><span data-toggle="tooltip" placement="left"
- ngbTooltip="{{user.id}}">{{user.user_id}}</span>
+ ngbTooltip="{{parentUser.id}}">{{parentUser.user_id}}</span>
</td>
- <td>{{user.full_name}}</td>
+ <td>{{parentUser.full_name}}</td>
</tr>
</tbody>
</table>
@@ -205,8 +205,8 @@
[displayControlsIfSinglePage]="false"
#userSection>
- <ng-container *ngIf="userSection.items$ |async as itemLoader">
- <ng-template [ngIf]="itemLoader.loading">
+ <ng-container *ngIf="userSection.items$ |async as userItemLoader">
+ <ng-template [ngIf]="userItemLoader.loading">
<div class="spinner-border text-primary" role="status">
<span class="sr-only">Loading...</span>
</div>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/shared/paginated-entities/paginated-entities.component.html b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/shared/paginated-entities/paginated-entities.component.html
index 879ff98..0662205 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/shared/paginated-entities/paginated-entities.component.html
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/shared/paginated-entities/paginated-entities.component.html
@@ -15,10 +15,17 @@
~ specific language governing permissions and limitations
~ under the License.
-->
+<!--
+<ng-template [ngIf]="((total$|async)>0 || displayIfEmpty)" [ngIfElse]="noContent" >
+-->
+ <ng-template [ngIf]="true" [ngIfElse]="noContent" >
+
-<ng-template [ngIf]="(displayIfEmpty || (total$|async)>0)" [ngIfElse]="noContent" >
-<form class="mt-3 mb-3">
- <div class="form-row align-items-center" *ngIf="displayControlsIfSinglePage||(multiplePages$|async)">
+ <form class="mt-3 mb-3">
+ <!--
+ <div class="form-row align-items-center" *ngIf="(multiplePages$|async)||displayControlsIfSinglePage">
+ -->
+ <div class="form-row align-items-center" *ngIf="(multiplePages$|async)==true">
<div class="col-lg-4 col-md-2 col-sm-1">
<label class="sr-only" for="searchQuery">{{'search.label' |translate}}</label>
<input type="text" class="form-control" id="searchQuery" placeholder="{{'search.input'|translate}}" #searchTerm
@@ -34,7 +41,7 @@
<ng-content></ng-content>
-<ngb-pagination *ngIf="displayControlsIfSinglePage||(multiplePages$|async)"
+<ngb-pagination *ngIf="(multiplePages$|async)==true"
[collectionSize]="total$|async" [pageSize]="pageSize" [maxSize]="pagination.maxSize" [rotate]="pagination.rotate"
[boundaryLinks]="pagination.boundaryLinks" [ellipses]="pagination.ellipses"
[(page)]="page" (pageChange)="changePage($event)" aria-label="Pagination"></ngb-pagination>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/shared/paginated-entities/paginated-entities.component.ts b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/shared/paginated-entities/paginated-entities.component.ts
index 6239e88..1e0c22d 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/shared/paginated-entities/paginated-entities.component.ts
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/shared/paginated-entities/paginated-entities.component.ts
@@ -27,7 +27,7 @@ import {
pluck,
refCount,
startWith,
- switchMap
+ switchMap, tap
} from "rxjs/operators";
import {EntityService} from "@app/model/entity-service";
import {FieldToggle} from "@app/model/field-toggle";
@@ -187,11 +187,11 @@ export class PaginatedEntitiesComponent<T> implements OnInit, FieldToggle, After
multicast(new Subject()),
refCount()
);
- this.total$ = source.pipe(filter(val=>val.hasValue()),map(val=>val.value),
- pluck('pagination', 'total_count'));
- this.multiplePages$ = source.pipe(filter(val => val.hasValue()),
+ this.total$ = source.pipe(tap((el)=>console.log("Total pipe "+this.id+": "+typeof(el)+" - "+JSON.stringify(el))),filter(val=>val.hasValue()),map(val=>val.value),
+ pluck('pagination', 'total_count'),tap((el)=>console.log("Total end "+this.id+" - "+el)));
+ this.multiplePages$ = source.pipe(tap((el)=>console.log("Multipage pipe "+this.id+": "+typeof(el)+" - "+JSON.stringify(el))),filter(val => val.hasValue()),
map(val => val.value.pagination.total_count > val.value.pagination.limit));
- this.items$ = source;
+ this.items$ = source.pipe(tap((el)=>console.log("Item pipe "+this.id+": "+typeof(el)+" - "+JSON.stringify(el))));
}
search(terms: string) {