-
Notifications
You must be signed in to change notification settings - Fork 6
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weβll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: task locking and validation error in project creator #382
Merged
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
github-actions
bot
added
bug
Something isn't working
backend
Related to backend code
labels
Dec 5, 2024
nrjadkry
approved these changes
Dec 5, 2024
nrjadkry
added a commit
that referenced
this pull request
Dec 20, 2024
* feat: make project approval page authentication free * feat: disable show popup functionality if user role is `REGULATOR` * feat(project-approval-by-regulator): add services to register regulator as a user * feat(project-approval-by-regulator): fetch project data after the user token is received and saved on local storage on successful response of user token api user token api takes the token as body and creates user and returns tokens and role the role will be the `REGULATOR` * feat(project-approval-by-regulator): round off project area and add unit `kmΒ²` * feat: add ts * feat(project-approval-by-regulator): add ApprovalSection component * feat(project-approval-by-regulator): post regulator's comment with approval status * feat(project-approval-by-regulator): show regulator's approval status and comment on about section * feat: show dashboard button only if the user is authenticated and the user role is other than `Regulator` * feat: update drone-flightplan to v0.3.2 and notify project creator on unflyable task state (#357) * feat: notify project creator when a task is marked as unflyable * feat: upgrade drone-flightplan to >=0.3.2 and add email notification for unflyable task * fix: added author email to send the email notification * feat: add actions and reducer for image processing * feat: add exifreader component * refactor: update component to HOC, add forwardRef * feat: add image plotted modal and type * refactor: update handle change function to extract and dispatch exif data * feat: add component to plot images data in map using its exif data * feat: add function to convert exifData to GeoJson data * feat: add function to extract exif data from image file * feat: add function to sort array of objects using dateTime property * hotfix: orthophoto zoom to geotiff * refactor: handle cases of no selection * refactor: handle cases of undefined/ null data * refactor: rename item to exifData at map function * refactor: remove destructuring of state and use single var * refactor: update type for handle change event * feat: post drone registered certificate and drone pilot certificate on profile complete * refactor: update import of redux state * refactor: destructure url instead of accessing whole object and accessing url * feat: show default image on profile in case of failure * refactor: update message mutation for if the task is not flyable * refactor: reset exifData at redux state at initial render * feat(update-profile): post only the binary file on certificate * feat: add `@cyntler/react-doc-viewer` package * feat: add document preview modal * feat(dashboard): implement drone certificate preview on task lock request * fix(individual-project): task requested for lock although the project owner lockes the task * feat: set certificate & registration url in my-info endpoint * fix: document viewer details style * fix: UploadArea component * feat: show uploaded certificates on edit profile page * feat: clear selectedDocumentDetails on document preview component unmount * docs: update user roadmap with latest requirements * feat(document-preview): download certificate using blob and additional UI if the file is image * docs: tweak user roadmap based on feedback * feat: set the certificate & registration url in task request page * feat(dashboard): show drone certificate and pilot certificate on task request log * feat: ommit password section if the existing user is trying to login as another role * fix: remove comment code from task schemas * feat(regulators-approval-page): clear local storage on main page unmount * feat: implemented user certificate upload functionality, storing user certificates on S3. (#331) * feat: Implement S3 path structure & file upload for user-specific drone operator certificate uploads * refac: refactor user profile update: Add validation for empty data, handle certificate URL and role updates * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * feat: update certificate URL in database for user profile * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * feat: update registration registration of drone operator * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * fix(profile-update): UI Issue * feat: add method parameter on `callApiSimultaneously` function * feat(update-profile): post add files `certificate` and `drone registration` file along with the other details * feat: post drone registered certificate and drone pilot certificate on profile complete * feat: show default image on profile in case of failure * feat(update-profile): post only the binary file on certificate * feat: add `@cyntler/react-doc-viewer` package * feat: add document preview modal * feat(dashboard): implement drone certificate preview on task lock request * fix(individual-project): task requested for lock although the project owner lockes the task * feat: set certificate & registration url in my-info endpoint * fix: document viewer details style * fix: UploadArea component * feat: show uploaded certificates on edit profile page * feat: clear selectedDocumentDetails on document preview component unmount * feat(document-preview): download certificate using blob and additional UI if the file is image * feat: set the certificate & registration url in task request page * feat(dashboard): show drone certificate and pilot certificate on task request log * feat: ommit password section if the existing user is trying to login as another role * fix: remove comment code from task schemas * feat(regulators-approval-page): clear local storage on main page unmount --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Sujit <sujitkarki703@gmail.com> * fix: set iscertifiedDroneUser initial value once * feat(user-profile): support pdf to upload certificates * feat: add zoom to extent function * refactor: remove unecessary states and handle session end of modal * refactor: rename title for imageMapBox modal * feat(project-approval-page): clear comment on approval comment success * feat: update type for coordinates * feat: make project `DescriptionSection` dynamic to render on both project description and project approval page * feat: add about section on project description page * feat: make regulator approval status optional to view on description section * feat(project-description): make map popup disabled if the regulator approval status is `REJECTED` * feat(project-description): disable popup open on table row click if requlator approval status is `REJECTED` * Adjust project description as per regulator's approval status (#361) * feat: Implement S3 path structure & file upload for user-specific drone operator certificate uploads * refac: refactor user profile update: Add validation for empty data, handle certificate URL and role updates * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * feat: update certificate URL in database for user profile * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * feat: update registration registration of drone operator * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * fix(profile-update): UI Issue * feat: add method parameter on `callApiSimultaneously` function * feat(update-profile): post add files `certificate` and `drone registration` file along with the other details * feat: post drone registered certificate and drone pilot certificate on profile complete * feat: show default image on profile in case of failure * feat(update-profile): post only the binary file on certificate * feat: add `@cyntler/react-doc-viewer` package * feat: add document preview modal * feat(dashboard): implement drone certificate preview on task lock request * fix(individual-project): task requested for lock although the project owner lockes the task * feat: set certificate & registration url in my-info endpoint * fix: document viewer details style * fix: UploadArea component * feat: show uploaded certificates on edit profile page * feat: clear selectedDocumentDetails on document preview component unmount * feat(document-preview): download certificate using blob and additional UI if the file is image * feat: set the certificate & registration url in task request page * feat(dashboard): show drone certificate and pilot certificate on task request log * feat: ommit password section if the existing user is trying to login as another role * fix: remove comment code from task schemas * feat(regulators-approval-page): clear local storage on main page unmount * fix: set iscertifiedDroneUser initial value once * feat(user-profile): support pdf to upload certificates * feat(project-approval-page): clear comment on approval comment success * feat: make project `DescriptionSection` dynamic to render on both project description and project approval page * feat: add about section on project description page * feat: make regulator approval status optional to view on description section * feat(project-description): make map popup disabled if the regulator approval status is `REJECTED` * feat(project-description): disable popup open on table row click if requlator approval status is `REJECTED` --------- Co-authored-by: Pradip-p <thapapradip542@gmail.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Sujit <sujitkarki703@gmail.com> * fix: hide approval section if the approval status has value * add trailing slash(/) in the regulator approval endpoint * style: about project * feat(project-description): show different popup message and hide task lock button if the `regulator_approval_status` is `PENDING` or `REJECTED` * fix: about typo and set default selected project tab to about * fix: capitalize tab options label * fix: update roles in existing user when auto local regulator creation * feat(regulators-approval-section): hide approval section on approval status updates * fix: remove commented code * fix: show popup on task click although the project is rejected * fix: update roles in existing user when auto local regulator creation (#362) * fix: upadate the regulator * Fix/regulator profile creation (#366) * fix: update roles in existing user when auto local regulator creation * fix: upadate the regulator * fix: reslove user roles access issues with regulator * feat: add drone altitude regulations model * feat: Add 'get all' and 'get one' endpoints for drone altitudes * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * reac: Rename DbDroneAltitude class to DbDroneFlightHeight and update table name * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * feat: Implemented endpoint to retrieve all drone altitude regulations of country (#368) * feat: add drone altitude regulations model * feat: Add 'get all' and 'get one' endpoints for drone altitudes * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * reac: Rename DbDroneAltitude class to DbDroneFlightHeight and update table name * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * feat: add `OSM_NOMINATIM_URL` on viteconfig and env.example * feat(project-creation): get project country by project centroid using `OSM Nominatim API` find centroid with the help of `truf` Integrated Nominatim API to fetch the country based on the centroid coordinates * Replace `pdm` to `uv` for faster dependency management (#347) * feat: migrate from pdm to uv * build: replace pdm with uv, add pre-commit hook to lock deps * build: replace all usage of pdm with uv * build: replace pdm with uv for faster dependency managementreplace all usage of pdm with uv * feat: update entry point to run with uv * update: users deps login_required --------- Co-authored-by: Niraj Adhikari <nrjadkry@gmail.com> * feat: add className optional prop to InfoMessage component for dynamic styling * feat: add orthoPhoto task component * feat: add symbol type prop for icon at tooltip * refactor: remove delay * feat: add functions to handle visiblity of vector layers and orthophoto layers * refactor: remove button of show orthophoto from description section * refactor: update onSuccess function to navigate user from task page to project page * feat(create-project): Show warning if altitude exceeds countryβs max limit * feat(individual-project): disable popup only if the user role regulator and has no other roles * feat(create-project): update fields description * feat: add validations for input feild * refactor: update onSuccess Function to navigate user to dashboard after password change * style: add z-index to user profile * feat: remove nominatim api from .env and vite config and save as a constant variable since it is constant on all environment * feat: update .env.example * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * feat: Show warning if altitude exceeds country's max limit (#370) * feat: add drone altitude regulations model * feat: Add 'get all' and 'get one' endpoints for drone altitudes * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * reac: Rename DbDroneAltitude class to DbDroneFlightHeight and update table name * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * feat: add `OSM_NOMINATIM_URL` on viteconfig and env.example * feat(project-creation): get project country by project centroid using `OSM Nominatim API` find centroid with the help of `truf` Integrated Nominatim API to fetch the country based on the centroid coordinates * feat: add className optional prop to InfoMessage component for dynamic styling * feat(create-project): Show warning if altitude exceeds countryβs max limit * feat(individual-project): disable popup only if the user role regulator and has no other roles * feat(create-project): update fields description * feat: remove nominatim api from .env and vite config and save as a constant variable since it is constant on all environment * feat: update .env.example * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: Pradip-p <thapapradip542@gmail.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Sujit <sujitkarki703@gmail.com> * feat: overwrite props className using `cn` the utils function to merge class names using `clsc` and `twMerge` * fix: typo * feat: add validation to check if old and new password are same * refactor: update placeholder for file upload * feat: updated count waypoints within AOI * fix: added auth in endpoint * feat: update handleDrawEnd function to prevent duplicate draw * feat: add conditional rendering for orthophoto button at map * refactor: remove character length restriction from comment submission * refactor: update naming of filterDuplicateFeature parameters * fix: update waypoints count of aoi * feat: add service to get project waypoints * feat: implementation of project avg taskway points count api * feat: add logic to count number of waypoints in task split (#373) * feat: updated count waypoints within AOI * fix: added auth in endpoint * fix: update waypoints count of aoi * feat: add service to get project waypoints * feat: implementation of project avg taskway points count api --------- Co-authored-by: Bijay Rauniyar <rauniyarbijay0@gmail.com> * fix: disable popup trigger if user signin as `ReGULATOR` * fix: added slash in waypoints count endpoint * [pre-commit.ci] pre-commit autoupdate (#376) updates: - [github.com/astral-sh/uv-pre-commit: 0.5.2 β 0.5.5](astral-sh/uv-pre-commit@0.5.2...0.5.5) - [github.com/commitizen-tools/commitizen: v3.31.0 β v4.0.0](commitizen-tools/commitizen@v3.31.0...v4.0.0) - [github.com/astral-sh/ruff-pre-commit: v0.8.0 β v0.8.1](astral-sh/ruff-pre-commit@v0.8.0...v0.8.1) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * refctor: update params and add a loading state for avg way points * fix: ensure small areas merge with the nearest one in task splitting (#378) * fix: task locking and validation error in project creator (#382) * add images.json file into s3 * feat: add turf/transform-rotate package * feat: add onDrag event listner and corresponding props * feat: add type for functions to be call at on drag event * feat: add feature to rotate filght plan * feat: add function to calculate angle, centeroid * feat: add funciton to rotate geojson * refactor: update type for function params * Feat/flightplan rotation (#383) * feat: add turf/transform-rotate package * feat: add onDrag event listner and corresponding props * feat: add type for functions to be call at on drag event * feat: add feature to rotate filght plan * feat: add function to calculate angle, centeroid * feat: add funciton to rotate geojson * refactor: update type for function params * feat: gcp app with router setup * feat: function to calculate image footprints * fix: regulator tags updated in routes * functions to find images within a point * feat: endpoint to find all the images that contains the specific point * gcp router added in main.py * typing used for params * refactor: update type for calculate angle fn * hot-fix: ignore ts on modal component * feat: add needDragEvent Prop * refactor: update taskDataPolygon and pass needDragEvent at vector layer * bump drone_flightplan version * bump drone_flightplan version (#387) * bump drone_flightplan version to 0.3.3 * [pre-commit.ci] pre-commit autoupdate updates: - [github.com/astral-sh/uv-pre-commit: 0.5.5 β 0.5.7](astral-sh/uv-pre-commit@0.5.5...0.5.7) - [github.com/commitizen-tools/commitizen: v4.0.0 β v4.1.0](commitizen-tools/commitizen@v4.0.0...v4.1.0) - [github.com/astral-sh/ruff-pre-commit: v0.8.1 β v0.8.2](astral-sh/ruff-pre-commit@v0.8.1...v0.8.2) - [github.com/pycontribs/mirrors-prettier: v3.3.3 β v3.4.2](pycontribs/mirrors-prettier@v3.3.3...v3.4.2) * feat: update rotation funcitons * feat: optimization of flightplan rotation * style: add dropshadow style * feat: add newAsync Popup for taskpage * feat: add rotattionCue component * feat: optimize flightplan rotation * feat: add layer ids constants * refactor: remove unused vars * feat: add function to swap first and last coordinate and fucntion to get last coordinate * style: add responsive attributes to rotation cue * refactor: update swapFirstAndLastCoordinate * refactor: remove swapFirstAndLast coordinate function * fix: update the flight plan time & updated waypoints conuts if user terrian follow (#390) * feat: update api for taskDataPolygon * refactor: update popup close fn * refactor: update type for mouse Events * fix: calculate bbox for the drone image (#393) * refactor: update taskWayPointsData data * feat: add est flight time * refactor: update type for coordinates * feat: generate and download KMZ files with placemarks (#392) * Added API to generate and download KMZ files * feat: added centroids on task details * fix: update authentication read task * feat: update rotation cue to handle touch events * feat: add button to save rotated taskpoints * Gcp calculation (#394) * fix: calculate bbox for the drone image * fix: calculate image footprints * refactor: extract centroid from api * feat: remove conditional color of points vector layer * refactor: update get exif data function to check N and S and provide negative or positive coordinates * style: decrease height of save rotated plan button * feat: add rotation degree inside rotation cue * docs: add quick summary page about GCP workflow * style: add bgcolor for toggled buttons * feat: update events for rotation handle * Get a list of images that contains a GCP Point from a whole Project (#396) * fix: calculate bbox for the drone image * fix: calculate image footprints * feat: get a list of images that contains a point * Style/responsive (#397) * refactor: remove useEffect and items to show state * style: add css to hide spinner on input:number * style: decrease width of select and input feilds * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * Fix/image procssing status (#386) * fix: add state image processing started to already image uploaded state * fix: change updated time to be same as created at * fix: add state for image processing to already present url * refactor: add funcitonality to start image processing manually * refactor: remove upload button * style: add bg color for IMAGE_UPLOADED state * fix: resolved image processing issues, state management for color, and dashboard listing --------- Co-authored-by: Bijay Rauniyar <rauniyarbijay0@gmail.com> Co-authored-by: Pradip-p <thapapradip542@gmail.com> * feat: Download dem file from JAXA if not provided by the user (#380) * feat: auto add dem file if not provided by the user for more information, see https://pre-commit.ci * fix: scrapy signals issue with signals for more information, see https://pre-commit.ci * feat: add constants for dem radio data * feat: add reducer and action ro set demTYpe * feat: add dem type * feat: auto add dem file if not provided by the user for more information, see https://pre-commit.ci * fix: scrapy signals issue with signals for more information, see https://pre-commit.ci * refactor: remove title from dem type switch * fix: pre commit fix --------- Co-authored-by: Bijay Rauniyar <rauniyarbijay0@gmail.com> * Update README.md * update: label for dem file download from jaxa * Feat/flightplan rotation (#400) * feat: implement api to save rotated flight plan * refactor: remove type from flightPlan mutation * refactor: update condition to show update image button * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * [pre-commit.ci] pre-commit autoupdate (#403) updates: - [github.com/astral-sh/uv-pre-commit: 0.5.7 β 0.5.9](astral-sh/uv-pre-commit@0.5.7...0.5.9) - [github.com/astral-sh/ruff-pre-commit: v0.8.2 β v0.8.3](astral-sh/ruff-pre-commit@v0.8.2...v0.8.3) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * feat: update drone image processor to handle single and multiple tasks (#399) * feat: add endpoints to process all task images of AOI * reac: refactor process_assets_from_odm function to reduce redundancy * fix: remove double s3_path from process_assets_from_odm * fix: added all tasks images in odm processing * fix: remove local setup of config & docker-compose * fix: remove multple class for drone images processing & now handle from single class * fix: refine drone image processing * added tags in the odm webhook router endpoint --------- Co-authored-by: Niraj Adhikari <nrjadkry@gmail.com> * Update faq section to add basic frequently asked questions.md (#402) * Update faq.md * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * feat: initial py-test setup & update Dockerfile (#404) * feat: setup the pytest * feat: initial pytest setup for drone create * feat: updated dependency overrides for login required * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * feat: updated test case for read drone * feat: update user test routes & make dummy project data as fixtures * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --------- Co-authored-by: Sujit <sujitkarki703@gmail.com> Co-authored-by: Sovas Tiwari <40485930+subashtiwari1010@users.noreply.github.com> Co-authored-by: Bijay Rauniyar <rauniyarbijay0@gmail.com> Co-authored-by: Niraj Adhikari <nrjadkry@gmail.com> Co-authored-by: spwoodcock <sam.woodcock@protonmail.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Sujit <90745363+suzit-10@users.noreply.github.com> Co-authored-by: Bijay Rauniyar <155698689+bijayrauniyar0@users.noreply.github.com> Co-authored-by: Niraj Adhikari <41701707+nrjadkry@users.noreply.github.com> Co-authored-by: Saurav Aryal <64722587+aryalsaurav@users.noreply.github.com> Co-authored-by: Manjita Pandey <97273021+manjitapandey@users.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.
What type of PR is this? (check all applicable)
Related Issue
Example: Fixes #123
Describe this PR
This PR addresses two issues:
Screenshots
Please provide screenshots of the change.
Alternative Approaches Considered
Did you attempt any other approaches that are not documented in code?
Review Guide
Notes for the reviewer. How to test this change?
Checklist before requesting a review
[optional] What gif best describes this PR or how it makes you feel?