Fix extent calculation of viewports and simulated regions #663
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also fixing a bug with negative extents
|
I'm going to check whether |
It was also affected. Fixed it in 271cc80 |
Greenscreen23
approved these changes
Feb 8, 2023
Dassderdie
reviewed
Feb 8, 2023
Comment on lines
+136
to
+162
| export function upperLeftCornerOf(element: WithExtent): MapCoordinates { | ||
| const corner = { ...currentCoordinatesOf(element) }; | ||
|
|
||
| if (element.size.width < 0) { | ||
| corner.x += element.size.width; | ||
| } | ||
|
|
||
| if (element.size.height < 0) { | ||
| corner.y -= element.size.height; | ||
| } | ||
|
|
||
| return MapCoordinates.create(corner.x, corner.y); | ||
| } | ||
|
|
||
| export function lowerRightCornerOf(element: WithExtent): MapCoordinates { | ||
| const corner = { ...currentCoordinatesOf(element) }; | ||
|
|
||
| if (element.size.width > 0) { | ||
| corner.x += element.size.width; | ||
| } | ||
|
|
||
| if (element.size.height > 0) { | ||
| corner.y -= element.size.height; | ||
| } | ||
|
|
||
| return MapCoordinates.create(corner.x, corner.y); | ||
| } |
There was a problem hiding this comment.
@lukasrad02
The original definition was that the position is always the top-left corner, and the size should, therefore, always be positive (even though the IsPositive decorators were missing there).
With these changes, you assume that the position could be any corner of a viewport.
While this is also a valid approach, you should make sure that this is also reflected in the documentation. (e.g., https://github.dev/hpi-sam/digital-fuesim-manv/blob/f8ff1124f96a426e7471f56fc572d7a029160669/shared/src/models/viewport.ts#L40)
I'm also unsure whether the resize interaction has bugs now, as I created it under a different assumption.
I suspect that there was another bug that caused the Size to get negative, and you fixed it by changing the definition of the position instead of the underlying cause.
There was a problem hiding this comment.
The problem was that position was not always the top-left corner, which could be caused by dragging the lower-right corner to the top-left quadrant of the (previously) top-left corner. At this point, the size would be negative and the position would be the lower-right hand corner.
There was a problem hiding this comment.
The problem was that position was not always the top-left corner, which could be caused by dragging the lower-right corner to the top-left quadrant of the (previously) top-left corner. At this point, the size would be negative and the position would be the lower-right hand corner.
So my assumption was correct. Then I probably made an error in the resize interaction, as I thought it would reassign the position instead of making the size negative...
There was a problem hiding this comment.
The problem was that position was not always the top-left corner, which could be caused by dragging the lower-right corner to the top-left quadrant of the (previously) top-left corner. At this point, the size would be negative and the position would be the lower-right hand corner.
So my assumption was correct. Then I probably made an error in the resize interaction, as I thought it would reassign the position instead of making the size negative...
I'm actually not sure that this is an error. I might be wrong, but if i recall correctly, @hpistudent72 and I implemented it this way (with a negative size) when we first made the viewport resize back in April of last year.
There was a problem hiding this comment.
Then I probably made an error in the resize interaction, as I thought it would reassign the position instead of making the size negative...
Are you talking about #604? I've just checked out the main branch which does not have these commits, but viewports can be resized to negative sizes there, too. I also wanted to check the commit in which the isInViewport method was introduced (3904077), but I did not manage to get the backend running on this commit. However, from looking at the code, I did not see something that would prevent negative sizes.
Therefore, I think the resizing behavior was meant to be like this. We did not find any other places in the code that were using the size of the viewport than the ones I've fixed, so I think its okay as it is now.
But documenting this behavior is a good idea since the coordinate system is quite confusing (e.g., the global y axis grows upwards, but positive heights grow downwards). I've opened #665 for this.
Nils1729
added a commit
to Nils1729/digital-fuesim-manv
that referenced
this pull request
Feb 22, 2023
* 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>
Nils1729
added a commit
to Nils1729/digital-fuesim-manv
that referenced
this pull request
Feb 23, 2023
* 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>
Nils1729
added a commit
to Nils1729/digital-fuesim-manv
that referenced
this pull request
Feb 23, 2023
* 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>
Nils1729
added a commit
to Nils1729/digital-fuesim-manv
that referenced
this pull request
Feb 23, 2023
* 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>
Nils1729
added a commit
to Nils1729/digital-fuesim-manv
that referenced
this pull request
Feb 23, 2023
* 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>
Nils1729
added a commit
to Nils1729/digital-fuesim-manv
that referenced
this pull request
Feb 23, 2023
* 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>
Nils1729
added a commit
to Nils1729/digital-fuesim-manv
that referenced
this pull request
Feb 23, 2023
* 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>
Nils1729
added a commit
to Nils1729/digital-fuesim-manv
that referenced
this pull request
Feb 23, 2023
* 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>
Nils1729
added a commit
to Nils1729/digital-fuesim-manv
that referenced
this pull request
Feb 25, 2023
* 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>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes the following bugs:
tryToFitViewToViewports()(which was renamed totryToFitViewForOverview()due to the change), the map view will be adjusted to show all viewports and simulated regions nowViewport.isInViewport), negative extents of viewports will be handled correctly now