MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

tenant user listing > remove tenantUserSubquery from lookup, instead add it to query during loadListing, small ui fixes

This commit is contained in:
mchouliara 2024-09-10 15:02:07 +03:00
parent 26f8c9014e
commit e4af1c1458
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.html
View File

@ -132,8 +132,10 @@
</div> </div>
</div> </div>
</div> </div>
<button mat-button class="rounded-btn secondary" type="button" (click)="addField()" [disabled]="formGroup.disabled">{{'PREFILLING-SOURCE-EDITOR.ACTIONS.ADD-FIELD' | translate}}</button> <div class="row d-flex gap-half-rem">
<button mat-button class="rounded-btn secondary" *ngIf="formGroup.get('definition').get('fields').value != ''" type="button" (click)="submitFields()" [disabled]="!formGroup.get('definition').get('fields').valid">{{'PREFILLING-SOURCE-EDITOR.ACTIONS.SUBMIT-FIELDS' | translate}}</button> <button mat-button class="rounded-btn secondary" type="button" (click)="addField()" [disabled]="formGroup.disabled">{{'PREFILLING-SOURCE-EDITOR.ACTIONS.ADD-FIELD' | translate}}</button>
<button mat-button class="rounded-btn secondary" *ngIf="formGroup.get('definition').get('fields').value != ''" type="button" (click)="submitFields()" [disabled]="!formGroup.get('definition').get('fields').valid">{{'PREFILLING-SOURCE-EDITOR.ACTIONS.SUBMIT-FIELDS' | translate}}</button>
</div>
</div> </div>
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>

18
frontend/src/app/ui/admin/user/listing/user-listing.component.ts
View File

@ -24,7 +24,6 @@ import * as FileSaver from 'file-saver';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { takeUntil } from 'rxjs/operators'; import { takeUntil } from 'rxjs/operators';
import { nameof } from 'ts-simple-nameof'; import { nameof } from 'ts-simple-nameof';
import { RouterUtilsService } from '@app/core/services/router/router-utils.service';
import { UserInviteToTenantDialogComponent } from './user-invite-to-tenant-dialog/user-invite-to-tenant-dialog.component'; import { UserInviteToTenantDialogComponent } from './user-invite-to-tenant-dialog/user-invite-to-tenant-dialog.component';
import { AppPermission } from '@app/core/common/enum/permission.enum'; import { AppPermission } from '@app/core/common/enum/permission.enum';
import { TenantUserLookup } from '@app/core/query/tenant-user.lookup'; import { TenantUserLookup } from '@app/core/query/tenant-user.lookup';
@ -100,13 +99,6 @@ export class UserListingComponent extends BaseListingComponent<User, UserLookup>
lookup.order = { items: [this.toDescSortField(nameof<User>(x => x.createdAt))] }; lookup.order = { items: [this.toDescSortField(nameof<User>(x => x.createdAt))] };
this.updateOrderUiFields(lookup.order); this.updateOrderUiFields(lookup.order);
const tenantUserLookup: TenantUserLookup = new TenantUserLookup();
if (this.authService.getSelectedTenantId() != null && this.isTenantAdminMode && this.authService.hasPermission(AppPermission.ViewTenantUserPage)){
tenantUserLookup.tenantIds = [this.authService.getSelectedTenantId()];
tenantUserLookup.isActive = [IsActive.Active]
lookup.tenantUserSubQuery = tenantUserLookup;
}
lookup.project = { lookup.project = {
fields: this.lookupFields fields: this.lookupFields
}; };
@ -177,7 +169,15 @@ export class UserListingComponent extends BaseListingComponent<User, UserLookup>
} }
protected loadListing(): Observable<QueryResult<User>> { protected loadListing(): Observable<QueryResult<User>> {
return this.userService.query(this.lookup); let lookup = this.lookup;
//TenantUserSubquery removed from lookup and added here so it is not part of the url params > removes bug of wrong tenantId in the subQuery when changing tenant
if (this.authService.getSelectedTenantId() != null && this.isTenantAdminMode && this.authService.hasPermission(AppPermission.ViewTenantUserPage)){
const tenantUserLookup: TenantUserLookup = new TenantUserLookup();
tenantUserLookup.tenantIds = [this.authService.getSelectedTenantId()];
tenantUserLookup.isActive = [IsActive.Active];
lookup = {...this.lookup, tenantUserSubQuery: tenantUserLookup}
}
return this.userService.query(lookup);
} }
public deleteType(id: Guid) { public deleteType(id: Guid) {

8
frontend/src/app/ui/plan/clone-dialog/plan-clone-dialog.component.html
View File

@ -20,7 +20,7 @@
</div> </div>
<!-- Description field --> <!-- Description field -->
<div class="row"> <div class="row">
<div class="col-12 pb-4"> <div class="col-12 pb-2">
<div class="heading">{{'PLAN-CLONE-DIALOG.FIELDS.DESCRIPTION' | translate}}</div> <div class="heading">{{'PLAN-CLONE-DIALOG.FIELDS.DESCRIPTION' | translate}}</div>
</div> </div>
<div class="col-12 hint">{{'PLAN-CLONE-DIALOG.FIELDS.DESCRIPTION-HINT' | translate}}</div> <div class="col-12 hint">{{'PLAN-CLONE-DIALOG.FIELDS.DESCRIPTION-HINT' | translate}}</div>
@ -30,11 +30,11 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12 pt-3 pb-2">
<div class="heading">{{'PLAN-CLONE-DIALOG.FIELDS.DESCRIPTIONS' | translate}}</div> <div class="heading">{{'PLAN-CLONE-DIALOG.FIELDS.DESCRIPTIONS' | translate}}</div>
</div> </div>
<div class="col-12" *ngIf="hasDescriptions()"> <div class="col-12 hint" *ngIf="hasDescriptions()">
<h5>{{'PLAN-CLONE-DIALOG.FIELDS.DESCRIPTIONS-HINT' | translate}}</h5> {{'PLAN-CLONE-DIALOG.FIELDS.DESCRIPTIONS-HINT' | translate}}
</div> </div>
<div class="col-12" *ngIf="hasDescriptions()"> <div class="col-12" *ngIf="hasDescriptions()">
<mat-card class="mat-card"> <mat-card class="mat-card">