diff --git a/.github/workflows/gradle-node.yaml b/.github/workflows/gradle-node.yaml
index 4d33944..ec0a902 100644
--- 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
index 3b3d966..460f074 100644
--- 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
index fcbc239..90b91dd 100644
--- 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
index 169ab48..8b07735 100644
--- 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"/>
{errMsg}
-
Forgot your Account information?
-
Request a CADC Account
diff --git a/src/react/canfar/CanfarNavbar.js b/src/react/canfar/CanfarNavbar.js
index 84e06eb..a77fbc8 100644
--- 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 (
@@ -69,10 +74,10 @@ class CanfarNavbar extends React.Component {
Documentation
Storage Management
- Group Management
+ Group Management
Data Publication
Science Portal
- CADC Search
+ CADC Search
OpenStack Cloud
About
@@ -122,8 +127,8 @@ class CanfarNavbar extends React.Component {
}
{this.state.isAuthenticated === true &&
- Update Profile
- Reset Password
+ Update Profile
+ Reset Password
Obtain Certificate
Logout