Skip to content
New issue

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

Sign up for GitHub

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

Jump to bottom

Add safe zone banner #1169

Merged
merged 1 commit into from
Mar 22, 2024
Merged

Add safe zone banner #1169

merged 1 commit into from
Mar 22, 2024

Conversation

mrica-equinor
Copy link
Contributor

@mrica-equinor mrica-equinor commented Nov 14, 2023 •
edited
Loading

Closes #1158

@mrica-equinor mrica-equinor self-assigned this Nov 14, 2023
@mrica-equinor mrica-equinor added improvement Improvement to existing functionality frontend Frontend related functionality labels Nov 14, 2023
@mrica-equinor mrica-equinor marked this pull request as draft November 15, 2023 14:16
@mrica-equinor mrica-equinor force-pushed the fix-safe-zone-dialogs branch 3 times, most recently from 2990740 to 5dcac8f Compare November 16, 2023 12:42
@mrica-equinor mrica-equinor marked this pull request as ready for review November 16, 2023 12:42
@mrica-equinor mrica-equinor force-pushed the fix-safe-zone-dialogs branch 3 times, most recently from 21a1165 to 0adbd37 Compare November 17, 2023 11:27
andchiind
andchiind reviewed Nov 17, 2023
View reviewed changes
Copy link
Contributor

@andchiind andchiind left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks very good in my opinion, just small nitpicks

frontend/src/components/Alerts/AlertsBanner.tsx Outdated Show resolved Hide resolved
frontend/src/components/Contexts/SafeZoneContext.tsx Outdated Show resolved Hide resolved
frontend/src/components/Contexts/SafeZoneContext.tsx Outdated Show resolved Hide resolved
@mrica-equinor mrica-equinor force-pushed the fix-safe-zone-dialogs branch 3 times, most recently from 5cce0ad to 7ad941d Compare November 23, 2023 14:33
Eddasol
Eddasol reviewed Nov 24, 2023
View reviewed changes
frontend/src/App.tsx Outdated Show resolved Hide resolved
@aeshub
Copy link
Contributor

aeshub commented Dec 25, 2023

This pull request has automatically been marked as stale as there has been no activity for 30 days.

@aeshub aeshub added the stale This issue or pull request already exists label Dec 25, 2023
@mrica-equinor mrica-equinor force-pushed the fix-safe-zone-dialogs branch 2 times, most recently from ca40d8d to 86e91d3 Compare January 22, 2024 15:18
@mrica-equinor mrica-equinor removed the stale This issue or pull request already exists label Jan 29, 2024
@mrica-equinor mrica-equinor force-pushed the fix-safe-zone-dialogs branch 3 times, most recently from 8393ced to 9ac42c9 Compare March 13, 2024 15:22
Eddasol
Eddasol reviewed Mar 14, 2024
View reviewed changes
frontend/src/language/no.json
"Continue missions": "Fortsett oppdragene",
"Safe Zone": "Trygg sone",
"Safe zone banner text": "Robotene kjører til sikker sone og vil ikke kjøre oppdrag. For å fortsette oppdrag trykk på knappen 'Trygt å fortsette oppdrag'.",
"Dismiss safe zone banner text": "Roboten fortsetter på oppdragene.",
"Edit mission definition": "Rediger oppdragsdefinisjon",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this one added?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They are used in the code

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe Safe Zone is no longer used

@mrica-equinor mrica-equinor force-pushed the fix-safe-zone-dialogs branch from 9ac42c9 to 8394694 Compare March 22, 2024 11:50
andchiind
andchiind approved these changes Mar 22, 2024
View reviewed changes
Copy link
Contributor

@andchiind andchiind left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, seems to work well. Ready to merge as soon as the translation files have been updated

@mrica-equinor mrica-equinor force-pushed the fix-safe-zone-dialogs branch from 8394694 to e33b94a Compare March 22, 2024 12:10
@mrica-equinor mrica-equinor merged commit 06d10c7 into equinor:main Mar 22, 2024
10 checks passed
@mrica-equinor mrica-equinor deleted the fix-safe-zone-dialogs branch May 13, 2024 14:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Eddasol Eddasol Eddasol left review comments

@andchiind andchiind andchiind approved these changes

Assignees

@mrica-equinor mrica-equinor

Labels
frontend Frontend related functionality improvement Improvement to existing functionality
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Stop button pop-up description is misleading
4 participants
@mrica-equinor @aeshub @andchiind @Eddasol