Skip to content

Commit 1f65b12

Browse files
authored
Merge pull request #155 from it-at-m/feature/finalize-preview-wc
Feature/finalize preview wc
2 parents e4160ab + 6246dcc commit 1f65b12

21 files changed

+739
-275
lines changed

.github/workflows/pr-checklist.yml

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
meta {
2+
name: APIGW Create Checklist
3+
type: http
4+
seq: 5
5+
}
6+
7+
post {
8+
url: http://localhost:8083/clients/api/p13n-backend/checklist
9+
body: json
10+
auth: none
11+
}
12+
13+
headers {
14+
Authorization: Bearer
15+
}
16+
17+
body:json {
18+
{
19+
"title": "Test",
20+
"checklistItems": []
21+
}
22+
}

bruno/DBS-P13N/Get Checklist with ID.bru

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ meta {
55
}
66

77
get {
8-
url: http://localhost:39146/checklist/d484de4c-2d58-435c-8210-bdb9e00d38f9
8+
url: http://localhost:39146/checklist/123e4567-e89b-12d3-a456-426614174002
99
body: none
1010
auth: inherit
1111
}

bruno/DBS-P13N/Get Checklists.bru

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ get {
1111
}
1212

1313
headers {
14-
Authorization: bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJCNV9OZHBVMzlfZl9ZX3pJYnF4WWc2SnhiZDlZazFXSkItUHFrWUpuRFowIn0.eyJleHAiOjE3NTI1NTg2NDYsImlhdCI6MTc1MjU1ODM0NiwiYXV0aF90aW1lIjoxNzUyNTU4MDQ1LCJqdGkiOiI2NGY5Y2IzMi01Njk3LTQwZjEtYjBkMC05ZjQ0OTgxMDYxY2QiLCJpc3MiOiJodHRwOi8vbG9jYWxob3N0OjgxMDAvYXV0aC9yZWFsbXMvbG9jYWxfcmVhbG0iLCJhdWQiOlsibG9jYWwiLCJhY2NvdW50Il0sInN1YiI6IjIyMjQxMDJmLWFlMDgtNDNhZi04M2FjLTNkMjA3MjhmNWRhOCIsInR5cCI6IkJlYXJlciIsImF6cCI6ImxvY2FsIiwic2lkIjoiZmY3M2NiYWUtMzAwMi00ODhiLWI3NTEtYzgwNGMwMWQ4ZTJmIiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyIqIl0sInJlYWxtX2FjY2VzcyI6eyJyb2xlcyI6WyJkZWZhdWx0LXJvbGVzLWxvY2FsX3JlYWxtIiwib2ZmbGluZV9hY2Nlc3MiLCJ1bWFfYXV0aG9yaXphdGlvbiJdfSwicmVzb3VyY2VfYWNjZXNzIjp7ImFjY291bnQiOnsicm9sZXMiOlsibWFuYWdlLWFjY291bnQiLCJtYW5hZ2UtYWNjb3VudC1saW5rcyIsInZpZXctcHJvZmlsZSJdfSwibG9jYWwiOnsicm9sZXMiOlsid3JpdGVyIl19fSwic2NvcGUiOiJlbWFpbCBsb2NhbF9hdWRpZW5jZSBwcm9maWxlIG9wZW5pZCIsImVtYWlsX3ZlcmlmaWVkIjp0cnVlLCJuYW1lIjoid3JpdGVyIHdyaXRlciIsInByZWZlcnJlZF91c2VybmFtZSI6IndyaXRlciIsImdpdmVuX25hbWUiOiJ3cml0ZXIiLCJmYW1pbHlfbmFtZSI6IndyaXRlciIsImVtYWlsIjoid3JpdGVyQHdyaXRlci5jb20iLCJhdXRob3JpdGllcyI6WyJST0xFX3dyaXRlciJdfQ.FizcVAGEJhkHTy8LPvUD7DA-E_4lsXovFvkesOBFb-sF1AIHsWAgyiziBuGfCOsxJaB-A_q6N1OF5g4In56o5Q8fMILUrzbxD1nXZVOr6Ro1DX35Utuv2bCp7yJJ5PM5WNH4MX4t4XD_4iTikTs-8l87tnd3vfExPFbvKR9aP3GLmE4wDbIP-ghXgAW5JOaXOSGqcAB2xoBaTFxBTtJ_kkfy7wLwVh4gwE9H7zkpVZm3fZum5kuPuJhBZjqWhbGAkwHiENahp6Rs3amMye_S8XOOAgWH3sOjynrtbXr-bbswmPXj4Q9DsVtBZkXH3XxUEGX4ZmxLxW_eBddh7xJaow
14+
Authorization: Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJnS1VSVUdSekxUdGZBRFdQYXdyejhtTE5Jcklqa0hEMFN5ZkYxMkQwQWNFIn0.eyJleHAiOjE3NTc5MjY1NjksImlhdCI6MTc1NzkyNjI2OSwianRpIjoiZGU3Y2ViMDctNmUxZS00NGExLTk2N2QtMGUwNmY3NWY5OTY3IiwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo4MTAwL2F1dGgvcmVhbG1zL2xvY2FsX3JlYWxtIiwiYXVkIjpbImxvY2FsIiwiYWNjb3VudCJdLCJzdWIiOiJjZDk4MDk0MS1lMDcxLTRhODktOGQ5NC1kYTIxMGMwMDgwYzIiLCJ0eXAiOiJCZWFyZXIiLCJhenAiOiJsb2NhbCIsInNpZCI6IjNmMmNmYzlmLTU4M2YtNGNjNi1iZjZkLWZjY2Y1NzgyY2M4OSIsImFjciI6IjEiLCJhbGxvd2VkLW9yaWdpbnMiOlsiKiJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsiZGVmYXVsdC1yb2xlcy1sb2NhbF9yZWFsbSIsIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInJlc291cmNlX2FjY2VzcyI6eyJhY2NvdW50Ijp7InJvbGVzIjpbIm1hbmFnZS1hY2NvdW50IiwibWFuYWdlLWFjY291bnQtbGlua3MiLCJ2aWV3LXByb2ZpbGUiXX0sImxvY2FsIjp7InJvbGVzIjpbIndyaXRlciJdfX0sInNjb3BlIjoib3BlbmlkIGVtYWlsIHByb2ZpbGUgbG9jYWxfYXVkaWVuY2UiLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwibmFtZSI6IndyaXRlciB3cml0ZXIiLCJwcmVmZXJyZWRfdXNlcm5hbWUiOiJ3cml0ZXIiLCJnaXZlbl9uYW1lIjoid3JpdGVyIiwiZmFtaWx5X25hbWUiOiJ3cml0ZXIiLCJlbWFpbCI6IndyaXRlckB3cml0ZXIuY29tIiwiYXV0aG9yaXRpZXMiOlsiUk9MRV93cml0ZXIiXX0.aizX_MHrW3gtVuNOOsiCIUdo51z3af1ov5-5nBM9vjLlYYTjVnjP9qWkI56h9uKZ7eDzzeR6MX8QJ1buAxQ6RipbVWAcvn4XjrAXhGS1UZ8-zHZ9o18mLCj9KUzi6roR7P4If3lNZU5XSi1LWnH_lpkgErTrOm2anTb5tHKS7dgb4Kol1lDc97Epl2RwH7eJ_T5f2oa0tt39QXj2yesqGw9tuNIjMgV7Cc_gYfMS5tKQSDINv44jekYw6--xnvpc5OutdWmBvpTSG7tvHWa6mvw36MB-Fx2iVQfEhu4Gq8dEjZIUB1kCugq62iYlqsj-QkYbu9sP51aDE9hjgbg8tA
1515
}

bruno/DBS-P13N/Get UserInfo.bru

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
meta {
2+
name: Get UserInfo
3+
type: http
4+
seq: 5
5+
}
6+
7+
get {
8+
url: http://localhost:8100/auth/realms/local_realm/protocol/openid-connect/userinfo
9+
body: none
10+
auth: inherit
11+
}
12+
13+
headers {
14+
Authorization: Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJnS1VSVUdSekxUdGZBRFdQYXdyejhtTE5Jcklqa0hEMFN5ZkYxMkQwQWNFIn0.eyJleHAiOjE3NTc5MjM3NDAsImlhdCI6MTc1NzkyMzQ0MCwianRpIjoiOTI0ZmQ1YjItNDg1My00NWFkLThmM2MtMTFkOWJkNDYzMmRjIiwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo4MTAwL2F1dGgvcmVhbG1zL2xvY2FsX3JlYWxtIiwiYXVkIjpbImxvY2FsIiwiYWNjb3VudCJdLCJzdWIiOiJjZDk4MDk0MS1lMDcxLTRhODktOGQ5NC1kYTIxMGMwMDgwYzIiLCJ0eXAiOiJCZWFyZXIiLCJhenAiOiJsb2NhbCIsInNpZCI6ImIzMDE3MDIxLTJmMjktNDk3MS05MzBjLWY1MzQyNDg5MTFhMSIsImFjciI6IjEiLCJhbGxvd2VkLW9yaWdpbnMiOlsiKiJdLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsiZGVmYXVsdC1yb2xlcy1sb2NhbF9yZWFsbSIsIm9mZmxpbmVfYWNjZXNzIiwidW1hX2F1dGhvcml6YXRpb24iXX0sInJlc291cmNlX2FjY2VzcyI6eyJhY2NvdW50Ijp7InJvbGVzIjpbIm1hbmFnZS1hY2NvdW50IiwibWFuYWdlLWFjY291bnQtbGlua3MiLCJ2aWV3LXByb2ZpbGUiXX0sImxvY2FsIjp7InJvbGVzIjpbIndyaXRlciJdfX0sInNjb3BlIjoib3BlbmlkIGVtYWlsIHByb2ZpbGUgbG9jYWxfYXVkaWVuY2UiLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwibmFtZSI6IndyaXRlciB3cml0ZXIiLCJwcmVmZXJyZWRfdXNlcm5hbWUiOiJ3cml0ZXIiLCJnaXZlbl9uYW1lIjoid3JpdGVyIiwiZmFtaWx5X25hbWUiOiJ3cml0ZXIiLCJlbWFpbCI6IndyaXRlckB3cml0ZXIuY29tIiwiYXV0aG9yaXRpZXMiOlsiUk9MRV93cml0ZXIiXX0.Ci27HaA5q8uzdf5jNvdDWdmfvXodeP0vygiz54W11QLvilOkia26NX8zH5pQD2beAkNKU22Iv9H2o2Bg_n5akW6t2RrYnRRfEnsPCcfyaaVQEZWDbHuZDH3VyE9oHuT28UmijMh6pL1gFh96opHFZkpZh3F7vUHiLsz3mABdZV7V-lPTtES8izAvED3GG0wFMrSfH9OuOw3buZ35uGyo-fsFSs9EHuEhAyO-2-_yIRe5Fnkb87Wo1sFaF2OEIzgqFdCgMu6xXV6qCtqBW6sLpFVnJjxyQ8-bolON7qIgDV-kOB0_9P4hGaWgWlVtxUUKiWP4DQ2sRePMj-unQpCawg
15+
}

personalization-service/src/main/resources/application-local.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ springdoc:
3636
# Define the local keycloak configuration here
3737
# Deduplication-only property
3838
sso:
39-
url: http://kubernetes.docker.internal:8100
39+
url: http://keycloak:8100
4040
realm: local_realm
4141
client: local
4242

personalization-service/src/main/resources/db/migration/testdata/R__Testdata.sql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ truncate checklist_item CASCADE;
44
INSERT INTO checklist (lhm_ext_id, title, last_update, id) VALUES
55
('user1-lhm-ext-id', 'title1', NOW(), '123e4567-e89b-12d3-a456-426614174000'),
66
('user2-lhm-ext-id', 'title2', NOW(), '123e4567-e89b-12d3-a456-426614174001'),
7-
('user3-lhm-ext-id', 'title3', NOW(), '123e4567-e89b-12d3-a456-426614174002');
7+
('writerlhmextid', 'title3', NOW(), '123e4567-e89b-12d3-a456-426614174002');
88

99
INSERT INTO checklist_item (service_id, checked, title, note, required, checklist_id) VALUES
1010
('service1', NOW(), 'Item 1', 'Note for Item 1', TRUE, (select id from checklist where lhm_ext_id='user1-lhm-ext-id')),
1111
('service2', NOW(), 'Item 2', 'Note for Item 2', FALSE, (select id from checklist where lhm_ext_id='user1-lhm-ext-id')),
1212
('service3', NOW(), 'Item 3', 'Note for Item 3', FALSE, (select id from checklist where lhm_ext_id='user2-lhm-ext-id')),
13-
('service4', NOW(), 'Item 4', 'Note for Item 4', TRUE, (select id from checklist where lhm_ext_id='user3-lhm-ext-id')),
14-
('service5', NOW(), 'Item 5', 'Note for Item 5', TRUE, (select id from checklist where lhm_ext_id='user3-lhm-ext-id')),
15-
('service6', NOW(), 'Item 6', 'Note for Item 6', FALSE, (select id from checklist where lhm_ext_id='user3-lhm-ext-id'));
13+
('service4', NOW(), 'Item 4', 'Note for Item 4', TRUE, (select id from checklist where lhm_ext_id='writerlhmextid')),
14+
('service5', NOW(), 'Item 5', 'Note for Item 5', TRUE, (select id from checklist where lhm_ext_id='writerlhmextid')),
15+
('service6', NOW(), 'Item 6', 'Note for Item 6', FALSE, (select id from checklist where lhm_ext_id='writerlhmextid'));

personalization-webcomponents/index-checklist-detail.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@
2222
rel="stylesheet"
2323
/>
2424

25-
<!-- Load login-WC from local dev-server -->
2625
<script
27-
src="http://localhost:5173/src/main.ts"
28-
type="module"
26+
src="https://dbs-login-webcomponent-integration-dbs-login.apps.capk.muenchen.de/loader.js"
27+
type="text/javascript"
2928
></script>
3029

3130
<!-- built files will be auto injected -->
@@ -42,7 +41,7 @@
4241
</strong>
4342
</noscript>
4443
<dbs-login
45-
kc-url="http://localhost:8100/auth/"
44+
kc-url="http://keycloak:8100/auth/"
4645
kc-realm="local_realm"
4746
kc-client-id="local"
4847
overview-link="http://localhost:3000/"

personalization-webcomponents/index-checklist-overview.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@
2222
rel="stylesheet"
2323
/>
2424

25-
<!-- Load login-WC from local dev-server -->
2625
<script
27-
src="http://localhost:5173/src/main.ts"
28-
type="module"
26+
src="https://dbs-login-webcomponent-integration-dbs-login.apps.capk.muenchen.de/loader.js"
27+
type="text/javascript"
2928
></script>
3029

3130
<!-- built files will be auto injected -->
@@ -42,7 +41,7 @@
4241
</strong>
4342
</noscript>
4443
<dbs-login
45-
kc-url="http://localhost:8100/auth/"
44+
kc-url="http://keycloak:8100/auth/"
4645
kc-realm="local_realm"
4746
kc-client-id="local"
4847
overview-link="http://localhost:3000/"

personalization-webcomponents/index-checklist-preview.html

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@
2222
rel="stylesheet"
2323
/>
2424

25-
<!-- Load login-WC from local dev-server -->
2625
<script
27-
src="http://localhost:5173/src/main.ts"
28-
type="module"
26+
src="https://dbs-login-webcomponent-integration-dbs-login.apps.capk.muenchen.de/loader.js"
27+
type="text/javascript"
2928
></script>
3029

3130
<!-- built files will be auto injected -->
@@ -42,15 +41,15 @@
4241
</strong>
4342
</noscript>
4443
<dbs-login
45-
kc-url="http://localhost:8100/auth/"
44+
kc-url="http://keycloak:8100/auth/"
4645
kc-realm="local_realm"
4746
kc-client-id="local"
4847
overview-link="http://localhost:3000/"
4948
ticket-link="http://localhost:3000/"
5049
appointment-link="http://localhost:3000/"
5150
></dbs-login>
5251
<div>
53-
<checklist-preview />
52+
<checklist-preview checklist-detail-url="./index-checklist-detail.html" />
5453
</div>
5554
</body>
5655
</html>

0 commit comments

Comments
 (0)