Bump upstream develop #110
Closed
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
…kmap#1480) * feature: disable stroke for "Circles" & "Polygons" * update: fix mui warning out-of-range value for select * update: accordion styling & conditions * update: comments, remove statement * remove: unnecessary array val * update: removed the eslint-disable row * update: comment
* npm up * Added the ENABLE_WEBSOCKETS variable to .env so we can easily turn this functionality on and off. * Streamlining Halmstad's production branch, removed unused components. * Changed browserslist to a simple 'defaults' only. * Added an optional hyphen and centered the app load text. * Deps bump for Backend * Since the separation of V1 and V2 APIs, hajkLogger has been moved to utils. * First step towards making Backend fully ESM-compatible: - Necessary changes made in package.json - Most other changes are due to a missing file extension in most imports. - One small change was that __dirname isn't available when using ESM, so I changed the way we resolve path to the YAML specifications by using process.cwd(), as we do in other fs.* functions. - I'm testing the VSCode-GitHub integration now, hence the branch name that does not follow our convention - sorry * Removed Babel, etc: - Removed Babel, including: 'compile' step in package.json and other commands, all dependencies and configuration file - Replaced the 'compile' step with a basic copy of directory to dist/. The reasoning behind this is that it let's us continue using current Dockerfiles etc without any changes. - Major cleanups in ESlint config. Seems good so far, check out the screenshot in this issue: https://github.com/hajkmap/Hajk/issues/1328\#issuecomment-1517542129 - Moved Prettier's config to an own file - Prettier seems fine too, see screenshot above - If this works as intended, we have a much cleaner toolchain. NodeJS 16+ is now required but it shouldn't be a major problem. * Added missing definition, no idea how it got lost. * New lock file after clean deps install. Should close hajkmap#1328. * Workaround the fact that __dirname isn't available in ESM. This pretty much closes hajkmap#1328. * Removed Windows Service references as they're not needed in our environment. * Fixes to the WebSocket part that exists in this branch, its imports must also be converted to ESM of course. * Ensure that the OpenApiValidator runs _after_ any async routes have been imported: - This was discovered in hajkmap#1332 but the problem first came up in hajkmap#1309. - OAV will only take care of routes that exists when the middleware runs. Hence, any async imports that haven't yet run will be unknown to the OAV and render a 404. - This ugly setTimeout fix takes care of it but I'm open for a better solution (including discussing the future of OAV in our Backend). * npm i * Upgraded query-string that awaited the completition of hajkmap#1328. * I need to bump the version number across the product to easily keep track of running versions. * This has grown pretty big since yesterday, time for an initial commit: - WIP so expect a lot of warnings - See hajkmap#1360 for issue - See also the README.md in the plugin's dir for more info on configuration. * Now also passing down the coordinates of clicked point. * Revert "Merge pull request hajkmap#1346 from hajkmap/feature/1316-PermanentDrawerOption" This reverts commit 38564d6, reversing changes made to dbbc37e. This will be re-merged once hajkmap#1367 is closed. * GeosuiteExport is not part of our toolset. * We've successfully migrated Draw->Sketch so there's no need to include it in the build anymore. * Fix for hajkmap#1309: import of XMLParser fell behind in the V2 API after the split. Corrected now. * Some significant dependencies bumped to latest versions: - Most notably a couple of our dependencies now dropped support for Node 8 (which we don't support anyway), so shouldn't be breaking to us. * Infoclick: allow for some common Markdown and URL characters inside the infoclick placeholder string: - I've implemented both of the proposals from hajkmap#1368 in this commit - Closes hajkmap#1368. * A refined approach towards grabbing and replacing infoclick placeholders with values, closes hajkmap#1368. * Ensure that useMapService always evaluates to a boolean. Fix for 'new' API's loading of simpleMapConfig if no mapserviceBase is specified. * Bumped version across the project to reflect the latest changes. * Manually added CSS class definition for .material-icons: - For reasons unknown, the definition has disappeard recently. - We should look into this further, but to fix it as quickly as possible, I'm adding it manually for now. * v.3.13.4 * Turns out the solution in 6b6429a was the correct one: - According to the docs, adding the .material-icons class is exactly what has to be done. - I'm doing another commit on it thought, to reflect the official structure inside the class, as specified in https://fontsource.org/docs/getting-started/material-icons * Removed all references to the legacy 'shortcode' feature in FeatureInfo, also removed unused deps. * Removed legacy/unused plugins: - Draw - Measure - VTSearch * Latest package-lock * Used 'npx depcheck' to identify missing deps. Fixed by adding. * Migrated from 'magic' module resolving to relative paths, this will be needed to further migrate to e.g. Vite anyway, so it's good to fix it right away. * Version bump * Succesfully upgraded a couple of deps: - The upgrades here are verified to work - Notable change is the major version bump on ESlint and Prettier. There have been some new defaults, among which new default for https://prettier.io/docs/en/options.html\#trailing-commas caused some confusion. The team has decided to disable it in our project, hence the change in .prettierrc. - I also ran 'npx prettier -w .' so there are some minor changes to the formatting in various files. * Fixed what was necessary to upgrade react-number-format. Didn't have time to properly replace this (as we seem to use it solely for the thousands separator) as I suggested elsewhere. Nevertheless, closes hajkmap#1207. * Upgraded IntroJS and deps to latest version. * Upgraded MUI's DataGrid to v6 * Major upgrade: PDFjs. * Added plugin-proposal-private-property-in-object to the list of dependencies in order to get rid of a warning from Babel * Finalized the migration to consolidated loading approach, first started in hajkmap#682: - Ensured that the static approach (aka simpleMapConfig loading) works in the consolidated loading part of code - Merged simpleMapConfig and simpleLayersConfig into a new file. Added keys needed for consolidated parser. Removed legacy files. - This could still be rewritten to async/await rather than the current Promise callback hell way of doing things, but I leave it for now. * Removed 'experimentalNewApi' from appConfig * Rewrote initial loading to async/await, added new Error page: - I got rid of the nested promise callbacks, now it's all in one try/catch - A new error page is added. It's (hopefully) nice and clean. It also features a reload button that will attempt to reset the application's state by redirecting to '/'. Should this not work, there are more things to try out (parsing the documnent.location and removing searchParams manually). * Version bump * Much better placement of loading error box across different screen sizes. * Make it possible to have a clean appConfig.json by emulating default values for some required properties in index.js. * Version bump * Ensure that the default API path in Swagger leads to V2. * Typo * Added the 'Simple Edit Workflow' to edit plugin, closes hajkmap#1377. * Version bump * Hotfix to 7decf9c, hajkmap#1377: - Ensure that we auto-activate the modify tool if user goes backwards in the Simple Edit workflow. * Version bump * Get rid of warning about 'preset' not being part of active plugins: it's core nowadays, hence it can be hard-coded as active. * Bug fix: the 'missing plugins' message was not so silent after all. Fixed. Shows only if it detects something. * Deps bump * Removed unused keys from default appConfig * Removed unused dependency from hook deps array in Measurer. * This has grown pretty big since yesterday, time for an initial commit: - WIP so expect a lot of warnings - See hajkmap#1360 for issue - See also the README.md in the plugin's dir for more info on configuration. * Now also passing down the coordinates of clicked point. * New approach towards setting layers' visibility. Taking a break for now though since I need to investigate some strange behaviour in LayerGroupItem related to hajkmap#1252. * Added two comments about lines modified in hajkmap#1304 to fix hajkmap#1291 that don't do much. * Some progress once I gave up the sublayers functionality: - Toggeling a sublayer will toggle all sublayers under the same layer. This is a trade-off. - Some nice functionality added, such as the layer toggler, better listing including nice icon (from infoclick config), etc. * init commit, changed logic that prev removed drawerButtons * minor fix * Major additions: - UI revised - Quick toggle buttons for often accessed layers - and more… * Added the optional bgColor setter for features in MapClickViewer, closes hajkmap#1385. * v3.13.10 * Revert "Revert "Merge pull request hajkmap#1346 from hajkmap/feature/1316-PermanentDrawerOption"" This reverts commit 55b01ed. * v3.13.11 * Addded the CHANGELOG.md with some initial (incomplete) entries. * CHANGELOG additions * CHANGELOG.md is up-to-date with the current state in hstd-main. * Upgraded deps. * Corrected the UI, added info that shows when no features are returned. Other fixes. * Updated changelog * The QuickLayer toggle buttons now show both icon and caption. * Multiple additions: - Features that belong to the same layer (but different sublayers) are now shown next to each other. - The control whether the layer actually exists in OLMap or not happens outside the FeatureItem view. This means that the component could be simplified by removing unneccesary checks that were previously required. - UI changes, hopefully for the better. - Some preparations for sending the GetFeatureInfo for specific layer (i.e. auto-trigger MapClickViewer). This will however require more work and refactoring in MapClickModel. * Added a nice little snackbar that informs user to click in map to select a property. * Made it easier to toggle layer visibility by allowing click on the entire list item * Added a help dialog that explains how to use this tool. * Terminology change after dialog with reference group. * Info about hajkmap#1403 in changelog * v3.13.12, see CHANGELOG.md for more info * QuickLayerToggleButtons correctly reflect the initial layer visibility state. * Better help desc, according to focus group. * Fix to stop propagation in the help dialog. * Added the Report Dialog: - For each property that got matched, users can now make a selection of layers that have been 'controlled' (in some way, depending on the procedure). - Layers with ticked checkboxes will now appear in a separate Dialog window, called Report Dialog. - From here, users will be able to select the text (I'll probably add some copy-to-clipboard soon) and paste into their reports/other systems. * Minor fixes * The Report dialog has been greatly enhanced with a copy-to-clipboard function that copies both as plain text and rich text (suitable for e.g. pasting into Word). * Typo * Updates in CHANGELOG * Added a script to ease deps install. * The Report dialog looks better, the list now has bullets too. * Removed the 360px width limit in MapClickViewer lists. Closes hajkmap#1411. * Added note on hajkmap#1411 to changelog. * v.3.13.13 * The `/ad/findCommonADGroupsForUsers` endpoint works again. Closes hajkmap#1415. * v.3.13.14 * Made the layer ids visible in Admins layer manager list. * Initial changes required to expand this plugin with another view - Digital Plans: - As the requirements have changed a bit, I'm not making some refactoring. The plan is to expand the plugin with a new view that will show another list of properties, different from the list created from the initial request ('check layer'). - I'm not implementing the new view yet, as it's not really clear how we want to display it. But we're ready from now on. * Rough WIP: added Tabs to separate the check layer features from digital plan features. This will need refactoring, comming up soon. * Major refactoring after a meeting with the client: this way it'll be easier to maintain and expand in the future. Nothing new in the UI since the last commit. * Big commit with the following: - Completely rewritten the way that we render list of check layer items. In addition to visual changes, there's a new field available that allows users to write simple notations on each item, that will get transferred to the final report. - I've started the initial implementation of showing those notes in the final report. I'm not done yet though as I await response from the client regarding which form this should be presented in. - Speaking of response from client: it turns out that they'd want to use this tool to show another report that showcases which digital layers affect the clicked point. This led me to rewrite and add more parts to the plugin. The new concept is called Digital Plans and shows up as a second tab (next to the Check Layer items). The new Digital Plans check will become a part of the final report as well, but I'm awaiting feedback here too. * Preparations for the first Public Beta of PropertyChecker: - Cleaned up the report generator, ensured same output to different formats. - Removed some logs messages. - Other fixes. * Upgraded deps in Client and Backend * v3.13.15: First Public Beta of Property Checker * Fixes a bug where GetFeatureInfo used wrong resolution. * v3.13.16 * Tightened security in backend: if AD_LOOKUP_ACTIVE is 'false' but RESTRICT_ADMIN_ACCESS_TO_AD_GROUPS has a value, access to admin-only endpoints will be restricted (to everyone). * v3.13.17 * v3.13.17 * Avoid float values in z param in URL hash, closes hajkmap#1422. * Added hajkmap#1422 to the changelog. * Added an option to Admin that allows setting autofocus in Search field on app load, closes hajkmap#1424. * v3.13.18 * Fix to hajkmap#1257: ensure that even non-togglable groups are marked with bold font. Plus a minor change from 'style' to 'sx' in one element. * Bump to v3.13.19 * Upgraded deps, among those react-markdown, which required some work. Closes hajkmap#1425. * Changes in changelog * Don't render tabs in LayerSwitcher if no layers are to be shown inside, closes hajkmap#1431. * Support for the EPSG:5847 in Admin UI. Keep in mind that you still need to add appropriate projection definitions to each map config. * v3.13.20 * The tools list in Admin is now refreshed: only current tools are available, sorting is alphabetical. * WMSLayer's onImageError should also result in the load failed indicator in LayerSwitcher. * Sorting in PropertyChecker now takes layer's caption into account. * Show layer load error indicator in PropertyChecker's layers list, if loading failed. * Changelog * Merged two new PRs from upstream * Fix for hajkmap#1439 and its LdapService: 'this' refers to something else than what could be expected when inside an instance of ActiveDirectory. Let's save and use a variable reference to the logger. * Added hajkmap#1439 to the changelog * Backend: show 403 Forbidden rather than 500 if access was not allowed: - I created a custom error class, AccessError, in order to distinguish access errors from the rest in our handleStandardResponse(). - The Service will now send an AccessError if the reason is that the authenticated user lacks autorizaton to a certain resource. * Updated changelog * Updated deps in Client and Backend * Fixed some irritating whitespace formatting mismatches between current and older ESlint versions. * Prettier fixes in Backend too. * Cleanups in PropertyChecker to get rid of some warnings. * A whole lot of refactoring. The plugin is growing, I need to separate the views. * Important additions, implemented a first view of digital plans. Some work remains, such as adding checkboxes etc (as in the Check Layers view), the Report and so on. But it's a good start. * PropertyChecker: added an option to disable the Generate Report functionality. Needed when we want to release this tool to a broader public audience. * Major additions to PropertyChecker, main feature is the new Digital Plans view and correpsonding Report. * Replaced all hard-coded attribute names with values retrived from Admin. This will aid anyone wanting to adapt it into their own setup. * PropertyChecker: important improvment - clicks that'd give results from more than 1 property are disallowed. Also, marker feature is added only for the property layer, not digital plans layer. * Updated changelog for v3.13.22 * Warning fix * PropertyChecker: Fix to hide unneeded UI elements when enableDigitalPlansReport is false. * Missed two files in v3.13.22 * Prepared the v3.13.23 release. * Implemented auto-rotation (to an admin-specified value) for background layers. Closes hajkmap#1451. * Release v3.13.24 * Added recent changes, merged from develop, to the changelog. * The reinstall dependencies script now also runs audit fix. * Updated deps, version number * Fixed missing keys in Docker's appConfig.json * Revert Halmstad-specific branding * Updated CHANGELOG to reflect recent merge --------- Co-authored-by: OlofSvahnVbg <[email protected]>
* The new dotnet backend * Disable need for TrustedProxyIPs when Windows Authentication is used. * Fix to use Swagger when the backend runs in a subdirectory (named mapservice). * Possible to use multiple BaseDNs in the AD tree. * Readded lost comment changes * Resolve 500 error due to duplicate .json extension Fixes a 500 error caused by appending a duplicate '.json' extension to `mapFile` for API calls in the admin UI. * Update endpoints /config/list/ and /mapconfig/list/ to not return .json extensions * Fix for create and update layer * Fix to support swagger for various setups --------- Co-authored-by: Mattias Andrén <[email protected]> Co-authored-by: linusfj <[email protected]> Co-authored-by: Mattias Strömberg <[email protected]>
…S in order to allow using Admin UI even without the AD.
* Re-introduces e.g. Windows CMD compile capability for Hajk's back-end * Fixes hajkmap#1483 after Babel removal (Hajk's RFC1/2 clean-up project)
…he code alot. (Sorry for the recklessness before).
Bug fix associated to hajkmap#1468 Can't get worse than before, I'm sure.
…API from list of supported API version in Node's backend. NB: the code is still there and will be removed in a future commit.
…ollowed by a merge, but it's preferable to do both steps manually to really see what's going on, especially for newcomers.
* Added dockerfile (rhel9) for simple-hajk deployment * Fixed dir error in dockerfile * Fix wrong dir again... * Let's put the nginx conf in the right place * The conf file location was wrong bc context dir... * Fix so nginx nonf is allowed * Remove default.conf, let's use the standard one * Let's use a s2i instead... * Move and rename dockerfile * Updated changelog
small change to previous commit
…ature/1482-QrCode
Feature/1482 qr code
* Refactor `TimeSlider` to allow for print support * Added basic print view in `TimeSlider` * Added print range-slider etc. WIP * Refactored `RangeSlider` * Make sure the number of images depends on date range * Make sure to inform user and disable print on strange settings * Added highlight to `InformationPanel` * Cleanup and refactor * Added resolution handling * Added scale selection * Let's use dynamic height as standard * Major changes in PrintModel - WIP Now possible to return blob from print-function allowing for further handling within the application * Fix: 🔨 Cleanup `printModel` - Let's use await... * The scale-list should apparently be strings * Makes sure to use proper settings and hide preview etc. * Finally found the stup mistake that caused double resolution fire... * Now printing all images in range * Fixed daterange calculation, missed the start... * Now waiting for layers to render properly before printing * Let's make sure the map-updater returns early when no work to do * Added proper cancellation * Remove unused code... * Now saving zip file with proper name and content * Fixed package-lock after merge * Make sure code aligns with new prettier settings * Add sneaky return so that print is actually canceled * Updated changelog
…ustness (hajkmap#1493) * Stand-alone GeoWebCache support * Resolves hajkmap#1469 * Add support for new WMS server type "geowebcache-standalone" * Add optional support for configuring a default server type, as well as existing option for default URL (backwards compatible, falls back to "geoserver" if not present) * Re-name admin WMS option from "GeoWebCache" to tiled (since WMS-C tiled mode has nothing to do with GeoWebCache and it's now a supported server type, making the old admin title for tiled option very confusing) * Use constants for WMS versions and server types * Avoid non-conformant WMS v1.3.0 GetCapabilities for geowebcache-standalone server type * Automatically default to tiled loading for geowebcache-standalone server type * Spellcheck admin sv-SE labels for queryable layers ("klick") More robust WMS admin, guard against GetCapabilties load failures or format errors * Console warning if unsupported spatial reference system found in WMS capabilities * Fix: Async load could crash WMS admin if clicking too fast on layers/capabilities, not ready for projections update * Fix: Do not reference undefined objects in admin after failed GetCapabilities * Fix: Handle failed net requests e.g. due to CORS-block, instead of crashing admin * Fix: Handle API failures for getting layers config gracefully (e.g. API endpoint version mismatch), instead of crashing admin * Fix: Handle HTML responses with 200/OK for failed GetCapabilities (like e.g. Hajk development mode and GeoServer proxy) * PR reference in changelog * Fix changelog format
…ng (hajkmap#1490) * Colors added to TwitterPicker, reset button for draw & text style Regarding this issue, two new colors have been added to the color picker for the different styling choices in the drawing tool. I also created a button that resets the styling of all drawing objects to it's default settings. I personally think that this is more user-friendly/a better use case tool than just restoring the color, Precisely for the reason that this also solves the issue if the user chooses not to want to use the styling values that are stored in local storage when for e.g refreshing Hajk and/or when the user returns to back to Hajk * update: reformat * update styling: boxShadow for each color picker * update: comments * update: CHANGELOG.MD hajkmap#1372
* Add configurable settings for Drawer button Updated to include configurable settings for the Drawer button. This includes drawer title, button title, and button icon. * Add configurable icons and update data source - Add predefined icons that can be selected in the admin UI. - Update source data using a different object in the config file. * Add settings for the drawer in admin Add settings to configure: - Drawer title - Button title - Button icon
* feature: added possibility to buffer from sketch * update: refactor, added comments & activityid check Updated the checks for the activityId inside SketchView. Comments added for the new sketch buffer component and some refactoring of the code. * update: removed unnecessary component, refactor, comment update * update: comment/s, pluginshown Since the button in the sketch buffer affects whether the user can draw an object on the map or not I want to ensure that the user has the option to always draw as default when the draw-object plugin is opened. * update: removed unnecessary dependency * update: context removed, code refactoring Decided to remove the context since it's not the best way to handle/set the vector layers in. Decided to refactor and put most of the context code in the parent. * update: passing props, removed import, variable name changes * cleanup * update: folder name, import Changed the folder name for the newly created buffer components to a more suitable name * update: enable clicklock * update: state objects added The second point of the request is now added and state objects are passed via props * update: comments * update: possibility to change style, buggfix hajkmap#1177, handle errors I fixed the whitepage error that prevented buffered objects from being edited due to styling being set to null. As a result, I've also added the ability to change styles on buffered objects through editing, excluding the point size. Note: There was a slight bug in my previously merged PR regarding issue hajkmap#1177. When attempting to edit a drawn object such as a "Polygon" or "Circle" with the stroke type set to none, the value was not shown in the strokeSelector dropdown during editing and was automatically set to stroke type "solid" as a result." * update: comment * update: bufferLayer, comments, styling, passing props Removed the VectorSource and VectorLayer for the buffer. Updated the comments, removec unnecessary props being passed between components & updated some styling * update: CHANGELOG.md --------- Co-authored-by: Jacob Wodzyński <[email protected]>
* Created the apps/ dir and moved (and renamed) the NodeJS apps to that dir. Also, created scripts/ and moved the relevant files to that dir. * Updated the reinstall modules script to work with the new dir structure. * Updated the shell build script to use the new repo structure. * The official Dockerfile updated to build using the new repo structure. * Latest lock files * Updated Admin's config to use /api/v2, added the Upload dir, reinstalled deps. * Updated custom Dockerfiles to use the new paths. Note: these changes are not tested, please test and fix any potential issues. * Added necessary keys to Admin, it now uses the folders option by default in DocumentHandler, as added in hajkmap#881. * Small fix do disallow buffering around Circle features. * Ensured that all paths in our readmes are updated with the new locations.
`ol` 9.0.0 introduced an error where the map rendering was flickering if the map contained vector features
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.
Including new repo structure from hajkmap#1488