@iblai/iblai-js 2.62.0 → 2.62.1
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/dist/web-containers/source/analytics/analytics-audit-log-stats.js +4 -1
- package/dist/web-containers/source/analytics/analytics-audit-log-stats.js.map +1 -1
- package/dist/web-containers/source/analytics/analytics-financial-stats.js +1 -0
- package/dist/web-containers/source/analytics/analytics-financial-stats.js.map +1 -1
- package/dist/web-containers/source/analytics/analytics-transcripts-stats.js +23 -8
- package/dist/web-containers/source/analytics/analytics-transcripts-stats.js.map +1 -1
- package/dist/web-containers/source/analytics/analytics-users-stats.js +3 -1
- package/dist/web-containers/source/analytics/analytics-users-stats.js.map +1 -1
- package/dist/web-containers/source/analytics/lti-user-tooltip.js +18 -0
- package/dist/web-containers/source/analytics/lti-user-tooltip.js.map +1 -0
- package/dist/web-containers/source/analytics/use-memory.js +15 -12
- package/dist/web-containers/source/analytics/use-memory.js.map +1 -1
- package/dist/web-containers/source/analytics/user-filter-select.js +28 -6
- package/dist/web-containers/source/analytics/user-filter-select.js.map +1 -1
- package/dist/web-containers/source/analytics-audit-log-stats.js +4 -1
- package/dist/web-containers/source/analytics-audit-log-stats.js.map +1 -1
- package/dist/web-containers/source/analytics-financial-stats.js +1 -0
- package/dist/web-containers/source/analytics-financial-stats.js.map +1 -1
- package/dist/web-containers/source/analytics-transcripts-stats.js +23 -8
- package/dist/web-containers/source/analytics-transcripts-stats.js.map +1 -1
- package/dist/web-containers/source/analytics-users-stats.js +3 -1
- package/dist/web-containers/source/analytics-users-stats.js.map +1 -1
- package/dist/web-containers/source/components/analytics/analytics-audit-log-stats.js +4 -1
- package/dist/web-containers/source/components/analytics/analytics-audit-log-stats.js.map +1 -1
- package/dist/web-containers/source/components/analytics/analytics-financial-stats.js +1 -0
- package/dist/web-containers/source/components/analytics/analytics-financial-stats.js.map +1 -1
- package/dist/web-containers/source/components/analytics/analytics-transcripts-stats.js +23 -8
- package/dist/web-containers/source/components/analytics/analytics-transcripts-stats.js.map +1 -1
- package/dist/web-containers/source/components/analytics/analytics-users-stats.js +3 -1
- package/dist/web-containers/source/components/analytics/analytics-users-stats.js.map +1 -1
- package/dist/web-containers/source/components/analytics/lti-user-tooltip.js +18 -0
- package/dist/web-containers/source/components/analytics/lti-user-tooltip.js.map +1 -0
- package/dist/web-containers/source/components/analytics/use-memory.js +15 -12
- package/dist/web-containers/source/components/analytics/use-memory.js.map +1 -1
- package/dist/web-containers/source/components/analytics/user-filter-select.js +28 -6
- package/dist/web-containers/source/components/analytics/user-filter-select.js.map +1 -1
- package/dist/web-containers/source/components/modals/edit-mentor-modal/tabs/history-tab/labels.js +2 -0
- package/dist/web-containers/source/components/modals/edit-mentor-modal/tabs/history-tab/labels.js.map +1 -1
- package/dist/web-containers/source/components/modals/edit-mentor-modal/tabs/history-tab.js +20 -15
- package/dist/web-containers/source/components/modals/edit-mentor-modal/tabs/history-tab.js.map +1 -1
- package/dist/web-containers/source/edit-mentor-modal/tabs/history-tab/labels.js +2 -0
- package/dist/web-containers/source/edit-mentor-modal/tabs/history-tab/labels.js.map +1 -1
- package/dist/web-containers/source/edit-mentor-modal/tabs/history-tab.js +20 -15
- package/dist/web-containers/source/edit-mentor-modal/tabs/history-tab.js.map +1 -1
- package/dist/web-containers/source/en.json.js +9 -1
- package/dist/web-containers/source/en.json.js.map +1 -1
- package/dist/web-containers/source/es.json.js +9 -1
- package/dist/web-containers/source/es.json.js.map +1 -1
- package/dist/web-containers/source/fr.json.js +9 -1
- package/dist/web-containers/source/fr.json.js.map +1 -1
- package/dist/web-containers/source/history-tab/labels.js +2 -0
- package/dist/web-containers/source/history-tab/labels.js.map +1 -1
- package/dist/web-containers/source/history-tab.js +20 -15
- package/dist/web-containers/source/history-tab.js.map +1 -1
- package/dist/web-containers/source/i18n/messages/en.json.js +9 -1
- package/dist/web-containers/source/i18n/messages/en.json.js.map +1 -1
- package/dist/web-containers/source/i18n/messages/es.json.js +9 -1
- package/dist/web-containers/source/i18n/messages/es.json.js.map +1 -1
- package/dist/web-containers/source/i18n/messages/fr.json.js +9 -1
- package/dist/web-containers/source/i18n/messages/fr.json.js.map +1 -1
- package/dist/web-containers/source/i18n/messages/zh.json.js +9 -1
- package/dist/web-containers/source/i18n/messages/zh.json.js.map +1 -1
- package/dist/web-containers/source/lib/user-identity.js +54 -13
- package/dist/web-containers/source/lib/user-identity.js.map +1 -1
- package/dist/web-containers/source/lti-user-tooltip.js +18 -0
- package/dist/web-containers/source/lti-user-tooltip.js.map +1 -0
- package/dist/web-containers/source/messages/en.json.js +9 -1
- package/dist/web-containers/source/messages/en.json.js.map +1 -1
- package/dist/web-containers/source/messages/es.json.js +9 -1
- package/dist/web-containers/source/messages/es.json.js.map +1 -1
- package/dist/web-containers/source/messages/fr.json.js +9 -1
- package/dist/web-containers/source/messages/fr.json.js.map +1 -1
- package/dist/web-containers/source/messages/zh.json.js +9 -1
- package/dist/web-containers/source/messages/zh.json.js.map +1 -1
- package/dist/web-containers/source/modals/edit-mentor-modal/tabs/history-tab/labels.js +2 -0
- package/dist/web-containers/source/modals/edit-mentor-modal/tabs/history-tab/labels.js.map +1 -1
- package/dist/web-containers/source/modals/edit-mentor-modal/tabs/history-tab.js +20 -15
- package/dist/web-containers/source/modals/edit-mentor-modal/tabs/history-tab.js.map +1 -1
- package/dist/web-containers/source/tabs/history-tab/labels.js +2 -0
- package/dist/web-containers/source/tabs/history-tab/labels.js.map +1 -1
- package/dist/web-containers/source/tabs/history-tab.js +20 -15
- package/dist/web-containers/source/tabs/history-tab.js.map +1 -1
- package/dist/web-containers/source/tsconfig.build.tsbuildinfo +1 -1
- package/dist/web-containers/source/use-memory.js +15 -12
- package/dist/web-containers/source/use-memory.js.map +1 -1
- package/dist/web-containers/source/user-filter-select.js +28 -6
- package/dist/web-containers/source/user-filter-select.js.map +1 -1
- package/dist/web-containers/source/user-identity.js +54 -13
- package/dist/web-containers/source/user-identity.js.map +1 -1
- package/dist/web-containers/source/web-containers/tsconfig.build.tsbuildinfo +1 -1
- package/dist/web-containers/source/zh.json.js +9 -1
- package/dist/web-containers/source/zh.json.js.map +1 -1
- package/package.json +3 -3
|
@@ -16,14 +16,14 @@ const formatDate = (date) => date ? date.toISOString().split('T')[0] : undefined
|
|
|
16
16
|
function isForbiddenError(error) {
|
|
17
17
|
return !!error && 'status' in error && error.status === 403;
|
|
18
18
|
}
|
|
19
|
-
function toRowFromMentorMemory(memory,
|
|
19
|
+
function toRowFromMentorMemory(memory, identity) {
|
|
20
20
|
var _a, _b, _c, _d, _e, _f;
|
|
21
21
|
return {
|
|
22
22
|
id: memory.id,
|
|
23
23
|
content: memory.content,
|
|
24
24
|
categoryName: (_b = (_a = memory.category) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : null,
|
|
25
25
|
categorySlug: (_d = (_c = memory.category) === null || _c === void 0 ? void 0 : _c.slug) !== null && _d !== void 0 ? _d : null,
|
|
26
|
-
learner: resolveUserIdentity(memory,
|
|
26
|
+
learner: resolveUserIdentity(memory, identity).label,
|
|
27
27
|
username: memory.username,
|
|
28
28
|
email: memory.email || null,
|
|
29
29
|
mentorId: (_e = memory.mentor_id) !== null && _e !== void 0 ? _e : null,
|
|
@@ -33,13 +33,13 @@ function toRowFromMentorMemory(memory, anonymousLabel) {
|
|
|
33
33
|
createdAt: memory.created_at,
|
|
34
34
|
};
|
|
35
35
|
}
|
|
36
|
-
function toRowFromGlobalMemory(memory,
|
|
36
|
+
function toRowFromGlobalMemory(memory, identity) {
|
|
37
37
|
return {
|
|
38
38
|
id: memory.id,
|
|
39
39
|
content: memory.content,
|
|
40
40
|
categoryName: null,
|
|
41
41
|
categorySlug: null,
|
|
42
|
-
learner: resolveUserIdentity(memory,
|
|
42
|
+
learner: resolveUserIdentity(memory, identity).label,
|
|
43
43
|
username: memory.username,
|
|
44
44
|
email: null,
|
|
45
45
|
mentorId: null,
|
|
@@ -144,17 +144,20 @@ const useMemory = ({ tenantKey, userId, mentorId, myMemory = false, }) => {
|
|
|
144
144
|
const { data: globalMemories, isLoading: isLoadingGlobal, isFetching: isFetchingGlobal, error: globalError, } = useGetGlobalMemoriesQuery({ org: tenantKey, userId, params: globalParams }, { skip: !hasIdentity || !isGlobalScope });
|
|
145
145
|
const { data: adminCategories } = useGetMemoryCategoriesAdminQuery({ org: tenantKey, mentorId: mentorId !== null && mentorId !== void 0 ? mentorId : '' }, { skip: !tenantKey || !hasMentor });
|
|
146
146
|
const t = useT();
|
|
147
|
-
// The learner
|
|
147
|
+
// The learner labels when a memory names nobody — the same translated words
|
|
148
148
|
// the other analytics tabs use.
|
|
149
|
-
const
|
|
149
|
+
const identity = useMemo(() => ({
|
|
150
|
+
anonymousLabel: t('analyticsAnalyticsMemoryStats.anonymous'),
|
|
151
|
+
ltiUserLabel: t('analyticsAnalyticsMemoryStats.ltiUser'),
|
|
152
|
+
}), [t]);
|
|
150
153
|
const rows = useMemo(() => {
|
|
151
154
|
var _a, _b, _c;
|
|
152
155
|
if (isMentorScope)
|
|
153
|
-
return ((_a = mentorList === null || mentorList === void 0 ? void 0 : mentorList.results) !== null && _a !== void 0 ? _a : []).map((memory) => toRowFromMentorMemory(memory,
|
|
156
|
+
return ((_a = mentorList === null || mentorList === void 0 ? void 0 : mentorList.results) !== null && _a !== void 0 ? _a : []).map((memory) => toRowFromMentorMemory(memory, identity));
|
|
154
157
|
if (isAllMentorsScope)
|
|
155
|
-
return ((_b = allMentors === null || allMentors === void 0 ? void 0 : allMentors.results) !== null && _b !== void 0 ? _b : []).map((memory) => toRowFromMentorMemory(memory,
|
|
156
|
-
return ((_c = globalMemories === null || globalMemories === void 0 ? void 0 : globalMemories.results) !== null && _c !== void 0 ? _c : []).map((memory) => toRowFromGlobalMemory(memory,
|
|
157
|
-
}, [isMentorScope, isAllMentorsScope, mentorList, allMentors, globalMemories,
|
|
158
|
+
return ((_b = allMentors === null || allMentors === void 0 ? void 0 : allMentors.results) !== null && _b !== void 0 ? _b : []).map((memory) => toRowFromMentorMemory(memory, identity));
|
|
159
|
+
return ((_c = globalMemories === null || globalMemories === void 0 ? void 0 : globalMemories.results) !== null && _c !== void 0 ? _c : []).map((memory) => toRowFromGlobalMemory(memory, identity));
|
|
160
|
+
}, [isMentorScope, isAllMentorsScope, mentorList, allMentors, globalMemories, identity]);
|
|
158
161
|
const totalCount = useMemo(() => {
|
|
159
162
|
var _a, _b, _c;
|
|
160
163
|
if (isMentorScope)
|
|
@@ -177,7 +180,7 @@ const useMemory = ({ tenantKey, userId, mentorId, myMemory = false, }) => {
|
|
|
177
180
|
let totalMemories = 0;
|
|
178
181
|
const categories = groups.map((group) => {
|
|
179
182
|
group.memories.forEach((memory) => {
|
|
180
|
-
learners.add(resolveUserIdentity(memory,
|
|
183
|
+
learners.add(resolveUserIdentity(memory, identity).label);
|
|
181
184
|
if (memory.is_auto_generated)
|
|
182
185
|
autoCaptured += 1;
|
|
183
186
|
});
|
|
@@ -194,7 +197,7 @@ const useMemory = ({ tenantKey, userId, mentorId, myMemory = false, }) => {
|
|
|
194
197
|
learners: learners.size,
|
|
195
198
|
categories: categories.sort((a, b) => b.count - a.count),
|
|
196
199
|
};
|
|
197
|
-
}, [isMentorScope, mentorGrouped, categoryFilter,
|
|
200
|
+
}, [isMentorScope, mentorGrouped, categoryFilter, identity]);
|
|
198
201
|
const error = isMentorScope ? mentorListError : isAllMentorsScope ? allMentorsError : globalError;
|
|
199
202
|
const isLoading = isMentorScope
|
|
200
203
|
? isLoadingMentorList || isLoadingMentorGrouped
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-memory.js","sources":["../../../../../../../src/components/analytics/use-memory.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;AAiIA;;;;AAIG;AACI,MAAM,gBAAgB,GAAG;AAEhC;AACO,MAAM,cAAc,GAAG;AAE9B,MAAM,UAAU,GAAG,CAAC,IAAsB,KACxC,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS;AAErD,SAAS,gBAAgB,CAAC,KAAwD,EAAA;AAChF,IAAA,OAAO,CAAC,CAAC,KAAK,IAAI,QAAQ,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG;AAC7D;AAEA,SAAS,qBAAqB,CAC5B,MAAwC,EACxC,
|
|
1
|
+
{"version":3,"file":"use-memory.js","sources":["../../../../../../../src/components/analytics/use-memory.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;AAiIA;;;;AAIG;AACI,MAAM,gBAAgB,GAAG;AAEhC;AACO,MAAM,cAAc,GAAG;AAE9B,MAAM,UAAU,GAAG,CAAC,IAAsB,KACxC,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS;AAErD,SAAS,gBAAgB,CAAC,KAAwD,EAAA;AAChF,IAAA,OAAO,CAAC,CAAC,KAAK,IAAI,QAAQ,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG;AAC7D;AAEA,SAAS,qBAAqB,CAC5B,MAAwC,EACxC,QAA6B,EAAA;;IAE7B,OAAO;QACL,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,YAAY,EAAE,MAAA,CAAA,EAAA,GAAA,MAAM,CAAC,QAAQ,MAAA,IAAA,IAAA,EAAA,KAAA,MAAA,GAAA,MAAA,GAAA,EAAA,CAAE,IAAI,MAAA,IAAA,IAAA,EAAA,KAAA,MAAA,GAAA,EAAA,GAAI,IAAI;QAC3C,YAAY,EAAE,MAAA,CAAA,EAAA,GAAA,MAAM,CAAC,QAAQ,MAAA,IAAA,IAAA,EAAA,KAAA,MAAA,GAAA,MAAA,GAAA,EAAA,CAAE,IAAI,MAAA,IAAA,IAAA,EAAA,KAAA,MAAA,GAAA,EAAA,GAAI,IAAI;QAC3C,OAAO,EAAE,mBAAmB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,KAAK;QACpD,QAAQ,EAAE,MAAM,CAAC,QAAQ;AACzB,QAAA,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,IAAI;AAC3B,QAAA,QAAQ,EAAE,CAAA,EAAA,GAAA,MAAM,CAAC,SAAS,mCAAI,IAAI;AAClC,QAAA,UAAU,EAAE,aAAa,IAAI,MAAM,IAAI,CAAA,EAAA,GAAA,MAAM,CAAC,WAAW,MAAA,IAAA,IAAA,EAAA,KAAA,MAAA,GAAA,EAAA,GAAI,IAAI,IAAI,IAAI;QACzE,eAAe,EAAE,MAAM,CAAC,iBAAiB;QACzC,eAAe,EAAE,MAAM,CAAC,iBAAiB;QACzC,SAAS,EAAE,MAAM,CAAC,UAAU;KAC7B;AACH;AAEA,SAAS,qBAAqB,CAAC,MAAoB,EAAE,QAA6B,EAAA;IAChF,OAAO;QACL,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,OAAO,EAAE,MAAM,CAAC,OAAO;AACvB,QAAA,YAAY,EAAE,IAAI;AAClB,QAAA,YAAY,EAAE,IAAI;QAClB,OAAO,EAAE,mBAAmB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,KAAK;QACpD,QAAQ,EAAE,MAAM,CAAC,QAAQ;AACzB,QAAA,KAAK,EAAE,IAAI;AACX,QAAA,QAAQ,EAAE,IAAI;AACd,QAAA,UAAU,EAAE,IAAI;QAChB,eAAe,EAAE,MAAM,CAAC,iBAAiB;QACzC,eAAe,EAAE,MAAM,CAAC,iBAAiB;QACzC,SAAS,EAAE,MAAM,CAAC,UAAU;KAC7B;AACH;AAEA;;;;;;;AAOG;AACI,MAAM,SAAS,GAAG,CAAC,EACxB,SAAS,EACT,MAAM,EACN,QAAQ,EACR,QAAQ,GAAG,KAAK,GACF,KAAqB;AACnC,IAAA,MAAM,SAAS,GAAG,CAAC,CAAC,QAAQ;;;;;;AAO5B,IAAA,MAAM,eAAe,GAAG,OAAO,CAC7B,OAAO,SAAS,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC,EACpE,CAAC,SAAS,CAAC,CACZ;IAED,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAc,QAAQ,CAAC;IACzD,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC;IACnC,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC;IACtD,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,QAAQ,CAAC,cAAc,CAAC;IACpE,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC;IACtD,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAA8B,SAAS,CAAC;;;IAIlF,SAAS,CAAC,MAAK;QACb,iBAAiB,CAAC,cAAc,CAAC;AACnC,IAAA,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;;;;IAKd,SAAS,CAAC,MAAK;AACb,QAAA,IAAI,CAAC,SAAS,IAAI,KAAK,KAAK,QAAQ;YAAE,QAAQ,CAAC,aAAa,CAAC;AAC7D,QAAA,IAAI,SAAS,IAAI,KAAK,KAAK,aAAa;YAAE,QAAQ,CAAC,QAAQ,CAAC;AAC9D,IAAA,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;;;;IAKtB,SAAS,CAAC,MAAK;QACb,IAAI,KAAK,KAAK,QAAQ;YAAE,iBAAiB,CAAC,cAAc,CAAC;AAC3D,IAAA,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;;;IAIX,SAAS,CAAC,MAAK;QACb,OAAO,CAAC,CAAC,CAAC;AACZ,IAAA,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;AAEpE,IAAA,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,KAAA,IAAA,IAAT,SAAS,KAAA,MAAA,GAAA,MAAA,GAAT,SAAS,CAAE,IAAI,CAAC;AAC7C,IAAA,MAAM,OAAO,GAAG,UAAU,CAAC,SAAS,KAAA,IAAA,IAAT,SAAS,KAAA,MAAA,GAAA,MAAA,GAAT,SAAS,CAAE,EAAE,CAAC;AAEzC,IAAA,MAAM,aAAa,GAAG,KAAK,KAAK,QAAQ,IAAI,SAAS;AACrD,IAAA,MAAM,iBAAiB,GAAG,KAAK,KAAK,aAAa;AACjD,IAAA,MAAM,aAAa,GAAG,KAAK,KAAK,QAAQ;IAExC,MAAM,WAAW,GAAG,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,MAAM;AAE3C,IAAA,MAAM,gBAAgB,GAAG,OAAO,CAC9B,OAAO;QACL,IAAI;AACJ,QAAA,SAAS,EAAE,gBAAgB;AAC3B,QAAA,IAAI,cAAc,KAAK,cAAc,GAAG,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,EAAE,CAAC;AAC1E,QAAA,IAAI,aAAa,GAAG,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC;AACpD,QAAA,IAAI,SAAS,GAAG,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC;AAC/C,QAAA,IAAI,OAAO,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;AACzC,QAAA,IAAI,QAAQ,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;AACzC,KAAA,CAAC,EACF,CAAC,IAAI,EAAE,cAAc,EAAE,aAAa,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,CACpE;IAED,MAAM,EACJ,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,mBAAmB,EAC9B,UAAU,EAAE,oBAAoB,EAChC,KAAK,EAAE,eAAe,GACvB,GAAG,6BAA6B,CAC/B,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,KAAA,IAAA,IAAR,QAAQ,KAAA,MAAA,GAAR,QAAQ,GAAI,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAC9E,EAAE,IAAI,EAAE,CAAC,WAAW,IAAI,CAAC,aAAa,EAAE,CACzC;;;;AAKD,IAAA,MAAM,oBAAoB,GAAG,OAAO,CAClC,OAAO;AACL,QAAA,IAAI,aAAa,GAAG,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC;AACpD,QAAA,IAAI,SAAS,GAAG,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC;AAC/C,QAAA,IAAI,OAAO,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;AACzC,QAAA,IAAI,QAAQ,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;KACzC,CAAC,EACF,CAAC,aAAa,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,CAC9C;IAED,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,sBAAsB,EAAE,GAAG,yBAAyB,CAC1F,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,aAAR,QAAQ,KAAA,MAAA,GAAR,QAAQ,GAAI,EAAE,EAAE,MAAM,EAAE,oBAAoB,EAAE,EAClF,EAAE,IAAI,EAAE,CAAC,WAAW,IAAI,CAAC,aAAa,EAAE,CACzC;;;AAID,IAAA,MAAM,gBAAgB,GAAG,OAAO,CAC9B,OAAO;QACL,IAAI;AACJ,QAAA,SAAS,EAAE,gBAAgB;AAC3B,QAAA,IAAI,aAAa,GAAG,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC;AACpD,QAAA,IAAI,SAAS,GAAG,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC;AAC/C,QAAA,IAAI,OAAO,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;KAC1C,CAAC,EACF,CAAC,IAAI,EAAE,aAAa,EAAE,SAAS,EAAE,OAAO,CAAC,CAC1C;AAED,IAAA,MAAM,EACJ,IAAI,EAAE,UAAU,EAChB,SAAS,EAAE,mBAAmB,EAC9B,UAAU,EAAE,oBAAoB,EAChC,KAAK,EAAE,eAAe,GACvB,GAAG,4BAA4B,CAC9B,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,EACpD,EAAE,IAAI,EAAE,CAAC,WAAW,IAAI,CAAC,iBAAiB,EAAE,CAC7C;AAED,IAAA,MAAM,YAAY,GAAG,OAAO,CAC1B,OAAO;QACL,IAAI;AACJ,QAAA,SAAS,EAAE,gBAAgB;AAC3B,QAAA,IAAI,aAAa,GAAG,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC;AACpD,QAAA,IAAI,aAAa,GAAG,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC;AACpD,QAAA,IAAI,SAAS,GAAG,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC;AAC/C,QAAA,IAAI,OAAO,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;AAC1C,KAAA,CAAC,EACF,CAAC,IAAI,EAAE,aAAa,EAAE,aAAa,EAAE,SAAS,EAAE,OAAO,CAAC,CACzD;AAED,IAAA,MAAM,EACJ,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,eAAe,EAC1B,UAAU,EAAE,gBAAgB,EAC5B,KAAK,EAAE,WAAW,GACnB,GAAG,yBAAyB,CAC3B,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,EAChD,EAAE,IAAI,EAAE,CAAC,WAAW,IAAI,CAAC,aAAa,EAAE,CACzC;AAED,IAAA,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,GAAG,gCAAgC,CAChE,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,KAAA,IAAA,IAAR,QAAQ,KAAA,MAAA,GAAR,QAAQ,GAAI,EAAE,EAAE,EAC5C,EAAE,IAAI,EAAE,CAAC,SAAS,IAAI,CAAC,SAAS,EAAE,CACnC;AAED,IAAA,MAAM,CAAC,GAAG,IAAI,EAAE;;;AAGhB,IAAA,MAAM,QAAQ,GAAG,OAAO,CACtB,OAAO;AACL,QAAA,cAAc,EAAE,CAAC,CAAC,yCAAyC,CAAC;AAC5D,QAAA,YAAY,EAAE,CAAC,CAAC,uCAAuC,CAAC;AACzD,KAAA,CAAC,EACF,CAAC,CAAC,CAAC,CACJ;AAED,IAAA,MAAM,IAAI,GAAG,OAAO,CAAc,MAAK;;AACrC,QAAA,IAAI,aAAa;YACf,OAAO,CAAC,CAAA,EAAA,GAAA,UAAU,KAAA,IAAA,IAAV,UAAU,KAAA,MAAA,GAAA,MAAA,GAAV,UAAU,CAAE,OAAO,MAAA,IAAA,IAAA,EAAA,KAAA,MAAA,GAAA,EAAA,GAAI,EAAE,EAAE,GAAG,CAAC,CAAC,MAAM,KAAK,qBAAqB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AAC7F,QAAA,IAAI,iBAAiB;YACnB,OAAO,CAAC,CAAA,EAAA,GAAA,UAAU,KAAA,IAAA,IAAV,UAAU,KAAA,MAAA,GAAA,MAAA,GAAV,UAAU,CAAE,OAAO,MAAA,IAAA,IAAA,EAAA,KAAA,MAAA,GAAA,EAAA,GAAI,EAAE,EAAE,GAAG,CAAC,CAAC,MAAM,KAAK,qBAAqB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC7F,OAAO,CAAC,CAAA,EAAA,GAAA,cAAc,KAAA,IAAA,IAAd,cAAc,KAAA,MAAA,GAAA,MAAA,GAAd,cAAc,CAAE,OAAO,MAAA,IAAA,IAAA,EAAA,KAAA,MAAA,GAAA,EAAA,GAAI,EAAE,EAAE,GAAG,CAAC,CAAC,MAAM,KAAK,qBAAqB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AACjG,IAAA,CAAC,EAAE,CAAC,aAAa,EAAE,iBAAiB,EAAE,UAAU,EAAE,UAAU,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAC;AAExF,IAAA,MAAM,UAAU,GAAG,OAAO,CAAC,MAAK;;AAC9B,QAAA,IAAI,aAAa;YAAE,OAAO,CAAA,EAAA,GAAA,UAAU,KAAA,IAAA,IAAV,UAAU,KAAA,MAAA,GAAA,MAAA,GAAV,UAAU,CAAE,KAAK,MAAA,IAAA,IAAA,EAAA,KAAA,MAAA,GAAA,EAAA,GAAI,CAAC;AAChD,QAAA,IAAI,iBAAiB;YAAE,OAAO,CAAA,EAAA,GAAA,UAAU,KAAA,IAAA,IAAV,UAAU,KAAA,MAAA,GAAA,MAAA,GAAV,UAAU,CAAE,KAAK,MAAA,IAAA,IAAA,EAAA,KAAA,MAAA,GAAA,EAAA,GAAI,CAAC;QACpD,OAAO,CAAA,EAAA,GAAA,cAAc,KAAA,IAAA,IAAd,cAAc,KAAA,MAAA,GAAA,MAAA,GAAd,cAAc,CAAE,KAAK,MAAA,IAAA,IAAA,EAAA,KAAA,MAAA,GAAA,EAAA,GAAI,CAAC;AACnC,IAAA,CAAC,EAAE,CAAC,aAAa,EAAE,iBAAiB,EAAE,UAAU,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC;;;;AAK9E,IAAA,MAAM,UAAU,GAAG,OAAO,CAA0B,MAAK;AACvD,QAAA,IAAI,CAAC,aAAa,IAAI,CAAC,aAAa;AAAE,YAAA,OAAO,IAAI;AAEjD,QAAA,MAAM,MAAM,GACV,cAAc,KAAK;AACjB,cAAE;AACF,cAAE,aAAa,CAAC,MAAM,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,QAAQ,CAAC,IAAI,KAAK,cAAc,CAAC;AAE7E,QAAA,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAU;QAClC,IAAI,YAAY,GAAG,CAAC;QACpB,IAAI,aAAa,GAAG,CAAC;QAErB,MAAM,UAAU,GAA8B,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,KAAI;YACjE,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,MAAM,KAAI;AAChC,gBAAA,QAAQ,CAAC,GAAG,CAAC,mBAAmB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,KAAK,CAAC;gBACzD,IAAI,MAAM,CAAC,iBAAiB;oBAAE,YAAY,IAAI,CAAC;AACjD,YAAA,CAAC,CAAC;AACF,YAAA,aAAa,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM;YACtC,OAAO;AACL,gBAAA,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI;AACzB,gBAAA,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI;AACzB,gBAAA,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,MAAM;aAC7B;AACH,QAAA,CAAC,CAAC;QAEF,OAAO;YACL,aAAa;YACb,YAAY;YACZ,QAAQ,EAAE,QAAQ,CAAC,IAAI;AACvB,YAAA,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;SACzD;IACH,CAAC,EAAE,CAAC,aAAa,EAAE,aAAa,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAC;AAE5D,IAAA,MAAM,KAAK,GAAG,aAAa,GAAG,eAAe,GAAG,iBAAiB,GAAG,eAAe,GAAG,WAAW;IAEjG,MAAM,SAAS,GAAG;UACd,mBAAmB,IAAI;AACzB,UAAE;AACA,cAAE;cACA,eAAe;IAErB,MAAM,UAAU,GAAG;AACjB,UAAE;AACF,UAAE;AACA,cAAE;cACA,gBAAgB;IAEtB,OAAO;QACL,KAAK;QACL,QAAQ;QACR,eAAe;QACf,IAAI;QACJ,UAAU;QACV,UAAU;AACV,QAAA,UAAU,EAAE,eAAe,KAAA,IAAA,IAAf,eAAe,KAAA,MAAA,GAAf,eAAe,GAAI,EAAE;QACjC,SAAS;QACT,UAAU;QACV,KAAK;AACL,QAAA,WAAW,EAAE,gBAAgB,CAAC,KAAK,CAAC;QACpC,IAAI;QACJ,OAAO;QACP,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,gBAAgB,CAAC;AACpD,QAAA,QAAQ,EAAE,gBAAgB;QAC1B,aAAa;QACb,gBAAgB;QAChB,cAAc;QACd,iBAAiB;QACjB,aAAa;QACb,gBAAgB;QAChB,SAAS;QACT,YAAY;KACb;AACH;;;;"}
|
|
@@ -6,6 +6,8 @@ import { useCurrentTenant, selectRbacPermissions, isPureWatcher } from '@iblai/w
|
|
|
6
6
|
import { useT } from '../../i18n/context.js';
|
|
7
7
|
import '../../packages/i18n/dist/index.esm.js';
|
|
8
8
|
import { cn } from '../../lib/utils.js';
|
|
9
|
+
import { isLtiPlaceholderEmail } from '../../lib/user-identity.js';
|
|
10
|
+
import { LtiUserTooltip } from './lti-user-tooltip.js';
|
|
9
11
|
import { Button } from '../ui/button.js';
|
|
10
12
|
import { Popover, PopoverTrigger, PopoverContent } from '../ui/popover.js';
|
|
11
13
|
import { Command, CommandInput, CommandList, CommandGroup, CommandItem } from '../ui/command.js';
|
|
@@ -22,14 +24,29 @@ const SELF_VALUE = '__self__';
|
|
|
22
24
|
* whose memories would then come back 403.
|
|
23
25
|
*/
|
|
24
26
|
const MEMORY_LIST_ACTION = 'Ibl.Mentor/Memory/list';
|
|
27
|
+
/**
|
|
28
|
+
* The address edX mints for an LTI launch with no email claim, which means the
|
|
29
|
+
* LMS sent none. Never a label — the row reads "LTI User" and offers it on hover.
|
|
30
|
+
*/
|
|
31
|
+
const ltiPlaceholder = (user) => {
|
|
32
|
+
var _a, _b;
|
|
33
|
+
const email = (_b = (_a = user.email) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : '';
|
|
34
|
+
return email && isLtiPlaceholderEmail(email) ? email : undefined;
|
|
35
|
+
};
|
|
36
|
+
/** The address worth showing as a label. */
|
|
37
|
+
const shownEmail = (user) => {
|
|
38
|
+
var _a, _b;
|
|
39
|
+
const email = (_b = (_a = user.email) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : '';
|
|
40
|
+
return email && !isLtiPlaceholderEmail(email) ? email : '';
|
|
41
|
+
};
|
|
25
42
|
/** Most recognizable label first: full name, then email, then username. */
|
|
26
|
-
const primaryLabel = (user) => { var _a
|
|
43
|
+
const primaryLabel = (user, ltiUserLabel) => { var _a; return ((_a = user.name) === null || _a === void 0 ? void 0 : _a.trim()) || shownEmail(user) || (ltiPlaceholder(user) ? ltiUserLabel : user.username); };
|
|
27
44
|
/** The next identifier down, so two users sharing a name stay distinguishable. */
|
|
28
45
|
const secondaryLabel = (user) => {
|
|
29
|
-
var _a
|
|
46
|
+
var _a;
|
|
30
47
|
if ((_a = user.name) === null || _a === void 0 ? void 0 : _a.trim())
|
|
31
|
-
return (
|
|
32
|
-
return (
|
|
48
|
+
return shownEmail(user) || user.username;
|
|
49
|
+
return shownEmail(user) || ltiPlaceholder(user) ? user.username : '';
|
|
33
50
|
};
|
|
34
51
|
function useDebouncedValue(value, delay) {
|
|
35
52
|
const [debounced, setDebounced] = useState(value);
|
|
@@ -131,13 +148,18 @@ function UserFilterSelect({ tenantKey, currentUsername, value, onChange, showSel
|
|
|
131
148
|
// A value set from outside (e.g. the Cost table's "View traces" hand-off)
|
|
132
149
|
// has no picked row; it resolves once the list holds it, else stays a username.
|
|
133
150
|
const selectedLabelUser = (selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.username) === value ? selectedUser : users.find((user) => user.username === value);
|
|
134
|
-
const
|
|
151
|
+
const ltiUserLabel = t('analyticsUserFilterSelect.ltiUser');
|
|
152
|
+
const triggerLabel = value
|
|
153
|
+
? selectedLabelUser
|
|
154
|
+
? primaryLabel(selectedLabelUser, ltiUserLabel)
|
|
155
|
+
: value
|
|
156
|
+
: '';
|
|
135
157
|
return (jsxs(Popover, { open: open, onOpenChange: setOpen, children: [jsx(PopoverTrigger, { asChild: true, children: jsxs(Button, { variant: "outline", role: "combobox", "aria-expanded": open, "aria-label": t('analyticsUserFilterSelect.filterByUser'), className: cn('h-9 w-full justify-between bg-white font-normal', className), children: [jsx("span", { className: "truncate", children: triggerLabel ||
|
|
136
158
|
t(showSelfOption
|
|
137
159
|
? 'analyticsUserFilterSelect.you'
|
|
138
160
|
: 'analyticsUserFilterSelect.allUsers') }), jsx(ChevronsUpDown, { className: "ml-2 h-4 w-4 shrink-0 opacity-50" })] }) }), jsx(PopoverContent, { "data-iblai-dialog-interaction-layer": true, className: "z-[60] w-[280px] p-0", align: "start", children: jsxs(Command, { shouldFilter: false, children: [jsx(CommandInput, { value: search, onValueChange: setSearch, placeholder: t('analyticsUserFilterSelect.searchPlaceholder') }), jsxs(CommandList, { children: [jsxs(CommandGroup, { children: [showSelfOption && (jsxs(CommandItem, { value: SELF_VALUE, onSelect: () => handleSelect(null), children: [jsx(Check, { className: cn('mr-2 h-4 w-4', value ? 'opacity-0' : 'opacity-100') }), t('analyticsUserFilterSelect.you')] })), users.map((user) => (jsxs(CommandItem, {
|
|
139
161
|
// cmdk keys items by value; the search itself is server-side.
|
|
140
|
-
value: user.username, onSelect: () => handleSelect(user), children: [jsx(Check, { className: cn('mr-2 h-4 w-4', value === user.username ? 'opacity-100' : 'opacity-0') }), jsxs("div", { className: "flex min-w-0 flex-col", children: [jsx("span", { className: "truncate font-medium", children: primaryLabel(user) }), secondaryLabel(user) && (jsx("span", { className: "truncate text-xs text-gray-500", children: secondaryLabel(user) }))] })] }, user.key)))] }), isFetching && (jsx("div", { className: "px-3 py-4 text-center text-sm text-gray-500", children: t('analyticsUserFilterSelect.loadingUsers') })), !isFetching && users.length === 0 && (jsx("div", { className: "px-3 py-4 text-center text-sm text-gray-500", children: t('analyticsUserFilterSelect.noUsersFound') }))] })] }) })] }));
|
|
162
|
+
value: user.username, onSelect: () => handleSelect(user), children: [jsx(Check, { className: cn('mr-2 h-4 w-4', value === user.username ? 'opacity-100' : 'opacity-0') }), jsxs("div", { className: "flex min-w-0 flex-col", children: [jsx(LtiUserTooltip, { email: ltiPlaceholder(user), children: jsx("span", { className: "truncate font-medium", children: primaryLabel(user, ltiUserLabel) }) }), secondaryLabel(user) && (jsx("span", { className: "truncate text-xs text-gray-500", children: secondaryLabel(user) }))] })] }, user.key)))] }), isFetching && (jsx("div", { className: "px-3 py-4 text-center text-sm text-gray-500", children: t('analyticsUserFilterSelect.loadingUsers') })), !isFetching && users.length === 0 && (jsx("div", { className: "px-3 py-4 text-center text-sm text-gray-500", children: t('analyticsUserFilterSelect.noUsersFound') }))] })] }) })] }));
|
|
141
163
|
}
|
|
142
164
|
|
|
143
165
|
export { UserFilterSelect };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-filter-select.js","sources":["../../../../../../../src/components/analytics/user-filter-select.tsx"],"sourcesContent":[null],"names":["_jsxs","_jsx"],"mappings":"
|
|
1
|
+
{"version":3,"file":"user-filter-select.js","sources":["../../../../../../../src/components/analytics/user-filter-select.tsx"],"sourcesContent":[null],"names":["_jsxs","_jsx"],"mappings":"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"}
|
|
@@ -29,8 +29,7 @@ const identityKey = (value) => (value !== null && value !== void 0 ? value : '')
|
|
|
29
29
|
* Many payloads fill the name field with the username ("conradmugabe" →
|
|
30
30
|
* "Conrad Mugabe", "fayyaz_4_ibleducation_com"), which tells an admin nothing
|
|
31
31
|
* the email does not. A name that matches none of the usernames on the record
|
|
32
|
-
* is the most recognisable thing on it
|
|
33
|
-
* minted `<opaque-id>@edx-lti-1p3.com` address and username identify nobody.
|
|
32
|
+
* is the most recognisable thing on it.
|
|
34
33
|
*/
|
|
35
34
|
function hasDistinctName(name, ...usernames) {
|
|
36
35
|
const key = identityKey(name);
|
|
@@ -39,6 +38,19 @@ function hasDistinctName(name, ...usernames) {
|
|
|
39
38
|
return usernames.every((username) => key !== identityKey(username));
|
|
40
39
|
}
|
|
41
40
|
const DEFAULT_ANONYMOUS_LABEL = 'Anonymous';
|
|
41
|
+
const DEFAULT_LTI_USER_LABEL = 'LTI User';
|
|
42
|
+
/**
|
|
43
|
+
* The address edX mints for an LTI 1.3 launch that carried no email claim
|
|
44
|
+
* (`LTI_EMAIL_SUFFIX` in the backend's `core/models/users.py`). The backend
|
|
45
|
+
* already swaps in the real address when the LMS sent one, so a placeholder
|
|
46
|
+
* that reaches a client means the LMS provided nothing: it names nobody, and
|
|
47
|
+
* neither does the username minted beside it (the same opaque id). Both are
|
|
48
|
+
* treated as absent, so such a learner reads as the LTI-user label unless the
|
|
49
|
+
* launch carried a real name; the address itself is handed back as
|
|
50
|
+
* `ltiPlaceholderEmail` for a hover hint.
|
|
51
|
+
*/
|
|
52
|
+
const LTI_PLACEHOLDER_EMAIL_SUFFIX = '@edx-lti-1p3.com';
|
|
53
|
+
const isLtiPlaceholderEmail = (value) => value.trim().toLowerCase().endsWith(LTI_PLACEHOLDER_EMAIL_SUFFIX);
|
|
42
54
|
/** Values backends emit instead of "nothing". Compared case-insensitively. */
|
|
43
55
|
const PLACEHOLDERS = new Set([
|
|
44
56
|
'',
|
|
@@ -97,7 +109,9 @@ const nested = (source) => source.user && typeof source.user === 'object' ? sour
|
|
|
97
109
|
* - `profileUsername`: the first *platform* username (never an LTI claim).
|
|
98
110
|
*
|
|
99
111
|
* A string source is treated as an email when it looks like one, else as a
|
|
100
|
-
* username. Placeholder strings ("None", "-", "anonymous"…) count as absent
|
|
112
|
+
* username. Placeholder strings ("None", "-", "anonymous"…) count as absent,
|
|
113
|
+
* and so do the address and username edX mints for an LTI launch with no email
|
|
114
|
+
* claim (see {@link isLtiPlaceholderEmail}).
|
|
101
115
|
*
|
|
102
116
|
* The default order flips to name → email → username when the record carries a
|
|
103
117
|
* real name (see {@link hasDistinctName}): "Joseph Oti" is more use to an admin
|
|
@@ -107,19 +121,44 @@ const nested = (source) => source.user && typeof source.user === 'object' ? sour
|
|
|
107
121
|
function resolveUserIdentity(source, options = {}) {
|
|
108
122
|
var _a, _b;
|
|
109
123
|
const anonymousLabel = options.anonymousLabel || DEFAULT_ANONYMOUS_LABEL;
|
|
124
|
+
const ltiUserLabel = options.ltiUserLabel || DEFAULT_LTI_USER_LABEL;
|
|
110
125
|
const order = ((_a = options.order) === null || _a === void 0 ? void 0 : _a.length) ? options.order : DEFAULT_USER_IDENTITY_ORDER;
|
|
111
126
|
const record = source && typeof source === 'object' ? source : { user: source !== null && source !== void 0 ? source : null };
|
|
112
127
|
const inner = nested(record);
|
|
128
|
+
const emailCandidates = [
|
|
129
|
+
record.lti_email,
|
|
130
|
+
record.email,
|
|
131
|
+
record.user_email,
|
|
132
|
+
inner === null || inner === void 0 ? void 0 : inner.lti_email,
|
|
133
|
+
inner === null || inner === void 0 ? void 0 : inner.email,
|
|
134
|
+
inner === null || inner === void 0 ? void 0 : inner.user_email,
|
|
135
|
+
];
|
|
136
|
+
const bareRaw = typeof record.user === 'string' ? clean(record.user) : undefined;
|
|
137
|
+
const placeholder = [...emailCandidates, bareRaw]
|
|
138
|
+
.map(clean)
|
|
139
|
+
.find((value) => value && isLtiPlaceholderEmail(value));
|
|
140
|
+
const mintedId = placeholder ? identityKey(placeholder.slice(0, placeholder.indexOf('@'))) : '';
|
|
141
|
+
// `clean`, minus the minted address and any field that merely restates its opaque id.
|
|
142
|
+
const named = (value) => {
|
|
143
|
+
const text = clean(value);
|
|
144
|
+
if (!text || isLtiPlaceholderEmail(text))
|
|
145
|
+
return undefined;
|
|
146
|
+
return mintedId && identityKey(text) === mintedId ? undefined : text;
|
|
147
|
+
};
|
|
148
|
+
const pick = (...candidates) => firstOf(...candidates.map(named));
|
|
113
149
|
// A bare `user` value is a username — unless it is a numeric id, which
|
|
114
150
|
// names nobody: transcript rows carry `user: 1` beside `username: null`,
|
|
115
151
|
// and showing "1" for that person is worse than "Anonymous".
|
|
116
|
-
const bareString =
|
|
152
|
+
const bareString = named(bareRaw);
|
|
117
153
|
const bareUser = bareString && !/^\d+$/.test(bareString) ? bareString : undefined;
|
|
118
|
-
let email =
|
|
119
|
-
|
|
120
|
-
|
|
154
|
+
let email = pick(...emailCandidates);
|
|
155
|
+
// The profile still opens on the minted id, so it is kept raw here and only
|
|
156
|
+
// the displayed username drops it.
|
|
157
|
+
const profileUsername = firstOf(clean(record.username), clean(record.student), clean(record.user_username), clean(inner === null || inner === void 0 ? void 0 : inner.username), clean(inner === null || inner === void 0 ? void 0 : inner.student), clean(inner === null || inner === void 0 ? void 0 : inner.user_username), bareUser && !isEmailLike(bareUser) ? bareUser : undefined);
|
|
158
|
+
const platformUsername = named(profileUsername);
|
|
159
|
+
let username = pick(record.lti_username, inner === null || inner === void 0 ? void 0 : inner.lti_username, platformUsername);
|
|
121
160
|
const composed = [clean(record.first_name), clean(record.last_name)].filter(Boolean).join(' ');
|
|
122
|
-
const name =
|
|
161
|
+
const name = pick(record.user_full_name, record.full_name, record.name, composed, inner === null || inner === void 0 ? void 0 : inner.user_full_name, inner === null || inner === void 0 ? void 0 : inner.full_name, inner === null || inner === void 0 ? void 0 : inner.name);
|
|
123
162
|
// A bare string that looks like an email is an email, and so is a
|
|
124
163
|
// "username" field that actually carries one.
|
|
125
164
|
if (!email && bareUser && isEmailLike(bareUser))
|
|
@@ -135,16 +174,18 @@ function resolveUserIdentity(source, options = {}) {
|
|
|
135
174
|
? NAME_FIRST_ORDER
|
|
136
175
|
: order;
|
|
137
176
|
const label = labelOrder.map((field) => facts[field]).find(Boolean);
|
|
177
|
+
const fallback = placeholder ? ltiUserLabel : anonymousLabel;
|
|
138
178
|
return {
|
|
139
|
-
label: label !== null && label !== void 0 ? label :
|
|
179
|
+
label: label !== null && label !== void 0 ? label : fallback,
|
|
140
180
|
email,
|
|
141
181
|
username,
|
|
142
182
|
name,
|
|
143
|
-
profileUsername
|
|
144
|
-
|
|
145
|
-
|
|
183
|
+
profileUsername,
|
|
184
|
+
ltiPlaceholderEmail: placeholder,
|
|
185
|
+
initial: (label !== null && label !== void 0 ? label : fallback).charAt(0).toUpperCase() || 'A',
|
|
186
|
+
isAnonymous: !label && !placeholder,
|
|
146
187
|
};
|
|
147
188
|
}
|
|
148
189
|
|
|
149
|
-
export { DEFAULT_USER_IDENTITY_ORDER, hasDistinctName, isEmailLike, resolveUserIdentity };
|
|
190
|
+
export { DEFAULT_USER_IDENTITY_ORDER, hasDistinctName, isEmailLike, isLtiPlaceholderEmail, resolveUserIdentity };
|
|
150
191
|
//# sourceMappingURL=user-identity.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-identity.js","sources":["../../../../../../src/lib/user-identity.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAA;;;;;;;;;;;;;AAaG;
|
|
1
|
+
{"version":3,"file":"user-identity.js","sources":["../../../../../../src/lib/user-identity.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAA;;;;;;;;;;;;;AAaG;AA4DI,MAAM,2BAA2B,GAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU;AAE5F;AACA,MAAM,gBAAgB,GAAwB,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC;AAE3E;;;AAGG;AACH,MAAM,WAAW,GAAG,CAAC,KAAc,KACjC,CAAC,KAAK,aAAL,KAAK,KAAA,MAAA,GAAL,KAAK,GAAI,EAAE;KACT,SAAS,CAAC,MAAM;AAChB,KAAA,OAAO,CAAC,iBAAiB,EAAE,EAAE;AAC7B,KAAA,WAAW,EAAE;AAElB;;;;;;;AAOG;SACa,eAAe,CAAC,IAAa,EAAE,GAAG,SAAiC,EAAA;AACjF,IAAA,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC;AAC7B,IAAA,IAAI,CAAC,GAAG;AAAE,QAAA,OAAO,KAAK;AACtB,IAAA,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,QAAQ,KAAK,GAAG,KAAK,WAAW,CAAC,QAAQ,CAAC,CAAC;AACrE;AAEA,MAAM,uBAAuB,GAAG,WAAW;AAC3C,MAAM,sBAAsB,GAAG,UAAU;AAEzC;;;;;;;;;AASG;AACH,MAAM,4BAA4B,GAAG,kBAAkB;MAE1C,qBAAqB,GAAG,CAAC,KAAa,KACjD,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,4BAA4B;AAElE;AACA,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC;IAC3B,EAAE;IACF,MAAM;IACN,MAAM;IACN,WAAW;IACX,KAAK;IACL,IAAI;IACJ,GAAG;IACH,WAAW;IACX,eAAe;AAChB,CAAA,CAAC;AAEF;;;;AAIG;AACI,MAAM,WAAW,GAAG,CAAC,KAAa,KAAa;AACpD,IAAA,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,EAAE;IACzB,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;AAAE,QAAA,OAAO,KAAK;IAC1C,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;AAC5B,IAAA,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,IAAI,CAAC,MAAM,GAAG,CAAC;AAAE,QAAA,OAAO,KAAK;IACnF,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC;IACjC,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;;IAE/B,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC;AACzC;AAEA;AACA,MAAM,KAAK,GAAG,CAAC,KAAc,KAAwB;IACnD,IAAI,OAAO,KAAK,KAAK,QAAQ;AAAE,QAAA,OAAO,SAAS;AAC/C,IAAA,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE;AAC5B,IAAA,OAAO,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,GAAG,SAAS,GAAG,OAAO;AACtE,CAAC;AAED,MAAM,OAAO,GAAG,CAAC,GAAG,UAAqB,KAAwB;AAC/D,IAAA,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;AAClC,QAAA,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC;AAC9B,QAAA,IAAI,KAAK;AAAE,YAAA,OAAO,KAAK;IACzB;AACA,IAAA,OAAO,SAAS;AAClB,CAAC;AAED,MAAM,MAAM,GAAG,CAAC,MAA0B,KACxC,MAAM,CAAC,IAAI,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,GAAG,MAAM,CAAC,IAAI,GAAG,SAAS;AAE1E;;;;;;;;;;;;;;;;;;;;;AAqBG;SACa,mBAAmB,CACjC,MAA+D,EAC/D,UAA+B,EAAE,EAAA;;AAEjC,IAAA,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,IAAI,uBAAuB;AACxE,IAAA,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,IAAI,sBAAsB;AACnE,IAAA,MAAM,KAAK,GAAG,CAAA,MAAA,OAAO,CAAC,KAAK,MAAA,IAAA,IAAA,EAAA,KAAA,MAAA,GAAA,MAAA,GAAA,EAAA,CAAE,MAAM,IAAG,OAAO,CAAC,KAAK,GAAG,2BAA2B;IAEjF,MAAM,MAAM,GACV,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,GAAG,MAAM,GAAG,EAAE,IAAI,EAAE,MAAM,KAAA,IAAA,IAAN,MAAM,KAAA,MAAA,GAAN,MAAM,GAAI,IAAI,EAAE;AAC1E,IAAA,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC;AAE5B,IAAA,MAAM,eAAe,GAAG;AACtB,QAAA,MAAM,CAAC,SAAS;AAChB,QAAA,MAAM,CAAC,KAAK;AACZ,QAAA,MAAM,CAAC,UAAU;AACjB,QAAA,KAAK,KAAA,IAAA,IAAL,KAAK,KAAA,MAAA,GAAA,MAAA,GAAL,KAAK,CAAE,SAAS;AAChB,QAAA,KAAK,KAAA,IAAA,IAAL,KAAK,KAAA,MAAA,GAAA,MAAA,GAAL,KAAK,CAAE,KAAK;AACZ,QAAA,KAAK,KAAA,IAAA,IAAL,KAAK,KAAA,MAAA,GAAA,MAAA,GAAL,KAAK,CAAE,UAAU;KAClB;IACD,MAAM,OAAO,GAAG,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS;AAChF,IAAA,MAAM,WAAW,GAAG,CAAC,GAAG,eAAe,EAAE,OAAO;SAC7C,GAAG,CAAC,KAAK;AACT,SAAA,IAAI,CAAC,CAAC,KAAK,KAAK,KAAK,IAAI,qBAAqB,CAAC,KAAK,CAAC,CAAC;IACzD,MAAM,QAAQ,GAAG,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE;;AAE/F,IAAA,MAAM,KAAK,GAAG,CAAC,KAAc,KAAwB;AACnD,QAAA,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC;AACzB,QAAA,IAAI,CAAC,IAAI,IAAI,qBAAqB,CAAC,IAAI,CAAC;AAAE,YAAA,OAAO,SAAS;AAC1D,QAAA,OAAO,QAAQ,IAAI,WAAW,CAAC,IAAI,CAAC,KAAK,QAAQ,GAAG,SAAS,GAAG,IAAI;AACtE,IAAA,CAAC;AACD,IAAA,MAAM,IAAI,GAAG,CAAC,GAAG,UAAqB,KAAK,OAAO,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;;;;AAK5E,IAAA,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC;AACjC,IAAA,MAAM,QAAQ,GAAG,UAAU,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,UAAU,GAAG,SAAS;AAEjF,IAAA,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,eAAe,CAAC;;;AAIpC,IAAA,MAAM,eAAe,GAAG,OAAO,CAC7B,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,EACtB,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,EACrB,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,EAC3B,KAAK,CAAC,KAAK,KAAA,IAAA,IAAL,KAAK,KAAA,MAAA,GAAA,MAAA,GAAL,KAAK,CAAE,QAAQ,CAAC,EACtB,KAAK,CAAC,KAAK,KAAA,IAAA,IAAL,KAAK,KAAA,MAAA,GAAA,MAAA,GAAL,KAAK,CAAE,OAAO,CAAC,EACrB,KAAK,CAAC,KAAK,KAAA,IAAA,IAAL,KAAK,KAAA,MAAA,GAAA,MAAA,GAAL,KAAK,CAAE,aAAa,CAAC,EAC3B,QAAQ,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,QAAQ,GAAG,SAAS,CAC1D;AACD,IAAA,MAAM,gBAAgB,GAAG,KAAK,CAAC,eAAe,CAAC;AAC/C,IAAA,IAAI,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,KAAK,KAAA,IAAA,IAAL,KAAK,uBAAL,KAAK,CAAE,YAAY,EAAE,gBAAgB,CAAC;IAE/E,MAAM,QAAQ,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;AAC9F,IAAA,MAAM,IAAI,GAAG,IAAI,CACf,MAAM,CAAC,cAAc,EACrB,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,IAAI,EACX,QAAQ,EACR,KAAK,KAAA,IAAA,IAAL,KAAK,KAAA,MAAA,GAAA,MAAA,GAAL,KAAK,CAAE,cAAc,EACrB,KAAK,KAAA,IAAA,IAAL,KAAK,uBAAL,KAAK,CAAE,SAAS,EAChB,KAAK,aAAL,KAAK,KAAA,MAAA,GAAA,MAAA,GAAL,KAAK,CAAE,IAAI,CACZ;;;IAID,IAAI,CAAC,KAAK,IAAI,QAAQ,IAAI,WAAW,CAAC,QAAQ,CAAC;QAAE,KAAK,GAAG,QAAQ;IACjE,IAAI,CAAC,KAAK,IAAI,QAAQ,IAAI,WAAW,CAAC,QAAQ,CAAC,EAAE;QAC/C,KAAK,GAAG,QAAQ;QAChB,QAAQ,GAAG,SAAS;IACtB;IAEA,MAAM,KAAK,GAAkD,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE;;;AAGtF,IAAA,MAAM,UAAU,GACd,EAAC,CAAA,EAAA,GAAA,OAAO,CAAC,KAAK,MAAA,IAAA,IAAA,EAAA,KAAA,MAAA,GAAA,MAAA,GAAA,EAAA,CAAE,MAAM,CAAA,IAAI,eAAe,CAAC,IAAI,EAAE,gBAAgB,EAAE,QAAQ;AACxE,UAAE;UACA,KAAK;IACX,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;IACnE,MAAM,QAAQ,GAAG,WAAW,GAAG,YAAY,GAAG,cAAc;IAE5D,OAAO;AACL,QAAA,KAAK,EAAE,KAAK,KAAA,IAAA,IAAL,KAAK,KAAA,MAAA,GAAL,KAAK,GAAI,QAAQ;QACxB,KAAK;QACL,QAAQ;QACR,IAAI;QACJ,eAAe;AACf,QAAA,mBAAmB,EAAE,WAAW;AAChC,QAAA,OAAO,EAAE,CAAC,KAAK,aAAL,KAAK,KAAA,MAAA,GAAL,KAAK,GAAI,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,IAAI,GAAG;AAC3D,QAAA,WAAW,EAAE,CAAC,KAAK,IAAI,CAAC,WAAW;KACpC;AACH;;;;"}
|