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.

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

feat: Add modals for deleting site and removing from project #552

Merged
merged 12 commits into from
Oct 31, 2023

Conversation

david-code
Copy link
Contributor

@david-code david-code commented Oct 27, 2023

Description

Just needed to use the ConfirmModal here. Had to also fix up some issues with the backend and shared-client.

Checklist

  • Corresponding issue has been opened
  • New tests added

Related Issues

Fixes #431

@david-code david-code linked an issue Oct 27, 2023 that may be closed by this pull request
dev-client/src/translations/en.json Outdated Show resolved Hide resolved
dev-client/src/translations/en.json Outdated Show resolved Hide resolved
dev-client/src/translations/en.json Outdated Show resolved Hide resolved
dev-client/src/translations/en.json Outdated Show resolved Hide resolved
David Code Howard and others added 3 commits October 27, 2023 16:45
dependabot bot and others added 4 commits October 30, 2023 12:09
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3 to 4.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [cocoapods](https://github.com/CocoaPods/CocoaPods) from 1.14.0 to 1.14.2.
- [Release notes](https://github.com/CocoaPods/CocoaPods/releases)
- [Changelog](https://github.com/CocoaPods/CocoaPods/blob/1.14.2/CHANGELOG.md)
- [Commits](CocoaPods/CocoaPods@1.14.0...1.14.2)

---
updated-dependencies:
- dependency-name: cocoapods
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* build: Bump client-shared

* feat: Add Checkbox Group

* feat: Add proper logic to site transfer

* feat: Dispatch transfer mutation

* fix: Render checkboxes in FlatList

* fix: Don't display sites of empty projects

* fix: Do some sorting

* feat: Navigate back after transfer

* fix: Styling changes

* feat: Add unaffiliated sites to site transfer

* fix: Fix unaffiliated search, allow scrolling

* fix: Allow transferring unaffiliated sites

* fix(lint): Fix linting errors
Copy link
Member

@paulschreiber paulschreiber left a comment

Choose a reason for hiding this comment

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

Please ensure check-ts runs cleanly.

dev-client/src/components/projects/ProjectSitesTab.tsx Outdated Show resolved Hide resolved
dev-client/src/components/projects/ProjectSitesTab.tsx Outdated Show resolved Hide resolved
@david-code david-code merged commit b7950c5 into main Oct 31, 2023
4 checks passed
@david-code david-code deleted the feat/connect-site-deletion branch October 31, 2023 18:45
david-code pushed a commit that referenced this pull request Nov 1, 2023
* feat: Add modals for deleting site and removing from project

* chore: Remove unused lodash types

* chore: Bump client-shared

* fix: Apply suggestions from code review

Co-authored-by: Paul Schreiber <paul@techmatters.org>

* chore(deps): bump actions/setup-node from 3 to 4 (#553)

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3 to 4.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump cocoapods from 1.14.0 to 1.14.2 in /dev-client (#554)

Bumps [cocoapods](https://github.com/CocoaPods/CocoaPods) from 1.14.0 to 1.14.2.
- [Release notes](https://github.com/CocoaPods/CocoaPods/releases)
- [Changelog](https://github.com/CocoaPods/CocoaPods/blob/1.14.2/CHANGELOG.md)
- [Commits](CocoaPods/CocoaPods@1.14.0...1.14.2)

---
updated-dependencies:
- dependency-name: cocoapods
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* feat: Site Transfer (#549)

* build: Bump client-shared

* feat: Add Checkbox Group

* feat: Add proper logic to site transfer

* feat: Dispatch transfer mutation

* fix: Render checkboxes in FlatList

* fix: Don't display sites of empty projects

* fix: Do some sorting

* feat: Navigate back after transfer

* fix: Styling changes

* feat: Add unaffiliated sites to site transfer

* fix: Fix unaffiliated search, allow scrolling

* fix: Allow transferring unaffiliated sites

* fix(lint): Fix linting errors

* fix: Pass params to translation

* chore: Bump client shared

* chore: Update remove site modal text

* chore(deps): Update client-shared

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Paul Schreiber <paul@techmatters.org>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
david-code pushed a commit that referenced this pull request Nov 7, 2023
* refactor: Split up validation schema for creation and editing

* fix: Save project settings to backend

* docs: add Java notes to README (#555)

* fix: improve Android build configuration (#556)

* build: set android.disableAutomaticComponentCreation=true

* fix: remove version number from gradle plugin

matches what the react-native init script does currently

* build: add kotlin plugin

Hopefully will fix:

The Kotlin Gradle plugin was loaded multiple times in different subprojects, which is not supported and may break the build.
This might happen in subprojects that apply the Kotlin plugins with the Gradle 'plugins { ... }' DSL if they specify explicit versions, even if the versions are equal.
Please add the Kotlin plugin to the common parent project or the root project, then remove the versions in the subprojects.
If the parent project does not need the plugin, add 'apply false' to the plugin line.
See: https://docs.gradle.org/current/userguide/plugins.html#sec:subprojects_plugins_dsl
The Kotlin plugin was loaded in the following projects: ':react-native-gesture-handler', ':rnmapbox_maps'

* chore: update package-lock.json

* fix: Fix up list rendering, styling for Site Transfer (#557)

* fix: Fix up list rendering, styling for Site Transfer

* fix(lint): Fix linting

* chore: Bump android version

* chore: Bump ios version

* chore: Disable cron schedule releases for now

* fix: Fix project transfer search (#558)

- I was having trouble with getting the FlatList to scroll, so I ended
up making the search bar component the list header
- This had the effect that everytime the list was updated, by the
search bar in the header, the whole list re-renders, closing the
keyboard
- Instead, it turns out that the FlatList was not scrolling only
because I had wrapped it in a VStack. When I got rid of the VStack,
things scrolled!
- So I did that and put the header component back to a separate
component.
- In the future it would be good to understand better how the list
rendering stuff works - maybe the whole list shouldn't be rerendering
every time it is updated?

* chore: Bump Android version

* chore: Bump ios version

* feat: Add modals for deleting site and removing from project (#552)

* feat: Add modals for deleting site and removing from project

* chore: Remove unused lodash types

* chore: Bump client-shared

* fix: Apply suggestions from code review

Co-authored-by: Paul Schreiber <paul@techmatters.org>

* chore(deps): bump actions/setup-node from 3 to 4 (#553)

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3 to 4.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump cocoapods from 1.14.0 to 1.14.2 in /dev-client (#554)

Bumps [cocoapods](https://github.com/CocoaPods/CocoaPods) from 1.14.0 to 1.14.2.
- [Release notes](https://github.com/CocoaPods/CocoaPods/releases)
- [Changelog](https://github.com/CocoaPods/CocoaPods/blob/1.14.2/CHANGELOG.md)
- [Commits](CocoaPods/CocoaPods@1.14.0...1.14.2)

---
updated-dependencies:
- dependency-name: cocoapods
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* feat: Site Transfer (#549)

* build: Bump client-shared

* feat: Add Checkbox Group

* feat: Add proper logic to site transfer

* feat: Dispatch transfer mutation

* fix: Render checkboxes in FlatList

* fix: Don't display sites of empty projects

* fix: Do some sorting

* feat: Navigate back after transfer

* fix: Styling changes

* feat: Add unaffiliated sites to site transfer

* fix: Fix unaffiliated search, allow scrolling

* fix: Allow transferring unaffiliated sites

* fix(lint): Fix linting errors

* fix: Pass params to translation

* chore: Bump client shared

* chore: Update remove site modal text

* chore(deps): Update client-shared

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Paul Schreiber <paul@techmatters.org>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: Save project settings to backend

* fix(lint): Fix linting issues

* fix: Add label to measurement units radio group

* chore(deps): Bump client-shared version

* refactor: Move measurement units into constant

* chore: Fix copy

Co-authored-by: Paul Schreiber <paul@techmatters.org>

* chore(deps): Update client shared

* chore: Remove stray space

Co-authored-by: Paul Schreiber <paul@techmatters.org>

* fix: Polyfill browser b64 functions to fix login (#567)

* feat: Add Microsoft and Apple login support (#559)

* Add Microsoft and Apple login support — buttons, OpenID configuration
* match login button text keys to web app
* temporarily disable Apple logins (web login doesn't work due to lack of request_mode: form_post support)

* chore(deps): bump @react-navigation/native-stack in /dev-client (#571)

Bumps [@react-navigation/native-stack](https://github.com/react-navigation/react-navigation/tree/HEAD/packages/native-stack) from 6.9.16 to 6.9.17.
- [Release notes](https://github.com/react-navigation/react-navigation/releases)
- [Changelog](https://github.com/react-navigation/react-navigation/blob/@react-navigation/native-stack@6.9.17/packages/native-stack/CHANGELOG.md)
- [Commits](https://github.com/react-navigation/react-navigation/commits/@react-navigation/native-stack@6.9.17/packages/native-stack)

---
updated-dependencies:
- dependency-name: "@react-navigation/native-stack"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps-dev): bump @types/jest from 29.5.6 to 29.5.7 in /dev-client (#572)

Bumps [@types/jest](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jest) from 29.5.6 to 29.5.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jest)

---
updated-dependencies:
- dependency-name: "@types/jest"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps-dev): bump eslint from 8.52.0 to 8.53.0 in /dev-client (#575)

Bumps [eslint](https://github.com/eslint/eslint) from 8.52.0 to 8.53.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](eslint/eslint@v8.52.0...v8.53.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps-dev): bump @react-native-community/cli-doctor in /dev-client (#573)

Bumps [@react-native-community/cli-doctor](https://github.com/react-native-community/cli/tree/HEAD/packages/cli-doctor) from 11.3.9 to 12.0.0.
- [Release notes](https://github.com/react-native-community/cli/releases)
- [Changelog](https://github.com/react-native-community/cli/blob/main/packages/cli-doctor/CHANGELOG.md)
- [Commits](https://github.com/react-native-community/cli/commits/v12.0.0/packages/cli-doctor)

---
updated-dependencies:
- dependency-name: "@react-native-community/cli-doctor"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps-dev): bump @types/react in /dev-client (#574)

Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.2.33 to 18.2.36.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react)

---
updated-dependencies:
- dependency-name: "@types/react"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* feat: Add sign out button to mobile app (#569)

* feat: add sign out button to nav bar
* fix: check if user is loggedIn instead of checking for token
* fix: add dependencies to LoginScreen useEffect

* chore: update .node-version to 20 (#576)

Has already been updated in .tool-versions and GitHub actions

* chore: bump build to 51 (#577)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Paul Schreiber <paul@techmatters.org>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Connect removing a site from a project to backend Connect site deletion from project to backend
2 participants