mirror of
https://github.com/andwati/zitadel.git
synced 2026-11-17 10:55:12 +00:00
# Which Problems Are Solved Actions V2 Method names got cut off in the creation dropdown <img width="668" height="717" alt="old modal" src="https://github.com/user-attachments/assets/e3dda16d-5326-464e-abc7-67a8b146037c" /> # How the Problems Are Solved The modal now first requires a Service to be set and only afterwards are users allowed set Methods. This way we can cut out the Service-Names from the Method-Name leading to cleaner and shorter names. <img width="796" height="988" alt="new modal" src="https://github.com/user-attachments/assets/5002afdf-b639-44ef-954a-5482cca12f96" /> # Additional Changes Changed the Modal dataloading to use Tanstack Query # Additional Context - Closes #10596
230 lines
8.0 KiB
TypeScript
230 lines
8.0 KiB
TypeScript
import { CommonModule } from '@angular/common';
|
|
import {
|
|
ChangeDetectionStrategy,
|
|
Component,
|
|
computed,
|
|
effect,
|
|
EventEmitter,
|
|
Input,
|
|
Output,
|
|
signal,
|
|
Signal,
|
|
} from '@angular/core';
|
|
import { RouterModule } from '@angular/router';
|
|
import { TranslateModule } from '@ngx-translate/core';
|
|
import { MatButtonModule } from '@angular/material/button';
|
|
import { FormBuilder, FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms';
|
|
import { ObservedValueOf, ReplaySubject, shareReplay, switchMap } from 'rxjs';
|
|
import { MatRadioModule } from '@angular/material/radio';
|
|
import { ActionService } from 'src/app/services/action.service';
|
|
import { ToastService } from 'src/app/services/toast.service';
|
|
import { MatAutocompleteModule } from '@angular/material/autocomplete';
|
|
import { InputModule } from 'src/app/modules/input/input.module';
|
|
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
|
|
import { Target } from '@zitadel/proto/zitadel/action/v2beta/target_pb';
|
|
import { MatSelectModule } from '@angular/material/select';
|
|
import { ActionConditionPipeModule } from 'src/app/pipes/action-condition-pipe/action-condition-pipe.module';
|
|
import { MatTableDataSource, MatTableModule } from '@angular/material/table';
|
|
import { map, startWith } from 'rxjs/operators';
|
|
import { TypeSafeCellDefModule } from 'src/app/directives/type-safe-cell-def/type-safe-cell-def.module';
|
|
import { CdkDrag, CdkDragDrop, CdkDropList, moveItemInArray } from '@angular/cdk/drag-drop';
|
|
import { toSignal } from '@angular/core/rxjs-interop';
|
|
import { minArrayLengthValidator } from 'src/app/modules/form-field/validators/validators';
|
|
import { ProjectRoleChipModule } from 'src/app/modules/project-role-chip/project-role-chip.module';
|
|
import { MatTooltipModule } from '@angular/material/tooltip';
|
|
import { TableActionsModule } from 'src/app/modules/table-actions/table-actions.module';
|
|
|
|
@Component({
|
|
standalone: true,
|
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
|
selector: 'cnsl-actions-two-add-action-target',
|
|
templateUrl: './actions-two-add-action-target.component.html',
|
|
styleUrls: ['./actions-two-add-action-target.component.scss'],
|
|
imports: [
|
|
TranslateModule,
|
|
MatRadioModule,
|
|
RouterModule,
|
|
ReactiveFormsModule,
|
|
InputModule,
|
|
MatAutocompleteModule,
|
|
FormsModule,
|
|
ActionConditionPipeModule,
|
|
CommonModule,
|
|
MatButtonModule,
|
|
MatProgressSpinnerModule,
|
|
MatSelectModule,
|
|
MatTableModule,
|
|
TypeSafeCellDefModule,
|
|
CdkDrag,
|
|
CdkDropList,
|
|
ProjectRoleChipModule,
|
|
MatTooltipModule,
|
|
TableActionsModule,
|
|
],
|
|
})
|
|
export class ActionsTwoAddActionTargetComponent {
|
|
@Input() public hideBackButton = false;
|
|
@Input()
|
|
public set preselectedTargetIds(preselectedTargetIds: string[]) {
|
|
this.preselectedTargetIds$.next(preselectedTargetIds);
|
|
}
|
|
|
|
@Output() public readonly back = new EventEmitter<void>();
|
|
@Output() public readonly continue = new EventEmitter<string[]>();
|
|
|
|
private readonly preselectedTargetIds$ = new ReplaySubject<string[]>(1);
|
|
|
|
protected readonly form$: ReturnType<typeof this.buildForm>;
|
|
|
|
protected readonly targets: ReturnType<typeof this.listTargets>;
|
|
private readonly selectedTargetIds: Signal<string[]>;
|
|
protected readonly selectableTargets: Signal<Target[]>;
|
|
protected readonly dataSource: MatTableDataSource<Target>;
|
|
|
|
constructor(
|
|
private readonly fb: FormBuilder,
|
|
private readonly actionService: ActionService,
|
|
private readonly toast: ToastService,
|
|
) {
|
|
this.form$ = this.buildForm().pipe(shareReplay({ refCount: true, bufferSize: 1 }));
|
|
this.targets = this.listTargets();
|
|
|
|
this.selectedTargetIds = this.getSelectedTargetIds(this.form$);
|
|
this.selectableTargets = this.getSelectableTargets(this.targets, this.selectedTargetIds, this.form$);
|
|
this.dataSource = this.getDataSource(this.targets, this.selectedTargetIds);
|
|
}
|
|
|
|
private buildForm() {
|
|
return this.preselectedTargetIds$.pipe(
|
|
startWith([] as string[]),
|
|
map((preselectedTargetIds) => {
|
|
return this.fb.group({
|
|
autocomplete: new FormControl('', { nonNullable: true }),
|
|
selectedTargetIds: new FormControl(preselectedTargetIds, {
|
|
nonNullable: true,
|
|
validators: [minArrayLengthValidator(1)],
|
|
}),
|
|
});
|
|
}),
|
|
);
|
|
}
|
|
|
|
private listTargets() {
|
|
const targetsSignal = signal({ state: 'loading' as 'loading' | 'loaded', targets: new Map<string, Target>() });
|
|
|
|
this.actionService
|
|
.listTargets({})
|
|
.then(({ targets }) => {
|
|
const result = targets.reduce((acc, target) => {
|
|
acc.set(target.id, target);
|
|
return acc;
|
|
}, new Map<string, Target>());
|
|
|
|
targetsSignal.set({ state: 'loaded', targets: result });
|
|
})
|
|
.catch((error) => {
|
|
this.toast.showError(error);
|
|
});
|
|
|
|
return computed(targetsSignal);
|
|
}
|
|
|
|
private getSelectedTargetIds(form$: typeof this.form$) {
|
|
const selectedTargetIds$ = form$.pipe(
|
|
switchMap(({ controls: { selectedTargetIds } }) => {
|
|
return selectedTargetIds.valueChanges.pipe(startWith(selectedTargetIds.value));
|
|
}),
|
|
);
|
|
return toSignal(selectedTargetIds$, { requireSync: true });
|
|
}
|
|
|
|
private getSelectableTargets(targets: typeof this.targets, selectedTargetIds: Signal<string[]>, form$: typeof this.form$) {
|
|
const autocomplete$ = form$.pipe(
|
|
switchMap(({ controls: { autocomplete } }) => {
|
|
return autocomplete.valueChanges.pipe(startWith(autocomplete.value));
|
|
}),
|
|
);
|
|
const autocompleteSignal = toSignal(autocomplete$, { requireSync: true });
|
|
|
|
const unselectedTargets = computed(() => {
|
|
const targetsCopy = new Map(targets().targets);
|
|
for (const selectedTargetId of selectedTargetIds()) {
|
|
targetsCopy.delete(selectedTargetId);
|
|
}
|
|
return Array.from(targetsCopy.values());
|
|
});
|
|
|
|
return computed(() => {
|
|
const autocomplete = autocompleteSignal().toLowerCase();
|
|
return unselectedTargets().filter(({ name }) => name.toLowerCase().includes(autocomplete));
|
|
});
|
|
}
|
|
|
|
private getDataSource(targetsSignal: typeof this.targets, selectedTargetIdsSignal: Signal<string[]>) {
|
|
const selectedTargets = computed(() => {
|
|
// get this out of the loop so angular can track this dependency
|
|
// even if targets is empty
|
|
const { targets, state } = targetsSignal();
|
|
const selectedTargetIds = selectedTargetIdsSignal();
|
|
|
|
if (state === 'loading') {
|
|
return [];
|
|
}
|
|
|
|
return selectedTargetIds.map((id) => {
|
|
const target = targets.get(id);
|
|
if (!target) {
|
|
throw new Error(`Target with id ${id} not found`);
|
|
}
|
|
return target;
|
|
});
|
|
});
|
|
|
|
const dataSource = new MatTableDataSource<Target>(selectedTargets());
|
|
effect(() => {
|
|
dataSource.data = selectedTargets();
|
|
});
|
|
|
|
return dataSource;
|
|
}
|
|
|
|
protected addTarget(target: Target, form: ObservedValueOf<typeof this.form$>) {
|
|
const { selectedTargetIds } = form.controls;
|
|
selectedTargetIds.setValue([target.id, ...selectedTargetIds.value]);
|
|
form.controls.autocomplete.setValue('');
|
|
}
|
|
|
|
protected removeTarget(index: number, form: ObservedValueOf<typeof this.form$>) {
|
|
const { selectedTargetIds } = form.controls;
|
|
const data = [...selectedTargetIds.value];
|
|
data.splice(index, 1);
|
|
selectedTargetIds.setValue(data);
|
|
}
|
|
|
|
protected drop(event: CdkDragDrop<undefined>, form: ObservedValueOf<typeof this.form$>) {
|
|
const { selectedTargetIds } = form.controls;
|
|
|
|
const data = [...selectedTargetIds.value];
|
|
moveItemInArray(data, event.previousIndex, event.currentIndex);
|
|
selectedTargetIds.setValue(data);
|
|
}
|
|
|
|
protected handleEnter(event: Event, form: ObservedValueOf<typeof this.form$>) {
|
|
const selectableTargets = this.selectableTargets();
|
|
if (selectableTargets.length !== 1) {
|
|
return;
|
|
}
|
|
|
|
event.preventDefault();
|
|
this.addTarget(selectableTargets[0], form);
|
|
}
|
|
|
|
protected submit() {
|
|
this.continue.emit(this.selectedTargetIds());
|
|
}
|
|
|
|
protected trackTarget(_: number, target: Target) {
|
|
return target.id;
|
|
}
|
|
}
|