@tech4good/angular-schematics 17.0.2 → 17.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/init/files/package.json.template +1 -1
- package/src/init/files/src/app/admin/waitlist/waitlist.component.html.template +3 -9
- package/src/init/files/src/app/admin/waitlist/waitlist.component.ts.template +12 -7
- package/src/init/files/src/app/core/store/user/user.effects.ts.template +19 -2
package/package.json
CHANGED
|
@@ -10,16 +10,10 @@
|
|
|
10
10
|
<!-- Access Status Column -->
|
|
11
11
|
<ng-container matColumnDef="accessState">
|
|
12
12
|
<th mat-header-cell *matHeaderCellDef> Access State </th>
|
|
13
|
-
<td mat-cell *matCellDef="let user">{{ user.accessState }}</td>
|
|
14
|
-
</ng-container>
|
|
15
|
-
|
|
16
|
-
<!-- Update Column -->
|
|
17
|
-
<ng-container matColumnDef="update">
|
|
18
|
-
<th mat-header-cell *matHeaderCellDef> Update Status </th>
|
|
19
13
|
<td mat-cell *matCellDef="let user">
|
|
20
|
-
<span class="update-btn" [matMenuTriggerFor]="
|
|
21
|
-
<mat-menu #
|
|
22
|
-
<button mat-menu-item (click)="updateState$.next({ user,
|
|
14
|
+
<span class="update-btn" [matMenuTriggerFor]="accessStateMenu" aria-label="accessState">{{ user.accessState }}</span>
|
|
15
|
+
<mat-menu #accessStateMenu="matMenu">
|
|
16
|
+
<button mat-menu-item (click)="updateState$.next({ user, key: 'accessState', value: option })" *ngFor="let option of accessOptions">{{ option }}</button>
|
|
23
17
|
</mat-menu>
|
|
24
18
|
</td>
|
|
25
19
|
</ng-container>
|
|
@@ -18,6 +18,9 @@ import { User, AccessState } from '../../core/store/user/user.model';
|
|
|
18
18
|
import { ShowSnackbar } from '../../core/snackbar/snackbar.actions';
|
|
19
19
|
import { UpdateUser, UserActionTypes } from '../../core/store/user/user.actions';
|
|
20
20
|
|
|
21
|
+
// If you add other columns, update this, e.g. AccessState | string | boolean;
|
|
22
|
+
type UpdateValueTypes = AccessState;
|
|
23
|
+
|
|
21
24
|
@Component({
|
|
22
25
|
selector: 'app-waitlist',
|
|
23
26
|
templateUrl: './waitlist.component.html',
|
|
@@ -32,8 +35,8 @@ export class WaitlistComponent implements OnInit, OnDestroy {
|
|
|
32
35
|
// --------------- LOCAL AND GLOBAL STATE --------------
|
|
33
36
|
|
|
34
37
|
/** Access options for menu sorted alphabetically. */
|
|
35
|
-
accessOptions = Object.keys(AccessState)
|
|
36
|
-
.map((k) => AccessState[k])
|
|
38
|
+
accessOptions: AccessState[] = Object.keys(AccessState)
|
|
39
|
+
.map((k) => AccessState[k] as AccessState)
|
|
37
40
|
.sort((a, b) => {
|
|
38
41
|
if (a > b) {
|
|
39
42
|
return 1;
|
|
@@ -45,7 +48,7 @@ export class WaitlistComponent implements OnInit, OnDestroy {
|
|
|
45
48
|
});
|
|
46
49
|
|
|
47
50
|
/** Columns to display in the table */
|
|
48
|
-
displayedColumns = ['userName', 'accessState'
|
|
51
|
+
displayedColumns = ['userName', 'accessState'];
|
|
49
52
|
|
|
50
53
|
// --------------- DB ENTITY DATA ----------------------
|
|
51
54
|
|
|
@@ -61,7 +64,7 @@ export class WaitlistComponent implements OnInit, OnDestroy {
|
|
|
61
64
|
// --------------- EVENT BINDING -----------------------
|
|
62
65
|
|
|
63
66
|
/** Event stream for updating user accessState. */
|
|
64
|
-
updateState$: Subject<{ user: User,
|
|
67
|
+
updateState$: Subject<{ user: User, key: string, value: UpdateValueTypes }> = new Subject<{ user: User, key: string, value: UpdateValueTypes }>();
|
|
65
68
|
|
|
66
69
|
|
|
67
70
|
// --------------- HELPER FUNCTIONS AND OTHER ----------
|
|
@@ -83,10 +86,12 @@ export class WaitlistComponent implements OnInit, OnDestroy {
|
|
|
83
86
|
|
|
84
87
|
this.updateState$.pipe(
|
|
85
88
|
takeUntil(this.unsubscribe$),
|
|
86
|
-
).subscribe(({ user,
|
|
89
|
+
).subscribe(({ user, key, value }) => {
|
|
90
|
+
const data = {};
|
|
91
|
+
data[key] = value;
|
|
87
92
|
const actionSets: ActionSet[] = [{
|
|
88
93
|
action: new UpdateUser(user.__id, {
|
|
89
|
-
|
|
94
|
+
...data,
|
|
90
95
|
}, this.containerId),
|
|
91
96
|
responseActionTypes: {
|
|
92
97
|
success: UserActionTypes.UPDATE_SUCCESS,
|
|
@@ -100,7 +105,7 @@ export class WaitlistComponent implements OnInit, OnDestroy {
|
|
|
100
105
|
successActionFn: (actionSetResponses) => {
|
|
101
106
|
return [
|
|
102
107
|
new ShowSnackbar({
|
|
103
|
-
message: `
|
|
108
|
+
message: `Set ${user.name}'s ${key} to ${value}`,
|
|
104
109
|
config: { duration: 3000 },
|
|
105
110
|
}),
|
|
106
111
|
];
|
|
@@ -5,8 +5,12 @@ import { EMPTY, of, Observable, throwError, forkJoin, from, pipe, merge } from '
|
|
|
5
5
|
import { switchMap, flatMap, mergeMap, map, catchError, tap, take } from 'rxjs/operators';
|
|
6
6
|
import { FirebaseService } from '../../firebase/firebase.service';
|
|
7
7
|
import { CachedLoadConnectionsService } from '../cached-load-connections.service';
|
|
8
|
+
import { Store, select } from '@ngrx/store';
|
|
9
|
+
import * as fromStore from '../../store/app.reducer';
|
|
10
|
+
import * as fromAuth from '../../store/auth/auth.reducer';
|
|
11
|
+
import { UpdateAppState } from '../../store/app-state/app-state.actions';
|
|
8
12
|
|
|
9
|
-
import { User } from './user.model';
|
|
13
|
+
import { User, AccessState } from './user.model';
|
|
10
14
|
import { UserActionTypes, UserActions,
|
|
11
15
|
AddedUser, RemovedUser,
|
|
12
16
|
StreamUser, StreamUserSuccess, StreamUserFail,
|
|
@@ -116,7 +120,19 @@ export class UserEffects {
|
|
|
116
120
|
}
|
|
117
121
|
|
|
118
122
|
actionsOnUpdate(action: UpdateUser): Observable<Action> {
|
|
119
|
-
|
|
123
|
+
if (Object.prototype.hasOwnProperty.call(action.changes, 'accessState')) {
|
|
124
|
+
// TODO: inefficient since we're querying all users. replace with count query
|
|
125
|
+
// once added to library
|
|
126
|
+
return this.db.queryListOnce('users', [['accessState', '==', AccessState.WAITING]]).pipe(
|
|
127
|
+
mergeMap((users: User[]) => {
|
|
128
|
+
return [new UpdateAppState('app', {
|
|
129
|
+
_totalWaiting: users.length,
|
|
130
|
+
}, action.correlationId)];
|
|
131
|
+
}),
|
|
132
|
+
);
|
|
133
|
+
} else {
|
|
134
|
+
return EMPTY;
|
|
135
|
+
}
|
|
120
136
|
}
|
|
121
137
|
|
|
122
138
|
actionsOnRemove(action: RemoveUser): Observable<Action> {
|
|
@@ -124,6 +140,7 @@ export class UserEffects {
|
|
|
124
140
|
}
|
|
125
141
|
|
|
126
142
|
constructor(
|
|
143
|
+
private store: Store<fromStore.State>,
|
|
127
144
|
private actions$: Actions,
|
|
128
145
|
private db: FirebaseService,
|
|
129
146
|
private clc: CachedLoadConnectionsService,
|