Merge branch 'WildMeOrg:develop' into 637-installinstructions

WildMeOrg · Jan 29, 2024 · b4b0c3f · b4b0c3f
2 parents c810189 + 2ab3a77
commit b4b0c3f
Show file tree

Hide file tree

Showing 33 changed files with 982 additions and 421 deletions.
diff --git a/.github/workflows/build_codex_fe.yml b/.github/workflows/build_codex_fe.yml
@@ -49,6 +49,7 @@ jobs:
 
       deploy:
         name: Docker image build
+        if: github.event.pull_request.head.repo.full_name == github.repository
         runs-on: ubuntu-latest
         strategy:
            fail-fast: false
@@ -142,47 +143,3 @@ jobs:
             run: |
               ./scripts/buildx.docker.sh -t nightly -r ghcr.io/wildmeorg/codex-frontend -i codex-frontend
     
-          # Notify status in Slack
-          - name: Slack Notification
-            if: ${{ failure() && github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v') }}
-            uses: rtCamp/action-slack-notify@master
-            env:
-              SLACK_CHANNEL: dev-houston
-              SLACK_COLOR: '#FF0000'
-              SLACK_ICON: https://avatars.slack-edge.com/2020-03-02/965719891842_db87aa21ccb61076f236_44.png
-              SLACK_MESSAGE: 'Tagged / Latest Docker build of Codex Frontend failed :sob:'
-              SLACK_USERNAME: "GitHub CI"
-              SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-
-          - name: Slack Notification
-            if: ${{ failure() && github.ref == 'refs/heads/main' }}
-            uses: rtCamp/action-slack-notify@master
-            env:
-              SLACK_CHANNEL: dev-houston
-              SLACK_COLOR: '#FF0000'
-              SLACK_ICON: https://avatars.slack-edge.com/2020-03-02/965719891842_db87aa21ccb61076f236_44.png
-              SLACK_MESSAGE: 'Stable Docker build of Codex Frontend failed :sob:'
-              SLACK_USERNAME: "GitHub CI"
-              SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-
-          - name: Slack Notification
-            if: ${{ failure() && github.ref == 'refs/heads/develop' }}
-            uses: rtCamp/action-slack-notify@master
-            env:
-              SLACK_CHANNEL: dev-houston
-              SLACK_COLOR: '#FF0000'
-              SLACK_ICON: https://avatars.slack-edge.com/2020-03-02/965719891842_db87aa21ccb61076f236_44.png
-              SLACK_MESSAGE: 'Bleeding Edge Docker build of Codex Frontend failed :sob:'
-              SLACK_USERNAME: "GitHub CI"
-              SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-
-          - name: Slack Notification
-            if: ${{ failure() && github.event_name == 'schedule' }}
-            uses: rtCamp/action-slack-notify@master
-            env:
-              SLACK_CHANNEL: dev-houston
-              SLACK_COLOR: '#FF0000'
-              SLACK_ICON: https://avatars.slack-edge.com/2020-03-02/965719891842_db87aa21ccb61076f236_44.png
-              SLACK_MESSAGE: 'Nightly Docker build of Codex Frontend failed :sob:'
-              SLACK_USERNAME: "GitHub CI"
-              SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
diff --git a/.github/workflows/build_houston_fe.yml b/.github/workflows/build_houston_fe.yml
@@ -49,6 +49,7 @@ jobs:
 
       deploy:
         name: Docker image build
+        if: github.event.pull_request.head.repo.full_name == github.repository
         runs-on: ubuntu-latest
         strategy:
            fail-fast: false
@@ -141,48 +142,4 @@ jobs:
             if: github.event_name == 'schedule'
             run: |
               ./scripts/buildx.docker.sh -t nightly -r ghcr.io/wildmeorg/codex-frontend -i houston-frontend
-    
-          # Notify status in Slack
-          - name: Slack Notification
-            if: ${{ failure() && github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v') }}
-            uses: rtCamp/action-slack-notify@master
-            env:
-              SLACK_CHANNEL: dev-houston
-              SLACK_COLOR: '#FF0000'
-              SLACK_ICON: https://avatars.slack-edge.com/2020-03-02/965719891842_db87aa21ccb61076f236_44.png
-              SLACK_MESSAGE: 'Tagged / Latest Docker build of Codex Frontend failed :sob:'
-              SLACK_USERNAME: "GitHub CI"
-              SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-
-          - name: Slack Notification
-            if: ${{ failure() && github.ref == 'refs/heads/main' }}
-            uses: rtCamp/action-slack-notify@master
-            env:
-              SLACK_CHANNEL: dev-houston
-              SLACK_COLOR: '#FF0000'
-              SLACK_ICON: https://avatars.slack-edge.com/2020-03-02/965719891842_db87aa21ccb61076f236_44.png
-              SLACK_MESSAGE: 'Stable Docker build of Codex Frontend failed :sob:'
-              SLACK_USERNAME: "GitHub CI"
-              SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-
-          - name: Slack Notification
-            if: ${{ failure() && github.ref == 'refs/heads/develop' }}
-            uses: rtCamp/action-slack-notify@master
-            env:
-              SLACK_CHANNEL: dev-houston
-              SLACK_COLOR: '#FF0000'
-              SLACK_ICON: https://avatars.slack-edge.com/2020-03-02/965719891842_db87aa21ccb61076f236_44.png
-              SLACK_MESSAGE: 'Bleeding Edge Docker build of Codex Frontend failed :sob:'
-              SLACK_USERNAME: "GitHub CI"
-              SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-
-          - name: Slack Notification
-            if: ${{ failure() && github.event_name == 'schedule' }}
-            uses: rtCamp/action-slack-notify@master
-            env:
-              SLACK_CHANNEL: dev-houston
-              SLACK_COLOR: '#FF0000'
-              SLACK_ICON: https://avatars.slack-edge.com/2020-03-02/965719891842_db87aa21ccb61076f236_44.png
-              SLACK_MESSAGE: 'Nightly Docker build of Codex Frontend failed :sob:'
-              SLACK_USERNAME: "GitHub CI"
-              SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+
diff --git a/locale/en.json b/locale/en.json
@@ -87,7 +87,9 @@
   "COLLABORATION_VIEW_REQUEST_BRIEF": "{userName} has requested to collaborate with you",
   "COLLABORATION_VIEW_REQUEST_DESCRIPTION": "{userName} has requested to collaborate with you. If you grant access to {userName}, you will be able to view each other's data.",
   "COLLABORATION_EDIT_REQUEST_BRIEF": "{userName} has requested an edit collaboration with you",
+  "COLLABORATION_EXPORT_REQUEST_BRIEF": "{userName} has requested an export collaboration with you",
   "COLLABORATION_EDIT_REQUEST_DESCRIPTION": "{userName} has requested an edit collaboration with you. If you grant access to {userName}, you will be able to edit each other's data.",
+  "COLLABORATION_EXPORT_REQUEST_DESCRIPTION": "{userName} has requested an export collaboration with you. If you grant access to {userName}, you will be able to export each other's data.",
   "VIEW_USER_PROFILE": "View user profile",
   "SEARCH_RADIUS_LABEL": "Search radius (kilometers)",
   "SEARCH_CENTER_POINT": "Search center point",
@@ -1049,7 +1051,9 @@
   "COLLABORATION_APPROVED_TITLE": "Collaboration approved",
   "COLLABORATION_REVOKE_BRIEF": "{userName} revoked your collaboration request",
   "EDIT_COLLABORATION_APPROVED": "{userName} approved your collaboration edit request",
+  "EXPORT_COLLABORATION_APPROVED": "{userName} approved your collaboration export request",
   "EDIT_COLLABORATION_REVOKED": "{userName} revoked edit privileges for your collaboration with them",
+  "EXPORT_COLLABORATION_REVOKED": "{userName} revoked export privileges for your collaboration with them",
   "COLLABORATION_REVOKED_BY_MANAGER": "A collaboration was revoked by a user manager.",
   "INDIVIDUAL_MERGE_REQUEST_MESSAGE_DETAILED": "{userName} requested that {yourIndividualName} be merged with {theirIndividualName}. You have until {formattedDeadline} to respond.",
   "INDIVIDUAL_MERGE_REQUEST_MESSAGE": "{userName} wants to merge {yourIndividualName} with {theirIndividualName}",
@@ -1060,8 +1064,11 @@
   "COLLABORATION_ESTABLISHED_BY_USER_MANAGER": "Collaboration established by a user manager",
   "COLLABORATION_REVOKE_TITLE": "Revoke collaboration",
   "COLLABORATION_EDIT_REQUEST_TITLE": "Edit collaboration request",
+  "COLLABORATION_EXPORT_REQUEST_TITLE": "Export collaboration request",
   "COLLABORATION_EDIT_APPROVED_TITLE": "Collaboration edit approved",
+  "COLLABORATION_EXPORT_APPROVED_TITLE": "Collaboration export approved",
   "COLLABORATION_EDIT_REVOKE_TITLE": "Revoke edit privileges",
+  "COLLABORATION_EXPORT_REVOKE_TITLE": "Revoke export privileges",
   "COLLABORATION_MANAGER_REVOKE_TITLE": "Revoke manager-assigned collaboration",
   "INDIVIDUAL_MERGE_REQUEST_TITLE": "Individual merge request",
   "INDIVIDUAL_MERGE_COMPLETE_TITLE": "Individual merge completed",
@@ -1206,15 +1213,23 @@
   "ADD_COLLABORATION": "Add collaboration",
   "EMAIL": "Email",
   "EDIT_COLLABORATION_REVOKED_BY_USER_MANAGER": "Edit collaboration revoked by a user manager.",
+  "EXPORT_COLLABORATION_REVOKED_BY_USER_MANAGER": "Export collaboration revoked by a user manager.",
   "EDIT_COLLABORATION_WAS_REVOKED_BY_A_USER_MANAGER": "An edit-level collaboration with {otherUserNameForManagerNotifications} was revoked by a user manager {managerName}.",
+  "EXPORT_COLLABORATION_WAS_REVOKED_BY_A_USER_MANAGER": "An export-level collaboration with {otherUserNameForManagerNotifications} was revoked by a user manager {managerName}.",
   "COLLABORATION_EDIT_DENIED": "Collaboration edit denied",
+  "COLLABORATION_EXPORT_DENIED": "Collaboration export denied",
   "EDIT_COLLABORATION_DENIED_MESSAGE": "{userName} denied your collaboration edit request",
+  "EXPORT_COLLABORATION_DENIED_MESSAGE": "{userName} denied your collaboration export request",
   "COLLABORATION_DENIED_BY_USER_MANAGER": "Collaboration denied by a user manager",
   "COLLABORATION_DENIED_BY_USER_MANAGER_MESSAGE": "Your collaboration with {otherUserNameForManagerNotifications} was denied by a user manager {managerName}.",
   "EDIT_COLLABORATION_DENIED_BY_USER_MANAGER": "Edit-level collaboration denied by a user manager",
+  "EXPORT_COLLABORATION_DENIED_BY_USER_MANAGER": "Export-level collaboration denied by a user manager",
   "EDIT_COLLABORATION_DENIED_BY_USER_MANAGER_MESSAGE": "An edit-level collaboration with {otherUserNameForManagerNotifications} was denied by a user manager {managerName}.",
+  "EXPORT_COLLABORATION_DENIED_BY_USER_MANAGER_MESSAGE": "An export-level collaboration with {otherUserNameForManagerNotifications} was denied by a user manager {managerName}.",
   "EDIT_COLLABORATION_APPROVED_BY_USER_MANAGER": "Edit collaboration approved by a user manager",
+  "EXPORT_COLLABORATION_APPROVED_BY_USER_MANAGER": "Export collaboration approved by a user manager",
   "EDIT_COLLABORATION_WAS_APPROVED_BY_A_USER_MANAGER": "An edit-level collaboration with {otherUserNameForManagerNotifications} was approved by a user manager {managerName}.",
+  "EXPORT_COLLABORATION_WAS_APPROVED_BY_A_USER_MANAGER": "An export-level collaboration with {otherUserNameForManagerNotifications} was approved by a user manager {managerName}.",
   "UNNAMED_MANAGER": "Unnamed manager",
   "STILL_GENERATING_LIST": "Still generating list; this can take up to one minute.",
   "SEARCH_TIMED_OUT_WHILE_TRYING_TO_CONNECT_TO_ITIS": "Search timed out while trying to connect to ITIS database. Try again later.",
@@ -1290,5 +1305,9 @@
   "MANAGE_REGIONS" : "Manage Regions",
   "EXPORT_RESULT" : "Export result",
   "EXPORT_ACCESS_RESTRICTED_WARNING" : "No results meet export criteria. Consider adjusting your search or requesting export collaborations.",
-  "OK" : "Ok"
+  "OK" : "Ok",
+  "EXPORT" : "Export",
+  "ACCESS" : "Access",
+  "COLLABORATE" : "Collaborate",
+  "COLLABORATION_STATE_EXPORT" : "Export"
 }
diff --git a/src/components/AuthenticatedAppHeader/NotificationsPane.jsx b/src/components/AuthenticatedAppHeader/NotificationsPane.jsx
@@ -101,7 +101,7 @@ export default function NotificationsPane({
               const defaultButtonPath = get(
                 currentNotificationSchema,
                 'buttonPath',
-                '/#collab-card',
+                '/user-profile/#collab-card',
               );
               const buttonPath = deriveButtonPath
                 ? deriveButtonPath(mergedIndividualGuid)