Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Coar Notify Integration #2681

Merged
merged 263 commits into from
Feb 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
263 commits
Select commit Hold shift + click to select a range
2ba86ed
CST-11012 Finalized Coar text +logo
Sondissimo Aug 29, 2023
7676478
CST-11012 Finalized Coar text +logo (centered with itself)
Sondissimo Aug 29, 2023
07527e1
CST-11012 removed extra comment
Sondissimo Sep 3, 2023
1f5f055
CST-11012 removed not needed path in app-routing-paths.ts
Sondissimo Sep 3, 2023
18aa0bb
CST-11012 removed not needed path in app-routing-paths.ts
Sondissimo Sep 3, 2023
eb82628
CST-11012 needed path in app-routing-paths.ts
Sondissimo Sep 3, 2023
f9e4044
CST-11012 fixed conflicts
Sondissimo Sep 14, 2023
0d79dd0
Merge branch 'coar-notify-7' of bitbucket.org:4Science/dspace-angular…
Sondissimo Sep 14, 2023
9a0f6fd
Merged in CST-11012-demo (pull request #778)
Sep 18, 2023
24a0af1
CST-11048 First commit
Sondissimo Sep 18, 2023
4805b50
CST-11048 First commit +fix for admin routing
Sondissimo Sep 18, 2023
b040f9c
CST-11048 sync branch with coar-notify-7
Sondissimo Sep 18, 2023
1c9fbd4
CST-11048 FInished the angular implementation for the ldn inbox, need…
Sondissimo Sep 26, 2023
11f9258
CST-11048 Form Styling
Sondissimo Oct 5, 2023
f893c6f
CST-11048 Implemented enabled slider in edit
Sondissimo Oct 6, 2023
c75f618
CST-11048 Spaced form updated error behaviour
Sondissimo Oct 6, 2023
9ab62d2
Merged in CST-11048 (pull request #905)
Oct 6, 2023
2bf5653
CST-10639 Added new fields in the item-view (Endorsed Reviewed and Da…
Oct 6, 2023
4dd3392
CST-10639 Fixed fields in the item-view (Endorsed Reviewed and Dataset)
Oct 6, 2023
71adb5b
CST-10639 Fixed field in the item-view (Endorsement)
Oct 6, 2023
8f63b54
CST-11045 Located component, working on adding new accordion
Oct 9, 2023
9216073
CST-12174 Coar form pages are now sized correctly, finishing up save …
Oct 11, 2023
8de0e76
CST-12174 Ldn services are now retrieved with the remotadata object
Oct 11, 2023
1c376b2
CST-12174 Implemented data-service for the api calls
Oct 17, 2023
ba0b110
CST-12174 added resetForm and leave edit for edit-form and overview page
Oct 17, 2023
6d794cd
[CST-12235] LDN inbox mechanism for home (partial commit)
alisaismailati Oct 18, 2023
2eb7160
CST-12174 created new remotadata service for itemfilters, pages are u…
Oct 18, 2023
318f057
[CST-12145] partial commit
alisaismailati Oct 24, 2023
5cca15d
CST-12174 Updated delete services to mark for deletion
Oct 24, 2023
0963a32
CST-12174 Updated delete services to mark for deletion
Oct 24, 2023
e2ad9fe
CST-12174 Updated delete services to mark for deletion on outboundpat…
Oct 24, 2023
4ecaeab
CST-12174 removed not needed guards
Oct 24, 2023
ce3ba35
CST-12174 added isNew Check for patterns deeltion
Oct 24, 2023
d877d6f
CST-12174 small layout fix
Oct 24, 2023
b3262ec
CST-12180 added div container
Oct 24, 2023
b995f9e
Merged coar-notify-7 into CST-11045
Oct 24, 2023
422a223
[CST-12235] support for the LDN inbox for root & /home & /item/:uuid …
alisaismailati Oct 24, 2023
494295c
CST-11045 added sections parts
Oct 24, 2023
c93c2a6
CST-12174 fixed red selected form section both for inbound and outbou…
Oct 24, 2023
54fc1f8
Merged coar-notify-7 into CST-11045
Oct 24, 2023
7ed4d14
CST-11045 Provided coarnotify section logic and dataservices for configs
Oct 25, 2023
90652b6
CST-12174 Added filters for empty string patterns removal
Oct 25, 2023
12c60b7
CST-12174 Removed console log
Oct 25, 2023
0682b7b
CST-11045 Dynamically creating dropdowns based on the coarconfig
Oct 25, 2023
5ed9f46
CST-11045 Improved css and remove console log and interpolation, adde…
Oct 26, 2023
4fd475f
[CST-12145] parial commit
alisaismailati Oct 26, 2023
b102ef7
[CST-12235] changed property name to ldn.notify.inbox
alisaismailati Oct 26, 2023
e9dd340
CST-11045 Added jsona5 text for coar submission section
Oct 27, 2023
92d66c9
CST-11045 CSS refactor + dropdown data correctly populated
Oct 27, 2023
e87c12c
[CST-12145] implementation of item-page & y dspace coar-notify notifi…
alisaismailati Oct 27, 2023
8e0af9b
[CST-12145] commented code
alisaismailati Oct 30, 2023
b927761
CST-11045 Dropdown behavior improved, working on multiple dropdowns
Oct 30, 2023
dff25d5
Merged in CST-10639 (pull request #908)
Oct 31, 2023
efcd4d3
Merged in coar-CST-12235 (pull request #951)
alisaismailati Oct 31, 2023
efd2d4c
[CST-12454] getting inbox url from rest for notify info page
alisaismailati Oct 31, 2023
bbbeeb6
CST-11045 Changed names and styling
Oct 31, 2023
e14ca89
Merge remote-tracking branch 'origin/CST-11045' into CST-11045
Oct 31, 2023
5dcd2d0
[CST-11045] Save & update coar-notify-data (submission form)
alisaismailati Nov 1, 2023
7117bc3
CST-12454 rename the placeholder to ldn inbox url
abollini Nov 1, 2023
5b3bcf4
Merged in coar-CST-12454 (pull request #974)
alisaismailati Nov 1, 2023
83761f1
[CST-11045] Handle coar-notify section errors
alisaismailati Nov 2, 2023
5a8bc4e
[CST-11045] small change
alisaismailati Nov 2, 2023
8616ef7
[CST-11045] rollback changes on ldn-service-coar-patterns.ts
alisaismailati Nov 2, 2023
bcf0b4c
[CST-11045] code clean up
alisaismailati Nov 2, 2023
1904bef
CST-12179 Added form handling for errors and new field score that on…
Nov 2, 2023
83ef02c
CST-12179 Form error now shows failed to edit the service and redirec…
Nov 2, 2023
b2e150d
CST-12471 Form error now shows failed to edit the service and redirec…
Nov 2, 2023
3e0e8e5
Merge remote-tracking branch 'origin/CST-12179' into CST-12179
Nov 2, 2023
ea726a7
CST-12455 Moved patterns to be using i18n, added id to represent the …
Nov 2, 2023
673a331
CST-12455 Added missing i18n values
Nov 2, 2023
d28e09a
CST-12481 Added missing i18n values
Nov 2, 2023
cc6bf7c
Merge remote-tracking branch 'origin/CST-12481' into CST-12481
Nov 2, 2023
d31dc4d
[CST-12145] get qa-sources by target for item-page & refactor
alisaismailati Nov 2, 2023
7fcd82a
CST-12179 removed console.log
Nov 3, 2023
f74efd6
[CST-12490] unit test fixes
alisaismailati Nov 3, 2023
bc267d2
Merged in CST-11045 (pull request #978)
alisaismailati Nov 3, 2023
2790f1e
Merged in CST-12481 (pull request #979)
Nov 3, 2023
9ffc778
Merged in coar-CST-12145 (pull request #967)
alisaismailati Nov 3, 2023
dd0dfba
Merged in CST-12490 (pull request #983)
alisaismailati Nov 6, 2023
546c892
[CST-12500] Unit tests SubmissionSectionCoarNotifyComponent
alisaismailati Nov 6, 2023
4bd80c9
[CST-12535] GET quality assurance topics by source/target
alisaismailati Nov 7, 2023
8f290c1
[CST-12500] coar-notify panel - new label keys for the dropdowns
alisaismailati Nov 7, 2023
8e70af6
[CST-12500] re-write translation keys based on pattern names
alisaismailati Nov 8, 2023
9233095
CST-12455 Provided json5 key values based on the string arrays
Nov 10, 2023
221a43d
CST-12179 Provided json5 values
Nov 10, 2023
f4b8c7f
CST-12179 Removed comments
Nov 10, 2023
6675f9c
[CST-12535] improvements
alisaismailati Nov 10, 2023
96cbd73
Merged in coar-CST-12500 (pull request #991)
alisaismailati Nov 10, 2023
f99f5d2
Merged in coar-CST-12535 (pull request #990)
alisaismailati Nov 10, 2023
3aaeaa6
CST-12179 Removed comments
Nov 10, 2023
075c53a
CST-12179 Using json5 and error are logged under the various sections…
Nov 10, 2023
786e2ee
[CST-12608] qaevents page improvements
alisaismailati Nov 13, 2023
7272747
Merged coar-notify-7 into CST-12455
Nov 13, 2023
721b80a
CST-12455 Changes for the page to be using an ngbdropdown logic are s…
Nov 14, 2023
cd5d509
CST-12455 Changes for the page to be using an ngbdropdown logic are n…
Nov 14, 2023
754a682
CST-12455 Itemfilter dropdown first refactoring just for layout
Nov 15, 2023
35c4585
CST-12455 Itemfilter dropdown for the edit inboundpatterns is working…
Nov 15, 2023
778a067
CST-12455 Edit page logic is working now finishing up the styling for…
Nov 15, 2023
d8e7487
CST-12455 Create page logic is working now finishing up the styling f…
Nov 15, 2023
00bf0d3
CST-12455 Code refactor and new dropdowns implementation
Nov 15, 2023
3a6f57d
CST-12455 Task Completed, cleanup needed
Nov 15, 2023
400d10d
Merged in CST-12179 (pull request #980)
Nov 16, 2023
0361dd2
Merged in coar-CST-12608 (pull request #1007)
alisaismailati Nov 16, 2023
7831bcb
CST-12455 Working dropdowns with scroll showing only 4 values + impro…
Nov 16, 2023
c8ece65
Merge remote-tracking branch 'remotes/origin/coar-notify-7' into HEAD
Nov 16, 2023
18367ba
CST-12455_coar-7sync Refactor after branch sync
Nov 16, 2023
6303d4c
CST-12455_coar-7sync Refactor after branch sync
Nov 16, 2023
64d9aba
CST-12455_coar-7sync Small fix
Nov 16, 2023
bb3cbad
CST-12455_coar-7sync Last refactor and TODO removal
Nov 16, 2023
9651c74
CST-12455_coar-7sync Failing tests fixed. Ready to be merged
Nov 16, 2023
1ba925d
CST-12455_coar-7sync Wrongly added file removal
Nov 16, 2023
5203a01
CST-12455_coar-7sync Fixed 2 code rows
Nov 16, 2023
1405e23
CST-12455_coar-7sync Removed console.log
Nov 16, 2023
6c710b7
CST-12455_coar-7sync Removed console.log
Nov 16, 2023
5a7965d
Merged in CST-12455_coar-7_sync (pull request #1024)
Nov 17, 2023
7726183
[CST-12147] display serive name & link for notify-coar events
alisaismailati Nov 17, 2023
53ba509
[CST-11523] footer component unit tests
alisaismailati Nov 17, 2023
3c96abb
CST-12498 Provided working mock, finishing the tests files
Nov 17, 2023
92b791e
CST-12498 Added tests, still needs cleanup and check on one behaviour
Nov 17, 2023
bdd2a8b
CST-12498 Tests added, need to check TODOs in ldn-services-directory…
Nov 17, 2023
d1ae9ad
CST-12498 Added javadocs
Nov 18, 2023
f7ca7a6
CST-12498 Added javadocs
Nov 18, 2023
3a6d8f3
Merged in coar-CST-12147 (pull request #1028)
alisaismailati Nov 20, 2023
2386bb8
Merged in coar-CST-11523 (pull request #1029)
alisaismailati Nov 20, 2023
80991e6
CST-12498 Fixed create form labels alignment
Nov 20, 2023
f35e6ae
CST-12498 Fixed tests for directory, no more failing ones
Nov 20, 2023
36778a0
CST-12498 Added last javadocs and removed console.log and comments
Nov 20, 2023
532f472
CST-12498 Final refactor
Nov 20, 2023
d8e6787
Merged coar-notify-7 into CST-12498
Nov 20, 2023
21d9785
[CST-12700] fixes
alisaismailati Nov 20, 2023
cb8f455
Merged in coar-CST-12700 (pull request #1035)
alisaismailati Nov 20, 2023
aa08989
CST-12498 rollback
Nov 20, 2023
3453f26
Merge remote-tracking branch 'origin/CST-12498' into CST-12498
Nov 20, 2023
b1d2b78
[CST-12700] added missing label
steph-ieffam Nov 20, 2023
56becbc
Merge remote-tracking branch 'origin/CST-12498' into coar-notify-7
steph-ieffam Nov 20, 2023
4a9bfb0
CST-12498 rollback
Nov 20, 2023
5359949
CST-12498 lint fix
Nov 20, 2023
d7db4bc
Merged in CST-12498 (pull request #1037)
Nov 20, 2023
a495a29
CST-12180
Nov 20, 2023
596cd6f
Merged in CST-12180 (pull request #950)
Nov 20, 2023
d46248e
[CST-11884] added notify related information in the item details page
alisaismailati Nov 20, 2023
f8215e7
Merged in coar-CST-11884 (pull request #1038)
alisaismailati Nov 21, 2023
442426b
[CST-12709] partial implementation with mock data
alisaismailati Nov 21, 2023
df0f192
[CST-12709] unit tests and final fixes
alisaismailati Nov 22, 2023
75ac289
[CST-12709] chages
alisaismailati Nov 22, 2023
dbdfcea
[CST-12718] Added validations on LDN Service form
alisaismailati Nov 22, 2023
27d891a
Merged in coar-CST-12709 (pull request #1051)
alisaismailati Nov 23, 2023
867bf8a
[CST-12768] LDN Service edit "Automatic" flag fixed
alisaismailati Nov 23, 2023
8256de5
[CST-12767] Fixed Modal behaviour when discarding a LDN service
alisaismailati Nov 23, 2023
d257380
[CST-12768] other fixes
alisaismailati Nov 23, 2023
86bbd26
[CST-12768] unit test fix
alisaismailati Nov 23, 2023
e74376c
Merged in coar-CST-12767 (pull request #1054)
alisaismailati Nov 23, 2023
1174152
[CST-12768] small change
alisaismailati Nov 23, 2023
1153c90
Merged in coar-CST-12768 (pull request #1053)
alisaismailati Nov 23, 2023
71bc019
[CST-12791] changed the route for suggestions to be be accessible to …
alisaismailati Nov 30, 2023
f4436a0
CST-12822 notify request box with offerType
frabacche Nov 30, 2023
48670dd
Merged in CST-12822-coar-display-pattern-type (pull request #1075)
frabacche Nov 30, 2023
4b7602f
Merge remote-tracking branch 'originGithub/main' into coar-notify-7
steph-ieffam Dec 5, 2023
a8ad88a
[CST-12881] fix lint error
steph-ieffam Dec 5, 2023
486d2ad
[CST-12881] fix typo
steph-ieffam Dec 5, 2023
62ae922
COAR alert box fix notiyrequeststatus object with the new attribute o…
frabacche Dec 5, 2023
e77c559
update translations
FrancescoMolinaro Dec 13, 2023
b494c95
add base resolver
FrancescoMolinaro Dec 13, 2023
763311e
add navigation resolver config
FrancescoMolinaro Dec 13, 2023
f4d0217
add navigation resolver config
FrancescoMolinaro Dec 13, 2023
86ccd8a
finalize resolver, service and tests
FrancescoMolinaro Dec 14, 2023
f2a2433
fix lint
FrancescoMolinaro Dec 14, 2023
90ad316
fix issue with edit and creation, unify files, refactor
FrancescoMolinaro Dec 14, 2023
8e4408f
fix lint
FrancescoMolinaro Dec 14, 2023
6a202bd
fix rest, add initialization param
FrancescoMolinaro Dec 14, 2023
3177a8c
add notification on patterns delete, small restyle
FrancescoMolinaro Dec 15, 2023
e280666
variable rename
FrancescoMolinaro Dec 15, 2023
339225e
Merged in CST-12915-edit-message-ldn (pull request #1110)
FrancescoMolinaro Dec 18, 2023
8c6daf7
Merged in CST-12863-CST-12940-ldn-services-improvments (pull request …
FrancescoMolinaro Dec 18, 2023
a483b30
resolve conflicts
FrancescoMolinaro Dec 18, 2023
9287045
add spaces on import
FrancescoMolinaro Dec 18, 2023
128dd2f
add mutliple request config
FrancescoMolinaro Dec 21, 2023
6d16bf3
add flush operation, fix lint, refactor
FrancescoMolinaro Dec 21, 2023
11bb71e
fix import spaces
FrancescoMolinaro Dec 22, 2023
ad723a6
Merged in CST-12914-ldn-breadcrumbs (pull request #1115)
FrancescoMolinaro Dec 22, 2023
24ad516
fix dropdown overflow and bar z-index
FrancescoMolinaro Dec 27, 2023
dfe4b15
CST-12868 remove Outbound Patterns
frabacche Jan 8, 2024
7692af1
merge UI improvements
FrancescoMolinaro Jan 11, 2024
7e25384
adapt ui improvements due to missing outbound patterns
FrancescoMolinaro Jan 11, 2024
f20f6a7
Merged in CST-12766-porting-from-part-2 (pull request #1202)
FrancescoMolinaro Jan 11, 2024
ccb5444
add base template and validator
FrancescoMolinaro Jan 11, 2024
1002a4d
add to shared module
FrancescoMolinaro Jan 11, 2024
d1e5287
refactor add tests for validator
FrancescoMolinaro Jan 12, 2024
b5fa46c
merge coar-notify-7
FrancescoMolinaro Jan 12, 2024
7a5b52f
fix lint, change translation, clean up component
FrancescoMolinaro Jan 12, 2024
c6993ae
Merge branch 'main' into coar-notify-7
alisaismailati Jan 12, 2024
96a6b80
add test fix mocks
FrancescoMolinaro Jan 12, 2024
3ae4304
fixed errors
alisaismailati Jan 12, 2024
565f723
Merge branch 'CST-12791-merge-main-to-coar' into coar-CST-12791
alisaismailati Jan 12, 2024
11a8077
add ldn services test
FrancescoMolinaro Jan 12, 2024
3a87044
remove unused param
FrancescoMolinaro Jan 12, 2024
fc11a1a
CST-12820 coar qaevent view ServiceId on ServiceName
frabacche Jan 12, 2024
ca8757f
Merge branch 'coar-notify-7' of bitbucket.org:4Science/dspace-angular…
frabacche Jan 12, 2024
16b9a14
[CST-12791] rename of files & components by removing admin
alisaismailati Jan 12, 2024
2ecc782
Merged in CST-12791-merge-main-to-coar (pull request #1204)
alisaismailati Jan 15, 2024
b9d8658
Merged in coar-CST-12791 (pull request #1073)
alisaismailati Jan 15, 2024
20efab2
Merged in CST-13039-multiple-request-patterns (pull request #1141)
FrancescoMolinaro Jan 15, 2024
fb1d20a
fix action type error
FrancescoMolinaro Jan 16, 2024
7ad2e1e
fix tests
FrancescoMolinaro Jan 17, 2024
a878696
CST-12820 QAEvent Service Name: to Service URL
frabacche Jan 17, 2024
8c10068
improve ldn form template
FrancescoMolinaro Jan 17, 2024
ae8e9fb
Merged in CST-12867-ip-range-for-ldn-service (pull request #1239)
FrancescoMolinaro Jan 17, 2024
890b333
Merge branch 'coar-notify-7' into CST-13315-improvements-part-1
FrancescoMolinaro Jan 17, 2024
37edb06
restore ip section
FrancescoMolinaro Jan 17, 2024
2589024
remove pointless double negation
FrancescoMolinaro Jan 17, 2024
9ee2ecf
fix style
FrancescoMolinaro Jan 17, 2024
034beb2
Merged in CST-13315-improvements-part-1 (pull request #1240)
FrancescoMolinaro Jan 17, 2024
db0c82b
CST-13401 add missing metadata
FrancescoMolinaro Jan 26, 2024
e0a30bd
CST-13405 fix QA breadcrumbs, ldn iprange hint
FrancescoMolinaro Jan 26, 2024
58da92d
Merged in CST-13405-ui-fine-tuning-part-1 (pull request #1281)
FrancescoMolinaro Jan 26, 2024
5bf9cea
Merged in CST-13401-coar-metadata (pull request #1280)
FrancescoMolinaro Jan 26, 2024
3561063
Merge branch 'main' into coar-notify-7
FrancescoMolinaro Feb 9, 2024
c860faa
Align translations
FrancescoMolinaro Feb 9, 2024
c09a6e8
Merge branch 'main' into coar-notify-7
FrancescoMolinaro Feb 13, 2024
62dc53d
Fix merge conflicts with main
FrancescoMolinaro Feb 13, 2024
47f1b84
Merge branch 'main' into coar-notify-7
FrancescoMolinaro Feb 14, 2024
2b33397
fix conflicts with main
FrancescoMolinaro Feb 14, 2024
a249cf5
Merge branch 'main' into coar-notify-7
FrancescoMolinaro Feb 16, 2024
6380abc
Fix merge conflicts
FrancescoMolinaro Feb 16, 2024
251729e
fix empty result js error
FrancescoMolinaro Feb 16, 2024
f4f48c8
Merged in align-coar-notify-7-with-main (pull request #1366)
FrancescoMolinaro Feb 16, 2024
9336e79
FIx issues from main alignment, remove leftover removed in Suggestion PR
FrancescoMolinaro Feb 19, 2024
a64e4c9
remove duplicated log, unused translations, refactor ldn discard button
FrancescoMolinaro Feb 21, 2024
ff1444b
coar-notify-7 LDN Service menu show/hide configuration
frabacche Feb 22, 2024
97dfe79
Merge branch 'coar-notify-7' of bitbucket.org:4Science/dspace-angular…
frabacche Feb 22, 2024
7e11b74
coar-notify-7 remove useless files
frabacche Feb 22, 2024
58c8dd6
Merge remote-tracking branch 'github/main' into coar-notify-7
frabacche Feb 22, 2024
fbab8ef
Merge remote-tracking branch 'origin/main' into coar-notify-7
frabacche Feb 22, 2024
57b777b
fix suggestion.service.ts main merge
frabacche Feb 22, 2024
1f80d7f
qa-coar-notify-logo.png file
frabacche Feb 22, 2024
e4a0340
LDN Service link always visible to admin
frabacche Feb 22, 2024
c3d5b4c
remove coar-notify.enable config, use ldn.enabled instead
frabacche Feb 22, 2024
2b57275
map constraints, add guard, small restyle (badge), remove unused patt…
FrancescoMolinaro Feb 26, 2024
fbd5dd4
Merge remote-tracking branch 'origin/main' into coar-notify-7
frabacche Feb 26, 2024
14976e0
fix Test errors, hide COAR requests with no LDN associable
frabacche Feb 26, 2024
03ee758
update filter labels
FrancescoMolinaro Feb 26, 2024
153cbc1
Merge remote-tracking branch 'origin/main' into coar-notify-7
frabacche Feb 27, 2024
c1b2282
en double label
frabacche Feb 27, 2024
3ed617e
NOtifyService item-filter patch fix
frabacche Feb 27, 2024
6be10a8
fix section data load for coar section in submission
FrancescoMolinaro Feb 27, 2024
aaf0ce2
coar-notify-7 item submission coar section show label if no inbound p…
frabacche Feb 27, 2024
47a907c
Merge branch 'main' into coar-notify-7
FrancescoMolinaro Feb 28, 2024
5eb2405
resolve conflicts after main alignment
FrancescoMolinaro Feb 28, 2024
6fc4c05
Merge branch 'main' into coar-notify-7
FrancescoMolinaro Feb 29, 2024
cd6a00e
resolve conflicts after alignment with main
FrancescoMolinaro Feb 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { LdnServicesOverviewComponent } from './ldn-services-directory/ldn-services-directory.component';
import { NavigationBreadcrumbResolver } from '../../core/breadcrumbs/navigation-breadcrumb.resolver';
import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
import { LdnServiceFormComponent } from './ldn-service-form/ldn-service-form.component';


const moduleRoutes: Routes = [
{
path: '',
pathMatch: 'full',
component: LdnServicesOverviewComponent,
resolve: {breadcrumb: I18nBreadcrumbResolver},
data: {title: 'ldn-registered-services.title', breadcrumbKey: 'ldn-registered-services.new'},
},
{
path: 'new',
resolve: {breadcrumb: NavigationBreadcrumbResolver},
component: LdnServiceFormComponent,
data: {title: 'ldn-register-new-service.title', breadcrumbKey: 'ldn-register-new-service'}
},
{
path: 'edit/:serviceId',
resolve: {breadcrumb: NavigationBreadcrumbResolver},
component: LdnServiceFormComponent,
data: {title: 'ldn-edit-service.title', breadcrumbKey: 'ldn-edit-service'}
},
];


@NgModule({
imports: [
RouterModule.forChild(moduleRoutes.map(route => {
return {...route, data: {
...route.data,
relatedRoutes: moduleRoutes.filter(relatedRoute => relatedRoute.path !== route.path)
.map((relatedRoute) => {
return {path: relatedRoute.path, data: relatedRoute.data};
})
}};
}))
]
})
export class AdminLdnServicesRoutingModule {

}
25 changes: 25 additions & 0 deletions src/app/admin/admin-ldn-services/admin-ldn-services.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { AdminLdnServicesRoutingModule } from './admin-ldn-services-routing.module';
import { LdnServicesOverviewComponent } from './ldn-services-directory/ldn-services-directory.component';
import { SharedModule } from '../../shared/shared.module';
import { LdnServiceFormComponent } from './ldn-service-form/ldn-service-form.component';
import { FormsModule } from '@angular/forms';
import { LdnItemfiltersService } from './ldn-services-data/ldn-itemfilters-data.service';


@NgModule({
imports: [
CommonModule,
SharedModule,
AdminLdnServicesRoutingModule,
FormsModule
],
declarations: [
LdnServicesOverviewComponent,
LdnServiceFormComponent,
],
providers: [LdnItemfiltersService]
})
export class AdminLdnServicesModule {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,310 @@
<div class="container">
<form (ngSubmit)="onSubmit()" [formGroup]="formModel">
<div class="d-flex">
<h1 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translate) : ('ldn-edit-registered-service.title' | translate) }}</h1>
</div>
<!-- In the toggle section -->
<div class="toggle-switch-container" *ngIf="!isNewService">
<label class="status-label font-weight-bold" for="enabled">{{ 'ldn-service-status' | translate }}</label>
<div>
<input formControlName="enabled" hidden id="enabled" name="enabled" type="checkbox">
<div (click)="toggleEnabled()" [class.checked]="formModel.get('enabled').value" class="toggle-switch">
<div class="slider"></div>
</div>
</div>
</div>
<!-- In the Name section -->
<div class="mb-5">
<label for="name" class="font-weight-bold">{{ 'ldn-new-service.form.label.name' | translate }}</label>
<input [class.invalid-field]="formModel.get('name').invalid && formModel.get('name').touched"
[placeholder]="'ldn-new-service.form.placeholder.name' | translate" class="form-control"
formControlName="name"
id="name"
name="name"
type="text">
<div *ngIf="formModel.get('name').invalid && formModel.get('name').touched" class="error-text">
{{ 'ldn-new-service.form.error.name' | translate }}
</div>
</div>

<!-- In the description section -->
<div class="mb-5 mt-5 d-flex flex-column">
<label for="description" class="font-weight-bold">{{ 'ldn-new-service.form.label.description' | translate }}</label>
<textarea [placeholder]="'ldn-new-service.form.placeholder.description' | translate"
class="form-control" formControlName="description" id="description" name="description"></textarea>
</div>

<div class="mb-5 mt-5">
<!-- In the url section -->
<div class="d-flex align-items-center">
<div class="d-flex flex-column w-50 mr-2">
<label for="url" class="font-weight-bold">{{ 'ldn-new-service.form.label.url' | translate }}</label>
<input [class.invalid-field]="formModel.get('url').invalid && formModel.get('url').touched"
[placeholder]="'ldn-new-service.form.placeholder.url' | translate" class="form-control"
formControlName="url"
id="url"
name="url"
type="text">
<div *ngIf="formModel.get('url').invalid && formModel.get('url').touched" class="error-text">
{{ 'ldn-new-service.form.error.url' | translate }}
</div>
</div>

<div class="d-flex flex-column w-50">
<label for="score" class="font-weight-bold">{{ 'ldn-new-service.form.label.score' | translate }}</label>
<input [class.invalid-field]="formModel.get('score').invalid && formModel.get('score').touched"
[placeholder]="'ldn-new-service.form.placeholder.score' | translate" formControlName="score"
id="score"
name="score"
min="0"
max="1"
step=".01"
class="form-control"
type="number">
<div *ngIf="formModel.get('score').invalid && formModel.get('score').touched" class="error-text">
{{ 'ldn-new-service.form.error.score' | translate }}
</div>
</div>
</div>
</div>

<!-- In the IP range section -->
<div class="mb-5 mt-5">
<label for="lowerIp" class="font-weight-bold">{{ 'ldn-new-service.form.label.ip-range' | translate }}</label>
<div class="d-flex">
<input [class.invalid-field]="formModel.get('lowerIp').invalid && formModel.get('lowerIp').touched"
[placeholder]="'ldn-new-service.form.placeholder.lowerIp' | translate" class="form-control mr-2"
formControlName="lowerIp"
id="lowerIp"
name="lowerIp"
type="text">
<input [class.invalid-field]="formModel.get('upperIp').invalid && formModel.get('upperIp').touched"
[placeholder]="'ldn-new-service.form.placeholder.upperIp' | translate" class="form-control"
formControlName="upperIp"
id="upperIp"
name="upperIp"
type="text">
</div>
<div *ngIf="(formModel.get('lowerIp').invalid && formModel.get('lowerIp').touched) || (formModel.get('upperIp').invalid && formModel.get('upperIp').touched)" class="error-text">
{{ 'ldn-new-service.form.error.ipRange' | translate }}
</div>
<div class="text-muted">
{{ 'ldn-new-service.form.hint.ipRange' | translate }}
</div>
</div>

<!-- In the ldnUrl section -->
<div class="mb-5 mt-5">
<label for="ldnUrl" class="font-weight-bold">{{ 'ldn-new-service.form.label.ldnUrl' | translate }}</label>
<input [class.invalid-field]="formModel.get('ldnUrl').invalid && formModel.get('ldnUrl').touched"
[placeholder]="'ldn-new-service.form.placeholder.ldnUrl' | translate" class="form-control"
formControlName="ldnUrl"
id="ldnUrl"
name="ldnUrl"
type="text">
<div *ngIf="formModel.get('ldnUrl').invalid && formModel.get('ldnUrl').touched" class="error-text">
{{ 'ldn-new-service.form.error.ldnurl' | translate }}
</div>
</div>


<!-- In the Inbound Patterns Labels section -->
<div class="row mb-1 mt-5" *ngIf="areControlsInitialized">
<div class="col">
<label class="font-weight-bold">{{ 'ldn-new-service.form.label.inboundPattern' | translate }} </label>
</div>
<ng-container *ngIf="formModel.get('notifyServiceInboundPatterns')['controls'][0]?.value?.pattern">
<div class="col">
<label class="font-weight-bold">{{ 'ldn-new-service.form.label.ItemFilter' | translate }}</label>
</div>
<div class="col-sm-1">
<label class="font-weight-bold">{{ 'ldn-new-service.form.label.automatic' | translate }}</label>
</div>
</ng-container>
<div class="col-sm-2">
</div>
</div>

<!-- In the Inbound Patterns section -->
<div *ngIf="areControlsInitialized">
<div *ngFor="let patternGroup of formModel.get('notifyServiceInboundPatterns')['controls']; let i = index"
[class.marked-for-deletion]="markedForDeletionInboundPattern.includes(i)"
formGroupName="notifyServiceInboundPatterns">

<ng-container [formGroupName]="i">


<div class="row mb-1 align-items-center">
<div class="col">
<div #inboundPatternDropdown="ngbDropdown" class="w-80" display="dynamic"
id="additionalInboundPattern{{i}}"
ngbDropdown placement="top-start">
<div class="position-relative right-addon" role="combobox" aria-expanded="false" aria-controls="inboundPatternDropdownButton">
<i aria-hidden="true" class="position-absolute scrollable-dropdown-toggle"
ngbDropdownToggle></i>
<input
(click)="inboundPatternDropdown.open();"
[readonly]="true"
[value]="selectedInboundPatterns"
class="form-control w-80 scrollable-dropdown-input"
formControlName="patternLabel"
id="inboundPatternDropdownButton"
ngbDropdownAnchor
type="text"
[attr.aria-label]="'ldn-service-input-inbound-pattern-dropdown' | translate"
/>
tdonohue marked this conversation as resolved.
Show resolved Hide resolved
<div aria-labelledby="inboundPatternDropdownButton"
class="dropdown-menu dropdown-menu-top w-100 "
ngbDropdownMenu>
<div class="scrollable-menu" role="listbox">
<button (click)="selectInboundPattern(pattern, i); $event.stopPropagation()"
*ngFor="let pattern of inboundPatterns; let internalIndex = index"
[title]="'ldn-service.form.pattern.' + pattern + '.description' | translate"
class="dropdown-item collection-item text-truncate w-100"
ngbDropdownItem
type="button">
<div>{{ 'ldn-service.form.pattern.' + pattern + '.label' | translate }}</div>
</button>
</div>
</div>
</div>
</div>
</div>

<div class="col">
<ng-container
*ngIf="formModel.get('notifyServiceInboundPatterns')['controls'][i].value.pattern">
<div #inboundItemfilterDropdown="ngbDropdown" class="w-100" id="constraint{{i}}" ngbDropdown
placement="top-start">
<div class="position-relative right-addon" aria-expanded="false" aria-controls="inboundItemfilterDropdown" role="combobox">
<i aria-hidden="true" class="position-absolute scrollable-dropdown-toggle"
ngbDropdownToggle></i>
<input
[readonly]="true"
class="form-control d-none w-100 scrollable-dropdown-input"
formControlName="constraint"
id="inboundItemfilterDropdown"
ngbDropdownAnchor
type="text"
[attr.aria-label]="'ldn-service-input-inbound-item-filter-dropdown' | translate"
/>
<input
(click)="inboundItemfilterDropdown.open();"
[readonly]="true"
class="form-control w-100 scrollable-dropdown-input"
formControlName="constraintFormatted"
id="inboundItemfilterDropdownPrettified"
ngbDropdownAnchor
type="text"
[attr.aria-label]="'ldn-service-input-inbound-item-filter-dropdown' | translate"
/>
tdonohue marked this conversation as resolved.
Show resolved Hide resolved
<div aria-labelledby="inboundItemfilterDropdownButton"
class="dropdown-menu scrollable-dropdown-menu w-100 "
ngbDropdownMenu>
<div class="scrollable-menu" role="listbox">
<button (click)="selectInboundItemFilter('', i); $event.stopPropagation()"
class="dropdown-item collection-item text-truncate w-100" ngbDropdownItem type="button">
<span> {{'ldn-service.control-constaint-select-none' | translate}} </span>
</button>
<button (click)="selectInboundItemFilter(constraint.id, i); $event.stopPropagation()"
*ngFor="let constraint of (itemfiltersRD$ | async)?.payload?.page; let internalIndex = index"
class="dropdown-item collection-item text-truncate w-100"
ngbDropdownItem
type="button">
<div>{{ constraint.id + '.label' | translate }}</div>
</button>
</div>
</div>
</div>
</div>
</ng-container>
</div>

<div
[style.visibility]="formModel.get('notifyServiceInboundPatterns')['controls'][i].value.pattern ? 'visible' : 'hidden'"
class="col-sm-1">
<input formControlName="automatic" hidden id="automatic{{i}}" name="automatic{{i}}"
type="checkbox">
<div (click)="toggleAutomatic(i)"
[class.checked]="formModel.get('notifyServiceInboundPatterns.' + i + '.automatic').value"
class="toggle-switch">
<div class="slider"></div>
</div>
</div>


<div class="col-sm-2">
<div class="btn-group">
<button (click)="markForInboundPatternDeletion(i)" class="btn btn-outline-dark trash-button"
tdonohue marked this conversation as resolved.
Show resolved Hide resolved
[title]="'ldn-service-button-mark-inbound-deletion' | translate"
type="button">
<i class="fas fa-trash"></i>
</button>


<button (click)="unmarkForInboundPatternDeletion(i)"
*ngIf="markedForDeletionInboundPattern.includes(i)"
[title]="'ldn-service-button-unmark-inbound-deletion' | translate"
class="btn btn-warning "
type="button">
<i class="fas fa-undo"></i>
</button>
</div>
</div>
</div>
</ng-container>
</div>
</div>

<span (click)="addInboundPattern()"
class="add-pattern-link mb-2">{{ 'ldn-new-service.form.label.addPattern' | translate }}</span>

<div class="submission-form-footer my-1 position-sticky d-flex justify-content-between" role="group">
<button (click)="resetFormAndLeave()" class="btn btn-primary" type="button">
<span>&nbsp;{{ 'submission.general.back.submit' | translate }}</span>
</button>
<button class="btn btn-primary" type="submit">
<span><i class="fas fa-save"></i>&nbsp;{{ 'ldn-new-service.form.label.submit' | translate }}</span>
</button>
</div>
</form>
</div>
<ng-template #confirmModal>
<div class="modal-header">
<h4 *ngIf="!isNewService">{{'service.overview.edit.modal' | translate }}</h4>
<h4 *ngIf="isNewService">{{'service.overview.create.modal' | translate }}</h4>
<button (click)="closeModal()" aria-label="Close"
class="close" type="button">
<span aria-hidden="true">×</span>
</button>
</div>

<div class="modal-body">
<div *ngIf="!isNewService">
{{ 'service.overview.edit.body' | translate }}
</div>
<span *ngIf="isNewService">
{{ 'service.overview.create.body' | translate }}
</span>
</div>
<div class="modal-footer">
<div *ngIf="!isNewService">
<button (click)="closeModal()" class="btn btn-danger mr-2"
id="delete-confirm-edit">{{ 'service.detail.return' | translate }}
</button>
<button *ngIf="!isNewService" (click)="patchService()"
class="btn btn-primary">{{ 'service.detail.update' | translate }}
</button>
</div>
<div *ngIf="isNewService">
<button (click)="closeModal()" class="btn btn-danger mr-2 "
id="delete-confirm-new">{{ 'service.refuse.create' | translate }}
</button>
<button (click)="createService()"
class="btn btn-primary">{{ 'service.confirm.create' | translate }}
</button>
</div>
</div>
</ng-template>


Loading
Loading