Merge pull request #272 from rimorin/master

Master -> Staging
rimorin · Oct 17, 2023 · d0c1bd1 · d0c1bd1
2 parents a4fd598 + 20d0b5a
commit d0c1bd1
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,24 @@
+## [1.25.3](https://github.com/rimorin/ministry-mapper/compare/v1.25.2...v1.25.3) (2023-10-17)
+
+
+### Bug Fixes
+
+* unable to remove/get assignments ([5db62ee](https://github.com/rimorin/ministry-mapper/commit/5db62ee9d17a70ea9e8c3614c757d8fbb6fc1e65))
+
+## [1.25.2](https://github.com/rimorin/ministry-mapper/compare/v1.25.1...v1.25.2) (2023-10-13)
+
+
+### Bug Fixes
+
+* load links on demand ([3da68b1](https://github.com/rimorin/ministry-mapper/commit/3da68b10f9b34cace107dbf259bb03953417f43a))
+
+## [1.25.1](https://github.com/rimorin/ministry-mapper/compare/v1.25.0...v1.25.1) (2023-10-12)
+
+
+### Bug Fixes
+
+* hide postal code from shared link for better security ([825dfa2](https://github.com/rimorin/ministry-mapper/commit/825dfa2a93557bccb3eb055114b5bb5c591fa050))
+
 # [1.25.0](https://github.com/rimorin/ministry-mapper/compare/v1.24.2...v1.25.0) (2023-10-04)
 
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ministry-mapper",
-  "version": "1.25.0",
+  "version": "1.25.3",
   "private": true,
   "dependencies": {
     "@ebay/nice-modal-react": "^1.2.13",

diff --git a/src/pages/dashboard/admin.tsx b/src/pages/dashboard/admin.tsx
@@ -1258,7 +1258,7 @@ function Admin({ user }: adminProps) {
                     pollingQueryFunction(() =>
                       get(
                         query(
-                          ref(database, "links"),
+                          ref(database, `links/${code}`),
                           orderByChild("userId"),
                           equalTo(user.uid)
                         )
@@ -1277,7 +1277,8 @@ function Admin({ user }: adminProps) {
                           );
                         }
                         ModalManager.show(SuspenseComponent(GetAssignments), {
-                          assignments: linkListing
+                          assignments: linkListing,
+                          congregation: code
                         });
                       })
                       .finally(() => {
@@ -1424,7 +1425,8 @@ function Admin({ user }: adminProps) {
                                         assignments:
                                           addressElement.personalDetailsList,
                                         assignmentType: LINK_TYPES.PERSONAL,
-                                        assignmentTerritory: currentPostalname
+                                        assignmentTerritory: currentPostalname,
+                                        congregation: code
                                       }
                                     )
                                   }
@@ -1499,7 +1501,8 @@ function Admin({ user }: adminProps) {
                                         assignments:
                                           addressElement.assigneeDetailsList,
                                         assignmentType: LINK_TYPES.ASSIGNMENT,
-                                        assignmentTerritory: currentPostalname
+                                        assignmentTerritory: currentPostalname,
+                                        congregation: code
                                       }
                                     )
                                   }