@7365admin1/layer-common 4.73.1-staging.455 → 4.74.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.
- package/CHANGELOG.md +15 -4
- package/assets/css/primitives.css +0 -43
- package/components/AccessCardPreviewDialog.vue +50 -286
- package/components/AppSelect.vue +3 -77
- package/components/BuildingUnitFormEdit.vue +0 -6
- package/components/Dialog/UpdateMoreAction.vue +1 -11
- package/components/DocumentForm.vue +112 -407
- package/components/DocumentManagement.vue +12 -213
- package/components/Facility/BookingSetup.vue +0 -63
- package/components/HidAccessLogDashboard.vue +17 -74
- package/components/HidIntercomManagement.vue +14 -183
- package/components/HidQrCodeConfiguration.vue +195 -17
- package/components/HidReaderManagement.vue +0 -398
- package/components/HidReaderUserRoster.vue +3 -44
- package/components/HidUserEnrollment.vue +155 -845
- package/components/InvitationClientForm.vue +1 -19
- package/components/MemberMain.vue +14 -66
- package/components/VisitorForm.vue +0 -12
- package/components/VisitorManagement.vue +5 -267
- package/composables/useDocument.ts +0 -7
- package/composables/useFacility.ts +0 -11
- package/composables/useHidAmico.ts +0 -165
- package/composables/useHidNavigation.ts +1 -25
- package/composables/useMember.ts +0 -16
- package/composables/usePeople.ts +0 -19
- package/composables/useServiceProvider.ts +2 -33
- package/package.json +1 -1
- package/pages/[org]/[site]/access-mgmt/administrator/index.vue +1 -1
- package/pages/[org]/[site]/access-mgmt/hid-cards/index.vue +1 -1
- package/pages/[org]/[site]/access-mgmt/hid-readers/index.vue +1 -1
- package/types/document.d.ts +0 -14
- package/types/facility.d.ts +0 -4
- package/types/member.d.ts +0 -4
- package/types/people.d.ts +1 -28
- package/types/service-provider.d.ts +0 -5
- package/utils/role.ts +5 -37
- package/components/BuildingUnitManagement.vue +0 -298
- package/components/HidAccessPermissions.vue +0 -424
- package/components/HidProfileQrCode.vue +0 -332
- package/composables/useHidReaderSelection.ts +0 -50
- package/composables/useSiteCategory.ts +0 -45
- package/pages/[org]/[site]/access-mgmt/hid-qr-code/index.vue +0 -23
- package/utils/hid-permission-assignments.ts +0 -190
- package/utils/hid-reader-selection.ts +0 -52
- package/utils/occupancy-role.ts +0 -109
- package/utils/service-type.ts +0 -30
|
@@ -1,332 +0,0 @@
|
|
|
1
|
-
<!--
|
|
2
|
-
MY HID QR CODE.
|
|
3
|
-
|
|
4
|
-
The signed-in member's own pass for one reader. Every other HID screen acts on
|
|
5
|
-
somebody else - a resident being enrolled, a visitor being issued a pass. This
|
|
6
|
-
one has no subject picker at all, because the server takes the caller from the
|
|
7
|
-
session and there is no user id to send.
|
|
8
|
-
|
|
9
|
-
Issuing a code does NOT grant access. A member's door permission comes from the
|
|
10
|
-
HID permissions screen, and minting an access rule here would let anyone who
|
|
11
|
-
can press Generate admit themselves. So the screen reports what the permissions
|
|
12
|
-
screen says (`assigned`) and warns when a code would be refused at the door,
|
|
13
|
-
rather than handing out something that silently fails.
|
|
14
|
-
-->
|
|
15
|
-
<template>
|
|
16
|
-
<div class="hid-profile-qr">
|
|
17
|
-
<div class="hid-profile-qr__header">
|
|
18
|
-
<h2 class="hid-profile-qr__title">HID QR Code</h2>
|
|
19
|
-
<AppSelect
|
|
20
|
-
v-if="readerOptions.length"
|
|
21
|
-
v-model="selectedReaderId"
|
|
22
|
-
class="reader-select"
|
|
23
|
-
:items="readerOptions"
|
|
24
|
-
@update:model-value="loadProfile"
|
|
25
|
-
/>
|
|
26
|
-
</div>
|
|
27
|
-
|
|
28
|
-
<v-card class="screen-modal hid-profile-qr__card">
|
|
29
|
-
<v-card-text class="screen-modal__body">
|
|
30
|
-
<div v-if="loading" class="hid-profile-qr__state">Loading...</div>
|
|
31
|
-
|
|
32
|
-
<div v-else-if="!readerOptions.length" class="hid-profile-qr__state">
|
|
33
|
-
No HID reader is set up for this site yet.
|
|
34
|
-
</div>
|
|
35
|
-
|
|
36
|
-
<template v-else>
|
|
37
|
-
<p class="hid-profile-qr__reader">
|
|
38
|
-
{{ profile?.readerName || "HID reader" }}
|
|
39
|
-
<span>{{ profile?.portalName || "Portal not configured" }}</span>
|
|
40
|
-
</p>
|
|
41
|
-
|
|
42
|
-
<!-- A code this reader cannot read is worse than no code, so the
|
|
43
|
-
capability is checked before anything is offered. -->
|
|
44
|
-
<v-alert
|
|
45
|
-
v-if="profile && !profile.qrEnabled"
|
|
46
|
-
type="warning"
|
|
47
|
-
variant="tonal"
|
|
48
|
-
density="compact"
|
|
49
|
-
class="mb-4"
|
|
50
|
-
>
|
|
51
|
-
This reader is not set up to read QR codes.
|
|
52
|
-
</v-alert>
|
|
53
|
-
|
|
54
|
-
<!-- The honest part: a code opens the door only for a member the
|
|
55
|
-
permissions screen already admits. `assigned` is null when the
|
|
56
|
-
lookup failed, which is not the same as "no". -->
|
|
57
|
-
<v-alert
|
|
58
|
-
v-else-if="profile && profile.assigned === false"
|
|
59
|
-
type="warning"
|
|
60
|
-
variant="tonal"
|
|
61
|
-
density="compact"
|
|
62
|
-
class="mb-4"
|
|
63
|
-
>
|
|
64
|
-
You are not assigned to this reader, so this code will be refused at
|
|
65
|
-
the door. Ask a property manager to add you on the HID permissions
|
|
66
|
-
screen.
|
|
67
|
-
</v-alert>
|
|
68
|
-
|
|
69
|
-
<div v-if="qrImage" class="hid-profile-qr__code">
|
|
70
|
-
<img :src="qrImage" alt="Your HID QR code" width="220" height="220" />
|
|
71
|
-
<p class="hid-profile-qr__issued">
|
|
72
|
-
Issued {{ formatIssuedAt(profile?.issuedAt) }}
|
|
73
|
-
</p>
|
|
74
|
-
</div>
|
|
75
|
-
<p v-else class="hid-profile-qr__state">
|
|
76
|
-
You have no QR code on this reader yet.
|
|
77
|
-
</p>
|
|
78
|
-
|
|
79
|
-
<div class="hid-profile-qr__actions">
|
|
80
|
-
<AppButton
|
|
81
|
-
:disabled="working || !profile?.qrEnabled"
|
|
82
|
-
@click="generate"
|
|
83
|
-
>
|
|
84
|
-
{{ profile?.issued ? "Regenerate" : "Generate QR Code" }}
|
|
85
|
-
</AppButton>
|
|
86
|
-
<AppButton
|
|
87
|
-
v-if="qrImage"
|
|
88
|
-
variant="ghost"
|
|
89
|
-
icon="mdi-download"
|
|
90
|
-
@click="downloadQr"
|
|
91
|
-
>
|
|
92
|
-
Download
|
|
93
|
-
</AppButton>
|
|
94
|
-
<AppButton
|
|
95
|
-
v-if="profile?.issued"
|
|
96
|
-
variant="ghost"
|
|
97
|
-
:disabled="working"
|
|
98
|
-
@click="remove"
|
|
99
|
-
>
|
|
100
|
-
Remove
|
|
101
|
-
</AppButton>
|
|
102
|
-
</div>
|
|
103
|
-
|
|
104
|
-
<p class="field-hint">
|
|
105
|
-
Regenerating replaces the previous code. The old one stops working
|
|
106
|
-
immediately.
|
|
107
|
-
</p>
|
|
108
|
-
</template>
|
|
109
|
-
</v-card-text>
|
|
110
|
-
</v-card>
|
|
111
|
-
|
|
112
|
-
<v-snackbar v-model="snackbar.show" :color="snackbar.color" timeout="4000">
|
|
113
|
-
{{ snackbar.message }}
|
|
114
|
-
</v-snackbar>
|
|
115
|
-
</div>
|
|
116
|
-
</template>
|
|
117
|
-
|
|
118
|
-
<script setup lang="ts">
|
|
119
|
-
import QRCode from "qrcode";
|
|
120
|
-
import type { HidProfileQr } from "../composables/useHidAmico";
|
|
121
|
-
|
|
122
|
-
const props = defineProps<{ site: string }>();
|
|
123
|
-
|
|
124
|
-
const { getReaders, getProfileQr, issueProfileQr, deleteProfileQr } = useHidAmico();
|
|
125
|
-
|
|
126
|
-
type HidReaderOption = { _id: string; name?: string; portalName?: string };
|
|
127
|
-
|
|
128
|
-
const readers = ref<HidReaderOption[]>([]);
|
|
129
|
-
const { selectHidReader, resolveForSite } = useHidReaderSelection();
|
|
130
|
-
const selectedReaderId = ref("");
|
|
131
|
-
const profile = ref<HidProfileQr | null>(null);
|
|
132
|
-
const qrImage = ref("");
|
|
133
|
-
const loading = ref(false);
|
|
134
|
-
const working = ref(false);
|
|
135
|
-
const snackbar = reactive({ show: false, color: "success", message: "" });
|
|
136
|
-
|
|
137
|
-
const readerOptions = computed(() => readers.value.map((reader) => ({
|
|
138
|
-
title: `${reader.name || reader._id} — ${reader.portalName || "Portal not configured"}`,
|
|
139
|
-
value: reader._id,
|
|
140
|
-
})));
|
|
141
|
-
|
|
142
|
-
function showToast(message: string, color: "success" | "error" = "success") {
|
|
143
|
-
snackbar.message = message;
|
|
144
|
-
snackbar.color = color;
|
|
145
|
-
snackbar.show = true;
|
|
146
|
-
}
|
|
147
|
-
|
|
148
|
-
function toRecord(value: unknown): Record<string, any> {
|
|
149
|
-
return value && typeof value === "object" ? (value as Record<string, any>) : {};
|
|
150
|
-
}
|
|
151
|
-
|
|
152
|
-
function errorMessage(error: unknown) {
|
|
153
|
-
const record = toRecord(error);
|
|
154
|
-
return String(toRecord(record.data).message || record.message || "Something went wrong.");
|
|
155
|
-
}
|
|
156
|
-
|
|
157
|
-
function formatIssuedAt(value?: string) {
|
|
158
|
-
if (!value) return "";
|
|
159
|
-
const date = new Date(value);
|
|
160
|
-
return Number.isNaN(date.getTime()) ? "" : date.toLocaleString();
|
|
161
|
-
}
|
|
162
|
-
|
|
163
|
-
/**
|
|
164
|
-
* The image is drawn here, never fetched. The value is the credential itself,
|
|
165
|
-
* so keeping it on this page and out of any URL is the point.
|
|
166
|
-
*/
|
|
167
|
-
async function renderQr(value: string) {
|
|
168
|
-
if (!value) {
|
|
169
|
-
qrImage.value = "";
|
|
170
|
-
return;
|
|
171
|
-
}
|
|
172
|
-
try {
|
|
173
|
-
qrImage.value = await QRCode.toDataURL(value, { width: 440, margin: 1 });
|
|
174
|
-
} catch (error) {
|
|
175
|
-
console.error("Unable to render the HID QR code:", error);
|
|
176
|
-
qrImage.value = "";
|
|
177
|
-
}
|
|
178
|
-
}
|
|
179
|
-
|
|
180
|
-
/**
|
|
181
|
-
* Saves the rendered code as a PNG.
|
|
182
|
-
*
|
|
183
|
-
* Straight off the data URL already in the page - no request, so the credential
|
|
184
|
-
* never travels again to be downloaded. Same anchor-click approach `VisitorForm`
|
|
185
|
-
* uses for a visitor pass, and the reader name is in the file name because a
|
|
186
|
-
* member can hold one code per reader.
|
|
187
|
-
*/
|
|
188
|
-
function downloadQr() {
|
|
189
|
-
if (!qrImage.value) return;
|
|
190
|
-
const slug = String(profile.value?.readerName || "reader")
|
|
191
|
-
.trim()
|
|
192
|
-
.replace(/[^a-z0-9]+/gi, "-")
|
|
193
|
-
.replace(/^-|-$/g, "")
|
|
194
|
-
.toLowerCase();
|
|
195
|
-
const link = document.createElement("a");
|
|
196
|
-
link.href = qrImage.value;
|
|
197
|
-
link.download = `hid-qr-${slug || "reader"}.png`;
|
|
198
|
-
link.click();
|
|
199
|
-
}
|
|
200
|
-
|
|
201
|
-
async function loadReaders() {
|
|
202
|
-
if (!props.site) return;
|
|
203
|
-
const response = toRecord(await getReaders({ site: props.site, page: 1, limit: 100 }));
|
|
204
|
-
const data = toRecord(response.data);
|
|
205
|
-
const items = response.items ?? data.items ?? data.readers ?? [];
|
|
206
|
-
readers.value = (Array.isArray(items) ? items : []).filter((reader) => reader?._id);
|
|
207
|
-
/* Shared with every other HID screen — see `useHidReaderSelection`. The
|
|
208
|
-
resolver refuses a remembered reader that is not this site's, so a site
|
|
209
|
-
switch or a deleted reader falls back to the first rather than querying
|
|
210
|
-
an id the site does not own. */
|
|
211
|
-
selectedReaderId.value = resolveForSite(props.site, readers.value);
|
|
212
|
-
}
|
|
213
|
-
|
|
214
|
-
async function loadProfile() {
|
|
215
|
-
if (!selectedReaderId.value) return;
|
|
216
|
-
loading.value = true;
|
|
217
|
-
try {
|
|
218
|
-
const response = await getProfileQr(selectedReaderId.value);
|
|
219
|
-
profile.value = response?.data ?? null;
|
|
220
|
-
await renderQr(profile.value?.qrValue || "");
|
|
221
|
-
} catch (error: unknown) {
|
|
222
|
-
profile.value = null;
|
|
223
|
-
qrImage.value = "";
|
|
224
|
-
showToast(errorMessage(error), "error");
|
|
225
|
-
} finally {
|
|
226
|
-
loading.value = false;
|
|
227
|
-
}
|
|
228
|
-
}
|
|
229
|
-
|
|
230
|
-
async function generate() {
|
|
231
|
-
if (!selectedReaderId.value) return;
|
|
232
|
-
working.value = true;
|
|
233
|
-
try {
|
|
234
|
-
const response = await issueProfileQr(selectedReaderId.value);
|
|
235
|
-
profile.value = response?.data ?? null;
|
|
236
|
-
await renderQr(profile.value?.qrValue || "");
|
|
237
|
-
showToast("QR code generated.");
|
|
238
|
-
} catch (error: unknown) {
|
|
239
|
-
showToast(errorMessage(error), "error");
|
|
240
|
-
} finally {
|
|
241
|
-
working.value = false;
|
|
242
|
-
}
|
|
243
|
-
}
|
|
244
|
-
|
|
245
|
-
async function remove() {
|
|
246
|
-
if (!selectedReaderId.value) return;
|
|
247
|
-
if (!window.confirm("Remove your QR code from this reader?")) return;
|
|
248
|
-
working.value = true;
|
|
249
|
-
try {
|
|
250
|
-
const response = await deleteProfileQr(selectedReaderId.value);
|
|
251
|
-
profile.value = response?.data ?? null;
|
|
252
|
-
await renderQr("");
|
|
253
|
-
showToast("QR code removed.");
|
|
254
|
-
} catch (error: unknown) {
|
|
255
|
-
showToast(errorMessage(error), "error");
|
|
256
|
-
} finally {
|
|
257
|
-
working.value = false;
|
|
258
|
-
}
|
|
259
|
-
}
|
|
260
|
-
|
|
261
|
-
watch(
|
|
262
|
-
() => props.site,
|
|
263
|
-
async () => {
|
|
264
|
-
await loadReaders();
|
|
265
|
-
await loadProfile();
|
|
266
|
-
},
|
|
267
|
-
{ immediate: true },
|
|
268
|
-
);
|
|
269
|
-
|
|
270
|
-
/* Publish every change, including the seed above: a screen that had to fall
|
|
271
|
-
back to the first reader should leave the others agreeing with it. */
|
|
272
|
-
watch(selectedReaderId, (value) => {
|
|
273
|
-
if (value) selectHidReader(props.site, value);
|
|
274
|
-
});
|
|
275
|
-
</script>
|
|
276
|
-
|
|
277
|
-
<style scoped>
|
|
278
|
-
.hid-profile-qr__header {
|
|
279
|
-
display: flex;
|
|
280
|
-
align-items: center;
|
|
281
|
-
gap: 12px;
|
|
282
|
-
flex-wrap: wrap;
|
|
283
|
-
}
|
|
284
|
-
|
|
285
|
-
.hid-profile-qr__title {
|
|
286
|
-
margin: 0;
|
|
287
|
-
font-size: 18px;
|
|
288
|
-
font-weight: 600;
|
|
289
|
-
}
|
|
290
|
-
|
|
291
|
-
.hid-profile-qr__card {
|
|
292
|
-
margin-top: 16px;
|
|
293
|
-
max-width: 460px;
|
|
294
|
-
}
|
|
295
|
-
|
|
296
|
-
.hid-profile-qr__reader {
|
|
297
|
-
margin: 0 0 14px;
|
|
298
|
-
font-size: 14px;
|
|
299
|
-
font-weight: 600;
|
|
300
|
-
}
|
|
301
|
-
|
|
302
|
-
.hid-profile-qr__reader span {
|
|
303
|
-
display: block;
|
|
304
|
-
color: var(--muted);
|
|
305
|
-
font-size: 12px;
|
|
306
|
-
font-weight: 500;
|
|
307
|
-
}
|
|
308
|
-
|
|
309
|
-
.hid-profile-qr__code {
|
|
310
|
-
display: grid;
|
|
311
|
-
place-items: center;
|
|
312
|
-
margin-bottom: 14px;
|
|
313
|
-
}
|
|
314
|
-
|
|
315
|
-
.hid-profile-qr__issued {
|
|
316
|
-
margin: 8px 0 0;
|
|
317
|
-
color: var(--muted);
|
|
318
|
-
font-size: 12px;
|
|
319
|
-
}
|
|
320
|
-
|
|
321
|
-
.hid-profile-qr__state {
|
|
322
|
-
color: var(--muted);
|
|
323
|
-
font-size: 13.5px;
|
|
324
|
-
padding: 8px 0 14px;
|
|
325
|
-
}
|
|
326
|
-
|
|
327
|
-
.hid-profile-qr__actions {
|
|
328
|
-
display: flex;
|
|
329
|
-
gap: 8px;
|
|
330
|
-
flex-wrap: wrap;
|
|
331
|
-
}
|
|
332
|
-
</style>
|
|
@@ -1,50 +0,0 @@
|
|
|
1
|
-
import {
|
|
2
|
-
EMPTY_HID_READER_CHOICE,
|
|
3
|
-
resolveHidReaderId,
|
|
4
|
-
type HidReaderChoice,
|
|
5
|
-
} from "../utils/hid-reader-selection";
|
|
6
|
-
|
|
7
|
-
/**
|
|
8
|
-
* ONE HID READER CHOICE, SHARED BY EVERY HID SCREEN.
|
|
9
|
-
*
|
|
10
|
-
* Declared at MODULE scope on purpose. Each screen held its own `ref("")`, and
|
|
11
|
-
* because the HID screens are separate pages the ref was rebuilt on every
|
|
12
|
-
* navigation — HID Reader Users, HID Cards, Access Logs and HID QR Code each
|
|
13
|
-
* reset to the first reader no matter what had just been picked next door.
|
|
14
|
-
*
|
|
15
|
-
* A module-scoped ref is enough because moving between those pages is a ROUTE
|
|
16
|
-
* change, not a page load: the menu's items carry a `route` and
|
|
17
|
-
* `NavigationItem.vue` renders them through `:to`, so vue-router handles them
|
|
18
|
-
* and this module is never re-evaluated.
|
|
19
|
-
*
|
|
20
|
-
* Deliberately NOT persisted. `localStorage` would carry the choice through a
|
|
21
|
-
* hard refresh as well, which is a real but much smaller benefit than the
|
|
22
|
-
* navigation case, and it is worth adding only once somebody has felt the
|
|
23
|
-
* absence. See `utils/hid-reader-selection.ts` for the staleness rule that
|
|
24
|
-
* would have to hold either way.
|
|
25
|
-
*
|
|
26
|
-
* Intercom keeps its own reader and is not wired to this. Its question is which
|
|
27
|
-
* panel you are calling, not which door you are administering, and joining them
|
|
28
|
-
* would mean switching reader on Access Logs changed who you would dial.
|
|
29
|
-
*/
|
|
30
|
-
const choice = ref<HidReaderChoice>({ ...EMPTY_HID_READER_CHOICE });
|
|
31
|
-
|
|
32
|
-
export default function useHidReaderSelection() {
|
|
33
|
-
/** Remember a choice. The site travels with it; an id alone means nothing. */
|
|
34
|
-
function selectHidReader(siteId: string, readerId: string) {
|
|
35
|
-
choice.value = { siteId: String(siteId ?? ""), readerId: String(readerId ?? "") };
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
/**
|
|
39
|
-
* The reader this screen should show, given the readers it just loaded.
|
|
40
|
-
*
|
|
41
|
-
* Call it after the reader list arrives, and write the answer back with
|
|
42
|
-
* `selectHidReader` so the screens agree on what "current" means even when
|
|
43
|
-
* one of them had to fall back to the first reader.
|
|
44
|
-
*/
|
|
45
|
-
function resolveForSite(siteId: string, readers: readonly { _id?: unknown }[]) {
|
|
46
|
-
return resolveHidReaderId(siteId, readers, choice.value);
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
return { choice, selectHidReader, resolveForSite };
|
|
50
|
-
}
|
|
@@ -1,45 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* THE CATEGORY OF THE SITE THE USER IS CURRENTLY IN.
|
|
3
|
-
*
|
|
4
|
-
* One shared answer, published once by the application's layout from the site
|
|
5
|
-
* it already loaded for the switcher, and read by anything that has to behave
|
|
6
|
-
* differently on a commercial or industrial site - the business Add Tenant
|
|
7
|
-
* form, the tenant list. Publishing it rather than re-fetching it per
|
|
8
|
-
* component means no two screens can disagree about which site this is.
|
|
9
|
-
*
|
|
10
|
-
* READ FROM THE CUSTOMER-SITE RECORD, NOT THE SITE RECORD. Both carry a
|
|
11
|
-
* `category` and `customer-site.service` keeps them equal (it writes the site
|
|
12
|
-
* on create and on update), but `siteSchema` DEFAULTS the site's own copy to
|
|
13
|
-
* `commercial` - so a site created without an explicit category reads back as
|
|
14
|
-
* commercial there even when it is a residential estate. The customer-site
|
|
15
|
-
* copy has no default: it is either the category somebody chose or nothing.
|
|
16
|
-
*
|
|
17
|
-
* An empty category means "not published yet" or "never set", and every
|
|
18
|
-
* caller must behave as it did before this existed - never assume commercial
|
|
19
|
-
* from silence.
|
|
20
|
-
*/
|
|
21
|
-
const BUSINESS_SITE_CATEGORIES: string[] = ["commercial", "industrial"];
|
|
22
|
-
|
|
23
|
-
export default function useSiteCategory() {
|
|
24
|
-
const siteCategory = useState<string>("current-site-category", () => "");
|
|
25
|
-
|
|
26
|
-
function setSiteCategory(value?: string | null) {
|
|
27
|
-
siteCategory.value = typeof value === "string" ? value : "";
|
|
28
|
-
}
|
|
29
|
-
|
|
30
|
-
/**
|
|
31
|
-
* The categories whose units are LET TO A BUSINESS rather than lived in.
|
|
32
|
-
*
|
|
33
|
-
* These are the sites where a unit has an owner, an occupier and often a
|
|
34
|
-
* person in charge who is neither, so they are the sites that ask for a
|
|
35
|
-
* tenant's standing and print it back (see `OCCUPANCY_ROLE_OPTIONS`).
|
|
36
|
-
*
|
|
37
|
-
* The category never changes what the APPLICATION is called: the rail says
|
|
38
|
-
* Property Management on every site it serves.
|
|
39
|
-
*/
|
|
40
|
-
const isBusinessSite = computed(() =>
|
|
41
|
-
BUSINESS_SITE_CATEGORIES.includes(siteCategory.value),
|
|
42
|
-
);
|
|
43
|
-
|
|
44
|
-
return { siteCategory, isBusinessSite, setSiteCategory };
|
|
45
|
-
}
|
|
@@ -1,23 +0,0 @@
|
|
|
1
|
-
<template>
|
|
2
|
-
<v-container fluid>
|
|
3
|
-
<HidEnabledGate
|
|
4
|
-
:site="siteId"
|
|
5
|
-
:org="orgId"
|
|
6
|
-
message="Enable HID as a service for this site before generating a QR code."
|
|
7
|
-
>
|
|
8
|
-
<HidProfileQrCode :site="siteId" />
|
|
9
|
-
</HidEnabledGate>
|
|
10
|
-
</v-container>
|
|
11
|
-
</template>
|
|
12
|
-
|
|
13
|
-
<script setup lang="ts">
|
|
14
|
-
definePageMeta({
|
|
15
|
-
layout: "default",
|
|
16
|
-
middleware: ["01-auth", "02-org"],
|
|
17
|
-
memberOnly: true,
|
|
18
|
-
});
|
|
19
|
-
|
|
20
|
-
const route = useRoute();
|
|
21
|
-
const siteId = computed(() => String(route.params.site ?? ""));
|
|
22
|
-
const orgId = computed(() => String(route.params.org ?? ""));
|
|
23
|
-
</script>
|
|
@@ -1,190 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* WHO IS ASSIGNED TO A HID READER — the editing model behind the permissions
|
|
3
|
-
* dialog.
|
|
4
|
-
*
|
|
5
|
-
* This is the step that actually grants access. Enrolling a person gives the
|
|
6
|
-
* reader a face, a card or a PIN it can RECOGNISE; it puts nobody in the group
|
|
7
|
-
* the access rule is attached to, so a recognised person is still refused at
|
|
8
|
-
* the door (access log event 6). `PUT /sites/:siteId/permissions` is the only
|
|
9
|
-
* call in the system that writes that group membership.
|
|
10
|
-
*
|
|
11
|
-
* Two contracts make this file necessary rather than inlining the logic in the
|
|
12
|
-
* component:
|
|
13
|
-
*
|
|
14
|
-
* 1. **The PUT REPLACES the whole assignment set for the reader.** The server
|
|
15
|
-
* keeps other readers' rows and overwrites this reader's with exactly what
|
|
16
|
-
* is sent. The candidate list, however, is fetched ONE CATEGORY AT A TIME.
|
|
17
|
-
* Saving from the tab in front of you while sending only that tab's people
|
|
18
|
-
* would silently revoke every resident if you were looking at the service
|
|
19
|
-
* providers tab. So the edit state is held for the whole reader and the
|
|
20
|
-
* payload is always built from all of it.
|
|
21
|
-
*
|
|
22
|
-
* 2. **The body schema accepts three keys and nothing else.**
|
|
23
|
-
* `hidPermissionAssignmentSchema` is `{ subjectId, category, intercom }`,
|
|
24
|
-
* and Joi rejects unknown keys rather than stripping them. The candidate
|
|
25
|
-
* rows carry `name`, `subtitle`, `location` and friends for display, so the
|
|
26
|
-
* payload has to be narrowed deliberately — passing a candidate straight
|
|
27
|
-
* through is a 400.
|
|
28
|
-
*/
|
|
29
|
-
|
|
30
|
-
/** The three real categories. `intercom` is a candidate FILTER, never a category. */
|
|
31
|
-
export const HID_PERMISSION_CATEGORIES: THidPermissionCategory[] = [
|
|
32
|
-
"resident",
|
|
33
|
-
"property_management",
|
|
34
|
-
"service_provider",
|
|
35
|
-
];
|
|
36
|
-
|
|
37
|
-
export type HidAssignmentState = Map<string, { category: THidPermissionCategory; intercom: boolean }>;
|
|
38
|
-
|
|
39
|
-
/** Body row for `updateSitePermissions` — exactly the keys Joi allows. */
|
|
40
|
-
export type HidAssignmentPayload = {
|
|
41
|
-
subjectId: string;
|
|
42
|
-
category: THidPermissionCategory;
|
|
43
|
-
intercom: boolean;
|
|
44
|
-
};
|
|
45
|
-
|
|
46
|
-
function isRealCategory(value: unknown): value is THidPermissionCategory {
|
|
47
|
-
return HID_PERMISSION_CATEGORIES.includes(value as THidPermissionCategory);
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
/**
|
|
51
|
-
* The reader's CURRENT assignments, as the edit state.
|
|
52
|
-
*
|
|
53
|
-
* Seeded from `getSitePermissions`, which returns every category at once —
|
|
54
|
-
* that is what makes a whole-reader payload possible from a one-category view.
|
|
55
|
-
* Rows with an unrecognised category are dropped rather than carried: sending
|
|
56
|
-
* one back fails the enum check and takes the entire save with it.
|
|
57
|
-
*/
|
|
58
|
-
export function seedAssignments(
|
|
59
|
-
assignments: readonly THidPermissionAssignment[] | undefined | null,
|
|
60
|
-
): HidAssignmentState {
|
|
61
|
-
const state: HidAssignmentState = new Map();
|
|
62
|
-
if (!Array.isArray(assignments)) return state;
|
|
63
|
-
for (const assignment of assignments) {
|
|
64
|
-
const subjectId = String(assignment?.subjectId ?? "");
|
|
65
|
-
if (!subjectId || !isRealCategory(assignment?.category)) continue;
|
|
66
|
-
state.set(subjectId, {
|
|
67
|
-
category: assignment.category,
|
|
68
|
-
intercom: assignment.intercom === true,
|
|
69
|
-
});
|
|
70
|
-
}
|
|
71
|
-
return state;
|
|
72
|
-
}
|
|
73
|
-
|
|
74
|
-
/**
|
|
75
|
-
* Add or remove one person.
|
|
76
|
-
*
|
|
77
|
-
* `saved` is the state the dialog opened with, and it is consulted for one
|
|
78
|
-
* reason: the `intercom` flag. Nothing here edits that flag, but
|
|
79
|
-
* `userHasSiteIntercomPermission` reads it off these same rows, so it must
|
|
80
|
-
* survive a round trip through the checkbox.
|
|
81
|
-
*
|
|
82
|
-
* - **Untick then save** drops it, which is right — an unassigned person
|
|
83
|
-
* holding a dangling intercom right would keep answering the door panel
|
|
84
|
-
* after losing the door.
|
|
85
|
-
* - **Untick then re-tick, without saving** must restore it. Removing from the
|
|
86
|
-
* draft forgets the flag, so re-adding recovers it from `saved`; otherwise a
|
|
87
|
-
* misclick corrected a second later would silently revoke intercom on the
|
|
88
|
-
* next save, with nothing on screen to show it had happened.
|
|
89
|
-
*/
|
|
90
|
-
export function setAssignment(
|
|
91
|
-
state: HidAssignmentState,
|
|
92
|
-
saved: HidAssignmentState,
|
|
93
|
-
subjectId: string,
|
|
94
|
-
category: THidPermissionCategory,
|
|
95
|
-
selected: boolean,
|
|
96
|
-
): HidAssignmentState {
|
|
97
|
-
const next: HidAssignmentState = new Map(state);
|
|
98
|
-
const id = String(subjectId ?? "");
|
|
99
|
-
if (!id || !isRealCategory(category)) return next;
|
|
100
|
-
if (!selected) {
|
|
101
|
-
next.delete(id);
|
|
102
|
-
return next;
|
|
103
|
-
}
|
|
104
|
-
const intercom = next.get(id)?.intercom ?? saved.get(id)?.intercom ?? false;
|
|
105
|
-
next.set(id, { category, intercom: intercom === true });
|
|
106
|
-
return next;
|
|
107
|
-
}
|
|
108
|
-
|
|
109
|
-
/** The whole reader's assignments, narrowed to the three keys the API accepts. */
|
|
110
|
-
export function toAssignmentPayload(state: HidAssignmentState): HidAssignmentPayload[] {
|
|
111
|
-
return [...state.entries()].map(([subjectId, value]) => ({
|
|
112
|
-
subjectId,
|
|
113
|
-
category: value.category,
|
|
114
|
-
intercom: value.intercom === true,
|
|
115
|
-
}));
|
|
116
|
-
}
|
|
117
|
-
|
|
118
|
-
/**
|
|
119
|
-
* The server sends `selected` with each candidate, describing what is SAVED.
|
|
120
|
-
* Once the dialog is open the local edit state is the truth, so the flag is
|
|
121
|
-
* recomputed rather than trusted — otherwise paging or searching would redraw
|
|
122
|
-
* a row with the saved value and quietly discard an unsaved tick.
|
|
123
|
-
*/
|
|
124
|
-
export function applySelection(
|
|
125
|
-
candidates: readonly THidPermissionCandidate[] | undefined | null,
|
|
126
|
-
state: HidAssignmentState,
|
|
127
|
-
): THidPermissionCandidate[] {
|
|
128
|
-
if (!Array.isArray(candidates)) return [];
|
|
129
|
-
return candidates.map((candidate) => ({
|
|
130
|
-
...candidate,
|
|
131
|
-
selected: state.has(String(candidate?.subjectId ?? "")),
|
|
132
|
-
}));
|
|
133
|
-
}
|
|
134
|
-
|
|
135
|
-
/** Per-category totals for the dialog header, counted over the whole reader. */
|
|
136
|
-
export function countByCategory(state: HidAssignmentState): Record<THidPermissionCategory, number> {
|
|
137
|
-
const counts = { resident: 0, property_management: 0, service_provider: 0 } as Record<
|
|
138
|
-
THidPermissionCategory,
|
|
139
|
-
number
|
|
140
|
-
>;
|
|
141
|
-
for (const value of state.values()) counts[value.category] += 1;
|
|
142
|
-
return counts;
|
|
143
|
-
}
|
|
144
|
-
|
|
145
|
-
/** Has anything changed since the dialog opened? Drives the Save button. */
|
|
146
|
-
export function hasChanges(saved: HidAssignmentState, draft: HidAssignmentState): boolean {
|
|
147
|
-
if (saved.size !== draft.size) return true;
|
|
148
|
-
for (const [subjectId, value] of draft) {
|
|
149
|
-
const before = saved.get(subjectId);
|
|
150
|
-
if (!before) return true;
|
|
151
|
-
if (before.category !== value.category) return true;
|
|
152
|
-
if (before.intercom !== value.intercom) return true;
|
|
153
|
-
}
|
|
154
|
-
return false;
|
|
155
|
-
}
|
|
156
|
-
|
|
157
|
-
/**
|
|
158
|
-
* What a listing response tells us: the rows, and how many pages exist.
|
|
159
|
-
*
|
|
160
|
-
* It deliberately does NOT return the current page, and the caller must keep
|
|
161
|
-
* owning that. `paginate` in `@7365admin1/node-server-utils` returns only
|
|
162
|
-
* `{ items, pages, pageRange }` — it never echoes the page it was asked for. A
|
|
163
|
-
* caller that read one back therefore got a default on every fetch and pinned
|
|
164
|
-
* itself to page one, so the pager moved and the rows never did.
|
|
165
|
-
*
|
|
166
|
-
* `items` sits at the root on some of these endpoints and under `data` on
|
|
167
|
-
* others, so both are read.
|
|
168
|
-
*/
|
|
169
|
-
export function readCandidatePage(response: unknown): {
|
|
170
|
-
items: THidPermissionCandidate[];
|
|
171
|
-
pages: number;
|
|
172
|
-
pageRange: string;
|
|
173
|
-
} {
|
|
174
|
-
const source = (response && typeof response === "object" ? response : {}) as Record<string, unknown>;
|
|
175
|
-
const nested = (source.data && typeof source.data === "object" ? source.data : {}) as Record<string, unknown>;
|
|
176
|
-
const items = Array.isArray(source.items)
|
|
177
|
-
? source.items
|
|
178
|
-
: Array.isArray(nested.items)
|
|
179
|
-
? nested.items
|
|
180
|
-
: [];
|
|
181
|
-
const pages = Number(source.pages ?? nested.pages ?? 1);
|
|
182
|
-
// `paginate` builds this ("1-10 of 37") and the table renders it verbatim.
|
|
183
|
-
// Without it the pager draws its placeholder, "-- - -- of --".
|
|
184
|
-
const pageRange = String(source.pageRange ?? nested.pageRange ?? "");
|
|
185
|
-
return {
|
|
186
|
-
items: items as THidPermissionCandidate[],
|
|
187
|
-
pages: Number.isFinite(pages) && pages > 0 ? pages : 1,
|
|
188
|
-
pageRange,
|
|
189
|
-
};
|
|
190
|
-
}
|
|
@@ -1,52 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* WHICH HID READER THE OPERATOR IS WORKING ON — the one rule behind it.
|
|
3
|
-
*
|
|
4
|
-
* Every HID screen used to hold its own `ref("")` and default it to
|
|
5
|
-
* `readers[0]`, so picking HID 2 on HID Reader Users and clicking through to
|
|
6
|
-
* HID Cards put you back on HID 1. They are separate PAGES, so the component
|
|
7
|
-
* unmounted and the ref was rebuilt from scratch every time — there was no way
|
|
8
|
-
* to make a choice stick. "I am working on HID 2" is a mode, not a per-screen
|
|
9
|
-
* preference.
|
|
10
|
-
*
|
|
11
|
-
* Navigation between those pages is a route change rather than a page load
|
|
12
|
-
* (`NavigationItem.vue` renders the menu's `route` through `:to`), so the
|
|
13
|
-
* module-scoped ref in `useHidReaderSelection` survives it. This file holds the
|
|
14
|
-
* part worth testing: deciding whether a remembered choice may still be used.
|
|
15
|
-
*/
|
|
16
|
-
|
|
17
|
-
export type HidReaderChoice = { siteId: string; readerId: string };
|
|
18
|
-
|
|
19
|
-
/** Anything with an id — the four screens all carry a different reader shape. */
|
|
20
|
-
type ReaderLike = { _id?: unknown };
|
|
21
|
-
|
|
22
|
-
export const EMPTY_HID_READER_CHOICE: HidReaderChoice = { siteId: "", readerId: "" };
|
|
23
|
-
|
|
24
|
-
/**
|
|
25
|
-
* The reader a screen should show, given what this site actually has.
|
|
26
|
-
*
|
|
27
|
-
* A remembered id is honoured ONLY when it belongs to this site and is still in
|
|
28
|
-
* the list. That single condition covers every way it goes stale:
|
|
29
|
-
*
|
|
30
|
-
* - the operator switched site, so the id belongs to a site they have left
|
|
31
|
-
* - the reader was deleted or deactivated since they chose it
|
|
32
|
-
* - nothing has been chosen yet
|
|
33
|
-
*
|
|
34
|
-
* In all three the first reader is returned instead. The alternative — using
|
|
35
|
-
* the id anyway — sends requests for a reader the site does not own, which come
|
|
36
|
-
* back empty and read on screen as a reader with no users, no cards and no
|
|
37
|
-
* logs, rather than as the mistake it is.
|
|
38
|
-
*/
|
|
39
|
-
export function resolveHidReaderId(
|
|
40
|
-
siteId: string,
|
|
41
|
-
readers: readonly ReaderLike[] | null | undefined,
|
|
42
|
-
choice: HidReaderChoice = EMPTY_HID_READER_CHOICE,
|
|
43
|
-
): string {
|
|
44
|
-
const ids = (Array.isArray(readers) ? readers : [])
|
|
45
|
-
.map((reader) => String(reader?._id ?? ""))
|
|
46
|
-
.filter(Boolean);
|
|
47
|
-
|
|
48
|
-
if (choice.siteId === String(siteId ?? "") && ids.includes(choice.readerId)) {
|
|
49
|
-
return choice.readerId;
|
|
50
|
-
}
|
|
51
|
-
return ids[0] ?? "";
|
|
52
|
-
}
|