Merge pull request #71 from at88mph/cadc-menu-items-fix

Fix for CANFAR specific menu items.
opencadc · Jul 16, 2024 · c3df7b8 · c3df7b8
2 parents 7cbc477 + 3831895
commit c3df7b8
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 21 deletions.
diff --git a/.github/workflows/gradle-node.yaml b/.github/workflows/gradle-node.yaml
@@ -16,7 +16,7 @@ jobs:
 
     runs-on: ubuntu-latest
     permissions:
-      contents: read
+      contents: write
 
     steps:
       - uses: actions/checkout@v4
@@ -70,4 +70,4 @@ jobs:
       # Generates and submits a dependency graph, enabling Dependabot Alerts for all project dependencies.
       # See: https://github.com/gradle/actions/blob/main/dependency-submission/README.md
       - name: Generate and submit dependency graph
-        uses: gradle/actions/dependency-submission@ec92e829475ac0c2315ea8f9eced72db85bb337a # v3.0.0
+        uses: gradle/actions/dependency-submission@v3
diff --git a/VERSION b/VERSION
@@ -5,6 +5,6 @@
 # tags with and without build number so operators use the versioned
 # tag but we always keep a timestamped tag in case a semantic tag gets
 # replaced accidentally
-VER=0.2.6
+VER=0.2.7
 TAGS="${VER} ${VER}-$(date -u +"%Y%m%dT%H%M%S")"
 unset VER
diff --git a/src/App.js b/src/App.js
@@ -49,12 +49,12 @@ const URLS = {
 }
 
 const HEADER_URL_DEFAULTS = {
-  "acctrequest": "",
-  "acctupdate": "",
-  "passreset": "",
-  "passchg": "",
-  "gmui": "",
-  "search": "",
+  "ivo://cadc.nrc.ca/acctrequest": "",
+  "ivo://cadc.nrc.ca/acctupdate": "",
+  "ivo://cadc.nrc.ca/passreset": "",
+  "ivo://cadc.nrc.ca/passchg": "",
+  "ivo://cadc.nrc.ca/groups": "",
+  "ivo://cadc.nrc.ca/search": "",
   "baseURLCanfar": "https://www.canfar.net"
 }
 
@@ -194,15 +194,11 @@ class SciencePortalApp extends React.Component {
   }
 
   setHeaderURLs(hURLs) {
-    var curState = this.state
-    curState.headerURLs = hURLs
-    this.setState(curState)
+    this.setState({headerURLs: hURLs})
   }
 
   setThemeName(themeName) {
-    const currState = this.state
-    currState.themeName = themeName
-    this.setState(currState)
+    this.setState({themeName: themeName})
   }
 
   getAccessToken() {

diff --git a/src/react/canfar/CanfarLoginModal.js b/src/react/canfar/CanfarLoginModal.js
@@ -4,6 +4,8 @@ import Modal from "react-bootstrap/Modal";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faRightToBracket } from "@fortawesome/free-solid-svg-icons";
 
+const PASS_RESET_URI = "ivo://cadc.nrc.ca/passreset"
+const ACCOUNT_REQUEST_URI = "ivo://cadc.nrc.ca/acctrequest"
 
 class CanfarLoginModal extends React.Component {
 
@@ -75,12 +77,12 @@ class CanfarLoginModal extends React.Component {
                          placeholder="Password"/>
                 </div>
                 {errMsg}
-                <a href={this.state.modalURLs.passreset}
+                <a href={this.state.modalURLs[PASS_RESET_URI]}
                    className="account_access_info"
                    tabIndex="5" title="Forgot Password">
                   Forgot your Account information?</a>
                 <br/>
-                <a href={this.state.modalURLs.acctrequest}
+                <a href={this.state.modalURLs[ACCOUNT_REQUEST_URI]}
                    className="account_access_info"
                    tabIndex="6" title="Register" >
                   Request a CADC Account</a>

diff --git a/src/react/canfar/CanfarNavbar.js b/src/react/canfar/CanfarNavbar.js
@@ -12,6 +12,10 @@ import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
 import {faRightFromBracket} from "@fortawesome/free-solid-svg-icons";
 import {faCaretDown} from "@fortawesome/free-solid-svg-icons";
 
+const GROUP_MANAGEMENT_URI = "ivo://cadc.nrc.ca/groups"
+const ADVANCED_SEARCH_URI = "ivo://cadc.nrc.ca/search"
+const ACCOUNT_UPDATE_URI = "ivo://cadc.nrc.ca/acctupdate"
+const PASSWORD_CHANGE_URI = "ivo://cadc.nrc.ca/passchg"
 
 class CanfarNavbar extends React.Component {
 
@@ -37,6 +41,7 @@ class CanfarNavbar extends React.Component {
         });
       }
     }
+
     renderButton() {
       return (
         <Button size="sm" variant="outline-primary">{this.state.authenticatedUser}<span className="sp-buffer-span-left"><FontAwesomeIcon icon={faCaretDown} /></span></Button>
@@ -69,10 +74,10 @@ class CanfarNavbar extends React.Component {
               <Nav.Link href={baseURLCanfar + "/en/docs/quick_start/"}>Documentation</Nav.Link>
               <NavDropdown title="Services">
                 <NavDropdown.Item href={baseURLCanfar + "/storage/list"}  target="_blank">Storage Management</NavDropdown.Item>
-                <NavDropdown.Item href={this.state.headerURLs.groups} target="_blank">Group Management</NavDropdown.Item>
+                <NavDropdown.Item href={this.state.headerURLs[GROUP_MANAGEMENT_URI]} target="_blank">Group Management</NavDropdown.Item>
                 <NavDropdown.Item href={baseURLCanfar + "/citation"}  target="_blank">Data Publication</NavDropdown.Item>
                 <NavDropdown.Item href={baseURLCanfar + "/science-portal"}  target="_blank">Science Portal</NavDropdown.Item>
-                <NavDropdown.Item href={this.state.headerURLs.search} target="_blank">CADC Search</NavDropdown.Item>
+                <NavDropdown.Item href={this.state.headerURLs[ADVANCED_SEARCH_URI]} target="_blank">CADC Search</NavDropdown.Item>
                 <NavDropdown.Item href="https://arbutus-canfar.cloud.computecanada.ca" target="_blank">OpenStack Cloud</NavDropdown.Item>
               </NavDropdown>
               <Nav.Link href={baseURLCanfar + "/en/about/organization/"}>About</Nav.Link>
@@ -122,8 +127,8 @@ class CanfarNavbar extends React.Component {
               }
               {this.state.isAuthenticated === true &&
                 <NavDropdown align="end" title={this.renderButton()} id="authenticated_nav_dropdown" className="sp-auth-dropdown">
-                  <NavDropdown.Item href={this.state.headerURLs.acctupdate}  target="_blank">Update Profile</NavDropdown.Item>
-                  <NavDropdown.Item href={this.state.headerURLs.passchg} target="_blank">Reset Password</NavDropdown.Item>
+                  <NavDropdown.Item href={this.state.headerURLs[ACCOUNT_UPDATE_URI]}  target="_blank">Update Profile</NavDropdown.Item>
+                  <NavDropdown.Item href={this.state.headerURLs[PASSWORD_CHANGE_URI]} target="_blank">Reset Password</NavDropdown.Item>
                   <NavDropdown.Item href="https://www.cadc-ccda.hia-iha.nrc-cnrc.gc.ca/cred/priv?daysValid=30">Obtain Certificate</NavDropdown.Item>
                   <NavDropdown.Item href={baseURLCanfar + "/access/logout?target=" + baseURLCanfar + "/science-portal/"}>
                     <span className="sp-buffer-span-right"><FontAwesomeIcon  icon={faRightFromBracket} /></span>Logout