@tech4good/angular-schematics 20.3.1 → 21.0.0

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.
Files changed (144) hide show
  1. package/.agents/skills/publish-npm/SKILL.md +1 -1
  2. package/.agents/skills/publish-npm/eval.yaml +15 -0
  3. package/.agents/skills/publish-npm/fixtures/package-v21.json.template +8 -0
  4. package/.t4g/agent-memory.db +0 -0
  5. package/CHANGELOG.md +62 -0
  6. package/contributing-docs/commit-message.md +3 -6
  7. package/package.json +5 -5
  8. package/src/collection.json +8 -0
  9. package/src/component/files/__name@dasherize__/__name@dasherize__.component.ts.template +1 -3
  10. package/src/component/index_spec.js +57 -4
  11. package/src/component/index_spec.js.map +1 -1
  12. package/src/entity/index.js +7 -1
  13. package/src/entity/index.js.map +1 -1
  14. package/src/entity/index_spec.js +108 -4
  15. package/src/entity/index_spec.js.map +1 -1
  16. package/src/guard/files/__name@dasherize__.guard.spec.ts.template +45 -0
  17. package/src/guard/files/__name@dasherize__.guard.ts.template +32 -0
  18. package/src/guard/index.d.ts +2 -0
  19. package/src/guard/index.js +38 -0
  20. package/src/guard/index.js.map +1 -0
  21. package/src/guard/index_spec.d.ts +1 -0
  22. package/src/guard/index_spec.js +64 -0
  23. package/src/guard/index_spec.js.map +1 -0
  24. package/src/guard/schema.json +46 -0
  25. package/src/ng-add/files/.firebaserc.template +3 -2
  26. package/src/ng-add/files/.github/workflows/angular-github-ci.yml.template +105 -39
  27. package/src/ng-add/files/.gitignore.template +1 -2
  28. package/src/ng-add/files/angular.json.template +1 -5
  29. package/src/ng-add/files/docs-infra/infrastructure-guide.md.template +390 -0
  30. package/src/ng-add/files/docs-infra/load-system-architecture.md.template +166 -0
  31. package/src/ng-add/files/docs-infra/querying-strategy.md.template +157 -0
  32. package/src/ng-add/files/docs-infra/stream-system-architecture.md.template +283 -0
  33. package/src/ng-add/files/eslint.config.js.template +4 -1
  34. package/src/ng-add/files/firebase.json.template +37 -0
  35. package/src/ng-add/files/firestore.rules.spec.ts.template +221 -0
  36. package/src/ng-add/files/firestore.rules.template +67 -0
  37. package/src/ng-add/files/jest.config.ts.template +6 -1
  38. package/src/ng-add/files/package.json.template +41 -31
  39. package/src/ng-add/files/setup-jest.ts.template +13 -5
  40. package/src/ng-add/files/src/app/admin/admin-panel/admin-panel.component.spec.ts.template +76 -12
  41. package/src/ng-add/files/src/app/admin/admin-panel/admin-panel.component.ts.template +1 -3
  42. package/src/ng-add/files/src/app/admin/admin-panel/admin-settings/admin-settings.component.spec.ts.template +90 -0
  43. package/src/ng-add/files/src/app/admin/admin-panel/admin-settings/admin-settings.component.ts.template +1 -1
  44. package/src/ng-add/files/src/app/admin/admin-panel/admin-user-list/admin-user-counts/admin-count-pill/admin-count-pill.component.spec.ts.template +12 -17
  45. package/src/ng-add/files/src/app/admin/admin-panel/admin-user-list/admin-user-counts/admin-count-pill/admin-count-pill.component.ts.template +2 -4
  46. package/src/ng-add/files/src/app/admin/admin-panel/admin-user-list/admin-user-counts/admin-user-counts.component.spec.ts.template +40 -19
  47. package/src/ng-add/files/src/app/admin/admin-panel/admin-user-list/admin-user-counts/admin-user-counts.component.ts.template +3 -5
  48. package/src/ng-add/files/src/app/admin/admin-panel/admin-user-list/admin-user-list.component.html.template +2 -2
  49. package/src/ng-add/files/src/app/admin/admin-panel/admin-user-list/admin-user-list.component.spec.ts.template +108 -0
  50. package/src/ng-add/files/src/app/admin/admin-panel/admin-user-list/admin-user-list.component.ts.template +11 -11
  51. package/src/ng-add/files/src/app/admin/admin-panel/admin-user-list/admin-user-table/admin-user-table.component.html.template +6 -2
  52. package/src/ng-add/files/src/app/admin/admin-panel/admin-user-list/admin-user-table/admin-user-table.component.spec.ts.template +136 -19
  53. package/src/ng-add/files/src/app/admin/admin-panel/admin-user-list/admin-user-table/admin-user-table.component.ts.template +8 -5
  54. package/src/ng-add/files/src/app/app.component.html.template +1 -1
  55. package/src/ng-add/files/src/app/app.component.scss.template +10 -0
  56. package/src/ng-add/files/src/app/app.component.ts.template +1 -1
  57. package/src/ng-add/files/src/app/app.config.ts.template +11 -11
  58. package/src/ng-add/files/src/app/auth-routing.spec.ts.template +101 -0
  59. package/src/ng-add/files/src/app/core/analytics/log.service.ts.template +5 -8
  60. package/src/ng-add/files/src/app/core/analytics/time-analytics.service.spec.ts.template +140 -0
  61. package/src/ng-add/files/src/app/core/analytics/time-analytics.service.ts.template +25 -7
  62. package/src/ng-add/files/src/app/core/auth/guards/redirect-if-authenticated.guard.ts.template +1 -1
  63. package/src/ng-add/files/src/app/core/auth/guards/require-admin.guard.ts.template +1 -1
  64. package/src/ng-add/files/src/app/core/auth/guards/require-auth-and-consent.guard.ts.template +1 -1
  65. package/src/ng-add/files/src/app/core/auth/guards/require-auth.guard.ts.template +1 -1
  66. package/src/ng-add/files/src/app/core/firebase/cached-listeners.service.ts.template +229 -14
  67. package/src/ng-add/files/src/app/core/firebase/database.service.ts.template +1 -1
  68. package/src/ng-add/files/src/app/core/firebase/firebase.mock.service.ts.template +34 -9
  69. package/src/ng-add/files/src/app/core/firebase/firebase.service.ts.template +4 -4
  70. package/src/ng-add/files/src/app/core/firebase/query-logger.ts.template +11 -0
  71. package/src/ng-add/files/src/app/core/firebase/simulate-load.spec.ts.template +104 -0
  72. package/src/ng-add/files/src/app/core/firebase/simulate-stream.spec.ts.template +127 -0
  73. package/src/ng-add/files/src/app/core/firebase/simulation.mock.ts.template +38 -0
  74. package/src/ng-add/files/src/app/core/firebase/stream-multiplexer.ts.template +443 -0
  75. package/src/ng-add/files/src/app/core/store/app.store.spec.ts.template +920 -0
  76. package/src/ng-add/files/src/app/core/store/app.store.ts.template +303 -137
  77. package/src/ng-add/files/src/app/core/store/auth/auth.mock.ts.template +65 -23
  78. package/src/ng-add/files/src/app/core/store/auth/auth.store.ts.template +68 -67
  79. package/src/ng-add/files/src/app/core/store/user/user.mock.ts.template +46 -0
  80. package/src/ng-add/files/src/app/core/store/user-context/user-context.mock.ts.template +17 -0
  81. package/src/ng-add/files/src/app/core/testing/test-utils.ts.template +26 -0
  82. package/src/ng-add/files/src/app/first-time/consent/consent.component.html.template +3 -3
  83. package/src/ng-add/files/src/app/first-time/consent/consent.component.spec.ts.template +89 -13
  84. package/src/ng-add/files/src/app/first-time/consent/consent.component.ts.template +46 -17
  85. package/src/ng-add/files/src/app/first-time/consent/consent.guard.ts.template +1 -1
  86. package/src/ng-add/files/src/app/first-time/early-access/early-access.component.html.template +5 -63
  87. package/src/ng-add/files/src/app/first-time/early-access/early-access.component.scss.template +1 -94
  88. package/src/ng-add/files/src/app/first-time/early-access/early-access.component.spec.ts.template +150 -14
  89. package/src/ng-add/files/src/app/first-time/early-access/early-access.component.ts.template +15 -42
  90. package/src/ng-add/files/src/app/first-time/early-access/early-access.guard.ts.template +2 -2
  91. package/src/ng-add/files/src/app/first-time/early-access/early-access.model.ts.template +5 -0
  92. package/src/ng-add/files/src/app/first-time/early-access/survey-form/survey-form.component.html.template +42 -0
  93. package/src/ng-add/files/src/app/first-time/early-access/survey-form/survey-form.component.scss.template +96 -0
  94. package/src/ng-add/files/src/app/first-time/early-access/survey-form/survey-form.component.spec.ts.template +37 -0
  95. package/src/ng-add/files/src/app/first-time/early-access/survey-form/survey-form.component.ts.template +63 -0
  96. package/src/ng-add/files/src/app/first-time/early-access/waitlist-view/waitlist-view.component.html.template +16 -0
  97. package/src/ng-add/files/src/app/first-time/early-access/waitlist-view/waitlist-view.component.scss.template +7 -0
  98. package/src/ng-add/files/src/app/first-time/early-access/waitlist-view/waitlist-view.component.spec.ts.template +41 -0
  99. package/src/ng-add/files/src/app/first-time/early-access/waitlist-view/waitlist-view.component.ts.template +26 -0
  100. package/src/ng-add/files/src/app/first-time/first-time-routing.spec.ts.template +123 -0
  101. package/src/ng-add/files/src/app/first-time/landing/hero/hero.component.html.template +11 -4
  102. package/src/ng-add/files/src/app/first-time/landing/hero/hero.component.scss.template +17 -4
  103. package/src/ng-add/files/src/app/first-time/landing/hero/hero.component.ts.template +5 -5
  104. package/src/ng-add/files/src/app/first-time/landing/landing.component.html.template +1 -1
  105. package/src/ng-add/files/src/app/first-time/landing/landing.component.scss.template +0 -1
  106. package/src/ng-add/files/src/app/first-time/landing/landing.component.spec.ts.template +25 -17
  107. package/src/ng-add/files/src/app/first-time/landing/landing.component.ts.template +4 -12
  108. package/src/ng-add/files/src/app/first-time/landing/rotating-quotes/rotating-quotes.component.ts.template +1 -1
  109. package/src/ng-add/files/src/app/first-time/login/login.component.spec.ts.template +36 -16
  110. package/src/ng-add/files/src/app/first-time/login/login.component.ts.template +1 -1
  111. package/src/ng-add/files/src/app/first-time/onboarding/onboarding.component.spec.ts.template +11 -15
  112. package/src/ng-add/files/src/app/first-time/onboarding/onboarding.component.ts.template +1 -3
  113. package/src/ng-add/files/src/app/main/home/home.component.ts.template +1 -3
  114. package/src/ng-add/files/src/app/shared/dev-status-bar/dev-status-bar.component.spec.ts.template +98 -0
  115. package/src/ng-add/files/src/app/shared/dev-status-bar/dev-status-bar.component.ts.template +9 -3
  116. package/src/ng-add/files/src/app/shared/hint-visibility/hint-visibility.directive.spec.ts.template +164 -0
  117. package/src/ng-add/files/src/app/shared/hint-visibility/hint-visibility.directive.ts.template +20 -18
  118. package/src/ng-add/files/src/app/shared/navbar/navbar.component.spec.ts.template +38 -17
  119. package/src/ng-add/files/src/app/shared/navbar/navbar.component.ts.template +1 -1
  120. package/src/ng-add/files/src/app/shared/redeployment-warning/redeployment-warning.component.html.template +1 -1
  121. package/src/ng-add/files/src/app/shared/redeployment-warning/redeployment-warning.component.spec.ts.template +49 -10
  122. package/src/ng-add/files/src/app/shared/redeployment-warning/redeployment-warning.component.ts.template +5 -5
  123. package/src/ng-add/files/src/app/shared/redeployment-warning/redeployment-warning.service.spec.ts.template +86 -0
  124. package/src/ng-add/files/src/app/shared/redeployment-warning/redeployment-warning.service.ts.template +11 -9
  125. package/src/ng-add/files/src/environments/environment.prod.ts.template +1 -0
  126. package/src/ng-add/files/src/environments/environment.test.ts.template +1 -0
  127. package/src/ng-add/files/src/environments/environment.ts.template +2 -8
  128. package/src/ng-add/files/src/styles.scss.template +29 -1
  129. package/src/ng-add/files/tsconfig.app.json.template +6 -6
  130. package/src/ng-add/files/tsconfig.json.template +13 -8
  131. package/src/ng-add/files/tsconfig.spec.json.template +6 -5
  132. package/src/ng-add/index.js +19 -1
  133. package/src/ng-add/index.js.map +1 -1
  134. package/src/component/files/__name@dasherize__/__name@dasherize__.animations.ts.template +0 -4
  135. package/src/ng-add/files/src/app/admin/admin-panel/admin-panel.animations.ts.template +0 -4
  136. package/src/ng-add/files/src/app/admin/admin-panel/admin-user-list/admin-user-counts/admin-count-pill/admin-count-pill.animations.ts.template +0 -4
  137. package/src/ng-add/files/src/app/admin/admin-panel/admin-user-list/admin-user-counts/admin-user-counts.animations.ts.template +0 -4
  138. package/src/ng-add/files/src/app/admin/admin-panel/admin-user-list/admin-user-table/admin-user-table.animations.ts.template +0 -4
  139. package/src/ng-add/files/src/app/first-time/consent/consent.animations.ts.template +0 -4
  140. package/src/ng-add/files/src/app/first-time/early-access/early-access.animations.ts.template +0 -10
  141. package/src/ng-add/files/src/app/first-time/landing/hero/hero.animations.ts.template +0 -15
  142. package/src/ng-add/files/src/app/first-time/landing/landing.animations.ts.template +0 -4
  143. package/src/ng-add/files/src/app/first-time/onboarding/onboarding.animations.ts.template +0 -4
  144. package/src/ng-add/files/src/app/main/home/home.animations.ts.template +0 -4
@@ -1,49 +1,91 @@
1
- import { signalStore, patchState, withState, withMethods, signalStoreFeature } from '@ngrx/signals';
2
- import { USER_DB } from '../user/user.mock';
1
+ import { signalStore, patchState, withState, withMethods, withComputed } from '@ngrx/signals';
2
+ import { computed, inject, Injector } from '@angular/core';
3
+ import { UserMockDB, USER_DB } from '../user/user.mock';
4
+ import { environment } from '../../../../environments/environment';
5
+ import { User } from '../user/user.model';
3
6
 
4
- const savedUser = localStorage.getItem('mockUser');
7
+ const savedUser = environment.cacheMockData ? localStorage.getItem('mockUser') : null;
5
8
  const initialUser = savedUser ? JSON.parse(savedUser) : null;
6
9
 
7
10
  export const AuthMockDB = signalStore(
8
11
  { providedIn: 'root' },
9
- withState({ user: initialUser }),
12
+ withState({
13
+ afUser: (initialUser ? {
14
+ uid: initialUser.uid || initialUser.__id,
15
+ email: initialUser.email,
16
+ displayName: initialUser.displayName || initialUser.name,
17
+ photoURL: initialUser.photoURL,
18
+ } : null) as { uid: string; email: string; displayName: string; photoURL: string } | null,
19
+ isLoadingLogin: false,
20
+ }),
21
+ withComputed((store) => {
22
+ const injector = inject(Injector);
23
+ return {
24
+ user: computed(() => {
25
+ const afUser = store.afUser();
26
+ if (!afUser) return null;
27
+ const userStore = injector.get(UserMockDB);
28
+ return userStore.selectEntity(afUser.uid) || USER_DB.find((u) => u.__id === afUser.uid) || null;
29
+ }),
30
+ };
31
+ }),
10
32
  withMethods((store) => ({
11
33
  login() {
12
- const userToLogin = {
34
+ const afUser = {
13
35
  uid: USER_DB[0].__id,
14
36
  email: USER_DB[0].email,
15
37
  displayName: USER_DB[0].name,
16
- photoURL: USER_DB[0].photoURL,
38
+ photoURL: USER_DB[0].photoURL || '',
17
39
  };
18
- localStorage.setItem('mockUser', JSON.stringify(userToLogin));
19
- patchState(store, { user: userToLogin });
40
+ if (environment.cacheMockData) {
41
+ localStorage.setItem('mockUser', JSON.stringify(afUser));
42
+ }
43
+ patchState(store, { afUser });
20
44
  },
21
45
  logout() {
22
- localStorage.removeItem('mockUser');
23
- patchState(store, { user: null });
46
+ if (environment.cacheMockData) {
47
+ localStorage.removeItem('mockUser');
48
+ }
49
+ patchState(store, { afUser: null });
24
50
  },
25
51
  })),
26
52
  );
27
53
 
28
54
  export const AuthLoggedInMockDB = signalStore(
29
55
  { providedIn: 'root' },
30
- withState({ user: {
31
- uid: USER_DB[0].__id,
32
- email: USER_DB[0].email,
33
- displayName: USER_DB[0].name,
34
- photoURL: USER_DB[0].photoURL,
35
- } }),
56
+ withState({
57
+ afUser: {
58
+ uid: USER_DB[0].__id,
59
+ email: USER_DB[0].email,
60
+ displayName: USER_DB[0].name,
61
+ photoURL: USER_DB[0].photoURL || '',
62
+ } as { uid: string; email: string; displayName: string; photoURL: string } | null,
63
+ isLoadingLogin: false,
64
+ }),
65
+ withComputed((store) => {
66
+ const injector = inject(Injector);
67
+ return {
68
+ user: computed(() => {
69
+ const afUser = store.afUser();
70
+ if (!afUser) return null;
71
+ const userStore = injector.get(UserMockDB);
72
+ return userStore.selectEntity(afUser.uid) || USER_DB.find((u) => u.__id === afUser.uid) || null;
73
+ }),
74
+ };
75
+ }),
36
76
  withMethods((store) => ({
37
77
  login() {
38
- patchState(store, { user: {
39
- uid: USER_DB[0].__id,
40
- email: USER_DB[0].email,
41
- displayName: USER_DB[0].name,
42
- photoURL: USER_DB[0].photoURL,
43
- } });
78
+ patchState(store, {
79
+ afUser: {
80
+ uid: USER_DB[0].__id,
81
+ email: USER_DB[0].email,
82
+ displayName: USER_DB[0].name,
83
+ photoURL: USER_DB[0].photoURL || '',
84
+ },
85
+ });
44
86
  },
45
87
  logout() {
46
- patchState(store, { user: null });
88
+ patchState(store, { afUser: null });
47
89
  },
48
90
  })),
49
91
  );
@@ -56,7 +56,7 @@ export const AuthStore = signalStore(
56
56
  // This ensures the UserStore stays continuously in sync with any
57
57
  // real-time backend database updates (e.g. from cloud functions).
58
58
  userStore.stream([['__id', '==', afUser.uid]], {}, injector);
59
-
59
+
60
60
  // Pass the afUser down the pipe to the tap() handler.
61
61
  return of(afUser);
62
62
  }),
@@ -72,13 +72,13 @@ export const AuthStore = signalStore(
72
72
  }),
73
73
 
74
74
  // 3. Update the local AuthStore state and handle brand new signups.
75
- tap(async (afUser: any) => {
75
+ tap(async (afUser: State['afUser']) => {
76
76
  if (!afUser) {
77
77
  patchState(store, { afUser: null });
78
78
  } else {
79
79
  patchState(store, { afUser });
80
80
  const dbUser = userStore.selectEntity(afUser.uid);
81
-
81
+
82
82
  if (!dbUser) {
83
83
  // afUser exists but dbUser doesn't exist yet, we should create it
84
84
  const newUser = {
@@ -99,79 +99,80 @@ export const AuthStore = signalStore(
99
99
  }
100
100
  }),
101
101
  )),
102
- async login(provider: string, params: {
103
- scope?: string,
104
- doNotRoute: boolean
105
- } = { doNotRoute: false }): Promise<void> {
106
- patchState(store, { isLoadingLogin: true });
107
-
108
- try {
109
- const loginResult = await db.login(provider, params.scope);
110
- const afUser = loginResult.user;
111
- patchState(store, { afUser });
102
+ async login(provider: string, params: {
103
+ scope?: string,
104
+ doNotRoute: boolean
105
+ } = { doNotRoute: false }): Promise<void> {
106
+ patchState(store, { isLoadingLogin: true });
107
+
108
+ try {
109
+ const loginResult = await db.login(provider, params.scope);
110
+ const afUser = loginResult.user;
111
+ patchState(store, { afUser });
112
112
 
113
- const dbUser: User = await db.getEntity('users', afUser.uid);
113
+ const dbUser: User = await db.getEntity('users', afUser.uid);
114
114
 
115
- const navLocation = ['/home'];
116
- // update the user if there is already a dbUser
117
- if (dbUser) {
118
- const changes = {
119
- email: afUser.email,
120
- name: afUser.displayName || afUser.email,
121
- photoURL: afUser.photoURL || null,
122
- };
123
- try {
124
- await userStore.update(dbUser.__id, changes);
115
+ const navLocation = ['/home'];
116
+ // update the user if there is already a dbUser
117
+ if (dbUser) {
118
+ const changes = {
119
+ email: afUser.email,
120
+ name: afUser.displayName || afUser.email,
121
+ photoURL: afUser.photoURL || null,
122
+ };
123
+ try {
124
+ await userStore.update(dbUser.__id, changes);
125
+
126
+ if (!params || !params.doNotRoute) {
127
+ router.navigate(navLocation, { queryParamsHandling: 'preserve' });
128
+ }
129
+ } catch (e) {
130
+ console.error(e);
131
+ throw e;
132
+ }
133
+ } else {
134
+ const newUser = {
135
+ __id: afUser.uid,
136
+ email: afUser.email,
137
+ name: afUser.displayName || afUser.email,
138
+ photoURL: afUser.photoURL || null,
139
+ isAdmin: false,
140
+ consented: false,
141
+ accessState: AccessState.SUBMIT_INTEREST,
142
+ };
143
+ try {
144
+ await userStore.add(newUser);
125
145
 
126
- if (!params || !params.doNotRoute) {
127
- router.navigate(navLocation, { queryParamsHandling: 'preserve' });
146
+ if (!params || !params.doNotRoute) {
147
+ router.navigate(navLocation, { queryParamsHandling: 'preserve' });
148
+ }
149
+ } catch (e) {
150
+ console.error(`[AuthStore login] Error creating new user:`, e);
151
+ throw e;
128
152
  }
129
- } catch (e) {
130
- console.error(e);
131
- throw e;
132
153
  }
133
- } else {
134
- const newUser = {
135
- __id: afUser.uid,
136
- email: afUser.email,
137
- name: afUser.displayName || afUser.email,
138
- photoURL: afUser.photoURL || null,
139
- isAdmin: false,
140
- consented: false,
141
- accessState: AccessState.SUBMIT_INTEREST,
142
- };
143
- try {
144
- await userStore.add(newUser);
145
-
146
- if (!params || !params.doNotRoute) {
147
- router.navigate(navLocation, { queryParamsHandling: 'preserve' });
154
+ } catch (e) {
155
+ switch (e.code) {
156
+ case 'auth/account-exists-with-different-credential': {
157
+ db.loginLink(e);
148
158
  }
149
- } catch (e) {
150
- console.error(`[AuthStore login] Error creating new user:`, e);
151
- throw e;
152
159
  }
160
+ throw e;
161
+ } finally {
162
+ patchState(store, { isLoadingLogin: false });
153
163
  }
154
- } catch (e) {
155
- switch (e.code) {
156
- case 'auth/account-exists-with-different-credential': {
157
- db.loginLink(e);
164
+ },
165
+ async logout(params?: { doNotRoute: boolean }): Promise<void> {
166
+ try {
167
+ await db.logout();
168
+ if (!params || !params.doNotRoute) {
169
+ router.navigate(['/landing']);
158
170
  }
171
+ } catch (e) {
172
+ console.error(e);
173
+ throw e;
159
174
  }
160
- throw e;
161
- }
162
- patchState(store, { isLoadingLogin: false });
163
- },
164
- async logout(params?: { doNotRoute: boolean }): Promise<void> {
165
- try {
166
- await db.logout();
167
- if (!params || !params.doNotRoute) {
168
- router.navigate(['/landing']);
169
- }
170
- } catch (e) {
171
- console.error(e);
172
- throw e;
173
- }
174
- },
175
- };
175
+ },
176
+ };
176
177
  }),
177
178
  );
@@ -8,6 +8,50 @@ export const UserMockDB = signalStore(
8
8
  withEntitiesForMockDB<User>('users'),
9
9
  );
10
10
 
11
+ export function createMockUser(overrides?: Partial<User>): User {
12
+ return {
13
+ __id: 'mock-user-id',
14
+ email: 'mock@example.com',
15
+ name: 'Mock User',
16
+ isAdmin: false,
17
+ accessState: AccessState.DONE,
18
+ consented: true,
19
+ _createdAt: Timestamp.now(),
20
+ _updatedAt: Timestamp.now(),
21
+ _deleted: false,
22
+ ...overrides,
23
+ };
24
+ }
25
+
26
+ export const MOCK_USER_WAITING: User = {
27
+ __id: 'u1',
28
+ name: 'Alice Waiting',
29
+ email: 'alice@example.com',
30
+ accessState: AccessState.WAITING,
31
+ isAdmin: false,
32
+ consented: false,
33
+ _createdAt: Timestamp.now(),
34
+ _updatedAt: Timestamp.now(),
35
+ _deleted: false,
36
+ };
37
+
38
+ export const MOCK_USER_DONE: User = {
39
+ __id: 'u2',
40
+ name: 'Bob Done',
41
+ email: 'bob@example.com',
42
+ accessState: AccessState.DONE,
43
+ isAdmin: false,
44
+ consented: false,
45
+ _createdAt: Timestamp.now(),
46
+ _updatedAt: Timestamp.now(),
47
+ _deleted: false,
48
+ };
49
+
50
+ export const MOCK_USER_LIST: User[] = [
51
+ MOCK_USER_WAITING,
52
+ MOCK_USER_DONE,
53
+ ];
54
+
11
55
  export const USER_DB: User[] = [
12
56
  {
13
57
  __id: '1',
@@ -21,4 +65,6 @@ export const USER_DB: User[] = [
21
65
  _updatedAt: Timestamp.now(),
22
66
  _deleted: false,
23
67
  },
68
+ ...MOCK_USER_LIST,
24
69
  ];
70
+
@@ -9,6 +9,20 @@ export const UserContextMockDB = signalStore(
9
9
  withEntitiesForMockDB<UserContext>('userContexts'),
10
10
  );
11
11
 
12
+ export const MOCK_USERCONTEXT_WAITING: UserContext = {
13
+ __id: 'uc-waiting',
14
+ __userId: 'u1',
15
+ questionOne: 'Response to question one',
16
+ questionTwo: 'Response to question two',
17
+ _createdAt: Timestamp.now(),
18
+ _updatedAt: Timestamp.now(),
19
+ _deleted: false,
20
+ };
21
+
22
+ export const MOCK_USERCONTEXT_LIST: UserContext[] = [
23
+ MOCK_USERCONTEXT_WAITING,
24
+ ];
25
+
12
26
  export const USERCONTEXT_DB = [
13
27
  {
14
28
  __id: 'uc1',
@@ -19,4 +33,7 @@ export const USERCONTEXT_DB = [
19
33
  _updatedAt: Timestamp.now(),
20
34
  _deleted: false,
21
35
  },
36
+ ...MOCK_USERCONTEXT_LIST,
22
37
  ];
38
+
39
+
@@ -0,0 +1,26 @@
1
+ /** Wait for the specified number of milliseconds (useful for CSS transitions). */
2
+ export const wait = (ms: number) => new Promise<void>((resolve) => setTimeout(resolve, ms));
3
+
4
+ /**
5
+ * Mocks getBoundingClientRect on a native HTML element for JSDOM testing.
6
+ */
7
+ export function mockGetBoundingClientRect(
8
+ element: HTMLElement,
9
+ rect: Partial<DOMRect> = {},
10
+ ): jest.Mock {
11
+ const mockRect = {
12
+ top: 0,
13
+ left: 0,
14
+ width: 0,
15
+ height: 0,
16
+ bottom: 0,
17
+ right: 0,
18
+ x: 0,
19
+ y: 0,
20
+ toJSON: () => '',
21
+ ...rect,
22
+ };
23
+ const mockFn = jest.fn().mockReturnValue(mockRect);
24
+ element.getBoundingClientRect = mockFn;
25
+ return mockFn;
26
+ }
@@ -45,11 +45,11 @@
45
45
 
46
46
  <p>We may revise this Privacy Policy from time to time. The most current version of the policy will govern our use of your information and will be at <a routerLink="/consent">{{ consentUrl }}</a>. If we make a change to this policy that, in our sole discretion, is material, we will notify you via an email to the email address associated with your account. By continuing to access or use the Services after those changes become effective, you agree to be bound by the revised Privacy Policy.</p>
47
47
 
48
- <form [formGroup]="checkForm" (ngSubmit)="submit()">
48
+ <form [formRoot]="consentForm">
49
49
  <div class="agree-container">
50
- <mat-checkbox [color]="'primary'" formControlName="checked" name="checked" required><span style="white-space:normal;" class="permission-text">I have read and understood the above, agree to the terms of use, and consent to participate in the research study.</span></mat-checkbox>
50
+ <mat-checkbox [color]="'primary'" [formField]="consentForm.checked"><span style="white-space:normal;" class="permission-text">I have read and understood the above, agree to the terms of use, and consent to participate in the research study.</span></mat-checkbox>
51
51
  </div>
52
- <button type="submit" class="btn continue-btn" [disabled]="checkForm.invalid">
52
+ <button type="submit" class="btn continue-btn" [disabled]="!consentForm.checked().value()">
53
53
  Accept and Continue
54
54
  <img src="https://icongr.am/feather/arrow-right.svg?size=20&color=B2B6C7">
55
55
  </button>
@@ -1,37 +1,113 @@
1
- import { render } from '@testing-library/angular';
1
+ import { render, screen, waitFor } from '@testing-library/angular';
2
2
  import userEvent from '@testing-library/user-event';
3
+ import { ActivatedRoute, Router } from '@angular/router';
4
+ import { Provider } from '@angular/core';
5
+ import { Location } from '@angular/common';
6
+ import { MatSnackBar } from '@angular/material/snack-bar';
3
7
 
4
8
  import { ConsentComponent } from './consent.component';
5
9
  import { DATABASE_SERVICE } from 'src/app/core/firebase/database.service';
6
10
  import { FirebaseMockService } from 'src/app/core/firebase/firebase.mock.service';
7
- import { BatchWriteMockService } from 'src/app/core/store/batch-write.mock.service';
8
11
  import { BATCH_WRITE_SERVICE } from 'src/app/core/store/batch-write.service';
12
+ import { BatchWriteMockService } from 'src/app/core/store/batch-write.mock.service';
13
+ import { AuthStore } from 'src/app/core/store/auth/auth.store';
14
+ import { AuthLoggedInMockDB } from 'src/app/core/store/auth/auth.mock';
15
+ import { UserStore } from 'src/app/core/store/user/user.store';
16
+ import { AccessState } from 'src/app/core/store/user/user.model';
17
+ import { provideFirebaseMock } from 'src/app/core/firebase/firebase.mock.service';
18
+ import { USER_DB } from 'src/app/core/store/user/user.mock';
9
19
 
10
- /** Sets up the testing environment for ConsentComponent using render.*/
11
- async function setup() {
20
+ /** Sets up the testing environment for ConsentComponent using render. */
21
+ async function setup(providers: Provider[] = [], seededUsers: any[] = []) {
12
22
  const user = userEvent.setup();
13
- const checkedSpy = jest.fn();
23
+ const snackBarMock = {
24
+ open: jest.fn(),
25
+ };
26
+ const routerMock = {
27
+ navigate: jest.fn().mockReturnValue(Promise.resolve(true)),
28
+ routerState: { snapshot: {} },
29
+ };
30
+ const activatedRouteMock = {
31
+ snapshot: {},
32
+ };
14
33
 
15
34
  const view = await render(ConsentComponent, {
16
- imports: [],
17
35
  providers: [
18
- { provide: DATABASE_SERVICE, useClass: FirebaseMockService },
36
+ ...provideFirebaseMock({
37
+ users: seededUsers,
38
+ }),
39
+ { provide: MatSnackBar, useValue: snackBarMock },
19
40
  { provide: BATCH_WRITE_SERVICE, useClass: BatchWriteMockService },
41
+ { provide: Router, useValue: routerMock },
42
+ { provide: ActivatedRoute, useValue: activatedRouteMock },
43
+ { provide: AuthStore, useClass: AuthLoggedInMockDB },
44
+ UserStore,
45
+ ...providers,
20
46
  ],
21
- componentInputs: {},
22
- on: {},
23
47
  });
24
48
 
49
+ const locationService = view.fixture.debugElement.injector.get(Location);
50
+ jest.spyOn(locationService, 'prepareExternalUrl').mockImplementation((val) => `prefix-${val}`);
51
+
25
52
  return {
26
53
  user,
27
54
  fixture: view.fixture,
28
- rerender: () => view.rerender(), // add component inputs if needed
55
+ navigateSpy: routerMock.navigate,
56
+ snackBarMock,
57
+ userStore: view.fixture.debugElement.injector.get(UserStore),
29
58
  };
30
59
  }
31
60
 
32
61
  describe('ConsentComponent', () => {
33
- it('should create', async () => {
34
- const { fixture } = await setup();
35
- expect(fixture.componentInstance).toBeTruthy();
62
+ beforeEach(() => {
63
+ // Reset user to default state before each test
64
+ USER_DB[0].accessState = AccessState.SUBMIT_INTEREST;
65
+ USER_DB[0].consented = false;
66
+ });
67
+
68
+ it('should render consent title and research study information', async () => {
69
+ await setup();
70
+
71
+ expect(screen.getByRole('heading', { level: 1, name: /Research Consent and Privacy Policy/i })).toBeVisible();
72
+ expect(screen.getByText(/What will you do in the study/i)).toBeVisible();
73
+ expect(screen.getByRole('button', { name: /Accept and Continue/i })).toBeDisabled();
74
+ });
75
+
76
+ it('should enable submit button when checkbox is checked', async () => {
77
+ const { user } = await setup();
78
+
79
+ const checkbox = screen.getByRole('checkbox', { name: /I have read and understood/i });
80
+ const submitBtn = screen.getByRole('button', { name: /Accept and Continue/i });
81
+
82
+ expect(submitBtn).toBeDisabled();
83
+
84
+ await user.click(checkbox);
85
+ expect(submitBtn).not.toBeDisabled();
86
+ });
87
+
88
+ it('should update accessState and consented in userStore and navigate to /home on submit', async () => {
89
+ USER_DB[0].accessState = AccessState.WAITING;
90
+ USER_DB[0].consented = false;
91
+
92
+ const { user, userStore, navigateSpy } = await setup([], [USER_DB[0]]);
93
+
94
+ const updateSpy = jest.spyOn(userStore, 'update');
95
+
96
+ const checkbox = screen.getByRole('checkbox', { name: /I have read and understood/i });
97
+ const submitBtn = screen.getByRole('button', { name: /Accept and Continue/i });
98
+
99
+ await user.click(checkbox);
100
+ await user.click(submitBtn);
101
+
102
+ expect(updateSpy).toHaveBeenCalledWith(USER_DB[0].__id, {
103
+ accessState: AccessState.DONE,
104
+ consented: true,
105
+ });
106
+
107
+ await waitFor(() => {
108
+ expect(navigateSpy).toHaveBeenCalledWith(['/home']);
109
+ });
110
+
111
+ updateSpy.mockRestore();
36
112
  });
37
113
  });
@@ -1,27 +1,31 @@
1
- import { Component, OnInit, ChangeDetectionStrategy, input, output, inject, WritableSignal, Signal, signal, computed, Inject, Injector } from '@angular/core';
2
- import { ConsentAnimations } from './consent.animations';
3
- import { Router, RouterLink } from '@angular/router';
1
+ import { Component, OnInit, ChangeDetectionStrategy, input, output, inject, WritableSignal, Signal, signal, computed, effect, Inject, Injector } from '@angular/core';
2
+ import { Router, RouterLink, ActivatedRoute } from '@angular/router';
4
3
  import { User, AccessState } from 'src/app/core/store/user/user.model';
4
+ import { handleAccess } from './consent.guard';
5
5
  import { Location } from '@angular/common';
6
6
  import { AuthStore } from 'src/app/core/store/auth/auth.store';
7
7
  import { UserStore } from 'src/app/core/store/user/user.store';
8
8
  import { MatSnackBar } from '@angular/material/snack-bar';
9
9
  import { MatCheckbox } from '@angular/material/checkbox';
10
- import { FormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
10
+ import { form, required, validate, FormField, FormRoot } from '@angular/forms/signals';
11
11
  import { BatchWriteService, BATCH_WRITE_SERVICE } from 'src/app/core/store/batch-write.service';
12
12
  import { NavbarComponent } from 'src/app/shared/navbar/navbar.component';
13
13
 
14
+ export interface ConsentData {
15
+ checked: boolean;
16
+ }
17
+
14
18
  @Component({
15
19
  selector: 'app-consent',
16
20
  templateUrl: './consent.component.html',
17
- styleUrls: ['./consent.component.scss'],
21
+ styleUrl: './consent.component.scss',
18
22
  changeDetection: ChangeDetectionStrategy.OnPush,
19
- animations: ConsentAnimations,
20
23
  imports: [
21
- ReactiveFormsModule,
22
24
  NavbarComponent,
23
25
  MatCheckbox,
24
- RouterLink
26
+ RouterLink,
27
+ FormField,
28
+ FormRoot,
25
29
  ],
26
30
  })
27
31
  export class ConsentComponent implements OnInit {
@@ -49,20 +53,40 @@ export class ConsentComponent implements OnInit {
49
53
  investigatorInfo = 'INVESTIGATOR_INFO [FirstName LastName, co-Principal Investigator, email@ucsc.edu]';
50
54
  facultyInfo = 'FACULTY_INFO [David T. Lee, dlee105@ucsc.edu]';
51
55
 
52
- /** Checkbox state used in form. */
53
- checkForm = this.form.group({
54
- checked: [false, Validators.requiredTrue],
56
+ /** Form model */
57
+ consentModel = signal<ConsentData>({
58
+ checked: false,
55
59
  });
56
60
 
61
+ /** Form definition */
62
+ consentForm = form(
63
+ this.consentModel,
64
+ (p) => {
65
+ validate(p.checked, (ctx) => {
66
+ return ctx.value() === true ? null : { kind: 'requiredTrue', message: 'Must be checked' };
67
+ });
68
+ },
69
+ { submission: { action: async () => {
70
+ await this.submitConsent();
71
+ } } },
72
+ );
73
+
57
74
  /** Consent url. */
58
75
  consentUrl: string;
59
76
 
60
77
  // --------------- COMPUTED DATA -----------------------
61
78
 
62
- // --------------- EVENT HANDLING ----------------------
79
+ waitlistData = computed(() => {
80
+ const user = this.currentUser();
81
+ if (!user) {
82
+ return null;
83
+ }
84
+ return user;
85
+ });
86
+
87
+ // --------------- STATE ACTIONS -----------------------
63
88
 
64
- /** Submit the consent form. */
65
- async submit() {
89
+ async submitConsent() {
66
90
  try {
67
91
  await this.userStore.update(this.currentUser().__id, {
68
92
  accessState: AccessState.DONE,
@@ -79,17 +103,22 @@ export class ConsentComponent implements OnInit {
79
103
 
80
104
  constructor(
81
105
  private router: Router,
82
- private form: FormBuilder,
106
+ private route: ActivatedRoute,
83
107
  private snackBar: MatSnackBar,
84
108
  private location: Location,
85
109
  @Inject(BATCH_WRITE_SERVICE) private batch: BatchWriteService,
86
- private injector: Injector,
87
110
  ) {
111
+ // Redirect users who have progressed past the consent stage
112
+ // (i.e. neither submitting consent nor waiting) to the main app.
113
+ effect(() => {
114
+ const user = this.currentUser();
115
+ handleAccess(user, this.router, this.route.snapshot, this.router.routerState.snapshot);
116
+ });
88
117
  }
89
118
 
90
119
  // --------------- LOAD AND CLEANUP --------------------
91
120
 
92
121
  ngOnInit() {
93
- this.consentUrl = location.origin + '/' + this.location.prepareExternalUrl('consent');
122
+ this.consentUrl = location.origin + this.location.prepareExternalUrl('consent');
94
123
  }
95
124
  }
@@ -19,7 +19,7 @@ export function handleAccess(
19
19
  user: User | null | undefined,
20
20
  router: Router,
21
21
  route: ActivatedRouteSnapshot,
22
- state: RouterStateSnapshot
22
+ state: RouterStateSnapshot,
23
23
  ): boolean {
24
24
  if (hasAdminOverride(user, state.url)) return true;
25
25