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

Feature/1125 cookie button #1509

Merged
merged 4 commits into from
May 15, 2024
Merged

Feature/1125 cookie button #1509

merged 4 commits into from
May 15, 2024

Conversation

mlromramse
Copy link
Contributor

feat: CookieNoticeButton control to show CookieBanner

small fixes in CookieNotice when selecting all cookies since the
cookie notice now can be revisited.
some prettifier justifications in App.js also.

Mikael Larsson added 2 commits May 14, 2024 08:13
chore: commit to change branch - broken
4f4ed22
feat: CookieNoticeButton control to show CookieBanner
47c8870 
small fixes in CookieNotice when selecting all cookies since the
cookie notice now can be revisited.
some prettifier justifications in App.js also.
Hallbergs
Hallbergs requested changes May 15, 2024
View reviewed changes
Copy link
Member

@Hallbergs Hallbergs left a comment

Choose a reason for hiding this comment

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

Looks good!

Just add a line to CHANGELOG.md and update the old comment.

Closes #1125

apps/client/src/controls/CookieNoticeButton.js Outdated
Comment on lines 16 to 21
/**
* @summary Hides all visible layers
*
* @param {object} props
* @returns {object} React
*/
Copy link
Member

Choose a reason for hiding this comment

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

Old comment, remove or update

apps/client/src/models/Cookie.js Show resolved Hide resolved
@Hallbergs Hallbergs linked an issue May 15, 2024 that may be closed by this pull request
Possibility to reopen the Cookie banner during a session #1125
Open
@mlromramse mlromramse requested a review from Hallbergs May 15, 2024 06:24
@mlromramse
Copy link
Contributor Author

mlromramse commented May 15, 2024 •
edited
Loading

OK, I'd love to add my change to the CHANGELOG.md but are a bit stumped over where I should put my entry.
In the 3.13.25/Added section?
Or maybe the Unreleased/Added is more appropriate?
In the top?
Is there a special format of entry to comply to?
Friendly suggestion, this part could be added to the CONTRIBUTING.md document.

@Hallbergs
Copy link
Member

Hallbergs commented May 15, 2024 •
edited
Loading

OK, I'd love to add my change to the CHANGELOG.md but are a bit stumped over where I should put my entry. In the 3.13.25/Added section?

Add it to the Unreleased => Added section! (At the bottom). The content under the unreleased section will be moved to a release tag at a later stage. Try formatting the entry to follow the other entries, will make sure formatting guidelines are added to contrib!

The changelog was recently added and the contribution information hasn't been updated. Sorry!

@mlromramse
Copy link
Contributor Author

mlromramse commented May 15, 2024 •
edited
Loading

OK, Should I enter the comment like this:

  • Cookie: It's now possible to revisit the cookie notice and change your preference #1125

I can enter something like this in the CONTRIBUTING.md above the point When you're done coding...

  1. Describe your change with a log entry in the CHANGELOG.md. Select the subsection below the Unreleased section based on the type of issue: Added for feature or Fixed for an alteration. Format the row like:
    - area: Short explanation of what the change resolves/adds. [#issue-number](https://github.com/hajkmap/Hajk/issues/`issue-number`)
    • area: could be a specific feature in Hajk like Sketch, Print or Cookie or an app like Admin, Backend or Client or more generic like Core, Bug, Fix.
    • issue-number: The number of your Hajk issue.

In such a case would you like to have that as a separate PR?

@Hallbergs
Copy link
Member

OK, Should I enter the comment like this:

  • Cookie: It's now possible to revisit the cookie notice and change your preference #1125

I can enter something like this in the CONTRIBUTING.md above the point When you're done coding...

  1. Describe your change with a log entry in the CHANGELOG.md. Select the subsection below the Unreleased section based on the type of issue: Added for feature or Fixed for an alteration. Format the row like:

    • area: Short explanation of what the change resolves/adds. #issue-number
    • area: could be a specific feature in Hajk like Sketch, Print or Cookie or an app like Admin, Backend or Client or more generic like Core, Bug, Fix.
    • issue-number: The number of your Hajk issue.

In such a case would you like to have that as a separate PR?

Would be awesome if you could contribute with that addition! Would like it as a separate PR in that case.

Your suggested text is great. Maybe you could add a line regarding the other sections (Removed, Security etc.). Just mention that there are guidelines regarding where the entry should be made at the bottom of the changelog file.

image

@Hallbergs Hallbergs merged commit dc9f0f3 into hajkmap:develop May 15, 2024
sweco-sepros added a commit to sweco-se/hajk-fork that referenced this pull request Oct 15, 2024
@sweco-sepros
Merge branch 'sgi/develop' of https://github.com/sweco-se/hajk-fork i…
a012227 
…nto sgi/develop

* 'sgi/develop' of https://github.com/sweco-se/hajk-fork: (95 commits)
  bug: set cookie checkboxes to stored values after refresh (hajkmap#1511)
  Add property showAttributeTableButton in admin
  chore: changelog.md mentioned in contributing.md (hajkmap#1510)
  Feature/1125 cookie button (hajkmap#1509)
  changelog
  changed copy logic to navigator...
  moved formatValue outside scope
  Quick fix for hajkmap#1507 - make sure Rnd component doesn't get "dynamic" as input
  removed unnecessary variable in state
  updated logic for copying coordinates
  added comments
  minor fixes
  added default copy functionality if no comma
  appConf
  refactored handleCopy func
  basic copying functionality
  refactored styledIconButton
  padding change etc
  minor change to styling
  aligned buttons with inputs
  ...

# Conflicts:
#	apps/admin/public/config_example.json
#	apps/backend/.env
#	apps/backend/App_Data/documents/exempeldokument.json
#	apps/backend/App_Data/documents/exempeldokument2.json
#	apps/client/public/apple-touch-icon.png
#	apps/client/public/fonts/Poppins-ExtraBold.woff
#	apps/client/public/fonts/Poppins-Medium.woff
#	apps/client/public/fonts/Poppins-Regular.woff
#	apps/client/public/fonts/Poppins-SemiBold.woff
#	apps/client/public/logo-sgi-light.svg
#	apps/client/public/logo-sgi.svg
#	apps/client/src/components/FeatureInfo/FeatureInfoContainer.js
#	apps/client/src/plugins/Coordinates/CoordinatesModel.js
#	backend/mapservice/App_Data/map_1.json
#	backend/mapservice/App_Data/oversiktsplan.json
#	backend/mapservice/App_Data/oversiktsplan_OLD.json
#	new-admin/public/config.json
#	new-backend/package-lock.json
#	new-client/public/appConfig.json
#	new-client/public/customTheme.json
#	new-client/public/favicon.ico
#	new-client/public/icon192.png
#	new-client/public/icon512.png
#	new-client/public/index.css
#	new-client/public/index.html
#	new-client/public/logoDark.png
#	new-client/public/logoLight.png
#	new-client/public/marker.png
#	new-client/public/marker_x2.png
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Hallbergs Hallbergs Hallbergs approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Possibility to reopen the Cookie banner during a session
2 participants
@mlromramse @Hallbergs