(VADC-1415 VADC-1412 VADC-1413 VADC-1456): Refactor level one headings (

#1641)

.secrets.baseline

@@ -3,7 +3,7 @@
     "files": "package-lock.json|.*/dictionary.json|.*/schema.json",
     "lines": ".*integrity.*"
   },
-  "generated_at": "2021-10-08T03:14:20Z",
+  "generated_at": "2024-11-19T16:49:52Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -81,7 +81,7 @@
         "hashed_secret": "abd9c7ed80fd61f97a190e059555269a6ff69b94",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 16,
+        "line_number": 17,
         "type": "Secret Keyword"
       }
     ],

docs/portal_config.md

@@ -709,11 +709,12 @@ Below is an example, with inline comments describing what each JSON block config
     "tableScrollHeight": 450 // optional, no scroll if omitted
   },
   "resourceBrowser": {}, // see Resource Browser documentation
-  "workspacePageTitle": "", // title to display above workspacePageDescription
+  "workspacePageTitle": "Workspace", // title to display above workspacePageDescription; Defaults to Workspace
   "workspacePageDescription": "", // html to display above the workspace options
   "studyViewerConfig": [],//See docs/study_viewer.md for more details.
   "useArboristUI": false, // optional; set true to enable Arborist UI; defaults to false if absent
   "hideSubmissionIfIneligible": true, // optional; only works if Arborist UI is enabled; if set to true, link/buttons to /submission page will be hidden to users who don't have permissions to submit data; defaults to false if absent
+  "profilePageTitle": "Profile", // title to display at top of Profile Page; Defaults to Profile
   "showArboristAuthzOnProfile": false, // optional; set true to list Arborist resources on profile page
   "showFenceAuthzOnProfile": true, // optional; set false to not list fence project access on profile page
   "showExternalLoginsOnProfile": false, // enable WTS OIDC logins via the profile page

src/Analysis/Analysis.jsx

@@ -19,7 +19,7 @@ class Analysis extends React.Component {
       <div className='analysis'>
         <Row>
           <Col flex='1 0 auto'>
-            <h2 className='analysis__title'>Apps</h2>
+            <h1 className='analysis__title'>Apps</h1>
           </Col>
           {CheckForTeamProjectApplication(analysisApps) && (
             <Col flex='1 0 auto'>

src/Analysis/AnalysisApp.jsx

@@ -262,7 +262,7 @@ class AnalysisApp extends React.Component {
           <div className='analysis-app'>
             <Row>
               <Col flex='1 0 auto'>
-                <h2>{app.title}</h2>
+                <h1>{app.title}</h1>
               </Col>
               {CheckForTeamProjectApplication(analysisApps) && (
                 <Col flex='1 0 auto'>

src/Login/Login.jsx

@@ -216,9 +216,9 @@ class Login extends React.Component {
             : null
         }
         <div className='login-page__central-content'>
-          <div className='h1-typo login-page__title'>
+          <h1 className='h1-typo login-page__title'>
             {this.props.data.title}
-          </div>
+          </h1>
           {fromLocationText ? (
             <React.Fragment><div className='high-light login-page__sub-title'>
               Access {fromLocationText}

src/ResourceBrowser/index.jsx

@@ -17,9 +17,9 @@ class ResourceBrowser extends React.Component {
     const resources = settings.resources || [];
     return (
       <div className='resource-browser'>
-        <h2 className='resource-browser__title'>
+        <h1 className='resource-browser__title'>
           {settings.title}
-        </h2>
+        </h1>
         {settings.description
           ? (
             <p className='resource-browser__description'>

src/UserProfile/UserProfile.jsx

@@ -3,9 +3,10 @@ import PropTypes from 'prop-types';
 import FileSaver from 'file-saver';
 import copy from 'clipboard-plus';
 import Button from '@gen3/ui-component/dist/components/Button';
+import parse from 'html-react-parser';
 import { jsonToString } from '../utils';
 import Popup from '../components/Popup';
-import { credentialCdisPath } from '../localconf';
+import { credentialCdisPath, profilePageTitle } from '../localconf';
 import KeyTable from '../components/tables/KeyTable';
 import AccessTable from '../components/tables/AccessTable';
 import ExternalLogins from './ExternalLogins';
@@ -44,6 +45,9 @@ const UserProfile = ({
 
   return (
     <div className='user-profile'>
+      <h1>
+        {profilePageTitle ? parse(profilePageTitle) : 'Profile'}
+      </h1>
       {
         showExternalLoginsOnProfile
         && <ExternalLogins />

src/Workspace/index.jsx

@@ -707,13 +707,9 @@ class Workspace extends React.Component {
               && this.state.workspaceStatus !== 'Stopped'
               ? (
                 <div>
-                  {workspacePageTitle
-                    ? (
-                      <h2 className='workspace__title'>
-                        {parse(workspacePageTitle)}
-                      </h2>
-                    )
-                    : null}
+                  <h1 className='workspace__title'>
+                    {workspacePageTitle ? parse(workspacePageTitle) : 'Workspace'}
+                  </h1>
                   {workspacePageDescription
                     ? (
                       <div className='workspace__description'>

src/localconf.js

@@ -354,6 +354,7 @@ function buildConfig(opts) {
     studyRegistrationConfig.variableMetadataField = '';
   }
   const { workspacePageTitle } = config;
+  const { profilePageTitle } = config;
   const { workspacePageDescription } = config;
   const workspaceRegistrationConfig = (registrationConfigs && registrationConfigs.features)
     ? registrationConfigs.features.workspaceRegistrationConfig : null;
@@ -604,6 +605,7 @@ function buildConfig(opts) {
     auspiceUrl,
     auspiceUrlIL,
     workspacePageTitle,
+    profilePageTitle,
     workspacePageDescription,
     enableDAPTracker,
     workspaceRegistrationConfig,