@nymphjs/tilmeld-setup 1.0.0-alpha.4 → 1.0.0-alpha.40
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 +159 -0
- package/app/nymph.ts +2 -1
- package/app/src/App.svelte +4 -3
- package/app/src/GroupEdit.svelte +10 -11
- package/app/src/Groups.svelte +9 -10
- package/app/src/UserEdit.svelte +17 -18
- package/app/src/Users.svelte +9 -10
- package/app/theme/_helpers.scss +3 -1
- package/app/theme/_smui-theme.scss +1 -1
- package/dist/app/index.js +1 -1
- package/dist/app/index.js.map +1 -1
- package/dist/app/smui.css +13 -1
- package/package.json +46 -45
- package/test.mjs +3 -0
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,165 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [1.0.0-alpha.40](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.39...v1.0.0-alpha.40) (2022-03-05)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @nymphjs/tilmeld-setup
|
|
9
|
+
|
|
10
|
+
# [1.0.0-alpha.39](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.38...v1.0.0-alpha.39) (2022-03-05)
|
|
11
|
+
|
|
12
|
+
**Note:** Version bump only for package @nymphjs/tilmeld-setup
|
|
13
|
+
|
|
14
|
+
# [1.0.0-alpha.38](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.37...v1.0.0-alpha.38) (2022-02-10)
|
|
15
|
+
|
|
16
|
+
### Bug Fixes
|
|
17
|
+
|
|
18
|
+
- queryParser props in setup app ([effba3f](https://github.com/sciactive/nymphjs/commit/effba3f3bbc30723b29874f20d54690c8a17adce))
|
|
19
|
+
|
|
20
|
+
# [1.0.0-alpha.37](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.36...v1.0.0-alpha.37) (2022-02-02)
|
|
21
|
+
|
|
22
|
+
**Note:** Version bump only for package @nymphjs/tilmeld-setup
|
|
23
|
+
|
|
24
|
+
# [1.0.0-alpha.36](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.35...v1.0.0-alpha.36) (2022-01-26)
|
|
25
|
+
|
|
26
|
+
**Note:** Version bump only for package @nymphjs/tilmeld-setup
|
|
27
|
+
|
|
28
|
+
# [1.0.0-alpha.35](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.34...v1.0.0-alpha.35) (2022-01-19)
|
|
29
|
+
|
|
30
|
+
### Bug Fixes
|
|
31
|
+
|
|
32
|
+
- add new props to tilmeld components in setup app ([0afb20b](https://github.com/sciactive/nymphjs/commit/0afb20b4a901951401b7696eec1033a5488e38c5))
|
|
33
|
+
|
|
34
|
+
# [1.0.0-alpha.34](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.33...v1.0.0-alpha.34) (2022-01-08)
|
|
35
|
+
|
|
36
|
+
**Note:** Version bump only for package @nymphjs/tilmeld-setup
|
|
37
|
+
|
|
38
|
+
# [1.0.0-alpha.33](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.32...v1.0.0-alpha.33) (2022-01-08)
|
|
39
|
+
|
|
40
|
+
**Note:** Version bump only for package @nymphjs/tilmeld-setup
|
|
41
|
+
|
|
42
|
+
# [1.0.0-alpha.32](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.31...v1.0.0-alpha.32) (2022-01-08)
|
|
43
|
+
|
|
44
|
+
**Note:** Version bump only for package @nymphjs/tilmeld-setup
|
|
45
|
+
|
|
46
|
+
# [1.0.0-alpha.31](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.30...v1.0.0-alpha.31) (2022-01-08)
|
|
47
|
+
|
|
48
|
+
**Note:** Version bump only for package @nymphjs/tilmeld-setup
|
|
49
|
+
|
|
50
|
+
# [1.0.0-alpha.30](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.29...v1.0.0-alpha.30) (2022-01-07)
|
|
51
|
+
|
|
52
|
+
**Note:** Version bump only for package @nymphjs/tilmeld-setup
|
|
53
|
+
|
|
54
|
+
# [1.0.0-alpha.29](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.28...v1.0.0-alpha.29) (2022-01-07)
|
|
55
|
+
|
|
56
|
+
**Note:** Version bump only for package @nymphjs/tilmeld-setup
|
|
57
|
+
|
|
58
|
+
# [1.0.0-alpha.28](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.27...v1.0.0-alpha.28) (2022-01-07)
|
|
59
|
+
|
|
60
|
+
**Note:** Version bump only for package @nymphjs/tilmeld-setup
|
|
61
|
+
|
|
62
|
+
# [1.0.0-alpha.27](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.26...v1.0.0-alpha.27) (2022-01-05)
|
|
63
|
+
|
|
64
|
+
### Features
|
|
65
|
+
|
|
66
|
+
- add prop forwarding for svelte components within tilmeld components ([42b60e2](https://github.com/sciactive/nymphjs/commit/42b60e29638f04036eff3f7e4876e96a1c66c0bf))
|
|
67
|
+
- update smui to latest versions ([7ed7bd3](https://github.com/sciactive/nymphjs/commit/7ed7bd34d01a155c7001a2671de25ef2f3363682))
|
|
68
|
+
|
|
69
|
+
# [1.0.0-alpha.26](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.25...v1.0.0-alpha.26) (2021-12-30)
|
|
70
|
+
|
|
71
|
+
**Note:** Version bump only for package @nymphjs/tilmeld-setup
|
|
72
|
+
|
|
73
|
+
# [1.0.0-alpha.25](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.24...v1.0.0-alpha.25) (2021-12-30)
|
|
74
|
+
|
|
75
|
+
**Note:** Version bump only for package @nymphjs/tilmeld-setup
|
|
76
|
+
|
|
77
|
+
# [1.0.0-alpha.24](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.23...v1.0.0-alpha.24) (2021-12-30)
|
|
78
|
+
|
|
79
|
+
**Note:** Version bump only for package @nymphjs/tilmeld-setup
|
|
80
|
+
|
|
81
|
+
# [1.0.0-alpha.23](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.22...v1.0.0-alpha.23) (2021-12-30)
|
|
82
|
+
|
|
83
|
+
**Note:** Version bump only for package @nymphjs/tilmeld-setup
|
|
84
|
+
|
|
85
|
+
# [1.0.0-alpha.22](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.21...v1.0.0-alpha.22) (2021-12-14)
|
|
86
|
+
|
|
87
|
+
### Features
|
|
88
|
+
|
|
89
|
+
- update smui to latest versions ([912873b](https://github.com/sciactive/nymphjs/commit/912873b863d1ae5d51c359a3c0558bff38ce85cd))
|
|
90
|
+
|
|
91
|
+
# [1.0.0-alpha.21](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.20...v1.0.0-alpha.21) (2021-11-29)
|
|
92
|
+
|
|
93
|
+
**Note:** Version bump only for package @nymphjs/tilmeld-setup
|
|
94
|
+
|
|
95
|
+
# [1.0.0-alpha.20](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.19...v1.0.0-alpha.20) (2021-11-24)
|
|
96
|
+
|
|
97
|
+
### Features
|
|
98
|
+
|
|
99
|
+
- update smui to latest versions ([73ab4e8](https://github.com/sciactive/nymphjs/commit/73ab4e843623c25dc2efeb3c4b2cdd91237018b8))
|
|
100
|
+
|
|
101
|
+
# [1.0.0-alpha.19](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.18...v1.0.0-alpha.19) (2021-11-18)
|
|
102
|
+
|
|
103
|
+
### Features
|
|
104
|
+
|
|
105
|
+
- update smui and other packages to latest versions ([2465340](https://github.com/sciactive/nymphjs/commit/24653400d887bc04c41c3c4ee0c73ce2f2289e0d))
|
|
106
|
+
|
|
107
|
+
# [1.0.0-alpha.18](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.17...v1.0.0-alpha.18) (2021-11-09)
|
|
108
|
+
|
|
109
|
+
**Note:** Version bump only for package @nymphjs/tilmeld-setup
|
|
110
|
+
|
|
111
|
+
# [1.0.0-alpha.17](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.16...v1.0.0-alpha.17) (2021-10-14)
|
|
112
|
+
|
|
113
|
+
**Note:** Version bump only for package @nymphjs/tilmeld-setup
|
|
114
|
+
|
|
115
|
+
# [1.0.0-alpha.16](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.15...v1.0.0-alpha.16) (2021-10-14)
|
|
116
|
+
|
|
117
|
+
### Bug Fixes
|
|
118
|
+
|
|
119
|
+
- don't ignore built files in npm packages ([7d688db](https://github.com/sciactive/nymphjs/commit/7d688dbec362f1f71fb451a1d0dbcaecc15d99fc))
|
|
120
|
+
|
|
121
|
+
# [1.0.0-alpha.15](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.14...v1.0.0-alpha.15) (2021-10-14)
|
|
122
|
+
|
|
123
|
+
**Note:** Version bump only for package @nymphjs/tilmeld-setup
|
|
124
|
+
|
|
125
|
+
# [1.0.0-alpha.14](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.13...v1.0.0-alpha.14) (2021-10-14)
|
|
126
|
+
|
|
127
|
+
**Note:** Version bump only for package @nymphjs/tilmeld-setup
|
|
128
|
+
|
|
129
|
+
# [1.0.0-alpha.13](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.12...v1.0.0-alpha.13) (2021-10-14)
|
|
130
|
+
|
|
131
|
+
**Note:** Version bump only for package @nymphjs/tilmeld-setup
|
|
132
|
+
|
|
133
|
+
# [1.0.0-alpha.12](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.11...v1.0.0-alpha.12) (2021-10-13)
|
|
134
|
+
|
|
135
|
+
**Note:** Version bump only for package @nymphjs/tilmeld-setup
|
|
136
|
+
|
|
137
|
+
# [1.0.0-alpha.11](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.10...v1.0.0-alpha.11) (2021-10-13)
|
|
138
|
+
|
|
139
|
+
**Note:** Version bump only for package @nymphjs/tilmeld-setup
|
|
140
|
+
|
|
141
|
+
# [1.0.0-alpha.10](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.9...v1.0.0-alpha.10) (2021-10-12)
|
|
142
|
+
|
|
143
|
+
**Note:** Version bump only for package @nymphjs/tilmeld-setup
|
|
144
|
+
|
|
145
|
+
# [1.0.0-alpha.9](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.8...v1.0.0-alpha.9) (2021-10-12)
|
|
146
|
+
|
|
147
|
+
**Note:** Version bump only for package @nymphjs/tilmeld-setup
|
|
148
|
+
|
|
149
|
+
# [1.0.0-alpha.8](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.7...v1.0.0-alpha.8) (2021-10-12)
|
|
150
|
+
|
|
151
|
+
**Note:** Version bump only for package @nymphjs/tilmeld-setup
|
|
152
|
+
|
|
153
|
+
# [1.0.0-alpha.7](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.6...v1.0.0-alpha.7) (2021-10-05)
|
|
154
|
+
|
|
155
|
+
**Note:** Version bump only for package @nymphjs/tilmeld-setup
|
|
156
|
+
|
|
157
|
+
# [1.0.0-alpha.6](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.5...v1.0.0-alpha.6) (2021-10-05)
|
|
158
|
+
|
|
159
|
+
**Note:** Version bump only for package @nymphjs/tilmeld-setup
|
|
160
|
+
|
|
161
|
+
# [1.0.0-alpha.5](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.4...v1.0.0-alpha.5) (2021-09-30)
|
|
162
|
+
|
|
163
|
+
**Note:** Version bump only for package @nymphjs/tilmeld-setup
|
|
164
|
+
|
|
6
165
|
# [1.0.0-alpha.4](https://github.com/sciactive/nymphjs/compare/v1.0.0-alpha.3...v1.0.0-alpha.4) (2021-09-27)
|
|
7
166
|
|
|
8
167
|
### Features
|
package/app/nymph.ts
CHANGED
package/app/src/App.svelte
CHANGED
|
@@ -111,19 +111,20 @@
|
|
|
111
111
|
{/if}
|
|
112
112
|
{:else if user == null}
|
|
113
113
|
<section style="display: flex; justify-content: center;">
|
|
114
|
-
<Login />
|
|
114
|
+
<Login {User} {clientConfig} />
|
|
115
115
|
</section>
|
|
116
116
|
{:else}
|
|
117
117
|
<section>You don't have permission to access this app.</section>
|
|
118
118
|
{/if}
|
|
119
|
-
<Account bind:open={accountOpen} />
|
|
119
|
+
<Account bind:open={accountOpen} {User} {clientConfig} />
|
|
120
120
|
</main>
|
|
121
121
|
</AppContent>
|
|
122
122
|
</div>
|
|
123
123
|
|
|
124
124
|
<script lang="ts">
|
|
125
125
|
import { onMount, SvelteComponent } from 'svelte';
|
|
126
|
-
import { ClientConfig, CurrentUserData
|
|
126
|
+
import type { ClientConfig, CurrentUserData } from '@nymphjs/tilmeld-client';
|
|
127
|
+
import { User } from '@nymphjs/tilmeld-client';
|
|
127
128
|
import { Login, Account } from '@nymphjs/tilmeld-components';
|
|
128
129
|
import { mdiGithub, mdiTwitter } from '@mdi/js';
|
|
129
130
|
import TopAppBar, { Row, Section, Title } from '@smui/top-app-bar';
|
package/app/src/GroupEdit.svelte
CHANGED
|
@@ -327,13 +327,12 @@
|
|
|
327
327
|
|
|
328
328
|
<script lang="ts">
|
|
329
329
|
import { createEventDispatcher, onMount } from 'svelte';
|
|
330
|
-
import {
|
|
330
|
+
import type {
|
|
331
331
|
AdminGroupData,
|
|
332
332
|
ClientConfig,
|
|
333
333
|
CurrentUserData,
|
|
334
|
-
Group,
|
|
335
|
-
User,
|
|
336
334
|
} from '@nymphjs/tilmeld-client';
|
|
335
|
+
import { Group, User } from '@nymphjs/tilmeld-client';
|
|
337
336
|
import queryParser from '@nymphjs/query-parser';
|
|
338
337
|
import {
|
|
339
338
|
mdiArrowLeft,
|
|
@@ -352,7 +351,7 @@
|
|
|
352
351
|
import Paper from '@smui/paper';
|
|
353
352
|
import DataTable, { Head, Body, Row, Cell } from '@smui/data-table';
|
|
354
353
|
import Textfield, { Input } from '@smui/textfield';
|
|
355
|
-
import HelperText from '@smui/textfield/helper-text
|
|
354
|
+
import HelperText from '@smui/textfield/helper-text';
|
|
356
355
|
import IconButton from '@smui/icon-button';
|
|
357
356
|
import Button from '@smui/button';
|
|
358
357
|
import { Icon, Label } from '@smui/common';
|
|
@@ -434,11 +433,11 @@
|
|
|
434
433
|
return;
|
|
435
434
|
}
|
|
436
435
|
try {
|
|
437
|
-
const query = queryParser(
|
|
438
|
-
parentSearch,
|
|
439
|
-
Group,
|
|
440
|
-
['groupname', 'name', 'email'],
|
|
441
|
-
{
|
|
436
|
+
const query = queryParser({
|
|
437
|
+
query: parentSearch,
|
|
438
|
+
entityClass: Group,
|
|
439
|
+
defaultFields: ['groupname', 'name', 'email'],
|
|
440
|
+
qrefMap: {
|
|
442
441
|
User: {
|
|
443
442
|
class: User,
|
|
444
443
|
defaultFields: ['username', 'name', 'email'],
|
|
@@ -447,8 +446,8 @@
|
|
|
447
446
|
class: Group,
|
|
448
447
|
defaultFields: ['groupname', 'name', 'email'],
|
|
449
448
|
},
|
|
450
|
-
}
|
|
451
|
-
);
|
|
449
|
+
},
|
|
450
|
+
});
|
|
452
451
|
parents = (await nymph.getEntities(...query)).filter((group) => {
|
|
453
452
|
return !group.$is(entity) && !group.$is(entity.parent);
|
|
454
453
|
});
|
package/app/src/Groups.svelte
CHANGED
|
@@ -91,13 +91,12 @@
|
|
|
91
91
|
<script lang="ts">
|
|
92
92
|
import { onMount } from 'svelte';
|
|
93
93
|
import queryParser from '@nymphjs/query-parser';
|
|
94
|
-
import {
|
|
94
|
+
import type {
|
|
95
95
|
AdminGroupData,
|
|
96
96
|
ClientConfig,
|
|
97
97
|
CurrentUserData,
|
|
98
|
-
Group,
|
|
99
|
-
User,
|
|
100
98
|
} from '@nymphjs/tilmeld-client';
|
|
99
|
+
import { Group, User } from '@nymphjs/tilmeld-client';
|
|
101
100
|
import { mdiMagnify, mdiArrowRight, mdiPlus } from '@mdi/js';
|
|
102
101
|
import CircularProgress from '@smui/circular-progress';
|
|
103
102
|
import Paper from '@smui/paper';
|
|
@@ -131,11 +130,11 @@
|
|
|
131
130
|
entitiesSearching = true;
|
|
132
131
|
failureMessage = undefined;
|
|
133
132
|
try {
|
|
134
|
-
const query = queryParser(
|
|
135
|
-
entitySearch,
|
|
136
|
-
Group,
|
|
137
|
-
['
|
|
138
|
-
{
|
|
133
|
+
const query = queryParser({
|
|
134
|
+
query: entitySearch,
|
|
135
|
+
entityClass: Group,
|
|
136
|
+
defaultFields: ['groupname', 'name', 'email'],
|
|
137
|
+
qrefMap: {
|
|
139
138
|
User: {
|
|
140
139
|
class: User,
|
|
141
140
|
defaultFields: ['username', 'name', 'email'],
|
|
@@ -144,8 +143,8 @@
|
|
|
144
143
|
class: Group,
|
|
145
144
|
defaultFields: ['groupname', 'name', 'email'],
|
|
146
145
|
},
|
|
147
|
-
}
|
|
148
|
-
);
|
|
146
|
+
},
|
|
147
|
+
});
|
|
149
148
|
entities = await nymph.getEntities(...query);
|
|
150
149
|
} catch (e: any) {
|
|
151
150
|
failureMessage = e?.message;
|
package/app/src/UserEdit.svelte
CHANGED
|
@@ -562,14 +562,13 @@
|
|
|
562
562
|
|
|
563
563
|
<script lang="ts">
|
|
564
564
|
import { createEventDispatcher, onMount } from 'svelte';
|
|
565
|
-
import {
|
|
565
|
+
import type {
|
|
566
566
|
AdminGroupData,
|
|
567
567
|
AdminUserData,
|
|
568
568
|
ClientConfig,
|
|
569
569
|
CurrentUserData,
|
|
570
|
-
Group,
|
|
571
|
-
User,
|
|
572
570
|
} from '@nymphjs/tilmeld-client';
|
|
571
|
+
import { Group, User } from '@nymphjs/tilmeld-client';
|
|
573
572
|
import queryParser from '@nymphjs/query-parser';
|
|
574
573
|
import {
|
|
575
574
|
mdiArrowLeft,
|
|
@@ -588,7 +587,7 @@
|
|
|
588
587
|
import Paper from '@smui/paper';
|
|
589
588
|
import DataTable, { Head, Body, Row, Cell } from '@smui/data-table';
|
|
590
589
|
import Textfield, { Input } from '@smui/textfield';
|
|
591
|
-
import HelperText from '@smui/textfield/helper-text
|
|
590
|
+
import HelperText from '@smui/textfield/helper-text';
|
|
592
591
|
import IconButton from '@smui/icon-button';
|
|
593
592
|
import Button from '@smui/button';
|
|
594
593
|
import { Icon, Label } from '@smui/common';
|
|
@@ -700,11 +699,11 @@
|
|
|
700
699
|
return;
|
|
701
700
|
}
|
|
702
701
|
try {
|
|
703
|
-
const [options, ...selectors] = queryParser(
|
|
704
|
-
primaryGroupSearch,
|
|
705
|
-
Group,
|
|
706
|
-
['groupname', 'name', 'email'],
|
|
707
|
-
{
|
|
702
|
+
const [options, ...selectors] = queryParser({
|
|
703
|
+
query: primaryGroupSearch,
|
|
704
|
+
entityClass: Group,
|
|
705
|
+
defaultFields: ['groupname', 'name', 'email'],
|
|
706
|
+
qrefMap: {
|
|
708
707
|
User: {
|
|
709
708
|
class: User,
|
|
710
709
|
defaultFields: ['username', 'name', 'email'],
|
|
@@ -713,8 +712,8 @@
|
|
|
713
712
|
class: Group,
|
|
714
713
|
defaultFields: ['groupname', 'name', 'email'],
|
|
715
714
|
},
|
|
716
|
-
}
|
|
717
|
-
);
|
|
715
|
+
},
|
|
716
|
+
});
|
|
718
717
|
primaryGroups = (await Group.getPrimaryGroups(options, selectors)).filter(
|
|
719
718
|
(group) => {
|
|
720
719
|
return !group.$is(entity.group);
|
|
@@ -739,11 +738,11 @@
|
|
|
739
738
|
return;
|
|
740
739
|
}
|
|
741
740
|
try {
|
|
742
|
-
const [options, ...selectors] = queryParser(
|
|
743
|
-
secondaryGroupSearch,
|
|
744
|
-
Group,
|
|
745
|
-
['groupname', 'name', 'email'],
|
|
746
|
-
{
|
|
741
|
+
const [options, ...selectors] = queryParser({
|
|
742
|
+
query: secondaryGroupSearch,
|
|
743
|
+
entityClass: Group,
|
|
744
|
+
defaultFields: ['groupname', 'name', 'email'],
|
|
745
|
+
qrefMap: {
|
|
747
746
|
User: {
|
|
748
747
|
class: User,
|
|
749
748
|
defaultFields: ['username', 'name', 'email'],
|
|
@@ -752,8 +751,8 @@
|
|
|
752
751
|
class: Group,
|
|
753
752
|
defaultFields: ['groupname', 'name', 'email'],
|
|
754
753
|
},
|
|
755
|
-
}
|
|
756
|
-
);
|
|
754
|
+
},
|
|
755
|
+
});
|
|
757
756
|
secondaryGroups = (
|
|
758
757
|
await Group.getSecondaryGroups(options, selectors)
|
|
759
758
|
).filter((group) => {
|
package/app/src/Users.svelte
CHANGED
|
@@ -91,13 +91,12 @@
|
|
|
91
91
|
<script lang="ts">
|
|
92
92
|
import { onMount } from 'svelte';
|
|
93
93
|
import queryParser from '@nymphjs/query-parser';
|
|
94
|
-
import {
|
|
94
|
+
import type {
|
|
95
95
|
AdminUserData,
|
|
96
96
|
ClientConfig,
|
|
97
97
|
CurrentUserData,
|
|
98
|
-
Group,
|
|
99
|
-
User,
|
|
100
98
|
} from '@nymphjs/tilmeld-client';
|
|
99
|
+
import { Group, User } from '@nymphjs/tilmeld-client';
|
|
101
100
|
import { mdiMagnify, mdiArrowRight, mdiPlus } from '@mdi/js';
|
|
102
101
|
import CircularProgress from '@smui/circular-progress';
|
|
103
102
|
import Paper from '@smui/paper';
|
|
@@ -131,11 +130,11 @@
|
|
|
131
130
|
entitiesSearching = true;
|
|
132
131
|
failureMessage = undefined;
|
|
133
132
|
try {
|
|
134
|
-
const query = queryParser(
|
|
135
|
-
entitySearch,
|
|
136
|
-
User,
|
|
137
|
-
['username', 'name', 'email'],
|
|
138
|
-
{
|
|
133
|
+
const query = queryParser({
|
|
134
|
+
query: entitySearch,
|
|
135
|
+
entityClass: User,
|
|
136
|
+
defaultFields: ['username', 'name', 'email'],
|
|
137
|
+
qrefMap: {
|
|
139
138
|
User: {
|
|
140
139
|
class: User,
|
|
141
140
|
defaultFields: ['username', 'name', 'email'],
|
|
@@ -144,8 +143,8 @@
|
|
|
144
143
|
class: Group,
|
|
145
144
|
defaultFields: ['groupname', 'name', 'email'],
|
|
146
145
|
},
|
|
147
|
-
}
|
|
148
|
-
);
|
|
146
|
+
},
|
|
147
|
+
});
|
|
149
148
|
entities = await nymph.getEntities(...query);
|
|
150
149
|
} catch (e: any) {
|
|
151
150
|
failureMessage = e?.message;
|
package/app/theme/_helpers.scss
CHANGED