Merge pull request #74 from unity-sds/develop

Merging `develop` to `main`

Author: anilnatha

CHANGELOG.md

@@ -5,21 +5,29 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.9.0] (Unreleased)
+## [0.9.0] 2025-04-23
+- Changed project and venue information location. This information is now available in the navbar instead of on the homepage of the application [#59](https://github.com/unity-sds/unity-portal/issues/59)
 - Changed Docker image build workflow is triggered when a tag is created and no longer triggered when code is merged to `main` or `features/*` branches [#51](https://github.com/unity-sds/unity-ui/issues/51)
 - Changed Docker image build workflow so that it uses the image name `unity-portal-application` instead of `unity-ui-application`
+- Rebranded the application's project references so that they state "MDPS" instead of "Unity" [#55](https://github.com/unity-sds/unity-portal/issues/55)
+- Rebranded the application and repo so that the "ui" is now known as the "portal" [#61](https://github.com/unity-sds/unity-portal/issues/61), [#64](https://github.com/unity-sds/unity-portal/issues/64)
+- Removed hard-coded links for all project's venues [#58](https://github.com/unity-sds/unity-portal/issues/58)
+- Fixed issue with basepath not set correctly after proxy label was updated from `ui` to `portal` [#68](https://github.com/unity-sds/unity-portal/issues/68)
+- Changed consumption of Health API endpoint so that it now captures information for three new fields, `componentCategory`, `componentType`, and `description` [#71](https://github.com/unity-sds/unity-portal/issues/71)
+- Updated home page view so that it only lists items that have a `componentType` of `ui` [#71](https://github.com/unity-sds/unity-portal/issues/71)
+- Fixed inconsistent routes being displayed when comparing the home page cards with what was shown in the main navigations application's menu [#75](https://github.com/unity-sds/unity-portal/issues/75)
 
 ## [0.8.0] 2025-01-14
 - Added support to report on when health API endpoint is not available in navbar and on health dashboard
 - Fixed clickable area of navbar menu items
 - Added support to hard code links for projects/venues
-- Added health check URL to health dashboard [#40](https://github.com/unity-sds/unity-ui/issues/40)
+- Added health check URL to health dashboard [#40](https://github.com/unity-sds/unity-portal/issues/40)
 - Fixed health dashboard column resizer element z-index
-- Added cards to homepage [#38](https://github.com/unity-sds/unity-ui/issues/38)
-- Updated router configuration to improve URL readability.  URLs no longer contain router information using a hash (#39). [#39](https://github.com/unity-sds/unity-ui/issues/39
-- Updated home page route to be located at `/home` and the route `/` redirects to it. [#39](https://github.com/unity-sds/unity-ui/issues/39)
-- Updated application basename configuration to use the proxy name `ui` instead of `dashboard` [#45](https://github.com/unity-sds/unity-ui/issues/45)
-- Added hard-coded links for STAC Browser for the unity/dev and unity/test venues [#47](https://github.com/unity-sds/unity-ui/issues/47)
+- Added cards to homepage [#38](https://github.com/unity-sds/unity-portal/issues/38)
+- Updated router configuration to improve URL readability.  URLs no longer contain router information using a hash (#39). [#39](https://github.com/unity-sds/unity-portal/issues/39
+- Updated home page route to be located at `/home` and the route `/` redirects to it. [#39](https://github.com/unity-sds/unity-portal/issues/39)
+- Updated application basename configuration to use the proxy name `ui` instead of `dashboard` [#45](https://github.com/unity-sds/unity-portal/issues/45)
+- Added hard-coded links for STAC Browser for the unity/dev and unity/test venues [#47](https://github.com/unity-sds/unity-portal/issues/47)
 
 ## [0.7.0] 2024-09-27
 - Updated node version lts/iron
@@ -32,12 +40,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Various code cleanup and optimization activities
 
 ## [0.6.0] (unreleased)
-- Added Health Dashboard using static JSON file containing example health information. [#29](https://github.com/unity-sds/unity-ui/issues/29)
-- Updated navbar menu so that it is (partially) dynamic. External UI information is loaded via the Health JSON file. [#20](https://github.com/unity-sds/unity-ui/issues/20)
+- Added Health Dashboard using static JSON file containing example health information. [#29](https://github.com/unity-sds/unity-portal/issues/29)
+- Updated navbar menu so that it is (partially) dynamic. External UI information is loaded via the Health JSON file. [#20](https://github.com/unity-sds/unity-portal/issues/20)
 
 ## [0.5.0] 2024-04-15
-- Updated Navbar CSS styling to match Figma designs [#5](https://github.com/unity-sds/unity-ui/issues/5)
-- Added CI/CD workflow to build application as a docker image. [#21](https://github.com/unity-sds/unity-ui/issues/21)
+- Updated Navbar CSS styling to match Figma designs [#5](https://github.com/unity-sds/unity-portal/issues/5)
+- Added CI/CD workflow to build application as a docker image. [#21](https://github.com/unity-sds/unity-portal/issues/21)
 - Updated application build configuration. Stateful information has been removed from project configuration. Instead we now allow environment variables to be supplied to the container at startup which in turn get injected into the Unity UI Codebase. This is in support of moving to dynamic configuration of the application via Unity Marketplace. Related to [#3](https://github.com/unity-sds/unity-sds-portal/issues/3)
 
 ## [0.4.0] - 2023-12-13

index.html

@@ -2,9 +2,9 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/unity.svg" />
+    <link rel="icon" type="image/svg+xml" href="/images/mdps-logo.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Unity</title>
+    <title>Multi-Mission Data Processing System (MDPS)</title>
     <script>window.global = window;</script>
     <script type="module">
       import process from 'process';

package.json

@@ -1,7 +1,7 @@
 {
   "name": "unity-ui",
   "private": true,
-  "version": "0.8.0",
+  "version": "0.9.0",
   "type": "module",
   "scripts": {
     "dev": "vite",

public/unity.svg renamed to public/images/mdps-logo.svg

@@ -1,25 +1,85 @@
-const Config = {
+import { Service } from "./state/slices/healthSlice";
+
+type Config = {
+  general: {
+    appTitle:string,
+    version:string,
+    adminEmail:string,
+    wwwDomain:string,
+    basePath:string,
+    project:string,
+    venue:string,
+    defaultRoutes:Service[]
+  },
+  auth: {
+    oauthRedirectUri:string,
+    oauthLogoutEndpoint:string,
+    oauthProviderUrl:string,
+    appAdminGroupName:string,
+    appViewerGroupName:string,
+  },
+  cs: {
+    healthEndpointUrl:string
+  },
+  ads: {
+    url:string
+  },
+  sps: {
+    endpoint:string
+  }
+}
+
+const Config:Config = {
 
    ['general']: {
+      appTitle: "MDPS",
       version: import.meta.env.VITE_UNITY_UI_VERSION,
-      unity_admin_email: import.meta.env.VITE_ADMIN_EMAIL,
-      www_domain: import.meta.env.VITE_WWW_DOMAIN,
-      base_path: import.meta.env.VITE_BASE_PATH,
+      adminEmail: import.meta.env.VITE_ADMIN_EMAIL,
+      wwwDomain: import.meta.env.VITE_WWW_DOMAIN,
+      basePath: import.meta.env.VITE_BASE_PATH,
       project: import.meta.env.VITE_PROJECT,
-      venue: import.meta.env.VITE_VENUE
+      venue: import.meta.env.VITE_VENUE,
+      defaultRoutes: [
+        {
+          componentName: "Health Dashboard",
+          componentCategory: "",
+          componentType: "ui",
+          description: "Check the health status of services running in this venue.",
+          healthChecks: [],
+          healthCheckUrl: "",
+          landingPageUrl: "/health-dashboard",
+          nativeRoute: true,
+          reportHealthStatus: false,
+          route: "/health-dashboard",
+          ssmKey: ""
+        },
+        {
+          componentName: "Documentation (Gitbook)",
+          componentCategory: "",
+          componentType: "ui",
+          description: "Documentation to help become familiar with the Unity platform.",
+          healthChecks: [],
+          healthCheckUrl: "",
+          landingPageUrl: "https://unity-sds.gitbook.io/docs",
+          nativeRoute: true,
+          reportHealthStatus: false,
+          route: "https://unity-sds.gitbook.io/docs",
+          ssmKey: ""
+        }
+      ]
    },
 
    ['auth']: {
-      //oauth_client_id: import.meta.env.VITE_AUTH_OAUTH_CLIENT_ID,
-      oauth_redirect_uri: import.meta.env.VITE_AUTH_OAUTH_REDIRECT_URI,
-      oauth_logout_endpoint: import.meta.env.VITE_AUTH_OAUTH_LOGOUT_ENDPOINT,
-      oauth_provider_url: import.meta.env.VITE_AUTH_OAUTH_PROVIDER_URL,
-      app_admin_group_name: import.meta.env.VITE_AUTH_APP_ADMIN_GROUP_NAME,
-      app_viewer_group_name: import.meta.env.VITE_AUTH_APP_APP_VIEWER_GROUP_NAME,
+      //oauthClientId: import.meta.env.VITE_AUTH_OAUTH_CLIENT_ID,
+      oauthRedirectUri: import.meta.env.VITE_AUTH_OAUTH_REDIRECT_URI,
+      oauthLogoutEndpoint: import.meta.env.VITE_AUTH_OAUTH_LOGOUT_ENDPOINT,
+      oauthProviderUrl: import.meta.env.VITE_AUTH_OAUTH_PROVIDER_URL,
+      appAdminGroupName: import.meta.env.VITE_AUTH_APP_ADMIN_GROUP_NAME,
+      appViewerGroupName: import.meta.env.VITE_AUTH_APP_APP_VIEWER_GROUP_NAME,
    },
 
    ['cs']: {
-      health_endpoint: import.meta.env.VITE_HEALTH_API_ENDPOINT
+      healthEndpointUrl: import.meta.env.VITE_HEALTH_API_ENDPOINT
    },
 
    ['ads']: {

src/Config.tsx

@@ -14,7 +14,6 @@ import NotFound from "./routes/errors/not-found";
 import { useAppDispatch, useAppSelector } from "./state/hooks";
 import { useEffect, useState } from "react";
 import { getHealthData } from "./state/slices/healthSlice";
-import { formatRoute } from "./utils/strings";
 import { Progress } from "@nasa-jpl/react-stellar";
 
 function Root() {
@@ -51,12 +50,12 @@ function Root() {
   }, [healthState, dispatch]);
 
   return (
-    <div className="unity-view-wrapper">
+    <div className="mdps-view-wrapper">
       {
         loading && <>
-          <div className="unity-view unity-view-with-status">
+          <div className="mdps-view mdps-view-with-status">
             <div className="progressStatus">
-              <h2>Setting up Unity UI Application</h2>
+              <h2>Setting up Multi-Mission Data Processing System Portal Application</h2>
               <Progress />
             </div>
           </div>
@@ -65,11 +64,12 @@ function Root() {
       { 
         !loading && <>
           <Navbar />
-          <div className="unity-view unity-view-with-navbar">
+          <div className="mdps-view mdps-view-with-navbar">
           <Routes>
             {
               healthState.items.map( (item, index) => {
-                return <Route key={index} path={"/applications/" + formatRoute(item.componentName)} element={<WebView url={item.landingPageUrl} />} />
+                if( !item.nativeRoute )
+                  return <Route key={index} path={item.route} element={<WebView url={item.landingPageUrl} />} />
               })
             }
             <Route path="/" element={<Navigate to="/home" replace={true} />} />

src/Root.tsx

@@ -26,14 +26,14 @@ export const Card = ({
 
   return (
     <Link to={route}>
-      <span className="unity-card">
+      <span className="mdps-card">
         <span className="header">
           <span className="title">{title}</span>
           <span className="icons">
             <Link to={url} target={"_blank"} onClick={ (e) => {onClickExternalHandler(e)}}><IconExternalLink /></Link>
           </span>
         </span>
-        <div className="description">{description}</div>
+       { description && <div className="description">{description}</div> }
         <div className="footer">
           <Pill label={type}/>
         </div>

src/assets/unity.svg renamed to src/assets/images/mdps-logo.svg

@@ -1,4 +1,5 @@
 import { Helmet } from 'react-helmet-async';
+import Config from '../../Config';
 
 export type DocumentMetaProps = {
   title: string;
@@ -8,10 +9,11 @@ export type DocumentMetaProps = {
 export const DocumentMeta = (props:DocumentMetaProps) => {
 
   const {title, description} = props;
+  const appTitle = Config["general"]["appTitle"];
 
   return (
     <Helmet>
-      <title>Unity | {title}</title>
+      <title>{appTitle} | {title}</title>
       <meta name="description" content={description} />
     </Helmet>
   );