|
...
|
...
|
@@ -34,6 +34,10 @@ import { coerceBooleanProperty } from '@angular/cdk/coercion'; |
|
34
|
34
|
import { QueueService } from '@core/http/queue.service';
|
|
35
|
35
|
import { ServiceType } from '@shared/models/queue.models';
|
|
36
|
36
|
|
|
|
37
|
+interface Queue {
|
|
|
38
|
+ queueName: string;
|
|
|
39
|
+}
|
|
|
40
|
+
|
|
37
|
41
|
@Component({
|
|
38
|
42
|
selector: 'tb-queue-type-list',
|
|
39
|
43
|
templateUrl: './queue-type-list.component.html',
|
|
...
|
...
|
@@ -48,7 +52,7 @@ export class QueueTypeListComponent implements ControlValueAccessor, OnInit, Aft |
|
48
|
52
|
|
|
49
|
53
|
queueFormGroup: FormGroup;
|
|
50
|
54
|
|
|
51
|
|
- modelValue: string | null;
|
|
|
55
|
+ modelValue: Queue | null;
|
|
52
|
56
|
|
|
53
|
57
|
private requiredValue: boolean;
|
|
54
|
58
|
get required(): boolean {
|
|
...
|
...
|
@@ -67,9 +71,9 @@ export class QueueTypeListComponent implements ControlValueAccessor, OnInit, Aft |
|
67
|
71
|
|
|
68
|
72
|
@ViewChild('queueInput', {static: true}) queueInput: ElementRef<HTMLInputElement>;
|
|
69
|
73
|
|
|
70
|
|
- filteredQueues: Observable<Array<string>>;
|
|
|
74
|
+ filteredQueues: Observable<Array<Queue>>;
|
|
71
|
75
|
|
|
72
|
|
- queues: Observable<Array<string>>;
|
|
|
76
|
+ queues: Observable<Array<Queue>>;
|
|
73
|
77
|
|
|
74
|
78
|
searchText = '';
|
|
75
|
79
|
|
|
...
|
...
|
@@ -99,9 +103,15 @@ export class QueueTypeListComponent implements ControlValueAccessor, OnInit, Aft |
|
99
|
103
|
debounceTime(150),
|
|
100
|
104
|
distinctUntilChanged(),
|
|
101
|
105
|
tap(value => {
|
|
102
|
|
- this.updateView(value);
|
|
|
106
|
+ let modelValue;
|
|
|
107
|
+ if (typeof value === 'string' || !value) {
|
|
|
108
|
+ modelValue = null;
|
|
|
109
|
+ } else {
|
|
|
110
|
+ modelValue = value;
|
|
|
111
|
+ }
|
|
|
112
|
+ this.updateView(modelValue);
|
|
103
|
113
|
}),
|
|
104
|
|
- map(value => value ? value : ''),
|
|
|
114
|
+ map(value => value ? (typeof value === 'string' ? value : value.queueName) : ''),
|
|
105
|
115
|
switchMap(queue => this.fetchQueues(queue) )
|
|
106
|
116
|
);
|
|
107
|
117
|
}
|
|
...
|
...
|
@@ -123,8 +133,8 @@ export class QueueTypeListComponent implements ControlValueAccessor, OnInit, Aft |
|
123
|
133
|
|
|
124
|
134
|
writeValue(value: string | null): void {
|
|
125
|
135
|
this.searchText = '';
|
|
126
|
|
- this.modelValue = value;
|
|
127
|
|
- this.queueFormGroup.get('queue').patchValue(value, {emitEvent: false});
|
|
|
136
|
+ this.modelValue = value ? { queueName: value } : null;
|
|
|
137
|
+ this.queueFormGroup.get('queue').patchValue(this.modelValue, {emitEvent: false});
|
|
128
|
138
|
this.dirty = true;
|
|
129
|
139
|
}
|
|
130
|
140
|
|
|
...
|
...
|
@@ -135,37 +145,42 @@ export class QueueTypeListComponent implements ControlValueAccessor, OnInit, Aft |
|
135
|
145
|
}
|
|
136
|
146
|
}
|
|
137
|
147
|
|
|
138
|
|
- updateView(value: string | null) {
|
|
|
148
|
+ updateView(value: Queue | null) {
|
|
139
|
149
|
if (this.modelValue !== value) {
|
|
140
|
150
|
this.modelValue = value;
|
|
141
|
|
- this.propagateChange(this.modelValue);
|
|
|
151
|
+ this.propagateChange(this.modelValue ? this.modelValue.queueName : null);
|
|
142
|
152
|
}
|
|
143
|
153
|
}
|
|
144
|
154
|
|
|
145
|
|
- displayQueueFn(queue?: string): string | undefined {
|
|
146
|
|
- return queue ? queue : undefined;
|
|
|
155
|
+ displayQueueFn(queue?: Queue): string | undefined {
|
|
|
156
|
+ return queue ? queue.queueName : undefined;
|
|
147
|
157
|
}
|
|
148
|
158
|
|
|
149
|
|
- fetchQueues(searchText?: string): Observable<Array<string>> {
|
|
|
159
|
+ fetchQueues(searchText?: string): Observable<Array<Queue>> {
|
|
150
|
160
|
this.searchText = searchText;
|
|
151
|
161
|
return this.getQueues().pipe(
|
|
152
|
|
- catchError(() => of([])),
|
|
|
162
|
+ catchError(() => of([] as Array<Queue>)),
|
|
153
|
163
|
map(queues => {
|
|
154
|
164
|
const result = queues.filter( queue => {
|
|
155
|
|
- return searchText ? queue.toUpperCase().startsWith(searchText.toUpperCase()) : true;
|
|
|
165
|
+ return searchText ? queue.queueName.toUpperCase().startsWith(searchText.toUpperCase()) : true;
|
|
156
|
166
|
});
|
|
157
|
167
|
if (result.length) {
|
|
158
|
|
- result.sort();
|
|
|
168
|
+ result.sort((q1, q2) => q1.queueName.localeCompare(q2.queueName));
|
|
159
|
169
|
}
|
|
160
|
170
|
return result;
|
|
161
|
171
|
})
|
|
162
|
172
|
);
|
|
163
|
173
|
}
|
|
164
|
174
|
|
|
165
|
|
- getQueues(): Observable<Array<string>> {
|
|
|
175
|
+ getQueues(): Observable<Array<Queue>> {
|
|
166
|
176
|
if (!this.queues) {
|
|
167
|
177
|
this.queues = this.queueService.
|
|
168
|
178
|
getTenantQueuesByServiceType(this.queueType, {ignoreLoading: true}).pipe(
|
|
|
179
|
+ map((queues) => {
|
|
|
180
|
+ return queues.map((queueName) => {
|
|
|
181
|
+ return { queueName };
|
|
|
182
|
+ });
|
|
|
183
|
+ }),
|
|
169
|
184
|
publishReplay(1),
|
|
170
|
185
|
refCount()
|
|
171
|
186
|
);
|
...
|
...
|
|
