Adjust nginx configuration for about pages #657

lukasrad02 · 2023-02-07T15:33:54Z

The about pages request the content for the pages from the server and rely on the server to answer either 200 if the file exists or 404 if the file doesn't. If the file doesn't exist, the page should show a hint how to customize this page.

Since the application uses client-side routing, the server serves the index.html for all requests where a file with a matching name could not be found. This breaks the functionality of the about pages.

This PR adjusts the configuration of the nginx in the docker container to fix the bug for the about pages while preserving the ability of client-side-routing.

anonym-HPI · 2023-02-07T16:27:04Z

Seems to work, mostly.
But using a path like: /assets/about/non-existent-file will result in an nginx 404.
This is not that important, as someone needs to enter such a path probably manually and for crawlers or other automatic requests it is still a 404.

One way is to just add the following:

error_page 404 /404.html;
As long as /404.html doesn't exist it will return 404, but this makes it so that the themed 404 page is returned.
Could be also /non-existent-page.html or so.
This could also be maybe be used, with documentation, so that people can create there custom 404 page by providing it at this location. But then we would have again the problem that the JS doesn't get a 404, but maybe people that create a custom 404 page, would already have license, imprint and privacy in place?

What I found is that it says "Go back to previous page" on the Imprint, Privacy and License page. Maybe it should be a link to the startpage?

lukasrad02 · 2023-02-08T08:12:27Z

error_page 404 /404.html; As long as /404.html doesn't exist it will return 404, but this makes it so that the themed 404 page is returned. Could be also /non-existent-page.html or so. This could also be maybe be used, with documentation, so that people can create there custom 404 page by providing it at this location. But then we would have again the problem that the JS doesn't get a 404, but maybe people that create a custom 404 page, would already have license, imprint and privacy in place?

As long as the status code is still 404, it should work no matter what HTML file will be delivered. As you've noticed yourself, nginx serves a default 404 page too and this does not affect the functionality of the imprint/privacy/license pages. But I'm nut sure whether this is worth the work. And having two kinds of 404 pages (the one in the frontend and the one for nginx) causes just some additional complexity.

What I found is that it says "Go back to previous page" on the Imprint, Privacy and License page. Maybe it should be a link to the startpage?

A link to the landing page might be better for situations in which someone navigated between the three about pages several times and then has to use the "back" link for the same number of times. On the other hand, there are also links to the about pages on the exercise pages. for a participant using this links (no matter whether by accident or not), a link to the landing page is not as useful as a "back" link.

I've built the navigation in a way that the links on the exercise page will open in a new tab so that the "back" link just closes the additional tab an no session information is lost (i.e., the participant do not has to be approved and assigned to a viewport again). In this scenario, the link might have no benefit over closing the tab in the browser's default way (clicking the "x" button of the tab), but these controls might be hidden if the exercise runs in full screen mode.

That's why I've built the link the way it is.

anonym-HPI · 2023-02-09T13:17:58Z

error_page 404 /404.html; As long as /404.html doesn't exist it will return 404, but this makes it so that the themed 404 page is returned. Could be also /non-existent-page.html or so. This could also be maybe be used, with documentation, so that people can create there custom 404 page by providing it at this location. But then we would have again the problem that the JS doesn't get a 404, but maybe people that create a custom 404 page, would already have license, imprint and privacy in place?

As long as the status code is still 404, it should work no matter what HTML file will be delivered. As you've noticed yourself, nginx serves a default 404 page too and this does not affect the functionality of the imprint/privacy/license pages. But I'm nut sure whether this is worth the work. And having two kinds of 404 pages (the one in the frontend and the one for nginx) causes just some additional complexity.

Without adding the error_page 404 /non_existent_page.html; we would have two different 404 pages.
With it (as long as the page doesn't exist) we would have only the Angular themed page, else we would have everywhere the Angular themed 404 page, but for files not existing in /assets/about, these would result in a 404 nginx page.
Probably nobody is getting to such a page accidently, so we could leave the nginx page, but we could also put the error_page 404 /non_existent_page.html; in the config to have everywhere the Angular themed error page.

What I found is that it says "Go back to previous page" on the Imprint, Privacy and License page. Maybe it should be a link to the startpage?

A link to the landing page might be better for situations in which someone navigated between the three about pages several times and then has to use the "back" link for the same number of times. On the other hand, there are also links to the about pages on the exercise pages. for a participant using this links (no matter whether by accident or not), a link to the landing page is not as useful as a "back" link.

I've built the navigation in a way that the links on the exercise page will open in a new tab so that the "back" link just closes the additional tab an no session information is lost (i.e., the participant do not has to be approved and assigned to a viewport again). In this scenario, the link might have no benefit over closing the tab in the browser's default way (clicking the "x" button of the tab), but these controls might be hidden if the exercise runs in full screen mode.

That's why I've built the link the way it is.

Geet it, but on phone or desktop, the link is not opened in a new tab (at least the links on pages itself or home page, which is fine, as they are not in an exercise).
What I would propose to have the title clickable (or if we had a logo, this one) or add a button "Going to Homepage" or so.

lukasrad02 · 2023-02-09T14:30:55Z

error_page 404 /404.html; As long as /404.html doesn't exist it will return 404, but this makes it so that the themed 404 page is returned. Could be also /non-existent-page.html or so. This could also be maybe be used, with documentation, so that people can create there custom 404 page by providing it at this location. But then we would have again the problem that the JS doesn't get a 404, but maybe people that create a custom 404 page, would already have license, imprint and privacy in place?

As long as the status code is still 404, it should work no matter what HTML file will be delivered. As you've noticed yourself, nginx serves a default 404 page too and this does not affect the functionality of the imprint/privacy/license pages. But I'm nut sure whether this is worth the work. And having two kinds of 404 pages (the one in the frontend and the one for nginx) causes just some additional complexity.

Without adding the error_page 404 /non_existent_page.html; we would have two different 404 pages. With it (as long as the page doesn't exist) we would have only the Angular themed page, else we would have everywhere the Angular themed 404 page, but for files not existing in /assets/about, these would result in a 404 nginx page. Probably nobody is getting to such a page accidently, so we could leave the nginx page, but we could also put the error_page 404 /non_existent_page.html; in the config to have everywhere the Angular themed error page.

Ah, I thought nginx would always search for a file named /non_existent_page.html (wich does not exist) and would not handle it like a new request. But since it works the way you're describing it, I agree with you that we should add this. I'm going to work on this and will also add the same line for 403 to make it work for requests for /assets/about, too.

What I found is that it says "Go back to previous page" on the Imprint, Privacy and License page. Maybe it should be a link to the startpage?

A link to the landing page might be better for situations in which someone navigated between the three about pages several times and then has to use the "back" link for the same number of times. On the other hand, there are also links to the about pages on the exercise pages. for a participant using this links (no matter whether by accident or not), a link to the landing page is not as useful as a "back" link.
I've built the navigation in a way that the links on the exercise page will open in a new tab so that the "back" link just closes the additional tab an no session information is lost (i.e., the participant do not has to be approved and assigned to a viewport again). In this scenario, the link might have no benefit over closing the tab in the browser's default way (clicking the "x" button of the tab), but these controls might be hidden if the exercise runs in full screen mode.
That's why I've built the link the way it is.

Geet it, but on phone or desktop, the link is not opened in a new tab (at least the links on pages itself or home page, which is fine, as they are not in an exercise). What I would propose to have the title clickable (or if we had a logo, this one) or add a button "Going to Homepage" or so.

Okay, I'll try what works best. I'm not sure whether clickable titles are intuitive enough if they're not styled like a link and styled links in <h1> size might be to obtrusive...

lukasrad02 · 2023-02-09T15:15:37Z

Here are two possible designs for the link to the landing page. Do you prefer one of them @anonym-HPI?

anonym-HPI · 2023-02-09T15:35:28Z

Would say the second one. Not 100% sure about the order of "back" and "home". In most browsers this is the chosen order and makes sense to have back on the left.

anonym-HPI · 2023-02-09T15:51:41Z

error_page 404 works in the way, that when nginx would serve its default 404 page, it instead would then serve this custom page. But in our case as /non_existent_page.html is handled by the location / including the try_files $uri $uri/ /index.html it will try to find the file, as the file does not exist it will server the index.html, which will result in the Angular 404 page.
Same for other http status codes that are themed (like you mentioned - but if you want a themed 403 page, you would need to create one first, it seems, look for error-404 in frontend/src/app/pages/error-404).
I thought maybe this page would land in the dist folder, so the way with /non_existent_page.html is not even needed, but seems to be, as frontend/dist is very empty, no error-404 page in sight, probably in some .js file included.
Not sure how error_page 403 would work, when trying to connect to a page that doesn't exist, if it would result in a 404.
Also for what do you think we would need 403 (forbidden)? No content on the server right now is containing any secrets that are authentication protected and should be not retrievable. Actually every file can be accessed without any authentication. Authentication is via the API and to the exercises, but these are in memory or in the database and not files.

docker/nginx/locations

The error pages do not rely on a non-existing URL any longer

anonym-HPI

Can be merged, but you have written about 403. Right now when you reach a 403 site, it shows the 404 page. This is fine, but if you want a different one, I would suggest adding it in this PR.

lukasrad02 · 2023-02-15T17:44:21Z

Can be merged, but you have written about 403. Right now when you reach a 403 site, it shows the 404 page. This is fine, but if you want a different one, I would suggest adding it in this PR.

It is on purpose, since the 403 from nginx should only occur if you're trying to access a directory without an index.html which is effectively a "Not found", since you're requesting a path which serves no content.

* Improve validation (hpi-sam#125) * Improve validation by introducing multiple new validation decorators * `IsIdMap` for types of the form `{ readonly [key: UUID]: T }`. This transforms the object, so using instance objects (instead of plain objects) will no longer be supported. * `IsLiteralUnion` for literal unions of types `number | string | symbol` (e.g. `participant | trainer`). Uses `isIn` internally. * `IsReachableTransferPoints` for `ReachableTransferPoints` used in `TransferPoint`. Very specific but necessary due to the unique structure of this type. * `IsUUIDSet` for `UUIDSet` * `IsValue` for *simple* values that are required for a property. For example, when a `type` property has to have the value `'partial'`, one can use `@IsValue('partial')` for this. Allowed are the types `bigint | boolean | number | string | symbol | null | undefined`. The reason is that this validator also uses `isIn` internally, which in turn uses `===` which might produce incorrect results for `object` values. * All validators are required to be applied to correctly types properties by the use of `GenericPropertyDecorator`. Using e.g. `@IsLiteralUnion({ partial: true, complete: true })` on a property typed `string` raises a TypeScript error. Co-authored-by: Julian Schmidt <julian.r.schmidt.js@gmail.com> * Feature/state benchmark (hpi-sam#581) * Move state migrations to shared * Add benchmark package * Update readmes * Make problem with duplicated RestoreError more obvious * Feature/improve eslint rules (hpi-sam#591) * Disallow imports from "*/dist/*" * Improve smaller eslint rules * Update documentation * Update packages to mitigate GHSA-9c47-m6qq-7p4h (hpi-sam#592) * Update dependencies (hpi-sam#595) * Update dependencies * typescript@4.9 (satisfies-operator and watch-performance-improvements) * angular@15.1 * Else only patch and minor version bumps * Fix version of @types/node in benchmark and frontend (18 -> 16) * Run prettier * Add simulated regions that can be placed on the map (hpi-sam#601) * Add simulated regions that can be placed on the map * Fix naming * Add migration * Fix linter error * Move simulated region to separate heading in trainer map editor * Turn isInSimulatedRegion into a stub method * Refactor ol-map-manager to reuse some features from viewport in simulatedRegion * Ignore vs code config files (hpi-sam#606) * Rename VS Code configs to `.example` * Add new "Start all but database" task * Explain changes in readme * Refactor viewport-modify to resize-rectangle-interaction (hpi-sam#604) * Instead of using some parts of the `Modify` interaction (side-effect in the style function) a new custom Interaction has been created. * Previously, one could switch between resizing and translating a viewport via pressing `Shift`. Instead, now one ***resizes*** if one drags an edge of the viewport (+ a bit around it), and ***translates*** if one drags any other part. This should enable touch users to resize viewports * The code should now be more readable and extendable * The unnecessary `viewportTranslateInteraction` has been removed * `feature.dispose()` now gets called when it gets deleted - this could have been a memory leak? * Add link to main branch in readme (hpi-sam#611) * Close popups with esc (hpi-sam#610) * Add keydown handler to close popups on escape * Ensure input is saved even after less than 600ms * Cast event inline Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Add new image for big material and material (hpi-sam#544) * Add new image for big material and material Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix CVE-2022-25901 (hpi-sam#618) * Feature/597 regions can contain personnel and patients (hpi-sam#607) * Add MetaPosition type * Add MetaPosition to Vehicle * Add MetaPosition ro Personnel * Add MetaPosition to Material * Add MetaPosition to Patient * Add Classes for different Position Types * Use create when applicable and fix in MetaPosition * Add migration for addition of MetaPosition * refactor literals to start with lowercase * Change nested if else to else if * Make metaPosition not optional * Fix failing Tests * Update shared/src/models/material.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/models/patient.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/models/personnel.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/patient.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/utils/calculate-treatments.spec.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/vehicle.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix Prettier Errors * Change Validation to Allow * Put personnel and material in vehicle on creation * Update shared/src/store/action-reducers/transfer.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix Pipeline dependencies * Update shared/src/state-migrations/16-add-meta-position.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix linter Error * Add validators to MetaPositions * Remove unused imports * Fix Validators * Add/Fix Action Migrations * Add Exports to Index.ts * Update shared/src/store/action-reducers/utils/spatial-elements.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/vehicle.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix Lint Co-authored-by: Nils <45318774+Nils1729@users.noreply.github.com> Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Initialize the optimisticUpdateHandler only after the store has the exercise (hpi-sam#622) * Fixes "Features disappear from the map in imported exercises" hpi-sam#621 * Can be observed when two actions are simultaneously optimistically proposed, and the client didn't receive any other action from the server before * Patients are automatically triaged without any personnel on the map (hpi-sam#624) * Fix incorrect import of isEmpty This caused "Patients are automatically triaged without any personnel on the map" hpi-sam#623 * Disallow isEmpty imports from class-validator via eslint * Add Image for Johanniter Akademie NRW, Campus Münster der Johanniter-Unfall-Hilfe e.V. (JUH) (hpi-sam#619) * Add Image for Johanniter Akademie NRW, Campus Münster der Johanniter-Unfall-Hilfe e.V. (JUH) * Fix linter * Mention JUH in Readme * Scale down the malteser logo and add the new 22/23 project team to the landing page * Add our year to the landing page * Feature/603 use opaque fill style for simulated regions (hpi-sam#608) * Refactor viewports and simulated regions to be polygons instead of lines * Add opaque fill to simulated regions * Fix linter * WIP * Refactor Coordinates and Points to Compositions * Update readme accordingly * Change default type of SubstituteCoordinateForPoint to never as it should never happen * Fix typo * Increase alpha value to 80% * Fix bug where features did not sync their movement to other clients * Fix linter * Refactor lambda function to geometry helpers and refactor ElementFeature ElementFeature (which had to extend Feature<FeatureType>) has been replaced by Feature<FeatureType> because according to ol docs there are no classes extending Feature * Remove ElementManager.recreateFeature() * Refactor lambdas to function in Geometry Helper subclasses * Rename getNextPosition to interpolateCoordinates * Refactor polygon geometry helper names in map lambda function * Remove comment and type cast Co-authored-by: Julian Schmidt <julian.r.schmidt.js@gmail.com> * Change functions to arrow functions in Geometry Helpers to preserve `this` (hpi-sam#629) * Add type property to elements in the state (hpi-sam#616) * WIP * Pick specific selectors from TypeSelectorMap * Fix linter * Remove type property from feature * Fix bug after merge * Rename selector map to plural map and add validation * Simplify featureKeys * Fix tests by adding type property to demo objects * WIP: Add migration * Update shared/src/utils/type-state-selector-map.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Rename file to reflect variable name change * Replace type literals by element property * Run prettier * Finish migration * Fix migration to set correct type on EocLogEntry * Make imports consistent * Reuse literal union from transfer in exercise * Fix linter Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Remove unsupportedChangeProperties (hpi-sam#630) * Fix the Bug (hpi-sam#635) * Remove generic type LineString | Point in favor of the default Geometry (hpi-sam#634) * Remove generic type LineString | Point in favor of the default Geometry * Fix linter * Refactoring/612 refactor position (hpi-sam#625) * Add MetaPosition Helpers * Remove position property * Fix Lint * Unify access onto metaPosition * Fix Frontend * Remove Position Class * Remove Position from Tests * Rename MetaPosition to Position * Add Migration (not for Add vehicle Action) * complete the renaming * Fix Tests * Remove Transfer Property * Add Migration for Add Vehicle Action * Fix Small Bug * Use type properties instead of passed strings * Add comments * Fix Test * Fix Test * Fix Transfer Overview * Refactor Helper Methods to avoid duplicate Code * Change Names of Helper Functions * Added Comments to unused vars * Fix GHSA-rc47-6667-2j5j (hpi-sam#645) * Allow elements to be added to simulated regions (hpi-sam#626) * Allow elements to be added to simulated regions * Adapt Add to Simulated Region Action to type tags * Make linter happy * Use new position and bugfixes * Use proper function to create position * Refactor Start Point Literals (hpi-sam#642) * Refactor Start Point Literals * Add Migration * Enable Migration * Implement Feedback * Remove not needed types * Add footer and about pages (hpi-sam#643) * Add basic footer and empty about pages * Refactor structure of about pages * Add footer to 404 page * Add links from footer to exercise page * Run prettier * Display version number * Explain overwriting the pages in Docker deployment * Do not lint HTML files for about pages * Refactor template component * Rename title property since it's an html attribute * Make content observable * Rename template component Avoids confusion with angular concepts * Remove accidentally committed imprint dummy file * Remove commented-out footer from exercise page * Make Map movable on Drag with Pop Up (hpi-sam#649) * Make Map movable on Drag with Pop Up * Update pipeline actions to node 16 (hpi-sam#627) * Update pipeline actions to node 16 The old actions were based on Node 12, which has reached EOL. https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/ * Test previous version of cypress action again * Try cypress action v3 * Do not use cached cypress * Try a Cypress Config without actually calling Cypress * Try some more stuff... * Add Cypress as DevDependency to root * Re-enable default cypress tests * Remove version tag from cypress cache The tag was there for debugging purposes only * Invoke cypress in frontend subfolder * Try working-directory for cypress * Try --prefix for start * Retry --prefix before 'run' * Restore 5a9692d * Update package-lock.json --------- Co-authored-by: ClFeSc <68013019+ClFeSc@users.noreply.github.com> Co-authored-by: Nils <45318774+Nils1729@users.noreply.github.com> * Change mail address to feedback mailing list (hpi-sam#659) * Adapt treatment system to account for simulated regions (hpi-sam#658) * Adapt treatment system to account for simulated regions The treatment system no longer asserts that patients can only be treated on the map. * Please linter * Enable patient ticking in simulated regions * Fix extent calculation of viewports and simulated regions (hpi-sam#663) * Include simulated regions when fitting to view Also fixing a bug with negative extents * Fix viewport restriction with negative extent * Rename fit view method * Rename function at all occurrences * Fix isInViewport for negative extents * Satisfy linter * Avoid duplication in type definitions * Refactoring/609 refactor functionality from olmapmanager to featuremanagers (hpi-sam#662) * WIP * Move Layer Creation to Feature Managers * Move Registration into Feature managers * Complete Merge * Move Interactions to Interaction Manager * Move Popup Handling to Popup Manager * Move Satellite Layer to Satellite Layer manager * Minor Cleanup * Move files * Move Files * More Cleanup * More Cleanup * Fix a bug in participant mode * Clean up Map Interactions manager * Clean up Satellite Layer Manager * Fix Lint * Implement Feedback * Implement Feedback and change Parameter Order in onFeatureDropped * Implement Feedback and change Parameter Order in onFeatureDropped --------- Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Adjust nginx configuration for about pages (hpi-sam#657) * Adjust nginx configuration for about pages * Redirect invalid requests for a uniform 404 page * Add link to landing page on about pages * Improve error pages in nginx setup The error pages do not rely on a non-existing URL any longer --------- Co-authored-by: Marvin <68286419+anonym-HPI@users.noreply.github.com> * Set up simulation framework (hpi-sam#664) * Create draft for simulation data types * WIP: Simulate unloading of vehicles * WIP add debug helpers and make simulation work * WIP add typings and lint * Validate events * Fix never parameter in activity and behavior functions * Validate activities and behaviors * Introduce pseudo randomness for deterministic uuids * Add migrations for simulation * Rename SimulationActivity.terminate to onTerminate * Remove simulatedRegionId from VehicleArrivedEvent * Slight improvement to debugging buttons * Fix typo * Validate state in AddBehaviorAction * Incorporate suggestions from review * Fix randomness * Add generic DelayEventActivity * Fix DelayEventActivity * Please linter * Remove debug UI * Dragging onto the Map now triggers Drop Events (hpi-sam#671) * Dragging onto the Map now triggers Drop Events * Add our names to the readme (hpi-sam#672) * Use @noble/hashes instead of hash.js (hpi-sam#674) * Use @noble/hashes instead of hash.js * Fix install:all script * Add release workflow * Populate CHANGELOG.md * Update create-release-pr.yml * trigger pipeline * Prepare release v0.0.1-review --------- Co-authored-by: Clemens <68013019+ClFeSc@users.noreply.github.com> Co-authored-by: Julian Schmidt <julian.r.schmidt.js@gmail.com> Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> Co-authored-by: Lukas Hagen <43916057+Greenscreen23@users.noreply.github.com> Co-authored-by: Lukas Radermacher <49586507+lukasrad02@users.noreply.github.com> Co-authored-by: benn02 <82985280+benn02@users.noreply.github.com> Co-authored-by: Nils <45318774+Nils1729@users.noreply.github.com> Co-authored-by: Marvin <68286419+anonym-HPI@users.noreply.github.com> Co-authored-by: GitHub Actions <noreply@github.com>

* Improve validation (hpi-sam#125) * Improve validation by introducing multiple new validation decorators * `IsIdMap` for types of the form `{ readonly [key: UUID]: T }`. This transforms the object, so using instance objects (instead of plain objects) will no longer be supported. * `IsLiteralUnion` for literal unions of types `number | string | symbol` (e.g. `participant | trainer`). Uses `isIn` internally. * `IsReachableTransferPoints` for `ReachableTransferPoints` used in `TransferPoint`. Very specific but necessary due to the unique structure of this type. * `IsUUIDSet` for `UUIDSet` * `IsValue` for *simple* values that are required for a property. For example, when a `type` property has to have the value `'partial'`, one can use `@IsValue('partial')` for this. Allowed are the types `bigint | boolean | number | string | symbol | null | undefined`. The reason is that this validator also uses `isIn` internally, which in turn uses `===` which might produce incorrect results for `object` values. * All validators are required to be applied to correctly types properties by the use of `GenericPropertyDecorator`. Using e.g. `@IsLiteralUnion({ partial: true, complete: true })` on a property typed `string` raises a TypeScript error. Co-authored-by: Julian Schmidt <julian.r.schmidt.js@gmail.com> * Feature/state benchmark (hpi-sam#581) * Move state migrations to shared * Add benchmark package * Update readmes * Make problem with duplicated RestoreError more obvious * Feature/improve eslint rules (hpi-sam#591) * Disallow imports from "*/dist/*" * Improve smaller eslint rules * Update documentation * Update packages to mitigate GHSA-9c47-m6qq-7p4h (hpi-sam#592) * Update dependencies (hpi-sam#595) * Update dependencies * typescript@4.9 (satisfies-operator and watch-performance-improvements) * angular@15.1 * Else only patch and minor version bumps * Fix version of @types/node in benchmark and frontend (18 -> 16) * Run prettier * Add simulated regions that can be placed on the map (hpi-sam#601) * Add simulated regions that can be placed on the map * Fix naming * Add migration * Fix linter error * Move simulated region to separate heading in trainer map editor * Turn isInSimulatedRegion into a stub method * Refactor ol-map-manager to reuse some features from viewport in simulatedRegion * Ignore vs code config files (hpi-sam#606) * Rename VS Code configs to `.example` * Add new "Start all but database" task * Explain changes in readme * Refactor viewport-modify to resize-rectangle-interaction (hpi-sam#604) * Instead of using some parts of the `Modify` interaction (side-effect in the style function) a new custom Interaction has been created. * Previously, one could switch between resizing and translating a viewport via pressing `Shift`. Instead, now one ***resizes*** if one drags an edge of the viewport (+ a bit around it), and ***translates*** if one drags any other part. This should enable touch users to resize viewports * The code should now be more readable and extendable * The unnecessary `viewportTranslateInteraction` has been removed * `feature.dispose()` now gets called when it gets deleted - this could have been a memory leak? * Add link to main branch in readme (hpi-sam#611) * Close popups with esc (hpi-sam#610) * Add keydown handler to close popups on escape * Ensure input is saved even after less than 600ms * Cast event inline Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Add new image for big material and material (hpi-sam#544) * Add new image for big material and material Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix CVE-2022-25901 (hpi-sam#618) * Feature/597 regions can contain personnel and patients (hpi-sam#607) * Add MetaPosition type * Add MetaPosition to Vehicle * Add MetaPosition ro Personnel * Add MetaPosition to Material * Add MetaPosition to Patient * Add Classes for different Position Types * Use create when applicable and fix in MetaPosition * Add migration for addition of MetaPosition * refactor literals to start with lowercase * Change nested if else to else if * Make metaPosition not optional * Fix failing Tests * Update shared/src/models/material.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/models/patient.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/models/personnel.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/patient.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/utils/calculate-treatments.spec.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/vehicle.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix Prettier Errors * Change Validation to Allow * Put personnel and material in vehicle on creation * Update shared/src/store/action-reducers/transfer.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix Pipeline dependencies * Update shared/src/state-migrations/16-add-meta-position.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix linter Error * Add validators to MetaPositions * Remove unused imports * Fix Validators * Add/Fix Action Migrations * Add Exports to Index.ts * Update shared/src/store/action-reducers/utils/spatial-elements.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/vehicle.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix Lint Co-authored-by: Nils <45318774+Nils1729@users.noreply.github.com> Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Initialize the optimisticUpdateHandler only after the store has the exercise (hpi-sam#622) * Fixes "Features disappear from the map in imported exercises" hpi-sam#621 * Can be observed when two actions are simultaneously optimistically proposed, and the client didn't receive any other action from the server before * Patients are automatically triaged without any personnel on the map (hpi-sam#624) * Fix incorrect import of isEmpty This caused "Patients are automatically triaged without any personnel on the map" hpi-sam#623 * Disallow isEmpty imports from class-validator via eslint * Add Image for Johanniter Akademie NRW, Campus Münster der Johanniter-Unfall-Hilfe e.V. (JUH) (hpi-sam#619) * Add Image for Johanniter Akademie NRW, Campus Münster der Johanniter-Unfall-Hilfe e.V. (JUH) * Fix linter * Mention JUH in Readme * Scale down the malteser logo and add the new 22/23 project team to the landing page * Add our year to the landing page * Feature/603 use opaque fill style for simulated regions (hpi-sam#608) * Refactor viewports and simulated regions to be polygons instead of lines * Add opaque fill to simulated regions * Fix linter * WIP * Refactor Coordinates and Points to Compositions * Update readme accordingly * Change default type of SubstituteCoordinateForPoint to never as it should never happen * Fix typo * Increase alpha value to 80% * Fix bug where features did not sync their movement to other clients * Fix linter * Refactor lambda function to geometry helpers and refactor ElementFeature ElementFeature (which had to extend Feature<FeatureType>) has been replaced by Feature<FeatureType> because according to ol docs there are no classes extending Feature * Remove ElementManager.recreateFeature() * Refactor lambdas to function in Geometry Helper subclasses * Rename getNextPosition to interpolateCoordinates * Refactor polygon geometry helper names in map lambda function * Remove comment and type cast Co-authored-by: Julian Schmidt <julian.r.schmidt.js@gmail.com> * Change functions to arrow functions in Geometry Helpers to preserve `this` (hpi-sam#629) * Add type property to elements in the state (hpi-sam#616) * WIP * Pick specific selectors from TypeSelectorMap * Fix linter * Remove type property from feature * Fix bug after merge * Rename selector map to plural map and add validation * Simplify featureKeys * Fix tests by adding type property to demo objects * WIP: Add migration * Update shared/src/utils/type-state-selector-map.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Rename file to reflect variable name change * Replace type literals by element property * Run prettier * Finish migration * Fix migration to set correct type on EocLogEntry * Make imports consistent * Reuse literal union from transfer in exercise * Fix linter Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Remove unsupportedChangeProperties (hpi-sam#630) * Fix the Bug (hpi-sam#635) * Remove generic type LineString | Point in favor of the default Geometry (hpi-sam#634) * Remove generic type LineString | Point in favor of the default Geometry * Fix linter * Refactoring/612 refactor position (hpi-sam#625) * Add MetaPosition Helpers * Remove position property * Fix Lint * Unify access onto metaPosition * Fix Frontend * Remove Position Class * Remove Position from Tests * Rename MetaPosition to Position * Add Migration (not for Add vehicle Action) * complete the renaming * Fix Tests * Remove Transfer Property * Add Migration for Add Vehicle Action * Fix Small Bug * Use type properties instead of passed strings * Add comments * Fix Test * Fix Test * Fix Transfer Overview * Refactor Helper Methods to avoid duplicate Code * Change Names of Helper Functions * Added Comments to unused vars * Fix GHSA-rc47-6667-2j5j (hpi-sam#645) * Allow elements to be added to simulated regions (hpi-sam#626) * Allow elements to be added to simulated regions * Adapt Add to Simulated Region Action to type tags * Make linter happy * Use new position and bugfixes * Use proper function to create position * Refactor Start Point Literals (hpi-sam#642) * Refactor Start Point Literals * Add Migration * Enable Migration * Implement Feedback * Remove not needed types * Add footer and about pages (hpi-sam#643) * Add basic footer and empty about pages * Refactor structure of about pages * Add footer to 404 page * Add links from footer to exercise page * Run prettier * Display version number * Explain overwriting the pages in Docker deployment * Do not lint HTML files for about pages * Refactor template component * Rename title property since it's an html attribute * Make content observable * Rename template component Avoids confusion with angular concepts * Remove accidentally committed imprint dummy file * Remove commented-out footer from exercise page * Make Map movable on Drag with Pop Up (hpi-sam#649) * Make Map movable on Drag with Pop Up * Update pipeline actions to node 16 (hpi-sam#627) * Update pipeline actions to node 16 The old actions were based on Node 12, which has reached EOL. https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/ * Test previous version of cypress action again * Try cypress action v3 * Do not use cached cypress * Try a Cypress Config without actually calling Cypress * Try some more stuff... * Add Cypress as DevDependency to root * Re-enable default cypress tests * Remove version tag from cypress cache The tag was there for debugging purposes only * Invoke cypress in frontend subfolder * Try working-directory for cypress * Try --prefix for start * Retry --prefix before 'run' * Restore 5a9692d * Update package-lock.json --------- Co-authored-by: ClFeSc <68013019+ClFeSc@users.noreply.github.com> Co-authored-by: Nils <45318774+Nils1729@users.noreply.github.com> * Change mail address to feedback mailing list (hpi-sam#659) * Adapt treatment system to account for simulated regions (hpi-sam#658) * Adapt treatment system to account for simulated regions The treatment system no longer asserts that patients can only be treated on the map. * Please linter * Enable patient ticking in simulated regions * Fix extent calculation of viewports and simulated regions (hpi-sam#663) * Include simulated regions when fitting to view Also fixing a bug with negative extents * Fix viewport restriction with negative extent * Rename fit view method * Rename function at all occurrences * Fix isInViewport for negative extents * Satisfy linter * Avoid duplication in type definitions * Refactoring/609 refactor functionality from olmapmanager to featuremanagers (hpi-sam#662) * WIP * Move Layer Creation to Feature Managers * Move Registration into Feature managers * Complete Merge * Move Interactions to Interaction Manager * Move Popup Handling to Popup Manager * Move Satellite Layer to Satellite Layer manager * Minor Cleanup * Move files * Move Files * More Cleanup * More Cleanup * Fix a bug in participant mode * Clean up Map Interactions manager * Clean up Satellite Layer Manager * Fix Lint * Implement Feedback * Implement Feedback and change Parameter Order in onFeatureDropped * Implement Feedback and change Parameter Order in onFeatureDropped --------- Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Adjust nginx configuration for about pages (hpi-sam#657) * Adjust nginx configuration for about pages * Redirect invalid requests for a uniform 404 page * Add link to landing page on about pages * Improve error pages in nginx setup The error pages do not rely on a non-existing URL any longer --------- Co-authored-by: Marvin <68286419+anonym-HPI@users.noreply.github.com> * Set up simulation framework (hpi-sam#664) * Create draft for simulation data types * WIP: Simulate unloading of vehicles * WIP add debug helpers and make simulation work * WIP add typings and lint * Validate events * Fix never parameter in activity and behavior functions * Validate activities and behaviors * Introduce pseudo randomness for deterministic uuids * Add migrations for simulation * Rename SimulationActivity.terminate to onTerminate * Remove simulatedRegionId from VehicleArrivedEvent * Slight improvement to debugging buttons * Fix typo * Validate state in AddBehaviorAction * Incorporate suggestions from review * Fix randomness * Add generic DelayEventActivity * Fix DelayEventActivity * Please linter * Remove debug UI * Dragging onto the Map now triggers Drop Events (hpi-sam#671) * Dragging onto the Map now triggers Drop Events * Add our names to the readme (hpi-sam#672) * Use @noble/hashes instead of hash.js (hpi-sam#674) * Use @noble/hashes instead of hash.js * Fix install:all script * Add release workflow * Populate CHANGELOG.md * Update create-release-pr.yml * trigger pipeline * Prepare release v0.0.1-review (#3) Co-authored-by: GitHub Actions <noreply@github.com> * Prepare release v123-test (#5) Co-authored-by: GitHub Actions <noreply@github.com> * Prepare release v1.2.3-test2 (#7) Co-authored-by: GitHub Actions <noreply@github.com> * Update create-release-pr.yml debug * Update create-release-pr.yml debug * debug * Prepare release v1.2.3-test4 (#11) Co-authored-by: GitHub Actions <noreply@github.com> * diff * Debug v1.2.3-test6 (#13) Co-authored-by: GitHub Actions <noreply@github.com> * Debug v1.2.3-test7 (#15) Co-authored-by: GitHub Actions <noreply@github.com> * Fix npm i * Debug v1.2.3-test8 (#17) Co-authored-by: GitHub Actions <noreply@github.com> * call pipeline from release * fix permissions * remove auto pipeline * Debug v1.2.3-test12 --------- Co-authored-by: Clemens <68013019+ClFeSc@users.noreply.github.com> Co-authored-by: Julian Schmidt <julian.r.schmidt.js@gmail.com> Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> Co-authored-by: Lukas Hagen <43916057+Greenscreen23@users.noreply.github.com> Co-authored-by: Lukas Radermacher <49586507+lukasrad02@users.noreply.github.com> Co-authored-by: benn02 <82985280+benn02@users.noreply.github.com> Co-authored-by: Nils <45318774+Nils1729@users.noreply.github.com> Co-authored-by: Marvin <68286419+anonym-HPI@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: GitHub Actions <noreply@github.com>

* Improve validation (hpi-sam#125) * Improve validation by introducing multiple new validation decorators * `IsIdMap` for types of the form `{ readonly [key: UUID]: T }`. This transforms the object, so using instance objects (instead of plain objects) will no longer be supported. * `IsLiteralUnion` for literal unions of types `number | string | symbol` (e.g. `participant | trainer`). Uses `isIn` internally. * `IsReachableTransferPoints` for `ReachableTransferPoints` used in `TransferPoint`. Very specific but necessary due to the unique structure of this type. * `IsUUIDSet` for `UUIDSet` * `IsValue` for *simple* values that are required for a property. For example, when a `type` property has to have the value `'partial'`, one can use `@IsValue('partial')` for this. Allowed are the types `bigint | boolean | number | string | symbol | null | undefined`. The reason is that this validator also uses `isIn` internally, which in turn uses `===` which might produce incorrect results for `object` values. * All validators are required to be applied to correctly types properties by the use of `GenericPropertyDecorator`. Using e.g. `@IsLiteralUnion({ partial: true, complete: true })` on a property typed `string` raises a TypeScript error. Co-authored-by: Julian Schmidt <julian.r.schmidt.js@gmail.com> * Feature/state benchmark (hpi-sam#581) * Move state migrations to shared * Add benchmark package * Update readmes * Make problem with duplicated RestoreError more obvious * Feature/improve eslint rules (hpi-sam#591) * Disallow imports from "*/dist/*" * Improve smaller eslint rules * Update documentation * Update packages to mitigate GHSA-9c47-m6qq-7p4h (hpi-sam#592) * Update dependencies (hpi-sam#595) * Update dependencies * typescript@4.9 (satisfies-operator and watch-performance-improvements) * angular@15.1 * Else only patch and minor version bumps * Fix version of @types/node in benchmark and frontend (18 -> 16) * Run prettier * Add simulated regions that can be placed on the map (hpi-sam#601) * Add simulated regions that can be placed on the map * Fix naming * Add migration * Fix linter error * Move simulated region to separate heading in trainer map editor * Turn isInSimulatedRegion into a stub method * Refactor ol-map-manager to reuse some features from viewport in simulatedRegion * Ignore vs code config files (hpi-sam#606) * Rename VS Code configs to `.example` * Add new "Start all but database" task * Explain changes in readme * Refactor viewport-modify to resize-rectangle-interaction (hpi-sam#604) * Instead of using some parts of the `Modify` interaction (side-effect in the style function) a new custom Interaction has been created. * Previously, one could switch between resizing and translating a viewport via pressing `Shift`. Instead, now one ***resizes*** if one drags an edge of the viewport (+ a bit around it), and ***translates*** if one drags any other part. This should enable touch users to resize viewports * The code should now be more readable and extendable * The unnecessary `viewportTranslateInteraction` has been removed * `feature.dispose()` now gets called when it gets deleted - this could have been a memory leak? * Add link to main branch in readme (hpi-sam#611) * Close popups with esc (hpi-sam#610) * Add keydown handler to close popups on escape * Ensure input is saved even after less than 600ms * Cast event inline Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Add new image for big material and material (hpi-sam#544) * Add new image for big material and material Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix CVE-2022-25901 (hpi-sam#618) * Feature/597 regions can contain personnel and patients (hpi-sam#607) * Add MetaPosition type * Add MetaPosition to Vehicle * Add MetaPosition ro Personnel * Add MetaPosition to Material * Add MetaPosition to Patient * Add Classes for different Position Types * Use create when applicable and fix in MetaPosition * Add migration for addition of MetaPosition * refactor literals to start with lowercase * Change nested if else to else if * Make metaPosition not optional * Fix failing Tests * Update shared/src/models/material.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/models/patient.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/models/personnel.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/patient.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/utils/calculate-treatments.spec.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/vehicle.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix Prettier Errors * Change Validation to Allow * Put personnel and material in vehicle on creation * Update shared/src/store/action-reducers/transfer.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix Pipeline dependencies * Update shared/src/state-migrations/16-add-meta-position.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix linter Error * Add validators to MetaPositions * Remove unused imports * Fix Validators * Add/Fix Action Migrations * Add Exports to Index.ts * Update shared/src/store/action-reducers/utils/spatial-elements.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/vehicle.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix Lint Co-authored-by: Nils <45318774+Nils1729@users.noreply.github.com> Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Initialize the optimisticUpdateHandler only after the store has the exercise (hpi-sam#622) * Fixes "Features disappear from the map in imported exercises" hpi-sam#621 * Can be observed when two actions are simultaneously optimistically proposed, and the client didn't receive any other action from the server before * Patients are automatically triaged without any personnel on the map (hpi-sam#624) * Fix incorrect import of isEmpty This caused "Patients are automatically triaged without any personnel on the map" hpi-sam#623 * Disallow isEmpty imports from class-validator via eslint * Add Image for Johanniter Akademie NRW, Campus Münster der Johanniter-Unfall-Hilfe e.V. (JUH) (hpi-sam#619) * Add Image for Johanniter Akademie NRW, Campus Münster der Johanniter-Unfall-Hilfe e.V. (JUH) * Fix linter * Mention JUH in Readme * Scale down the malteser logo and add the new 22/23 project team to the landing page * Add our year to the landing page * Feature/603 use opaque fill style for simulated regions (hpi-sam#608) * Refactor viewports and simulated regions to be polygons instead of lines * Add opaque fill to simulated regions * Fix linter * WIP * Refactor Coordinates and Points to Compositions * Update readme accordingly * Change default type of SubstituteCoordinateForPoint to never as it should never happen * Fix typo * Increase alpha value to 80% * Fix bug where features did not sync their movement to other clients * Fix linter * Refactor lambda function to geometry helpers and refactor ElementFeature ElementFeature (which had to extend Feature<FeatureType>) has been replaced by Feature<FeatureType> because according to ol docs there are no classes extending Feature * Remove ElementManager.recreateFeature() * Refactor lambdas to function in Geometry Helper subclasses * Rename getNextPosition to interpolateCoordinates * Refactor polygon geometry helper names in map lambda function * Remove comment and type cast Co-authored-by: Julian Schmidt <julian.r.schmidt.js@gmail.com> * Change functions to arrow functions in Geometry Helpers to preserve `this` (hpi-sam#629) * Add type property to elements in the state (hpi-sam#616) * WIP * Pick specific selectors from TypeSelectorMap * Fix linter * Remove type property from feature * Fix bug after merge * Rename selector map to plural map and add validation * Simplify featureKeys * Fix tests by adding type property to demo objects * WIP: Add migration * Update shared/src/utils/type-state-selector-map.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Rename file to reflect variable name change * Replace type literals by element property * Run prettier * Finish migration * Fix migration to set correct type on EocLogEntry * Make imports consistent * Reuse literal union from transfer in exercise * Fix linter Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Remove unsupportedChangeProperties (hpi-sam#630) * Fix the Bug (hpi-sam#635) * Remove generic type LineString | Point in favor of the default Geometry (hpi-sam#634) * Remove generic type LineString | Point in favor of the default Geometry * Fix linter * Refactoring/612 refactor position (hpi-sam#625) * Add MetaPosition Helpers * Remove position property * Fix Lint * Unify access onto metaPosition * Fix Frontend * Remove Position Class * Remove Position from Tests * Rename MetaPosition to Position * Add Migration (not for Add vehicle Action) * complete the renaming * Fix Tests * Remove Transfer Property * Add Migration for Add Vehicle Action * Fix Small Bug * Use type properties instead of passed strings * Add comments * Fix Test * Fix Test * Fix Transfer Overview * Refactor Helper Methods to avoid duplicate Code * Change Names of Helper Functions * Added Comments to unused vars * Fix GHSA-rc47-6667-2j5j (hpi-sam#645) * Allow elements to be added to simulated regions (hpi-sam#626) * Allow elements to be added to simulated regions * Adapt Add to Simulated Region Action to type tags * Make linter happy * Use new position and bugfixes * Use proper function to create position * Refactor Start Point Literals (hpi-sam#642) * Refactor Start Point Literals * Add Migration * Enable Migration * Implement Feedback * Remove not needed types * Add footer and about pages (hpi-sam#643) * Add basic footer and empty about pages * Refactor structure of about pages * Add footer to 404 page * Add links from footer to exercise page * Run prettier * Display version number * Explain overwriting the pages in Docker deployment * Do not lint HTML files for about pages * Refactor template component * Rename title property since it's an html attribute * Make content observable * Rename template component Avoids confusion with angular concepts * Remove accidentally committed imprint dummy file * Remove commented-out footer from exercise page * Make Map movable on Drag with Pop Up (hpi-sam#649) * Make Map movable on Drag with Pop Up * Update pipeline actions to node 16 (hpi-sam#627) * Update pipeline actions to node 16 The old actions were based on Node 12, which has reached EOL. https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/ * Test previous version of cypress action again * Try cypress action v3 * Do not use cached cypress * Try a Cypress Config without actually calling Cypress * Try some more stuff... * Add Cypress as DevDependency to root * Re-enable default cypress tests * Remove version tag from cypress cache The tag was there for debugging purposes only * Invoke cypress in frontend subfolder * Try working-directory for cypress * Try --prefix for start * Retry --prefix before 'run' * Restore 5a9692d * Update package-lock.json --------- Co-authored-by: ClFeSc <68013019+ClFeSc@users.noreply.github.com> Co-authored-by: Nils <45318774+Nils1729@users.noreply.github.com> * Change mail address to feedback mailing list (hpi-sam#659) * Adapt treatment system to account for simulated regions (hpi-sam#658) * Adapt treatment system to account for simulated regions The treatment system no longer asserts that patients can only be treated on the map. * Please linter * Enable patient ticking in simulated regions * Fix extent calculation of viewports and simulated regions (hpi-sam#663) * Include simulated regions when fitting to view Also fixing a bug with negative extents * Fix viewport restriction with negative extent * Rename fit view method * Rename function at all occurrences * Fix isInViewport for negative extents * Satisfy linter * Avoid duplication in type definitions * Refactoring/609 refactor functionality from olmapmanager to featuremanagers (hpi-sam#662) * WIP * Move Layer Creation to Feature Managers * Move Registration into Feature managers * Complete Merge * Move Interactions to Interaction Manager * Move Popup Handling to Popup Manager * Move Satellite Layer to Satellite Layer manager * Minor Cleanup * Move files * Move Files * More Cleanup * More Cleanup * Fix a bug in participant mode * Clean up Map Interactions manager * Clean up Satellite Layer Manager * Fix Lint * Implement Feedback * Implement Feedback and change Parameter Order in onFeatureDropped * Implement Feedback and change Parameter Order in onFeatureDropped --------- Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Adjust nginx configuration for about pages (hpi-sam#657) * Adjust nginx configuration for about pages * Redirect invalid requests for a uniform 404 page * Add link to landing page on about pages * Improve error pages in nginx setup The error pages do not rely on a non-existing URL any longer --------- Co-authored-by: Marvin <68286419+anonym-HPI@users.noreply.github.com> * Set up simulation framework (hpi-sam#664) * Create draft for simulation data types * WIP: Simulate unloading of vehicles * WIP add debug helpers and make simulation work * WIP add typings and lint * Validate events * Fix never parameter in activity and behavior functions * Validate activities and behaviors * Introduce pseudo randomness for deterministic uuids * Add migrations for simulation * Rename SimulationActivity.terminate to onTerminate * Remove simulatedRegionId from VehicleArrivedEvent * Slight improvement to debugging buttons * Fix typo * Validate state in AddBehaviorAction * Incorporate suggestions from review * Fix randomness * Add generic DelayEventActivity * Fix DelayEventActivity * Please linter * Remove debug UI * Dragging onto the Map now triggers Drop Events (hpi-sam#671) * Dragging onto the Map now triggers Drop Events * Add our names to the readme (hpi-sam#672) * Use @noble/hashes instead of hash.js (hpi-sam#674) * Use @noble/hashes instead of hash.js * Fix install:all script * Add release workflow * Populate CHANGELOG.md * Update create-release-pr.yml * trigger pipeline * Prepare release v0.0.1-review (#3) Co-authored-by: GitHub Actions <noreply@github.com> * Prepare release v123-test (#5) Co-authored-by: GitHub Actions <noreply@github.com> * Prepare release v1.2.3-test2 (#7) Co-authored-by: GitHub Actions <noreply@github.com> * Update create-release-pr.yml debug * Update create-release-pr.yml debug * debug * Prepare release v1.2.3-test4 (#11) Co-authored-by: GitHub Actions <noreply@github.com> * diff * Debug v1.2.3-test6 (#13) Co-authored-by: GitHub Actions <noreply@github.com> * Debug v1.2.3-test7 (#15) Co-authored-by: GitHub Actions <noreply@github.com> * Fix npm i * Debug v1.2.3-test8 (#17) Co-authored-by: GitHub Actions <noreply@github.com> * call pipeline from release * fix permissions * remove auto pipeline * fix changelog * Debug v1.2.3-test13 --------- Co-authored-by: Clemens <68013019+ClFeSc@users.noreply.github.com> Co-authored-by: Julian Schmidt <julian.r.schmidt.js@gmail.com> Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> Co-authored-by: Lukas Hagen <43916057+Greenscreen23@users.noreply.github.com> Co-authored-by: Lukas Radermacher <49586507+lukasrad02@users.noreply.github.com> Co-authored-by: benn02 <82985280+benn02@users.noreply.github.com> Co-authored-by: Nils <45318774+Nils1729@users.noreply.github.com> Co-authored-by: Marvin <68286419+anonym-HPI@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: GitHub Actions <noreply@github.com>

* Improve validation (hpi-sam#125) * Improve validation by introducing multiple new validation decorators * `IsIdMap` for types of the form `{ readonly [key: UUID]: T }`. This transforms the object, so using instance objects (instead of plain objects) will no longer be supported. * `IsLiteralUnion` for literal unions of types `number | string | symbol` (e.g. `participant | trainer`). Uses `isIn` internally. * `IsReachableTransferPoints` for `ReachableTransferPoints` used in `TransferPoint`. Very specific but necessary due to the unique structure of this type. * `IsUUIDSet` for `UUIDSet` * `IsValue` for *simple* values that are required for a property. For example, when a `type` property has to have the value `'partial'`, one can use `@IsValue('partial')` for this. Allowed are the types `bigint | boolean | number | string | symbol | null | undefined`. The reason is that this validator also uses `isIn` internally, which in turn uses `===` which might produce incorrect results for `object` values. * All validators are required to be applied to correctly types properties by the use of `GenericPropertyDecorator`. Using e.g. `@IsLiteralUnion({ partial: true, complete: true })` on a property typed `string` raises a TypeScript error. Co-authored-by: Julian Schmidt <julian.r.schmidt.js@gmail.com> * Feature/state benchmark (hpi-sam#581) * Move state migrations to shared * Add benchmark package * Update readmes * Make problem with duplicated RestoreError more obvious * Feature/improve eslint rules (hpi-sam#591) * Disallow imports from "*/dist/*" * Improve smaller eslint rules * Update documentation * Update packages to mitigate GHSA-9c47-m6qq-7p4h (hpi-sam#592) * Update dependencies (hpi-sam#595) * Update dependencies * typescript@4.9 (satisfies-operator and watch-performance-improvements) * angular@15.1 * Else only patch and minor version bumps * Fix version of @types/node in benchmark and frontend (18 -> 16) * Run prettier * Add simulated regions that can be placed on the map (hpi-sam#601) * Add simulated regions that can be placed on the map * Fix naming * Add migration * Fix linter error * Move simulated region to separate heading in trainer map editor * Turn isInSimulatedRegion into a stub method * Refactor ol-map-manager to reuse some features from viewport in simulatedRegion * Ignore vs code config files (hpi-sam#606) * Rename VS Code configs to `.example` * Add new "Start all but database" task * Explain changes in readme * Refactor viewport-modify to resize-rectangle-interaction (hpi-sam#604) * Instead of using some parts of the `Modify` interaction (side-effect in the style function) a new custom Interaction has been created. * Previously, one could switch between resizing and translating a viewport via pressing `Shift`. Instead, now one ***resizes*** if one drags an edge of the viewport (+ a bit around it), and ***translates*** if one drags any other part. This should enable touch users to resize viewports * The code should now be more readable and extendable * The unnecessary `viewportTranslateInteraction` has been removed * `feature.dispose()` now gets called when it gets deleted - this could have been a memory leak? * Add link to main branch in readme (hpi-sam#611) * Close popups with esc (hpi-sam#610) * Add keydown handler to close popups on escape * Ensure input is saved even after less than 600ms * Cast event inline Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Add new image for big material and material (hpi-sam#544) * Add new image for big material and material Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix CVE-2022-25901 (hpi-sam#618) * Feature/597 regions can contain personnel and patients (hpi-sam#607) * Add MetaPosition type * Add MetaPosition to Vehicle * Add MetaPosition ro Personnel * Add MetaPosition to Material * Add MetaPosition to Patient * Add Classes for different Position Types * Use create when applicable and fix in MetaPosition * Add migration for addition of MetaPosition * refactor literals to start with lowercase * Change nested if else to else if * Make metaPosition not optional * Fix failing Tests * Update shared/src/models/material.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/models/patient.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/models/personnel.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/patient.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/utils/calculate-treatments.spec.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/vehicle.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix Prettier Errors * Change Validation to Allow * Put personnel and material in vehicle on creation * Update shared/src/store/action-reducers/transfer.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix Pipeline dependencies * Update shared/src/state-migrations/16-add-meta-position.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix linter Error * Add validators to MetaPositions * Remove unused imports * Fix Validators * Add/Fix Action Migrations * Add Exports to Index.ts * Update shared/src/store/action-reducers/utils/spatial-elements.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/vehicle.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix Lint Co-authored-by: Nils <45318774+Nils1729@users.noreply.github.com> Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Initialize the optimisticUpdateHandler only after the store has the exercise (hpi-sam#622) * Fixes "Features disappear from the map in imported exercises" hpi-sam#621 * Can be observed when two actions are simultaneously optimistically proposed, and the client didn't receive any other action from the server before * Patients are automatically triaged without any personnel on the map (hpi-sam#624) * Fix incorrect import of isEmpty This caused "Patients are automatically triaged without any personnel on the map" hpi-sam#623 * Disallow isEmpty imports from class-validator via eslint * Add Image for Johanniter Akademie NRW, Campus Münster der Johanniter-Unfall-Hilfe e.V. (JUH) (hpi-sam#619) * Add Image for Johanniter Akademie NRW, Campus Münster der Johanniter-Unfall-Hilfe e.V. (JUH) * Fix linter * Mention JUH in Readme * Scale down the malteser logo and add the new 22/23 project team to the landing page * Add our year to the landing page * Feature/603 use opaque fill style for simulated regions (hpi-sam#608) * Refactor viewports and simulated regions to be polygons instead of lines * Add opaque fill to simulated regions * Fix linter * WIP * Refactor Coordinates and Points to Compositions * Update readme accordingly * Change default type of SubstituteCoordinateForPoint to never as it should never happen * Fix typo * Increase alpha value to 80% * Fix bug where features did not sync their movement to other clients * Fix linter * Refactor lambda function to geometry helpers and refactor ElementFeature ElementFeature (which had to extend Feature<FeatureType>) has been replaced by Feature<FeatureType> because according to ol docs there are no classes extending Feature * Remove ElementManager.recreateFeature() * Refactor lambdas to function in Geometry Helper subclasses * Rename getNextPosition to interpolateCoordinates * Refactor polygon geometry helper names in map lambda function * Remove comment and type cast Co-authored-by: Julian Schmidt <julian.r.schmidt.js@gmail.com> * Change functions to arrow functions in Geometry Helpers to preserve `this` (hpi-sam#629) * Add type property to elements in the state (hpi-sam#616) * WIP * Pick specific selectors from TypeSelectorMap * Fix linter * Remove type property from feature * Fix bug after merge * Rename selector map to plural map and add validation * Simplify featureKeys * Fix tests by adding type property to demo objects * WIP: Add migration * Update shared/src/utils/type-state-selector-map.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Rename file to reflect variable name change * Replace type literals by element property * Run prettier * Finish migration * Fix migration to set correct type on EocLogEntry * Make imports consistent * Reuse literal union from transfer in exercise * Fix linter Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Remove unsupportedChangeProperties (hpi-sam#630) * Fix the Bug (hpi-sam#635) * Remove generic type LineString | Point in favor of the default Geometry (hpi-sam#634) * Remove generic type LineString | Point in favor of the default Geometry * Fix linter * Refactoring/612 refactor position (hpi-sam#625) * Add MetaPosition Helpers * Remove position property * Fix Lint * Unify access onto metaPosition * Fix Frontend * Remove Position Class * Remove Position from Tests * Rename MetaPosition to Position * Add Migration (not for Add vehicle Action) * complete the renaming * Fix Tests * Remove Transfer Property * Add Migration for Add Vehicle Action * Fix Small Bug * Use type properties instead of passed strings * Add comments * Fix Test * Fix Test * Fix Transfer Overview * Refactor Helper Methods to avoid duplicate Code * Change Names of Helper Functions * Added Comments to unused vars * Fix GHSA-rc47-6667-2j5j (hpi-sam#645) * Allow elements to be added to simulated regions (hpi-sam#626) * Allow elements to be added to simulated regions * Adapt Add to Simulated Region Action to type tags * Make linter happy * Use new position and bugfixes * Use proper function to create position * Refactor Start Point Literals (hpi-sam#642) * Refactor Start Point Literals * Add Migration * Enable Migration * Implement Feedback * Remove not needed types * Add footer and about pages (hpi-sam#643) * Add basic footer and empty about pages * Refactor structure of about pages * Add footer to 404 page * Add links from footer to exercise page * Run prettier * Display version number * Explain overwriting the pages in Docker deployment * Do not lint HTML files for about pages * Refactor template component * Rename title property since it's an html attribute * Make content observable * Rename template component Avoids confusion with angular concepts * Remove accidentally committed imprint dummy file * Remove commented-out footer from exercise page * Make Map movable on Drag with Pop Up (hpi-sam#649) * Make Map movable on Drag with Pop Up * Update pipeline actions to node 16 (hpi-sam#627) * Update pipeline actions to node 16 The old actions were based on Node 12, which has reached EOL. https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/ * Test previous version of cypress action again * Try cypress action v3 * Do not use cached cypress * Try a Cypress Config without actually calling Cypress * Try some more stuff... * Add Cypress as DevDependency to root * Re-enable default cypress tests * Remove version tag from cypress cache The tag was there for debugging purposes only * Invoke cypress in frontend subfolder * Try working-directory for cypress * Try --prefix for start * Retry --prefix before 'run' * Restore 5a9692d * Update package-lock.json --------- Co-authored-by: ClFeSc <68013019+ClFeSc@users.noreply.github.com> Co-authored-by: Nils <45318774+Nils1729@users.noreply.github.com> * Change mail address to feedback mailing list (hpi-sam#659) * Adapt treatment system to account for simulated regions (hpi-sam#658) * Adapt treatment system to account for simulated regions The treatment system no longer asserts that patients can only be treated on the map. * Please linter * Enable patient ticking in simulated regions * Fix extent calculation of viewports and simulated regions (hpi-sam#663) * Include simulated regions when fitting to view Also fixing a bug with negative extents * Fix viewport restriction with negative extent * Rename fit view method * Rename function at all occurrences * Fix isInViewport for negative extents * Satisfy linter * Avoid duplication in type definitions * Refactoring/609 refactor functionality from olmapmanager to featuremanagers (hpi-sam#662) * WIP * Move Layer Creation to Feature Managers * Move Registration into Feature managers * Complete Merge * Move Interactions to Interaction Manager * Move Popup Handling to Popup Manager * Move Satellite Layer to Satellite Layer manager * Minor Cleanup * Move files * Move Files * More Cleanup * More Cleanup * Fix a bug in participant mode * Clean up Map Interactions manager * Clean up Satellite Layer Manager * Fix Lint * Implement Feedback * Implement Feedback and change Parameter Order in onFeatureDropped * Implement Feedback and change Parameter Order in onFeatureDropped --------- Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Adjust nginx configuration for about pages (hpi-sam#657) * Adjust nginx configuration for about pages * Redirect invalid requests for a uniform 404 page * Add link to landing page on about pages * Improve error pages in nginx setup The error pages do not rely on a non-existing URL any longer --------- Co-authored-by: Marvin <68286419+anonym-HPI@users.noreply.github.com> * Set up simulation framework (hpi-sam#664) * Create draft for simulation data types * WIP: Simulate unloading of vehicles * WIP add debug helpers and make simulation work * WIP add typings and lint * Validate events * Fix never parameter in activity and behavior functions * Validate activities and behaviors * Introduce pseudo randomness for deterministic uuids * Add migrations for simulation * Rename SimulationActivity.terminate to onTerminate * Remove simulatedRegionId from VehicleArrivedEvent * Slight improvement to debugging buttons * Fix typo * Validate state in AddBehaviorAction * Incorporate suggestions from review * Fix randomness * Add generic DelayEventActivity * Fix DelayEventActivity * Please linter * Remove debug UI * Dragging onto the Map now triggers Drop Events (hpi-sam#671) * Dragging onto the Map now triggers Drop Events * Add our names to the readme (hpi-sam#672) * Use @noble/hashes instead of hash.js (hpi-sam#674) * Use @noble/hashes instead of hash.js * Fix install:all script * Add release workflow * Populate CHANGELOG.md * Update create-release-pr.yml * trigger pipeline * Prepare release v0.0.1-review (#3) Co-authored-by: GitHub Actions <noreply@github.com> * Prepare release v123-test (#5) Co-authored-by: GitHub Actions <noreply@github.com> * Prepare release v1.2.3-test2 (#7) Co-authored-by: GitHub Actions <noreply@github.com> * Update create-release-pr.yml debug * Update create-release-pr.yml debug * debug * Prepare release v1.2.3-test4 (#11) Co-authored-by: GitHub Actions <noreply@github.com> * diff * Debug v1.2.3-test6 (#13) Co-authored-by: GitHub Actions <noreply@github.com> * Debug v1.2.3-test7 (#15) Co-authored-by: GitHub Actions <noreply@github.com> * Fix npm i * Debug v1.2.3-test8 (#17) Co-authored-by: GitHub Actions <noreply@github.com> * call pipeline from release * fix permissions * remove auto pipeline * fix changelog * more permissions * Debug v1.2.3-test14 --------- Co-authored-by: Clemens <68013019+ClFeSc@users.noreply.github.com> Co-authored-by: Julian Schmidt <julian.r.schmidt.js@gmail.com> Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> Co-authored-by: Lukas Hagen <43916057+Greenscreen23@users.noreply.github.com> Co-authored-by: Lukas Radermacher <49586507+lukasrad02@users.noreply.github.com> Co-authored-by: benn02 <82985280+benn02@users.noreply.github.com> Co-authored-by: Nils <45318774+Nils1729@users.noreply.github.com> Co-authored-by: Marvin <68286419+anonym-HPI@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: GitHub Actions <noreply@github.com>

* Improve validation (hpi-sam#125) * Improve validation by introducing multiple new validation decorators * `IsIdMap` for types of the form `{ readonly [key: UUID]: T }`. This transforms the object, so using instance objects (instead of plain objects) will no longer be supported. * `IsLiteralUnion` for literal unions of types `number | string | symbol` (e.g. `participant | trainer`). Uses `isIn` internally. * `IsReachableTransferPoints` for `ReachableTransferPoints` used in `TransferPoint`. Very specific but necessary due to the unique structure of this type. * `IsUUIDSet` for `UUIDSet` * `IsValue` for *simple* values that are required for a property. For example, when a `type` property has to have the value `'partial'`, one can use `@IsValue('partial')` for this. Allowed are the types `bigint | boolean | number | string | symbol | null | undefined`. The reason is that this validator also uses `isIn` internally, which in turn uses `===` which might produce incorrect results for `object` values. * All validators are required to be applied to correctly types properties by the use of `GenericPropertyDecorator`. Using e.g. `@IsLiteralUnion({ partial: true, complete: true })` on a property typed `string` raises a TypeScript error. Co-authored-by: Julian Schmidt <julian.r.schmidt.js@gmail.com> * Feature/state benchmark (hpi-sam#581) * Move state migrations to shared * Add benchmark package * Update readmes * Make problem with duplicated RestoreError more obvious * Feature/improve eslint rules (hpi-sam#591) * Disallow imports from "*/dist/*" * Improve smaller eslint rules * Update documentation * Update packages to mitigate GHSA-9c47-m6qq-7p4h (hpi-sam#592) * Update dependencies (hpi-sam#595) * Update dependencies * typescript@4.9 (satisfies-operator and watch-performance-improvements) * angular@15.1 * Else only patch and minor version bumps * Fix version of @types/node in benchmark and frontend (18 -> 16) * Run prettier * Add simulated regions that can be placed on the map (hpi-sam#601) * Add simulated regions that can be placed on the map * Fix naming * Add migration * Fix linter error * Move simulated region to separate heading in trainer map editor * Turn isInSimulatedRegion into a stub method * Refactor ol-map-manager to reuse some features from viewport in simulatedRegion * Ignore vs code config files (hpi-sam#606) * Rename VS Code configs to `.example` * Add new "Start all but database" task * Explain changes in readme * Refactor viewport-modify to resize-rectangle-interaction (hpi-sam#604) * Instead of using some parts of the `Modify` interaction (side-effect in the style function) a new custom Interaction has been created. * Previously, one could switch between resizing and translating a viewport via pressing `Shift`. Instead, now one ***resizes*** if one drags an edge of the viewport (+ a bit around it), and ***translates*** if one drags any other part. This should enable touch users to resize viewports * The code should now be more readable and extendable * The unnecessary `viewportTranslateInteraction` has been removed * `feature.dispose()` now gets called when it gets deleted - this could have been a memory leak? * Add link to main branch in readme (hpi-sam#611) * Close popups with esc (hpi-sam#610) * Add keydown handler to close popups on escape * Ensure input is saved even after less than 600ms * Cast event inline Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Add new image for big material and material (hpi-sam#544) * Add new image for big material and material Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix CVE-2022-25901 (hpi-sam#618) * Feature/597 regions can contain personnel and patients (hpi-sam#607) * Add MetaPosition type * Add MetaPosition to Vehicle * Add MetaPosition ro Personnel * Add MetaPosition to Material * Add MetaPosition to Patient * Add Classes for different Position Types * Use create when applicable and fix in MetaPosition * Add migration for addition of MetaPosition * refactor literals to start with lowercase * Change nested if else to else if * Make metaPosition not optional * Fix failing Tests * Update shared/src/models/material.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/models/patient.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/models/personnel.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/patient.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/utils/calculate-treatments.spec.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/vehicle.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix Prettier Errors * Change Validation to Allow * Put personnel and material in vehicle on creation * Update shared/src/store/action-reducers/transfer.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix Pipeline dependencies * Update shared/src/state-migrations/16-add-meta-position.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix linter Error * Add validators to MetaPositions * Remove unused imports * Fix Validators * Add/Fix Action Migrations * Add Exports to Index.ts * Update shared/src/store/action-reducers/utils/spatial-elements.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/vehicle.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix Lint Co-authored-by: Nils <45318774+Nils1729@users.noreply.github.com> Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Initialize the optimisticUpdateHandler only after the store has the exercise (hpi-sam#622) * Fixes "Features disappear from the map in imported exercises" hpi-sam#621 * Can be observed when two actions are simultaneously optimistically proposed, and the client didn't receive any other action from the server before * Patients are automatically triaged without any personnel on the map (hpi-sam#624) * Fix incorrect import of isEmpty This caused "Patients are automatically triaged without any personnel on the map" hpi-sam#623 * Disallow isEmpty imports from class-validator via eslint * Add Image for Johanniter Akademie NRW, Campus Münster der Johanniter-Unfall-Hilfe e.V. (JUH) (hpi-sam#619) * Add Image for Johanniter Akademie NRW, Campus Münster der Johanniter-Unfall-Hilfe e.V. (JUH) * Fix linter * Mention JUH in Readme * Scale down the malteser logo and add the new 22/23 project team to the landing page * Add our year to the landing page * Feature/603 use opaque fill style for simulated regions (hpi-sam#608) * Refactor viewports and simulated regions to be polygons instead of lines * Add opaque fill to simulated regions * Fix linter * WIP * Refactor Coordinates and Points to Compositions * Update readme accordingly * Change default type of SubstituteCoordinateForPoint to never as it should never happen * Fix typo * Increase alpha value to 80% * Fix bug where features did not sync their movement to other clients * Fix linter * Refactor lambda function to geometry helpers and refactor ElementFeature ElementFeature (which had to extend Feature<FeatureType>) has been replaced by Feature<FeatureType> because according to ol docs there are no classes extending Feature * Remove ElementManager.recreateFeature() * Refactor lambdas to function in Geometry Helper subclasses * Rename getNextPosition to interpolateCoordinates * Refactor polygon geometry helper names in map lambda function * Remove comment and type cast Co-authored-by: Julian Schmidt <julian.r.schmidt.js@gmail.com> * Change functions to arrow functions in Geometry Helpers to preserve `this` (hpi-sam#629) * Add type property to elements in the state (hpi-sam#616) * WIP * Pick specific selectors from TypeSelectorMap * Fix linter * Remove type property from feature * Fix bug after merge * Rename selector map to plural map and add validation * Simplify featureKeys * Fix tests by adding type property to demo objects * WIP: Add migration * Update shared/src/utils/type-state-selector-map.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Rename file to reflect variable name change * Replace type literals by element property * Run prettier * Finish migration * Fix migration to set correct type on EocLogEntry * Make imports consistent * Reuse literal union from transfer in exercise * Fix linter Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Remove unsupportedChangeProperties (hpi-sam#630) * Fix the Bug (hpi-sam#635) * Remove generic type LineString | Point in favor of the default Geometry (hpi-sam#634) * Remove generic type LineString | Point in favor of the default Geometry * Fix linter * Refactoring/612 refactor position (hpi-sam#625) * Add MetaPosition Helpers * Remove position property * Fix Lint * Unify access onto metaPosition * Fix Frontend * Remove Position Class * Remove Position from Tests * Rename MetaPosition to Position * Add Migration (not for Add vehicle Action) * complete the renaming * Fix Tests * Remove Transfer Property * Add Migration for Add Vehicle Action * Fix Small Bug * Use type properties instead of passed strings * Add comments * Fix Test * Fix Test * Fix Transfer Overview * Refactor Helper Methods to avoid duplicate Code * Change Names of Helper Functions * Added Comments to unused vars * Fix GHSA-rc47-6667-2j5j (hpi-sam#645) * Allow elements to be added to simulated regions (hpi-sam#626) * Allow elements to be added to simulated regions * Adapt Add to Simulated Region Action to type tags * Make linter happy * Use new position and bugfixes * Use proper function to create position * Refactor Start Point Literals (hpi-sam#642) * Refactor Start Point Literals * Add Migration * Enable Migration * Implement Feedback * Remove not needed types * Add footer and about pages (hpi-sam#643) * Add basic footer and empty about pages * Refactor structure of about pages * Add footer to 404 page * Add links from footer to exercise page * Run prettier * Display version number * Explain overwriting the pages in Docker deployment * Do not lint HTML files for about pages * Refactor template component * Rename title property since it's an html attribute * Make content observable * Rename template component Avoids confusion with angular concepts * Remove accidentally committed imprint dummy file * Remove commented-out footer from exercise page * Make Map movable on Drag with Pop Up (hpi-sam#649) * Make Map movable on Drag with Pop Up * Update pipeline actions to node 16 (hpi-sam#627) * Update pipeline actions to node 16 The old actions were based on Node 12, which has reached EOL. https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/ * Test previous version of cypress action again * Try cypress action v3 * Do not use cached cypress * Try a Cypress Config without actually calling Cypress * Try some more stuff... * Add Cypress as DevDependency to root * Re-enable default cypress tests * Remove version tag from cypress cache The tag was there for debugging purposes only * Invoke cypress in frontend subfolder * Try working-directory for cypress * Try --prefix for start * Retry --prefix before 'run' * Restore 5a9692d * Update package-lock.json --------- Co-authored-by: ClFeSc <68013019+ClFeSc@users.noreply.github.com> Co-authored-by: Nils <45318774+Nils1729@users.noreply.github.com> * Change mail address to feedback mailing list (hpi-sam#659) * Adapt treatment system to account for simulated regions (hpi-sam#658) * Adapt treatment system to account for simulated regions The treatment system no longer asserts that patients can only be treated on the map. * Please linter * Enable patient ticking in simulated regions * Fix extent calculation of viewports and simulated regions (hpi-sam#663) * Include simulated regions when fitting to view Also fixing a bug with negative extents * Fix viewport restriction with negative extent * Rename fit view method * Rename function at all occurrences * Fix isInViewport for negative extents * Satisfy linter * Avoid duplication in type definitions * Refactoring/609 refactor functionality from olmapmanager to featuremanagers (hpi-sam#662) * WIP * Move Layer Creation to Feature Managers * Move Registration into Feature managers * Complete Merge * Move Interactions to Interaction Manager * Move Popup Handling to Popup Manager * Move Satellite Layer to Satellite Layer manager * Minor Cleanup * Move files * Move Files * More Cleanup * More Cleanup * Fix a bug in participant mode * Clean up Map Interactions manager * Clean up Satellite Layer Manager * Fix Lint * Implement Feedback * Implement Feedback and change Parameter Order in onFeatureDropped * Implement Feedback and change Parameter Order in onFeatureDropped --------- Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Adjust nginx configuration for about pages (hpi-sam#657) * Adjust nginx configuration for about pages * Redirect invalid requests for a uniform 404 page * Add link to landing page on about pages * Improve error pages in nginx setup The error pages do not rely on a non-existing URL any longer --------- Co-authored-by: Marvin <68286419+anonym-HPI@users.noreply.github.com> * Set up simulation framework (hpi-sam#664) * Create draft for simulation data types * WIP: Simulate unloading of vehicles * WIP add debug helpers and make simulation work * WIP add typings and lint * Validate events * Fix never parameter in activity and behavior functions * Validate activities and behaviors * Introduce pseudo randomness for deterministic uuids * Add migrations for simulation * Rename SimulationActivity.terminate to onTerminate * Remove simulatedRegionId from VehicleArrivedEvent * Slight improvement to debugging buttons * Fix typo * Validate state in AddBehaviorAction * Incorporate suggestions from review * Fix randomness * Add generic DelayEventActivity * Fix DelayEventActivity * Please linter * Remove debug UI * Dragging onto the Map now triggers Drop Events (hpi-sam#671) * Dragging onto the Map now triggers Drop Events * Add our names to the readme (hpi-sam#672) * Use @noble/hashes instead of hash.js (hpi-sam#674) * Use @noble/hashes instead of hash.js * Fix install:all script * Add release workflow * Populate CHANGELOG.md * Update create-release-pr.yml * trigger pipeline * Prepare release v0.0.1-review (#3) Co-authored-by: GitHub Actions <noreply@github.com> * Prepare release v123-test (#5) Co-authored-by: GitHub Actions <noreply@github.com> * Prepare release v1.2.3-test2 (#7) Co-authored-by: GitHub Actions <noreply@github.com> * Update create-release-pr.yml debug * Update create-release-pr.yml debug * debug * Prepare release v1.2.3-test4 (#11) Co-authored-by: GitHub Actions <noreply@github.com> * diff * Debug v1.2.3-test6 (#13) Co-authored-by: GitHub Actions <noreply@github.com> * Debug v1.2.3-test7 (#15) Co-authored-by: GitHub Actions <noreply@github.com> * Fix npm i * Debug v1.2.3-test8 (#17) Co-authored-by: GitHub Actions <noreply@github.com> * call pipeline from release * fix permissions * remove auto pipeline * fix changelog * more permissions * Update pr creation steps * add checkout * maybe fix pr comment * Debug v1.2.3-test17 --------- Co-authored-by: Clemens <68013019+ClFeSc@users.noreply.github.com> Co-authored-by: Julian Schmidt <julian.r.schmidt.js@gmail.com> Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> Co-authored-by: Lukas Hagen <43916057+Greenscreen23@users.noreply.github.com> Co-authored-by: Lukas Radermacher <49586507+lukasrad02@users.noreply.github.com> Co-authored-by: benn02 <82985280+benn02@users.noreply.github.com> Co-authored-by: Nils <45318774+Nils1729@users.noreply.github.com> Co-authored-by: Marvin <68286419+anonym-HPI@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: GitHub Actions <noreply@github.com>

* Improve validation (hpi-sam#125) * Improve validation by introducing multiple new validation decorators * `IsIdMap` for types of the form `{ readonly [key: UUID]: T }`. This transforms the object, so using instance objects (instead of plain objects) will no longer be supported. * `IsLiteralUnion` for literal unions of types `number | string | symbol` (e.g. `participant | trainer`). Uses `isIn` internally. * `IsReachableTransferPoints` for `ReachableTransferPoints` used in `TransferPoint`. Very specific but necessary due to the unique structure of this type. * `IsUUIDSet` for `UUIDSet` * `IsValue` for *simple* values that are required for a property. For example, when a `type` property has to have the value `'partial'`, one can use `@IsValue('partial')` for this. Allowed are the types `bigint | boolean | number | string | symbol | null | undefined`. The reason is that this validator also uses `isIn` internally, which in turn uses `===` which might produce incorrect results for `object` values. * All validators are required to be applied to correctly types properties by the use of `GenericPropertyDecorator`. Using e.g. `@IsLiteralUnion({ partial: true, complete: true })` on a property typed `string` raises a TypeScript error. Co-authored-by: Julian Schmidt <julian.r.schmidt.js@gmail.com> * Feature/state benchmark (hpi-sam#581) * Move state migrations to shared * Add benchmark package * Update readmes * Make problem with duplicated RestoreError more obvious * Feature/improve eslint rules (hpi-sam#591) * Disallow imports from "*/dist/*" * Improve smaller eslint rules * Update documentation * Update packages to mitigate GHSA-9c47-m6qq-7p4h (hpi-sam#592) * Update dependencies (hpi-sam#595) * Update dependencies * typescript@4.9 (satisfies-operator and watch-performance-improvements) * angular@15.1 * Else only patch and minor version bumps * Fix version of @types/node in benchmark and frontend (18 -> 16) * Run prettier * Add simulated regions that can be placed on the map (hpi-sam#601) * Add simulated regions that can be placed on the map * Fix naming * Add migration * Fix linter error * Move simulated region to separate heading in trainer map editor * Turn isInSimulatedRegion into a stub method * Refactor ol-map-manager to reuse some features from viewport in simulatedRegion * Ignore vs code config files (hpi-sam#606) * Rename VS Code configs to `.example` * Add new "Start all but database" task * Explain changes in readme * Refactor viewport-modify to resize-rectangle-interaction (hpi-sam#604) * Instead of using some parts of the `Modify` interaction (side-effect in the style function) a new custom Interaction has been created. * Previously, one could switch between resizing and translating a viewport via pressing `Shift`. Instead, now one ***resizes*** if one drags an edge of the viewport (+ a bit around it), and ***translates*** if one drags any other part. This should enable touch users to resize viewports * The code should now be more readable and extendable * The unnecessary `viewportTranslateInteraction` has been removed * `feature.dispose()` now gets called when it gets deleted - this could have been a memory leak? * Add link to main branch in readme (hpi-sam#611) * Close popups with esc (hpi-sam#610) * Add keydown handler to close popups on escape * Ensure input is saved even after less than 600ms * Cast event inline Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Add new image for big material and material (hpi-sam#544) * Add new image for big material and material Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix CVE-2022-25901 (hpi-sam#618) * Feature/597 regions can contain personnel and patients (hpi-sam#607) * Add MetaPosition type * Add MetaPosition to Vehicle * Add MetaPosition ro Personnel * Add MetaPosition to Material * Add MetaPosition to Patient * Add Classes for different Position Types * Use create when applicable and fix in MetaPosition * Add migration for addition of MetaPosition * refactor literals to start with lowercase * Change nested if else to else if * Make metaPosition not optional * Fix failing Tests * Update shared/src/models/material.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/models/patient.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/models/personnel.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/patient.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/utils/calculate-treatments.spec.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/vehicle.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix Prettier Errors * Change Validation to Allow * Put personnel and material in vehicle on creation * Update shared/src/store/action-reducers/transfer.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix Pipeline dependencies * Update shared/src/state-migrations/16-add-meta-position.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix linter Error * Add validators to MetaPositions * Remove unused imports * Fix Validators * Add/Fix Action Migrations * Add Exports to Index.ts * Update shared/src/store/action-reducers/utils/spatial-elements.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/vehicle.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix Lint Co-authored-by: Nils <45318774+Nils1729@users.noreply.github.com> Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Initialize the optimisticUpdateHandler only after the store has the exercise (hpi-sam#622) * Fixes "Features disappear from the map in imported exercises" hpi-sam#621 * Can be observed when two actions are simultaneously optimistically proposed, and the client didn't receive any other action from the server before * Patients are automatically triaged without any personnel on the map (hpi-sam#624) * Fix incorrect import of isEmpty This caused "Patients are automatically triaged without any personnel on the map" hpi-sam#623 * Disallow isEmpty imports from class-validator via eslint * Add Image for Johanniter Akademie NRW, Campus Münster der Johanniter-Unfall-Hilfe e.V. (JUH) (hpi-sam#619) * Add Image for Johanniter Akademie NRW, Campus Münster der Johanniter-Unfall-Hilfe e.V. (JUH) * Fix linter * Mention JUH in Readme * Scale down the malteser logo and add the new 22/23 project team to the landing page * Add our year to the landing page * Feature/603 use opaque fill style for simulated regions (hpi-sam#608) * Refactor viewports and simulated regions to be polygons instead of lines * Add opaque fill to simulated regions * Fix linter * WIP * Refactor Coordinates and Points to Compositions * Update readme accordingly * Change default type of SubstituteCoordinateForPoint to never as it should never happen * Fix typo * Increase alpha value to 80% * Fix bug where features did not sync their movement to other clients * Fix linter * Refactor lambda function to geometry helpers and refactor ElementFeature ElementFeature (which had to extend Feature<FeatureType>) has been replaced by Feature<FeatureType> because according to ol docs there are no classes extending Feature * Remove ElementManager.recreateFeature() * Refactor lambdas to function in Geometry Helper subclasses * Rename getNextPosition to interpolateCoordinates * Refactor polygon geometry helper names in map lambda function * Remove comment and type cast Co-authored-by: Julian Schmidt <julian.r.schmidt.js@gmail.com> * Change functions to arrow functions in Geometry Helpers to preserve `this` (hpi-sam#629) * Add type property to elements in the state (hpi-sam#616) * WIP * Pick specific selectors from TypeSelectorMap * Fix linter * Remove type property from feature * Fix bug after merge * Rename selector map to plural map and add validation * Simplify featureKeys * Fix tests by adding type property to demo objects * WIP: Add migration * Update shared/src/utils/type-state-selector-map.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Rename file to reflect variable name change * Replace type literals by element property * Run prettier * Finish migration * Fix migration to set correct type on EocLogEntry * Make imports consistent * Reuse literal union from transfer in exercise * Fix linter Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Remove unsupportedChangeProperties (hpi-sam#630) * Fix the Bug (hpi-sam#635) * Remove generic type LineString | Point in favor of the default Geometry (hpi-sam#634) * Remove generic type LineString | Point in favor of the default Geometry * Fix linter * Refactoring/612 refactor position (hpi-sam#625) * Add MetaPosition Helpers * Remove position property * Fix Lint * Unify access onto metaPosition * Fix Frontend * Remove Position Class * Remove Position from Tests * Rename MetaPosition to Position * Add Migration (not for Add vehicle Action) * complete the renaming * Fix Tests * Remove Transfer Property * Add Migration for Add Vehicle Action * Fix Small Bug * Use type properties instead of passed strings * Add comments * Fix Test * Fix Test * Fix Transfer Overview * Refactor Helper Methods to avoid duplicate Code * Change Names of Helper Functions * Added Comments to unused vars * Fix GHSA-rc47-6667-2j5j (hpi-sam#645) * Allow elements to be added to simulated regions (hpi-sam#626) * Allow elements to be added to simulated regions * Adapt Add to Simulated Region Action to type tags * Make linter happy * Use new position and bugfixes * Use proper function to create position * Refactor Start Point Literals (hpi-sam#642) * Refactor Start Point Literals * Add Migration * Enable Migration * Implement Feedback * Remove not needed types * Add footer and about pages (hpi-sam#643) * Add basic footer and empty about pages * Refactor structure of about pages * Add footer to 404 page * Add links from footer to exercise page * Run prettier * Display version number * Explain overwriting the pages in Docker deployment * Do not lint HTML files for about pages * Refactor template component * Rename title property since it's an html attribute * Make content observable * Rename template component Avoids confusion with angular concepts * Remove accidentally committed imprint dummy file * Remove commented-out footer from exercise page * Make Map movable on Drag with Pop Up (hpi-sam#649) * Make Map movable on Drag with Pop Up * Update pipeline actions to node 16 (hpi-sam#627) * Update pipeline actions to node 16 The old actions were based on Node 12, which has reached EOL. https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/ * Test previous version of cypress action again * Try cypress action v3 * Do not use cached cypress * Try a Cypress Config without actually calling Cypress * Try some more stuff... * Add Cypress as DevDependency to root * Re-enable default cypress tests * Remove version tag from cypress cache The tag was there for debugging purposes only * Invoke cypress in frontend subfolder * Try working-directory for cypress * Try --prefix for start * Retry --prefix before 'run' * Restore 5a9692d * Update package-lock.json --------- Co-authored-by: ClFeSc <68013019+ClFeSc@users.noreply.github.com> Co-authored-by: Nils <45318774+Nils1729@users.noreply.github.com> * Change mail address to feedback mailing list (hpi-sam#659) * Adapt treatment system to account for simulated regions (hpi-sam#658) * Adapt treatment system to account for simulated regions The treatment system no longer asserts that patients can only be treated on the map. * Please linter * Enable patient ticking in simulated regions * Fix extent calculation of viewports and simulated regions (hpi-sam#663) * Include simulated regions when fitting to view Also fixing a bug with negative extents * Fix viewport restriction with negative extent * Rename fit view method * Rename function at all occurrences * Fix isInViewport for negative extents * Satisfy linter * Avoid duplication in type definitions * Refactoring/609 refactor functionality from olmapmanager to featuremanagers (hpi-sam#662) * WIP * Move Layer Creation to Feature Managers * Move Registration into Feature managers * Complete Merge * Move Interactions to Interaction Manager * Move Popup Handling to Popup Manager * Move Satellite Layer to Satellite Layer manager * Minor Cleanup * Move files * Move Files * More Cleanup * More Cleanup * Fix a bug in participant mode * Clean up Map Interactions manager * Clean up Satellite Layer Manager * Fix Lint * Implement Feedback * Implement Feedback and change Parameter Order in onFeatureDropped * Implement Feedback and change Parameter Order in onFeatureDropped --------- Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Adjust nginx configuration for about pages (hpi-sam#657) * Adjust nginx configuration for about pages * Redirect invalid requests for a uniform 404 page * Add link to landing page on about pages * Improve error pages in nginx setup The error pages do not rely on a non-existing URL any longer --------- Co-authored-by: Marvin <68286419+anonym-HPI@users.noreply.github.com> * Set up simulation framework (hpi-sam#664) * Create draft for simulation data types * WIP: Simulate unloading of vehicles * WIP add debug helpers and make simulation work * WIP add typings and lint * Validate events * Fix never parameter in activity and behavior functions * Validate activities and behaviors * Introduce pseudo randomness for deterministic uuids * Add migrations for simulation * Rename SimulationActivity.terminate to onTerminate * Remove simulatedRegionId from VehicleArrivedEvent * Slight improvement to debugging buttons * Fix typo * Validate state in AddBehaviorAction * Incorporate suggestions from review * Fix randomness * Add generic DelayEventActivity * Fix DelayEventActivity * Please linter * Remove debug UI * Dragging onto the Map now triggers Drop Events (hpi-sam#671) * Dragging onto the Map now triggers Drop Events * Add our names to the readme (hpi-sam#672) * Use @noble/hashes instead of hash.js (hpi-sam#674) * Use @noble/hashes instead of hash.js * Fix install:all script * Add release workflow * Populate CHANGELOG.md * Update create-release-pr.yml * trigger pipeline * Prepare release v0.0.1-review (#3) Co-authored-by: GitHub Actions <noreply@github.com> * Prepare release v123-test (#5) Co-authored-by: GitHub Actions <noreply@github.com> * Prepare release v1.2.3-test2 (#7) Co-authored-by: GitHub Actions <noreply@github.com> * Update create-release-pr.yml debug * Update create-release-pr.yml debug * debug * Prepare release v1.2.3-test4 (#11) Co-authored-by: GitHub Actions <noreply@github.com> * diff * Debug v1.2.3-test6 (#13) Co-authored-by: GitHub Actions <noreply@github.com> * Debug v1.2.3-test7 (#15) Co-authored-by: GitHub Actions <noreply@github.com> * Fix npm i * Debug v1.2.3-test8 (#17) Co-authored-by: GitHub Actions <noreply@github.com> * call pipeline from release * fix permissions * remove auto pipeline * fix changelog * more permissions * Update pr creation steps * add checkout * maybe fix pr comment * Use other release action * Use other name for dev PR * Debug v1.2.3-test18 --------- Co-authored-by: Clemens <68013019+ClFeSc@users.noreply.github.com> Co-authored-by: Julian Schmidt <julian.r.schmidt.js@gmail.com> Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> Co-authored-by: Lukas Hagen <43916057+Greenscreen23@users.noreply.github.com> Co-authored-by: Lukas Radermacher <49586507+lukasrad02@users.noreply.github.com> Co-authored-by: benn02 <82985280+benn02@users.noreply.github.com> Co-authored-by: Nils <45318774+Nils1729@users.noreply.github.com> Co-authored-by: Marvin <68286419+anonym-HPI@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: GitHub Actions <noreply@github.com>

* Improve validation (hpi-sam#125) * Improve validation by introducing multiple new validation decorators * `IsIdMap` for types of the form `{ readonly [key: UUID]: T }`. This transforms the object, so using instance objects (instead of plain objects) will no longer be supported. * `IsLiteralUnion` for literal unions of types `number | string | symbol` (e.g. `participant | trainer`). Uses `isIn` internally. * `IsReachableTransferPoints` for `ReachableTransferPoints` used in `TransferPoint`. Very specific but necessary due to the unique structure of this type. * `IsUUIDSet` for `UUIDSet` * `IsValue` for *simple* values that are required for a property. For example, when a `type` property has to have the value `'partial'`, one can use `@IsValue('partial')` for this. Allowed are the types `bigint | boolean | number | string | symbol | null | undefined`. The reason is that this validator also uses `isIn` internally, which in turn uses `===` which might produce incorrect results for `object` values. * All validators are required to be applied to correctly types properties by the use of `GenericPropertyDecorator`. Using e.g. `@IsLiteralUnion({ partial: true, complete: true })` on a property typed `string` raises a TypeScript error. Co-authored-by: Julian Schmidt <julian.r.schmidt.js@gmail.com> * Feature/state benchmark (hpi-sam#581) * Move state migrations to shared * Add benchmark package * Update readmes * Make problem with duplicated RestoreError more obvious * Feature/improve eslint rules (hpi-sam#591) * Disallow imports from "*/dist/*" * Improve smaller eslint rules * Update documentation * Update packages to mitigate GHSA-9c47-m6qq-7p4h (hpi-sam#592) * Update dependencies (hpi-sam#595) * Update dependencies * typescript@4.9 (satisfies-operator and watch-performance-improvements) * angular@15.1 * Else only patch and minor version bumps * Fix version of @types/node in benchmark and frontend (18 -> 16) * Run prettier * Add simulated regions that can be placed on the map (hpi-sam#601) * Add simulated regions that can be placed on the map * Fix naming * Add migration * Fix linter error * Move simulated region to separate heading in trainer map editor * Turn isInSimulatedRegion into a stub method * Refactor ol-map-manager to reuse some features from viewport in simulatedRegion * Ignore vs code config files (hpi-sam#606) * Rename VS Code configs to `.example` * Add new "Start all but database" task * Explain changes in readme * Refactor viewport-modify to resize-rectangle-interaction (hpi-sam#604) * Instead of using some parts of the `Modify` interaction (side-effect in the style function) a new custom Interaction has been created. * Previously, one could switch between resizing and translating a viewport via pressing `Shift`. Instead, now one ***resizes*** if one drags an edge of the viewport (+ a bit around it), and ***translates*** if one drags any other part. This should enable touch users to resize viewports * The code should now be more readable and extendable * The unnecessary `viewportTranslateInteraction` has been removed * `feature.dispose()` now gets called when it gets deleted - this could have been a memory leak? * Add link to main branch in readme (hpi-sam#611) * Close popups with esc (hpi-sam#610) * Add keydown handler to close popups on escape * Ensure input is saved even after less than 600ms * Cast event inline Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Add new image for big material and material (hpi-sam#544) * Add new image for big material and material Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix CVE-2022-25901 (hpi-sam#618) * Feature/597 regions can contain personnel and patients (hpi-sam#607) * Add MetaPosition type * Add MetaPosition to Vehicle * Add MetaPosition ro Personnel * Add MetaPosition to Material * Add MetaPosition to Patient * Add Classes for different Position Types * Use create when applicable and fix in MetaPosition * Add migration for addition of MetaPosition * refactor literals to start with lowercase * Change nested if else to else if * Make metaPosition not optional * Fix failing Tests * Update shared/src/models/material.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/models/patient.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/models/personnel.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/patient.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/utils/calculate-treatments.spec.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/vehicle.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix Prettier Errors * Change Validation to Allow * Put personnel and material in vehicle on creation * Update shared/src/store/action-reducers/transfer.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix Pipeline dependencies * Update shared/src/state-migrations/16-add-meta-position.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix linter Error * Add validators to MetaPositions * Remove unused imports * Fix Validators * Add/Fix Action Migrations * Add Exports to Index.ts * Update shared/src/store/action-reducers/utils/spatial-elements.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/vehicle.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix Lint Co-authored-by: Nils <45318774+Nils1729@users.noreply.github.com> Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Initialize the optimisticUpdateHandler only after the store has the exercise (hpi-sam#622) * Fixes "Features disappear from the map in imported exercises" hpi-sam#621 * Can be observed when two actions are simultaneously optimistically proposed, and the client didn't receive any other action from the server before * Patients are automatically triaged without any personnel on the map (hpi-sam#624) * Fix incorrect import of isEmpty This caused "Patients are automatically triaged without any personnel on the map" hpi-sam#623 * Disallow isEmpty imports from class-validator via eslint * Add Image for Johanniter Akademie NRW, Campus Münster der Johanniter-Unfall-Hilfe e.V. (JUH) (hpi-sam#619) * Add Image for Johanniter Akademie NRW, Campus Münster der Johanniter-Unfall-Hilfe e.V. (JUH) * Fix linter * Mention JUH in Readme * Scale down the malteser logo and add the new 22/23 project team to the landing page * Add our year to the landing page * Feature/603 use opaque fill style for simulated regions (hpi-sam#608) * Refactor viewports and simulated regions to be polygons instead of lines * Add opaque fill to simulated regions * Fix linter * WIP * Refactor Coordinates and Points to Compositions * Update readme accordingly * Change default type of SubstituteCoordinateForPoint to never as it should never happen * Fix typo * Increase alpha value to 80% * Fix bug where features did not sync their movement to other clients * Fix linter * Refactor lambda function to geometry helpers and refactor ElementFeature ElementFeature (which had to extend Feature<FeatureType>) has been replaced by Feature<FeatureType> because according to ol docs there are no classes extending Feature * Remove ElementManager.recreateFeature() * Refactor lambdas to function in Geometry Helper subclasses * Rename getNextPosition to interpolateCoordinates * Refactor polygon geometry helper names in map lambda function * Remove comment and type cast Co-authored-by: Julian Schmidt <julian.r.schmidt.js@gmail.com> * Change functions to arrow functions in Geometry Helpers to preserve `this` (hpi-sam#629) * Add type property to elements in the state (hpi-sam#616) * WIP * Pick specific selectors from TypeSelectorMap * Fix linter * Remove type property from feature * Fix bug after merge * Rename selector map to plural map and add validation * Simplify featureKeys * Fix tests by adding type property to demo objects * WIP: Add migration * Update shared/src/utils/type-state-selector-map.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Rename file to reflect variable name change * Replace type literals by element property * Run prettier * Finish migration * Fix migration to set correct type on EocLogEntry * Make imports consistent * Reuse literal union from transfer in exercise * Fix linter Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Remove unsupportedChangeProperties (hpi-sam#630) * Fix the Bug (hpi-sam#635) * Remove generic type LineString | Point in favor of the default Geometry (hpi-sam#634) * Remove generic type LineString | Point in favor of the default Geometry * Fix linter * Refactoring/612 refactor position (hpi-sam#625) * Add MetaPosition Helpers * Remove position property * Fix Lint * Unify access onto metaPosition * Fix Frontend * Remove Position Class * Remove Position from Tests * Rename MetaPosition to Position * Add Migration (not for Add vehicle Action) * complete the renaming * Fix Tests * Remove Transfer Property * Add Migration for Add Vehicle Action * Fix Small Bug * Use type properties instead of passed strings * Add comments * Fix Test * Fix Test * Fix Transfer Overview * Refactor Helper Methods to avoid duplicate Code * Change Names of Helper Functions * Added Comments to unused vars * Fix GHSA-rc47-6667-2j5j (hpi-sam#645) * Allow elements to be added to simulated regions (hpi-sam#626) * Allow elements to be added to simulated regions * Adapt Add to Simulated Region Action to type tags * Make linter happy * Use new position and bugfixes * Use proper function to create position * Refactor Start Point Literals (hpi-sam#642) * Refactor Start Point Literals * Add Migration * Enable Migration * Implement Feedback * Remove not needed types * Add footer and about pages (hpi-sam#643) * Add basic footer and empty about pages * Refactor structure of about pages * Add footer to 404 page * Add links from footer to exercise page * Run prettier * Display version number * Explain overwriting the pages in Docker deployment * Do not lint HTML files for about pages * Refactor template component * Rename title property since it's an html attribute * Make content observable * Rename template component Avoids confusion with angular concepts * Remove accidentally committed imprint dummy file * Remove commented-out footer from exercise page * Make Map movable on Drag with Pop Up (hpi-sam#649) * Make Map movable on Drag with Pop Up * Update pipeline actions to node 16 (hpi-sam#627) * Update pipeline actions to node 16 The old actions were based on Node 12, which has reached EOL. https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/ * Test previous version of cypress action again * Try cypress action v3 * Do not use cached cypress * Try a Cypress Config without actually calling Cypress * Try some more stuff... * Add Cypress as DevDependency to root * Re-enable default cypress tests * Remove version tag from cypress cache The tag was there for debugging purposes only * Invoke cypress in frontend subfolder * Try working-directory for cypress * Try --prefix for start * Retry --prefix before 'run' * Restore 5a9692d * Update package-lock.json --------- Co-authored-by: ClFeSc <68013019+ClFeSc@users.noreply.github.com> Co-authored-by: Nils <45318774+Nils1729@users.noreply.github.com> * Change mail address to feedback mailing list (hpi-sam#659) * Adapt treatment system to account for simulated regions (hpi-sam#658) * Adapt treatment system to account for simulated regions The treatment system no longer asserts that patients can only be treated on the map. * Please linter * Enable patient ticking in simulated regions * Fix extent calculation of viewports and simulated regions (hpi-sam#663) * Include simulated regions when fitting to view Also fixing a bug with negative extents * Fix viewport restriction with negative extent * Rename fit view method * Rename function at all occurrences * Fix isInViewport for negative extents * Satisfy linter * Avoid duplication in type definitions * Refactoring/609 refactor functionality from olmapmanager to featuremanagers (hpi-sam#662) * WIP * Move Layer Creation to Feature Managers * Move Registration into Feature managers * Complete Merge * Move Interactions to Interaction Manager * Move Popup Handling to Popup Manager * Move Satellite Layer to Satellite Layer manager * Minor Cleanup * Move files * Move Files * More Cleanup * More Cleanup * Fix a bug in participant mode * Clean up Map Interactions manager * Clean up Satellite Layer Manager * Fix Lint * Implement Feedback * Implement Feedback and change Parameter Order in onFeatureDropped * Implement Feedback and change Parameter Order in onFeatureDropped --------- Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Adjust nginx configuration for about pages (hpi-sam#657) * Adjust nginx configuration for about pages * Redirect invalid requests for a uniform 404 page * Add link to landing page on about pages * Improve error pages in nginx setup The error pages do not rely on a non-existing URL any longer --------- Co-authored-by: Marvin <68286419+anonym-HPI@users.noreply.github.com> * Set up simulation framework (hpi-sam#664) * Create draft for simulation data types * WIP: Simulate unloading of vehicles * WIP add debug helpers and make simulation work * WIP add typings and lint * Validate events * Fix never parameter in activity and behavior functions * Validate activities and behaviors * Introduce pseudo randomness for deterministic uuids * Add migrations for simulation * Rename SimulationActivity.terminate to onTerminate * Remove simulatedRegionId from VehicleArrivedEvent * Slight improvement to debugging buttons * Fix typo * Validate state in AddBehaviorAction * Incorporate suggestions from review * Fix randomness * Add generic DelayEventActivity * Fix DelayEventActivity * Please linter * Remove debug UI * Dragging onto the Map now triggers Drop Events (hpi-sam#671) * Dragging onto the Map now triggers Drop Events * Add our names to the readme (hpi-sam#672) * Use @noble/hashes instead of hash.js (hpi-sam#674) * Use @noble/hashes instead of hash.js * Fix install:all script * Add release workflow * Populate CHANGELOG.md * Update create-release-pr.yml * trigger pipeline * Prepare release v0.0.1-review (#3) Co-authored-by: GitHub Actions <noreply@github.com> * Prepare release v123-test (#5) Co-authored-by: GitHub Actions <noreply@github.com> * Prepare release v1.2.3-test2 (#7) Co-authored-by: GitHub Actions <noreply@github.com> * Update create-release-pr.yml debug * Update create-release-pr.yml debug * debug * Prepare release v1.2.3-test4 (#11) Co-authored-by: GitHub Actions <noreply@github.com> * diff * Debug v1.2.3-test6 (#13) Co-authored-by: GitHub Actions <noreply@github.com> * Debug v1.2.3-test7 (#15) Co-authored-by: GitHub Actions <noreply@github.com> * Fix npm i * Debug v1.2.3-test8 (#17) Co-authored-by: GitHub Actions <noreply@github.com> * call pipeline from release * fix permissions * remove auto pipeline * fix changelog * more permissions * Update pr creation steps * add checkout * maybe fix pr comment * Use other release action * Use other name for dev PR * Use script instead of third party action --------- Co-authored-by: Clemens <68013019+ClFeSc@users.noreply.github.com> Co-authored-by: Julian Schmidt <julian.r.schmidt.js@gmail.com> Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> Co-authored-by: Lukas Hagen <43916057+Greenscreen23@users.noreply.github.com> Co-authored-by: Lukas Radermacher <49586507+lukasrad02@users.noreply.github.com> Co-authored-by: benn02 <82985280+benn02@users.noreply.github.com> Co-authored-by: Marvin <68286419+anonym-HPI@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: GitHub Actions <noreply@github.com>

* Improve validation (hpi-sam#125) * Improve validation by introducing multiple new validation decorators * `IsIdMap` for types of the form `{ readonly [key: UUID]: T }`. This transforms the object, so using instance objects (instead of plain objects) will no longer be supported. * `IsLiteralUnion` for literal unions of types `number | string | symbol` (e.g. `participant | trainer`). Uses `isIn` internally. * `IsReachableTransferPoints` for `ReachableTransferPoints` used in `TransferPoint`. Very specific but necessary due to the unique structure of this type. * `IsUUIDSet` for `UUIDSet` * `IsValue` for *simple* values that are required for a property. For example, when a `type` property has to have the value `'partial'`, one can use `@IsValue('partial')` for this. Allowed are the types `bigint | boolean | number | string | symbol | null | undefined`. The reason is that this validator also uses `isIn` internally, which in turn uses `===` which might produce incorrect results for `object` values. * All validators are required to be applied to correctly types properties by the use of `GenericPropertyDecorator`. Using e.g. `@IsLiteralUnion({ partial: true, complete: true })` on a property typed `string` raises a TypeScript error. Co-authored-by: Julian Schmidt <julian.r.schmidt.js@gmail.com> * Feature/state benchmark (hpi-sam#581) * Move state migrations to shared * Add benchmark package * Update readmes * Make problem with duplicated RestoreError more obvious * Feature/improve eslint rules (hpi-sam#591) * Disallow imports from "*/dist/*" * Improve smaller eslint rules * Update documentation * Update packages to mitigate GHSA-9c47-m6qq-7p4h (hpi-sam#592) * Update dependencies (hpi-sam#595) * Update dependencies * typescript@4.9 (satisfies-operator and watch-performance-improvements) * angular@15.1 * Else only patch and minor version bumps * Fix version of @types/node in benchmark and frontend (18 -> 16) * Run prettier * Add simulated regions that can be placed on the map (hpi-sam#601) * Add simulated regions that can be placed on the map * Fix naming * Add migration * Fix linter error * Move simulated region to separate heading in trainer map editor * Turn isInSimulatedRegion into a stub method * Refactor ol-map-manager to reuse some features from viewport in simulatedRegion * Ignore vs code config files (hpi-sam#606) * Rename VS Code configs to `.example` * Add new "Start all but database" task * Explain changes in readme * Refactor viewport-modify to resize-rectangle-interaction (hpi-sam#604) * Instead of using some parts of the `Modify` interaction (side-effect in the style function) a new custom Interaction has been created. * Previously, one could switch between resizing and translating a viewport via pressing `Shift`. Instead, now one ***resizes*** if one drags an edge of the viewport (+ a bit around it), and ***translates*** if one drags any other part. This should enable touch users to resize viewports * The code should now be more readable and extendable * The unnecessary `viewportTranslateInteraction` has been removed * `feature.dispose()` now gets called when it gets deleted - this could have been a memory leak? * Add link to main branch in readme (hpi-sam#611) * Close popups with esc (hpi-sam#610) * Add keydown handler to close popups on escape * Ensure input is saved even after less than 600ms * Cast event inline Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Add new image for big material and material (hpi-sam#544) * Add new image for big material and material Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix CVE-2022-25901 (hpi-sam#618) * Feature/597 regions can contain personnel and patients (hpi-sam#607) * Add MetaPosition type * Add MetaPosition to Vehicle * Add MetaPosition ro Personnel * Add MetaPosition to Material * Add MetaPosition to Patient * Add Classes for different Position Types * Use create when applicable and fix in MetaPosition * Add migration for addition of MetaPosition * refactor literals to start with lowercase * Change nested if else to else if * Make metaPosition not optional * Fix failing Tests * Update shared/src/models/material.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/models/patient.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/models/personnel.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/patient.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/utils/calculate-treatments.spec.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/vehicle.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix Prettier Errors * Change Validation to Allow * Put personnel and material in vehicle on creation * Update shared/src/store/action-reducers/transfer.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix Pipeline dependencies * Update shared/src/state-migrations/16-add-meta-position.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix linter Error * Add validators to MetaPositions * Remove unused imports * Fix Validators * Add/Fix Action Migrations * Add Exports to Index.ts * Update shared/src/store/action-reducers/utils/spatial-elements.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/vehicle.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix Lint Co-authored-by: Nils <45318774+Nils1729@users.noreply.github.com> Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Initialize the optimisticUpdateHandler only after the store has the exercise (hpi-sam#622) * Fixes "Features disappear from the map in imported exercises" hpi-sam#621 * Can be observed when two actions are simultaneously optimistically proposed, and the client didn't receive any other action from the server before * Patients are automatically triaged without any personnel on the map (hpi-sam#624) * Fix incorrect import of isEmpty This caused "Patients are automatically triaged without any personnel on the map" hpi-sam#623 * Disallow isEmpty imports from class-validator via eslint * Add Image for Johanniter Akademie NRW, Campus Münster der Johanniter-Unfall-Hilfe e.V. (JUH) (hpi-sam#619) * Add Image for Johanniter Akademie NRW, Campus Münster der Johanniter-Unfall-Hilfe e.V. (JUH) * Fix linter * Mention JUH in Readme * Scale down the malteser logo and add the new 22/23 project team to the landing page * Add our year to the landing page * Feature/603 use opaque fill style for simulated regions (hpi-sam#608) * Refactor viewports and simulated regions to be polygons instead of lines * Add opaque fill to simulated regions * Fix linter * WIP * Refactor Coordinates and Points to Compositions * Update readme accordingly * Change default type of SubstituteCoordinateForPoint to never as it should never happen * Fix typo * Increase alpha value to 80% * Fix bug where features did not sync their movement to other clients * Fix linter * Refactor lambda function to geometry helpers and refactor ElementFeature ElementFeature (which had to extend Feature<FeatureType>) has been replaced by Feature<FeatureType> because according to ol docs there are no classes extending Feature * Remove ElementManager.recreateFeature() * Refactor lambdas to function in Geometry Helper subclasses * Rename getNextPosition to interpolateCoordinates * Refactor polygon geometry helper names in map lambda function * Remove comment and type cast Co-authored-by: Julian Schmidt <julian.r.schmidt.js@gmail.com> * Change functions to arrow functions in Geometry Helpers to preserve `this` (hpi-sam#629) * Add type property to elements in the state (hpi-sam#616) * WIP * Pick specific selectors from TypeSelectorMap * Fix linter * Remove type property from feature * Fix bug after merge * Rename selector map to plural map and add validation * Simplify featureKeys * Fix tests by adding type property to demo objects * WIP: Add migration * Update shared/src/utils/type-state-selector-map.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Rename file to reflect variable name change * Replace type literals by element property * Run prettier * Finish migration * Fix migration to set correct type on EocLogEntry * Make imports consistent * Reuse literal union from transfer in exercise * Fix linter Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Remove unsupportedChangeProperties (hpi-sam#630) * Fix the Bug (hpi-sam#635) * Remove generic type LineString | Point in favor of the default Geometry (hpi-sam#634) * Remove generic type LineString | Point in favor of the default Geometry * Fix linter * Refactoring/612 refactor position (hpi-sam#625) * Add MetaPosition Helpers * Remove position property * Fix Lint * Unify access onto metaPosition * Fix Frontend * Remove Position Class * Remove Position from Tests * Rename MetaPosition to Position * Add Migration (not for Add vehicle Action) * complete the renaming * Fix Tests * Remove Transfer Property * Add Migration for Add Vehicle Action * Fix Small Bug * Use type properties instead of passed strings * Add comments * Fix Test * Fix Test * Fix Transfer Overview * Refactor Helper Methods to avoid duplicate Code * Change Names of Helper Functions * Added Comments to unused vars * Fix GHSA-rc47-6667-2j5j (hpi-sam#645) * Allow elements to be added to simulated regions (hpi-sam#626) * Allow elements to be added to simulated regions * Adapt Add to Simulated Region Action to type tags * Make linter happy * Use new position and bugfixes * Use proper function to create position * Refactor Start Point Literals (hpi-sam#642) * Refactor Start Point Literals * Add Migration * Enable Migration * Implement Feedback * Remove not needed types * Add footer and about pages (hpi-sam#643) * Add basic footer and empty about pages * Refactor structure of about pages * Add footer to 404 page * Add links from footer to exercise page * Run prettier * Display version number * Explain overwriting the pages in Docker deployment * Do not lint HTML files for about pages * Refactor template component * Rename title property since it's an html attribute * Make content observable * Rename template component Avoids confusion with angular concepts * Remove accidentally committed imprint dummy file * Remove commented-out footer from exercise page * Make Map movable on Drag with Pop Up (hpi-sam#649) * Make Map movable on Drag with Pop Up * Update pipeline actions to node 16 (hpi-sam#627) * Update pipeline actions to node 16 The old actions were based on Node 12, which has reached EOL. https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/ * Test previous version of cypress action again * Try cypress action v3 * Do not use cached cypress * Try a Cypress Config without actually calling Cypress * Try some more stuff... * Add Cypress as DevDependency to root * Re-enable default cypress tests * Remove version tag from cypress cache The tag was there for debugging purposes only * Invoke cypress in frontend subfolder * Try working-directory for cypress * Try --prefix for start * Retry --prefix before 'run' * Restore 5a9692d * Update package-lock.json --------- Co-authored-by: ClFeSc <68013019+ClFeSc@users.noreply.github.com> Co-authored-by: Nils <45318774+Nils1729@users.noreply.github.com> * Change mail address to feedback mailing list (hpi-sam#659) * Adapt treatment system to account for simulated regions (hpi-sam#658) * Adapt treatment system to account for simulated regions The treatment system no longer asserts that patients can only be treated on the map. * Please linter * Enable patient ticking in simulated regions * Fix extent calculation of viewports and simulated regions (hpi-sam#663) * Include simulated regions when fitting to view Also fixing a bug with negative extents * Fix viewport restriction with negative extent * Rename fit view method * Rename function at all occurrences * Fix isInViewport for negative extents * Satisfy linter * Avoid duplication in type definitions * Refactoring/609 refactor functionality from olmapmanager to featuremanagers (hpi-sam#662) * WIP * Move Layer Creation to Feature Managers * Move Registration into Feature managers * Complete Merge * Move Interactions to Interaction Manager * Move Popup Handling to Popup Manager * Move Satellite Layer to Satellite Layer manager * Minor Cleanup * Move files * Move Files * More Cleanup * More Cleanup * Fix a bug in participant mode * Clean up Map Interactions manager * Clean up Satellite Layer Manager * Fix Lint * Implement Feedback * Implement Feedback and change Parameter Order in onFeatureDropped * Implement Feedback and change Parameter Order in onFeatureDropped --------- Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Adjust nginx configuration for about pages (hpi-sam#657) * Adjust nginx configuration for about pages * Redirect invalid requests for a uniform 404 page * Add link to landing page on about pages * Improve error pages in nginx setup The error pages do not rely on a non-existing URL any longer --------- Co-authored-by: Marvin <68286419+anonym-HPI@users.noreply.github.com> * Set up simulation framework (hpi-sam#664) * Create draft for simulation data types * WIP: Simulate unloading of vehicles * WIP add debug helpers and make simulation work * WIP add typings and lint * Validate events * Fix never parameter in activity and behavior functions * Validate activities and behaviors * Introduce pseudo randomness for deterministic uuids * Add migrations for simulation * Rename SimulationActivity.terminate to onTerminate * Remove simulatedRegionId from VehicleArrivedEvent * Slight improvement to debugging buttons * Fix typo * Validate state in AddBehaviorAction * Incorporate suggestions from review * Fix randomness * Add generic DelayEventActivity * Fix DelayEventActivity * Please linter * Remove debug UI * Dragging onto the Map now triggers Drop Events (hpi-sam#671) * Dragging onto the Map now triggers Drop Events * Add our names to the readme (hpi-sam#672) * Use @noble/hashes instead of hash.js (hpi-sam#674) * Use @noble/hashes instead of hash.js * Fix install:all script * Add release workflow * Populate CHANGELOG.md * Update create-release-pr.yml * trigger pipeline * Prepare release v0.0.1-review (#3) Co-authored-by: GitHub Actions <noreply@github.com> * Prepare release v123-test (#5) Co-authored-by: GitHub Actions <noreply@github.com> * Prepare release v1.2.3-test2 (#7) Co-authored-by: GitHub Actions <noreply@github.com> * Update create-release-pr.yml debug * Update create-release-pr.yml debug * debug * Prepare release v1.2.3-test4 (#11) Co-authored-by: GitHub Actions <noreply@github.com> * diff * Debug v1.2.3-test6 (#13) Co-authored-by: GitHub Actions <noreply@github.com> * Debug v1.2.3-test7 (#15) Co-authored-by: GitHub Actions <noreply@github.com> * Fix npm i * Debug v1.2.3-test8 (#17) Co-authored-by: GitHub Actions <noreply@github.com> * call pipeline from release * fix permissions * remove auto pipeline * fix changelog * more permissions * Update pr creation steps * add checkout * maybe fix pr comment * Use other release action * Use other name for dev PR * Use script instead of third party action * Debug v1.2.3-test19 --------- Co-authored-by: Clemens <68013019+ClFeSc@users.noreply.github.com> Co-authored-by: Julian Schmidt <julian.r.schmidt.js@gmail.com> Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> Co-authored-by: Lukas Hagen <43916057+Greenscreen23@users.noreply.github.com> Co-authored-by: Lukas Radermacher <49586507+lukasrad02@users.noreply.github.com> Co-authored-by: benn02 <82985280+benn02@users.noreply.github.com> Co-authored-by: Nils <45318774+Nils1729@users.noreply.github.com> Co-authored-by: Marvin <68286419+anonym-HPI@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: GitHub Actions <noreply@github.com>

* Improve validation (hpi-sam#125) * Improve validation by introducing multiple new validation decorators * `IsIdMap` for types of the form `{ readonly [key: UUID]: T }`. This transforms the object, so using instance objects (instead of plain objects) will no longer be supported. * `IsLiteralUnion` for literal unions of types `number | string | symbol` (e.g. `participant | trainer`). Uses `isIn` internally. * `IsReachableTransferPoints` for `ReachableTransferPoints` used in `TransferPoint`. Very specific but necessary due to the unique structure of this type. * `IsUUIDSet` for `UUIDSet` * `IsValue` for *simple* values that are required for a property. For example, when a `type` property has to have the value `'partial'`, one can use `@IsValue('partial')` for this. Allowed are the types `bigint | boolean | number | string | symbol | null | undefined`. The reason is that this validator also uses `isIn` internally, which in turn uses `===` which might produce incorrect results for `object` values. * All validators are required to be applied to correctly types properties by the use of `GenericPropertyDecorator`. Using e.g. `@IsLiteralUnion({ partial: true, complete: true })` on a property typed `string` raises a TypeScript error. Co-authored-by: Julian Schmidt <julian.r.schmidt.js@gmail.com> * Feature/state benchmark (hpi-sam#581) * Move state migrations to shared * Add benchmark package * Update readmes * Make problem with duplicated RestoreError more obvious * Feature/improve eslint rules (hpi-sam#591) * Disallow imports from "*/dist/*" * Improve smaller eslint rules * Update documentation * Update packages to mitigate GHSA-9c47-m6qq-7p4h (hpi-sam#592) * Update dependencies (hpi-sam#595) * Update dependencies * typescript@4.9 (satisfies-operator and watch-performance-improvements) * angular@15.1 * Else only patch and minor version bumps * Fix version of @types/node in benchmark and frontend (18 -> 16) * Run prettier * Add simulated regions that can be placed on the map (hpi-sam#601) * Add simulated regions that can be placed on the map * Fix naming * Add migration * Fix linter error * Move simulated region to separate heading in trainer map editor * Turn isInSimulatedRegion into a stub method * Refactor ol-map-manager to reuse some features from viewport in simulatedRegion * Ignore vs code config files (hpi-sam#606) * Rename VS Code configs to `.example` * Add new "Start all but database" task * Explain changes in readme * Refactor viewport-modify to resize-rectangle-interaction (hpi-sam#604) * Instead of using some parts of the `Modify` interaction (side-effect in the style function) a new custom Interaction has been created. * Previously, one could switch between resizing and translating a viewport via pressing `Shift`. Instead, now one ***resizes*** if one drags an edge of the viewport (+ a bit around it), and ***translates*** if one drags any other part. This should enable touch users to resize viewports * The code should now be more readable and extendable * The unnecessary `viewportTranslateInteraction` has been removed * `feature.dispose()` now gets called when it gets deleted - this could have been a memory leak? * Add link to main branch in readme (hpi-sam#611) * Close popups with esc (hpi-sam#610) * Add keydown handler to close popups on escape * Ensure input is saved even after less than 600ms * Cast event inline Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Add new image for big material and material (hpi-sam#544) * Add new image for big material and material Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix CVE-2022-25901 (hpi-sam#618) * Feature/597 regions can contain personnel and patients (hpi-sam#607) * Add MetaPosition type * Add MetaPosition to Vehicle * Add MetaPosition ro Personnel * Add MetaPosition to Material * Add MetaPosition to Patient * Add Classes for different Position Types * Use create when applicable and fix in MetaPosition * Add migration for addition of MetaPosition * refactor literals to start with lowercase * Change nested if else to else if * Make metaPosition not optional * Fix failing Tests * Update shared/src/models/material.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/models/patient.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/models/personnel.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/patient.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/utils/calculate-treatments.spec.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/vehicle.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix Prettier Errors * Change Validation to Allow * Put personnel and material in vehicle on creation * Update shared/src/store/action-reducers/transfer.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix Pipeline dependencies * Update shared/src/state-migrations/16-add-meta-position.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix linter Error * Add validators to MetaPositions * Remove unused imports * Fix Validators * Add/Fix Action Migrations * Add Exports to Index.ts * Update shared/src/store/action-reducers/utils/spatial-elements.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Update shared/src/store/action-reducers/vehicle.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Fix Lint Co-authored-by: Nils <45318774+Nils1729@users.noreply.github.com> Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Initialize the optimisticUpdateHandler only after the store has the exercise (hpi-sam#622) * Fixes "Features disappear from the map in imported exercises" hpi-sam#621 * Can be observed when two actions are simultaneously optimistically proposed, and the client didn't receive any other action from the server before * Patients are automatically triaged without any personnel on the map (hpi-sam#624) * Fix incorrect import of isEmpty This caused "Patients are automatically triaged without any personnel on the map" hpi-sam#623 * Disallow isEmpty imports from class-validator via eslint * Add Image for Johanniter Akademie NRW, Campus Münster der Johanniter-Unfall-Hilfe e.V. (JUH) (hpi-sam#619) * Add Image for Johanniter Akademie NRW, Campus Münster der Johanniter-Unfall-Hilfe e.V. (JUH) * Fix linter * Mention JUH in Readme * Scale down the malteser logo and add the new 22/23 project team to the landing page * Add our year to the landing page * Feature/603 use opaque fill style for simulated regions (hpi-sam#608) * Refactor viewports and simulated regions to be polygons instead of lines * Add opaque fill to simulated regions * Fix linter * WIP * Refactor Coordinates and Points to Compositions * Update readme accordingly * Change default type of SubstituteCoordinateForPoint to never as it should never happen * Fix typo * Increase alpha value to 80% * Fix bug where features did not sync their movement to other clients * Fix linter * Refactor lambda function to geometry helpers and refactor ElementFeature ElementFeature (which had to extend Feature<FeatureType>) has been replaced by Feature<FeatureType> because according to ol docs there are no classes extending Feature * Remove ElementManager.recreateFeature() * Refactor lambdas to function in Geometry Helper subclasses * Rename getNextPosition to interpolateCoordinates * Refactor polygon geometry helper names in map lambda function * Remove comment and type cast Co-authored-by: Julian Schmidt <julian.r.schmidt.js@gmail.com> * Change functions to arrow functions in Geometry Helpers to preserve `this` (hpi-sam#629) * Add type property to elements in the state (hpi-sam#616) * WIP * Pick specific selectors from TypeSelectorMap * Fix linter * Remove type property from feature * Fix bug after merge * Rename selector map to plural map and add validation * Simplify featureKeys * Fix tests by adding type property to demo objects * WIP: Add migration * Update shared/src/utils/type-state-selector-map.ts Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Rename file to reflect variable name change * Replace type literals by element property * Run prettier * Finish migration * Fix migration to set correct type on EocLogEntry * Make imports consistent * Reuse literal union from transfer in exercise * Fix linter Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Remove unsupportedChangeProperties (hpi-sam#630) * Fix the Bug (hpi-sam#635) * Remove generic type LineString | Point in favor of the default Geometry (hpi-sam#634) * Remove generic type LineString | Point in favor of the default Geometry * Fix linter * Refactoring/612 refactor position (hpi-sam#625) * Add MetaPosition Helpers * Remove position property * Fix Lint * Unify access onto metaPosition * Fix Frontend * Remove Position Class * Remove Position from Tests * Rename MetaPosition to Position * Add Migration (not for Add vehicle Action) * complete the renaming * Fix Tests * Remove Transfer Property * Add Migration for Add Vehicle Action * Fix Small Bug * Use type properties instead of passed strings * Add comments * Fix Test * Fix Test * Fix Transfer Overview * Refactor Helper Methods to avoid duplicate Code * Change Names of Helper Functions * Added Comments to unused vars * Fix GHSA-rc47-6667-2j5j (hpi-sam#645) * Allow elements to be added to simulated regions (hpi-sam#626) * Allow elements to be added to simulated regions * Adapt Add to Simulated Region Action to type tags * Make linter happy * Use new position and bugfixes * Use proper function to create position * Refactor Start Point Literals (hpi-sam#642) * Refactor Start Point Literals * Add Migration * Enable Migration * Implement Feedback * Remove not needed types * Add footer and about pages (hpi-sam#643) * Add basic footer and empty about pages * Refactor structure of about pages * Add footer to 404 page * Add links from footer to exercise page * Run prettier * Display version number * Explain overwriting the pages in Docker deployment * Do not lint HTML files for about pages * Refactor template component * Rename title property since it's an html attribute * Make content observable * Rename template component Avoids confusion with angular concepts * Remove accidentally committed imprint dummy file * Remove commented-out footer from exercise page * Make Map movable on Drag with Pop Up (hpi-sam#649) * Make Map movable on Drag with Pop Up * Update pipeline actions to node 16 (hpi-sam#627) * Update pipeline actions to node 16 The old actions were based on Node 12, which has reached EOL. https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/ * Test previous version of cypress action again * Try cypress action v3 * Do not use cached cypress * Try a Cypress Config without actually calling Cypress * Try some more stuff... * Add Cypress as DevDependency to root * Re-enable default cypress tests * Remove version tag from cypress cache The tag was there for debugging purposes only * Invoke cypress in frontend subfolder * Try working-directory for cypress * Try --prefix for start * Retry --prefix before 'run' * Restore 5a9692d * Update package-lock.json --------- Co-authored-by: ClFeSc <68013019+ClFeSc@users.noreply.github.com> Co-authored-by: Nils <45318774+Nils1729@users.noreply.github.com> * Change mail address to feedback mailing list (hpi-sam#659) * Adapt treatment system to account for simulated regions (hpi-sam#658) * Adapt treatment system to account for simulated regions The treatment system no longer asserts that patients can only be treated on the map. * Please linter * Enable patient ticking in simulated regions * Fix extent calculation of viewports and simulated regions (hpi-sam#663) * Include simulated regions when fitting to view Also fixing a bug with negative extents * Fix viewport restriction with negative extent * Rename fit view method * Rename function at all occurrences * Fix isInViewport for negative extents * Satisfy linter * Avoid duplication in type definitions * Refactoring/609 refactor functionality from olmapmanager to featuremanagers (hpi-sam#662) * WIP * Move Layer Creation to Feature Managers * Move Registration into Feature managers * Complete Merge * Move Interactions to Interaction Manager * Move Popup Handling to Popup Manager * Move Satellite Layer to Satellite Layer manager * Minor Cleanup * Move files * Move Files * More Cleanup * More Cleanup * Fix a bug in participant mode * Clean up Map Interactions manager * Clean up Satellite Layer Manager * Fix Lint * Implement Feedback * Implement Feedback and change Parameter Order in onFeatureDropped * Implement Feedback and change Parameter Order in onFeatureDropped --------- Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> * Adjust nginx configuration for about pages (hpi-sam#657) * Adjust nginx configuration for about pages * Redirect invalid requests for a uniform 404 page * Add link to landing page on about pages * Improve error pages in nginx setup The error pages do not rely on a non-existing URL any longer --------- Co-authored-by: Marvin <68286419+anonym-HPI@users.noreply.github.com> * Set up simulation framework (hpi-sam#664) * Create draft for simulation data types * WIP: Simulate unloading of vehicles * WIP add debug helpers and make simulation work * WIP add typings and lint * Validate events * Fix never parameter in activity and behavior functions * Validate activities and behaviors * Introduce pseudo randomness for deterministic uuids * Add migrations for simulation * Rename SimulationActivity.terminate to onTerminate * Remove simulatedRegionId from VehicleArrivedEvent * Slight improvement to debugging buttons * Fix typo * Validate state in AddBehaviorAction * Incorporate suggestions from review * Fix randomness * Add generic DelayEventActivity * Fix DelayEventActivity * Please linter * Remove debug UI * Dragging onto the Map now triggers Drop Events (hpi-sam#671) * Dragging onto the Map now triggers Drop Events * Add our names to the readme (hpi-sam#672) * Use @noble/hashes instead of hash.js (hpi-sam#674) * Use @noble/hashes instead of hash.js * Fix install:all script * Add release workflow * Populate CHANGELOG.md * Update create-release-pr.yml * trigger pipeline * Prepare release v0.0.1-review (#3) Co-authored-by: GitHub Actions <noreply@github.com> * Prepare release v123-test (#5) Co-authored-by: GitHub Actions <noreply@github.com> * Prepare release v1.2.3-test2 (#7) Co-authored-by: GitHub Actions <noreply@github.com> * Update create-release-pr.yml debug * Update create-release-pr.yml debug * debug * Prepare release v1.2.3-test4 (#11) Co-authored-by: GitHub Actions <noreply@github.com> * diff * Debug v1.2.3-test6 (#13) Co-authored-by: GitHub Actions <noreply@github.com> * Debug v1.2.3-test7 (#15) Co-authored-by: GitHub Actions <noreply@github.com> * Fix npm i * Debug v1.2.3-test8 (#17) Co-authored-by: GitHub Actions <noreply@github.com> * call pipeline from release * fix permissions * remove auto pipeline * fix changelog * more permissions * Update pr creation steps * add checkout * maybe fix pr comment * Use other release action * Use other name for dev PR * Use script instead of third party action * use draft PR workaround * remove branch requirement * lint pipelines * Format changelog * Debug v1.2.3-test21 --------- Co-authored-by: Clemens <68013019+ClFeSc@users.noreply.github.com> Co-authored-by: Julian Schmidt <julian.r.schmidt.js@gmail.com> Co-authored-by: Julian Schmidt <julian.schmidt@student.hpi.de> Co-authored-by: Lukas Hagen <43916057+Greenscreen23@users.noreply.github.com> Co-authored-by: Lukas Radermacher <49586507+lukasrad02@users.noreply.github.com> Co-authored-by: benn02 <82985280+benn02@users.noreply.github.com> Co-authored-by: Nils <45318774+Nils1729@users.noreply.github.com> Co-authored-by: Marvin <68286419+anonym-HPI@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: GitHub Actions <noreply@github.com>

Adjust nginx configuration for about pages

a830668

lukasrad02 added bug Something isn't working docker docker, nginx, docker-compose related labels Feb 7, 2023

lukasrad02 requested a review from anonym-HPI February 7, 2023 15:33

lukasrad02 self-assigned this Feb 7, 2023

Merge branch 'dev' into fix/docker-nginx-configuration

e96665c

Redirect invalid requests for a uniform 404 page

2d6292c

Add link to landing page on about pages

55ad39e

anonym-HPI reviewed Feb 9, 2023

View reviewed changes

docker/nginx/locations Outdated Show resolved Hide resolved

Improve error pages in nginx setup

3a51279

The error pages do not rely on a non-existing URL any longer

benn02 approved these changes Feb 15, 2023

View reviewed changes

Merge branch 'dev' into fix/docker-nginx-configuration

768c809

anonym-HPI approved these changes Feb 15, 2023

View reviewed changes

lukasrad02 merged commit cbcc1fd into dev Feb 15, 2023

lukasrad02 deleted the fix/docker-nginx-configuration branch February 15, 2023 17:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adjust nginx configuration for about pages #657

Adjust nginx configuration for about pages #657

lukasrad02 commented Feb 7, 2023

anonym-HPI commented Feb 7, 2023

lukasrad02 commented Feb 8, 2023

anonym-HPI commented Feb 9, 2023

lukasrad02 commented Feb 9, 2023

lukasrad02 commented Feb 9, 2023

anonym-HPI commented Feb 9, 2023

anonym-HPI commented Feb 9, 2023 •

edited

Loading

anonym-HPI left a comment

lukasrad02 commented Feb 15, 2023

Adjust nginx configuration for about pages #657

Adjust nginx configuration for about pages #657

Conversation

lukasrad02 commented Feb 7, 2023

anonym-HPI commented Feb 7, 2023

lukasrad02 commented Feb 8, 2023

anonym-HPI commented Feb 9, 2023

lukasrad02 commented Feb 9, 2023

lukasrad02 commented Feb 9, 2023

anonym-HPI commented Feb 9, 2023

anonym-HPI commented Feb 9, 2023 • edited Loading

anonym-HPI left a comment

Choose a reason for hiding this comment

lukasrad02 commented Feb 15, 2023

anonym-HPI commented Feb 9, 2023 •

edited

Loading