From c0a354bca6772133ce466beaea934bd2f054d309 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Fri, 7 Jun 2024 16:46:47 -0400
Subject: [PATCH 001/113] feat(resource-catalog): add catalog and carousel
 components

---
 index.html                            |  15 ++----
 package-lock.json                     |   7 +++
 package.json                          |   1 +
 public/api/resourceCatalogSlides.json |  20 ++++++++
 public/images/psc-machine-room.jpg    | Bin 0 -> 65601 bytes
 public/images/stampede3.jpg           | Bin 0 -> 51750 bytes
 src/base.css                          |  11 ++++
 src/carousel.css                      |  70 ++++++++++++++++++++++++++
 src/carousel.jsx                      |  66 ++++++++++++++++++++++++
 src/content.css                       |  27 ++++++++++
 src/index.jsx                         |   5 ++
 src/resource-catalog.jsx              |  24 +++++++++
 src/resource-home.jsx                 |  22 ++++++++
 13 files changed, 257 insertions(+), 11 deletions(-)
 create mode 100644 public/api/resourceCatalogSlides.json
 create mode 100644 public/images/psc-machine-room.jpg
 create mode 100644 public/images/stampede3.jpg
 create mode 100644 src/carousel.css
 create mode 100644 src/carousel.jsx
 create mode 100644 src/content.css
 create mode 100644 src/resource-catalog.jsx
 create mode 100644 src/resource-home.jsx

diff --git a/index.html b/index.html
index 40d90d9..ab28628 100644
--- a/index.html
+++ b/index.html
@@ -54,12 +54,8 @@
     <div id="site-menus"></div>
     <div id="main" class="container">
       <div id="body">
-        <h1>Page Title</h1>
-        <h2>First Section</h2>
-        <h2>Second Section</h2>
-        <h2>Third Section</h2>
+        <div id="resource-catalog"></div>
       </div>
-      <div id="table-of-contents"></div>
     </div>
     <div id="footer-menus"></div>
     <div id="footer"></div>
@@ -68,6 +64,7 @@ <h2>Third Section</h2>
         footer,
         footerMenus,
         header,
+        resourceCatalog,
         siteMenus,
         tableOfContents,
         universalMenuItems,
@@ -114,24 +111,20 @@ <h2>Third Section</h2>
       universalMenus({
         loginUrl: "/login",
         logoutUrl: "/logout",
-        siteName: "Allocations",
         target: document.getElementById("universal-menus"),
       });
 
       header({
-        siteName: "Allocations",
         target: document.getElementById("header"),
       });
 
       siteMenus({
         items: siteItems,
-        siteName: "Allocations",
         target: document.getElementById("site-menus"),
       });
 
-      tableOfContents({
-        headings: document.querySelectorAll("#body h1, #body h2"),
-        target: document.getElementById("table-of-contents"),
+      resourceCatalog({
+        target: document.getElementById("resource-catalog"),
       });
 
       footerMenus({
diff --git a/package-lock.json b/package-lock.json
index 2da88cf..8d65208 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,7 +7,9 @@
     "": {
       "name": "@access-ci/ui",
       "version": "0.2.5",
+      "license": "Apache-2.0",
       "dependencies": {
+        "@glidejs/glide": "^3.6.1",
         "preact": "^10.13.1"
       },
       "devDependencies": {
@@ -874,6 +876,11 @@
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
+    "node_modules/@glidejs/glide": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/@glidejs/glide/-/glide-3.6.1.tgz",
+      "integrity": "sha512-5hduecGlGI/R14bxEelKS3sG+cDUwtCAlxS2U3nte0o9NdYltYlW4OWtAyMHUF6USl6n1XqCru2pQZ0s+Ytmzw=="
+    },
     "node_modules/@humanwhocodes/config-array": {
       "version": "0.11.10",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
diff --git a/package.json b/package.json
index 2c411f7..892bbbb 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "@glidejs/glide": "^3.6.1",
     "preact": "^10.13.1"
   },
   "devDependencies": {
diff --git a/public/api/resourceCatalogSlides.json b/public/api/resourceCatalogSlides.json
new file mode 100644
index 0000000..50a723c
--- /dev/null
+++ b/public/api/resourceCatalogSlides.json
@@ -0,0 +1,20 @@
+{
+  "slides": [
+    {
+      "title": "Stampede3 Now Available!",
+      "description": "Stampede3, the latest compute and storage resource from TACC, is now accepting allocation requests. This powerful Dell Technologies and Intel based supercomputer is the only system in the ACCESS environment to integrate the new Intel Max Series GPUs.",
+      "linkText": "Learn more about Stampede3",
+      "linkURI": "https://tacc.utexas.edu/systems/stampede3/",
+      "imageURI": "/images/stampede3.jpg",
+      "imageAltText": "Cattle cross a dirt road behind the logo for Stampede3"
+    },
+    {
+      "title": "PSC Machine Room Tours",
+      "description": "Pittsburgh Supercomputing Center is offering tours of its machine room to interested uses of its Bridges-2 machine.",
+      "linkText": "Sign up for a tour",
+      "linkURI": "https://www.psc.edu/psc-machine-room-tours/",
+      "imageURI": "/images/psc-machine-room.jpg",
+      "imageAltText": "A PSC staff member explains the Bridges-2 supercomputer to a group of three visitors"
+    }
+  ]
+}
diff --git a/public/images/psc-machine-room.jpg b/public/images/psc-machine-room.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..097967f39aab2f7c416ccad6dd21d1def7e24560
GIT binary patch
literal 65601
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
VU{y=V=@J>HWlZKL4$-4i|JlpiDy0Ab

literal 0
HcmV?d00001

diff --git a/public/images/stampede3.jpg b/public/images/stampede3.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..eead21d4eddb02c5e845d1e095de588b17c7fc14
GIT binary patch
literal 51750
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

literal 0
HcmV?d00001

diff --git a/src/base.css b/src/base.css
index 69e2aab..c4c423a 100644
--- a/src/base.css
+++ b/src/base.css
@@ -26,6 +26,17 @@
   padding: 0 var(--padding);
   width: var(--width);
 }
+.visually-hidden {
+  border: 0 !important;
+  clip: rect(0, 0, 0, 0) !important;
+  height: 1px !important;
+  margin: -1px !important;
+  overflow: hidden !important;
+  padding: 0 !important;
+  position: absolute !important;
+  white-space: nowrap !important;
+  width: 1px !important;
+}
 @media (min-width: 600px) {
   :host,
   :root {
diff --git a/src/carousel.css b/src/carousel.css
new file mode 100644
index 0000000..19cb3ea
--- /dev/null
+++ b/src/carousel.css
@@ -0,0 +1,70 @@
+.carousel {
+  margin-bottom: 1rem;
+  width: var(--width);
+}
+.slide-inner {
+  display: flex;
+  flex-direction: column;
+}
+.slide-image img {
+  display: block;
+  width: 100%;
+}
+.slide-text {
+  background-color: var(--teal-100);
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  font-size: 14px;
+  justify-content: center;
+  padding: 20px;
+}
+.slide-text h2 {
+  font-size: 20px;
+  margin: 0 0 0.25rem;
+}
+.glide__arrow {
+  align-items: center;
+  background-color: var(--contrast-3);
+  border: 0 none transparent;
+  border-radius: 15px;
+  display: flex;
+  justify-content: center;
+  height: 30px;
+  padding: 8px;
+  width: 30px;
+}
+.glide__arrow:active,
+.glide__arrow:hover {
+  background-color: var(--teal-700);
+}
+.glide__arrow svg {
+  fill: white;
+}
+.glide__arrow--left {
+  margin-left: -66px;
+}
+.glide__arrow--right {
+  margin-right: -66px;
+}
+@media (min-width: 900px) {
+  .slide-inner {
+    flex-direction: row;
+  }
+  .slide-image img {
+    width: calc(var(--width) * 5 / 8 + 80px);
+  }
+}
+@media (min-width: 1024px) {
+  .slide-text {
+    font-size: 16px;
+  }
+}
+@media (min-width: 1280px) {
+  .slide-text {
+    font-size: 18px;
+  }
+  .slide-text h2 {
+    font-size: 24px;
+  }
+}
diff --git a/src/carousel.jsx b/src/carousel.jsx
new file mode 100644
index 0000000..f472b84
--- /dev/null
+++ b/src/carousel.jsx
@@ -0,0 +1,66 @@
+import { useLayoutEffect, useRef } from "preact/hooks";
+import Glide, { Controls } from "@glidejs/glide/dist/glide.modular.esm";
+
+export function Carousel({ children }) {
+  const glide = useRef(null);
+  useLayoutEffect(() => {
+    if (glide.current) new Glide(glide.current).mount({ Controls });
+  }, []);
+  return (
+    <section class="carousel">
+      <div class="glide" ref={glide}>
+        <div class="glide__track" data-glide-el="track">
+          <ul class="glide__slides">{children}</ul>
+        </div>
+        <div class="glide__arrows" data-glide-el="controls">
+          <button class="glide__arrow glide__arrow--left" data-glide-dir="<">
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              width="18"
+              height="18"
+              viewBox="0 0 24 24"
+            >
+              <path d="M0 12l10.975 11 2.848-2.828-6.176-6.176H24v-3.992H7.646l6.176-6.176L10.975 1 0 12z" />
+            </svg>
+          </button>
+          <button class="glide__arrow glide__arrow--right" data-glide-dir=">">
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              width="18"
+              height="18"
+              viewBox="0 0 24 24"
+            >
+              <path d="M13.025 1l-2.847 2.828 6.176 6.176h-16.354v3.992h16.354l-6.176 6.176 2.847 2.828 10.975-11z" />
+            </svg>
+          </button>
+        </div>
+      </div>
+    </section>
+  );
+}
+
+export function CarouselSlide({
+  title,
+  description,
+  linkText,
+  linkURI,
+  imageURI,
+  imageAltText,
+}) {
+  return (
+    <li class="glide__slide">
+      <span class="slide-inner">
+        {imageURI && (
+          <a href={linkURI} class="slide-image">
+            <img src={imageURI} alt={imageAltText} />
+          </a>
+        )}
+        <span class="slide-text">
+          {title && <h2>{title}</h2>}
+          {description && <p>{description}</p>}
+          {linkText && <a href={linkURI}>{linkText}</a>}
+        </span>
+      </span>
+    </li>
+  );
+}
diff --git a/src/content.css b/src/content.css
new file mode 100644
index 0000000..a9674f1
--- /dev/null
+++ b/src/content.css
@@ -0,0 +1,27 @@
+:root {
+  color: #232323;
+  font-family: "Archivo", sans-serif;
+  font-size: 16px;
+}
+h1 {
+  font-size: 36px;
+  font-stretch: 70%;
+  font-weight: 500;
+  margin-top: 60px;
+}
+h2 {
+  font-size: 24px;
+  font-weight: 700;
+  margin-top: 36px;
+}
+a {
+  color: var(--contrast);
+  font-weight: 800;
+  text-decoration: underline;
+}
+a:active,
+a:focus,
+a:hover {
+  color: var(--teal-600);
+  text-decoration: none;
+}
diff --git a/src/index.jsx b/src/index.jsx
index 385b3c8..66df994 100644
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -2,6 +2,7 @@ import { Footer } from "./footer";
 import { Header } from "./header";
 import { FooterMenus, Menus } from "./menu";
 import { loginMenuItem, myAccessMenuItem, universalMenuItems } from "./items";
+import { ResourceCatalog } from "./resource-catalog";
 import { TableOfContents } from "./table-of-contents";
 import { renderShadow } from "./utils";
 
@@ -67,12 +68,16 @@ const footerMenus = ({ items, target }) =>
 const tableOfContents = ({ headings = [], target }) =>
   renderShadow(<TableOfContents headings={headings} />, target);
 
+const resourceCatalog = ({ target }) =>
+  renderShadow(<ResourceCatalog />, target);
+
 export {
   footer,
   header,
   footerMenus,
   loginMenuItem,
   myAccessMenuItem,
+  resourceCatalog,
   siteMenus,
   tableOfContents,
   universalMenuItems,
diff --git a/src/resource-catalog.jsx b/src/resource-catalog.jsx
new file mode 100644
index 0000000..3e406ef
--- /dev/null
+++ b/src/resource-catalog.jsx
@@ -0,0 +1,24 @@
+import baseStyle from "./base.css?inline";
+import contentStyle from "./content.css?inline";
+import glideCoreStyle from "@glidejs/glide/dist/css/glide.core.min.css?inline";
+import glideThemeStyle from "@glidejs/glide/dist/css/glide.theme.min.css?inline";
+import carouselStyle from "./carousel.css?inline";
+
+import { ResourceHome } from "./resource-home";
+
+export function ResourceCatalog({
+  title = "Resource Catalog",
+  showTitle = false,
+  slidesURI = "/api/resourceCatalogSlides.json",
+}) {
+  return (
+    <>
+      <ResourceHome title={title} showTitle={showTitle} slidesURI={slidesURI} />
+      <style>{baseStyle}</style>
+      <style>{contentStyle}</style>
+      <style>{glideCoreStyle}</style>
+      <style>{glideThemeStyle}</style>
+      <style>{carouselStyle}</style>
+    </>
+  );
+}
diff --git a/src/resource-home.jsx b/src/resource-home.jsx
new file mode 100644
index 0000000..af8b9ca
--- /dev/null
+++ b/src/resource-home.jsx
@@ -0,0 +1,22 @@
+import { useEffect, useState } from "preact/hooks";
+import { Carousel, CarouselSlide } from "./carousel";
+
+export function ResourceHome({ title, showTitle, slidesURI }) {
+  const [slides, setSlides] = useState([]);
+  useEffect(() => {
+    if (slidesURI)
+      (async () => {
+        const res = await fetch(slidesURI);
+        setSlides((await res.json()).slides);
+      })();
+  }, []);
+
+  return (
+    <>
+      {title && <h1 class={showTitle ? "" : "visually-hidden"}>{title}</h1>}
+      {slides.length ? (
+        <Carousel>{slides.map((slide) => CarouselSlide(slide))}</Carousel>
+      ) : null}
+    </>
+  );
+}

From f47a3ba58054569aab248a80a7f36defd3c73c95 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Tue, 11 Jun 2024 13:56:28 -0400
Subject: [PATCH 002/113] feat(resource-catalog): add resource groups and tags

---
 index.html                                    | 49 +-----------
 package-lock.json                             | 11 ++-
 package.json                                  |  3 +-
 public/api/resourceGroups.json                | 55 +++++++++++++
 ...CatalogSlides.json => resourceSlides.json} |  0
 src/base.css                                  |  1 +
 src/icons.jsx                                 | 80 +++++++++++++++++++
 src/index.jsx                                 |  5 +-
 src/resource-catalog.jsx                      | 19 ++++-
 src/resource-group.jsx                        | 44 ++++++++++
 src/resource-groups.css                       | 30 +++++++
 src/resource-groups.jsx                       | 43 ++++++++++
 src/resource-home.jsx                         | 17 ++--
 src/tag.jsx                                   | 21 +++++
 src/tags.css                                  | 38 +++++++++
 src/tags.jsx                                  |  3 +
 src/utils.js                                  | 15 ++++
 17 files changed, 373 insertions(+), 61 deletions(-)
 create mode 100644 public/api/resourceGroups.json
 rename public/api/{resourceCatalogSlides.json => resourceSlides.json} (100%)
 create mode 100644 src/icons.jsx
 create mode 100644 src/resource-group.jsx
 create mode 100644 src/resource-groups.css
 create mode 100644 src/resource-groups.jsx
 create mode 100644 src/tag.jsx
 create mode 100644 src/tags.css
 create mode 100644 src/tags.jsx

diff --git a/index.html b/index.html
index ab28628..38346f5 100644
--- a/index.html
+++ b/index.html
@@ -20,21 +20,6 @@
         margin: 0;
         padding: 0;
       }
-      h1 {
-        font-size: 36px;
-        font-stretch: 70%;
-        font-weight: 500;
-        margin-top: 60px;
-      }
-      h2 {
-        font-size: 24px;
-        font-weight: 700;
-        margin: 36px 0 150px;
-      }
-      #table-of-contents {
-        margin-bottom: 50px;
-        margin-top: 60px;
-      }
       @media (min-width: 768px) {
         #main {
           display: flex;
@@ -73,38 +58,12 @@
 
       const siteItems = [
         {
-          name: "One",
-          items: [
-            {
-              name: "Item A",
-              href: "/one/a",
-            },
-            {
-              name: "Item B",
-              href: "/one/b",
-            },
-            {
-              name: "Item C",
-              href: "/one/c",
-            },
-          ],
-        },
-        {
-          name: "Two",
-          items: [
-            {
-              name: "Item A",
-              href: "/two/a",
-            },
-            {
-              name: "Item B",
-              href: "/two/b",
-            },
-          ],
+          name: "Resources",
+          href: "/",
         },
         {
-          name: "Three",
-          href: "/three",
+          name: "Resource Providers",
+          href: "/resource-providers",
         },
       ];
 
diff --git a/package-lock.json b/package-lock.json
index 8d65208..54c3d28 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,8 @@
       "license": "Apache-2.0",
       "dependencies": {
         "@glidejs/glide": "^3.6.1",
-        "preact": "^10.13.1"
+        "preact": "^10.13.1",
+        "preact-router": "^4.1.2"
       },
       "devDependencies": {
         "@preact/preset-vite": "^2.5.0",
@@ -3497,6 +3498,14 @@
         "url": "https://opencollective.com/preact"
       }
     },
+    "node_modules/preact-router": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/preact-router/-/preact-router-4.1.2.tgz",
+      "integrity": "sha512-uICUaUFYh+XQ+6vZtQn1q+X6rSqwq+zorWOCLWPF5FAsQh3EJ+RsDQ9Ee+fjk545YWQHfUxhrBAaemfxEnMOUg==",
+      "peerDependencies": {
+        "preact": ">=10"
+      }
+    },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
diff --git a/package.json b/package.json
index 892bbbb..82ef5bb 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,8 @@
   },
   "dependencies": {
     "@glidejs/glide": "^3.6.1",
-    "preact": "^10.13.1"
+    "preact": "^10.13.1",
+    "preact-router": "^4.1.2"
   },
   "devDependencies": {
     "@preact/preset-vite": "^2.5.0",
diff --git a/public/api/resourceGroups.json b/public/api/resourceGroups.json
new file mode 100644
index 0000000..ba94fc6
--- /dev/null
+++ b/public/api/resourceGroups.json
@@ -0,0 +1,55 @@
+{
+  "categories": [
+    {
+      "categoryId": 1,
+      "name": "General Purpose Compute & Storage",
+      "order": 1
+    },
+    { "categoryId": 2, "name": "Specialized Compute & Storage", "order": 2 },
+    { "categoryId": 3, "name": "Coordination & Support", "order": 3 }
+  ],
+  "resourceGroups": [
+    {
+      "resourceGroupId": 1,
+      "name": "Bridges-2",
+      "summary": "Bridges-2 is an integrated compute and storage platform that combines traditional high-performance computing with artificial intelligence and big data capabilities.",
+      "imageType": "photo",
+      "imageUri": "https://i0.wp.com/www.psc.edu/wp-content/uploads/2024/02/bridges-2-50.png?w=694&ssl=1",
+      "categoryId": 1,
+      "resourceProviderId": 1,
+      "tagIds": [1, 2, 3, 4]
+    },
+    {
+      "resourceGroupId": 2,
+      "name": "Jetstream2",
+      "summary": "Jetstream2 is a hybrid-cloud platform that provides flexible, on-demand, programmable cyberinfrastructure, including interactive virtual machine services.",
+      "imageType": "logo",
+      "imageUri": "https://jetstream-cloud.org/images/home/jetstream-2.png",
+      "categoryId": 1,
+      "resourceProviderId": 2,
+      "tagIds": [1, 2, 3, 4, 5]
+    }
+  ],
+  "resourceProviders": [
+    {
+      "resourceProviderId": 1,
+      "name": "Pittsburgh Supercomputing Center",
+      "iconUri": "https://i0.wp.com/www.psc.edu/wp-content/uploads/2020/09/cropped-PSClogo_Gradient-e1600870263745.jpg?fit=32%2C32&ssl=1"
+    },
+    {
+      "resourceProviderId": 2,
+      "name": "Indiana University",
+      "iconUri": "https://www.iu.edu/favicon.ico"
+    }
+  ],
+  "tags": [
+    { "tagId": 1, "name": "CPU", "tagCategoryId": 1, "order": 1 },
+    { "tagId": 2, "name": "GPU", "tagCategoryId": 1, "order": 2 },
+    { "tagId": 3, "name": "Storage", "tagCategoryId": 1, "order": 3 },
+    { "tagId": 4, "name": "Large Memory", "tagCategoryId": 1, "order": 4 },
+    { "tagId": 5, "name": "Virtual Machines", "tagCategoryId": 1, "order": 5 }
+  ],
+  "tagCategories": [
+    { "tagCategoryId": 1, "name": "Compute Features", "order": 1 }
+  ]
+}
diff --git a/public/api/resourceCatalogSlides.json b/public/api/resourceSlides.json
similarity index 100%
rename from public/api/resourceCatalogSlides.json
rename to public/api/resourceSlides.json
diff --git a/src/base.css b/src/base.css
index c4c423a..df52d9b 100644
--- a/src/base.css
+++ b/src/base.css
@@ -5,6 +5,7 @@
   --contrast-3: #707070;
   --orange-400: #f07537;
   --teal-100: #cee8e9;
+  --teal-200: #b0dadb;
   --teal-400: #48c0b9;
   --teal-600: #107180;
   --teal-700: #1a5b6e;
diff --git a/src/icons.jsx b/src/icons.jsx
new file mode 100644
index 0000000..59ab85d
--- /dev/null
+++ b/src/icons.jsx
@@ -0,0 +1,80 @@
+export const defaultIcons = {
+  CPU: (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width="16"
+      height="16"
+      fill="currentColor"
+      class="bi bi-cpu-fill"
+      viewBox="0 0 16 16"
+    >
+      <path d="M6.5 6a.5.5 0 0 0-.5.5v3a.5.5 0 0 0 .5.5h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 0 0-.5-.5z" />
+      <path d="M5.5.5a.5.5 0 0 0-1 0V2A2.5 2.5 0 0 0 2 4.5H.5a.5.5 0 0 0 0 1H2v1H.5a.5.5 0 0 0 0 1H2v1H.5a.5.5 0 0 0 0 1H2v1H.5a.5.5 0 0 0 0 1H2A2.5 2.5 0 0 0 4.5 14v1.5a.5.5 0 0 0 1 0V14h1v1.5a.5.5 0 0 0 1 0V14h1v1.5a.5.5 0 0 0 1 0V14h1v1.5a.5.5 0 0 0 1 0V14a2.5 2.5 0 0 0 2.5-2.5h1.5a.5.5 0 0 0 0-1H14v-1h1.5a.5.5 0 0 0 0-1H14v-1h1.5a.5.5 0 0 0 0-1H14v-1h1.5a.5.5 0 0 0 0-1H14A2.5 2.5 0 0 0 11.5 2V.5a.5.5 0 0 0-1 0V2h-1V.5a.5.5 0 0 0-1 0V2h-1V.5a.5.5 0 0 0-1 0V2h-1zm1 4.5h3A1.5 1.5 0 0 1 11 6.5v3A1.5 1.5 0 0 1 9.5 11h-3A1.5 1.5 0 0 1 5 9.5v-3A1.5 1.5 0 0 1 6.5 5" />
+    </svg>
+  ),
+  GPU: (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width="16"
+      height="16"
+      fill="currentColor"
+      class="bi bi-gpu-card"
+      viewBox="0 0 16 16"
+    >
+      <path d="M4 8a1.5 1.5 0 1 1 3 0 1.5 1.5 0 0 1-3 0m7.5-1.5a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3" />
+      <path d="M0 1.5A.5.5 0 0 1 .5 1h1a.5.5 0 0 1 .5.5V4h13.5a.5.5 0 0 1 .5.5v7a.5.5 0 0 1-.5.5H2v2.5a.5.5 0 0 1-1 0V2H.5a.5.5 0 0 1-.5-.5m5.5 4a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5M9 8a2.5 2.5 0 1 0 5 0 2.5 2.5 0 0 0-5 0" />
+      <path d="M3 12.5h3.5v1a.5.5 0 0 1-.5.5H3.5a.5.5 0 0 1-.5-.5zm4 1v-1h4v1a.5.5 0 0 1-.5.5h-3a.5.5 0 0 1-.5-.5" />
+    </svg>
+  ),
+  Storage: (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width="16"
+      height="16"
+      fill="currentColor"
+      class="bi bi-hdd-fill"
+      viewBox="0 0 16 16"
+    >
+      <path d="M0 10a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v1a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2zm2.5 1a.5.5 0 1 0 0-1 .5.5 0 0 0 0 1m2 0a.5.5 0 1 0 0-1 .5.5 0 0 0 0 1M.91 7.204A3 3 0 0 1 2 7h12c.384 0 .752.072 1.09.204l-1.867-3.422A1.5 1.5 0 0 0 11.906 3H4.094a1.5 1.5 0 0 0-1.317.782z" />
+    </svg>
+  ),
+  "Large Memory": (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width="16"
+      height="16"
+      fill="currentColor"
+      class="bi bi-arrows-fullscreen"
+      viewBox="0 0 16 16"
+    >
+      <path
+        fill-rule="evenodd"
+        d="M5.828 10.172a.5.5 0 0 0-.707 0l-4.096 4.096V11.5a.5.5 0 0 0-1 0v3.975a.5.5 0 0 0 .5.5H4.5a.5.5 0 0 0 0-1H1.732l4.096-4.096a.5.5 0 0 0 0-.707m4.344 0a.5.5 0 0 1 .707 0l4.096 4.096V11.5a.5.5 0 1 1 1 0v3.975a.5.5 0 0 1-.5.5H11.5a.5.5 0 0 1 0-1h2.768l-4.096-4.096a.5.5 0 0 1 0-.707m0-4.344a.5.5 0 0 0 .707 0l4.096-4.096V4.5a.5.5 0 1 0 1 0V.525a.5.5 0 0 0-.5-.5H11.5a.5.5 0 0 0 0 1h2.768l-4.096 4.096a.5.5 0 0 0 0 .707m-4.344 0a.5.5 0 0 1-.707 0L1.025 1.732V4.5a.5.5 0 0 1-1 0V.525a.5.5 0 0 1 .5-.5H4.5a.5.5 0 0 1 0 1H1.732l4.096 4.096a.5.5 0 0 1 0 .707"
+      />
+    </svg>
+  ),
+  "Virtual Machines": (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width="16"
+      height="16"
+      fill="currentColor"
+      class="bi bi-pc-display-horizontal"
+      viewBox="0 0 16 16"
+    >
+      <path d="M1.5 0A1.5 1.5 0 0 0 0 1.5v7A1.5 1.5 0 0 0 1.5 10H6v1H1a1 1 0 0 0-1 1v3a1 1 0 0 0 1 1h14a1 1 0 0 0 1-1v-3a1 1 0 0 0-1-1h-5v-1h4.5A1.5 1.5 0 0 0 16 8.5v-7A1.5 1.5 0 0 0 14.5 0zm0 1h13a.5.5 0 0 1 .5.5v7a.5.5 0 0 1-.5.5h-13a.5.5 0 0 1-.5-.5v-7a.5.5 0 0 1 .5-.5M12 12.5a.5.5 0 1 1 1 0 .5.5 0 0 1-1 0m2 0a.5.5 0 1 1 1 0 .5.5 0 0 1-1 0M1.5 12h5a.5.5 0 0 1 0 1h-5a.5.5 0 0 1 0-1M1 14.25a.25.25 0 0 1 .25-.25h5.5a.25.25 0 1 1 0 .5h-5.5a.25.25 0 0 1-.25-.25" />
+    </svg>
+  ),
+  Tag: (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width="16"
+      height="16"
+      fill="currentColor"
+      class="bi bi-tag-fill"
+      viewBox="0 0 16 16"
+    >
+      <path d="M2 1a1 1 0 0 0-1 1v4.586a1 1 0 0 0 .293.707l7 7a1 1 0 0 0 1.414 0l4.586-4.586a1 1 0 0 0 0-1.414l-7-7A1 1 0 0 0 6.586 1zm4 3.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0" />
+    </svg>
+  ),
+};
diff --git a/src/index.jsx b/src/index.jsx
index 66df994..3c4cc9c 100644
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -1,3 +1,5 @@
+import { render } from "preact";
+
 import { Footer } from "./footer";
 import { Header } from "./header";
 import { FooterMenus, Menus } from "./menu";
@@ -68,8 +70,7 @@ const footerMenus = ({ items, target }) =>
 const tableOfContents = ({ headings = [], target }) =>
   renderShadow(<TableOfContents headings={headings} />, target);
 
-const resourceCatalog = ({ target }) =>
-  renderShadow(<ResourceCatalog />, target);
+const resourceCatalog = ({ target }) => render(<ResourceCatalog />, target);
 
 export {
   footer,
diff --git a/src/resource-catalog.jsx b/src/resource-catalog.jsx
index 3e406ef..76270be 100644
--- a/src/resource-catalog.jsx
+++ b/src/resource-catalog.jsx
@@ -1,24 +1,39 @@
+import Router from "preact-router";
+
 import baseStyle from "./base.css?inline";
 import contentStyle from "./content.css?inline";
 import glideCoreStyle from "@glidejs/glide/dist/css/glide.core.min.css?inline";
 import glideThemeStyle from "@glidejs/glide/dist/css/glide.theme.min.css?inline";
 import carouselStyle from "./carousel.css?inline";
+import resourceGroupsStyle from "./resource-groups.css?inline";
+import tagsStyle from "./tags.css?inline";
 
 import { ResourceHome } from "./resource-home";
 
 export function ResourceCatalog({
   title = "Resource Catalog",
   showTitle = false,
-  slidesURI = "/api/resourceCatalogSlides.json",
+  groupsURI = "/api/resourceGroups.json",
+  slidesURI = "/api/resourceSlides.json",
 }) {
   return (
     <>
-      <ResourceHome title={title} showTitle={showTitle} slidesURI={slidesURI} />
+      <Router>
+        <ResourceHome
+          path="/"
+          title={title}
+          showTitle={showTitle}
+          slidesURI={slidesURI}
+          groupsURI={groupsURI}
+        />
+      </Router>
       <style>{baseStyle}</style>
       <style>{contentStyle}</style>
       <style>{glideCoreStyle}</style>
       <style>{glideThemeStyle}</style>
       <style>{carouselStyle}</style>
+      <style>{resourceGroupsStyle}</style>
+      <style>{tagsStyle}</style>
     </>
   );
 }
diff --git a/src/resource-group.jsx b/src/resource-group.jsx
new file mode 100644
index 0000000..3f41467
--- /dev/null
+++ b/src/resource-group.jsx
@@ -0,0 +1,44 @@
+import { Tag } from "./tag";
+import { Tags } from "./tags";
+
+export function ResourceGroup({
+  imageType,
+  imageUri,
+  name,
+  summary,
+  resourceGroupId,
+  resourceProvider,
+  tags,
+}) {
+  const detailUri = `/resources/${resourceGroupId}`;
+  return (
+    <div class="resource-group">
+      <a
+        class={`resource-group-image image-type-${imageType}`}
+        href={detailUri}
+      >
+        {imageUri ? <img src={imageUri} /> : null}
+      </a>
+      <div class="resource-group-text">
+        <h3>
+          <a href={detailUri}>{name}</a>
+        </h3>
+        <Tags>
+          <Tag
+            collection="resource-providers"
+            tagId={resourceProvider.resourceProviderId}
+            name={resourceProvider.name}
+            icon={resourceProvider.iconUri}
+          />
+          {tags.map((tag) => (
+            <Tag tagId={tag.tagId} name={tag.name} />
+          ))}
+        </Tags>
+        <p>
+          {summary && summary}{" "}
+          <a href={detailUri}>Learn more about {name} &raquo;</a>
+        </p>
+      </div>
+    </div>
+  );
+}
diff --git a/src/resource-groups.css b/src/resource-groups.css
new file mode 100644
index 0000000..cff013f
--- /dev/null
+++ b/src/resource-groups.css
@@ -0,0 +1,30 @@
+.resource-group {
+  align-items: flex-start;
+  display: flex;
+  flex-direction: row;
+  margin-bottom: 20px;
+}
+.resource-group-image {
+  border: 1px solid var(--contrast);
+  flex: 0 0 auto;
+  margin-right: 20px;
+  position: relative;
+  width: calc((var(--width) - 140px) / 4 + 20px);
+}
+.resource-group-image > * {
+  display: block;
+  width: 100%;
+}
+.image-type-logo {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  min-height: 120px;
+}
+.image-type-logo > * {
+  margin: 10px;
+  width: calc(100% - 20px);
+}
+.resource-group-text *:first-child {
+  margin-top: 0;
+}
diff --git a/src/resource-groups.jsx b/src/resource-groups.jsx
new file mode 100644
index 0000000..d992009
--- /dev/null
+++ b/src/resource-groups.jsx
@@ -0,0 +1,43 @@
+import { sortOn } from "./utils";
+
+import { ResourceGroup } from "./resource-group";
+
+export function ResourceGroups({
+  categories,
+  resourceGroups,
+  resourceProviders,
+  tags,
+  tagCategories,
+}) {
+  const rpMap = {};
+  for (let rp of resourceProviders) rpMap[rp.resourceProviderId] = rp;
+  const tagMap = {};
+  for (let tag of tags) tagMap[tag.tagId] = tag;
+  const categoryGroups = {};
+  for (let group of resourceGroups) {
+    if (!(group.categoryId in categoryGroups))
+      categoryGroups[group.categoryId] = [];
+    categoryGroups[group.categoryId].push(group);
+  }
+
+  return categories.sort(sortOn("order")).map((category) => {
+    return (
+      <>
+        <h2>{category.name}</h2>
+        {(categoryGroups[category.categoryId] || []).map((group) => (
+          <ResourceGroup
+            imageType={group.imageType}
+            imageUri={group.imageUri}
+            name={group.name}
+            summary={group.summary}
+            resourceGroupId={group.resourceGroupId}
+            resourceProvider={rpMap[group.resourceProviderId]}
+            tags={group.tagIds
+              .map((tagId) => tagMap[tagId])
+              .sort(sortOn("order"))}
+          />
+        ))}
+      </>
+    );
+  });
+}
diff --git a/src/resource-home.jsx b/src/resource-home.jsx
index af8b9ca..378807e 100644
--- a/src/resource-home.jsx
+++ b/src/resource-home.jsx
@@ -1,15 +1,11 @@
-import { useEffect, useState } from "preact/hooks";
 import { Carousel, CarouselSlide } from "./carousel";
+import { useJSON } from "./utils";
 
-export function ResourceHome({ title, showTitle, slidesURI }) {
-  const [slides, setSlides] = useState([]);
-  useEffect(() => {
-    if (slidesURI)
-      (async () => {
-        const res = await fetch(slidesURI);
-        setSlides((await res.json()).slides);
-      })();
-  }, []);
+import { ResourceGroups } from "./resource-groups";
+
+export function ResourceHome({ title, showTitle, slidesURI, groupsURI }) {
+  const slides = useJSON(slidesURI, [], "slides");
+  const groups = useJSON(groupsURI, null);
 
   return (
     <>
@@ -17,6 +13,7 @@ export function ResourceHome({ title, showTitle, slidesURI }) {
       {slides.length ? (
         <Carousel>{slides.map((slide) => CarouselSlide(slide))}</Carousel>
       ) : null}
+      {groups ? <ResourceGroups {...groups} /> : null}
     </>
   );
 }
diff --git a/src/tag.jsx b/src/tag.jsx
new file mode 100644
index 0000000..ba01ff6
--- /dev/null
+++ b/src/tag.jsx
@@ -0,0 +1,21 @@
+import { defaultIcons } from "./icons";
+
+export function Tag({
+  active = false,
+  collection = "tags",
+  icon = "default",
+  name,
+}) {
+  return (
+    <li class={`tag collection-${collection}${active ? " active" : ""}`}>
+      <a href="#">
+        {icon.startsWith("http") ? (
+          <img src={icon} />
+        ) : (
+          defaultIcons[name] || defaultIcons.Tag
+        )}
+        {name}
+      </a>
+    </li>
+  );
+}
diff --git a/src/tags.css b/src/tags.css
new file mode 100644
index 0000000..4a7d34c
--- /dev/null
+++ b/src/tags.css
@@ -0,0 +1,38 @@
+ul.tags {
+  margin: 0;
+  padding: 0;
+}
+li.tag {
+  display: inline-block;
+  list-style-type: none;
+  margin: 0 5px 5px 0;
+}
+.tag a {
+  background-color: var(--teal-100);
+  border: 1px solid var(--teal-400);
+  border-radius: 8px;
+  display: inline-block;
+  font-weight: 500;
+  line-height: 18px;
+  padding: 3px 7px;
+  text-decoration: none;
+}
+.tag.active a,
+.tag a:active,
+.tag a:focus,
+.tag a:hover {
+  background-color: var(--teal-200);
+  color: var(--contrast);
+}
+.tag img,
+.tag svg {
+  background-position: center;
+  background-size: contain;
+  display: inline-block;
+  height: 16px;
+  margin-right: 5px;
+  vertical-align: text-bottom;
+  width: 16px;
+}
+.tag .collection-resource-providers a {
+}
diff --git a/src/tags.jsx b/src/tags.jsx
new file mode 100644
index 0000000..13999d8
--- /dev/null
+++ b/src/tags.jsx
@@ -0,0 +1,3 @@
+export function Tags({ children }) {
+  return <ul class="tags">{children}</ul>;
+}
diff --git a/src/utils.js b/src/utils.js
index 3e1300d..1c966a9 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -22,3 +22,18 @@ export const getScrollTop = () =>
     ? window.pageYOffset
     : (document.documentElement || document.body.parentNode || document.body)
         .scrollTop;
+
+export const useJSON = (uri, defaultValue, prop) => {
+  const [value, setValue] = useState(defaultValue);
+  useEffect(() => {
+    if (uri)
+      (async () => {
+        const res = await fetch(uri);
+        const data = await res.json();
+        setValue(prop ? data[prop] : data);
+      })();
+  }, []);
+  return value;
+};
+
+export const sortOn = (prop) => (a, b) => a[prop] < b[prop] ? -1 : 1;

From 3a9965e4cd035364df58b164b71a04823f069f40 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Fri, 14 Jun 2024 16:07:09 -0400
Subject: [PATCH 003/113] feat(resource-catalog): add tags and filtering

---
 public/api/resourceGroups.json                |  53 +++++----
 src/base.css                                  |   1 +
 src/resource-catalog.jsx                      |   4 +-
 src/resource-category.jsx                     |  20 ++++
 ...resource-groups.css => resource-group.css} |   0
 src/resource-group.jsx                        |  11 +-
 src/resource-groups.jsx                       |  43 -------
 src/resource-home.jsx                         | 112 +++++++++++++++++-
 src/tag.jsx                                   |  25 ++--
 src/tags.css                                  |  10 +-
 src/utils.js                                  |   7 ++
 11 files changed, 190 insertions(+), 96 deletions(-)
 create mode 100644 src/resource-category.jsx
 rename src/{resource-groups.css => resource-group.css} (100%)
 delete mode 100644 src/resource-groups.jsx

diff --git a/public/api/resourceGroups.json b/public/api/resourceGroups.json
index ba94fc6..124d811 100644
--- a/public/api/resourceGroups.json
+++ b/public/api/resourceGroups.json
@@ -1,12 +1,16 @@
 {
-  "categories": [
+  "resourceCategories": [
     {
-      "categoryId": 1,
+      "resourceCategoryId": 1,
       "name": "General Purpose Compute & Storage",
       "order": 1
     },
-    { "categoryId": 2, "name": "Specialized Compute & Storage", "order": 2 },
-    { "categoryId": 3, "name": "Coordination & Support", "order": 3 }
+    {
+      "resourceCategoryId": 2,
+      "name": "Specialized Compute & Storage",
+      "order": 2
+    },
+    { "resourceCategoryId": 3, "name": "Coordination & Support", "order": 3 }
   ],
   "resourceGroups": [
     {
@@ -15,9 +19,8 @@
       "summary": "Bridges-2 is an integrated compute and storage platform that combines traditional high-performance computing with artificial intelligence and big data capabilities.",
       "imageType": "photo",
       "imageUri": "https://i0.wp.com/www.psc.edu/wp-content/uploads/2024/02/bridges-2-50.png?w=694&ssl=1",
-      "categoryId": 1,
-      "resourceProviderId": 1,
-      "tagIds": [1, 2, 3, 4]
+      "resourceCategoryId": 1,
+      "tagIds": [1, 3, 4, 5, 6]
     },
     {
       "resourceGroupId": 2,
@@ -25,31 +28,33 @@
       "summary": "Jetstream2 is a hybrid-cloud platform that provides flexible, on-demand, programmable cyberinfrastructure, including interactive virtual machine services.",
       "imageType": "logo",
       "imageUri": "https://jetstream-cloud.org/images/home/jetstream-2.png",
-      "categoryId": 1,
-      "resourceProviderId": 2,
-      "tagIds": [1, 2, 3, 4, 5]
+      "resourceCategoryId": 1,
+      "tagIds": [2, 3, 4, 5, 6, 7]
     }
   ],
-  "resourceProviders": [
+  "tags": [
     {
-      "resourceProviderId": 1,
+      "tagId": 1,
       "name": "Pittsburgh Supercomputing Center",
-      "iconUri": "https://i0.wp.com/www.psc.edu/wp-content/uploads/2020/09/cropped-PSClogo_Gradient-e1600870263745.jpg?fit=32%2C32&ssl=1"
+      "iconUri": "https://i0.wp.com/www.psc.edu/wp-content/uploads/2020/09/cropped-PSClogo_Gradient-e1600870263745.jpg?fit=32%2C32&ssl=1",
+      "tagCategoryId": 1,
+      "order": 1
     },
     {
-      "resourceProviderId": 2,
+      "tagId": 2,
       "name": "Indiana University",
-      "iconUri": "https://www.iu.edu/favicon.ico"
-    }
-  ],
-  "tags": [
-    { "tagId": 1, "name": "CPU", "tagCategoryId": 1, "order": 1 },
-    { "tagId": 2, "name": "GPU", "tagCategoryId": 1, "order": 2 },
-    { "tagId": 3, "name": "Storage", "tagCategoryId": 1, "order": 3 },
-    { "tagId": 4, "name": "Large Memory", "tagCategoryId": 1, "order": 4 },
-    { "tagId": 5, "name": "Virtual Machines", "tagCategoryId": 1, "order": 5 }
+      "iconUri": "https://www.iu.edu/favicon.ico",
+      "tagCategoryId": 1,
+      "order": 2
+    },
+    { "tagId": 3, "name": "CPU", "tagCategoryId": 2, "order": 1 },
+    { "tagId": 4, "name": "GPU", "tagCategoryId": 2, "order": 2 },
+    { "tagId": 5, "name": "Storage", "tagCategoryId": 2, "order": 3 },
+    { "tagId": 6, "name": "Large Memory", "tagCategoryId": 2, "order": 4 },
+    { "tagId": 7, "name": "Virtual Machines", "tagCategoryId": 2, "order": 5 }
   ],
   "tagCategories": [
-    { "tagCategoryId": 1, "name": "Compute Features", "order": 1 }
+    { "tagCategoryId": 1, "name": "Resource Provider", "order": 1 },
+    { "tagCategoryId": 2, "name": "Compute & Storage Feature", "order": 2 }
   ]
 }
diff --git a/src/base.css b/src/base.css
index df52d9b..f65199f 100644
--- a/src/base.css
+++ b/src/base.css
@@ -3,6 +3,7 @@
   --contrast: #232323;
   --contrast-2: #3f3f3f;
   --contrast-3: #707070;
+  --orange-200: #f6d8ca;
   --orange-400: #f07537;
   --teal-100: #cee8e9;
   --teal-200: #b0dadb;
diff --git a/src/resource-catalog.jsx b/src/resource-catalog.jsx
index 76270be..f514b0d 100644
--- a/src/resource-catalog.jsx
+++ b/src/resource-catalog.jsx
@@ -5,7 +5,7 @@ import contentStyle from "./content.css?inline";
 import glideCoreStyle from "@glidejs/glide/dist/css/glide.core.min.css?inline";
 import glideThemeStyle from "@glidejs/glide/dist/css/glide.theme.min.css?inline";
 import carouselStyle from "./carousel.css?inline";
-import resourceGroupsStyle from "./resource-groups.css?inline";
+import resourceGroupStyle from "./resource-group.css?inline";
 import tagsStyle from "./tags.css?inline";
 
 import { ResourceHome } from "./resource-home";
@@ -32,7 +32,7 @@ export function ResourceCatalog({
       <style>{glideCoreStyle}</style>
       <style>{glideThemeStyle}</style>
       <style>{carouselStyle}</style>
-      <style>{resourceGroupsStyle}</style>
+      <style>{resourceGroupStyle}</style>
       <style>{tagsStyle}</style>
     </>
   );
diff --git a/src/resource-category.jsx b/src/resource-category.jsx
new file mode 100644
index 0000000..844c003
--- /dev/null
+++ b/src/resource-category.jsx
@@ -0,0 +1,20 @@
+import { ResourceGroup } from "./resource-group";
+
+export function ResourceCategory({ active, name, resourceGroups, toggleTag }) {
+  return (
+    <>
+      <h2>{name}</h2>
+      {resourceGroups
+        .filter(({ resourceGroupId }) =>
+          active.resourceGroupIds.has(resourceGroupId)
+        )
+        .map((resourceGroup) => (
+          <ResourceGroup
+            {...resourceGroup}
+            active={active}
+            toggleTag={toggleTag}
+          />
+        ))}
+    </>
+  );
+}
diff --git a/src/resource-groups.css b/src/resource-group.css
similarity index 100%
rename from src/resource-groups.css
rename to src/resource-group.css
diff --git a/src/resource-group.jsx b/src/resource-group.jsx
index 3f41467..1d5b173 100644
--- a/src/resource-group.jsx
+++ b/src/resource-group.jsx
@@ -2,13 +2,14 @@ import { Tag } from "./tag";
 import { Tags } from "./tags";
 
 export function ResourceGroup({
+  active,
   imageType,
   imageUri,
   name,
   summary,
   resourceGroupId,
-  resourceProvider,
   tags,
+  toggleTag,
 }) {
   const detailUri = `/resources/${resourceGroupId}`;
   return (
@@ -24,14 +25,8 @@ export function ResourceGroup({
           <a href={detailUri}>{name}</a>
         </h3>
         <Tags>
-          <Tag
-            collection="resource-providers"
-            tagId={resourceProvider.resourceProviderId}
-            name={resourceProvider.name}
-            icon={resourceProvider.iconUri}
-          />
           {tags.map((tag) => (
-            <Tag tagId={tag.tagId} name={tag.name} />
+            <Tag {...tag} active={active} toggleTag={toggleTag} />
           ))}
         </Tags>
         <p>
diff --git a/src/resource-groups.jsx b/src/resource-groups.jsx
deleted file mode 100644
index d992009..0000000
--- a/src/resource-groups.jsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import { sortOn } from "./utils";
-
-import { ResourceGroup } from "./resource-group";
-
-export function ResourceGroups({
-  categories,
-  resourceGroups,
-  resourceProviders,
-  tags,
-  tagCategories,
-}) {
-  const rpMap = {};
-  for (let rp of resourceProviders) rpMap[rp.resourceProviderId] = rp;
-  const tagMap = {};
-  for (let tag of tags) tagMap[tag.tagId] = tag;
-  const categoryGroups = {};
-  for (let group of resourceGroups) {
-    if (!(group.categoryId in categoryGroups))
-      categoryGroups[group.categoryId] = [];
-    categoryGroups[group.categoryId].push(group);
-  }
-
-  return categories.sort(sortOn("order")).map((category) => {
-    return (
-      <>
-        <h2>{category.name}</h2>
-        {(categoryGroups[category.categoryId] || []).map((group) => (
-          <ResourceGroup
-            imageType={group.imageType}
-            imageUri={group.imageUri}
-            name={group.name}
-            summary={group.summary}
-            resourceGroupId={group.resourceGroupId}
-            resourceProvider={rpMap[group.resourceProviderId]}
-            tags={group.tagIds
-              .map((tagId) => tagMap[tagId])
-              .sort(sortOn("order"))}
-          />
-        ))}
-      </>
-    );
-  });
-}
diff --git a/src/resource-home.jsx b/src/resource-home.jsx
index 378807e..eca212c 100644
--- a/src/resource-home.jsx
+++ b/src/resource-home.jsx
@@ -1,11 +1,102 @@
-import { Carousel, CarouselSlide } from "./carousel";
+import { useMemo, useState } from "preact/hooks";
 import { useJSON } from "./utils";
 
-import { ResourceGroups } from "./resource-groups";
+import { Carousel, CarouselSlide } from "./carousel";
+import { ResourceCategory } from "./resource-category";
+
+const linkGroupData = ({
+  resourceCategories,
+  resourceGroups,
+  tags,
+  tagCategories,
+}) => {
+  const tagCategoryMap = {};
+  for (let tagCategory of tagCategories) {
+    tagCategory.tags = [];
+    tagCategoryMap[tagCategory.tagCategoryId] = tagCategory;
+  }
+
+  const tagMap = {};
+  for (let tag of tags) {
+    tag.tagCategory = tagCategoryMap[tag.tagCategoryId];
+    tag.tagCategory.tags.push(tag);
+    tag.resources = [];
+    tagMap[tag.tagId] = tag;
+  }
+
+  const resourceCategoryMap = {};
+  for (let resourceCategory of resourceCategories) {
+    resourceCategory.resourceGroups = [];
+    resourceCategoryMap[resourceCategory.resourceCategoryId] = resourceCategory;
+  }
+
+  for (let resourceGroup of resourceGroups) {
+    resourceGroup.resourceCategory =
+      resourceCategoryMap[resourceGroup.resourceCategoryId];
+    resourceGroup.resourceCategory.resourceGroups.push(resourceGroup);
+    resourceGroup.tags = resourceGroup.tagIds.map((tagId) => tagMap[tagId]);
+  }
+
+  return { resourceCategories, resourceGroups, tags, tagCategories };
+};
+
+const getActive = ({ resourceGroups, tags, tagCategories }, activeTagIds) => {
+  const resourceCategoryIds = new Set();
+  const resourceGroupIds = new Set();
+  const tagCategoryIds = new Set();
+  const tagIds = new Set(activeTagIds);
+
+  for (let tag of tags)
+    if (tagIds.has(tag.tagId)) tagCategoryIds.add(tag.tagCategoryId);
+
+  const activeTagCategories = tagCategories.filter(({ tagCategoryId }) =>
+    tagCategoryIds.has(tagCategoryId)
+  );
+
+  for (let resourceGroup of resourceGroups) {
+    let resourceGroupActive = true;
+    for (let tagCategory of activeTagCategories) {
+      let hasCategory = false;
+      for (let tag of tagCategory.tags) {
+        if (!tagIds.has(tag.tagId)) continue;
+        if (resourceGroup.tags.includes(tag)) {
+          hasCategory = true;
+          break;
+        }
+      }
+      if (!hasCategory) {
+        resourceGroupActive = false;
+        break;
+      }
+    }
+    if (resourceGroupActive) {
+      resourceGroupIds.add(resourceGroup.resourceGroupId);
+      resourceCategoryIds.add(resourceGroup.resourceCategoryId);
+    }
+  }
+
+  return { resourceCategoryIds, resourceGroupIds, tagCategoryIds, tagIds };
+};
 
 export function ResourceHome({ title, showTitle, slidesURI, groupsURI }) {
+  const [activeTagIds, setActiveTagIds] = useState([]);
   const slides = useJSON(slidesURI, [], "slides");
-  const groups = useJSON(groupsURI, null);
+  const allGroups = useJSON(groupsURI, null);
+  const groups = useMemo(
+    () => (allGroups ? linkGroupData(allGroups) : null),
+    [allGroups]
+  );
+  const active = useMemo(
+    () => (groups ? getActive(groups, activeTagIds) : null),
+    [groups, activeTagIds]
+  );
+
+  const toggleTag = (tagId) =>
+    setActiveTagIds(
+      activeTagIds.includes(tagId)
+        ? activeTagIds.filter((id) => id != tagId)
+        : [...activeTagIds, tagId]
+    );
 
   return (
     <>
@@ -13,7 +104,20 @@ export function ResourceHome({ title, showTitle, slidesURI, groupsURI }) {
       {slides.length ? (
         <Carousel>{slides.map((slide) => CarouselSlide(slide))}</Carousel>
       ) : null}
-      {groups ? <ResourceGroups {...groups} /> : null}
+
+      {groups
+        ? groups.resourceCategories
+            .filter(({ resourceCategoryId }) =>
+              active.resourceCategoryIds.has(resourceCategoryId)
+            )
+            .map((resourceCategory) => (
+              <ResourceCategory
+                {...resourceCategory}
+                active={active}
+                toggleTag={toggleTag}
+              />
+            ))
+        : null}
     </>
   );
 }
diff --git a/src/tag.jsx b/src/tag.jsx
index ba01ff6..1d9daba 100644
--- a/src/tag.jsx
+++ b/src/tag.jsx
@@ -1,16 +1,21 @@
 import { defaultIcons } from "./icons";
 
-export function Tag({
-  active = false,
-  collection = "tags",
-  icon = "default",
-  name,
-}) {
+export function Tag({ active, tagCategory, tagId, iconUri, name, toggleTag }) {
   return (
-    <li class={`tag collection-${collection}${active ? " active" : ""}`}>
-      <a href="#">
-        {icon.startsWith("http") ? (
-          <img src={icon} />
+    <li
+      class={`tag tag-category-${tagCategory.name
+        .toLowerCase()
+        .replace(/[^a-z]+/g, "-")}${active.tagIds.has(tagId) ? " active" : ""}`}
+    >
+      <a
+        href="#"
+        onClick={(e) => {
+          e.preventDefault();
+          toggleTag(tagId);
+        }}
+      >
+        {iconUri ? (
+          <img src={iconUri} />
         ) : (
           defaultIcons[name] || defaultIcons.Tag
         )}
diff --git a/src/tags.css b/src/tags.css
index 4a7d34c..6bd61ed 100644
--- a/src/tags.css
+++ b/src/tags.css
@@ -11,19 +11,21 @@ li.tag {
   background-color: var(--teal-100);
   border: 1px solid var(--teal-400);
   border-radius: 8px;
+  color: var(--contrast);
   display: inline-block;
   font-weight: 500;
   line-height: 18px;
   padding: 3px 7px;
   text-decoration: none;
 }
-.tag.active a,
-.tag a:active,
-.tag a:focus,
 .tag a:hover {
   background-color: var(--teal-200);
   color: var(--contrast);
 }
+.tag.active a {
+  border-color: var(--orange-400);
+  background-color: var(--orange-200);
+}
 .tag img,
 .tag svg {
   background-position: center;
@@ -34,5 +36,3 @@ li.tag {
   vertical-align: text-bottom;
   width: 16px;
 }
-.tag .collection-resource-providers a {
-}
diff --git a/src/utils.js b/src/utils.js
index 1c966a9..7cae543 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -37,3 +37,10 @@ export const useJSON = (uri, defaultValue, prop) => {
 };
 
 export const sortOn = (prop) => (a, b) => a[prop] < b[prop] ? -1 : 1;
+
+// export const useActiveIds = (initial = []) => {
+//   const [ids, setIds] = useState(initial);
+//   const toggle = (id) => setIds(id in ids ? ids.filter((x) => x != id) : [...ids, id]);
+//   const clear = () => setIds([]);
+
+// }

From a49030618838e17af7e2a310ad65ba1ca4d76e8b Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Tue, 18 Jun 2024 15:35:01 -0400
Subject: [PATCH 004/113] feat(resource-catalog): add filtering by tag

---
 public/api/resources.json | 2694 +++++++++++++++++++++++++++++++++++++
 src/base.css              |    2 +
 src/content.css           |   29 +-
 src/resource-catalog.jsx  |    2 +
 src/resource-filters.css  |   14 +
 src/resource-filters.jsx  |   37 +
 src/resource-home.jsx     |   23 +-
 src/tag.jsx               |    5 +-
 src/tags.css              |   13 +-
 9 files changed, 2811 insertions(+), 8 deletions(-)
 create mode 100644 public/api/resources.json
 create mode 100644 src/resource-filters.css
 create mode 100644 src/resource-filters.jsx

diff --git a/public/api/resources.json b/public/api/resources.json
new file mode 100644
index 0000000..a31bd51
--- /dev/null
+++ b/public/api/resources.json
@@ -0,0 +1,2694 @@
+[
+  {
+    "resourceId": 530479,
+    "resourceName": "SDSC Expanse Projects Storage",
+    "displayResourceName": "SDSC Expanse Projects Storage",
+    "resourceType": "Storage",
+    "description": "",
+    "units": "GB",
+    "organization": "San Diego Supercomputer Center",
+    "resourceRepositoryKey": 145120,
+    "productionBeginDate": "2020-10-01",
+    "productionEndDate": "2025-10-01",
+    "resourceDescription": "5PB of storage on a Lustre based filesystem.",
+    "recommendedUse": "Use for storage needs of allocated projects on Expanse Compute and Expanse GPU resources. Unpurged storage available for duration of allocation period.",
+    "conversionFactor": "8.0145",
+    "userGuideUrl": "https://www.sdsc.edu/support/user_guides/expanse.html",
+    "attributeSets": [],
+    "featureCategories": [
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 139,
+            "name": "ACCESS Allocated",
+            "description": "Resource is allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 138,
+            "name": "Storage",
+            "description": "Storage is the main purpose of this resource",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 531298,
+    "resourceName": "ACCESS Credits",
+    "displayResourceName": "ACCESS Credits",
+    "resourceType": "Program",
+    "description": "",
+    "units": "ACCESS Credits",
+    "organization": "ACCESS Allocations",
+    "resourceRepositoryKey": 145904,
+    "productionBeginDate": "2022-09-01",
+    "productionEndDate": null,
+    "resourceDescription": null,
+    "recommendedUse": "Credits should be exchanged for ACCESS resources",
+    "conversionFactor": "8.0145",
+    "userGuideUrl": "https://allocations.access-ci.org",
+    "attributeSets": [],
+    "featureCategories": []
+  },
+  {
+    "resourceId": 531464,
+    "resourceName": "Georgia Tech GaTech Hive Cluster",
+    "displayResourceName": "Georgia Tech GaTech Hive Cluster",
+    "resourceType": "Compute",
+    "description": "As part of the ACCESS ecosystem, a portion of the system is available for community use through the Hive Gateway (https://gateway.hive.pace.gatech.edu). The Hive gateway permits direct use of a variety of software for users with ACCESS logins. No allocation necessary! Also through its ACCESS participation, the Hive cluster is available to support existing or new gateways using the Airavata platform. Interested gateways should contact pace-support@oit.gatech.edu.",
+    "units": "Core-hours",
+    "organization": "Georgia Institute of Technology",
+    "resourceRepositoryKey": 146103,
+    "productionBeginDate": "2020-10-01",
+    "productionEndDate": null,
+    "resourceDescription": null,
+    "recommendedUse": "As part of the ACCESS ecosystem, a portion of the system is available for community use through the Hive Gateway (https://gateway.hive.pace.gatech.edu). The Hive gateway permits direct use of a variety of software for users with ACCESS logins. No allocation necessary! Also through its ACCESS participation, the Hive cluster is available to support existing or new gateways using the Airavata platform. Interested gateways should contact pace-support@oit.gatech.edu.",
+    "conversionFactor": null,
+    "userGuideUrl": "https://docs.pace.gatech.edu/hiveGateway/gettingStarted/",
+    "attributeSets": [],
+    "featureCategories": [
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 136,
+            "name": "CPU Compute",
+            "description": "General compute use",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 140,
+            "name": "RP-managed process",
+            "description": "Resource is not allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 103,
+        "categoryName": "Specialized Support",
+        "categoryDescription": "Special services offered by the resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 167,
+            "name": "ACCESS OnDemand",
+            "description": "An intuitive, innovative, and interactive interface to remote computing resources",
+            "isFilter": null
+          },
+          {
+            "featureId": 146,
+            "name": "Science Gateway support",
+            "description": "Support for Science Gateways",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 531199,
+    "resourceName": "IACS at Stony Brook Ookami",
+    "displayResourceName": "IACS at Stony Brook Ookami",
+    "resourceType": "Compute",
+    "description": "1 SU = 1 node hour\r\nA node is allocated exclusively to a user. Node-sharing is not available.",
+    "units": "SUs",
+    "organization": "Institute for Advanced Computational Science at Stony Brook University",
+    "resourceRepositoryKey": 145574,
+    "productionBeginDate": "2022-06-16",
+    "productionEndDate": "2025-09-30",
+    "resourceDescription": "Ookami is a computer technology testbed supported by the National Science Foundation under grant OAC 1927880. It provides researchers with access to the A64FX processor developed by Riken and Fujitsu for the Japanese path to exascale computing and is deployed in the, until June 2022, fastest computer in the world, Fugaku. It is the first such computer outside of Japan. By focusing on crucial architectural details, the ARM-based, multi-core, 512-bit SIMD-vector processor with ultrahigh-bandwidth memory promises to retain familiar and successful programming models while achieving very high performance for a wide range of applications. While being very power-efficient it supports a wide range of data types and enables both HPC and big data applications.\r\n\r\nThe Ookami HPE (formerly Cray) Apollo 80 system has 176 A64FX compute nodes each with 32GB of high-bandwidth memory and a 512 Gbyte SSD. This amounts to about 1.5M node hours per year. A high-performance Lustre filesystem provides about 0.8 Pbyte storage.\r\n\r\nTo facilitate users exploring current computer technologies and contrasting performance and programmability with the A64FX, Ookami also includes:\r\n\r\n- 1 node with dual socket AMD Milan (64cores) with 512 Gbyte memory\r\n- 2 nodes with dual socket Thunder X2 (64 cores) each with 256 Gbyte memory\r\n- 1 node with dual socket Intel Skylake (32 cores) with 192 Gbyte memory and 2 NVIDIA V100 GPUs",
+    "recommendedUse": "Applications that are fitting within the memory requirements (27GB per node) and are well vectorized, or well auto-vectorized by the compiler.\r\nNote a node is allocated exclusively to one user. Node-sharing is not available.",
+    "conversionFactor": "1.0",
+    "userGuideUrl": "https://www.stonybrook.edu/commcms/ookami/support/faq/",
+    "attributeSets": [],
+    "featureCategories": [
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 136,
+            "name": "CPU Compute",
+            "description": "General compute use",
+            "isFilter": null
+          },
+          {
+            "featureId": 135,
+            "name": "Innovative / Novel Compute",
+            "description": "Unique, innovative or non-traditional compute resource",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 139,
+            "name": "ACCESS Allocated",
+            "description": "Resource is allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 103,
+        "categoryName": "Specialized Support",
+        "categoryDescription": "Special services offered by the resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 146,
+            "name": "Science Gateway support",
+            "description": "Support for Science Gateways",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 530808,
+    "resourceName": "Indiana Jetstream2 Storage",
+    "displayResourceName": "Indiana Jetstream2 Storage",
+    "resourceType": "Storage",
+    "description": "",
+    "units": "GB",
+    "organization": "Indiana University",
+    "resourceRepositoryKey": 145449,
+    "productionBeginDate": "2021-10-01",
+    "productionEndDate": "2025-09-30",
+    "resourceDescription": null,
+    "recommendedUse": null,
+    "conversionFactor": "8.0145",
+    "userGuideUrl": "https://docs.jetstream-cloud.org/",
+    "attributeSets": [],
+    "featureCategories": [
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 139,
+            "name": "ACCESS Allocated",
+            "description": "Resource is allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 138,
+            "name": "Storage",
+            "description": "Storage is the main purpose of this resource",
+            "isFilter": null
+          },
+          {
+            "featureId": 133,
+            "name": "Cloud",
+            "description": "Cloud Resource",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 530639,
+    "resourceName": "UD DARWIN GPU Nodes (DARWIN GPU)",
+    "displayResourceName": "UD DARWIN GPU Nodes (DARWIN GPU)",
+    "resourceType": "Compute",
+    "description": "1 SU = 1 device hour;  \r\nT4 or MI50 device hour = 1 GPU + 64 CPU cores + 512 GiB RAM;  \r\nV100 device hour = 1 GPU + 12 CPU cores + 192 GiB RAM",
+    "units": "SUs",
+    "organization": "University of Delaware",
+    "resourceRepositoryKey": 145278,
+    "productionBeginDate": "2021-08-02",
+    "productionEndDate": "2024-09-30",
+    "resourceDescription": "3 nodes with two Intel® Xeon® Platinum 8260 processors (24 cores each), 768 GiB RAM, and 4 NVIDIA Tesla V100 32GB GPUs connected via NVLINK™\r\n9 nodes with two AMD EPYC™ 7502 processors (32 cores each), 512 GiB RAM, and a single NVIDIA Tesla T4 GPU\r\n1 node with two AMD EPYC™ 7502 processors (32 cores each), 512 GiB RAM, and a single AMD Radeon Instinct MI50 GPU",
+    "recommendedUse": "DARWIN's GPU nodes provide resources for machine learning, artificial intelligence research,  and visualization.",
+    "conversionFactor": "310.0",
+    "userGuideUrl": "https://docs.hpc.udel.edu/abstract/darwin/darwin#compute-nodes",
+    "attributeSets": [],
+    "featureCategories": []
+  },
+  {
+    "resourceId": 530640,
+    "resourceName": "UD DARWIN Storage (DARWIN Storage)",
+    "displayResourceName": "UD DARWIN Storage (DARWIN Storage)",
+    "resourceType": "Storage",
+    "description": "",
+    "units": "GB",
+    "organization": "University of Delaware",
+    "resourceRepositoryKey": 145279,
+    "productionBeginDate": "2021-08-02",
+    "productionEndDate": "2024-09-30",
+    "resourceDescription": "DARWIN's Lustre file system is for use with the DARWIN Compute and GPU nodes.",
+    "recommendedUse": "DARWIN's Lustre storage should be used for storing input files, supporting data files, work files, and output files associated with computational tasks run on the cluster.",
+    "conversionFactor": "8.0145",
+    "userGuideUrl": "https://docs.hpc.udel.edu/abstract/darwin/darwin#storage",
+    "attributeSets": [],
+    "featureCategories": [
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 138,
+            "name": "Storage",
+            "description": "Storage is the main purpose of this resource",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 530638,
+    "resourceName": "UD DARWIN Compute Nodes (DARWIN)",
+    "displayResourceName": "UD DARWIN Compute Nodes (DARWIN)",
+    "resourceType": "Compute",
+    "description": "1 SU = 1 compute hour (any node type);  \r\nstandard = 1 core + 8 GiB RAM;  \r\nlarge = 1 core + 16 GiB RAM;  \r\nxlarge = 1 core + 32 GiB RAM;  \r\nlg-swap is billed as the entire node at 64 SUs per hour = 64 cores + 1024 GiB RAM + 2.73 TiB Optane NVMe swap",
+    "units": "SUs",
+    "organization": "University of Delaware",
+    "resourceRepositoryKey": 145277,
+    "productionBeginDate": "2021-08-02",
+    "productionEndDate": "2024-09-30",
+    "resourceDescription": "Nodes with two AMD EPYC™ 7502 processors (32 cores each) with three memory size options:\r\n48x standard 512 GiB; \r\n32x large-memory 1024 GiB; \r\n11x xlarge-memory 2048 GiB; \r\n1x lg-swap 1024 GiB RAM + 2.73 TiB Intel Optane NVMe swap",
+    "recommendedUse": "DARWIN's standard memory nodes provide powerful general-purpose computing, data analytics, and pre- and post-processing capabilities.  The large and xlarge memory nodes enable memory-intensive applications and workflows that do not have distributed-memory implementations.",
+    "conversionFactor": "4.45",
+    "userGuideUrl": "https://docs.hpc.udel.edu/abstract/darwin/darwin#compute-nodes",
+    "attributeSets": [],
+    "featureCategories": []
+  },
+  {
+    "resourceId": 530162,
+    "resourceName": "TACC Long-term tape Archival Storage (Ranch)",
+    "displayResourceName": "TACC Long-term tape Archival Storage (Ranch)",
+    "resourceType": "Storage",
+    "description": "",
+    "units": "GB",
+    "organization": "Texas Advanced Computing Center",
+    "resourceRepositoryKey": 142293,
+    "productionBeginDate": "2013-03-15",
+    "productionEndDate": null,
+    "resourceDescription": "TACC's long-term mass storage solution, Ranch, is an Oracle® StorageTek Modular Library System. Ranch utilizes Oracle's Sun Storage Archive Manager Filesystem (SAM-FS) for migrating files to/from a tape archival system with a current offline storage capacity of 60 PB.\r\nRanch's disk cache is built on Oracle's ZFS 7240 and Dell MD3600i disk arrays containing approximately 640 TB of usable spinning disk storage. These disk arrays are controlled by a Dell R720  SAM-FS Metadata server which has 16 CPUs and 72 GB of RAM.\r\nTwo Oracle StorageTek SL8500 Automated Tape Libraries house all of the offline archival storage. Each SL8500 library can house up to 10,000 tapes with 64 tape drive slots. One SL8500 is currently populated with 10,000 T-10000B media where each tape is capable of holding one TB of uncompressed data while the second SL8500 houses 6,000 of the latest T-10000C media which can hold five TB of uncompressed data. Each SL8500 library also contains eight handbots to manage tapes and move them to/from the tape drives with a pass-through port connecting the two SL8500 libraries. If necessary, up to four SL8500 libraries can be integrated into a single archival solution, allowing for an offline storage capacity of 200 PB with current tape media.",
+    "recommendedUse": "TACC's High Performance Computing systems are used primarily for scientific computing with users having access to WORK, SCRATCH, and HOME file systems that are limited in size. This is also true for TACC's visualization system, Longhorn. The Ranch system serves the HPC and Vis community systems by providing a massive, high-performance file system for archival purposes. Space on Ranch can also be requested independent of an accompanying allocation on an XSEDE compute or visualization resource.\r\nPlease note that Ranch is an archival system. The ranch system is not backed up or replicated. This means that Ranch contains a single copy, and only a single copy, of your file/s. While lost data due to tape damage is rare, please keep this fact in mind for your data management plans.",
+    "conversionFactor": "8.0145",
+    "userGuideUrl": "https://portal.xsede.org/tacc-ranch",
+    "attributeSets": [],
+    "featureCategories": [
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 139,
+            "name": "ACCESS Allocated",
+            "description": "Resource is allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 138,
+            "name": "Storage",
+            "description": "Storage is the main purpose of this resource",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 531365,
+    "resourceName": "MATCHPremier",
+    "displayResourceName": "MATCHPremier",
+    "resourceType": "Program",
+    "description": "The pilot program for the ACCESS MATCHPremier embedded support service provides matches your project with an experienced research professional, identified by ACCESS Support to provide the skills needed to help your project, for example, with managing massive allocations or using ACCESS resources in novel ways. MATCHPremier consultants are selected from the Computational Science and Support Network (CSSN) — they may be facilitators, research software engineers, or other types of appropriate support personnel. MATCHPremier should be requested at least six months in advance of the anticipated need.For more information visit the ACCESS Support portal: https://support.access-ci.org/matchpremier\r\n\r\n",
+    "units": "Yes / No",
+    "organization": "ACCESS Support",
+    "resourceRepositoryKey": 146004,
+    "productionBeginDate": "2022-10-24",
+    "productionEndDate": null,
+    "resourceDescription": null,
+    "recommendedUse": "MATCHPremier identifies consultants who are available to be embedded on your research team for 12- 8 months. Consultants have the expertise to help manage massive allocation plans or to use ACCESS resources in novel ways. Engagements should be requested at least six months in advance and are funded through your research award.",
+    "conversionFactor": null,
+    "userGuideUrl": "https://support.access-ci.org/matchpremier",
+    "attributeSets": [],
+    "featureCategories": [
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 137,
+            "name": "Service / Other",
+            "description": "An allocated resource that's not compute or storage",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 139,
+            "name": "ACCESS Allocated",
+            "description": "Resource is allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 530772,
+    "resourceName": "Purdue Anvil GPU",
+    "displayResourceName": "Purdue Anvil GPU",
+    "resourceType": "Compute",
+    "description": "1 Anvil GPU Service Unit = 1 A100 GPU hour on a quad-NVIDIA A100 node",
+    "units": "SUs",
+    "organization": "Purdue University",
+    "resourceRepositoryKey": 145412,
+    "productionBeginDate": "2021-10-01",
+    "productionEndDate": "2026-10-01",
+    "resourceDescription": "16 nodes each with four NVIDIA A100 Tensor Core GPUs providing 1.5 PF of single-precision performance to support machine learning and artificial intelligence applications.",
+    "recommendedUse": "Anvil’s GPU nodes can be used for various Machine learning (ML), artificial intelligence (AI), and other GPU-enabled workloads. A comprehensive set of GPU software is available within Open OnDemand as well as the module system that includes GPU-enabled package builds and NVIDIA GPU Cloud (NGC) containers for common Python ML frameworks such as PyTorch, Keras, and TensorFlow. GPU-enabled scientific software supports a variety of disciplines and applications that include, but is not limited to, AMBER, LAMMPS, NAMD, Gromacs.",
+    "conversionFactor": "539.4375",
+    "userGuideUrl": "https://www.rcac.purdue.edu/anvil#docs",
+    "attributeSets": [],
+    "featureCategories": [
+      {
+        "categoryId": 103,
+        "categoryName": "Specialized Support",
+        "categoryDescription": "Special services offered by the resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 166,
+            "name": "ACCESS Pegasus",
+            "description": "Run Jobs and Workflows on ACCESS Resources from a Single Entry Point",
+            "isFilter": null
+          },
+          {
+            "featureId": 167,
+            "name": "ACCESS OnDemand",
+            "description": "An intuitive, innovative, and interactive interface to remote computing resources",
+            "isFilter": null
+          },
+          {
+            "featureId": 146,
+            "name": "Science Gateway support",
+            "description": "Support for Science Gateways",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 139,
+            "name": "ACCESS Allocated",
+            "description": "Resource is allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 134,
+            "name": "GPU Compute",
+            "description": "GPU use is the main purpose of this resource",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 133,
+        "categoryName": "Resource Category",
+        "categoryDescription": "NAIRR Pilot Resource Category",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 232,
+            "name": "Federal agency systems",
+            "description": "Agency supercomputers and advanced architecture systems",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 530807,
+    "resourceName": "Indiana Jetstream2 Large Memory",
+    "displayResourceName": "Indiana Jetstream2 Large Memory",
+    "resourceType": "Compute",
+    "description": "Jetstream2 Large Memory VMs are charged 2x the number of vCPUs per hour because of the additional memory capacity. For instance, the r3.xl flavor that uses 128 cores costs 256 SUs per hour. VM sizes and cost per hour are available at the \u003ca href=\"https://docs.jetstream-cloud.org/general/vmsizes/\"\u003eJetstream website\u003c/a\u003e.",
+    "units": "SUs",
+    "organization": "Indiana University",
+    "resourceRepositoryKey": 145448,
+    "productionBeginDate": "2021-10-01",
+    "productionEndDate": "2025-09-30",
+    "resourceDescription": "Jetstream2 LM is a hybrid-cloud platform that provides flexible, on-demand, programmable cyberinfrastructure tools ranging from interactive virtual machine services to a variety of infrastructure and orchestration services for research and education. This particular portion of the resource is allocated separately from the primary resource and contains 32 nodes of GPU-ready 1TB RAM compute nodes, AMD Milan 7713 CPUs with 128 cores per node connected by 100gbps ethernet to the spine.",
+    "recommendedUse": "For the researcher needing virtual machine services on demand as well as for software creators and researchers needing to create their own customized virtual machine environments. Additional use cases are for research-supporting infrastructure services that need to be \"always on\" as well as science gateway services and for education support, providing virtual machines for students. \r\n\r\nThis particular resource is for those required 512gb or 1tb for their workloads and must demonstrate that need.",
+    "conversionFactor": "8.0145",
+    "userGuideUrl": "https://docs.jetstream-cloud.org/",
+    "attributeSets": [],
+    "featureCategories": [
+      {
+        "categoryId": 102,
+        "categoryName": "Specialized Hardware",
+        "categoryDescription": "Key compute hardware components in this resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 142,
+            "name": "Large Memory Nodes",
+            "description": "Specialized analysis nodes with large memory",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 103,
+        "categoryName": "Specialized Support",
+        "categoryDescription": "Special services offered by the resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 166,
+            "name": "ACCESS Pegasus",
+            "description": "Run Jobs and Workflows on ACCESS Resources from a Single Entry Point",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 139,
+            "name": "ACCESS Allocated",
+            "description": "Resource is allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 133,
+            "name": "Cloud",
+            "description": "Cloud Resource",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 530482,
+    "resourceName": "PSC Bridges-2 Storage (PSC Ocean)",
+    "displayResourceName": "PSC Bridges-2 Storage (PSC Ocean)",
+    "resourceType": "Storage",
+    "description": "Storage",
+    "units": "GB",
+    "organization": "Pittsburgh Supercomputing Center",
+    "resourceRepositoryKey": 145122,
+    "productionBeginDate": "2021-02-11",
+    "productionEndDate": "2025-09-30",
+    "resourceDescription": "The Bridges-2 Ocean data management system provides a unified, high-performance filesystem for active project data, archive, and resilience. Ocean consists of two tiers, disk and tape, transparently managed by HPE DMF as a single, highly usable namespace.\r\n\r\nOcean's disk subsystem, for active project data, is a high-performance, internally resilient Lustre parallel filesystem with 15PB of usable capacity, configured to deliver up to 129GB/s and 142GB/s of read and write bandwidth, respectively.\r\n\r\nOcean's tape subsystem, for archive and additional resilience, is a high-performance tape library with 7.2PB of uncompressed capacity (estimated 8.6PB compressed, with compression done transparently in hardware with no performance overhead), configured to deliver 50TB/hour.",
+    "recommendedUse": "The Bridges-2 Ocean data management system provides high-performance and highly usable access to project and archive data. It is equally accessible to all Bridges-2 compute nodes, allowing seamless execution of data-intensive workflows involving components running on different compute resource types.",
+    "conversionFactor": "80.145",
+    "userGuideUrl": "http://www.psc.edu/resources/bridges-2/user-guide",
+    "attributeSets": [],
+    "featureCategories": [
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 139,
+            "name": "ACCESS Allocated",
+            "description": "Resource is allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 138,
+            "name": "Storage",
+            "description": "Storage is the main purpose of this resource",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 530374,
+    "resourceName": "PSC Anton 2 Special-Purpose Supercomputer for Molecular Dynamics (PSC Anton 2)",
+    "displayResourceName": "PSC Anton 2 Special-Purpose Supercomputer for Molecular Dynamics (PSC Anton 2)",
+    "resourceType": "Compute",
+    "description": "Anton 2 is allocated annually via a Request for Proposal with proposals reviewed by a committee convened by the National Research Council at the National Academies. To qualify for an allocation on Anton 2, the principal investigator must be a faculty or staff member at a U.S. academic or non-profit research institution. Anton is allocated in MD simulation units.",
+    "units": "MD Simulation Units",
+    "organization": "Pittsburgh Supercomputing Center",
+    "resourceRepositoryKey": 144815,
+    "productionBeginDate": "2023-02-01",
+    "productionEndDate": null,
+    "resourceDescription": "Anton is a special purpose supercomputer for biomolecular simulation designed and constructed by D. E. Shaw Research (DESRES).   PSC's current system is known as Anton 2 and is a successor to the original Anton 1 machine hosted here.  \r\n\r\nAnton 2, the next-generation Anton supercomputer, is a 128 node system, made available without cost by DESRES for non-commercial research use by US universities and other not-for-profit institutions, and is hosted by PSC with support from the NIH National Institute of General Medical Sciences.  It replaced the original Anton 1 system in the fall of 2016.\r\n\r\nAnton was designed to dramatically increase the speed of molecular dynamics (MD) simulations compared with the previous state of the art, allowing biomedical researchers to understand the motions and interactions of proteins and other biologically important molecules over much longer time periods than was previously accessible to computational study.  The MD research community is using the Anton 2 machine at PSC to investigate important biological phenomena that due to their intrinsically long time scales have been outside the reach of even the most powerful general-purpose scientific computers.  Application areas include biomolecular energy transformation, ion channel selectivity and gating, drug interactions with proteins and nucleic acids, protein folding and protein-membrane signaling.",
+    "recommendedUse": "As part of the ACCESS ecosystem, Anton 2 invites interested molecular dynamics (MD) investigators to request allocations on the special purpose supercomputer built specifically for MD. Requests for proposals are accepted each summer. The next request period will be in 2024. For detailed application instructions please see (https://www.psc.edu/resources/anton-2/anton-rfp/). Questions regarding Anton 2 can be directed to: grants@psc.edu.",
+    "conversionFactor": null,
+    "userGuideUrl": "https://www.psc.edu/resources/anton-2/",
+    "attributeSets": [],
+    "featureCategories": [
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 135,
+            "name": "Innovative / Novel Compute",
+            "description": "Unique, innovative or non-traditional compute resource",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 140,
+            "name": "RP-managed process",
+            "description": "Resource is not allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 530157,
+    "resourceName": "OSG Open Science Pool",
+    "displayResourceName": "OSG Open Science Pool",
+    "resourceType": "Compute",
+    "description": "1 SU = 1 Core-hour",
+    "units": "SUs",
+    "organization": "Open Science Grid",
+    "resourceRepositoryKey": 142288,
+    "productionBeginDate": "2012-04-01",
+    "productionEndDate": "2025-12-31",
+    "resourceDescription": "A virtual HTCondor pool made up of resources from the Open Science Grid",
+    "recommendedUse": "High throughput jobs using a single core, or a small number of threads which can fit on a single compute node.",
+    "conversionFactor": "3.147",
+    "userGuideUrl": "https://portal.osg-htc.org/documentation/",
+    "attributeSets": [],
+    "featureCategories": [
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 139,
+            "name": "ACCESS Allocated",
+            "description": "Resource is allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 103,
+        "categoryName": "Specialized Support",
+        "categoryDescription": "Special services offered by the resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 145,
+            "name": "Preemption",
+            "description": "preemption",
+            "isFilter": null
+          },
+          {
+            "featureId": 146,
+            "name": "Science Gateway support",
+            "description": "Support for Science Gateways",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 531562,
+    "resourceName": "TACC Dell/Intel Sapphire Rapids, Ice Lake, Skylake (Stampede3)",
+    "displayResourceName": "TACC Dell/Intel Sapphire Rapids, Ice Lake, Skylake (Stampede3)",
+    "resourceType": "Compute",
+    "description": "DECEMBER 1, 2023 WILL BE THE START DATE FOR STAMPEDE3 MAXIMIZE ALLOCATIONS\r\n\r\nStampede3 is allocated in service units (SU)s. \r\nThe charge rate varies by node type:\r\n1) Skylake 1 node-hour = 1 SU\r\n2) Ice Lake 1 node-hour = 1.66 SU\r\n3) Sapphire Rapids  1 node-hour = 3 SU",
+    "units": "Node Hours",
+    "organization": "University of Texas at Austin",
+    "resourceRepositoryKey": 146465,
+    "productionBeginDate": "2024-04-27",
+    "productionEndDate": "2028-09-30",
+    "resourceDescription": "Stampede3 is generously funded through the National Science Foundation and is designed to serve today's researchers as well as support the research community on an evolutionary path toward many-core processors and accelerated technologies. Stampede 3 maintains the familiar programming model for all of today's users, and thus will be broadly useful for traditional simulation users, users performing data intensive computations, and emerging classes of new users.",
+    "recommendedUse": "Stampede3 is intended primarily for parallel applications scalable to tens of thousands of cores, as well as general purpose and throughput computing. Normal batch queues will enable users to run simulations up to 48 hours.",
+    "conversionFactor": "512.0",
+    "userGuideUrl": "https://docs.tacc.utexas.edu/hpc/stampede3/",
+    "attributeSets": [],
+    "featureCategories": [
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 136,
+            "name": "CPU Compute",
+            "description": "General compute use",
+            "isFilter": null
+          },
+          {
+            "featureId": 134,
+            "name": "GPU Compute",
+            "description": "GPU use is the main purpose of this resource",
+            "isFilter": null
+          },
+          {
+            "featureId": 135,
+            "name": "Innovative / Novel Compute",
+            "description": "Unique, innovative or non-traditional compute resource",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 139,
+            "name": "ACCESS Allocated",
+            "description": "Resource is allocated by ACCESS",
+            "isFilter": null
+          },
+          {
+            "featureId": 140,
+            "name": "RP-managed process",
+            "description": "Resource is not allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 530641,
+    "resourceName": "NCSA Delta CPU (Delta CPU)",
+    "displayResourceName": "NCSA Delta CPU (Delta CPU)",
+    "resourceType": "Compute",
+    "description": "1 Core hour = 1 CPU Core-hour in the normal priority partition. One hour using a full Delta CPU node will cost 128 core hours in the normal priority partition.",
+    "units": "Core-hours",
+    "organization": "National Center for Supercomputing Applications",
+    "resourceRepositoryKey": 145281,
+    "productionBeginDate": "2022-09-19",
+    "productionEndDate": "2027-08-31",
+    "resourceDescription": "The Delta CPU resource comprises 124 dual-socket compute nodes for general purpose computation across a broad range of domains able to benefit from the scalar and multi-core performance provided by the CPUs, such as appropriately scaled weather and climate, hydrodynamics, astrophysics, and engineering modeling and simulation, and other domains using algorithms not yet adapted for the GPU. Each Delta CPU node is configured with 2 AMD EPYC 7763 (“Milan”) processors with 64-cores/socket (128-cores/node) at 2.45GHz and 256GB of DDR4-3200 RAM. An 800GB, NVMe solid-state disk is available for use as local scratch space during job execution. All Delta CPU compute nodes are interconnected to each other and to the Delta storage resource by a 100 Gb/sec HPE Slingshot network fabric.",
+    "recommendedUse": "The Delta CPU resource is designed for general purpose computation across a broad range of domains able to benefit from the scalar and multi-core performance provided by the CPUs such as appropriately scaled weather and climate, hydrodynamics, astrophysics, and engineering modeling and simulation, and other domains that have algorithms that have not yet moved to the GPU. Delta also supports domains that employ data analysis, data analytics, or other data-centric methods. Delta features a rich base of preinstalled applications, based on user demand.  The system is optimized for capacity computing, with rapid turnaround for small to modest scale jobs, and features support for shared-node usage. Local SSD storage on each compute node benefits applications with random access data patterns or require fast access to significant amounts of compute-node local scratch space.\r\nThis allocation type is specific to and required for the CPU-only nodes on Delta. Request this allocation type if you have CPU only parts to your workflow.",
+    "conversionFactor": "8.015",
+    "userGuideUrl": "https://docs.ncsa.illinois.edu/systems/delta/en/latest/index.html",
+    "attributeSets": [],
+    "featureCategories": [
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 139,
+            "name": "ACCESS Allocated",
+            "description": "Resource is allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 103,
+        "categoryName": "Specialized Support",
+        "categoryDescription": "Special services offered by the resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 143,
+            "name": "Advance reservations",
+            "description": "has advance reservations",
+            "isFilter": null
+          },
+          {
+            "featureId": 146,
+            "name": "Science Gateway support",
+            "description": "Support for Science Gateways",
+            "isFilter": null
+          },
+          {
+            "featureId": 167,
+            "name": "ACCESS OnDemand",
+            "description": "An intuitive, innovative, and interactive interface to remote computing resources",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 136,
+            "name": "CPU Compute",
+            "description": "General compute use",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 531826,
+    "resourceName": "PSC Brain Image Library (BIL)",
+    "displayResourceName": "PSC Brain Image Library (BIL)",
+    "resourceType": "Storage",
+    "description": "BIL provides rich neuroscience image data collected in alignment with FAIR (Findable, Accessible, interoperable, reusable)  principles. Experimentalists  can deposit BRAIN data originating from microscopy experiments for indexing and distribution to others. Researchers interested in using BIL data for re-analysis or other purposes (including algorithm development)   can request in-place access to datasets coupled with computing infrastructure provided by PSC Bridges-2 compute, GPU, and storage resources. Interested researchers are requested to contact PSC via email at bil-support@psc.edu",
+    "units": "Yes / No",
+    "organization": "Pittsburgh Supercomputing Center",
+    "resourceRepositoryKey": 146668,
+    "productionBeginDate": null,
+    "productionEndDate": null,
+    "resourceDescription": null,
+    "recommendedUse": "For researchers and data generators in the field of neuroscience, BIL provides a centralized hub for depositing, accessing, and sharing large brain image microscopy datasets to foster data-driven collaboration across the broader research community. AI and machine learning developers can harness the rich datasets to build and optimize models to advance neuroscience and computational image analysis domains.",
+    "conversionFactor": null,
+    "userGuideUrl": null,
+    "attributeSets": [],
+    "featureCategories": [
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 140,
+            "name": "RP-managed process",
+            "description": "Resource is not allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 135,
+            "name": "Innovative / Novel Compute",
+            "description": "Unique, innovative or non-traditional compute resource",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 530642,
+    "resourceName": "NCSA Delta Storage (Delta Storage)",
+    "displayResourceName": "NCSA Delta Storage (Delta Storage)",
+    "resourceType": "Storage",
+    "description": "",
+    "units": "GB",
+    "organization": "National Center for Supercomputing Applications",
+    "resourceRepositoryKey": 145283,
+    "productionBeginDate": "2022-09-19",
+    "productionEndDate": "2027-08-31",
+    "resourceDescription": "The Delta Storage resource provides storage allocations for projects using the Delta CPU and Delta GPU resources. It delivers 7PB of capacity to projects on Delta and will be augmented by a later expansion of 3PB of flash capacity for high-speed, data-intensive workloads.",
+    "recommendedUse": "The Delta Storage resource provides storage allocations on the scratch file system for allocated projects using the Delta CPU and Delta GPU resources. Allocations are available for the duration of the compute allocation period. Scratch is unpurged storage.",
+    "conversionFactor": "8.0145",
+    "userGuideUrl": "https://docs.ncsa.illinois.edu/systems/delta/en/latest/index.html",
+    "attributeSets": [],
+    "featureCategories": [
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 139,
+            "name": "ACCESS Allocated",
+            "description": "Resource is allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 138,
+            "name": "Storage",
+            "description": "Storage is the main purpose of this resource",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 530643,
+    "resourceName": "NCSA Delta GPU (Delta GPU)",
+    "displayResourceName": "NCSA Delta GPU (Delta GPU)",
+    "resourceType": "Compute",
+    "description": "1 GPU Hour = 1 A100 GPU-Hour on a quad-NVIDIA A100 node (using 1 of the 4 GPUs) in the normal queue. A40 GPUs are discounted while large memory GPU nodes have a premium charge. Details on the charge rates are available in the \u003ca href=\"https://docs.ncsa.illinois.edu/systems/delta/en/latest/\" target=\"_blank\"\u003eDelta user guide\u003c/a\u003e (refer to the partitions section under running jobs). ",
+    "units": "GPU Hours",
+    "organization": "National Center for Supercomputing Applications",
+    "resourceRepositoryKey": 145282,
+    "productionBeginDate": "2022-09-19",
+    "productionEndDate": "2027-08-31",
+    "resourceDescription": "The Delta GPU resource comprises 4 different node configurations intended to support accelerated computation across a broad range of domains such as soft-matter physics, molecular dynamics, replica-exchange molecular dynamics, machine learning, deep learning, natural language processing, textual analysis, visualization, ray tracing, and accelerated analysis of very large in-memory datasets. Delta is designed to support the transition of applications from CPU-only to using the GPU or hybrid CPU-GPU models. Delta GPU resource capacity is predominately provided by 200 single-socket nodes, each configured with 1 AMD EPYC 7763 (“Milan”) processors with 64-cores/socket (64-cores/node) at 2.55GHz and 256GB of DDR4-3200 RAM. Half of these single-socket GPU nodes (100 nodes) are configured with 4 NVIDIA A100 GPUs with 40GB HBM2 RAM and NVLink (400 total A100 GPUs); the remaining half (100 nodes) are configured with 4 NVIDIA A40 GPUs with 48GB GDDR6 RAM and PCIe 4.0 (400 total A40 GPUs). Rounding out the GPU resource is 6 additional “dense” GPU nodes, containing 8 GPUs each, in a dual-socket CPU configuration (128-cores per node) and 2TB of DDR4-3200 RAM but otherwise configured similarly to the single-socket GPU nodes. Within the “dense” GPU nodes, 5 nodes employ NVIDIA A100 GPUs (40 total A100 GPUs in “dense” configuration) and 1 node employs AMD MI100 GPUs (8 total MI100 GPUs) with 32GB HBM2 RAM. A 1.6TB, NVMe solid-state disk is available for use as local scratch space during job execution on each GPU node type. All Delta GPU compute nodes are interconnected to each other and to the Delta storage resource by a 100 Gb/sec HPE Slingshot network fabric.",
+    "recommendedUse": "The Delta GPU resource is designed to support accelerated computation across a broad range of domains such as soft-matter physics, molecular dynamics, replica-exchange molecular dynamics, machine learning, deep learning, natural language processing, textual analysis, visualization, ray tracing, and accelerated analysis of very large in-memory datasets. Delta is designed to support the transition of applications from CPU-only to using the GPU or hybrid CPU-GPU models. Delta features a rich base of preinstalled applications, based on user demand. The system is optimized for capacity computing, with rapid turnaround for small to modest scale jobs, and features support for shared-node usage. Local SSD storage on each compute node benefits applications with random access data patterns or require fast access to significant amounts of compute-node local scratch space.\r\nThis allocation type covers the use of all Delta GPU node types and all resources (CPU and GPU) within those nodes. If you have CPU only portions of your workflow you should also request an allocation of time under NCSA Delta CPU which provides access to CPU-only compute nodes.",
+    "conversionFactor": "534.3333",
+    "userGuideUrl": "https://docs.ncsa.illinois.edu/systems/delta/en/latest/",
+    "attributeSets": [],
+    "featureCategories": [
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 139,
+            "name": "ACCESS Allocated",
+            "description": "Resource is allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 103,
+        "categoryName": "Specialized Support",
+        "categoryDescription": "Special services offered by the resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 143,
+            "name": "Advance reservations",
+            "description": "has advance reservations",
+            "isFilter": null
+          },
+          {
+            "featureId": 146,
+            "name": "Science Gateway support",
+            "description": "Support for Science Gateways",
+            "isFilter": null
+          },
+          {
+            "featureId": 167,
+            "name": "ACCESS OnDemand",
+            "description": "An intuitive, innovative, and interactive interface to remote computing resources",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 102,
+        "categoryName": "Specialized Hardware",
+        "categoryDescription": "Key compute hardware components in this resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 142,
+            "name": "Large Memory Nodes",
+            "description": "Specialized analysis nodes with large memory",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 136,
+            "name": "CPU Compute",
+            "description": "General compute use",
+            "isFilter": null
+          },
+          {
+            "featureId": 134,
+            "name": "GPU Compute",
+            "description": "GPU use is the main purpose of this resource",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 133,
+        "categoryName": "Resource Category",
+        "categoryDescription": "NAIRR Pilot Resource Category",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 232,
+            "name": "Federal agency systems",
+            "description": "Agency supercomputers and advanced architecture systems",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 530605,
+    "resourceName": "Open Storage Network (OSN)",
+    "displayResourceName": "Open Storage Network (OSN)",
+    "resourceType": "Storage",
+    "description": "Amount of storage capacity being requested, expressed in base 10 units. The minimum allocation is 10TB. Larger allocations of up to 300TB may be accommodated with further justification and approval by OSN. Storage access is via AWS S3-compatible tools such as rclone, cyberduck and the AWS command-line interface for S3. A web interface is provided at https://portal.osn.xsede.org for allocated project users to manage and browse their storage.",
+    "units": "TB",
+    "organization": "Open Storage Network",
+    "resourceRepositoryKey": 145013,
+    "productionBeginDate": "2021-04-01",
+    "productionEndDate": null,
+    "resourceDescription": "The Open Storage Network (OSN) is an NSF-funded cloud storage resource, geographically distributed among several pods. OSN pods are currently hosted at SDSC, NCSA, MGHPCC, RENCI, and Johns Hopkins University. Each OSN pod currently hosts 1PB of storage, and is connected to R\u0026E networks at 50 Gbps. OSN storage is allocated in buckets, and is accessed using S3 interfaces with tools like rclone, cyberduck, or the AWS cli.",
+    "recommendedUse": "Cloud-style storage of project datasets for access using AWS S3-compatible tools. The minimum allocation is 10TB. Storage allocations up to 300TB may be requested via the XSEDE resource allocation process.",
+    "conversionFactor": "8.0145",
+    "userGuideUrl": "https://openstoragenetwork.readthedocs.io/en/latest/",
+    "attributeSets": [],
+    "featureCategories": [
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 138,
+            "name": "Storage",
+            "description": "Storage is the main purpose of this resource",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 139,
+            "name": "ACCESS Allocated",
+            "description": "Resource is allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 530805,
+    "resourceName": "Indiana Jetstream2 CPU",
+    "displayResourceName": "Indiana Jetstream2 CPU",
+    "resourceType": "Compute",
+    "description": "1 SU = 1 Jetstream2 vCPU-hour. VM sizes and cost per hour are available https://docs.jetstream-cloud.org/general/vmsizes/",
+    "units": "SUs",
+    "organization": "Indiana University",
+    "resourceRepositoryKey": 145446,
+    "productionBeginDate": "2022-09-07",
+    "productionEndDate": "2027-09-30",
+    "resourceDescription": "Jetstream2 is a hybrid-cloud platform that provides flexible, on-demand, programmable cyberinfrastructure tools ranging from interactive virtual machine services to a variety of infrastructure and orchestration services for research and education. The primary resource is a standard CPU resource consisting of AMD Milan 7713 CPUs with 128 cores per node and 512gb RAM per node connected by 100gbps ethernet to the spine.",
+    "recommendedUse": "For the researcher needing virtual machine services on demand as well as for software creators and researchers needing to create their own customized virtual machine environments. Additional use cases are for research-supporting infrastructure services that need to be \"always on\" as well as science gateway services and for education support, providing virtual machines for students.",
+    "conversionFactor": "8.0145",
+    "userGuideUrl": "https://docs.jetstream-cloud.org/",
+    "attributeSets": [],
+    "featureCategories": [
+      {
+        "categoryId": 103,
+        "categoryName": "Specialized Support",
+        "categoryDescription": "Special services offered by the resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 166,
+            "name": "ACCESS Pegasus",
+            "description": "Run Jobs and Workflows on ACCESS Resources from a Single Entry Point",
+            "isFilter": null
+          },
+          {
+            "featureId": 146,
+            "name": "Science Gateway support",
+            "description": "Support for Science Gateways",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 139,
+            "name": "ACCESS Allocated",
+            "description": "Resource is allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 136,
+            "name": "CPU Compute",
+            "description": "General compute use",
+            "isFilter": null
+          },
+          {
+            "featureId": 133,
+            "name": "Cloud",
+            "description": "Cloud Resource",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 530481,
+    "resourceName": "PSC Bridges-2 Regular Memory (PSC Bridges-2 RM)",
+    "displayResourceName": "PSC Bridges-2 Regular Memory (PSC Bridges-2 RM)",
+    "resourceType": "Compute",
+    "description": "1 SU = 1 core hour",
+    "units": "Core-hours",
+    "organization": "Pittsburgh Supercomputing Center",
+    "resourceRepositoryKey": 145121,
+    "productionBeginDate": "2021-02-11",
+    "productionEndDate": "2025-09-30",
+    "resourceDescription": "Bridges-2 combines high-performance computing (HPC), high performance artificial intelligence (HPAI), and large-scale data management to support simulation and modeling, data analytics, community data, and complex workflows.\r\n\r\nBridges-2 Regular Memory (RM) nodes provide extremely powerful general-purpose computing, machine learning and data analytics, AI inferencing, and pre- and post-processing. Each Bridges RM node consists of two AMD EPYC “Rome” 7742 64-core CPUs, 256-512GB of RAM, and 3.84TB NVMe SSD. 488 Bridges-2 RM nodes have 256GB RAM, and 16 have 512GB RAM for more memory-intensive applications (see also Bridges-2 Extreme Memory nodes, each of which has 4TB of RAM). Bridges-2 RM nodes are connected to other Bridges-2 compute nodes and its Ocean parallel filesystem and archive by HDR-200 InfiniBand.",
+    "recommendedUse": "Bridges-2 Regular Memory (RM) nodes provide extremely powerful general-purpose computing, machine learning and data analytics, AI inferencing, and pre- and post-processing. Their x86 CPUs support an extremely broad range of applications, and jobs can request anywhere from 1 core to all 64,512 cores of the Bridges-2 RM resource.",
+    "conversionFactor": "8.0145",
+    "userGuideUrl": "http://www.psc.edu/resources/bridges-2/user-guide",
+    "attributeSets": [],
+    "featureCategories": [
+      {
+        "categoryId": 103,
+        "categoryName": "Specialized Support",
+        "categoryDescription": "Special services offered by the resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 167,
+            "name": "ACCESS OnDemand",
+            "description": "An intuitive, innovative, and interactive interface to remote computing resources",
+            "isFilter": null
+          },
+          {
+            "featureId": 166,
+            "name": "ACCESS Pegasus",
+            "description": "Run Jobs and Workflows on ACCESS Resources from a Single Entry Point",
+            "isFilter": null
+          },
+          {
+            "featureId": 143,
+            "name": "Advance reservations",
+            "description": "has advance reservations",
+            "isFilter": null
+          },
+          {
+            "featureId": 146,
+            "name": "Science Gateway support",
+            "description": "Support for Science Gateways",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 139,
+            "name": "ACCESS Allocated",
+            "description": "Resource is allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 136,
+            "name": "CPU Compute",
+            "description": "General compute use",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 133,
+        "categoryName": "Resource Category",
+        "categoryDescription": "NAIRR Pilot Resource Category",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 232,
+            "name": "Federal agency systems",
+            "description": "Agency supercomputers and advanced architecture systems",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 531034,
+    "resourceName": "TAMU FASTER",
+    "displayResourceName": "TAMU FASTER",
+    "resourceType": "Compute",
+    "description": "1 SU = 1 core hour",
+    "units": "SUs",
+    "organization": "Texas A\u0026M University",
+    "resourceRepositoryKey": 145280,
+    "productionBeginDate": "2022-03-31",
+    "productionEndDate": "2025-09-30",
+    "resourceDescription": "FASTER (Fostering Accelerated Scientific Transformations, Education and Research) is funded by the NSF MRI program (Award #2019129) and provides a composable high-performance data-analysis and computing instrument.  The FASTER system has 180 compute nodes with 2 Intel 32-core Ice Lake processors and 256 GB RAM, and includes 240 NVIDIA GPUs (40 A100 and 200 T4 GPUs). Using LIQID’s composable technology, all 180 compute nodes have access to the pool of available GPUs, dramatically improving workflow scalability. FASTER will have HDR InfiniBand interconnection and access/share a 5PB usable high-performance storage system running Lustre filesystem. thirty percent of FASTER’s computing resources will be allocated to researchers nationwide through XSEDE’s XRAC process.",
+    "recommendedUse": "Workflows that can utilize multiple GPUs.",
+    "conversionFactor": "1.0",
+    "userGuideUrl": null,
+    "attributeSets": [],
+    "featureCategories": [
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 135,
+            "name": "Innovative / Novel Compute",
+            "description": "Unique, innovative or non-traditional compute resource",
+            "isFilter": null
+          },
+          {
+            "featureId": 134,
+            "name": "GPU Compute",
+            "description": "GPU use is the main purpose of this resource",
+            "isFilter": null
+          },
+          {
+            "featureId": 136,
+            "name": "CPU Compute",
+            "description": "General compute use",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 139,
+            "name": "ACCESS Allocated",
+            "description": "Resource is allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 102,
+        "categoryName": "Specialized Hardware",
+        "categoryDescription": "Key compute hardware components in this resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 141,
+            "name": "Composable hardware fabric",
+            "description": "Composable hardware fabric",
+            "isFilter": null
+          },
+          {
+            "featureId": 142,
+            "name": "Large Memory Nodes",
+            "description": "Specialized analysis nodes with large memory",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 103,
+        "categoryName": "Specialized Support",
+        "categoryDescription": "Special services offered by the resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 167,
+            "name": "ACCESS OnDemand",
+            "description": "An intuitive, innovative, and interactive interface to remote computing resources",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 530806,
+    "resourceName": "Indiana Jetstream2 GPU",
+    "displayResourceName": "Indiana Jetstream2 GPU",
+    "resourceType": "Compute",
+    "description": "Jetstream2 GPU VMs are charged 4x the number of vCPUs per hour because of the associated GPU capability. For example, the g3.large VM costs 64 SUs per hour. VM sizes and cost per hour are available at \u003ca href=\"https://docs.jetstream-cloud.org/general/vmsizes/\"\u003ethe Jetstream2 website\u003c/a\u003e.",
+    "units": "SUs",
+    "organization": "Indiana University",
+    "resourceRepositoryKey": 145447,
+    "productionBeginDate": "2021-10-01",
+    "productionEndDate": "2025-09-30",
+    "resourceDescription": "Jetstream2 GPU is a hybrid-cloud platform that provides flexible, on-demand, programmable cyberinfrastructure tools ranging from interactive virtual machine services to a variety of infrastructure and orchestration services for research and education. This particular portion of the resource is allocated separately from the primary resource and contains 360 NVIDIA A100 GPUs -- 4 GPUs per node, 128 AMD Milan cores, and 512gb RAM connected by 100gbps ethernet to the spine.",
+    "recommendedUse": "For the researcher needing GPUs for virtual machine services on demand as well as for software creators and researchers needing to create their own customized virtual machine environments. Additional use cases are for research-supporting infrastructure services that need to be \"always on\" as well as science gateway services and for education support, providing virtual machines for students. \r\n\r\nThe A100 GPUs on Jetstream2-GPU are well-suited for machine learning/deep learning projects and other codes optimized for GPU usage. They also may be utilized for some graphical/desktop applications with some effort.",
+    "conversionFactor": "8.0145",
+    "userGuideUrl": "https://docs.jetstream-cloud.org/",
+    "attributeSets": [],
+    "featureCategories": [
+      {
+        "categoryId": 103,
+        "categoryName": "Specialized Support",
+        "categoryDescription": "Special services offered by the resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 166,
+            "name": "ACCESS Pegasus",
+            "description": "Run Jobs and Workflows on ACCESS Resources from a Single Entry Point",
+            "isFilter": null
+          },
+          {
+            "featureId": 146,
+            "name": "Science Gateway support",
+            "description": "Support for Science Gateways",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 139,
+            "name": "ACCESS Allocated",
+            "description": "Resource is allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 134,
+            "name": "GPU Compute",
+            "description": "GPU use is the main purpose of this resource",
+            "isFilter": null
+          },
+          {
+            "featureId": 133,
+            "name": "Cloud",
+            "description": "Cloud Resource",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 133,
+        "categoryName": "Resource Category",
+        "categoryDescription": "NAIRR Pilot Resource Category",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 232,
+            "name": "Federal agency systems",
+            "description": "Agency supercomputers and advanced architecture systems",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 530484,
+    "resourceName": "PSC Bridges-2 GPU (PSC Bridges-2 GPU)",
+    "displayResourceName": "PSC Bridges-2 GPU (PSC Bridges-2 GPU)",
+    "resourceType": "Compute",
+    "description": "1 SU = 1 GPU hour",
+    "units": "GPU Hours",
+    "organization": "Pittsburgh Supercomputing Center",
+    "resourceRepositoryKey": 145124,
+    "productionBeginDate": "2021-02-11",
+    "productionEndDate": "2025-09-30",
+    "resourceDescription": "Bridges-2 combines high-performance computing (HPC), high performance artificial intelligence (HPAI), and large-scale data management to support simulation and modeling, data analytics, community data, and complex workflows.\r\n\r\nBridges-2 Accelerated GPU (GPU) nodes are optimized for scalable artificial intelligence (AI; deep learning). They are also available for accelerated simulation and modeling applications. Bridges-2 GPU nodes each contain 8 NVIDIA Tesla V100-32GB SXM2 GPUs, providing 40,960 CUDA cores and 5,120 tensor cores. In addition, each node holds 2 Intel Xeon Gold 6248 CPUs; 512GB of DDR4-2933 RAM; and 7.68TB NVMe SSD. They are connected to Bridges-2's other compute nodes and its Ocean parallel filesystem and archive by two HDR-200 InfiniBand links, providing 400Gbps of bandwidth to enhance scalability of deep learning training.",
+    "recommendedUse": "Bridges-2 GPU nodes are optimized for scalable artificial intelligence (AI) including deep learning training, deep reinforcement learning, and generative techniques - as well as for accelerated simulation and modeling.",
+    "conversionFactor": "431.55",
+    "userGuideUrl": "http://www.psc.edu/resources/bridges-2/user-guide",
+    "attributeSets": [],
+    "featureCategories": [
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 139,
+            "name": "ACCESS Allocated",
+            "description": "Resource is allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 103,
+        "categoryName": "Specialized Support",
+        "categoryDescription": "Special services offered by the resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 166,
+            "name": "ACCESS Pegasus",
+            "description": "Run Jobs and Workflows on ACCESS Resources from a Single Entry Point",
+            "isFilter": null
+          },
+          {
+            "featureId": 167,
+            "name": "ACCESS OnDemand",
+            "description": "An intuitive, innovative, and interactive interface to remote computing resources",
+            "isFilter": null
+          },
+          {
+            "featureId": 143,
+            "name": "Advance reservations",
+            "description": "has advance reservations",
+            "isFilter": null
+          },
+          {
+            "featureId": 146,
+            "name": "Science Gateway support",
+            "description": "Support for Science Gateways",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 134,
+            "name": "GPU Compute",
+            "description": "GPU use is the main purpose of this resource",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 133,
+        "categoryName": "Resource Category",
+        "categoryDescription": "NAIRR Pilot Resource Category",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 232,
+            "name": "Federal agency systems",
+            "description": "Agency supercomputers and advanced architecture systems",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 530209,
+    "resourceName": "Science Gateways Center of Excellence (SGX3)",
+    "displayResourceName": "Science Gateways Center of Excellence (SGX3)",
+    "resourceType": "Program",
+    "description": "",
+    "units": "Yes / No",
+    "organization": "Science Gateways Community Institute",
+    "resourceRepositoryKey": 144601,
+    "productionBeginDate": "2016-08-01",
+    "productionEndDate": "2027-08-31",
+    "resourceDescription": "The Science Gateways Community Institute (SGCI) and the follow-on SGX3 NSF Center of Excellence projects support science gateways through both complementary and paid services. Complementary services include assistance with proposal development, a technical consultancy to help science gateway providers define their system architectures and choose technologies, a usability/user experience consultancy to help design effective user interfaces, and sustainability training programs to help science gateway providers with long term operations planning.\r\nFor more about science gateways and additional available services, please see https://sciencegateways.org/our-services/consulting-services.  An SGCI team member will contact allocated projects to help review and select specific services.",
+    "recommendedUse": "SGCI services can be used to develop entirely new gateways or improve existing gateways. The gateways do not need to make use of ACCESS compute resources (though they can). They could be gateways to data collections, instruments, sensor streams, citizen science engagement, etc.",
+    "conversionFactor": "8.0145",
+    "userGuideUrl": "http://www.sciencegateways.org/",
+    "attributeSets": [
+      {
+        "attributeSetId": 530701,
+        "attributeSetTypeId": 500008,
+        "attributeSetRelationTypeId": 500007,
+        "attributeSetName": "Science Gateway Name",
+        "relativeOrder": 1,
+        "isActive": true,
+        "attributes": [
+          {
+            "resourceAttributeId": 533321,
+            "attributeName": "Please enter your answer below:",
+            "description": null,
+            "isRequired": true,
+            "relativeOrder": 1
+          }
+        ]
+      },
+      {
+        "attributeSetId": 530702,
+        "attributeSetTypeId": 500008,
+        "attributeSetRelationTypeId": 500007,
+        "attributeSetName": "Science Gateway URL (if applicable)",
+        "relativeOrder": 2,
+        "isActive": true,
+        "attributes": [
+          {
+            "resourceAttributeId": 533322,
+            "attributeName": "Please enter your answer below:",
+            "description": null,
+            "isRequired": true,
+            "relativeOrder": 1
+          }
+        ]
+      },
+      {
+        "attributeSetId": 530703,
+        "attributeSetTypeId": 500008,
+        "attributeSetRelationTypeId": 500007,
+        "attributeSetName": "Other Team Members who will work on the project (optional; please include contact info for them)",
+        "relativeOrder": 3,
+        "isActive": true,
+        "attributes": [
+          {
+            "resourceAttributeId": 533323,
+            "attributeName": "Please enter your answer below:",
+            "description": null,
+            "isRequired": true,
+            "relativeOrder": 1
+          }
+        ]
+      },
+      {
+        "attributeSetId": 530704,
+        "attributeSetTypeId": 500008,
+        "attributeSetRelationTypeId": 500007,
+        "attributeSetName": "Project Description: Please provide a short description summarizing the science gateway project, its goals and functions, any technologies already in use, and the community that it serves or will serve.",
+        "relativeOrder": 4,
+        "isActive": true,
+        "attributes": [
+          {
+            "resourceAttributeId": 533324,
+            "attributeName": "Please enter your answer below:",
+            "description": null,
+            "isRequired": true,
+            "relativeOrder": 1
+          }
+        ]
+      },
+      {
+        "attributeSetId": 530705,
+        "attributeSetTypeId": 500008,
+        "attributeSetRelationTypeId": 500007,
+        "attributeSetName": "SGCI Services: Please provide a short description about what you would like to achieve by using the services of the Institute.",
+        "relativeOrder": 5,
+        "isActive": true,
+        "attributes": [
+          {
+            "resourceAttributeId": 533325,
+            "attributeName": "Please enter your answer below:",
+            "description": null,
+            "isRequired": true,
+            "relativeOrder": 1
+          }
+        ]
+      }
+    ],
+    "featureCategories": [
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 137,
+            "name": "Service / Other",
+            "description": "An allocated resource that's not compute or storage",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 139,
+            "name": "ACCESS Allocated",
+            "description": "Resource is allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 103,
+        "categoryName": "Specialized Support",
+        "categoryDescription": "Special services offered by the resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 146,
+            "name": "Science Gateway support",
+            "description": "Support for Science Gateways",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 531364,
+    "resourceName": "MATCHPlus",
+    "displayResourceName": "MATCHPlus",
+    "resourceType": "Program",
+    "description": "The ACCESS MATCHPlus short-term support partnership provides consulting support from an experienced mentor paired with a student-facilitator to help you address an immediate research need. These needs may include improvements like expanding your code functionality, transitioning from lab computers to HPC, or introducing new technologies into your workflow. For more information visit the ACCESS Support portal: https://support.access-ci.org/matchplus",
+    "units": "Yes / No",
+    "organization": "ACCESS Support",
+    "resourceRepositoryKey": 146003,
+    "productionBeginDate": "2022-10-24",
+    "productionEndDate": null,
+    "resourceDescription": null,
+    "recommendedUse": "MATCHPlus is an opportunity for researchers to get help with improvements like expanding your code functionality, transitioning from lab computers to HPC, or introducing new technologies into your workflow.",
+    "conversionFactor": null,
+    "userGuideUrl": "https://support.access-ci.org/matchplus",
+    "attributeSets": [
+      {
+        "attributeSetId": 535543,
+        "attributeSetTypeId": 500007,
+        "attributeSetRelationTypeId": 500007,
+        "attributeSetName": "Please let us know why you are requesting a MatchPlus project (e.g., graduate student, first time running on a supercomputer, a small or resource-constrained institution).",
+        "relativeOrder": 1,
+        "isActive": true,
+        "attributes": [
+          {
+            "resourceAttributeId": 536097,
+            "attributeName": "Please enter your answer",
+            "description": null,
+            "isRequired": true,
+            "relativeOrder": 1
+          }
+        ]
+      }
+    ],
+    "featureCategories": [
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 137,
+            "name": "Service / Other",
+            "description": "An allocated resource that's not compute or storage",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 139,
+            "name": "ACCESS Allocated",
+            "description": "Resource is allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 530483,
+    "resourceName": "PSC Bridges-2 Extreme Memory (PSC Bridges-2 EM)",
+    "displayResourceName": "PSC Bridges-2 Extreme Memory (PSC Bridges-2 EM)",
+    "resourceType": "Compute",
+    "description": "1 SU = 1 core hour",
+    "units": "Core-hours",
+    "organization": "Pittsburgh Supercomputing Center",
+    "resourceRepositoryKey": 145123,
+    "productionBeginDate": "2021-02-11",
+    "productionEndDate": "2025-09-30",
+    "resourceDescription": "Bridges-2 combines high-performance computing (HPC), high performance artificial intelligence (HPAI), and large-scale data management to support simulation and modeling, data analytics, community data, and complex workflows.\r\n\r\nBridges-2 Extreme Memory (EM) nodes enable memory-intensive  genome sequence assembly, graph analytics, in-memory databases, statistics, and other applications that need a large amount of memory and for which distributed-memory implementations are not available. Bridges-2 Extreme Memory (EM) nodes each consist of 4 Intel Xeon Platinum 8260M “Cascade Lake” CPUs, 4TB of DDR4-2933 RAM, 7.68TB NVMe SSD. They are connected to Bridges-2's other compute nodes and its Ocean parallel filesystem and archive by two HDR-200 InfiniBand links, providing 400Gbps of bandwidth to read or write data from each EM node.",
+    "recommendedUse": "Bridges-2 Extreme Memory (EM) nodes enable memory-intensive  genome sequence assembly, graph analytics, statistics, in-memory databases, and other applications that need a large amount of memory and for which distributed-memory implementations are not available. This includes memory-intensive applications implemented in languages such as Java, R, and Python. Their x86 CPUs support an extremely broad range of applications, and approximately 42GB of RAM per core provides valuable support for applications where memory capacity is the primary requirement.",
+    "conversionFactor": "71.558",
+    "userGuideUrl": "http://www.psc.edu/resources/bridges-2/user-guide",
+    "attributeSets": [],
+    "featureCategories": [
+      {
+        "categoryId": 103,
+        "categoryName": "Specialized Support",
+        "categoryDescription": "Special services offered by the resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 166,
+            "name": "ACCESS Pegasus",
+            "description": "Run Jobs and Workflows on ACCESS Resources from a Single Entry Point",
+            "isFilter": null
+          },
+          {
+            "featureId": 143,
+            "name": "Advance reservations",
+            "description": "has advance reservations",
+            "isFilter": null
+          },
+          {
+            "featureId": 146,
+            "name": "Science Gateway support",
+            "description": "Support for Science Gateways",
+            "isFilter": null
+          },
+          {
+            "featureId": 167,
+            "name": "ACCESS OnDemand",
+            "description": "An intuitive, innovative, and interactive interface to remote computing resources",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 139,
+            "name": "ACCESS Allocated",
+            "description": "Resource is allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 102,
+        "categoryName": "Specialized Hardware",
+        "categoryDescription": "Key compute hardware components in this resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 142,
+            "name": "Large Memory Nodes",
+            "description": "Specialized analysis nodes with large memory",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 136,
+            "name": "CPU Compute",
+            "description": "General compute use",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 133,
+        "categoryName": "Resource Category",
+        "categoryDescription": "NAIRR Pilot Resource Category",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 232,
+            "name": "Federal agency systems",
+            "description": "Agency supercomputers and advanced architecture systems",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 530478,
+    "resourceName": "SDSC Expanse CPU",
+    "displayResourceName": "SDSC Expanse CPU",
+    "resourceType": "Compute",
+    "description": "SDSC Expanse Dell/AMD Rome cluster with HDR InfiniBand designed to provide cyberinfrastructure for the long tail of science, covering a diverse application base with complex workflows.",
+    "units": "Core-hours",
+    "organization": "San Diego Supercomputer Center",
+    "resourceRepositoryKey": 145117,
+    "productionBeginDate": "2020-10-01",
+    "productionEndDate": "2025-10-01",
+    "resourceDescription": "Expanse is a Dell integrated compute cluster, with AMD Rome processors, 128 cores per node, interconnected with Mellanox HDR InfiniBand in a hybrid fat-tree topology. The compute node section of Expanse has a peak performance of 3.373 PF. Full bisection bandwidth is available at rack level (56 compute nodes) with HDR100 connectivity to each node. HDR200 switches are used at the rack level and 3:1 oversubscription cross-rack. Compute nodes feature 1TB of NVMe storage and 256GB of DRAM per node. The system also features 12PB of Lustre based performance storage (140GB/s aggregate), and 7PB of Ceph based object storage.",
+    "recommendedUse": "Expanse is designed to provide cyberinfrastructure for the long tail of science, covering a diverse application base with complex workflows. It features a rich base of preinstalled applications including commercial software like Gaussian, Abaqus, QChem, MATLAB, and IDL. The system is geared towards supporting capacity computing, optimized for quick turnaround on small/modest scale jobs. The local NVMes on each compute node are beneficial to applications that exhibit random access data patterns or require fast access to significant amounts of compute node local scratch space. Expanse supports containers and composable systems computing with dynamic capabilities enabled using tools such as Kubernetes and workflow software for e.g., continuum/edge computing applications.",
+    "conversionFactor": "8.0145",
+    "userGuideUrl": "https://www.sdsc.edu/support/user_guides/expanse.html",
+    "attributeSets": [
+      {
+        "attributeSetId": 536171,
+        "attributeSetTypeId": 500006,
+        "attributeSetRelationTypeId": 500004,
+        "attributeSetName": "Do your jobs require less than 4096 cores? Expanse CPU jobs are limited in size to 4096 cores (32 nodes). Up to 4096 single-core jobs are permitted simultaneously.",
+        "relativeOrder": 7,
+        "isActive": true,
+        "attributes": [
+          {
+            "resourceAttributeId": 536462,
+            "attributeName": "Yes",
+            "description": null,
+            "isRequired": true,
+            "relativeOrder": 1
+          },
+          {
+            "resourceAttributeId": 536463,
+            "attributeName": "No",
+            "description": null,
+            "isRequired": true,
+            "relativeOrder": 1
+          }
+        ]
+      }
+    ],
+    "featureCategories": [
+      {
+        "categoryId": 103,
+        "categoryName": "Specialized Support",
+        "categoryDescription": "Special services offered by the resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 166,
+            "name": "ACCESS Pegasus",
+            "description": "Run Jobs and Workflows on ACCESS Resources from a Single Entry Point",
+            "isFilter": null
+          },
+          {
+            "featureId": 143,
+            "name": "Advance reservations",
+            "description": "has advance reservations",
+            "isFilter": null
+          },
+          {
+            "featureId": 167,
+            "name": "ACCESS OnDemand",
+            "description": "An intuitive, innovative, and interactive interface to remote computing resources",
+            "isFilter": null
+          },
+          {
+            "featureId": 146,
+            "name": "Science Gateway support",
+            "description": "Support for Science Gateways",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 139,
+            "name": "ACCESS Allocated",
+            "description": "Resource is allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 102,
+        "categoryName": "Specialized Hardware",
+        "categoryDescription": "Key compute hardware components in this resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 142,
+            "name": "Large Memory Nodes",
+            "description": "Specialized analysis nodes with large memory",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 136,
+            "name": "CPU Compute",
+            "description": "General compute use",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 133,
+        "categoryName": "Resource Category",
+        "categoryDescription": "NAIRR Pilot Resource Category",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 232,
+            "name": "Federal agency systems",
+            "description": "Agency supercomputers and advanced architecture systems",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 530480,
+    "resourceName": "SDSC Expanse GPU",
+    "displayResourceName": "SDSC Expanse GPU",
+    "resourceType": "Compute",
+    "description": "SDSC Expanse Dell/NVIDIA V100 cluster with NVLINK and HDR InfiniBand recommend to be used for accelerating codes optimized to take advantage of GPUs.",
+    "units": "GPU Hours",
+    "organization": "San Diego Supercomputer Center",
+    "resourceRepositoryKey": 145118,
+    "productionBeginDate": "2020-10-01",
+    "productionEndDate": "2025-10-01",
+    "resourceDescription": "Expanse is a Dell integrated compute cluster, with AMD Rome processors, NVIDIA V100 GPUs, interconnected with Mellanox HDR InfiniBand in a hybrid fat-tree topology. The GPU component of Expanse features 52 GPU nodes, each containing four NVIDIA V100s (32 GB SMX2), connected via NVLINK, and dual 20-core Intel Xeon 6248 CPUs. They feature 1.6TB of NVMe storage and 256GB of DRAM per node. There is HDR100 connectivity to each node. The system also features 12PB of Lustre based performance storage (140GB/s aggregate), and 7PB of Ceph based object storage.",
+    "recommendedUse": "GPUs are a specialized resource that performs well for certain classes of algorithms and applications. Recommend to be used for accelerating simulation codes optimized to take advantage of GPUs (using CUDA, OpenACC). There is a large and growing base of community codes that have been optimized for GPUs including those in molecular dynamics, and machine learning. GPU-enabled applications on Expanse will include: AMBER, Gromacs, BEAST, OpenMM, NAMD, TensorFlow, and PyTorch.",
+    "conversionFactor": "431.55",
+    "userGuideUrl": "https://www.sdsc.edu/support/user_guides/expanse.html",
+    "attributeSets": [
+      {
+        "attributeSetId": 536170,
+        "attributeSetTypeId": 500006,
+        "attributeSetRelationTypeId": 500004,
+        "attributeSetName": "Do your jobs require less than 16 GPUs in a single job? Expanse GPU jobs are limited in size to 16 GPUs (4 nodes). Up to 24 single GPU-node jobs are permitted simultaneously.",
+        "relativeOrder": 7,
+        "isActive": true,
+        "attributes": [
+          {
+            "resourceAttributeId": 536460,
+            "attributeName": "Yes",
+            "description": null,
+            "isRequired": true,
+            "relativeOrder": 1
+          },
+          {
+            "resourceAttributeId": 536461,
+            "attributeName": "No",
+            "description": null,
+            "isRequired": true,
+            "relativeOrder": 1
+          }
+        ]
+      }
+    ],
+    "featureCategories": [
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 139,
+            "name": "ACCESS Allocated",
+            "description": "Resource is allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 103,
+        "categoryName": "Specialized Support",
+        "categoryDescription": "Special services offered by the resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 166,
+            "name": "ACCESS Pegasus",
+            "description": "Run Jobs and Workflows on ACCESS Resources from a Single Entry Point",
+            "isFilter": null
+          },
+          {
+            "featureId": 143,
+            "name": "Advance reservations",
+            "description": "has advance reservations",
+            "isFilter": null
+          },
+          {
+            "featureId": 146,
+            "name": "Science Gateway support",
+            "description": "Support for Science Gateways",
+            "isFilter": null
+          },
+          {
+            "featureId": 167,
+            "name": "ACCESS OnDemand",
+            "description": "An intuitive, innovative, and interactive interface to remote computing resources",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 134,
+            "name": "GPU Compute",
+            "description": "GPU use is the main purpose of this resource",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 133,
+        "categoryName": "Resource Category",
+        "categoryDescription": "NAIRR Pilot Resource Category",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 232,
+            "name": "Federal agency systems",
+            "description": "Agency supercomputers and advanced architecture systems",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 531529,
+    "resourceName": "TAMU ACES",
+    "displayResourceName": "TAMU ACES",
+    "resourceType": "Compute",
+    "description": "",
+    "units": "SUs",
+    "organization": "Texas A\u0026M University",
+    "resourceRepositoryKey": 146168,
+    "productionBeginDate": "2023-04-14",
+    "productionEndDate": "2026-09-30",
+    "resourceDescription": "ACES is a Dell cluster with a rich accelerator testbed consisting of Intel Max GPUs (Graphics Processing Units), Intel FPGAs (Field Programmable Gate Arrays), NVIDIA H100 and A30 GPUs, NEC Vector Engines, NextSilicon co-processors, Graphcore IPUs (Intelligence Processing Units). The ACES cluster consists of compute nodes using a mix of the following processors:\r\n\r\nIntel Xeon 8468 Sapphire Rapids processors\r\nIntel Xeon Ice Lake 8352Y processors\r\nIntel Xeon Cascade Lake 8268 processors\r\nAMD Epyc Rome 7742 processors\r\n\r\nThe compute nodes are interconnected with NVIDIA NDR200 connections for MPI and access to the Lustre storage. The Intel Optane SSDs and all accelerators (except the Graphcore IPUs and NEC Vector Engines) are accessed using Liqid's composable infrustructre via PCIe (Peripheral Component Interconnect express) Gen4 and Gen5 fabrics.",
+    "recommendedUse": "Machine Learning (ML), Artificial Intelligence (AI), and workflows that can utilize novel accelerators and/or multiple GPUs.",
+    "conversionFactor": "1.0",
+    "userGuideUrl": "https://hprc.tamu.edu/kb/Quick-Start/ACES",
+    "attributeSets": [],
+    "featureCategories": [
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 139,
+            "name": "ACCESS Allocated",
+            "description": "Resource is allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 134,
+            "name": "GPU Compute",
+            "description": "GPU use is the main purpose of this resource",
+            "isFilter": null
+          },
+          {
+            "featureId": 135,
+            "name": "Innovative / Novel Compute",
+            "description": "Unique, innovative or non-traditional compute resource",
+            "isFilter": null
+          },
+          {
+            "featureId": 136,
+            "name": "CPU Compute",
+            "description": "General compute use",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 102,
+        "categoryName": "Specialized Hardware",
+        "categoryDescription": "Key compute hardware components in this resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 141,
+            "name": "Composable hardware fabric",
+            "description": "Composable hardware fabric",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 103,
+        "categoryName": "Specialized Support",
+        "categoryDescription": "Special services offered by the resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 167,
+            "name": "ACCESS OnDemand",
+            "description": "An intuitive, innovative, and interactive interface to remote computing resources",
+            "isFilter": null
+          },
+          {
+            "featureId": 146,
+            "name": "Science Gateway support",
+            "description": "Support for Science Gateways",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 133,
+        "categoryName": "Resource Category",
+        "categoryDescription": "NAIRR Pilot Resource Category",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 232,
+            "name": "Federal agency systems",
+            "description": "Agency supercomputers and advanced architecture systems",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 531760,
+    "resourceName": "SDSC Voyager (Habana Training and Inference Processor based AI System)",
+    "displayResourceName": "SDSC Voyager (Habana Training and Inference Processor based AI System)",
+    "resourceType": "Compute",
+    "description": "SDSC Voyager cluster with Intel Habana Gaudi training processors for deep learning applications. Voyager does not have general-purpose GPUs. The Gaudi training processors are custom designed and optimized for deep learning. Only AI/scientific applications that feature deep learning are recommended for use on this system.\r\n",
+    "units": "Gaudi-hours",
+    "organization": "San Diego Supercomputer Center",
+    "resourceRepositoryKey": 146630,
+    "productionBeginDate": "2022-05-01",
+    "productionEndDate": null,
+    "resourceDescription": "Voyager is a heterogeneous system designed to support complex deep learning AI workflows. The system features 42 Intel Habana Gaudi training nodes, each with 8 training processors (336 in total). Each training node has 512GB of memory and 6.4TB of node local NVMe storage. The Gaudi training processors feature specialized hardware units for AI, HBM2, and on-chip high-speed Ethernet. The on-chip ethernet ports are used in a non-blocking all-to-all network between processors on a node and the remaining ports are aggregated into 6 400G connections on each node that are plugged into a 400G Arista switch to provide scale out of network. Voyager also has two first-generation inference nodes, each with 8 inference processors (16 in total). In addition to the custom AI hardware, the system also has 36 Intel x86 processors compute nodes for general purpose computing and data processing. Voyager features 3PB of storage currently deployed as a Ceph filesystem.",
+    "recommendedUse": "Voyager invites researchers in science and engineering that are dependent upon artificial intelligence and deep learning as a critical element in their experimental and/or computational work. It provides researchers the ability to work with extremely large data sets using standard AI tools, like TensorFlow and PyTorch, or develop their own deep learning models using developer tools and libraries from Habana Labs. Voyager is currently in the testbed phase and accepting researchers through a RP managed allocation process. Interested researchers are requested to contact SDSC via email at consult@sdsc.edu.",
+    "conversionFactor": null,
+    "userGuideUrl": "https://sdsc.edu/support/user_guides/voyager.html",
+    "attributeSets": [],
+    "featureCategories": [
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 135,
+            "name": "Innovative / Novel Compute",
+            "description": "Unique, innovative or non-traditional compute resource",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 140,
+            "name": "RP-managed process",
+            "description": "Resource is not allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 133,
+        "categoryName": "Resource Category",
+        "categoryDescription": "NAIRR Pilot Resource Category",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 232,
+            "name": "Federal agency systems",
+            "description": "Agency supercomputers and advanced architecture systems",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 531727,
+    "resourceName": "PSC Neocortex (PSC Neocortex - Cerebras Wafer Scale Engine AI Accelerator)",
+    "displayResourceName": "PSC Neocortex (PSC Neocortex - Cerebras Wafer Scale Engine AI Accelerator)",
+    "resourceType": "Compute",
+    "description": "The Neocortex is a testbed system incorporating the Cerebras Wafer Engine (WSE), an accelerator initially designed for optimizing AI training and inferencing. Since its introduction a few years ago, the chip has demonstrated its effectiveness in accelerating specific non-AI workflows as well. Notably, the WSE is utilized in lieu of other accelerators, such as GPUs.\r\n\r\nNeocortex projects are expected to require the powerful compute capabilities offered by the Cerebras server and the wafer scale engine chip. Neocortex is ideal for a well-defined group of foundation and large language models. Please refer to \u003ca href=\"https://portal.neocortex.psc.edu/docs/index.html\" target=\"_blank\"\u003ethe Neocortex user guide\u003c/a\u003e for more information on the models supported and the type of applications ideally suited for Neocortex.",
+    "units": "CS-2 Hours",
+    "organization": "Pittsburgh Supercomputing Center",
+    "resourceRepositoryKey": 146597,
+    "productionBeginDate": "2023-12-01",
+    "productionEndDate": null,
+    "resourceDescription": "Neocortex is a highly innovative advanced computing system ideal for foundation and large language models. Neocortex, which captures promising specialized innovative hardware technologies, is designed to vastly accelerate large deep learning (DL) models and high- performance computing (HPC) research in pursuit of science, discovery, and societal good. Neocortex features two Cerebras CS-2 systems, provisioned by an HPE Superdome Flex HPC server and the Bridges-2 filesystems. Each CS-2 system features a Cerebras WSE-2 (Wafer Scale Engine 2), the largest chip ever built, with 850,000 Sparse Linear Algebra Compute cores, 40 GB SRAM on-chip memory, 20 PB/s aggregate memory bandwidth and 220 Pb/s interconnect bandwidth. The HPE Superdome Flex (SDF) features 32 Intel Xeon Platinum 8280L CPUs with 28 cores (56 threads) each, 2.70-4.0 GHz, 38.5 MB cache, 24 TiB RAM, aggregate memory bandwidth of 4.5 TB/s, and 204.6 TB aggregate local storage capacity with 150 GB/s read bandwidth. The SDF can provide 1.2 Tb/s to each CS-2 system and 1.6 Tb/s from the Bridges-2 filesystems. Jobs are submitted via SLURM. The CS-2 systems can run customized TensorFlow and Pytorch containers, as well as programs written using the Cerebras SDK or the WSE Field Equation API.",
+    "recommendedUse": "Neocortex, a system that captures promising innovative hardware technologies, is designed to accelerate Deep Learning (DL) and High Performance Computing (HPC) research in pursuit of science, discovery, and societal good. Currently recommended DL projects focus on foundation and large language models such as BERT, GPT-J, and Transformer, or combine supported TensorFlow or PyTorch layers. DL codes can also be developed “from scratch” using the Cerebras Software Development Toolkit (SDK). The SDK can be used to develop HPC codes, such as structured grid based PDE and ODE solvers and particle methods with regular communication. Interested researchers are encouraged to contact PSC via email at neocortex@psc.edu to address comments and questions.",
+    "conversionFactor": "17631.9",
+    "userGuideUrl": "https://www.cmu.edu/psc/aibd/neocortex/",
+    "attributeSets": [
+      {
+        "attributeSetId": 536038,
+        "attributeSetTypeId": 500007,
+        "attributeSetRelationTypeId": 500006,
+        "attributeSetName": "Describe your research team (*). Please, describe your research team and make sure to include expected roles in the proposed research, current affiliation, academic status, and relevant experience. Links to professional pages or attached documents that describe relevant experience and qualifications are welcomed.",
+        "relativeOrder": 1,
+        "isActive": true,
+        "attributes": [
+          {
+            "resourceAttributeId": 536394,
+            "attributeName": "Please enter your answer",
+            "description": null,
+            "isRequired": false,
+            "relativeOrder": 1
+          }
+        ]
+      },
+      {
+        "attributeSetId": 536039,
+        "attributeSetTypeId": 500007,
+        "attributeSetRelationTypeId": 500006,
+        "attributeSetName": "Describe your data and the total storage requirements in GB (*). Please, describe your data format and size in GB. Make sure to request as many GB of PSC Bridges-2 Ocean storage.",
+        "relativeOrder": 2,
+        "isActive": true,
+        "attributes": [
+          {
+            "resourceAttributeId": 536395,
+            "attributeName": "Please enter your answer",
+            "description": null,
+            "isRequired": false,
+            "relativeOrder": 1
+          }
+        ]
+      },
+      {
+        "attributeSetId": 535576,
+        "attributeSetTypeId": 500008,
+        "attributeSetRelationTypeId": 500005,
+        "attributeSetName": "There are four types of applications currently supported on the Neocortex system, divided into the following individual tracks:\n\n    Track 1: Cerebras modelzoo ML models\n    Track 2: Models similar to the Cerebras modelzoo models\n    Track 3: General purpose SDK\n    Track 4: WFA, WSE Field-equation API\n\nPlease see:\n\n https://portal.neocortex.psc.edu/docs/index.html\n\nfor further details.",
+        "relativeOrder": 3,
+        "isActive": true,
+        "attributes": [
+          {
+            "resourceAttributeId": 536130,
+            "attributeName": "Track 1: Cerebras modelzoo ML models",
+            "description": null,
+            "isRequired": true,
+            "relativeOrder": 1
+          },
+          {
+            "resourceAttributeId": 536131,
+            "attributeName": "Track 2: Models similar to the Cerebras modelzoo models",
+            "description": null,
+            "isRequired": true,
+            "relativeOrder": 2
+          },
+          {
+            "resourceAttributeId": 536132,
+            "attributeName": "Track 3: General purpose SDK",
+            "description": null,
+            "isRequired": true,
+            "relativeOrder": 3
+          },
+          {
+            "resourceAttributeId": 536133,
+            "attributeName": "Track 4: WFA, WSE Field-equation API",
+            "description": null,
+            "isRequired": true,
+            "relativeOrder": 4
+          }
+        ]
+      },
+      {
+        "attributeSetId": 536040,
+        "attributeSetTypeId": 500007,
+        "attributeSetRelationTypeId": 500006,
+        "attributeSetName": "Did you address all the questions associated with the track(s) in an attached application PDF document? (*). The track specific questions are available at https://portal.neocortex.psc.edu/docs/index.html. Failure to address these questions may result in your submission being rejected without review.",
+        "relativeOrder": 4,
+        "isActive": true,
+        "attributes": [
+          {
+            "resourceAttributeId": 536396,
+            "attributeName": "Please enter your answer",
+            "description": null,
+            "isRequired": false,
+            "relativeOrder": 1
+          }
+        ]
+      }
+    ],
+    "featureCategories": [
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 135,
+            "name": "Innovative / Novel Compute",
+            "description": "Unique, innovative or non-traditional compute resource",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 140,
+            "name": "RP-managed process",
+            "description": "Resource is not allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 133,
+        "categoryName": "Resource Category",
+        "categoryDescription": "NAIRR Pilot Resource Category",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 232,
+            "name": "Federal agency systems",
+            "description": "Agency supercomputers and advanced architecture systems",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 530770,
+    "resourceName": "Purdue Anvil CPU",
+    "displayResourceName": "Purdue Anvil CPU",
+    "resourceType": "Compute",
+    "description": "1 Anvil CPU Service Unit = 1 Core Hour on a regular node\r\n4 Anvil CPU Service Units = 1 Core Hour on a large memory node\r\n",
+    "units": "SUs",
+    "organization": "Purdue University",
+    "resourceRepositoryKey": 145411,
+    "productionBeginDate": "2021-10-01",
+    "productionEndDate": "2026-10-01",
+    "resourceDescription": "Purdue's Anvil cluster built in partnership with Dell and AMD consists of 1,000 nodes with two 64-core AMD EPYC \"Milan\" processors each and delivers over 1 billion CPU core hours each year, with a peak performance of 5.1 petaflops. Each of these nodes has 256GB of DDR4-3200 memory. A separate set of 32 large memory nodes has 1TB of DDR4-3200 memory each. Anvil's nodes are interconnected with 100 Gbps Mellanox HDR100 InfiniBand.",
+    "recommendedUse": "Anvil's general-purpose CPUs and 128 cores per node make it suitable for many types of CPU-based workloads including the most common modeling and simulation codes across all science and engineering domains. Memory-intensive workloads can be executed on the large memory nodes on Anvil. Anvil’s Composable Subsystem which is a Kubernetes based private cloud consists of both CPU and GPU nodes and large (S3) data storage. The Composable Subsystem is suitable for applications such as model inference service (via NVIDIA Triton), Specialized LLMs, dataset hosting, science gateways and web application hosting, and classroom and training applications via interactive access interfaces.",
+    "conversionFactor": "9.6174",
+    "userGuideUrl": "https://www.rcac.purdue.edu/anvil#docs",
+    "attributeSets": [],
+    "featureCategories": [
+      {
+        "categoryId": 103,
+        "categoryName": "Specialized Support",
+        "categoryDescription": "Special services offered by the resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 166,
+            "name": "ACCESS Pegasus",
+            "description": "Run Jobs and Workflows on ACCESS Resources from a Single Entry Point",
+            "isFilter": null
+          },
+          {
+            "featureId": 167,
+            "name": "ACCESS OnDemand",
+            "description": "An intuitive, innovative, and interactive interface to remote computing resources",
+            "isFilter": null
+          },
+          {
+            "featureId": 146,
+            "name": "Science Gateway support",
+            "description": "Support for Science Gateways",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 139,
+            "name": "ACCESS Allocated",
+            "description": "Resource is allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 102,
+        "categoryName": "Specialized Hardware",
+        "categoryDescription": "Key compute hardware components in this resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 142,
+            "name": "Large Memory Nodes",
+            "description": "Specialized analysis nodes with large memory",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 136,
+            "name": "CPU Compute",
+            "description": "General compute use",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 133,
+        "categoryName": "Resource Category",
+        "categoryDescription": "NAIRR Pilot Resource Category",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 232,
+            "name": "Federal agency systems",
+            "description": "Agency supercomputers and advanced architecture systems",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 530574,
+    "resourceName": "Kentucky Research Informatics Cloud (KyRIC) Large Memory Nodes",
+    "displayResourceName": "Kentucky Research Informatics Cloud (KyRIC) Large Memory Nodes",
+    "resourceType": "Compute",
+    "description": "Each Core hr is 1 CPU core with a default memory of 75GB RAM/core",
+    "units": "Core-hours",
+    "organization": "University of Kentucky",
+    "resourceRepositoryKey": 145213,
+    "productionBeginDate": "2021-04-01",
+    "productionEndDate": "2025-03-31",
+    "resourceDescription": "Five large memory compute nodes dedicated for XSEDE allocation. Each of these nodes have 40 cores (Broadwell class and lntel(R) Xeon(R) CPU E7-4820 v4 @ 2.00GHz with 4 sockets, 10 cores/socket), 3TB RAM, and 6TB SSD storage drives. The 5 dedicated XSEDE nodes will have exclusive access to approximately 300 TB of network attached disk storage. All these compute nodes are interconnected through a 100 Gigabit Ethernet (l00GbE) backbone and the cluster login and data transfer nodes will be connected through a 100Gb uplink to lnternet2 for external connections.",
+    "recommendedUse": "Large memory nodes are increasingly needed by a wide range of XSEDE researchers, particularly researchers working with big data such as massive NLP data sets used in many research domains or the massive genomes required by computational biology and bioinformatics.",
+    "conversionFactor": "8.01",
+    "userGuideUrl": "https://xsedetoaccess.ccs.uky.edu/confluence/redirect/KyRIC+Kentucky.html",
+    "attributeSets": [],
+    "featureCategories": [
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 136,
+            "name": "CPU Compute",
+            "description": "General compute use",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 139,
+            "name": "ACCESS Allocated",
+            "description": "Resource is allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 102,
+        "categoryName": "Specialized Hardware",
+        "categoryDescription": "Key compute hardware components in this resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 142,
+            "name": "Large Memory Nodes",
+            "description": "Specialized analysis nodes with large memory",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 103,
+        "categoryName": "Specialized Support",
+        "categoryDescription": "Special services offered by the resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 167,
+            "name": "ACCESS OnDemand",
+            "description": "An intuitive, innovative, and interactive interface to remote computing resources",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 532123,
+    "resourceName": "PSC Neocortex Superdome Flex Server",
+    "displayResourceName": "PSC Neocortex Superdome Flex Server",
+    "resourceType": "Compute",
+    "description": "",
+    "units": "Core-hours",
+    "organization": "Pittsburgh Supercomputing Center",
+    "resourceRepositoryKey": 147026,
+    "productionBeginDate": "2024-04-15",
+    "productionEndDate": null,
+    "resourceDescription": "Neocortex is a highly innovative resource that targets the acceleration of AI-powered scientific discovery by vastly shortening the time required for deep learning training, fostering greater integration of artificial deep learning with scientific workflows, and providing revolutionary new hardware for the development of more efficient algorithms for artificial intelligence and high performance computing. \r\n\r\nThe HPE Superdome Flex (SDFlex) features 32 Intel Xeon Platinum 8280L CPUs with 28 cores (56 threads) each, 2.70-4.0 GHz, 38.5 MB cache, 24 TiB RAM, aggregate memory bandwidth of 4.5 TB/s, and 204.6 TB aggregate local storage capacity with 150 GB/s read bandwidth. The SDF can provide 1.2 Tb/s to each CS-2 system and 1.6 Tb/s from the Bridges-2 filesystems.",
+    "recommendedUse": null,
+    "conversionFactor": "80.145",
+    "userGuideUrl": "portal.neocortex.psc.edu",
+    "attributeSets": [],
+    "featureCategories": [
+      {
+        "categoryId": 101,
+        "categoryName": "Allocations",
+        "categoryDescription": "Whether resource is allocated by ACCESS or not",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 139,
+            "name": "ACCESS Allocated",
+            "description": "Resource is allocated by ACCESS",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 133,
+        "categoryName": "Resource Category",
+        "categoryDescription": "NAIRR Pilot Resource Category",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 232,
+            "name": "Federal agency systems",
+            "description": "Agency supercomputers and advanced architecture systems",
+            "isFilter": null
+          }
+        ]
+      },
+      {
+        "categoryId": 100,
+        "categoryName": "Resource Type",
+        "categoryDescription": "The general kind of resource",
+        "categoryIsFilter": true,
+        "features": [
+          {
+            "featureId": 135,
+            "name": "Innovative / Novel Compute",
+            "description": "Unique, innovative or non-traditional compute resource",
+            "isFilter": null
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "resourceId": 530204,
+    "resourceName": "TACC Dell/Intel Knights Landing, Skylake System (Stampede2)",
+    "displayResourceName": "TACC Dell/Intel Knights Landing, Skylake System (Stampede2)",
+    "resourceType": "Compute",
+    "description": "Stampede 2 is allocated in service units (SU)s. An SU is defined as 1 wall-clock node hour. Allocations awarded on Stampede2 may be used on either or both node types.",
+    "units": "Node Hours",
+    "organization": "Texas Advanced Computing Center",
+    "resourceRepositoryKey": 144584,
+    "productionBeginDate": "2017-06-13",
+    "productionEndDate": "2023-09-30",
+    "resourceDescription": "PLEASE NOTE THAT STAMPEDE2 WILL NO LONGER BE AVAILABLE AS OF JULY 1, 2023.  If you require larger scale resources you should consider the leadership computing capabilities of Frontera https://frontera-portal.tacc.utexas.edu/allocations/  Otherwise we are currently recommending PI's who are new to ACCESS to consider other resources.\r\n\r\nThe Stampede2 Dell/Intel Knights Landing (KNL), Skylake (SKX) System provides the user community access to two Intel Xeon compute technologies.\r\n\r\nThe system is configured with 4204 Dell KNL compute nodes, each with a stand-alone Intel Xeon Phi Knights Landing bootable processor.  Each KNL node includes 68 cores, 16GB MCDRAM, 96GB DDR-4 memory and a 200GB SSD drive.  \r\n\r\nStampede2 also includes 1736 Intel Xeon Skylake (SKX) nodes and additional management nodes. Each SKX includes 48 cores, 192GB DDR-4 memory, and a 200GB SSD.\r\n\r\nAllocations awarded on Stampede2 may be used on either or both of the node types.\r\n\r\nCompute nodes have access to dedicated Lustre Parallel file systems totaling 28PB raw, provided by Cray. An Intel Omni-Path Architecture switch fabric connects the nodes and storage through a fat-tree topology with a point to point bandwidth of 100 Gb/s (unidirectional speed). 16 additional login and management servers complete the system. Stampede2 will deliver an estimated 18PF of peak performance.\r\n\r\nPlease see the Stampede2 User Guide for detailed information on the system and how to most effectively use it.\r\n\r\nhttps://portal.tacc.utexas.edu/user-guides/stampede2",
+    "recommendedUse": "Stampede2 is intended primarily for parallel applications scalable to tens of thousands of cores, as well as general purpose and throughput computing. Normal batch queues will enable users to run simulations up to 48 hours. Jobs requiring run times and more cores than allowed by the normal queues will be run in a special queue after approval of TACC staff. normal, serial and development queues are configured as well as special purpose queues.",
+    "conversionFactor": "143.719",
+    "userGuideUrl": "https://docs.tacc.utexas.edu/hpc/stampede2/",
+    "attributeSets": [],
+    "featureCategories": []
+  }
+]
diff --git a/src/base.css b/src/base.css
index f65199f..8a7b2b5 100644
--- a/src/base.css
+++ b/src/base.css
@@ -3,6 +3,8 @@
   --contrast: #232323;
   --contrast-2: #3f3f3f;
   --contrast-3: #707070;
+  --contrast-6: #999999;
+  --contrast-9: #f2f2f2;
   --orange-200: #f6d8ca;
   --orange-400: #f07537;
   --teal-100: #cee8e9;
diff --git a/src/content.css b/src/content.css
index a9674f1..1bb4fa9 100644
--- a/src/content.css
+++ b/src/content.css
@@ -10,10 +10,15 @@ h1 {
   margin-top: 60px;
 }
 h2 {
-  font-size: 24px;
-  font-weight: 700;
+  font-size: 22px;
+  font-weight: 800;
   margin-top: 36px;
 }
+h3 {
+  color: var(--teal-700);
+  font-size: 18px;
+  font-weight: 800;
+}
 a {
   color: var(--contrast);
   font-weight: 800;
@@ -25,3 +30,23 @@ a:hover {
   color: var(--teal-600);
   text-decoration: none;
 }
+.btn {
+  font-size: 24px;
+  font-weight: 700;
+  text-transform: uppercase;
+}
+.btn-lite {
+  background-color: white;
+  border: 1px solid var(--contrast);
+  color: var(--contrast);
+  font-size: 16px;
+  font-weight: 700;
+  padding: 10px 25px;
+  text-transform: uppercase;
+}
+.btn-lite:active,
+.btn-lite:focus,
+.btn-lite:hover {
+  background-color: var(--contrast-9);
+  cursor: pointer;
+}
diff --git a/src/resource-catalog.jsx b/src/resource-catalog.jsx
index f514b0d..ea98aba 100644
--- a/src/resource-catalog.jsx
+++ b/src/resource-catalog.jsx
@@ -5,6 +5,7 @@ import contentStyle from "./content.css?inline";
 import glideCoreStyle from "@glidejs/glide/dist/css/glide.core.min.css?inline";
 import glideThemeStyle from "@glidejs/glide/dist/css/glide.theme.min.css?inline";
 import carouselStyle from "./carousel.css?inline";
+import resourceFiltersStyle from "./resource-filters.css?inline";
 import resourceGroupStyle from "./resource-group.css?inline";
 import tagsStyle from "./tags.css?inline";
 
@@ -32,6 +33,7 @@ export function ResourceCatalog({
       <style>{glideCoreStyle}</style>
       <style>{glideThemeStyle}</style>
       <style>{carouselStyle}</style>
+      <style>{resourceFiltersStyle}</style>
       <style>{resourceGroupStyle}</style>
       <style>{tagsStyle}</style>
     </>
diff --git a/src/resource-filters.css b/src/resource-filters.css
new file mode 100644
index 0000000..1646553
--- /dev/null
+++ b/src/resource-filters.css
@@ -0,0 +1,14 @@
+.filters-outer {
+  float: right;
+  position: relative;
+}
+.filters-inner {
+  background-color: white;
+  border: 1px solid var(--contrast);
+  box-shadow: 0 0 5px rgba(0, 0, 0, 0.15);
+  padding: 20px;
+  position: absolute;
+  right: 0;
+  top: 38px;
+  width: calc(var(--width) * 0.4);
+}
diff --git a/src/resource-filters.jsx b/src/resource-filters.jsx
new file mode 100644
index 0000000..8b585b0
--- /dev/null
+++ b/src/resource-filters.jsx
@@ -0,0 +1,37 @@
+import { useLayoutEffect, useRef, useState } from "preact/hooks";
+
+import { Tag } from "./tag";
+import { Tags } from "./tags";
+
+export function ResourceFilters({ active, tagCategories, toggleTag }) {
+  const [open, setOpen] = useState(false);
+  const outer = useRef(null);
+  useLayoutEffect(() => {
+    if (outer.current) {
+      outer.current.addEventListener("click", (e) => e.stopPropagation());
+      document.body.addEventListener("click", () => setOpen(false));
+    }
+  }, [outer.current]);
+
+  return (
+    <section class="filters-outer" ref={outer}>
+      <button onClick={() => setOpen(!open)} class="filters btn-lite">
+        Filters
+      </button>
+      {open ? (
+        <div class="filters-inner">
+          {tagCategories.map((tagCategory) => (
+            <>
+              <h2>{tagCategory.name}</h2>
+              <Tags>
+                {tagCategory.tags.map((tag) => (
+                  <Tag {...tag} active={active} toggleTag={toggleTag} />
+                ))}
+              </Tags>
+            </>
+          ))}
+        </div>
+      ) : null}
+    </section>
+  );
+}
diff --git a/src/resource-home.jsx b/src/resource-home.jsx
index eca212c..582fe45 100644
--- a/src/resource-home.jsx
+++ b/src/resource-home.jsx
@@ -3,6 +3,7 @@ import { useJSON } from "./utils";
 
 import { Carousel, CarouselSlide } from "./carousel";
 import { ResourceCategory } from "./resource-category";
+import { ResourceFilters } from "./resource-filters";
 
 const linkGroupData = ({
   resourceCategories,
@@ -53,6 +54,12 @@ const getActive = ({ resourceGroups, tags, tagCategories }, activeTagIds) => {
     tagCategoryIds.has(tagCategoryId)
   );
 
+  const disabledTagIds = new Set(
+    tags
+      .filter((tag) => !tagCategoryIds.has(tag.tagCategoryId))
+      .map((tag) => tag.tagId)
+  );
+
   for (let resourceGroup of resourceGroups) {
     let resourceGroupActive = true;
     for (let tagCategory of activeTagCategories) {
@@ -72,10 +79,17 @@ const getActive = ({ resourceGroups, tags, tagCategories }, activeTagIds) => {
     if (resourceGroupActive) {
       resourceGroupIds.add(resourceGroup.resourceGroupId);
       resourceCategoryIds.add(resourceGroup.resourceCategoryId);
+      for (let tagId of resourceGroup.tagIds) disabledTagIds.delete(tagId);
     }
   }
 
-  return { resourceCategoryIds, resourceGroupIds, tagCategoryIds, tagIds };
+  return {
+    disabledTagIds,
+    resourceCategoryIds,
+    resourceGroupIds,
+    tagCategoryIds,
+    tagIds,
+  };
 };
 
 export function ResourceHome({ title, showTitle, slidesURI, groupsURI }) {
@@ -105,6 +119,13 @@ export function ResourceHome({ title, showTitle, slidesURI, groupsURI }) {
         <Carousel>{slides.map((slide) => CarouselSlide(slide))}</Carousel>
       ) : null}
 
+      {active ? (
+        <ResourceFilters
+          tagCategories={groups.tagCategories}
+          active={active}
+          toggleTag={toggleTag}
+        />
+      ) : null}
       {groups
         ? groups.resourceCategories
             .filter(({ resourceCategoryId }) =>
diff --git a/src/tag.jsx b/src/tag.jsx
index 1d9daba..2e13b06 100644
--- a/src/tag.jsx
+++ b/src/tag.jsx
@@ -7,8 +7,9 @@ export function Tag({ active, tagCategory, tagId, iconUri, name, toggleTag }) {
         .toLowerCase()
         .replace(/[^a-z]+/g, "-")}${active.tagIds.has(tagId) ? " active" : ""}`}
     >
-      <a
+      <button
         href="#"
+        disabled={active.disabledTagIds.has(tagId)}
         onClick={(e) => {
           e.preventDefault();
           toggleTag(tagId);
@@ -20,7 +21,7 @@ export function Tag({ active, tagCategory, tagId, iconUri, name, toggleTag }) {
           defaultIcons[name] || defaultIcons.Tag
         )}
         {name}
-      </a>
+      </button>
     </li>
   );
 }
diff --git a/src/tags.css b/src/tags.css
index 6bd61ed..f7bbedf 100644
--- a/src/tags.css
+++ b/src/tags.css
@@ -7,22 +7,29 @@ li.tag {
   list-style-type: none;
   margin: 0 5px 5px 0;
 }
-.tag a {
+.tag button {
   background-color: var(--teal-100);
   border: 1px solid var(--teal-400);
   border-radius: 8px;
   color: var(--contrast);
+  cursor: pointer;
   display: inline-block;
+  font-size: 16px;
   font-weight: 500;
   line-height: 18px;
   padding: 3px 7px;
   text-decoration: none;
 }
-.tag a:hover {
+.tag button:hover {
   background-color: var(--teal-200);
   color: var(--contrast);
 }
-.tag.active a {
+.tag button:disabled {
+  background-color: var(--contrast-9);
+  border-color: var(--contrast-6);
+  color: var(--contrast-3);
+}
+.tag.active button {
   border-color: var(--orange-400);
   background-color: var(--orange-200);
 }

From db73d79f49fa29dcec8e0fe04ddb1da35b76e07a Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Thu, 20 Jun 2024 13:36:14 -0400
Subject: [PATCH 005/113] feat(resource-catalog): add filter reset button

---
 src/base.css             |  2 ++
 src/content.css          | 43 ++++++++++++++++++++++++++++------------
 src/icons.jsx            | 13 ++++++++++++
 src/resource-filters.css | 42 ++++++++++++++++++++++++++++++++++++---
 src/resource-filters.jsx | 23 +++++++++++++++++++--
 src/resource-home.jsx    |  8 ++++++++
 6 files changed, 113 insertions(+), 18 deletions(-)

diff --git a/src/base.css b/src/base.css
index 8a7b2b5..e4a4645 100644
--- a/src/base.css
+++ b/src/base.css
@@ -4,7 +4,9 @@
   --contrast-2: #3f3f3f;
   --contrast-3: #707070;
   --contrast-6: #999999;
+  --contrast-8: #dfdfdf;
   --contrast-9: #f2f2f2;
+  --red-400: #a70000;
   --orange-200: #f6d8ca;
   --orange-400: #f07537;
   --teal-100: #cee8e9;
diff --git a/src/content.css b/src/content.css
index 1bb4fa9..79935ee 100644
--- a/src/content.css
+++ b/src/content.css
@@ -31,22 +31,39 @@ a:hover {
   text-decoration: none;
 }
 .btn {
-  font-size: 24px;
-  font-weight: 700;
+  background-color: var(--teal-700);
+  border: 4px solid var(--teal-700);
+  color: white;
+  font-family: "Archivo", sans-serif;
+  font-size: 16px;
+  font-weight: 600;
+  line-height: 24px;
+  padding: 6px 12px;
   text-transform: uppercase;
 }
-.btn-lite {
-  background-color: white;
-  border: 1px solid var(--contrast);
+.secondary {
+  background-color: var(--yellow-400);
+  border-color: var(--yellow-400);
   color: var(--contrast);
-  font-size: 16px;
-  font-weight: 700;
-  padding: 10px 25px;
-  text-transform: uppercase;
 }
-.btn-lite:active,
-.btn-lite:focus,
-.btn-lite:hover {
-  background-color: var(--contrast-9);
+.danger {
+  background-color: var(--red-400);
+  border-color: var(--red-400);
+}
+.btn.active,
+.btn:active,
+.btn:focus,
+.btn:hover {
+  background-color: white;
+  border-color: var(--contrast);
+  color: var(--contrast);
   cursor: pointer;
 }
+.btn:disabled {
+  background-color: var(--contrast-8);
+  border-color: var(--contrast-8);
+  color: var(--contrast-3);
+}
+.btn .bi {
+  vertical-align: middle;
+}
diff --git a/src/icons.jsx b/src/icons.jsx
index 59ab85d..74e1ccb 100644
--- a/src/icons.jsx
+++ b/src/icons.jsx
@@ -77,4 +77,17 @@ export const defaultIcons = {
       <path d="M2 1a1 1 0 0 0-1 1v4.586a1 1 0 0 0 .293.707l7 7a1 1 0 0 0 1.414 0l4.586-4.586a1 1 0 0 0 0-1.414l-7-7A1 1 0 0 0 6.586 1zm4 3.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0" />
     </svg>
   ),
+  Trash: (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width="16"
+      height="16"
+      fill="currentColor"
+      class="bi bi-trash"
+      viewBox="0 0 16 16"
+    >
+      <path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5m2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5m3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0z" />
+      <path d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1zM4.118 4 4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4zM2.5 3h11V2h-11z" />
+    </svg>
+  ),
 };
diff --git a/src/resource-filters.css b/src/resource-filters.css
index 1646553..17823be 100644
--- a/src/resource-filters.css
+++ b/src/resource-filters.css
@@ -4,11 +4,47 @@
 }
 .filters-inner {
   background-color: white;
-  border: 1px solid var(--contrast);
-  box-shadow: 0 0 5px rgba(0, 0, 0, 0.15);
+  border: 4px solid var(--contrast);
   padding: 20px;
   position: absolute;
   right: 0;
-  top: 38px;
+  top: 40px;
   width: calc(var(--width) * 0.4);
 }
+.filters-inner h2 {
+  font-size: 16px;
+  margin: 0 0 1rem;
+}
+.filters-inner ul.tags {
+  margin-bottom: 1rem;
+}
+.btn-filters {
+  position: relative;
+}
+.btn-filters .active-tag-count {
+  background-color: var(--orange-400);
+  border-radius: 10px;
+  color: white;
+  display: block;
+  font-size: 12px;
+  height: 20px;
+  line-height: 20px;
+  top: -10px;
+  position: absolute;
+  text-align: center;
+  right: -10px;
+  width: 20px;
+}
+.btn-filters.active {
+  z-index: 100;
+}
+.btn-filters.active::after {
+  background-color: white;
+  bottom: -4px;
+  content: "";
+  display: block;
+  height: 4px;
+  left: 0;
+  position: absolute;
+  width: 100%;
+}
diff --git a/src/resource-filters.jsx b/src/resource-filters.jsx
index 8b585b0..348bbb2 100644
--- a/src/resource-filters.jsx
+++ b/src/resource-filters.jsx
@@ -1,9 +1,15 @@
 import { useLayoutEffect, useRef, useState } from "preact/hooks";
+import { defaultIcons } from "./icons";
 
 import { Tag } from "./tag";
 import { Tags } from "./tags";
 
-export function ResourceFilters({ active, tagCategories, toggleTag }) {
+export function ResourceFilters({
+  active,
+  clearTags,
+  tagCategories,
+  toggleTag,
+}) {
   const [open, setOpen] = useState(false);
   const outer = useRef(null);
   useLayoutEffect(() => {
@@ -15,8 +21,14 @@ export function ResourceFilters({ active, tagCategories, toggleTag }) {
 
   return (
     <section class="filters-outer" ref={outer}>
-      <button onClick={() => setOpen(!open)} class="filters btn-lite">
+      <button
+        onClick={() => setOpen(!open)}
+        class={`btn-filters btn ${open ? "active" : ""}`}
+      >
         Filters
+        {active.tagIds.size > 0 ? (
+          <span class="active-tag-count">{active.tagIds.size}</span>
+        ) : null}
       </button>
       {open ? (
         <div class="filters-inner">
@@ -30,6 +42,13 @@ export function ResourceFilters({ active, tagCategories, toggleTag }) {
               </Tags>
             </>
           ))}
+          <button
+            onClick={clearTags}
+            disabled={active.tagIds.size == 0}
+            class="btn danger"
+          >
+            {defaultIcons.Trash} Clear Filters
+          </button>
         </div>
       ) : null}
     </section>
diff --git a/src/resource-home.jsx b/src/resource-home.jsx
index 582fe45..72675d7 100644
--- a/src/resource-home.jsx
+++ b/src/resource-home.jsx
@@ -54,6 +54,10 @@ const getActive = ({ resourceGroups, tags, tagCategories }, activeTagIds) => {
     tagCategoryIds.has(tagCategoryId)
   );
 
+  // TODO: Improve logic for disabled tags. Tags should be disabled if the active
+  // tags in all *other* tag categories eliminate all resource groups containing
+  // that tag. The current logic fails to disable some tags when another tag in
+  // the same tag category is active.
   const disabledTagIds = new Set(
     tags
       .filter((tag) => !tagCategoryIds.has(tag.tagCategoryId))
@@ -112,6 +116,8 @@ export function ResourceHome({ title, showTitle, slidesURI, groupsURI }) {
         : [...activeTagIds, tagId]
     );
 
+  const clearTags = () => setActiveTagIds([]);
+
   return (
     <>
       {title && <h1 class={showTitle ? "" : "visually-hidden"}>{title}</h1>}
@@ -123,6 +129,7 @@ export function ResourceHome({ title, showTitle, slidesURI, groupsURI }) {
         <ResourceFilters
           tagCategories={groups.tagCategories}
           active={active}
+          clearTags={clearTags}
           toggleTag={toggleTag}
         />
       ) : null}
@@ -135,6 +142,7 @@ export function ResourceHome({ title, showTitle, slidesURI, groupsURI }) {
               <ResourceCategory
                 {...resourceCategory}
                 active={active}
+                clearTags={clearTags}
                 toggleTag={toggleTag}
               />
             ))

From a006f4ed855a5de42d063f49092aee2cf2eb33d5 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Thu, 20 Jun 2024 15:24:34 -0400
Subject: [PATCH 006/113] feat(resource-catalog): add resource group
 description component

---
 package-lock.json                  | 20 ++++++++++----
 package.json                       |  2 +-
 public/api/resourceGroup.json      | 11 ++++++++
 src/content.css                    | 15 ++++++++++
 src/icon.css                       |  5 ++++
 src/icon.jsx                       |  7 +++++
 src/resource-catalog.jsx           | 31 +++++++++++++--------
 src/resource-group-description.jsx | 44 ++++++++++++++++++++++++++++++
 src/resource-group-detail.jsx      |  9 ++++++
 src/resource-group.css             | 22 +++++++++++++++
 src/resource-home.jsx              |  7 ++++-
 11 files changed, 154 insertions(+), 19 deletions(-)
 create mode 100644 public/api/resourceGroup.json
 create mode 100644 src/icon.css
 create mode 100644 src/icon.jsx
 create mode 100644 src/resource-group-description.jsx
 create mode 100644 src/resource-group-detail.jsx

diff --git a/package-lock.json b/package-lock.json
index 54c3d28..2092f1e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@glidejs/glide": "^3.6.1",
         "preact": "^10.13.1",
-        "preact-router": "^4.1.2"
+        "preact-iso": "^2.6.3"
       },
       "devDependencies": {
         "@preact/preset-vite": "^2.5.0",
@@ -3498,10 +3498,20 @@
         "url": "https://opencollective.com/preact"
       }
     },
-    "node_modules/preact-router": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/preact-router/-/preact-router-4.1.2.tgz",
-      "integrity": "sha512-uICUaUFYh+XQ+6vZtQn1q+X6rSqwq+zorWOCLWPF5FAsQh3EJ+RsDQ9Ee+fjk545YWQHfUxhrBAaemfxEnMOUg==",
+    "node_modules/preact-iso": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/preact-iso/-/preact-iso-2.6.3.tgz",
+      "integrity": "sha512-2JqNi+Elyt7rf0kULtMn/QskbZE10cDMrhmoanGKWJX3gOCTIfLt/ta5xWu+kQUsyInPkTQIVp3fS5Im0V+X8A==",
+      "peerDependencies": {
+        "preact": ">=10",
+        "preact-render-to-string": ">=6.4.0"
+      }
+    },
+    "node_modules/preact-render-to-string": {
+      "version": "6.5.5",
+      "resolved": "https://registry.npmjs.org/preact-render-to-string/-/preact-render-to-string-6.5.5.tgz",
+      "integrity": "sha512-KiMFTKNTmT/ccE79BURR/r6XRc2I2TCTZ0MpeWqHW2XnllbeghXvwGsdAfF/MzMilUcTfODtSmMxgoRFL9TM5g==",
+      "peer": true,
       "peerDependencies": {
         "preact": ">=10"
       }
diff --git a/package.json b/package.json
index 82ef5bb..f40718f 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
   "dependencies": {
     "@glidejs/glide": "^3.6.1",
     "preact": "^10.13.1",
-    "preact-router": "^4.1.2"
+    "preact-iso": "^2.6.3"
   },
   "devDependencies": {
     "@preact/preset-vite": "^2.5.0",
diff --git a/public/api/resourceGroup.json b/public/api/resourceGroup.json
new file mode 100644
index 0000000..14b2714
--- /dev/null
+++ b/public/api/resourceGroup.json
@@ -0,0 +1,11 @@
+{
+  "name": "Bridges-2",
+  "resourceProvider": {
+    "resourceProviderId": 1,
+    "name": "Pittsburgh Supercomputing Center",
+    "iconUri": "https://i0.wp.com/www.psc.edu/wp-content/uploads/2020/09/cropped-PSClogo_Gradient-e1600870263745.jpg?fit=32%2C32&ssl=1"
+  },
+  "imageUri": "https://i0.wp.com/www.psc.edu/wp-content/uploads/2024/02/bridges-2-50.png?w=694&ssl=1",
+  "description": "Bridges-2 provides transformative capability for rapidly evolving computation- and data-intensive research, and creates opportunities for collaboration and convergence research. It supports both traditional and non-traditional research communities and applications. Bridges-2 integrates new technologies for converged, scalable HPC, machine learning and data; prioritizes researcher productivity and ease of use; and provides an extensible architecture for interoperation with complementary data-intensive projects, campus resources, and clouds.",
+  "userGuideUri": "https://www.psc.edu/resources/bridges-2/user-guide/"
+}
diff --git a/src/content.css b/src/content.css
index 79935ee..3042c04 100644
--- a/src/content.css
+++ b/src/content.css
@@ -30,15 +30,22 @@ a:hover {
   color: var(--teal-600);
   text-decoration: none;
 }
+p {
+  font-size: 1.125rem;
+  line-height: 1.875rem;
+  margin: 0 0 1.25rem;
+}
 .btn {
   background-color: var(--teal-700);
   border: 4px solid var(--teal-700);
   color: white;
+  display: inline-block;
   font-family: "Archivo", sans-serif;
   font-size: 16px;
   font-weight: 600;
   line-height: 24px;
   padding: 6px 12px;
+  text-decoration: none;
   text-transform: uppercase;
 }
 .secondary {
@@ -50,6 +57,11 @@ a:hover {
   background-color: var(--red-400);
   border-color: var(--red-400);
 }
+.lg {
+  font-size: 20px;
+  line-height: 30px;
+  padding: 8px 16px;
+}
 .btn.active,
 .btn:active,
 .btn:focus,
@@ -67,3 +79,6 @@ a:hover {
 .btn .bi {
   vertical-align: middle;
 }
+.btn + .btn {
+  margin-left: 10px;
+}
diff --git a/src/icon.css b/src/icon.css
new file mode 100644
index 0000000..5fc0856
--- /dev/null
+++ b/src/icon.css
@@ -0,0 +1,5 @@
+@import url("https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css");
+.icon {
+  height: 1em;
+  margin-right: 5px;
+}
diff --git a/src/icon.jsx b/src/icon.jsx
new file mode 100644
index 0000000..8476143
--- /dev/null
+++ b/src/icon.jsx
@@ -0,0 +1,7 @@
+export default function Icon({ alt = null, name = null, src = null }) {
+  return name ? (
+    <i class={`icon bi bi-${name}`}></i>
+  ) : (
+    <img class="icon" alt={alt} src={src} />
+  );
+}
diff --git a/src/resource-catalog.jsx b/src/resource-catalog.jsx
index ea98aba..e396be8 100644
--- a/src/resource-catalog.jsx
+++ b/src/resource-catalog.jsx
@@ -1,7 +1,7 @@
-import Router from "preact-router";
-
+import { ErrorBoundary, lazy, LocationProvider, Router } from "preact-iso";
 import baseStyle from "./base.css?inline";
 import contentStyle from "./content.css?inline";
+import iconStyle from "./icon.css?inline";
 import glideCoreStyle from "@glidejs/glide/dist/css/glide.core.min.css?inline";
 import glideThemeStyle from "@glidejs/glide/dist/css/glide.theme.min.css?inline";
 import carouselStyle from "./carousel.css?inline";
@@ -9,7 +9,8 @@ import resourceFiltersStyle from "./resource-filters.css?inline";
 import resourceGroupStyle from "./resource-group.css?inline";
 import tagsStyle from "./tags.css?inline";
 
-import { ResourceHome } from "./resource-home";
+const ResourceGroupDetail = lazy(() => import("./resource-group-detail.jsx"));
+const ResourceHome = lazy(() => import("./resource-home.jsx"));
 
 export function ResourceCatalog({
   title = "Resource Catalog",
@@ -19,17 +20,23 @@ export function ResourceCatalog({
 }) {
   return (
     <>
-      <Router>
-        <ResourceHome
-          path="/"
-          title={title}
-          showTitle={showTitle}
-          slidesURI={slidesURI}
-          groupsURI={groupsURI}
-        />
-      </Router>
+      <LocationProvider>
+        <ErrorBoundary>
+          <Router>
+            <ResourceHome
+              path="/"
+              title={title}
+              showTitle={showTitle}
+              slidesURI={slidesURI}
+              groupsURI={groupsURI}
+            />
+            <ResourceGroupDetail path="/resources/:resourceId" />
+          </Router>
+        </ErrorBoundary>
+      </LocationProvider>
       <style>{baseStyle}</style>
       <style>{contentStyle}</style>
+      <style>{iconStyle}</style>
       <style>{glideCoreStyle}</style>
       <style>{glideThemeStyle}</style>
       <style>{carouselStyle}</style>
diff --git a/src/resource-group-description.jsx b/src/resource-group-description.jsx
new file mode 100644
index 0000000..d6d1bc6
--- /dev/null
+++ b/src/resource-group-description.jsx
@@ -0,0 +1,44 @@
+import { useJSON } from "./utils";
+
+import Icon from "./icon";
+
+export default function ResourceGroupDescription({ resourceId }) {
+  const data = useJSON(
+    `/api/resourceGroup.json?resourceId=${resourceId}`,
+    null
+  );
+  if (!data) return;
+  const { name, resourceProvider, imageUri, description, userGuideUri } = data;
+  return (
+    <div class="resource-group-description">
+      {imageUri ? (
+        <img class="resource-group-feature-image" src={imageUri} />
+      ) : null}
+      <h1>{name}</h1>
+      {resourceProvider ? (
+        <p>
+          <a
+            href={`/resource-providers/${resourceProvider.resourceProviderId}`}
+          >
+            {resourceProvider.iconUri ? (
+              <Icon
+                alt={resourceProvider.name}
+                src={resourceProvider.iconUri}
+              />
+            ) : null}
+            {resourceProvider.name}
+          </a>
+        </p>
+      ) : null}
+      {description ? <p>{description}</p> : null}
+      <a href="#" class="btn secondary lg">
+        <Icon name="check2-circle" /> Get Started with {name}
+      </a>
+      {userGuideUri ? (
+        <a href={userGuideUri} class="btn lg">
+          <Icon name="book" /> User Guide
+        </a>
+      ) : null}
+    </div>
+  );
+}
diff --git a/src/resource-group-detail.jsx b/src/resource-group-detail.jsx
new file mode 100644
index 0000000..ccdea36
--- /dev/null
+++ b/src/resource-group-detail.jsx
@@ -0,0 +1,9 @@
+import ResourceGroupDescription from "./resource-group-description";
+
+export default function ResourceGroupDetail({ resourceId }) {
+  return (
+    <div class="resource-group-detail">
+      <ResourceGroupDescription resourceId={resourceId} />
+    </div>
+  );
+}
diff --git a/src/resource-group.css b/src/resource-group.css
index cff013f..c570a06 100644
--- a/src/resource-group.css
+++ b/src/resource-group.css
@@ -1,3 +1,4 @@
+/* Resource home page */
 .resource-group {
   align-items: flex-start;
   display: flex;
@@ -28,3 +29,24 @@
 .resource-group-text *:first-child {
   margin-top: 0;
 }
+/* Resource detail page */
+.resource-group-detail {
+  margin-bottom: 70px;
+  width: var(--width);
+}
+.resource-group-feature-image {
+  margin-top: 60px;
+}
+.resource-group-description::after {
+  clear: both;
+  content: "";
+  display: block;
+}
+
+@media (min-width: 900px) {
+  .resource-group-feature-image {
+    float: right;
+    margin: 0 0 0 20px;
+    width: calc(((var(--width) - 140px) / 8) * 3 + 40px);
+  }
+}
diff --git a/src/resource-home.jsx b/src/resource-home.jsx
index 72675d7..fc7f62a 100644
--- a/src/resource-home.jsx
+++ b/src/resource-home.jsx
@@ -96,7 +96,12 @@ const getActive = ({ resourceGroups, tags, tagCategories }, activeTagIds) => {
   };
 };
 
-export function ResourceHome({ title, showTitle, slidesURI, groupsURI }) {
+export default function ResourceHome({
+  title,
+  showTitle,
+  slidesURI,
+  groupsURI,
+}) {
   const [activeTagIds, setActiveTagIds] = useState([]);
   const slides = useJSON(slidesURI, [], "slides");
   const allGroups = useJSON(groupsURI, null);

From 2cbfe382b76c090fe478e32103c895d86f07d713 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Thu, 20 Jun 2024 15:29:43 -0400
Subject: [PATCH 007/113] fix(resource-catalog): allow body to be longer than
 browser height

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 38346f5..2482078 100644
--- a/index.html
+++ b/index.html
@@ -16,8 +16,8 @@
       body {
         color: #232323;
         font-family: "Archivo", sans-serif;
-        height: 100vh;
         margin: 0;
+        min-height: 100vh;
         padding: 0;
       }
       @media (min-width: 768px) {

From fe44c53a92c570d7553a3dbff80b76b1ea79c659 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Thu, 20 Jun 2024 15:37:05 -0400
Subject: [PATCH 008/113] refactor(resource-catalog): load icons from Bootstrap
 Icons CSS

---
 src/icon.css             |  1 +
 src/icons.jsx            | 96 +++-------------------------------------
 src/resource-filters.jsx |  3 +-
 src/tag.jsx              |  6 ++-
 src/tags.css             | 10 -----
 5 files changed, 12 insertions(+), 104 deletions(-)

diff --git a/src/icon.css b/src/icon.css
index 5fc0856..fe022cd 100644
--- a/src/icon.css
+++ b/src/icon.css
@@ -2,4 +2,5 @@
 .icon {
   height: 1em;
   margin-right: 5px;
+  vertical-align: text-bottom;
 }
diff --git a/src/icons.jsx b/src/icons.jsx
index 74e1ccb..466c505 100644
--- a/src/icons.jsx
+++ b/src/icons.jsx
@@ -1,93 +1,7 @@
 export const defaultIcons = {
-  CPU: (
-    <svg
-      xmlns="http://www.w3.org/2000/svg"
-      width="16"
-      height="16"
-      fill="currentColor"
-      class="bi bi-cpu-fill"
-      viewBox="0 0 16 16"
-    >
-      <path d="M6.5 6a.5.5 0 0 0-.5.5v3a.5.5 0 0 0 .5.5h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 0 0-.5-.5z" />
-      <path d="M5.5.5a.5.5 0 0 0-1 0V2A2.5 2.5 0 0 0 2 4.5H.5a.5.5 0 0 0 0 1H2v1H.5a.5.5 0 0 0 0 1H2v1H.5a.5.5 0 0 0 0 1H2v1H.5a.5.5 0 0 0 0 1H2A2.5 2.5 0 0 0 4.5 14v1.5a.5.5 0 0 0 1 0V14h1v1.5a.5.5 0 0 0 1 0V14h1v1.5a.5.5 0 0 0 1 0V14h1v1.5a.5.5 0 0 0 1 0V14a2.5 2.5 0 0 0 2.5-2.5h1.5a.5.5 0 0 0 0-1H14v-1h1.5a.5.5 0 0 0 0-1H14v-1h1.5a.5.5 0 0 0 0-1H14v-1h1.5a.5.5 0 0 0 0-1H14A2.5 2.5 0 0 0 11.5 2V.5a.5.5 0 0 0-1 0V2h-1V.5a.5.5 0 0 0-1 0V2h-1V.5a.5.5 0 0 0-1 0V2h-1zm1 4.5h3A1.5 1.5 0 0 1 11 6.5v3A1.5 1.5 0 0 1 9.5 11h-3A1.5 1.5 0 0 1 5 9.5v-3A1.5 1.5 0 0 1 6.5 5" />
-    </svg>
-  ),
-  GPU: (
-    <svg
-      xmlns="http://www.w3.org/2000/svg"
-      width="16"
-      height="16"
-      fill="currentColor"
-      class="bi bi-gpu-card"
-      viewBox="0 0 16 16"
-    >
-      <path d="M4 8a1.5 1.5 0 1 1 3 0 1.5 1.5 0 0 1-3 0m7.5-1.5a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3" />
-      <path d="M0 1.5A.5.5 0 0 1 .5 1h1a.5.5 0 0 1 .5.5V4h13.5a.5.5 0 0 1 .5.5v7a.5.5 0 0 1-.5.5H2v2.5a.5.5 0 0 1-1 0V2H.5a.5.5 0 0 1-.5-.5m5.5 4a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5M9 8a2.5 2.5 0 1 0 5 0 2.5 2.5 0 0 0-5 0" />
-      <path d="M3 12.5h3.5v1a.5.5 0 0 1-.5.5H3.5a.5.5 0 0 1-.5-.5zm4 1v-1h4v1a.5.5 0 0 1-.5.5h-3a.5.5 0 0 1-.5-.5" />
-    </svg>
-  ),
-  Storage: (
-    <svg
-      xmlns="http://www.w3.org/2000/svg"
-      width="16"
-      height="16"
-      fill="currentColor"
-      class="bi bi-hdd-fill"
-      viewBox="0 0 16 16"
-    >
-      <path d="M0 10a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v1a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2zm2.5 1a.5.5 0 1 0 0-1 .5.5 0 0 0 0 1m2 0a.5.5 0 1 0 0-1 .5.5 0 0 0 0 1M.91 7.204A3 3 0 0 1 2 7h12c.384 0 .752.072 1.09.204l-1.867-3.422A1.5 1.5 0 0 0 11.906 3H4.094a1.5 1.5 0 0 0-1.317.782z" />
-    </svg>
-  ),
-  "Large Memory": (
-    <svg
-      xmlns="http://www.w3.org/2000/svg"
-      width="16"
-      height="16"
-      fill="currentColor"
-      class="bi bi-arrows-fullscreen"
-      viewBox="0 0 16 16"
-    >
-      <path
-        fill-rule="evenodd"
-        d="M5.828 10.172a.5.5 0 0 0-.707 0l-4.096 4.096V11.5a.5.5 0 0 0-1 0v3.975a.5.5 0 0 0 .5.5H4.5a.5.5 0 0 0 0-1H1.732l4.096-4.096a.5.5 0 0 0 0-.707m4.344 0a.5.5 0 0 1 .707 0l4.096 4.096V11.5a.5.5 0 1 1 1 0v3.975a.5.5 0 0 1-.5.5H11.5a.5.5 0 0 1 0-1h2.768l-4.096-4.096a.5.5 0 0 1 0-.707m0-4.344a.5.5 0 0 0 .707 0l4.096-4.096V4.5a.5.5 0 1 0 1 0V.525a.5.5 0 0 0-.5-.5H11.5a.5.5 0 0 0 0 1h2.768l-4.096 4.096a.5.5 0 0 0 0 .707m-4.344 0a.5.5 0 0 1-.707 0L1.025 1.732V4.5a.5.5 0 0 1-1 0V.525a.5.5 0 0 1 .5-.5H4.5a.5.5 0 0 1 0 1H1.732l4.096 4.096a.5.5 0 0 1 0 .707"
-      />
-    </svg>
-  ),
-  "Virtual Machines": (
-    <svg
-      xmlns="http://www.w3.org/2000/svg"
-      width="16"
-      height="16"
-      fill="currentColor"
-      class="bi bi-pc-display-horizontal"
-      viewBox="0 0 16 16"
-    >
-      <path d="M1.5 0A1.5 1.5 0 0 0 0 1.5v7A1.5 1.5 0 0 0 1.5 10H6v1H1a1 1 0 0 0-1 1v3a1 1 0 0 0 1 1h14a1 1 0 0 0 1-1v-3a1 1 0 0 0-1-1h-5v-1h4.5A1.5 1.5 0 0 0 16 8.5v-7A1.5 1.5 0 0 0 14.5 0zm0 1h13a.5.5 0 0 1 .5.5v7a.5.5 0 0 1-.5.5h-13a.5.5 0 0 1-.5-.5v-7a.5.5 0 0 1 .5-.5M12 12.5a.5.5 0 1 1 1 0 .5.5 0 0 1-1 0m2 0a.5.5 0 1 1 1 0 .5.5 0 0 1-1 0M1.5 12h5a.5.5 0 0 1 0 1h-5a.5.5 0 0 1 0-1M1 14.25a.25.25 0 0 1 .25-.25h5.5a.25.25 0 1 1 0 .5h-5.5a.25.25 0 0 1-.25-.25" />
-    </svg>
-  ),
-  Tag: (
-    <svg
-      xmlns="http://www.w3.org/2000/svg"
-      width="16"
-      height="16"
-      fill="currentColor"
-      class="bi bi-tag-fill"
-      viewBox="0 0 16 16"
-    >
-      <path d="M2 1a1 1 0 0 0-1 1v4.586a1 1 0 0 0 .293.707l7 7a1 1 0 0 0 1.414 0l4.586-4.586a1 1 0 0 0 0-1.414l-7-7A1 1 0 0 0 6.586 1zm4 3.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0" />
-    </svg>
-  ),
-  Trash: (
-    <svg
-      xmlns="http://www.w3.org/2000/svg"
-      width="16"
-      height="16"
-      fill="currentColor"
-      class="bi bi-trash"
-      viewBox="0 0 16 16"
-    >
-      <path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5m2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5m3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0z" />
-      <path d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1zM4.118 4 4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4zM2.5 3h11V2h-11z" />
-    </svg>
-  ),
+  CPU: "cpu-fill",
+  GPU: "cpu",
+  Storage: "hdd-fill",
+  "Large Memory": "arrows-fullscreen",
+  "Virtual Machines": "pc-display-horizontal",
 };
diff --git a/src/resource-filters.jsx b/src/resource-filters.jsx
index 348bbb2..b780ebf 100644
--- a/src/resource-filters.jsx
+++ b/src/resource-filters.jsx
@@ -3,6 +3,7 @@ import { defaultIcons } from "./icons";
 
 import { Tag } from "./tag";
 import { Tags } from "./tags";
+import Icon from "./icon";
 
 export function ResourceFilters({
   active,
@@ -47,7 +48,7 @@ export function ResourceFilters({
             disabled={active.tagIds.size == 0}
             class="btn danger"
           >
-            {defaultIcons.Trash} Clear Filters
+            <Icon name="trash" /> Clear Filters
           </button>
         </div>
       ) : null}
diff --git a/src/tag.jsx b/src/tag.jsx
index 2e13b06..595d926 100644
--- a/src/tag.jsx
+++ b/src/tag.jsx
@@ -1,5 +1,7 @@
 import { defaultIcons } from "./icons";
 
+import Icon from "./icon";
+
 export function Tag({ active, tagCategory, tagId, iconUri, name, toggleTag }) {
   return (
     <li
@@ -16,9 +18,9 @@ export function Tag({ active, tagCategory, tagId, iconUri, name, toggleTag }) {
         }}
       >
         {iconUri ? (
-          <img src={iconUri} />
+          <Icon alt={name} src={iconUri} />
         ) : (
-          defaultIcons[name] || defaultIcons.Tag
+          <Icon name={defaultIcons[name] || "tag"} />
         )}
         {name}
       </button>
diff --git a/src/tags.css b/src/tags.css
index f7bbedf..07bf8c9 100644
--- a/src/tags.css
+++ b/src/tags.css
@@ -33,13 +33,3 @@ li.tag {
   border-color: var(--orange-400);
   background-color: var(--orange-200);
 }
-.tag img,
-.tag svg {
-  background-position: center;
-  background-size: contain;
-  display: inline-block;
-  height: 16px;
-  margin-right: 5px;
-  vertical-align: text-bottom;
-  width: 16px;
-}

From b1963ae81f98e3305471d6c3ce71727b8d22a19e Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Thu, 20 Jun 2024 15:42:01 -0400
Subject: [PATCH 009/113] feat(resource-catalog): add filter icon

---
 src/resource-filters.jsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/resource-filters.jsx b/src/resource-filters.jsx
index b780ebf..e225059 100644
--- a/src/resource-filters.jsx
+++ b/src/resource-filters.jsx
@@ -1,5 +1,4 @@
 import { useLayoutEffect, useRef, useState } from "preact/hooks";
-import { defaultIcons } from "./icons";
 
 import { Tag } from "./tag";
 import { Tags } from "./tags";
@@ -26,7 +25,7 @@ export function ResourceFilters({
         onClick={() => setOpen(!open)}
         class={`btn-filters btn ${open ? "active" : ""}`}
       >
-        Filters
+        <Icon name="filter" /> Filters
         {active.tagIds.size > 0 ? (
           <span class="active-tag-count">{active.tagIds.size}</span>
         ) : null}

From 3c6615cf6378bab76199740664bf288bc743111e Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 26 Jun 2024 09:25:05 -0400
Subject: [PATCH 010/113] refactor(api): remove unused resources data

---
 public/api/resources.json | 2694 -------------------------------------
 1 file changed, 2694 deletions(-)
 delete mode 100644 public/api/resources.json

diff --git a/public/api/resources.json b/public/api/resources.json
deleted file mode 100644
index a31bd51..0000000
--- a/public/api/resources.json
+++ /dev/null
@@ -1,2694 +0,0 @@
-[
-  {
-    "resourceId": 530479,
-    "resourceName": "SDSC Expanse Projects Storage",
-    "displayResourceName": "SDSC Expanse Projects Storage",
-    "resourceType": "Storage",
-    "description": "",
-    "units": "GB",
-    "organization": "San Diego Supercomputer Center",
-    "resourceRepositoryKey": 145120,
-    "productionBeginDate": "2020-10-01",
-    "productionEndDate": "2025-10-01",
-    "resourceDescription": "5PB of storage on a Lustre based filesystem.",
-    "recommendedUse": "Use for storage needs of allocated projects on Expanse Compute and Expanse GPU resources. Unpurged storage available for duration of allocation period.",
-    "conversionFactor": "8.0145",
-    "userGuideUrl": "https://www.sdsc.edu/support/user_guides/expanse.html",
-    "attributeSets": [],
-    "featureCategories": [
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 139,
-            "name": "ACCESS Allocated",
-            "description": "Resource is allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 138,
-            "name": "Storage",
-            "description": "Storage is the main purpose of this resource",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 531298,
-    "resourceName": "ACCESS Credits",
-    "displayResourceName": "ACCESS Credits",
-    "resourceType": "Program",
-    "description": "",
-    "units": "ACCESS Credits",
-    "organization": "ACCESS Allocations",
-    "resourceRepositoryKey": 145904,
-    "productionBeginDate": "2022-09-01",
-    "productionEndDate": null,
-    "resourceDescription": null,
-    "recommendedUse": "Credits should be exchanged for ACCESS resources",
-    "conversionFactor": "8.0145",
-    "userGuideUrl": "https://allocations.access-ci.org",
-    "attributeSets": [],
-    "featureCategories": []
-  },
-  {
-    "resourceId": 531464,
-    "resourceName": "Georgia Tech GaTech Hive Cluster",
-    "displayResourceName": "Georgia Tech GaTech Hive Cluster",
-    "resourceType": "Compute",
-    "description": "As part of the ACCESS ecosystem, a portion of the system is available for community use through the Hive Gateway (https://gateway.hive.pace.gatech.edu). The Hive gateway permits direct use of a variety of software for users with ACCESS logins. No allocation necessary! Also through its ACCESS participation, the Hive cluster is available to support existing or new gateways using the Airavata platform. Interested gateways should contact pace-support@oit.gatech.edu.",
-    "units": "Core-hours",
-    "organization": "Georgia Institute of Technology",
-    "resourceRepositoryKey": 146103,
-    "productionBeginDate": "2020-10-01",
-    "productionEndDate": null,
-    "resourceDescription": null,
-    "recommendedUse": "As part of the ACCESS ecosystem, a portion of the system is available for community use through the Hive Gateway (https://gateway.hive.pace.gatech.edu). The Hive gateway permits direct use of a variety of software for users with ACCESS logins. No allocation necessary! Also through its ACCESS participation, the Hive cluster is available to support existing or new gateways using the Airavata platform. Interested gateways should contact pace-support@oit.gatech.edu.",
-    "conversionFactor": null,
-    "userGuideUrl": "https://docs.pace.gatech.edu/hiveGateway/gettingStarted/",
-    "attributeSets": [],
-    "featureCategories": [
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 136,
-            "name": "CPU Compute",
-            "description": "General compute use",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 140,
-            "name": "RP-managed process",
-            "description": "Resource is not allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 103,
-        "categoryName": "Specialized Support",
-        "categoryDescription": "Special services offered by the resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 167,
-            "name": "ACCESS OnDemand",
-            "description": "An intuitive, innovative, and interactive interface to remote computing resources",
-            "isFilter": null
-          },
-          {
-            "featureId": 146,
-            "name": "Science Gateway support",
-            "description": "Support for Science Gateways",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 531199,
-    "resourceName": "IACS at Stony Brook Ookami",
-    "displayResourceName": "IACS at Stony Brook Ookami",
-    "resourceType": "Compute",
-    "description": "1 SU = 1 node hour\r\nA node is allocated exclusively to a user. Node-sharing is not available.",
-    "units": "SUs",
-    "organization": "Institute for Advanced Computational Science at Stony Brook University",
-    "resourceRepositoryKey": 145574,
-    "productionBeginDate": "2022-06-16",
-    "productionEndDate": "2025-09-30",
-    "resourceDescription": "Ookami is a computer technology testbed supported by the National Science Foundation under grant OAC 1927880. It provides researchers with access to the A64FX processor developed by Riken and Fujitsu for the Japanese path to exascale computing and is deployed in the, until June 2022, fastest computer in the world, Fugaku. It is the first such computer outside of Japan. By focusing on crucial architectural details, the ARM-based, multi-core, 512-bit SIMD-vector processor with ultrahigh-bandwidth memory promises to retain familiar and successful programming models while achieving very high performance for a wide range of applications. While being very power-efficient it supports a wide range of data types and enables both HPC and big data applications.\r\n\r\nThe Ookami HPE (formerly Cray) Apollo 80 system has 176 A64FX compute nodes each with 32GB of high-bandwidth memory and a 512 Gbyte SSD. This amounts to about 1.5M node hours per year. A high-performance Lustre filesystem provides about 0.8 Pbyte storage.\r\n\r\nTo facilitate users exploring current computer technologies and contrasting performance and programmability with the A64FX, Ookami also includes:\r\n\r\n- 1 node with dual socket AMD Milan (64cores) with 512 Gbyte memory\r\n- 2 nodes with dual socket Thunder X2 (64 cores) each with 256 Gbyte memory\r\n- 1 node with dual socket Intel Skylake (32 cores) with 192 Gbyte memory and 2 NVIDIA V100 GPUs",
-    "recommendedUse": "Applications that are fitting within the memory requirements (27GB per node) and are well vectorized, or well auto-vectorized by the compiler.\r\nNote a node is allocated exclusively to one user. Node-sharing is not available.",
-    "conversionFactor": "1.0",
-    "userGuideUrl": "https://www.stonybrook.edu/commcms/ookami/support/faq/",
-    "attributeSets": [],
-    "featureCategories": [
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 136,
-            "name": "CPU Compute",
-            "description": "General compute use",
-            "isFilter": null
-          },
-          {
-            "featureId": 135,
-            "name": "Innovative / Novel Compute",
-            "description": "Unique, innovative or non-traditional compute resource",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 139,
-            "name": "ACCESS Allocated",
-            "description": "Resource is allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 103,
-        "categoryName": "Specialized Support",
-        "categoryDescription": "Special services offered by the resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 146,
-            "name": "Science Gateway support",
-            "description": "Support for Science Gateways",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 530808,
-    "resourceName": "Indiana Jetstream2 Storage",
-    "displayResourceName": "Indiana Jetstream2 Storage",
-    "resourceType": "Storage",
-    "description": "",
-    "units": "GB",
-    "organization": "Indiana University",
-    "resourceRepositoryKey": 145449,
-    "productionBeginDate": "2021-10-01",
-    "productionEndDate": "2025-09-30",
-    "resourceDescription": null,
-    "recommendedUse": null,
-    "conversionFactor": "8.0145",
-    "userGuideUrl": "https://docs.jetstream-cloud.org/",
-    "attributeSets": [],
-    "featureCategories": [
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 139,
-            "name": "ACCESS Allocated",
-            "description": "Resource is allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 138,
-            "name": "Storage",
-            "description": "Storage is the main purpose of this resource",
-            "isFilter": null
-          },
-          {
-            "featureId": 133,
-            "name": "Cloud",
-            "description": "Cloud Resource",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 530639,
-    "resourceName": "UD DARWIN GPU Nodes (DARWIN GPU)",
-    "displayResourceName": "UD DARWIN GPU Nodes (DARWIN GPU)",
-    "resourceType": "Compute",
-    "description": "1 SU = 1 device hour;  \r\nT4 or MI50 device hour = 1 GPU + 64 CPU cores + 512 GiB RAM;  \r\nV100 device hour = 1 GPU + 12 CPU cores + 192 GiB RAM",
-    "units": "SUs",
-    "organization": "University of Delaware",
-    "resourceRepositoryKey": 145278,
-    "productionBeginDate": "2021-08-02",
-    "productionEndDate": "2024-09-30",
-    "resourceDescription": "3 nodes with two Intel® Xeon® Platinum 8260 processors (24 cores each), 768 GiB RAM, and 4 NVIDIA Tesla V100 32GB GPUs connected via NVLINK™\r\n9 nodes with two AMD EPYC™ 7502 processors (32 cores each), 512 GiB RAM, and a single NVIDIA Tesla T4 GPU\r\n1 node with two AMD EPYC™ 7502 processors (32 cores each), 512 GiB RAM, and a single AMD Radeon Instinct MI50 GPU",
-    "recommendedUse": "DARWIN's GPU nodes provide resources for machine learning, artificial intelligence research,  and visualization.",
-    "conversionFactor": "310.0",
-    "userGuideUrl": "https://docs.hpc.udel.edu/abstract/darwin/darwin#compute-nodes",
-    "attributeSets": [],
-    "featureCategories": []
-  },
-  {
-    "resourceId": 530640,
-    "resourceName": "UD DARWIN Storage (DARWIN Storage)",
-    "displayResourceName": "UD DARWIN Storage (DARWIN Storage)",
-    "resourceType": "Storage",
-    "description": "",
-    "units": "GB",
-    "organization": "University of Delaware",
-    "resourceRepositoryKey": 145279,
-    "productionBeginDate": "2021-08-02",
-    "productionEndDate": "2024-09-30",
-    "resourceDescription": "DARWIN's Lustre file system is for use with the DARWIN Compute and GPU nodes.",
-    "recommendedUse": "DARWIN's Lustre storage should be used for storing input files, supporting data files, work files, and output files associated with computational tasks run on the cluster.",
-    "conversionFactor": "8.0145",
-    "userGuideUrl": "https://docs.hpc.udel.edu/abstract/darwin/darwin#storage",
-    "attributeSets": [],
-    "featureCategories": [
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 138,
-            "name": "Storage",
-            "description": "Storage is the main purpose of this resource",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 530638,
-    "resourceName": "UD DARWIN Compute Nodes (DARWIN)",
-    "displayResourceName": "UD DARWIN Compute Nodes (DARWIN)",
-    "resourceType": "Compute",
-    "description": "1 SU = 1 compute hour (any node type);  \r\nstandard = 1 core + 8 GiB RAM;  \r\nlarge = 1 core + 16 GiB RAM;  \r\nxlarge = 1 core + 32 GiB RAM;  \r\nlg-swap is billed as the entire node at 64 SUs per hour = 64 cores + 1024 GiB RAM + 2.73 TiB Optane NVMe swap",
-    "units": "SUs",
-    "organization": "University of Delaware",
-    "resourceRepositoryKey": 145277,
-    "productionBeginDate": "2021-08-02",
-    "productionEndDate": "2024-09-30",
-    "resourceDescription": "Nodes with two AMD EPYC™ 7502 processors (32 cores each) with three memory size options:\r\n48x standard 512 GiB; \r\n32x large-memory 1024 GiB; \r\n11x xlarge-memory 2048 GiB; \r\n1x lg-swap 1024 GiB RAM + 2.73 TiB Intel Optane NVMe swap",
-    "recommendedUse": "DARWIN's standard memory nodes provide powerful general-purpose computing, data analytics, and pre- and post-processing capabilities.  The large and xlarge memory nodes enable memory-intensive applications and workflows that do not have distributed-memory implementations.",
-    "conversionFactor": "4.45",
-    "userGuideUrl": "https://docs.hpc.udel.edu/abstract/darwin/darwin#compute-nodes",
-    "attributeSets": [],
-    "featureCategories": []
-  },
-  {
-    "resourceId": 530162,
-    "resourceName": "TACC Long-term tape Archival Storage (Ranch)",
-    "displayResourceName": "TACC Long-term tape Archival Storage (Ranch)",
-    "resourceType": "Storage",
-    "description": "",
-    "units": "GB",
-    "organization": "Texas Advanced Computing Center",
-    "resourceRepositoryKey": 142293,
-    "productionBeginDate": "2013-03-15",
-    "productionEndDate": null,
-    "resourceDescription": "TACC's long-term mass storage solution, Ranch, is an Oracle® StorageTek Modular Library System. Ranch utilizes Oracle's Sun Storage Archive Manager Filesystem (SAM-FS) for migrating files to/from a tape archival system with a current offline storage capacity of 60 PB.\r\nRanch's disk cache is built on Oracle's ZFS 7240 and Dell MD3600i disk arrays containing approximately 640 TB of usable spinning disk storage. These disk arrays are controlled by a Dell R720  SAM-FS Metadata server which has 16 CPUs and 72 GB of RAM.\r\nTwo Oracle StorageTek SL8500 Automated Tape Libraries house all of the offline archival storage. Each SL8500 library can house up to 10,000 tapes with 64 tape drive slots. One SL8500 is currently populated with 10,000 T-10000B media where each tape is capable of holding one TB of uncompressed data while the second SL8500 houses 6,000 of the latest T-10000C media which can hold five TB of uncompressed data. Each SL8500 library also contains eight handbots to manage tapes and move them to/from the tape drives with a pass-through port connecting the two SL8500 libraries. If necessary, up to four SL8500 libraries can be integrated into a single archival solution, allowing for an offline storage capacity of 200 PB with current tape media.",
-    "recommendedUse": "TACC's High Performance Computing systems are used primarily for scientific computing with users having access to WORK, SCRATCH, and HOME file systems that are limited in size. This is also true for TACC's visualization system, Longhorn. The Ranch system serves the HPC and Vis community systems by providing a massive, high-performance file system for archival purposes. Space on Ranch can also be requested independent of an accompanying allocation on an XSEDE compute or visualization resource.\r\nPlease note that Ranch is an archival system. The ranch system is not backed up or replicated. This means that Ranch contains a single copy, and only a single copy, of your file/s. While lost data due to tape damage is rare, please keep this fact in mind for your data management plans.",
-    "conversionFactor": "8.0145",
-    "userGuideUrl": "https://portal.xsede.org/tacc-ranch",
-    "attributeSets": [],
-    "featureCategories": [
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 139,
-            "name": "ACCESS Allocated",
-            "description": "Resource is allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 138,
-            "name": "Storage",
-            "description": "Storage is the main purpose of this resource",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 531365,
-    "resourceName": "MATCHPremier",
-    "displayResourceName": "MATCHPremier",
-    "resourceType": "Program",
-    "description": "The pilot program for the ACCESS MATCHPremier embedded support service provides matches your project with an experienced research professional, identified by ACCESS Support to provide the skills needed to help your project, for example, with managing massive allocations or using ACCESS resources in novel ways. MATCHPremier consultants are selected from the Computational Science and Support Network (CSSN) — they may be facilitators, research software engineers, or other types of appropriate support personnel. MATCHPremier should be requested at least six months in advance of the anticipated need.For more information visit the ACCESS Support portal: https://support.access-ci.org/matchpremier\r\n\r\n",
-    "units": "Yes / No",
-    "organization": "ACCESS Support",
-    "resourceRepositoryKey": 146004,
-    "productionBeginDate": "2022-10-24",
-    "productionEndDate": null,
-    "resourceDescription": null,
-    "recommendedUse": "MATCHPremier identifies consultants who are available to be embedded on your research team for 12- 8 months. Consultants have the expertise to help manage massive allocation plans or to use ACCESS resources in novel ways. Engagements should be requested at least six months in advance and are funded through your research award.",
-    "conversionFactor": null,
-    "userGuideUrl": "https://support.access-ci.org/matchpremier",
-    "attributeSets": [],
-    "featureCategories": [
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 137,
-            "name": "Service / Other",
-            "description": "An allocated resource that's not compute or storage",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 139,
-            "name": "ACCESS Allocated",
-            "description": "Resource is allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 530772,
-    "resourceName": "Purdue Anvil GPU",
-    "displayResourceName": "Purdue Anvil GPU",
-    "resourceType": "Compute",
-    "description": "1 Anvil GPU Service Unit = 1 A100 GPU hour on a quad-NVIDIA A100 node",
-    "units": "SUs",
-    "organization": "Purdue University",
-    "resourceRepositoryKey": 145412,
-    "productionBeginDate": "2021-10-01",
-    "productionEndDate": "2026-10-01",
-    "resourceDescription": "16 nodes each with four NVIDIA A100 Tensor Core GPUs providing 1.5 PF of single-precision performance to support machine learning and artificial intelligence applications.",
-    "recommendedUse": "Anvil’s GPU nodes can be used for various Machine learning (ML), artificial intelligence (AI), and other GPU-enabled workloads. A comprehensive set of GPU software is available within Open OnDemand as well as the module system that includes GPU-enabled package builds and NVIDIA GPU Cloud (NGC) containers for common Python ML frameworks such as PyTorch, Keras, and TensorFlow. GPU-enabled scientific software supports a variety of disciplines and applications that include, but is not limited to, AMBER, LAMMPS, NAMD, Gromacs.",
-    "conversionFactor": "539.4375",
-    "userGuideUrl": "https://www.rcac.purdue.edu/anvil#docs",
-    "attributeSets": [],
-    "featureCategories": [
-      {
-        "categoryId": 103,
-        "categoryName": "Specialized Support",
-        "categoryDescription": "Special services offered by the resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 166,
-            "name": "ACCESS Pegasus",
-            "description": "Run Jobs and Workflows on ACCESS Resources from a Single Entry Point",
-            "isFilter": null
-          },
-          {
-            "featureId": 167,
-            "name": "ACCESS OnDemand",
-            "description": "An intuitive, innovative, and interactive interface to remote computing resources",
-            "isFilter": null
-          },
-          {
-            "featureId": 146,
-            "name": "Science Gateway support",
-            "description": "Support for Science Gateways",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 139,
-            "name": "ACCESS Allocated",
-            "description": "Resource is allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 134,
-            "name": "GPU Compute",
-            "description": "GPU use is the main purpose of this resource",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 133,
-        "categoryName": "Resource Category",
-        "categoryDescription": "NAIRR Pilot Resource Category",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 232,
-            "name": "Federal agency systems",
-            "description": "Agency supercomputers and advanced architecture systems",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 530807,
-    "resourceName": "Indiana Jetstream2 Large Memory",
-    "displayResourceName": "Indiana Jetstream2 Large Memory",
-    "resourceType": "Compute",
-    "description": "Jetstream2 Large Memory VMs are charged 2x the number of vCPUs per hour because of the additional memory capacity. For instance, the r3.xl flavor that uses 128 cores costs 256 SUs per hour. VM sizes and cost per hour are available at the \u003ca href=\"https://docs.jetstream-cloud.org/general/vmsizes/\"\u003eJetstream website\u003c/a\u003e.",
-    "units": "SUs",
-    "organization": "Indiana University",
-    "resourceRepositoryKey": 145448,
-    "productionBeginDate": "2021-10-01",
-    "productionEndDate": "2025-09-30",
-    "resourceDescription": "Jetstream2 LM is a hybrid-cloud platform that provides flexible, on-demand, programmable cyberinfrastructure tools ranging from interactive virtual machine services to a variety of infrastructure and orchestration services for research and education. This particular portion of the resource is allocated separately from the primary resource and contains 32 nodes of GPU-ready 1TB RAM compute nodes, AMD Milan 7713 CPUs with 128 cores per node connected by 100gbps ethernet to the spine.",
-    "recommendedUse": "For the researcher needing virtual machine services on demand as well as for software creators and researchers needing to create their own customized virtual machine environments. Additional use cases are for research-supporting infrastructure services that need to be \"always on\" as well as science gateway services and for education support, providing virtual machines for students. \r\n\r\nThis particular resource is for those required 512gb or 1tb for their workloads and must demonstrate that need.",
-    "conversionFactor": "8.0145",
-    "userGuideUrl": "https://docs.jetstream-cloud.org/",
-    "attributeSets": [],
-    "featureCategories": [
-      {
-        "categoryId": 102,
-        "categoryName": "Specialized Hardware",
-        "categoryDescription": "Key compute hardware components in this resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 142,
-            "name": "Large Memory Nodes",
-            "description": "Specialized analysis nodes with large memory",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 103,
-        "categoryName": "Specialized Support",
-        "categoryDescription": "Special services offered by the resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 166,
-            "name": "ACCESS Pegasus",
-            "description": "Run Jobs and Workflows on ACCESS Resources from a Single Entry Point",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 139,
-            "name": "ACCESS Allocated",
-            "description": "Resource is allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 133,
-            "name": "Cloud",
-            "description": "Cloud Resource",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 530482,
-    "resourceName": "PSC Bridges-2 Storage (PSC Ocean)",
-    "displayResourceName": "PSC Bridges-2 Storage (PSC Ocean)",
-    "resourceType": "Storage",
-    "description": "Storage",
-    "units": "GB",
-    "organization": "Pittsburgh Supercomputing Center",
-    "resourceRepositoryKey": 145122,
-    "productionBeginDate": "2021-02-11",
-    "productionEndDate": "2025-09-30",
-    "resourceDescription": "The Bridges-2 Ocean data management system provides a unified, high-performance filesystem for active project data, archive, and resilience. Ocean consists of two tiers, disk and tape, transparently managed by HPE DMF as a single, highly usable namespace.\r\n\r\nOcean's disk subsystem, for active project data, is a high-performance, internally resilient Lustre parallel filesystem with 15PB of usable capacity, configured to deliver up to 129GB/s and 142GB/s of read and write bandwidth, respectively.\r\n\r\nOcean's tape subsystem, for archive and additional resilience, is a high-performance tape library with 7.2PB of uncompressed capacity (estimated 8.6PB compressed, with compression done transparently in hardware with no performance overhead), configured to deliver 50TB/hour.",
-    "recommendedUse": "The Bridges-2 Ocean data management system provides high-performance and highly usable access to project and archive data. It is equally accessible to all Bridges-2 compute nodes, allowing seamless execution of data-intensive workflows involving components running on different compute resource types.",
-    "conversionFactor": "80.145",
-    "userGuideUrl": "http://www.psc.edu/resources/bridges-2/user-guide",
-    "attributeSets": [],
-    "featureCategories": [
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 139,
-            "name": "ACCESS Allocated",
-            "description": "Resource is allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 138,
-            "name": "Storage",
-            "description": "Storage is the main purpose of this resource",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 530374,
-    "resourceName": "PSC Anton 2 Special-Purpose Supercomputer for Molecular Dynamics (PSC Anton 2)",
-    "displayResourceName": "PSC Anton 2 Special-Purpose Supercomputer for Molecular Dynamics (PSC Anton 2)",
-    "resourceType": "Compute",
-    "description": "Anton 2 is allocated annually via a Request for Proposal with proposals reviewed by a committee convened by the National Research Council at the National Academies. To qualify for an allocation on Anton 2, the principal investigator must be a faculty or staff member at a U.S. academic or non-profit research institution. Anton is allocated in MD simulation units.",
-    "units": "MD Simulation Units",
-    "organization": "Pittsburgh Supercomputing Center",
-    "resourceRepositoryKey": 144815,
-    "productionBeginDate": "2023-02-01",
-    "productionEndDate": null,
-    "resourceDescription": "Anton is a special purpose supercomputer for biomolecular simulation designed and constructed by D. E. Shaw Research (DESRES).   PSC's current system is known as Anton 2 and is a successor to the original Anton 1 machine hosted here.  \r\n\r\nAnton 2, the next-generation Anton supercomputer, is a 128 node system, made available without cost by DESRES for non-commercial research use by US universities and other not-for-profit institutions, and is hosted by PSC with support from the NIH National Institute of General Medical Sciences.  It replaced the original Anton 1 system in the fall of 2016.\r\n\r\nAnton was designed to dramatically increase the speed of molecular dynamics (MD) simulations compared with the previous state of the art, allowing biomedical researchers to understand the motions and interactions of proteins and other biologically important molecules over much longer time periods than was previously accessible to computational study.  The MD research community is using the Anton 2 machine at PSC to investigate important biological phenomena that due to their intrinsically long time scales have been outside the reach of even the most powerful general-purpose scientific computers.  Application areas include biomolecular energy transformation, ion channel selectivity and gating, drug interactions with proteins and nucleic acids, protein folding and protein-membrane signaling.",
-    "recommendedUse": "As part of the ACCESS ecosystem, Anton 2 invites interested molecular dynamics (MD) investigators to request allocations on the special purpose supercomputer built specifically for MD. Requests for proposals are accepted each summer. The next request period will be in 2024. For detailed application instructions please see (https://www.psc.edu/resources/anton-2/anton-rfp/). Questions regarding Anton 2 can be directed to: grants@psc.edu.",
-    "conversionFactor": null,
-    "userGuideUrl": "https://www.psc.edu/resources/anton-2/",
-    "attributeSets": [],
-    "featureCategories": [
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 135,
-            "name": "Innovative / Novel Compute",
-            "description": "Unique, innovative or non-traditional compute resource",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 140,
-            "name": "RP-managed process",
-            "description": "Resource is not allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 530157,
-    "resourceName": "OSG Open Science Pool",
-    "displayResourceName": "OSG Open Science Pool",
-    "resourceType": "Compute",
-    "description": "1 SU = 1 Core-hour",
-    "units": "SUs",
-    "organization": "Open Science Grid",
-    "resourceRepositoryKey": 142288,
-    "productionBeginDate": "2012-04-01",
-    "productionEndDate": "2025-12-31",
-    "resourceDescription": "A virtual HTCondor pool made up of resources from the Open Science Grid",
-    "recommendedUse": "High throughput jobs using a single core, or a small number of threads which can fit on a single compute node.",
-    "conversionFactor": "3.147",
-    "userGuideUrl": "https://portal.osg-htc.org/documentation/",
-    "attributeSets": [],
-    "featureCategories": [
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 139,
-            "name": "ACCESS Allocated",
-            "description": "Resource is allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 103,
-        "categoryName": "Specialized Support",
-        "categoryDescription": "Special services offered by the resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 145,
-            "name": "Preemption",
-            "description": "preemption",
-            "isFilter": null
-          },
-          {
-            "featureId": 146,
-            "name": "Science Gateway support",
-            "description": "Support for Science Gateways",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 531562,
-    "resourceName": "TACC Dell/Intel Sapphire Rapids, Ice Lake, Skylake (Stampede3)",
-    "displayResourceName": "TACC Dell/Intel Sapphire Rapids, Ice Lake, Skylake (Stampede3)",
-    "resourceType": "Compute",
-    "description": "DECEMBER 1, 2023 WILL BE THE START DATE FOR STAMPEDE3 MAXIMIZE ALLOCATIONS\r\n\r\nStampede3 is allocated in service units (SU)s. \r\nThe charge rate varies by node type:\r\n1) Skylake 1 node-hour = 1 SU\r\n2) Ice Lake 1 node-hour = 1.66 SU\r\n3) Sapphire Rapids  1 node-hour = 3 SU",
-    "units": "Node Hours",
-    "organization": "University of Texas at Austin",
-    "resourceRepositoryKey": 146465,
-    "productionBeginDate": "2024-04-27",
-    "productionEndDate": "2028-09-30",
-    "resourceDescription": "Stampede3 is generously funded through the National Science Foundation and is designed to serve today's researchers as well as support the research community on an evolutionary path toward many-core processors and accelerated technologies. Stampede 3 maintains the familiar programming model for all of today's users, and thus will be broadly useful for traditional simulation users, users performing data intensive computations, and emerging classes of new users.",
-    "recommendedUse": "Stampede3 is intended primarily for parallel applications scalable to tens of thousands of cores, as well as general purpose and throughput computing. Normal batch queues will enable users to run simulations up to 48 hours.",
-    "conversionFactor": "512.0",
-    "userGuideUrl": "https://docs.tacc.utexas.edu/hpc/stampede3/",
-    "attributeSets": [],
-    "featureCategories": [
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 136,
-            "name": "CPU Compute",
-            "description": "General compute use",
-            "isFilter": null
-          },
-          {
-            "featureId": 134,
-            "name": "GPU Compute",
-            "description": "GPU use is the main purpose of this resource",
-            "isFilter": null
-          },
-          {
-            "featureId": 135,
-            "name": "Innovative / Novel Compute",
-            "description": "Unique, innovative or non-traditional compute resource",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 139,
-            "name": "ACCESS Allocated",
-            "description": "Resource is allocated by ACCESS",
-            "isFilter": null
-          },
-          {
-            "featureId": 140,
-            "name": "RP-managed process",
-            "description": "Resource is not allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 530641,
-    "resourceName": "NCSA Delta CPU (Delta CPU)",
-    "displayResourceName": "NCSA Delta CPU (Delta CPU)",
-    "resourceType": "Compute",
-    "description": "1 Core hour = 1 CPU Core-hour in the normal priority partition. One hour using a full Delta CPU node will cost 128 core hours in the normal priority partition.",
-    "units": "Core-hours",
-    "organization": "National Center for Supercomputing Applications",
-    "resourceRepositoryKey": 145281,
-    "productionBeginDate": "2022-09-19",
-    "productionEndDate": "2027-08-31",
-    "resourceDescription": "The Delta CPU resource comprises 124 dual-socket compute nodes for general purpose computation across a broad range of domains able to benefit from the scalar and multi-core performance provided by the CPUs, such as appropriately scaled weather and climate, hydrodynamics, astrophysics, and engineering modeling and simulation, and other domains using algorithms not yet adapted for the GPU. Each Delta CPU node is configured with 2 AMD EPYC 7763 (“Milan”) processors with 64-cores/socket (128-cores/node) at 2.45GHz and 256GB of DDR4-3200 RAM. An 800GB, NVMe solid-state disk is available for use as local scratch space during job execution. All Delta CPU compute nodes are interconnected to each other and to the Delta storage resource by a 100 Gb/sec HPE Slingshot network fabric.",
-    "recommendedUse": "The Delta CPU resource is designed for general purpose computation across a broad range of domains able to benefit from the scalar and multi-core performance provided by the CPUs such as appropriately scaled weather and climate, hydrodynamics, astrophysics, and engineering modeling and simulation, and other domains that have algorithms that have not yet moved to the GPU. Delta also supports domains that employ data analysis, data analytics, or other data-centric methods. Delta features a rich base of preinstalled applications, based on user demand.  The system is optimized for capacity computing, with rapid turnaround for small to modest scale jobs, and features support for shared-node usage. Local SSD storage on each compute node benefits applications with random access data patterns or require fast access to significant amounts of compute-node local scratch space.\r\nThis allocation type is specific to and required for the CPU-only nodes on Delta. Request this allocation type if you have CPU only parts to your workflow.",
-    "conversionFactor": "8.015",
-    "userGuideUrl": "https://docs.ncsa.illinois.edu/systems/delta/en/latest/index.html",
-    "attributeSets": [],
-    "featureCategories": [
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 139,
-            "name": "ACCESS Allocated",
-            "description": "Resource is allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 103,
-        "categoryName": "Specialized Support",
-        "categoryDescription": "Special services offered by the resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 143,
-            "name": "Advance reservations",
-            "description": "has advance reservations",
-            "isFilter": null
-          },
-          {
-            "featureId": 146,
-            "name": "Science Gateway support",
-            "description": "Support for Science Gateways",
-            "isFilter": null
-          },
-          {
-            "featureId": 167,
-            "name": "ACCESS OnDemand",
-            "description": "An intuitive, innovative, and interactive interface to remote computing resources",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 136,
-            "name": "CPU Compute",
-            "description": "General compute use",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 531826,
-    "resourceName": "PSC Brain Image Library (BIL)",
-    "displayResourceName": "PSC Brain Image Library (BIL)",
-    "resourceType": "Storage",
-    "description": "BIL provides rich neuroscience image data collected in alignment with FAIR (Findable, Accessible, interoperable, reusable)  principles. Experimentalists  can deposit BRAIN data originating from microscopy experiments for indexing and distribution to others. Researchers interested in using BIL data for re-analysis or other purposes (including algorithm development)   can request in-place access to datasets coupled with computing infrastructure provided by PSC Bridges-2 compute, GPU, and storage resources. Interested researchers are requested to contact PSC via email at bil-support@psc.edu",
-    "units": "Yes / No",
-    "organization": "Pittsburgh Supercomputing Center",
-    "resourceRepositoryKey": 146668,
-    "productionBeginDate": null,
-    "productionEndDate": null,
-    "resourceDescription": null,
-    "recommendedUse": "For researchers and data generators in the field of neuroscience, BIL provides a centralized hub for depositing, accessing, and sharing large brain image microscopy datasets to foster data-driven collaboration across the broader research community. AI and machine learning developers can harness the rich datasets to build and optimize models to advance neuroscience and computational image analysis domains.",
-    "conversionFactor": null,
-    "userGuideUrl": null,
-    "attributeSets": [],
-    "featureCategories": [
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 140,
-            "name": "RP-managed process",
-            "description": "Resource is not allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 135,
-            "name": "Innovative / Novel Compute",
-            "description": "Unique, innovative or non-traditional compute resource",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 530642,
-    "resourceName": "NCSA Delta Storage (Delta Storage)",
-    "displayResourceName": "NCSA Delta Storage (Delta Storage)",
-    "resourceType": "Storage",
-    "description": "",
-    "units": "GB",
-    "organization": "National Center for Supercomputing Applications",
-    "resourceRepositoryKey": 145283,
-    "productionBeginDate": "2022-09-19",
-    "productionEndDate": "2027-08-31",
-    "resourceDescription": "The Delta Storage resource provides storage allocations for projects using the Delta CPU and Delta GPU resources. It delivers 7PB of capacity to projects on Delta and will be augmented by a later expansion of 3PB of flash capacity for high-speed, data-intensive workloads.",
-    "recommendedUse": "The Delta Storage resource provides storage allocations on the scratch file system for allocated projects using the Delta CPU and Delta GPU resources. Allocations are available for the duration of the compute allocation period. Scratch is unpurged storage.",
-    "conversionFactor": "8.0145",
-    "userGuideUrl": "https://docs.ncsa.illinois.edu/systems/delta/en/latest/index.html",
-    "attributeSets": [],
-    "featureCategories": [
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 139,
-            "name": "ACCESS Allocated",
-            "description": "Resource is allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 138,
-            "name": "Storage",
-            "description": "Storage is the main purpose of this resource",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 530643,
-    "resourceName": "NCSA Delta GPU (Delta GPU)",
-    "displayResourceName": "NCSA Delta GPU (Delta GPU)",
-    "resourceType": "Compute",
-    "description": "1 GPU Hour = 1 A100 GPU-Hour on a quad-NVIDIA A100 node (using 1 of the 4 GPUs) in the normal queue. A40 GPUs are discounted while large memory GPU nodes have a premium charge. Details on the charge rates are available in the \u003ca href=\"https://docs.ncsa.illinois.edu/systems/delta/en/latest/\" target=\"_blank\"\u003eDelta user guide\u003c/a\u003e (refer to the partitions section under running jobs). ",
-    "units": "GPU Hours",
-    "organization": "National Center for Supercomputing Applications",
-    "resourceRepositoryKey": 145282,
-    "productionBeginDate": "2022-09-19",
-    "productionEndDate": "2027-08-31",
-    "resourceDescription": "The Delta GPU resource comprises 4 different node configurations intended to support accelerated computation across a broad range of domains such as soft-matter physics, molecular dynamics, replica-exchange molecular dynamics, machine learning, deep learning, natural language processing, textual analysis, visualization, ray tracing, and accelerated analysis of very large in-memory datasets. Delta is designed to support the transition of applications from CPU-only to using the GPU or hybrid CPU-GPU models. Delta GPU resource capacity is predominately provided by 200 single-socket nodes, each configured with 1 AMD EPYC 7763 (“Milan”) processors with 64-cores/socket (64-cores/node) at 2.55GHz and 256GB of DDR4-3200 RAM. Half of these single-socket GPU nodes (100 nodes) are configured with 4 NVIDIA A100 GPUs with 40GB HBM2 RAM and NVLink (400 total A100 GPUs); the remaining half (100 nodes) are configured with 4 NVIDIA A40 GPUs with 48GB GDDR6 RAM and PCIe 4.0 (400 total A40 GPUs). Rounding out the GPU resource is 6 additional “dense” GPU nodes, containing 8 GPUs each, in a dual-socket CPU configuration (128-cores per node) and 2TB of DDR4-3200 RAM but otherwise configured similarly to the single-socket GPU nodes. Within the “dense” GPU nodes, 5 nodes employ NVIDIA A100 GPUs (40 total A100 GPUs in “dense” configuration) and 1 node employs AMD MI100 GPUs (8 total MI100 GPUs) with 32GB HBM2 RAM. A 1.6TB, NVMe solid-state disk is available for use as local scratch space during job execution on each GPU node type. All Delta GPU compute nodes are interconnected to each other and to the Delta storage resource by a 100 Gb/sec HPE Slingshot network fabric.",
-    "recommendedUse": "The Delta GPU resource is designed to support accelerated computation across a broad range of domains such as soft-matter physics, molecular dynamics, replica-exchange molecular dynamics, machine learning, deep learning, natural language processing, textual analysis, visualization, ray tracing, and accelerated analysis of very large in-memory datasets. Delta is designed to support the transition of applications from CPU-only to using the GPU or hybrid CPU-GPU models. Delta features a rich base of preinstalled applications, based on user demand. The system is optimized for capacity computing, with rapid turnaround for small to modest scale jobs, and features support for shared-node usage. Local SSD storage on each compute node benefits applications with random access data patterns or require fast access to significant amounts of compute-node local scratch space.\r\nThis allocation type covers the use of all Delta GPU node types and all resources (CPU and GPU) within those nodes. If you have CPU only portions of your workflow you should also request an allocation of time under NCSA Delta CPU which provides access to CPU-only compute nodes.",
-    "conversionFactor": "534.3333",
-    "userGuideUrl": "https://docs.ncsa.illinois.edu/systems/delta/en/latest/",
-    "attributeSets": [],
-    "featureCategories": [
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 139,
-            "name": "ACCESS Allocated",
-            "description": "Resource is allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 103,
-        "categoryName": "Specialized Support",
-        "categoryDescription": "Special services offered by the resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 143,
-            "name": "Advance reservations",
-            "description": "has advance reservations",
-            "isFilter": null
-          },
-          {
-            "featureId": 146,
-            "name": "Science Gateway support",
-            "description": "Support for Science Gateways",
-            "isFilter": null
-          },
-          {
-            "featureId": 167,
-            "name": "ACCESS OnDemand",
-            "description": "An intuitive, innovative, and interactive interface to remote computing resources",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 102,
-        "categoryName": "Specialized Hardware",
-        "categoryDescription": "Key compute hardware components in this resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 142,
-            "name": "Large Memory Nodes",
-            "description": "Specialized analysis nodes with large memory",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 136,
-            "name": "CPU Compute",
-            "description": "General compute use",
-            "isFilter": null
-          },
-          {
-            "featureId": 134,
-            "name": "GPU Compute",
-            "description": "GPU use is the main purpose of this resource",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 133,
-        "categoryName": "Resource Category",
-        "categoryDescription": "NAIRR Pilot Resource Category",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 232,
-            "name": "Federal agency systems",
-            "description": "Agency supercomputers and advanced architecture systems",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 530605,
-    "resourceName": "Open Storage Network (OSN)",
-    "displayResourceName": "Open Storage Network (OSN)",
-    "resourceType": "Storage",
-    "description": "Amount of storage capacity being requested, expressed in base 10 units. The minimum allocation is 10TB. Larger allocations of up to 300TB may be accommodated with further justification and approval by OSN. Storage access is via AWS S3-compatible tools such as rclone, cyberduck and the AWS command-line interface for S3. A web interface is provided at https://portal.osn.xsede.org for allocated project users to manage and browse their storage.",
-    "units": "TB",
-    "organization": "Open Storage Network",
-    "resourceRepositoryKey": 145013,
-    "productionBeginDate": "2021-04-01",
-    "productionEndDate": null,
-    "resourceDescription": "The Open Storage Network (OSN) is an NSF-funded cloud storage resource, geographically distributed among several pods. OSN pods are currently hosted at SDSC, NCSA, MGHPCC, RENCI, and Johns Hopkins University. Each OSN pod currently hosts 1PB of storage, and is connected to R\u0026E networks at 50 Gbps. OSN storage is allocated in buckets, and is accessed using S3 interfaces with tools like rclone, cyberduck, or the AWS cli.",
-    "recommendedUse": "Cloud-style storage of project datasets for access using AWS S3-compatible tools. The minimum allocation is 10TB. Storage allocations up to 300TB may be requested via the XSEDE resource allocation process.",
-    "conversionFactor": "8.0145",
-    "userGuideUrl": "https://openstoragenetwork.readthedocs.io/en/latest/",
-    "attributeSets": [],
-    "featureCategories": [
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 138,
-            "name": "Storage",
-            "description": "Storage is the main purpose of this resource",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 139,
-            "name": "ACCESS Allocated",
-            "description": "Resource is allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 530805,
-    "resourceName": "Indiana Jetstream2 CPU",
-    "displayResourceName": "Indiana Jetstream2 CPU",
-    "resourceType": "Compute",
-    "description": "1 SU = 1 Jetstream2 vCPU-hour. VM sizes and cost per hour are available https://docs.jetstream-cloud.org/general/vmsizes/",
-    "units": "SUs",
-    "organization": "Indiana University",
-    "resourceRepositoryKey": 145446,
-    "productionBeginDate": "2022-09-07",
-    "productionEndDate": "2027-09-30",
-    "resourceDescription": "Jetstream2 is a hybrid-cloud platform that provides flexible, on-demand, programmable cyberinfrastructure tools ranging from interactive virtual machine services to a variety of infrastructure and orchestration services for research and education. The primary resource is a standard CPU resource consisting of AMD Milan 7713 CPUs with 128 cores per node and 512gb RAM per node connected by 100gbps ethernet to the spine.",
-    "recommendedUse": "For the researcher needing virtual machine services on demand as well as for software creators and researchers needing to create their own customized virtual machine environments. Additional use cases are for research-supporting infrastructure services that need to be \"always on\" as well as science gateway services and for education support, providing virtual machines for students.",
-    "conversionFactor": "8.0145",
-    "userGuideUrl": "https://docs.jetstream-cloud.org/",
-    "attributeSets": [],
-    "featureCategories": [
-      {
-        "categoryId": 103,
-        "categoryName": "Specialized Support",
-        "categoryDescription": "Special services offered by the resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 166,
-            "name": "ACCESS Pegasus",
-            "description": "Run Jobs and Workflows on ACCESS Resources from a Single Entry Point",
-            "isFilter": null
-          },
-          {
-            "featureId": 146,
-            "name": "Science Gateway support",
-            "description": "Support for Science Gateways",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 139,
-            "name": "ACCESS Allocated",
-            "description": "Resource is allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 136,
-            "name": "CPU Compute",
-            "description": "General compute use",
-            "isFilter": null
-          },
-          {
-            "featureId": 133,
-            "name": "Cloud",
-            "description": "Cloud Resource",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 530481,
-    "resourceName": "PSC Bridges-2 Regular Memory (PSC Bridges-2 RM)",
-    "displayResourceName": "PSC Bridges-2 Regular Memory (PSC Bridges-2 RM)",
-    "resourceType": "Compute",
-    "description": "1 SU = 1 core hour",
-    "units": "Core-hours",
-    "organization": "Pittsburgh Supercomputing Center",
-    "resourceRepositoryKey": 145121,
-    "productionBeginDate": "2021-02-11",
-    "productionEndDate": "2025-09-30",
-    "resourceDescription": "Bridges-2 combines high-performance computing (HPC), high performance artificial intelligence (HPAI), and large-scale data management to support simulation and modeling, data analytics, community data, and complex workflows.\r\n\r\nBridges-2 Regular Memory (RM) nodes provide extremely powerful general-purpose computing, machine learning and data analytics, AI inferencing, and pre- and post-processing. Each Bridges RM node consists of two AMD EPYC “Rome” 7742 64-core CPUs, 256-512GB of RAM, and 3.84TB NVMe SSD. 488 Bridges-2 RM nodes have 256GB RAM, and 16 have 512GB RAM for more memory-intensive applications (see also Bridges-2 Extreme Memory nodes, each of which has 4TB of RAM). Bridges-2 RM nodes are connected to other Bridges-2 compute nodes and its Ocean parallel filesystem and archive by HDR-200 InfiniBand.",
-    "recommendedUse": "Bridges-2 Regular Memory (RM) nodes provide extremely powerful general-purpose computing, machine learning and data analytics, AI inferencing, and pre- and post-processing. Their x86 CPUs support an extremely broad range of applications, and jobs can request anywhere from 1 core to all 64,512 cores of the Bridges-2 RM resource.",
-    "conversionFactor": "8.0145",
-    "userGuideUrl": "http://www.psc.edu/resources/bridges-2/user-guide",
-    "attributeSets": [],
-    "featureCategories": [
-      {
-        "categoryId": 103,
-        "categoryName": "Specialized Support",
-        "categoryDescription": "Special services offered by the resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 167,
-            "name": "ACCESS OnDemand",
-            "description": "An intuitive, innovative, and interactive interface to remote computing resources",
-            "isFilter": null
-          },
-          {
-            "featureId": 166,
-            "name": "ACCESS Pegasus",
-            "description": "Run Jobs and Workflows on ACCESS Resources from a Single Entry Point",
-            "isFilter": null
-          },
-          {
-            "featureId": 143,
-            "name": "Advance reservations",
-            "description": "has advance reservations",
-            "isFilter": null
-          },
-          {
-            "featureId": 146,
-            "name": "Science Gateway support",
-            "description": "Support for Science Gateways",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 139,
-            "name": "ACCESS Allocated",
-            "description": "Resource is allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 136,
-            "name": "CPU Compute",
-            "description": "General compute use",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 133,
-        "categoryName": "Resource Category",
-        "categoryDescription": "NAIRR Pilot Resource Category",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 232,
-            "name": "Federal agency systems",
-            "description": "Agency supercomputers and advanced architecture systems",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 531034,
-    "resourceName": "TAMU FASTER",
-    "displayResourceName": "TAMU FASTER",
-    "resourceType": "Compute",
-    "description": "1 SU = 1 core hour",
-    "units": "SUs",
-    "organization": "Texas A\u0026M University",
-    "resourceRepositoryKey": 145280,
-    "productionBeginDate": "2022-03-31",
-    "productionEndDate": "2025-09-30",
-    "resourceDescription": "FASTER (Fostering Accelerated Scientific Transformations, Education and Research) is funded by the NSF MRI program (Award #2019129) and provides a composable high-performance data-analysis and computing instrument.  The FASTER system has 180 compute nodes with 2 Intel 32-core Ice Lake processors and 256 GB RAM, and includes 240 NVIDIA GPUs (40 A100 and 200 T4 GPUs). Using LIQID’s composable technology, all 180 compute nodes have access to the pool of available GPUs, dramatically improving workflow scalability. FASTER will have HDR InfiniBand interconnection and access/share a 5PB usable high-performance storage system running Lustre filesystem. thirty percent of FASTER’s computing resources will be allocated to researchers nationwide through XSEDE’s XRAC process.",
-    "recommendedUse": "Workflows that can utilize multiple GPUs.",
-    "conversionFactor": "1.0",
-    "userGuideUrl": null,
-    "attributeSets": [],
-    "featureCategories": [
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 135,
-            "name": "Innovative / Novel Compute",
-            "description": "Unique, innovative or non-traditional compute resource",
-            "isFilter": null
-          },
-          {
-            "featureId": 134,
-            "name": "GPU Compute",
-            "description": "GPU use is the main purpose of this resource",
-            "isFilter": null
-          },
-          {
-            "featureId": 136,
-            "name": "CPU Compute",
-            "description": "General compute use",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 139,
-            "name": "ACCESS Allocated",
-            "description": "Resource is allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 102,
-        "categoryName": "Specialized Hardware",
-        "categoryDescription": "Key compute hardware components in this resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 141,
-            "name": "Composable hardware fabric",
-            "description": "Composable hardware fabric",
-            "isFilter": null
-          },
-          {
-            "featureId": 142,
-            "name": "Large Memory Nodes",
-            "description": "Specialized analysis nodes with large memory",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 103,
-        "categoryName": "Specialized Support",
-        "categoryDescription": "Special services offered by the resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 167,
-            "name": "ACCESS OnDemand",
-            "description": "An intuitive, innovative, and interactive interface to remote computing resources",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 530806,
-    "resourceName": "Indiana Jetstream2 GPU",
-    "displayResourceName": "Indiana Jetstream2 GPU",
-    "resourceType": "Compute",
-    "description": "Jetstream2 GPU VMs are charged 4x the number of vCPUs per hour because of the associated GPU capability. For example, the g3.large VM costs 64 SUs per hour. VM sizes and cost per hour are available at \u003ca href=\"https://docs.jetstream-cloud.org/general/vmsizes/\"\u003ethe Jetstream2 website\u003c/a\u003e.",
-    "units": "SUs",
-    "organization": "Indiana University",
-    "resourceRepositoryKey": 145447,
-    "productionBeginDate": "2021-10-01",
-    "productionEndDate": "2025-09-30",
-    "resourceDescription": "Jetstream2 GPU is a hybrid-cloud platform that provides flexible, on-demand, programmable cyberinfrastructure tools ranging from interactive virtual machine services to a variety of infrastructure and orchestration services for research and education. This particular portion of the resource is allocated separately from the primary resource and contains 360 NVIDIA A100 GPUs -- 4 GPUs per node, 128 AMD Milan cores, and 512gb RAM connected by 100gbps ethernet to the spine.",
-    "recommendedUse": "For the researcher needing GPUs for virtual machine services on demand as well as for software creators and researchers needing to create their own customized virtual machine environments. Additional use cases are for research-supporting infrastructure services that need to be \"always on\" as well as science gateway services and for education support, providing virtual machines for students. \r\n\r\nThe A100 GPUs on Jetstream2-GPU are well-suited for machine learning/deep learning projects and other codes optimized for GPU usage. They also may be utilized for some graphical/desktop applications with some effort.",
-    "conversionFactor": "8.0145",
-    "userGuideUrl": "https://docs.jetstream-cloud.org/",
-    "attributeSets": [],
-    "featureCategories": [
-      {
-        "categoryId": 103,
-        "categoryName": "Specialized Support",
-        "categoryDescription": "Special services offered by the resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 166,
-            "name": "ACCESS Pegasus",
-            "description": "Run Jobs and Workflows on ACCESS Resources from a Single Entry Point",
-            "isFilter": null
-          },
-          {
-            "featureId": 146,
-            "name": "Science Gateway support",
-            "description": "Support for Science Gateways",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 139,
-            "name": "ACCESS Allocated",
-            "description": "Resource is allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 134,
-            "name": "GPU Compute",
-            "description": "GPU use is the main purpose of this resource",
-            "isFilter": null
-          },
-          {
-            "featureId": 133,
-            "name": "Cloud",
-            "description": "Cloud Resource",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 133,
-        "categoryName": "Resource Category",
-        "categoryDescription": "NAIRR Pilot Resource Category",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 232,
-            "name": "Federal agency systems",
-            "description": "Agency supercomputers and advanced architecture systems",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 530484,
-    "resourceName": "PSC Bridges-2 GPU (PSC Bridges-2 GPU)",
-    "displayResourceName": "PSC Bridges-2 GPU (PSC Bridges-2 GPU)",
-    "resourceType": "Compute",
-    "description": "1 SU = 1 GPU hour",
-    "units": "GPU Hours",
-    "organization": "Pittsburgh Supercomputing Center",
-    "resourceRepositoryKey": 145124,
-    "productionBeginDate": "2021-02-11",
-    "productionEndDate": "2025-09-30",
-    "resourceDescription": "Bridges-2 combines high-performance computing (HPC), high performance artificial intelligence (HPAI), and large-scale data management to support simulation and modeling, data analytics, community data, and complex workflows.\r\n\r\nBridges-2 Accelerated GPU (GPU) nodes are optimized for scalable artificial intelligence (AI; deep learning). They are also available for accelerated simulation and modeling applications. Bridges-2 GPU nodes each contain 8 NVIDIA Tesla V100-32GB SXM2 GPUs, providing 40,960 CUDA cores and 5,120 tensor cores. In addition, each node holds 2 Intel Xeon Gold 6248 CPUs; 512GB of DDR4-2933 RAM; and 7.68TB NVMe SSD. They are connected to Bridges-2's other compute nodes and its Ocean parallel filesystem and archive by two HDR-200 InfiniBand links, providing 400Gbps of bandwidth to enhance scalability of deep learning training.",
-    "recommendedUse": "Bridges-2 GPU nodes are optimized for scalable artificial intelligence (AI) including deep learning training, deep reinforcement learning, and generative techniques - as well as for accelerated simulation and modeling.",
-    "conversionFactor": "431.55",
-    "userGuideUrl": "http://www.psc.edu/resources/bridges-2/user-guide",
-    "attributeSets": [],
-    "featureCategories": [
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 139,
-            "name": "ACCESS Allocated",
-            "description": "Resource is allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 103,
-        "categoryName": "Specialized Support",
-        "categoryDescription": "Special services offered by the resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 166,
-            "name": "ACCESS Pegasus",
-            "description": "Run Jobs and Workflows on ACCESS Resources from a Single Entry Point",
-            "isFilter": null
-          },
-          {
-            "featureId": 167,
-            "name": "ACCESS OnDemand",
-            "description": "An intuitive, innovative, and interactive interface to remote computing resources",
-            "isFilter": null
-          },
-          {
-            "featureId": 143,
-            "name": "Advance reservations",
-            "description": "has advance reservations",
-            "isFilter": null
-          },
-          {
-            "featureId": 146,
-            "name": "Science Gateway support",
-            "description": "Support for Science Gateways",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 134,
-            "name": "GPU Compute",
-            "description": "GPU use is the main purpose of this resource",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 133,
-        "categoryName": "Resource Category",
-        "categoryDescription": "NAIRR Pilot Resource Category",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 232,
-            "name": "Federal agency systems",
-            "description": "Agency supercomputers and advanced architecture systems",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 530209,
-    "resourceName": "Science Gateways Center of Excellence (SGX3)",
-    "displayResourceName": "Science Gateways Center of Excellence (SGX3)",
-    "resourceType": "Program",
-    "description": "",
-    "units": "Yes / No",
-    "organization": "Science Gateways Community Institute",
-    "resourceRepositoryKey": 144601,
-    "productionBeginDate": "2016-08-01",
-    "productionEndDate": "2027-08-31",
-    "resourceDescription": "The Science Gateways Community Institute (SGCI) and the follow-on SGX3 NSF Center of Excellence projects support science gateways through both complementary and paid services. Complementary services include assistance with proposal development, a technical consultancy to help science gateway providers define their system architectures and choose technologies, a usability/user experience consultancy to help design effective user interfaces, and sustainability training programs to help science gateway providers with long term operations planning.\r\nFor more about science gateways and additional available services, please see https://sciencegateways.org/our-services/consulting-services.  An SGCI team member will contact allocated projects to help review and select specific services.",
-    "recommendedUse": "SGCI services can be used to develop entirely new gateways or improve existing gateways. The gateways do not need to make use of ACCESS compute resources (though they can). They could be gateways to data collections, instruments, sensor streams, citizen science engagement, etc.",
-    "conversionFactor": "8.0145",
-    "userGuideUrl": "http://www.sciencegateways.org/",
-    "attributeSets": [
-      {
-        "attributeSetId": 530701,
-        "attributeSetTypeId": 500008,
-        "attributeSetRelationTypeId": 500007,
-        "attributeSetName": "Science Gateway Name",
-        "relativeOrder": 1,
-        "isActive": true,
-        "attributes": [
-          {
-            "resourceAttributeId": 533321,
-            "attributeName": "Please enter your answer below:",
-            "description": null,
-            "isRequired": true,
-            "relativeOrder": 1
-          }
-        ]
-      },
-      {
-        "attributeSetId": 530702,
-        "attributeSetTypeId": 500008,
-        "attributeSetRelationTypeId": 500007,
-        "attributeSetName": "Science Gateway URL (if applicable)",
-        "relativeOrder": 2,
-        "isActive": true,
-        "attributes": [
-          {
-            "resourceAttributeId": 533322,
-            "attributeName": "Please enter your answer below:",
-            "description": null,
-            "isRequired": true,
-            "relativeOrder": 1
-          }
-        ]
-      },
-      {
-        "attributeSetId": 530703,
-        "attributeSetTypeId": 500008,
-        "attributeSetRelationTypeId": 500007,
-        "attributeSetName": "Other Team Members who will work on the project (optional; please include contact info for them)",
-        "relativeOrder": 3,
-        "isActive": true,
-        "attributes": [
-          {
-            "resourceAttributeId": 533323,
-            "attributeName": "Please enter your answer below:",
-            "description": null,
-            "isRequired": true,
-            "relativeOrder": 1
-          }
-        ]
-      },
-      {
-        "attributeSetId": 530704,
-        "attributeSetTypeId": 500008,
-        "attributeSetRelationTypeId": 500007,
-        "attributeSetName": "Project Description: Please provide a short description summarizing the science gateway project, its goals and functions, any technologies already in use, and the community that it serves or will serve.",
-        "relativeOrder": 4,
-        "isActive": true,
-        "attributes": [
-          {
-            "resourceAttributeId": 533324,
-            "attributeName": "Please enter your answer below:",
-            "description": null,
-            "isRequired": true,
-            "relativeOrder": 1
-          }
-        ]
-      },
-      {
-        "attributeSetId": 530705,
-        "attributeSetTypeId": 500008,
-        "attributeSetRelationTypeId": 500007,
-        "attributeSetName": "SGCI Services: Please provide a short description about what you would like to achieve by using the services of the Institute.",
-        "relativeOrder": 5,
-        "isActive": true,
-        "attributes": [
-          {
-            "resourceAttributeId": 533325,
-            "attributeName": "Please enter your answer below:",
-            "description": null,
-            "isRequired": true,
-            "relativeOrder": 1
-          }
-        ]
-      }
-    ],
-    "featureCategories": [
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 137,
-            "name": "Service / Other",
-            "description": "An allocated resource that's not compute or storage",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 139,
-            "name": "ACCESS Allocated",
-            "description": "Resource is allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 103,
-        "categoryName": "Specialized Support",
-        "categoryDescription": "Special services offered by the resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 146,
-            "name": "Science Gateway support",
-            "description": "Support for Science Gateways",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 531364,
-    "resourceName": "MATCHPlus",
-    "displayResourceName": "MATCHPlus",
-    "resourceType": "Program",
-    "description": "The ACCESS MATCHPlus short-term support partnership provides consulting support from an experienced mentor paired with a student-facilitator to help you address an immediate research need. These needs may include improvements like expanding your code functionality, transitioning from lab computers to HPC, or introducing new technologies into your workflow. For more information visit the ACCESS Support portal: https://support.access-ci.org/matchplus",
-    "units": "Yes / No",
-    "organization": "ACCESS Support",
-    "resourceRepositoryKey": 146003,
-    "productionBeginDate": "2022-10-24",
-    "productionEndDate": null,
-    "resourceDescription": null,
-    "recommendedUse": "MATCHPlus is an opportunity for researchers to get help with improvements like expanding your code functionality, transitioning from lab computers to HPC, or introducing new technologies into your workflow.",
-    "conversionFactor": null,
-    "userGuideUrl": "https://support.access-ci.org/matchplus",
-    "attributeSets": [
-      {
-        "attributeSetId": 535543,
-        "attributeSetTypeId": 500007,
-        "attributeSetRelationTypeId": 500007,
-        "attributeSetName": "Please let us know why you are requesting a MatchPlus project (e.g., graduate student, first time running on a supercomputer, a small or resource-constrained institution).",
-        "relativeOrder": 1,
-        "isActive": true,
-        "attributes": [
-          {
-            "resourceAttributeId": 536097,
-            "attributeName": "Please enter your answer",
-            "description": null,
-            "isRequired": true,
-            "relativeOrder": 1
-          }
-        ]
-      }
-    ],
-    "featureCategories": [
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 137,
-            "name": "Service / Other",
-            "description": "An allocated resource that's not compute or storage",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 139,
-            "name": "ACCESS Allocated",
-            "description": "Resource is allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 530483,
-    "resourceName": "PSC Bridges-2 Extreme Memory (PSC Bridges-2 EM)",
-    "displayResourceName": "PSC Bridges-2 Extreme Memory (PSC Bridges-2 EM)",
-    "resourceType": "Compute",
-    "description": "1 SU = 1 core hour",
-    "units": "Core-hours",
-    "organization": "Pittsburgh Supercomputing Center",
-    "resourceRepositoryKey": 145123,
-    "productionBeginDate": "2021-02-11",
-    "productionEndDate": "2025-09-30",
-    "resourceDescription": "Bridges-2 combines high-performance computing (HPC), high performance artificial intelligence (HPAI), and large-scale data management to support simulation and modeling, data analytics, community data, and complex workflows.\r\n\r\nBridges-2 Extreme Memory (EM) nodes enable memory-intensive  genome sequence assembly, graph analytics, in-memory databases, statistics, and other applications that need a large amount of memory and for which distributed-memory implementations are not available. Bridges-2 Extreme Memory (EM) nodes each consist of 4 Intel Xeon Platinum 8260M “Cascade Lake” CPUs, 4TB of DDR4-2933 RAM, 7.68TB NVMe SSD. They are connected to Bridges-2's other compute nodes and its Ocean parallel filesystem and archive by two HDR-200 InfiniBand links, providing 400Gbps of bandwidth to read or write data from each EM node.",
-    "recommendedUse": "Bridges-2 Extreme Memory (EM) nodes enable memory-intensive  genome sequence assembly, graph analytics, statistics, in-memory databases, and other applications that need a large amount of memory and for which distributed-memory implementations are not available. This includes memory-intensive applications implemented in languages such as Java, R, and Python. Their x86 CPUs support an extremely broad range of applications, and approximately 42GB of RAM per core provides valuable support for applications where memory capacity is the primary requirement.",
-    "conversionFactor": "71.558",
-    "userGuideUrl": "http://www.psc.edu/resources/bridges-2/user-guide",
-    "attributeSets": [],
-    "featureCategories": [
-      {
-        "categoryId": 103,
-        "categoryName": "Specialized Support",
-        "categoryDescription": "Special services offered by the resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 166,
-            "name": "ACCESS Pegasus",
-            "description": "Run Jobs and Workflows on ACCESS Resources from a Single Entry Point",
-            "isFilter": null
-          },
-          {
-            "featureId": 143,
-            "name": "Advance reservations",
-            "description": "has advance reservations",
-            "isFilter": null
-          },
-          {
-            "featureId": 146,
-            "name": "Science Gateway support",
-            "description": "Support for Science Gateways",
-            "isFilter": null
-          },
-          {
-            "featureId": 167,
-            "name": "ACCESS OnDemand",
-            "description": "An intuitive, innovative, and interactive interface to remote computing resources",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 139,
-            "name": "ACCESS Allocated",
-            "description": "Resource is allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 102,
-        "categoryName": "Specialized Hardware",
-        "categoryDescription": "Key compute hardware components in this resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 142,
-            "name": "Large Memory Nodes",
-            "description": "Specialized analysis nodes with large memory",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 136,
-            "name": "CPU Compute",
-            "description": "General compute use",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 133,
-        "categoryName": "Resource Category",
-        "categoryDescription": "NAIRR Pilot Resource Category",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 232,
-            "name": "Federal agency systems",
-            "description": "Agency supercomputers and advanced architecture systems",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 530478,
-    "resourceName": "SDSC Expanse CPU",
-    "displayResourceName": "SDSC Expanse CPU",
-    "resourceType": "Compute",
-    "description": "SDSC Expanse Dell/AMD Rome cluster with HDR InfiniBand designed to provide cyberinfrastructure for the long tail of science, covering a diverse application base with complex workflows.",
-    "units": "Core-hours",
-    "organization": "San Diego Supercomputer Center",
-    "resourceRepositoryKey": 145117,
-    "productionBeginDate": "2020-10-01",
-    "productionEndDate": "2025-10-01",
-    "resourceDescription": "Expanse is a Dell integrated compute cluster, with AMD Rome processors, 128 cores per node, interconnected with Mellanox HDR InfiniBand in a hybrid fat-tree topology. The compute node section of Expanse has a peak performance of 3.373 PF. Full bisection bandwidth is available at rack level (56 compute nodes) with HDR100 connectivity to each node. HDR200 switches are used at the rack level and 3:1 oversubscription cross-rack. Compute nodes feature 1TB of NVMe storage and 256GB of DRAM per node. The system also features 12PB of Lustre based performance storage (140GB/s aggregate), and 7PB of Ceph based object storage.",
-    "recommendedUse": "Expanse is designed to provide cyberinfrastructure for the long tail of science, covering a diverse application base with complex workflows. It features a rich base of preinstalled applications including commercial software like Gaussian, Abaqus, QChem, MATLAB, and IDL. The system is geared towards supporting capacity computing, optimized for quick turnaround on small/modest scale jobs. The local NVMes on each compute node are beneficial to applications that exhibit random access data patterns or require fast access to significant amounts of compute node local scratch space. Expanse supports containers and composable systems computing with dynamic capabilities enabled using tools such as Kubernetes and workflow software for e.g., continuum/edge computing applications.",
-    "conversionFactor": "8.0145",
-    "userGuideUrl": "https://www.sdsc.edu/support/user_guides/expanse.html",
-    "attributeSets": [
-      {
-        "attributeSetId": 536171,
-        "attributeSetTypeId": 500006,
-        "attributeSetRelationTypeId": 500004,
-        "attributeSetName": "Do your jobs require less than 4096 cores? Expanse CPU jobs are limited in size to 4096 cores (32 nodes). Up to 4096 single-core jobs are permitted simultaneously.",
-        "relativeOrder": 7,
-        "isActive": true,
-        "attributes": [
-          {
-            "resourceAttributeId": 536462,
-            "attributeName": "Yes",
-            "description": null,
-            "isRequired": true,
-            "relativeOrder": 1
-          },
-          {
-            "resourceAttributeId": 536463,
-            "attributeName": "No",
-            "description": null,
-            "isRequired": true,
-            "relativeOrder": 1
-          }
-        ]
-      }
-    ],
-    "featureCategories": [
-      {
-        "categoryId": 103,
-        "categoryName": "Specialized Support",
-        "categoryDescription": "Special services offered by the resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 166,
-            "name": "ACCESS Pegasus",
-            "description": "Run Jobs and Workflows on ACCESS Resources from a Single Entry Point",
-            "isFilter": null
-          },
-          {
-            "featureId": 143,
-            "name": "Advance reservations",
-            "description": "has advance reservations",
-            "isFilter": null
-          },
-          {
-            "featureId": 167,
-            "name": "ACCESS OnDemand",
-            "description": "An intuitive, innovative, and interactive interface to remote computing resources",
-            "isFilter": null
-          },
-          {
-            "featureId": 146,
-            "name": "Science Gateway support",
-            "description": "Support for Science Gateways",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 139,
-            "name": "ACCESS Allocated",
-            "description": "Resource is allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 102,
-        "categoryName": "Specialized Hardware",
-        "categoryDescription": "Key compute hardware components in this resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 142,
-            "name": "Large Memory Nodes",
-            "description": "Specialized analysis nodes with large memory",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 136,
-            "name": "CPU Compute",
-            "description": "General compute use",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 133,
-        "categoryName": "Resource Category",
-        "categoryDescription": "NAIRR Pilot Resource Category",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 232,
-            "name": "Federal agency systems",
-            "description": "Agency supercomputers and advanced architecture systems",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 530480,
-    "resourceName": "SDSC Expanse GPU",
-    "displayResourceName": "SDSC Expanse GPU",
-    "resourceType": "Compute",
-    "description": "SDSC Expanse Dell/NVIDIA V100 cluster with NVLINK and HDR InfiniBand recommend to be used for accelerating codes optimized to take advantage of GPUs.",
-    "units": "GPU Hours",
-    "organization": "San Diego Supercomputer Center",
-    "resourceRepositoryKey": 145118,
-    "productionBeginDate": "2020-10-01",
-    "productionEndDate": "2025-10-01",
-    "resourceDescription": "Expanse is a Dell integrated compute cluster, with AMD Rome processors, NVIDIA V100 GPUs, interconnected with Mellanox HDR InfiniBand in a hybrid fat-tree topology. The GPU component of Expanse features 52 GPU nodes, each containing four NVIDIA V100s (32 GB SMX2), connected via NVLINK, and dual 20-core Intel Xeon 6248 CPUs. They feature 1.6TB of NVMe storage and 256GB of DRAM per node. There is HDR100 connectivity to each node. The system also features 12PB of Lustre based performance storage (140GB/s aggregate), and 7PB of Ceph based object storage.",
-    "recommendedUse": "GPUs are a specialized resource that performs well for certain classes of algorithms and applications. Recommend to be used for accelerating simulation codes optimized to take advantage of GPUs (using CUDA, OpenACC). There is a large and growing base of community codes that have been optimized for GPUs including those in molecular dynamics, and machine learning. GPU-enabled applications on Expanse will include: AMBER, Gromacs, BEAST, OpenMM, NAMD, TensorFlow, and PyTorch.",
-    "conversionFactor": "431.55",
-    "userGuideUrl": "https://www.sdsc.edu/support/user_guides/expanse.html",
-    "attributeSets": [
-      {
-        "attributeSetId": 536170,
-        "attributeSetTypeId": 500006,
-        "attributeSetRelationTypeId": 500004,
-        "attributeSetName": "Do your jobs require less than 16 GPUs in a single job? Expanse GPU jobs are limited in size to 16 GPUs (4 nodes). Up to 24 single GPU-node jobs are permitted simultaneously.",
-        "relativeOrder": 7,
-        "isActive": true,
-        "attributes": [
-          {
-            "resourceAttributeId": 536460,
-            "attributeName": "Yes",
-            "description": null,
-            "isRequired": true,
-            "relativeOrder": 1
-          },
-          {
-            "resourceAttributeId": 536461,
-            "attributeName": "No",
-            "description": null,
-            "isRequired": true,
-            "relativeOrder": 1
-          }
-        ]
-      }
-    ],
-    "featureCategories": [
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 139,
-            "name": "ACCESS Allocated",
-            "description": "Resource is allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 103,
-        "categoryName": "Specialized Support",
-        "categoryDescription": "Special services offered by the resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 166,
-            "name": "ACCESS Pegasus",
-            "description": "Run Jobs and Workflows on ACCESS Resources from a Single Entry Point",
-            "isFilter": null
-          },
-          {
-            "featureId": 143,
-            "name": "Advance reservations",
-            "description": "has advance reservations",
-            "isFilter": null
-          },
-          {
-            "featureId": 146,
-            "name": "Science Gateway support",
-            "description": "Support for Science Gateways",
-            "isFilter": null
-          },
-          {
-            "featureId": 167,
-            "name": "ACCESS OnDemand",
-            "description": "An intuitive, innovative, and interactive interface to remote computing resources",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 134,
-            "name": "GPU Compute",
-            "description": "GPU use is the main purpose of this resource",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 133,
-        "categoryName": "Resource Category",
-        "categoryDescription": "NAIRR Pilot Resource Category",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 232,
-            "name": "Federal agency systems",
-            "description": "Agency supercomputers and advanced architecture systems",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 531529,
-    "resourceName": "TAMU ACES",
-    "displayResourceName": "TAMU ACES",
-    "resourceType": "Compute",
-    "description": "",
-    "units": "SUs",
-    "organization": "Texas A\u0026M University",
-    "resourceRepositoryKey": 146168,
-    "productionBeginDate": "2023-04-14",
-    "productionEndDate": "2026-09-30",
-    "resourceDescription": "ACES is a Dell cluster with a rich accelerator testbed consisting of Intel Max GPUs (Graphics Processing Units), Intel FPGAs (Field Programmable Gate Arrays), NVIDIA H100 and A30 GPUs, NEC Vector Engines, NextSilicon co-processors, Graphcore IPUs (Intelligence Processing Units). The ACES cluster consists of compute nodes using a mix of the following processors:\r\n\r\nIntel Xeon 8468 Sapphire Rapids processors\r\nIntel Xeon Ice Lake 8352Y processors\r\nIntel Xeon Cascade Lake 8268 processors\r\nAMD Epyc Rome 7742 processors\r\n\r\nThe compute nodes are interconnected with NVIDIA NDR200 connections for MPI and access to the Lustre storage. The Intel Optane SSDs and all accelerators (except the Graphcore IPUs and NEC Vector Engines) are accessed using Liqid's composable infrustructre via PCIe (Peripheral Component Interconnect express) Gen4 and Gen5 fabrics.",
-    "recommendedUse": "Machine Learning (ML), Artificial Intelligence (AI), and workflows that can utilize novel accelerators and/or multiple GPUs.",
-    "conversionFactor": "1.0",
-    "userGuideUrl": "https://hprc.tamu.edu/kb/Quick-Start/ACES",
-    "attributeSets": [],
-    "featureCategories": [
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 139,
-            "name": "ACCESS Allocated",
-            "description": "Resource is allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 134,
-            "name": "GPU Compute",
-            "description": "GPU use is the main purpose of this resource",
-            "isFilter": null
-          },
-          {
-            "featureId": 135,
-            "name": "Innovative / Novel Compute",
-            "description": "Unique, innovative or non-traditional compute resource",
-            "isFilter": null
-          },
-          {
-            "featureId": 136,
-            "name": "CPU Compute",
-            "description": "General compute use",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 102,
-        "categoryName": "Specialized Hardware",
-        "categoryDescription": "Key compute hardware components in this resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 141,
-            "name": "Composable hardware fabric",
-            "description": "Composable hardware fabric",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 103,
-        "categoryName": "Specialized Support",
-        "categoryDescription": "Special services offered by the resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 167,
-            "name": "ACCESS OnDemand",
-            "description": "An intuitive, innovative, and interactive interface to remote computing resources",
-            "isFilter": null
-          },
-          {
-            "featureId": 146,
-            "name": "Science Gateway support",
-            "description": "Support for Science Gateways",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 133,
-        "categoryName": "Resource Category",
-        "categoryDescription": "NAIRR Pilot Resource Category",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 232,
-            "name": "Federal agency systems",
-            "description": "Agency supercomputers and advanced architecture systems",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 531760,
-    "resourceName": "SDSC Voyager (Habana Training and Inference Processor based AI System)",
-    "displayResourceName": "SDSC Voyager (Habana Training and Inference Processor based AI System)",
-    "resourceType": "Compute",
-    "description": "SDSC Voyager cluster with Intel Habana Gaudi training processors for deep learning applications. Voyager does not have general-purpose GPUs. The Gaudi training processors are custom designed and optimized for deep learning. Only AI/scientific applications that feature deep learning are recommended for use on this system.\r\n",
-    "units": "Gaudi-hours",
-    "organization": "San Diego Supercomputer Center",
-    "resourceRepositoryKey": 146630,
-    "productionBeginDate": "2022-05-01",
-    "productionEndDate": null,
-    "resourceDescription": "Voyager is a heterogeneous system designed to support complex deep learning AI workflows. The system features 42 Intel Habana Gaudi training nodes, each with 8 training processors (336 in total). Each training node has 512GB of memory and 6.4TB of node local NVMe storage. The Gaudi training processors feature specialized hardware units for AI, HBM2, and on-chip high-speed Ethernet. The on-chip ethernet ports are used in a non-blocking all-to-all network between processors on a node and the remaining ports are aggregated into 6 400G connections on each node that are plugged into a 400G Arista switch to provide scale out of network. Voyager also has two first-generation inference nodes, each with 8 inference processors (16 in total). In addition to the custom AI hardware, the system also has 36 Intel x86 processors compute nodes for general purpose computing and data processing. Voyager features 3PB of storage currently deployed as a Ceph filesystem.",
-    "recommendedUse": "Voyager invites researchers in science and engineering that are dependent upon artificial intelligence and deep learning as a critical element in their experimental and/or computational work. It provides researchers the ability to work with extremely large data sets using standard AI tools, like TensorFlow and PyTorch, or develop their own deep learning models using developer tools and libraries from Habana Labs. Voyager is currently in the testbed phase and accepting researchers through a RP managed allocation process. Interested researchers are requested to contact SDSC via email at consult@sdsc.edu.",
-    "conversionFactor": null,
-    "userGuideUrl": "https://sdsc.edu/support/user_guides/voyager.html",
-    "attributeSets": [],
-    "featureCategories": [
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 135,
-            "name": "Innovative / Novel Compute",
-            "description": "Unique, innovative or non-traditional compute resource",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 140,
-            "name": "RP-managed process",
-            "description": "Resource is not allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 133,
-        "categoryName": "Resource Category",
-        "categoryDescription": "NAIRR Pilot Resource Category",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 232,
-            "name": "Federal agency systems",
-            "description": "Agency supercomputers and advanced architecture systems",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 531727,
-    "resourceName": "PSC Neocortex (PSC Neocortex - Cerebras Wafer Scale Engine AI Accelerator)",
-    "displayResourceName": "PSC Neocortex (PSC Neocortex - Cerebras Wafer Scale Engine AI Accelerator)",
-    "resourceType": "Compute",
-    "description": "The Neocortex is a testbed system incorporating the Cerebras Wafer Engine (WSE), an accelerator initially designed for optimizing AI training and inferencing. Since its introduction a few years ago, the chip has demonstrated its effectiveness in accelerating specific non-AI workflows as well. Notably, the WSE is utilized in lieu of other accelerators, such as GPUs.\r\n\r\nNeocortex projects are expected to require the powerful compute capabilities offered by the Cerebras server and the wafer scale engine chip. Neocortex is ideal for a well-defined group of foundation and large language models. Please refer to \u003ca href=\"https://portal.neocortex.psc.edu/docs/index.html\" target=\"_blank\"\u003ethe Neocortex user guide\u003c/a\u003e for more information on the models supported and the type of applications ideally suited for Neocortex.",
-    "units": "CS-2 Hours",
-    "organization": "Pittsburgh Supercomputing Center",
-    "resourceRepositoryKey": 146597,
-    "productionBeginDate": "2023-12-01",
-    "productionEndDate": null,
-    "resourceDescription": "Neocortex is a highly innovative advanced computing system ideal for foundation and large language models. Neocortex, which captures promising specialized innovative hardware technologies, is designed to vastly accelerate large deep learning (DL) models and high- performance computing (HPC) research in pursuit of science, discovery, and societal good. Neocortex features two Cerebras CS-2 systems, provisioned by an HPE Superdome Flex HPC server and the Bridges-2 filesystems. Each CS-2 system features a Cerebras WSE-2 (Wafer Scale Engine 2), the largest chip ever built, with 850,000 Sparse Linear Algebra Compute cores, 40 GB SRAM on-chip memory, 20 PB/s aggregate memory bandwidth and 220 Pb/s interconnect bandwidth. The HPE Superdome Flex (SDF) features 32 Intel Xeon Platinum 8280L CPUs with 28 cores (56 threads) each, 2.70-4.0 GHz, 38.5 MB cache, 24 TiB RAM, aggregate memory bandwidth of 4.5 TB/s, and 204.6 TB aggregate local storage capacity with 150 GB/s read bandwidth. The SDF can provide 1.2 Tb/s to each CS-2 system and 1.6 Tb/s from the Bridges-2 filesystems. Jobs are submitted via SLURM. The CS-2 systems can run customized TensorFlow and Pytorch containers, as well as programs written using the Cerebras SDK or the WSE Field Equation API.",
-    "recommendedUse": "Neocortex, a system that captures promising innovative hardware technologies, is designed to accelerate Deep Learning (DL) and High Performance Computing (HPC) research in pursuit of science, discovery, and societal good. Currently recommended DL projects focus on foundation and large language models such as BERT, GPT-J, and Transformer, or combine supported TensorFlow or PyTorch layers. DL codes can also be developed “from scratch” using the Cerebras Software Development Toolkit (SDK). The SDK can be used to develop HPC codes, such as structured grid based PDE and ODE solvers and particle methods with regular communication. Interested researchers are encouraged to contact PSC via email at neocortex@psc.edu to address comments and questions.",
-    "conversionFactor": "17631.9",
-    "userGuideUrl": "https://www.cmu.edu/psc/aibd/neocortex/",
-    "attributeSets": [
-      {
-        "attributeSetId": 536038,
-        "attributeSetTypeId": 500007,
-        "attributeSetRelationTypeId": 500006,
-        "attributeSetName": "Describe your research team (*). Please, describe your research team and make sure to include expected roles in the proposed research, current affiliation, academic status, and relevant experience. Links to professional pages or attached documents that describe relevant experience and qualifications are welcomed.",
-        "relativeOrder": 1,
-        "isActive": true,
-        "attributes": [
-          {
-            "resourceAttributeId": 536394,
-            "attributeName": "Please enter your answer",
-            "description": null,
-            "isRequired": false,
-            "relativeOrder": 1
-          }
-        ]
-      },
-      {
-        "attributeSetId": 536039,
-        "attributeSetTypeId": 500007,
-        "attributeSetRelationTypeId": 500006,
-        "attributeSetName": "Describe your data and the total storage requirements in GB (*). Please, describe your data format and size in GB. Make sure to request as many GB of PSC Bridges-2 Ocean storage.",
-        "relativeOrder": 2,
-        "isActive": true,
-        "attributes": [
-          {
-            "resourceAttributeId": 536395,
-            "attributeName": "Please enter your answer",
-            "description": null,
-            "isRequired": false,
-            "relativeOrder": 1
-          }
-        ]
-      },
-      {
-        "attributeSetId": 535576,
-        "attributeSetTypeId": 500008,
-        "attributeSetRelationTypeId": 500005,
-        "attributeSetName": "There are four types of applications currently supported on the Neocortex system, divided into the following individual tracks:\n\n    Track 1: Cerebras modelzoo ML models\n    Track 2: Models similar to the Cerebras modelzoo models\n    Track 3: General purpose SDK\n    Track 4: WFA, WSE Field-equation API\n\nPlease see:\n\n https://portal.neocortex.psc.edu/docs/index.html\n\nfor further details.",
-        "relativeOrder": 3,
-        "isActive": true,
-        "attributes": [
-          {
-            "resourceAttributeId": 536130,
-            "attributeName": "Track 1: Cerebras modelzoo ML models",
-            "description": null,
-            "isRequired": true,
-            "relativeOrder": 1
-          },
-          {
-            "resourceAttributeId": 536131,
-            "attributeName": "Track 2: Models similar to the Cerebras modelzoo models",
-            "description": null,
-            "isRequired": true,
-            "relativeOrder": 2
-          },
-          {
-            "resourceAttributeId": 536132,
-            "attributeName": "Track 3: General purpose SDK",
-            "description": null,
-            "isRequired": true,
-            "relativeOrder": 3
-          },
-          {
-            "resourceAttributeId": 536133,
-            "attributeName": "Track 4: WFA, WSE Field-equation API",
-            "description": null,
-            "isRequired": true,
-            "relativeOrder": 4
-          }
-        ]
-      },
-      {
-        "attributeSetId": 536040,
-        "attributeSetTypeId": 500007,
-        "attributeSetRelationTypeId": 500006,
-        "attributeSetName": "Did you address all the questions associated with the track(s) in an attached application PDF document? (*). The track specific questions are available at https://portal.neocortex.psc.edu/docs/index.html. Failure to address these questions may result in your submission being rejected without review.",
-        "relativeOrder": 4,
-        "isActive": true,
-        "attributes": [
-          {
-            "resourceAttributeId": 536396,
-            "attributeName": "Please enter your answer",
-            "description": null,
-            "isRequired": false,
-            "relativeOrder": 1
-          }
-        ]
-      }
-    ],
-    "featureCategories": [
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 135,
-            "name": "Innovative / Novel Compute",
-            "description": "Unique, innovative or non-traditional compute resource",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 140,
-            "name": "RP-managed process",
-            "description": "Resource is not allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 133,
-        "categoryName": "Resource Category",
-        "categoryDescription": "NAIRR Pilot Resource Category",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 232,
-            "name": "Federal agency systems",
-            "description": "Agency supercomputers and advanced architecture systems",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 530770,
-    "resourceName": "Purdue Anvil CPU",
-    "displayResourceName": "Purdue Anvil CPU",
-    "resourceType": "Compute",
-    "description": "1 Anvil CPU Service Unit = 1 Core Hour on a regular node\r\n4 Anvil CPU Service Units = 1 Core Hour on a large memory node\r\n",
-    "units": "SUs",
-    "organization": "Purdue University",
-    "resourceRepositoryKey": 145411,
-    "productionBeginDate": "2021-10-01",
-    "productionEndDate": "2026-10-01",
-    "resourceDescription": "Purdue's Anvil cluster built in partnership with Dell and AMD consists of 1,000 nodes with two 64-core AMD EPYC \"Milan\" processors each and delivers over 1 billion CPU core hours each year, with a peak performance of 5.1 petaflops. Each of these nodes has 256GB of DDR4-3200 memory. A separate set of 32 large memory nodes has 1TB of DDR4-3200 memory each. Anvil's nodes are interconnected with 100 Gbps Mellanox HDR100 InfiniBand.",
-    "recommendedUse": "Anvil's general-purpose CPUs and 128 cores per node make it suitable for many types of CPU-based workloads including the most common modeling and simulation codes across all science and engineering domains. Memory-intensive workloads can be executed on the large memory nodes on Anvil. Anvil’s Composable Subsystem which is a Kubernetes based private cloud consists of both CPU and GPU nodes and large (S3) data storage. The Composable Subsystem is suitable for applications such as model inference service (via NVIDIA Triton), Specialized LLMs, dataset hosting, science gateways and web application hosting, and classroom and training applications via interactive access interfaces.",
-    "conversionFactor": "9.6174",
-    "userGuideUrl": "https://www.rcac.purdue.edu/anvil#docs",
-    "attributeSets": [],
-    "featureCategories": [
-      {
-        "categoryId": 103,
-        "categoryName": "Specialized Support",
-        "categoryDescription": "Special services offered by the resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 166,
-            "name": "ACCESS Pegasus",
-            "description": "Run Jobs and Workflows on ACCESS Resources from a Single Entry Point",
-            "isFilter": null
-          },
-          {
-            "featureId": 167,
-            "name": "ACCESS OnDemand",
-            "description": "An intuitive, innovative, and interactive interface to remote computing resources",
-            "isFilter": null
-          },
-          {
-            "featureId": 146,
-            "name": "Science Gateway support",
-            "description": "Support for Science Gateways",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 139,
-            "name": "ACCESS Allocated",
-            "description": "Resource is allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 102,
-        "categoryName": "Specialized Hardware",
-        "categoryDescription": "Key compute hardware components in this resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 142,
-            "name": "Large Memory Nodes",
-            "description": "Specialized analysis nodes with large memory",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 136,
-            "name": "CPU Compute",
-            "description": "General compute use",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 133,
-        "categoryName": "Resource Category",
-        "categoryDescription": "NAIRR Pilot Resource Category",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 232,
-            "name": "Federal agency systems",
-            "description": "Agency supercomputers and advanced architecture systems",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 530574,
-    "resourceName": "Kentucky Research Informatics Cloud (KyRIC) Large Memory Nodes",
-    "displayResourceName": "Kentucky Research Informatics Cloud (KyRIC) Large Memory Nodes",
-    "resourceType": "Compute",
-    "description": "Each Core hr is 1 CPU core with a default memory of 75GB RAM/core",
-    "units": "Core-hours",
-    "organization": "University of Kentucky",
-    "resourceRepositoryKey": 145213,
-    "productionBeginDate": "2021-04-01",
-    "productionEndDate": "2025-03-31",
-    "resourceDescription": "Five large memory compute nodes dedicated for XSEDE allocation. Each of these nodes have 40 cores (Broadwell class and lntel(R) Xeon(R) CPU E7-4820 v4 @ 2.00GHz with 4 sockets, 10 cores/socket), 3TB RAM, and 6TB SSD storage drives. The 5 dedicated XSEDE nodes will have exclusive access to approximately 300 TB of network attached disk storage. All these compute nodes are interconnected through a 100 Gigabit Ethernet (l00GbE) backbone and the cluster login and data transfer nodes will be connected through a 100Gb uplink to lnternet2 for external connections.",
-    "recommendedUse": "Large memory nodes are increasingly needed by a wide range of XSEDE researchers, particularly researchers working with big data such as massive NLP data sets used in many research domains or the massive genomes required by computational biology and bioinformatics.",
-    "conversionFactor": "8.01",
-    "userGuideUrl": "https://xsedetoaccess.ccs.uky.edu/confluence/redirect/KyRIC+Kentucky.html",
-    "attributeSets": [],
-    "featureCategories": [
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 136,
-            "name": "CPU Compute",
-            "description": "General compute use",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 139,
-            "name": "ACCESS Allocated",
-            "description": "Resource is allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 102,
-        "categoryName": "Specialized Hardware",
-        "categoryDescription": "Key compute hardware components in this resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 142,
-            "name": "Large Memory Nodes",
-            "description": "Specialized analysis nodes with large memory",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 103,
-        "categoryName": "Specialized Support",
-        "categoryDescription": "Special services offered by the resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 167,
-            "name": "ACCESS OnDemand",
-            "description": "An intuitive, innovative, and interactive interface to remote computing resources",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 532123,
-    "resourceName": "PSC Neocortex Superdome Flex Server",
-    "displayResourceName": "PSC Neocortex Superdome Flex Server",
-    "resourceType": "Compute",
-    "description": "",
-    "units": "Core-hours",
-    "organization": "Pittsburgh Supercomputing Center",
-    "resourceRepositoryKey": 147026,
-    "productionBeginDate": "2024-04-15",
-    "productionEndDate": null,
-    "resourceDescription": "Neocortex is a highly innovative resource that targets the acceleration of AI-powered scientific discovery by vastly shortening the time required for deep learning training, fostering greater integration of artificial deep learning with scientific workflows, and providing revolutionary new hardware for the development of more efficient algorithms for artificial intelligence and high performance computing. \r\n\r\nThe HPE Superdome Flex (SDFlex) features 32 Intel Xeon Platinum 8280L CPUs with 28 cores (56 threads) each, 2.70-4.0 GHz, 38.5 MB cache, 24 TiB RAM, aggregate memory bandwidth of 4.5 TB/s, and 204.6 TB aggregate local storage capacity with 150 GB/s read bandwidth. The SDF can provide 1.2 Tb/s to each CS-2 system and 1.6 Tb/s from the Bridges-2 filesystems.",
-    "recommendedUse": null,
-    "conversionFactor": "80.145",
-    "userGuideUrl": "portal.neocortex.psc.edu",
-    "attributeSets": [],
-    "featureCategories": [
-      {
-        "categoryId": 101,
-        "categoryName": "Allocations",
-        "categoryDescription": "Whether resource is allocated by ACCESS or not",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 139,
-            "name": "ACCESS Allocated",
-            "description": "Resource is allocated by ACCESS",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 133,
-        "categoryName": "Resource Category",
-        "categoryDescription": "NAIRR Pilot Resource Category",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 232,
-            "name": "Federal agency systems",
-            "description": "Agency supercomputers and advanced architecture systems",
-            "isFilter": null
-          }
-        ]
-      },
-      {
-        "categoryId": 100,
-        "categoryName": "Resource Type",
-        "categoryDescription": "The general kind of resource",
-        "categoryIsFilter": true,
-        "features": [
-          {
-            "featureId": 135,
-            "name": "Innovative / Novel Compute",
-            "description": "Unique, innovative or non-traditional compute resource",
-            "isFilter": null
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "resourceId": 530204,
-    "resourceName": "TACC Dell/Intel Knights Landing, Skylake System (Stampede2)",
-    "displayResourceName": "TACC Dell/Intel Knights Landing, Skylake System (Stampede2)",
-    "resourceType": "Compute",
-    "description": "Stampede 2 is allocated in service units (SU)s. An SU is defined as 1 wall-clock node hour. Allocations awarded on Stampede2 may be used on either or both node types.",
-    "units": "Node Hours",
-    "organization": "Texas Advanced Computing Center",
-    "resourceRepositoryKey": 144584,
-    "productionBeginDate": "2017-06-13",
-    "productionEndDate": "2023-09-30",
-    "resourceDescription": "PLEASE NOTE THAT STAMPEDE2 WILL NO LONGER BE AVAILABLE AS OF JULY 1, 2023.  If you require larger scale resources you should consider the leadership computing capabilities of Frontera https://frontera-portal.tacc.utexas.edu/allocations/  Otherwise we are currently recommending PI's who are new to ACCESS to consider other resources.\r\n\r\nThe Stampede2 Dell/Intel Knights Landing (KNL), Skylake (SKX) System provides the user community access to two Intel Xeon compute technologies.\r\n\r\nThe system is configured with 4204 Dell KNL compute nodes, each with a stand-alone Intel Xeon Phi Knights Landing bootable processor.  Each KNL node includes 68 cores, 16GB MCDRAM, 96GB DDR-4 memory and a 200GB SSD drive.  \r\n\r\nStampede2 also includes 1736 Intel Xeon Skylake (SKX) nodes and additional management nodes. Each SKX includes 48 cores, 192GB DDR-4 memory, and a 200GB SSD.\r\n\r\nAllocations awarded on Stampede2 may be used on either or both of the node types.\r\n\r\nCompute nodes have access to dedicated Lustre Parallel file systems totaling 28PB raw, provided by Cray. An Intel Omni-Path Architecture switch fabric connects the nodes and storage through a fat-tree topology with a point to point bandwidth of 100 Gb/s (unidirectional speed). 16 additional login and management servers complete the system. Stampede2 will deliver an estimated 18PF of peak performance.\r\n\r\nPlease see the Stampede2 User Guide for detailed information on the system and how to most effectively use it.\r\n\r\nhttps://portal.tacc.utexas.edu/user-guides/stampede2",
-    "recommendedUse": "Stampede2 is intended primarily for parallel applications scalable to tens of thousands of cores, as well as general purpose and throughput computing. Normal batch queues will enable users to run simulations up to 48 hours. Jobs requiring run times and more cores than allowed by the normal queues will be run in a special queue after approval of TACC staff. normal, serial and development queues are configured as well as special purpose queues.",
-    "conversionFactor": "143.719",
-    "userGuideUrl": "https://docs.tacc.utexas.edu/hpc/stampede2/",
-    "attributeSets": [],
-    "featureCategories": []
-  }
-]

From c3d525705b4370c8746ee56f6209f40298b0266a Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 26 Jun 2024 09:26:54 -0400
Subject: [PATCH 011/113] build(vite): disable library mode for prototype
 builds

---
 vite.config.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/vite.config.js b/vite.config.js
index 6752257..d34f667 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,15 +1,15 @@
-import { resolve } from "path";
+// import { resolve } from "path";
 import { defineConfig } from "vite";
 import preact from "@preact/preset-vite";
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  build: {
-    lib: {
-      entry: resolve(__dirname, "src/index.jsx"),
-      name: "AccessCiUi",
-      fileName: "access-ci-ui",
-    },
-  },
+  // build: {
+  //   lib: {
+  //     entry: resolve(__dirname, "src/index.jsx"),
+  //     name: "AccessCiUi",
+  //     fileName: "access-ci-ui",
+  //   },
+  // },
   plugins: [preact()],
 });

From 4309bb8491979bf3c96ad2caaa1b0fe3f0f164c1 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 26 Jun 2024 09:31:32 -0400
Subject: [PATCH 012/113] feat(index): add warning banner with link to
 production catalog

---
 index.html | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 2482078..f753794 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="color-scheme" content="light" />
-    <title>ACCESS CI User Interface Components</title>
+    <title>ACCESS Resource Catalog Development Prototype</title>
     <link
       rel="stylesheet"
       id="google-font-archivo-css"
@@ -30,6 +30,11 @@
           margin-left: 20px;
           width: calc((var(--width) - 140px) / 4 + 20px);
         }
+        #banner {
+          background-color: #fff3cd;
+          color: #856404;
+          padding: 12px calc((100% - var(--width)) / 2);
+        }
       }
     </style>
   </head>
@@ -37,6 +42,13 @@
     <div id="universal-menus"></div>
     <div id="header"></div>
     <div id="site-menus"></div>
+    <div id="banner">
+      This is a development prototype. For information about ACCESS resources,
+      visit the
+      <a href="https://allocations.access-ci.org/resources"
+        >resource catalog.</a
+      >
+    </div>
     <div id="main" class="container">
       <div id="body">
         <div id="resource-catalog"></div>

From 628b5fc63da3e76ed7dd7df03dcc2d6872b15062 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 26 Jun 2024 09:31:58 -0400
Subject: [PATCH 013/113] ci(build-deploy-pages): add workflow to build and
 deploy to GitHub Pages

---
 .github/workflows/build-deploy-pages.yml | 46 ++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 .github/workflows/build-deploy-pages.yml

diff --git a/.github/workflows/build-deploy-pages.yml b/.github/workflows/build-deploy-pages.yml
new file mode 100644
index 0000000..c8031a2
--- /dev/null
+++ b/.github/workflows/build-deploy-pages.yml
@@ -0,0 +1,46 @@
+name: Build and Deploy to Pages
+
+on:
+  push:
+    branches:
+      - "resource-catalog"
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - name: Install dependencies
+        run: npm ci
+      - name: Build project
+        run: npm run build
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: "dist"
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

From e12d79e9c17a29941e8c702dcbdee5409c00e630 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 26 Jun 2024 09:53:46 -0400
Subject: [PATCH 014/113] feat(resource-catalog): add support for custom base
 URI

---
 index.html                         | 4 ++--
 public/api/resourceSlides.json     | 4 ++--
 src/resource-catalog.jsx           | 9 +++++++--
 src/resource-category.jsx          | 9 ++++++++-
 src/resource-group-description.jsx | 2 +-
 src/resource-group.jsx             | 3 ++-
 src/resource-home.jsx              | 6 ++++--
 vite.config.js                     | 1 +
 8 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/index.html b/index.html
index f753794..d13063a 100644
--- a/index.html
+++ b/index.html
@@ -71,11 +71,11 @@
       const siteItems = [
         {
           name: "Resources",
-          href: "/",
+          href: "/access-ci-ui",
         },
         {
           name: "Resource Providers",
-          href: "/resource-providers",
+          href: "/access-ci-ui/resource-providers",
         },
       ];
 
diff --git a/public/api/resourceSlides.json b/public/api/resourceSlides.json
index 50a723c..e7013cb 100644
--- a/public/api/resourceSlides.json
+++ b/public/api/resourceSlides.json
@@ -5,7 +5,7 @@
       "description": "Stampede3, the latest compute and storage resource from TACC, is now accepting allocation requests. This powerful Dell Technologies and Intel based supercomputer is the only system in the ACCESS environment to integrate the new Intel Max Series GPUs.",
       "linkText": "Learn more about Stampede3",
       "linkURI": "https://tacc.utexas.edu/systems/stampede3/",
-      "imageURI": "/images/stampede3.jpg",
+      "imageURI": "/access-ci-ui/images/stampede3.jpg",
       "imageAltText": "Cattle cross a dirt road behind the logo for Stampede3"
     },
     {
@@ -13,7 +13,7 @@
       "description": "Pittsburgh Supercomputing Center is offering tours of its machine room to interested uses of its Bridges-2 machine.",
       "linkText": "Sign up for a tour",
       "linkURI": "https://www.psc.edu/psc-machine-room-tours/",
-      "imageURI": "/images/psc-machine-room.jpg",
+      "imageURI": "/access-ci-ui/images/psc-machine-room.jpg",
       "imageAltText": "A PSC staff member explains the Bridges-2 supercomputer to a group of three visitors"
     }
   ]
diff --git a/src/resource-catalog.jsx b/src/resource-catalog.jsx
index e396be8..f72bee4 100644
--- a/src/resource-catalog.jsx
+++ b/src/resource-catalog.jsx
@@ -15,6 +15,7 @@ const ResourceHome = lazy(() => import("./resource-home.jsx"));
 export function ResourceCatalog({
   title = "Resource Catalog",
   showTitle = false,
+  baseUri = "/access-ci-ui",
   groupsURI = "/api/resourceGroups.json",
   slidesURI = "/api/resourceSlides.json",
 }) {
@@ -24,13 +25,17 @@ export function ResourceCatalog({
         <ErrorBoundary>
           <Router>
             <ResourceHome
-              path="/"
+              path={baseUri}
+              baseUri={baseUri}
               title={title}
               showTitle={showTitle}
               slidesURI={slidesURI}
               groupsURI={groupsURI}
             />
-            <ResourceGroupDetail path="/resources/:resourceId" />
+            <ResourceGroupDetail
+              baseUri={baseUri}
+              path={`${baseUri}/resources/:resourceId`}
+            />
           </Router>
         </ErrorBoundary>
       </LocationProvider>
diff --git a/src/resource-category.jsx b/src/resource-category.jsx
index 844c003..582c1d5 100644
--- a/src/resource-category.jsx
+++ b/src/resource-category.jsx
@@ -1,6 +1,12 @@
 import { ResourceGroup } from "./resource-group";
 
-export function ResourceCategory({ active, name, resourceGroups, toggleTag }) {
+export function ResourceCategory({
+  active,
+  baseUri,
+  name,
+  resourceGroups,
+  toggleTag,
+}) {
   return (
     <>
       <h2>{name}</h2>
@@ -11,6 +17,7 @@ export function ResourceCategory({ active, name, resourceGroups, toggleTag }) {
         .map((resourceGroup) => (
           <ResourceGroup
             {...resourceGroup}
+            baseUri={baseUri}
             active={active}
             toggleTag={toggleTag}
           />
diff --git a/src/resource-group-description.jsx b/src/resource-group-description.jsx
index d6d1bc6..14aa142 100644
--- a/src/resource-group-description.jsx
+++ b/src/resource-group-description.jsx
@@ -4,7 +4,7 @@ import Icon from "./icon";
 
 export default function ResourceGroupDescription({ resourceId }) {
   const data = useJSON(
-    `/api/resourceGroup.json?resourceId=${resourceId}`,
+    `/access-ci-ui/api/resourceGroup.json?resourceId=${resourceId}`,
     null
   );
   if (!data) return;
diff --git a/src/resource-group.jsx b/src/resource-group.jsx
index 1d5b173..cc3da0c 100644
--- a/src/resource-group.jsx
+++ b/src/resource-group.jsx
@@ -3,6 +3,7 @@ import { Tags } from "./tags";
 
 export function ResourceGroup({
   active,
+  baseUri,
   imageType,
   imageUri,
   name,
@@ -11,7 +12,7 @@ export function ResourceGroup({
   tags,
   toggleTag,
 }) {
-  const detailUri = `/resources/${resourceGroupId}`;
+  const detailUri = `${baseUri}/resources/${resourceGroupId}`;
   return (
     <div class="resource-group">
       <a
diff --git a/src/resource-home.jsx b/src/resource-home.jsx
index fc7f62a..adb2c8e 100644
--- a/src/resource-home.jsx
+++ b/src/resource-home.jsx
@@ -97,14 +97,15 @@ const getActive = ({ resourceGroups, tags, tagCategories }, activeTagIds) => {
 };
 
 export default function ResourceHome({
+  baseUri,
   title,
   showTitle,
   slidesURI,
   groupsURI,
 }) {
   const [activeTagIds, setActiveTagIds] = useState([]);
-  const slides = useJSON(slidesURI, [], "slides");
-  const allGroups = useJSON(groupsURI, null);
+  const slides = useJSON(`${baseUri}${slidesURI}`, [], "slides");
+  const allGroups = useJSON(`${baseUri}${groupsURI}`, null);
   const groups = useMemo(
     () => (allGroups ? linkGroupData(allGroups) : null),
     [allGroups]
@@ -147,6 +148,7 @@ export default function ResourceHome({
               <ResourceCategory
                 {...resourceCategory}
                 active={active}
+                baseUri={baseUri}
                 clearTags={clearTags}
                 toggleTag={toggleTag}
               />
diff --git a/vite.config.js b/vite.config.js
index d34f667..6c3450f 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -11,5 +11,6 @@ export default defineConfig({
   //     fileName: "access-ci-ui",
   //   },
   // },
+  base: "/access-ci-ui",
   plugins: [preact()],
 });

From c1f45335891784eb5117683d8f3b4a4ac955dd3e Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 26 Jun 2024 10:01:04 -0400
Subject: [PATCH 015/113] ci(build-deploy-pages): copy index to 404 page

---
 .github/workflows/build-deploy-pages.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build-deploy-pages.yml b/.github/workflows/build-deploy-pages.yml
index c8031a2..fbc5c55 100644
--- a/.github/workflows/build-deploy-pages.yml
+++ b/.github/workflows/build-deploy-pages.yml
@@ -28,6 +28,8 @@ jobs:
         run: npm ci
       - name: Build project
         run: npm run build
+      - name: Copy index to 404 page
+        run: cp dist/index.html dist/404.html
       - name: Setup Pages
         uses: actions/configure-pages@v5
       - name: Upload artifact

From 664bce5bdd5bcb1cb2d34d2e1314ec59568a38fa Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Fri, 28 Jun 2024 09:46:04 -0400
Subject: [PATCH 016/113] refactor(api): update mock API structure

---
 .../api/{resourceGroup.json => resource-group/1.json} |  0
 public/api/resource-group/2.json                      | 11 +++++++++++
 .../api/{resourceGroups.json => resource-groups.json} |  0
 .../api/{resourceSlides.json => resource-slides.json} |  0
 src/resource-catalog.jsx                              |  4 ++--
 src/resource-group-description.jsx                    |  4 ++--
 src/resource-group-detail.jsx                         |  4 ++--
 7 files changed, 17 insertions(+), 6 deletions(-)
 rename public/api/{resourceGroup.json => resource-group/1.json} (100%)
 create mode 100644 public/api/resource-group/2.json
 rename public/api/{resourceGroups.json => resource-groups.json} (100%)
 rename public/api/{resourceSlides.json => resource-slides.json} (100%)

diff --git a/public/api/resourceGroup.json b/public/api/resource-group/1.json
similarity index 100%
rename from public/api/resourceGroup.json
rename to public/api/resource-group/1.json
diff --git a/public/api/resource-group/2.json b/public/api/resource-group/2.json
new file mode 100644
index 0000000..f6c9d44
--- /dev/null
+++ b/public/api/resource-group/2.json
@@ -0,0 +1,11 @@
+{
+  "name": "Jetstream2",
+  "resourceProvider": {
+    "resourceProviderId": 2,
+    "name": "Indiana University",
+    "iconUri": "https://www.iu.edu/favicon.ico"
+  },
+  "imageUri": "https://jetstream-cloud.org/images/home/jetstream-2.png",
+  "description": "Jetstream2 is a user-friendly cloud computing environment for researchers and educators running on OpenStack and featuring Exosphere as the primary user interface. It is built on the successes of Jetstream1 and continues the main features of that system while extending to a broader range of hardware and services, including GPUs, large memory nodes, virtual clustering, programmable cyberinfrastructure with OpenStack Heat and Terraform, and many other features. It is designed to provide both infrastructure for gateways and other “always on” services as well as giving researchers access to interactive computing and data analysis resources on demand.",
+  "userGuideUri": "https://docs.jetstream-cloud.org/"
+}
diff --git a/public/api/resourceGroups.json b/public/api/resource-groups.json
similarity index 100%
rename from public/api/resourceGroups.json
rename to public/api/resource-groups.json
diff --git a/public/api/resourceSlides.json b/public/api/resource-slides.json
similarity index 100%
rename from public/api/resourceSlides.json
rename to public/api/resource-slides.json
diff --git a/src/resource-catalog.jsx b/src/resource-catalog.jsx
index f72bee4..99646e9 100644
--- a/src/resource-catalog.jsx
+++ b/src/resource-catalog.jsx
@@ -16,8 +16,8 @@ export function ResourceCatalog({
   title = "Resource Catalog",
   showTitle = false,
   baseUri = "/access-ci-ui",
-  groupsURI = "/api/resourceGroups.json",
-  slidesURI = "/api/resourceSlides.json",
+  groupsURI = "/api/resource-groups.json",
+  slidesURI = "/api/resource-slides.json",
 }) {
   return (
     <>
diff --git a/src/resource-group-description.jsx b/src/resource-group-description.jsx
index 14aa142..2239279 100644
--- a/src/resource-group-description.jsx
+++ b/src/resource-group-description.jsx
@@ -2,9 +2,9 @@ import { useJSON } from "./utils";
 
 import Icon from "./icon";
 
-export default function ResourceGroupDescription({ resourceId }) {
+export default function ResourceGroupDescription({ baseUri, resourceId }) {
   const data = useJSON(
-    `/access-ci-ui/api/resourceGroup.json?resourceId=${resourceId}`,
+    `${baseUri}/api/resource-group/${resourceId}.json`,
     null
   );
   if (!data) return;
diff --git a/src/resource-group-detail.jsx b/src/resource-group-detail.jsx
index ccdea36..7972bb1 100644
--- a/src/resource-group-detail.jsx
+++ b/src/resource-group-detail.jsx
@@ -1,9 +1,9 @@
 import ResourceGroupDescription from "./resource-group-description";
 
-export default function ResourceGroupDetail({ resourceId }) {
+export default function ResourceGroupDetail({ baseUri, resourceId }) {
   return (
     <div class="resource-group-detail">
-      <ResourceGroupDescription resourceId={resourceId} />
+      <ResourceGroupDescription baseUri={baseUri} resourceId={resourceId} />
     </div>
   );
 }

From 8665dd58e316ce68c60dc77509d645f5cf104b52 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Fri, 28 Jun 2024 14:24:25 -0400
Subject: [PATCH 017/113] feat(resource-catalog): add node details

---
 .../1.json                                    |  0
 public/api/resource-groups/1/resources.json   | 97 +++++++++++++++++++
 .../2.json                                    |  0
 src/accordion.css                             | 27 ++++++
 src/accordion.jsx                             | 24 +++++
 src/base.css                                  |  1 +
 src/content.css                               | 13 +++
 src/icons.jsx                                 |  2 +
 src/resource-catalog.jsx                      |  4 +-
 src/resource-detail.jsx                       | 10 ++
 src/resource-group-description.jsx            |  4 +-
 src/resource-group-detail.jsx                 | 12 ++-
 src/resource-group-resources.jsx              | 51 ++++++++++
 src/resource-home.jsx                         | 10 +-
 src/resource-node-types.jsx                   | 35 +++++++
 src/utils.js                                  | 10 +-
 16 files changed, 288 insertions(+), 12 deletions(-)
 rename public/api/{resource-group => resource-groups}/1.json (100%)
 create mode 100644 public/api/resource-groups/1/resources.json
 rename public/api/{resource-group => resource-groups}/2.json (100%)
 create mode 100644 src/accordion.css
 create mode 100644 src/accordion.jsx
 create mode 100644 src/resource-detail.jsx
 create mode 100644 src/resource-group-resources.jsx
 create mode 100644 src/resource-node-types.jsx

diff --git a/public/api/resource-group/1.json b/public/api/resource-groups/1.json
similarity index 100%
rename from public/api/resource-group/1.json
rename to public/api/resource-groups/1.json
diff --git a/public/api/resource-groups/1/resources.json b/public/api/resource-groups/1/resources.json
new file mode 100644
index 0000000..15496d6
--- /dev/null
+++ b/public/api/resource-groups/1/resources.json
@@ -0,0 +1,97 @@
+{
+  "resources": [
+    {
+      "resourceId": 1,
+      "name": "Bridges-2 Regular Memory",
+      "summary": "Regular Memory (RM) nodes provide extremely powerful general-purpose computing, pre- and post-processing, AI inferencing, and machine learning and data analytics. Most RM nodes contain 256GB of RAM, but 16 of them have 512GB.",
+      "resourceTypeId": 1,
+      "nodeTypes": [
+        {
+          "count": 488,
+          "cpu": "2 AMD EPYC 7742 CPUs, 64 cores per CPU, 128 cores per node, 2.25-3.40 GHz",
+          "ram": "256GB",
+          "cache": "256MB L3, 8 memory channels",
+          "localStorage": "3.84TB NVMe SSD",
+          "network": "Mellanox ConnectX-6-HDR Infiniband 200Gb/s Adapter"
+        },
+        {
+          "count": 16,
+          "cpu": "2 AMD EPYC 7742 CPUs, 64 cores per CPU, 128 cores per node, 2.25-3.40 GHz",
+          "ram": "512GB",
+          "cache": "256MB L3, 8 memory channels",
+          "localStorage": "3.84TB NVMe SSD",
+          "network": "Mellanox ConnectX-6-HDR Infiniband 200Gb/s Adapter"
+        }
+      ],
+      "order": 1
+    },
+    {
+      "resourceId": 2,
+      "name": "Bridges-2 Extreme Memory",
+      "summary": "Extreme Memory (EM) nodes provide 4TB of shared memory for statistics, graph analytics, genome sequence assembly, and other applications requiring a large amount of memory for which distributed-memory implementations are not available.",
+      "resourceTypeId": 1,
+      "nodeTypes": [
+        {
+          "count": 4,
+          "cpu": "4 Intel Xeon Platinum 8260M Cascade lake CPUs, 24 cores per CPU, 96 cores per node, 2.40-3.90 GHz",
+          "ram": "4TB, DDR4-2933",
+          "cache": "37.75MB LLC, 6 memory channels",
+          "localStorage": "7.68TB NVMe SSD",
+          "network": "Mellanox ConnectX-6-HDR Infiniband 200Gb/s Adapter"
+        }
+      ],
+      "order": 2
+    },
+    {
+      "resourceId": 3,
+      "name": "Bridges-2 GPU",
+      "summary": "Bridges-2's GPU nodes provide exceptional performance and scalability for deep learning and accelerated computing, with a total of 40, 960 CUDA cores and 5,120 tensor cores. Bridges' GPU-AI resources have been migrated to Bridges-2, adding the DGX-2 and nine more V100 GPU nodes to Bridges-2's GPU resources.",
+      "resourceTypeId": 1,
+      "nodeTypes": [
+        {
+          "count": 24,
+          "gpu": "8 NVIDIA Tesla V100-32GB SXM2",
+          "gpuMemory": "32 GB per GPU, 256GB total/node",
+          "gpuPerformance": "1 Pf/s tensor",
+          "cpu": "2 Intel Xeon Gold 6248 Cascade Lake CPUs, 20 cores per CPU, 40 cores per node, 2.50-3.90 GHz",
+          "ram": "512GB, DDR4-2933",
+          "interconnect": "NVLink",
+          "nvCache": "27.5MB LLC, 6 memory channels",
+          "localStorage": "7.68TB NVMe SSD",
+          "network": "2 Mellanox ConnectX-6 HDR Infiniband 200 Gbs/s Adapters"
+        },
+        {
+          "count": 9,
+          "gpu": "8 NVIDIA V100-16GB",
+          "gpuMemory": "16GB per GPU, 128GB total/node",
+          "cpu": "2 Intel Xeon Gold 6148 CPUs, 20 cores per CPU, 40 cores per node, 2.4-3.7 GHz",
+          "ram": "192 GB, DDR4-2666",
+          "interconnect": "PCIe",
+          "localStorage": "4 NVMe SSDs, 2TB each (total 8TB)"
+        },
+        {
+          "count": 1,
+          "gpu": "16 NVIDIA Volta V100-32GB",
+          "gpuMemory": "32GB per GPU, 512GB total",
+          "cpu": "2 Intel Xeon Platinum 8168, 24 cores per CPU, 48 cores total, 2.7-3.7 GHz",
+          "ram": "1.5 TB, DDR4-2666",
+          "interconnect": "NVLink",
+          "nvCache": "33MB",
+          "localStorage": "8 NVMe SSDs, 8.84TB each (total ~30TB)"
+        }
+      ],
+      "order": 3
+    },
+    {
+      "resourceId": 4,
+      "name": "Bridges-2 Ocean",
+      "summary": "Data management on Bridges-2 is accomplished through a unified, high performance filesystem for active project data, archive, and resilience, named Ocean. Used for active project data, Ocean is a high performance, internally resilient Lustre parallel filesystem with 15PB of usable capacity, configured to deliver up to 129GB/s and 142GB/s of read and write bandwidth, respectively.",
+      "resourceTypeId": 2,
+      "order": 4
+    }
+  ],
+  "resourceTypes": [
+    { "resourceTypeId": 1, "name": "Compute Resources" },
+    { "resourceTypeId": 2, "name": "Storage Resources" }
+  ]
+}
diff --git a/public/api/resource-group/2.json b/public/api/resource-groups/2.json
similarity index 100%
rename from public/api/resource-group/2.json
rename to public/api/resource-groups/2.json
diff --git a/src/accordion.css b/src/accordion.css
new file mode 100644
index 0000000..a32cd20
--- /dev/null
+++ b/src/accordion.css
@@ -0,0 +1,27 @@
+.accordion {
+  margin: 0 0 16px;
+}
+.accordion-heading {
+  margin: 0;
+}
+.accordion-heading button {
+  background-color: var(--teal-050);
+  border: 0 none transparent;
+  color: var(--teal-700);
+  cursor: pointer;
+  display: block;
+  font-size: 16px;
+  font-weight: 800;
+  padding: 16px 40px 16px 20px;
+  position: relative;
+  text-align: left;
+  width: 100%;
+}
+.accordion-heading button .icon {
+  position: absolute;
+  right: 20px;
+  top: 16px;
+}
+.accordion-content {
+  padding: 16px 20px 0;
+}
diff --git a/src/accordion.jsx b/src/accordion.jsx
new file mode 100644
index 0000000..751b881
--- /dev/null
+++ b/src/accordion.jsx
@@ -0,0 +1,24 @@
+import { useState } from "preact/hooks";
+
+import Icon from "./icon";
+
+export default function Accordion({ children, headingLevel = 2, title }) {
+  const [open, setOpen] = useState(false);
+  const Heading = `h${headingLevel}`;
+  return (
+    <div class="accordion">
+      <Heading class="accordion-heading">
+        <button aria-expanded={open} onClick={() => setOpen(!open)}>
+          {title}
+          <Icon name={open ? "caret-up-fill" : "caret-down-fill"} />
+        </button>
+      </Heading>
+      <div
+        class="accordion-content"
+        style={{ display: open ? "block" : "none" }}
+      >
+        {children}
+      </div>
+    </div>
+  );
+}
diff --git a/src/base.css b/src/base.css
index e4a4645..20039fa 100644
--- a/src/base.css
+++ b/src/base.css
@@ -9,6 +9,7 @@
   --red-400: #a70000;
   --orange-200: #f6d8ca;
   --orange-400: #f07537;
+  --teal-050: #ecf9f8;
   --teal-100: #cee8e9;
   --teal-200: #b0dadb;
   --teal-400: #48c0b9;
diff --git a/src/content.css b/src/content.css
index 3042c04..6b956cb 100644
--- a/src/content.css
+++ b/src/content.css
@@ -82,3 +82,16 @@ p {
 .btn + .btn {
   margin-left: 10px;
 }
+.table {
+  border-top: 1px solid var(--contrast);
+  border-collapse: collapse;
+  width: 100%;
+}
+.table td,
+.table th {
+  border-bottom: 1px solid var(--contrast);
+  padding: 16px;
+}
+.table tbody th {
+  text-align: right;
+}
diff --git a/src/icons.jsx b/src/icons.jsx
index 466c505..f69f310 100644
--- a/src/icons.jsx
+++ b/src/icons.jsx
@@ -1,7 +1,9 @@
 export const defaultIcons = {
+  "Compute Resources": "cpu-fill",
   CPU: "cpu-fill",
   GPU: "cpu",
   Storage: "hdd-fill",
+  "Storage Resources": "hdd-fill",
   "Large Memory": "arrows-fullscreen",
   "Virtual Machines": "pc-display-horizontal",
 };
diff --git a/src/resource-catalog.jsx b/src/resource-catalog.jsx
index 99646e9..967fe43 100644
--- a/src/resource-catalog.jsx
+++ b/src/resource-catalog.jsx
@@ -1,4 +1,5 @@
 import { ErrorBoundary, lazy, LocationProvider, Router } from "preact-iso";
+import accordionStyle from "./accordion.css?inline";
 import baseStyle from "./base.css?inline";
 import contentStyle from "./content.css?inline";
 import iconStyle from "./icon.css?inline";
@@ -34,13 +35,14 @@ export function ResourceCatalog({
             />
             <ResourceGroupDetail
               baseUri={baseUri}
-              path={`${baseUri}/resources/:resourceId`}
+              path={`${baseUri}/resources/:resourceGroupId`}
             />
           </Router>
         </ErrorBoundary>
       </LocationProvider>
       <style>{baseStyle}</style>
       <style>{contentStyle}</style>
+      <style>{accordionStyle}</style>
       <style>{iconStyle}</style>
       <style>{glideCoreStyle}</style>
       <style>{glideThemeStyle}</style>
diff --git a/src/resource-detail.jsx b/src/resource-detail.jsx
new file mode 100644
index 0000000..a5b22e5
--- /dev/null
+++ b/src/resource-detail.jsx
@@ -0,0 +1,10 @@
+import ResourceNodeTypes from "./resource-node-types";
+
+export default function ResourceDetail({ summary, nodeTypes }) {
+  return (
+    <>
+      {summary ? <p>{summary}</p> : null}
+      {nodeTypes ? <ResourceNodeTypes nodeTypes={nodeTypes} /> : null}
+    </>
+  );
+}
diff --git a/src/resource-group-description.jsx b/src/resource-group-description.jsx
index 2239279..eae321f 100644
--- a/src/resource-group-description.jsx
+++ b/src/resource-group-description.jsx
@@ -2,9 +2,9 @@ import { useJSON } from "./utils";
 
 import Icon from "./icon";
 
-export default function ResourceGroupDescription({ baseUri, resourceId }) {
+export default function ResourceGroupDescription({ baseUri, resourceGroupId }) {
   const data = useJSON(
-    `${baseUri}/api/resource-group/${resourceId}.json`,
+    `${baseUri}/api/resource-groups/${resourceGroupId}.json`,
     null
   );
   if (!data) return;
diff --git a/src/resource-group-detail.jsx b/src/resource-group-detail.jsx
index 7972bb1..e764537 100644
--- a/src/resource-group-detail.jsx
+++ b/src/resource-group-detail.jsx
@@ -1,9 +1,17 @@
 import ResourceGroupDescription from "./resource-group-description";
+import ResourceGroupResources from "./resource-group-resources";
 
-export default function ResourceGroupDetail({ baseUri, resourceId }) {
+export default function ResourceGroupDetail({ baseUri, resourceGroupId }) {
   return (
     <div class="resource-group-detail">
-      <ResourceGroupDescription baseUri={baseUri} resourceId={resourceId} />
+      <ResourceGroupDescription
+        baseUri={baseUri}
+        resourceGroupId={resourceGroupId}
+      />
+      <ResourceGroupResources
+        baseUri={baseUri}
+        resourceGroupId={resourceGroupId}
+      />
     </div>
   );
 }
diff --git a/src/resource-group-resources.jsx b/src/resource-group-resources.jsx
new file mode 100644
index 0000000..33c2057
--- /dev/null
+++ b/src/resource-group-resources.jsx
@@ -0,0 +1,51 @@
+import { useMemo } from "preact/hooks";
+import { defaultIcons } from "./icons";
+import { useJSON } from "./utils";
+
+import Accordion from "./accordion";
+import Icon from "./icon";
+import ResourceDetail from "./resource-detail";
+
+const linkResourceData = ({ resources, resourceTypes }) => {
+  const resourceTypesMap = {};
+  for (let resourceType of resourceTypes) {
+    resourceType.resources = [];
+    resourceTypesMap[resourceType.resourceTypeId] = resourceType;
+  }
+
+  for (let resource of resources) {
+    let resourceType = resourceTypesMap[resource.resourceTypeId];
+    resourceType.resources.push(resource);
+    resource.resourceType = resourceType;
+  }
+
+  return { resources, resourceTypes };
+};
+
+export default function ResourceGroupResources({ baseUri, resourceGroupId }) {
+  const allTypes = useJSON(
+    `${baseUri}/api/resource-groups/${resourceGroupId}/resources.json`,
+    null
+  );
+  const types = useMemo(
+    () => (allTypes && !allTypes.error ? linkResourceData(allTypes) : null),
+    [allTypes]
+  );
+  if (!types) return;
+  return types.resourceTypes.map(({ name, resources }) => {
+    if (resources.length)
+      return (
+        <>
+          <h2>
+            <Icon name={defaultIcons[name] || "stars"} />
+            {name}
+          </h2>
+          {resources.map((resource) => (
+            <Accordion title={resource.name}>
+              <ResourceDetail {...resource} />
+            </Accordion>
+          ))}
+        </>
+      );
+  });
+}
diff --git a/src/resource-home.jsx b/src/resource-home.jsx
index adb2c8e..2d094ab 100644
--- a/src/resource-home.jsx
+++ b/src/resource-home.jsx
@@ -104,10 +104,10 @@ export default function ResourceHome({
   groupsURI,
 }) {
   const [activeTagIds, setActiveTagIds] = useState([]);
-  const slides = useJSON(`${baseUri}${slidesURI}`, [], "slides");
+  const slides = useJSON(`${baseUri}${slidesURI}`, null);
   const allGroups = useJSON(`${baseUri}${groupsURI}`, null);
   const groups = useMemo(
-    () => (allGroups ? linkGroupData(allGroups) : null),
+    () => (allGroups && !allGroups.error ? linkGroupData(allGroups) : null),
     [allGroups]
   );
   const active = useMemo(
@@ -127,8 +127,10 @@ export default function ResourceHome({
   return (
     <>
       {title && <h1 class={showTitle ? "" : "visually-hidden"}>{title}</h1>}
-      {slides.length ? (
-        <Carousel>{slides.map((slide) => CarouselSlide(slide))}</Carousel>
+      {slides && slides.slides.length ? (
+        <Carousel>
+          {slides.slides.map((slide) => CarouselSlide(slide))}
+        </Carousel>
       ) : null}
 
       {active ? (
diff --git a/src/resource-node-types.jsx b/src/resource-node-types.jsx
new file mode 100644
index 0000000..a3b4728
--- /dev/null
+++ b/src/resource-node-types.jsx
@@ -0,0 +1,35 @@
+const allFields = [
+  { key: "count", name: "Nodes" },
+  { key: "gpu", name: "GPU" },
+  { key: "gpuMemory", name: "GPU Memory" },
+  { key: "gpuPerformance", name: "GPU Performance" },
+  { key: "cpu", name: "CPU" },
+  { key: "ram", name: "RAM" },
+  { key: "interconnect", name: "Interconnect" },
+  { key: "cache", name: "Cache" },
+  { key: "nvCache", name: "NVCache" },
+  { key: "localStorage", name: "Local Storage" },
+  { key: "network", name: "Network" },
+];
+
+export default function ResourceNodeTypes({ nodeTypes }) {
+  const fields = new Set();
+  for (let nodeType of nodeTypes) for (let field in nodeType) fields.add(field);
+
+  const rows = allFields
+    .filter(({ key }) => fields.has(key))
+    .map(({ key, name }) => (
+      <tr>
+        <th>{name}</th>
+        {nodeTypes.map((nodeType) => (
+          <td>{nodeType[key]}</td>
+        ))}
+      </tr>
+    ));
+
+  return (
+    <table class="table">
+      <tbody>{rows}</tbody>
+    </table>
+  );
+}
diff --git a/src/utils.js b/src/utils.js
index 7cae543..4553d3a 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -23,14 +23,18 @@ export const getScrollTop = () =>
     : (document.documentElement || document.body.parentNode || document.body)
         .scrollTop;
 
-export const useJSON = (uri, defaultValue, prop) => {
+export const useJSON = (uri, defaultValue) => {
   const [value, setValue] = useState(defaultValue);
   useEffect(() => {
     if (uri)
       (async () => {
         const res = await fetch(uri);
-        const data = await res.json();
-        setValue(prop ? data[prop] : data);
+        if (res.status < 200 || res.status > 299) {
+          setValue({ error: { status: res.status } });
+        } else {
+          const data = await res.json();
+          setValue(data);
+        }
       })();
   }, []);
   return value;

From 3c639cf26ae8ca5272883590afdfd20e045781c4 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Thu, 11 Jul 2024 16:20:12 -0400
Subject: [PATCH 018/113] feat(resource-catalog): add software list to resource
 group detail page

---
 package-lock.json                          |   9 +
 package.json                               |   1 +
 public/api/resource-groups/1/software.json | 678 +++++++++++++++++++++
 src/base.css                               |   1 +
 src/components.css                         |   9 +
 src/content.css                            |  10 +
 src/grid-text.jsx                          |  15 +
 src/grid.css                               |  56 ++
 src/grid.jsx                               |  93 +++
 src/highlight.jsx                          |  19 +
 src/resource-catalog.jsx                   |   4 +
 src/resource-group-detail.jsx              |   5 +
 src/resource-group-software.jsx            |  65 ++
 src/search.jsx                             |  23 +
 14 files changed, 988 insertions(+)
 create mode 100644 public/api/resource-groups/1/software.json
 create mode 100644 src/components.css
 create mode 100644 src/grid-text.jsx
 create mode 100644 src/grid.css
 create mode 100644 src/grid.jsx
 create mode 100644 src/highlight.jsx
 create mode 100644 src/resource-group-software.jsx
 create mode 100644 src/search.jsx

diff --git a/package-lock.json b/package-lock.json
index 2092f1e..22a3c7e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,6 +10,7 @@
       "license": "Apache-2.0",
       "dependencies": {
         "@glidejs/glide": "^3.6.1",
+        "fuse.js": "^7.0.0",
         "preact": "^10.13.1",
         "preact-iso": "^2.6.3"
       },
@@ -2498,6 +2499,14 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/fuse.js": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-7.0.0.tgz",
+      "integrity": "sha512-14F4hBIxqKvD4Zz/XjDc3y94mNZN6pRv3U13Udo0lNLCWRBUsrMv2xwcF/y/Z5sV6+FQW+/ow68cHpm4sunt8Q==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
diff --git a/package.json b/package.json
index f40718f..6d2166d 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
   },
   "dependencies": {
     "@glidejs/glide": "^3.6.1",
+    "fuse.js": "^7.0.0",
     "preact": "^10.13.1",
     "preact-iso": "^2.6.3"
   },
diff --git a/public/api/resource-groups/1/software.json b/public/api/resource-groups/1/software.json
new file mode 100644
index 0000000..eaa8751
--- /dev/null
+++ b/public/api/resource-groups/1/software.json
@@ -0,0 +1,678 @@
+{
+  "software": [
+    {
+      "softwareId": 0,
+      "name": "Abinit",
+      "summary": "Calculates electronic density and derived properties of materials (incl. molecules, surfaces & solids) within DFT using pseudopotentials and a planewave or wavelet basis"
+    },
+    {
+      "softwareId": 1,
+      "name": "ABySS",
+      "summary": "Parallel assembler for short read sequence data"
+    },
+    {
+      "softwareId": 2,
+      "name": "AI/ML/BD environments",
+      "summary": "Prebuilt environments of AI/ML/BD packages"
+    },
+    {
+      "softwareId": 3,
+      "name": "AMBER",
+      "summary": "Package of molecular simulation programs"
+    },
+    {
+      "softwareId": 4,
+      "name": "Anaconda",
+      "summary": "Open data science platform, includes popular Python, R and SCALA packages"
+    },
+    {
+      "softwareId": 5,
+      "name": "ANSYS",
+      "summary": "General purpose finite element modeling package"
+    },
+    {
+      "softwareId": 6,
+      "name": "AOCL",
+      "summary": "Numerical library suite optimized for AMD processors"
+    },
+    {
+      "softwareId": 7,
+      "name": "Arriba",
+      "summary": "Detects gene fusions from RNA-Seq data"
+    },
+    {
+      "softwareId": 8,
+      "name": "asciinema",
+      "summary": "Allows recording and sharing terminal sessions"
+    },
+    {
+      "softwareId": 9,
+      "name": "AUGUSTUS",
+      "summary": "Predicts genes in eukaryotic genomic sequences"
+    },
+    {
+      "softwareId": 10,
+      "name": "BAMTools",
+      "summary": "C++ API and toolkit for analyzing and managing BAM files"
+    },
+    {
+      "softwareId": 11,
+      "name": "BCFTools",
+      "summary": "Utilities for variant calling and manipulating VCFs and BCFs"
+    },
+    {
+      "softwareId": 12,
+      "name": "Bedops",
+      "summary": "Tools to address common questions raised in genomics studies"
+    },
+    {
+      "softwareId": 13,
+      "name": "Bedtools",
+      "summary": "Utilities for comparing, summarizing and intersecting genomic features in the UCSC Genome Browser BED format"
+    },
+    {
+      "softwareId": 14,
+      "name": "Bismark",
+      "summary": "Bisulfite read mapper and methylation caller"
+    },
+    {
+      "softwareId": 15,
+      "name": "BLAST",
+      "summary": "Search tool that finds regions of local similarity between nucleotide or protein sequences"
+    },
+    {
+      "softwareId": 16,
+      "name": "BLAT",
+      "summary": "Alignment tool like BLAST, but structured differently"
+    },
+    {
+      "softwareId": 17,
+      "name": "Boost",
+      "summary": "Peer reviewed C++ source libraries"
+    },
+    {
+      "softwareId": 18,
+      "name": "Bowtie2",
+      "summary": "Ultrafast, memory-efficient tool for aligning sequencing reads to long reference sequences. See related tool Bowtie."
+    },
+    {
+      "softwareId": 19,
+      "name": "BUSCO",
+      "summary": "Assesses genome assembly and annotation completeness"
+    },
+    {
+      "softwareId": 20,
+      "name": "BWA",
+      "summary": "Fast light-weight tool that aligns relatively short sequences to a sequence database"
+    },
+    {
+      "softwareId": 21,
+      "name": "C, C++",
+      "summary": "Programming languages"
+    },
+    { "softwareId": 22, "name": "Caffe", "summary": "Deep learning framework" },
+    {
+      "softwareId": 23,
+      "name": "CheckM",
+      "summary": "Tools to assess the quality of genomes recovered from isolates, single cells, or metagenomes"
+    },
+    {
+      "softwareId": 24,
+      "name": "Circos",
+      "summary": "Displays data in a circular layout"
+    },
+    {
+      "softwareId": 25,
+      "name": "CMake",
+      "summary": "Tools to control the compilation process, build, test and package software"
+    },
+    {
+      "softwareId": 26,
+      "name": "Conda",
+      "summary": "Environment manager for all languages"
+    },
+    {
+      "softwareId": 27,
+      "name": "CP2K",
+      "summary": "Atomistic simulations of solid state, liquid, molecular, periodic, material, crystal, and biological systems"
+    },
+    {
+      "softwareId": 28,
+      "name": "CUDA",
+      "summary": "Parallel computing platform and API model"
+    },
+    {
+      "softwareId": 29,
+      "name": "Cutadapt",
+      "summary": "Reads a FASTA or FASTQ file, finds and removes adapters, writes the changed sequence to standard output"
+    },
+    {
+      "softwareId": 30,
+      "name": "DDT",
+      "summary": "Debugger for C, C++ and Fortran 90 threaded and parallel codes"
+    },
+    {
+      "softwareId": 31,
+      "name": "deal.ii",
+      "summary": "C++ library for finite element codes"
+    },
+    {
+      "softwareId": 32,
+      "name": "Dorado",
+      "summary": "High-performance, easy-to-use, open source basecaller for Oxford Nanopore reads"
+    },
+    {
+      "softwareId": 33,
+      "name": "DReAMM",
+      "summary": "Designs, renders and animates the output from a MCell simulation"
+    },
+    {
+      "softwareId": 34,
+      "name": "FastANI",
+      "summary": "Fast alignment-free computation of whole-genome Average Nucleotide Identity (ANI)"
+    },
+    {
+      "softwareId": 35,
+      "name": "FASTA-Splitter",
+      "summary": "Divides a single FASTA file into multiple files"
+    },
+    {
+      "softwareId": 36,
+      "name": "FASTQ-Splitter",
+      "summary": "Divides a single FASTQ file into multiple files"
+    },
+    {
+      "softwareId": 37,
+      "name": "FastQC",
+      "summary": "Quality control tool for high throughput sequence data"
+    },
+    {
+      "softwareId": 38,
+      "name": "FASTX Toolkit",
+      "summary": "Command line tools for Short-Reads FASTA/FASTQ files preprocessing"
+    },
+    {
+      "softwareId": 39,
+      "name": "FFTW3",
+      "summary": "C subroutine library for computing the DFT in one or more dimensions, of arbitrary input size, of both real and complex data"
+    },
+    {
+      "softwareId": 40,
+      "name": "Filtlong",
+      "summary": "Tool to filter long reads by quality"
+    },
+    {
+      "softwareId": 41,
+      "name": "FLASh",
+      "summary": "Fast and accurate tool to merge paired-end reads from NGS experiments"
+    },
+    {
+      "softwareId": 42,
+      "name": "Fluent",
+      "summary": "Computational fluid dynamics, part of ANSYS"
+    },
+    {
+      "softwareId": 43,
+      "name": "Fortran",
+      "summary": "Programming language"
+    },
+    {
+      "softwareId": 44,
+      "name": "Funannotate",
+      "summary": "Genome prediction, annotation and comparison"
+    },
+    {
+      "softwareId": 45,
+      "name": "GAMESS",
+      "summary": "Ab initio molecular quantum chemistry"
+    },
+    {
+      "softwareId": 46,
+      "name": "GATK",
+      "summary": "Genome Analysis Toolkit, for high-throughput sequencing data"
+    },
+    {
+      "softwareId": 47,
+      "name": "Gaussian",
+      "summary": "Electronic structure program"
+    },
+    {
+      "softwareId": 48,
+      "name": "GCC",
+      "summary": "(GNU Compiler Collection) Compiler system supporting various programming languages"
+    },
+    {
+      "softwareId": 49,
+      "name": "GeneMark-ES",
+      "summary": "Gene prediction in eukaryotes"
+    },
+    {
+      "softwareId": 50,
+      "name": "GeNT",
+      "summary": "Computes the cross entropy for groups of sequences that have been assigned to groups on the basis of biochemical, physiological, or another biological property"
+    },
+    {
+      "softwareId": 51,
+      "name": "Git",
+      "summary": "Version control system for tracking changes in files and coordinating work on files among multiple people"
+    },
+    {
+      "softwareId": 52,
+      "name": "GNU Parallel",
+      "summary": "Shell tool for executing jobs in parallel using one or more computers"
+    },
+    {
+      "softwareId": 53,
+      "name": "GROMACS",
+      "summary": "Molecular dynamics software primarily designed for biomolecular systems"
+    },
+    {
+      "softwareId": 54,
+      "name": "Guppy",
+      "summary": "Data processing toolkit containing the Oxford Nanopore Technologies’ basecalling algorithms"
+    },
+    {
+      "softwareId": 55,
+      "name": "Gurobi",
+      "summary": "Mathematical programming solver"
+    },
+    {
+      "softwareId": 56,
+      "name": "hashdeep",
+      "summary": "Computes hash files, or message digests, for any number of files"
+    },
+    {
+      "softwareId": 57,
+      "name": "HDF5/PHDF5",
+      "summary": "Data model, library, and file format for storing and managing data and its parallel version"
+    },
+    {
+      "softwareId": 58,
+      "name": "HISAT2",
+      "summary": "Fast, sensitive alignment, mapping NGS reads (DNA & RNA) to a population of human genomes or against a single reference genome"
+    },
+    {
+      "softwareId": 59,
+      "name": "HMMER",
+      "summary": "Biosequence analysis using profile hidden Markov models"
+    },
+    {
+      "softwareId": 60,
+      "name": "Homer",
+      "summary": "Suite of tools for motif discovery and next-gen sequence analysis"
+    },
+    {
+      "softwareId": 61,
+      "name": "HPN-SSH",
+      "summary": "Series of patches for OpenSSH to provide improved performance and functionality"
+    },
+    {
+      "softwareId": 62,
+      "name": "HTSlib",
+      "summary": "C library for reading and writing high-throughput sequence data"
+    },
+    {
+      "softwareId": 63,
+      "name": "iCommands",
+      "summary": "Library of commands to access iRODS servers"
+    },
+    {
+      "softwareId": 64,
+      "name": "Infernal",
+      "summary": "Searches DNA sequence databases for RNA structure and sequence similarities"
+    },
+    {
+      "softwareId": 65,
+      "name": "ICC (Intel)",
+      "summary": "Intel compilers, libraries and MPI implementation"
+    },
+    { "softwareId": 66, "name": "Java", "summary": "Programming language" },
+    {
+      "softwareId": 67,
+      "name": "Julia",
+      "summary": "High-level, high performance dynamic programming language for numerical computing"
+    },
+    {
+      "softwareId": 68,
+      "name": "Jupyter",
+      "summary": "Create and share code, visualizations, equations, more"
+    },
+    {
+      "softwareId": 69,
+      "name": "Keras",
+      "summary": "Minimalist, highly modular neural networks library written in Python and capable of running on top of either TensorFlow or Theano"
+    },
+    {
+      "softwareId": 70,
+      "name": "Kracken2",
+      "summary": "Taxonomic sequence classifier that assigns taxonomic labels to DNA sequences"
+    },
+    {
+      "softwareId": 71,
+      "name": "LAMMPS",
+      "summary": "Classical molecular dynamics code"
+    },
+    {
+      "softwareId": 72,
+      "name": "lazygit",
+      "summary": "Simple terminal UI for git commands"
+    },
+    {
+      "softwareId": 73,
+      "name": "lowcharts",
+      "summary": "Tool to draw low-resolution charts in the terminal"
+    },
+    {
+      "softwareId": 74,
+      "name": "LSMS",
+      "summary": "Locally Self-consistent Multiple Scattering method, an order-N approach to the calculating the electronic structure of large systems within the local density approximation"
+    },
+    {
+      "softwareId": 75,
+      "name": "MATLAB",
+      "summary": "High-level language and interactive environment, performs computationally intensive tasks faster than traditional languages"
+    },
+    {
+      "softwareId": 76,
+      "name": "MCell",
+      "summary": "Monte Carlo Cell, simulates the movements and reactions of molecules within and between cells"
+    },
+    {
+      "softwareId": 77,
+      "name": "MEME Suite",
+      "summary": "Collection of tools for the discovery and analysis of sequence motifs"
+    },
+    {
+      "softwareId": 78,
+      "name": "Methylpy",
+      "summary": "Bisulfate sequencing data processing and differential methylation analysis"
+    },
+    {
+      "softwareId": 79,
+      "name": "Minialign",
+      "summary": "A little bit fast and moderately accurate nucleotide sequence alignment tool for PacBio & Nanopore long reads"
+    },
+    {
+      "softwareId": 80,
+      "name": "MKL",
+      "summary": "Math Kernel Library, highly optimized and threaded routines for linear algebra, FFTs, vector math and random number generators"
+    },
+    {
+      "softwareId": 81,
+      "name": "MPI",
+      "summary": "Message Passing Interface. Both Intel MPI and Open MPI are available."
+    },
+    {
+      "softwareId": 82,
+      "name": "MVAPICH",
+      "summary": "Library exploiting novel features and mechanisms of high performance networking technologies. Delivers improved performance and scalability to MPI applications."
+    },
+    {
+      "softwareId": 83,
+      "name": "NAMD",
+      "summary": "Parallel, object-oriented molecular dynamics code designed for high performance simulation of large biomolecular systems"
+    },
+    {
+      "softwareId": 84,
+      "name": "Nanoplot",
+      "summary": "Plotting tool for long read sequencing data and alignments"
+    },
+    { "softwareId": 85, "name": "Ncdu", "summary": "Disk usage analyzer" },
+    {
+      "softwareId": 86,
+      "name": "ncview",
+      "summary": "Viewer for netCDF format files"
+    },
+    {
+      "softwareId": 87,
+      "name": "Nextflow",
+      "summary": "DSL for parallel and scalable computational pipelines"
+    },
+    {
+      "softwareId": 88,
+      "name": "NVHPC",
+      "summary": "NVHPC (formerly called PGI) compilers and Tools"
+    },
+    {
+      "softwareId": 89,
+      "name": "NWCHEM",
+      "summary": "Computes the properties of molecular and periodic systems using standard quantum mechanical descriptions of the electronic wavefunction or density"
+    },
+    {
+      "softwareId": 90,
+      "name": "Octave",
+      "summary": "High-level programming language, intended for computation"
+    },
+    {
+      "softwareId": 91,
+      "name": "OnDemand",
+      "summary": "Web browser interface to manage files, submit and track jobs on Bridges-2"
+    },
+    {
+      "softwareId": 92,
+      "name": "OpenBLAS",
+      "summary": "Optimized BLAS library"
+    },
+    {
+      "softwareId": 93,
+      "name": "OpenCV",
+      "summary": "Open source library of several hundred computer vision algorithms"
+    },
+    {
+      "softwareId": 94,
+      "name": "OpenFOAM",
+      "summary": "Finite volume CFD package"
+    },
+    {
+      "softwareId": 95,
+      "name": "OpenMPI",
+      "summary": "high performance message passing library"
+    },
+    {
+      "softwareId": 96,
+      "name": "ORCA",
+      "summary": "Ab-initio quantum chemistry"
+    },
+    { "softwareId": 97, "name": "Perl", "summary": "Programming language" },
+    {
+      "softwareId": 98,
+      "name": "PGI",
+      "summary": "NVHPC (formerly called PGI) compilers and Tools"
+    },
+    {
+      "softwareId": 99,
+      "name": "PHYLIP",
+      "summary": "Package for inferring phylogenies"
+    },
+    {
+      "softwareId": 100,
+      "name": "Picard",
+      "summary": "Java-based command-line utilities that manipulate SAM files, and a Java API (SAM-JDK) for creating new programs that read and write SAM files"
+    },
+    {
+      "softwareId": 101,
+      "name": "PLUMED",
+      "summary": "Library of enhanced sampling methods, free energy methods, tools to analyze data for MD simulations"
+    },
+    {
+      "softwareId": 102,
+      "name": "Porechop",
+      "summary": "Tool which finds and removes adapters from Oxford Nanopore reads"
+    },
+    {
+      "softwareId": 103,
+      "name": "pnetCDF",
+      "summary": "high performance, parallel library for files compatible with netCDF"
+    },
+    {
+      "softwareId": 104,
+      "name": "Prodigal",
+      "summary": "Open source lightweight microbial genefinding program"
+    },
+    {
+      "softwareId": 105,
+      "name": "Prokka",
+      "summary": "Software tool for rapid annotation of prokaryotic genomes"
+    },
+    {
+      "softwareId": 106,
+      "name": "Python (including numpy, scipy)",
+      "summary": "Powerful, object-oriented programming language"
+    },
+    {
+      "softwareId": 107,
+      "name": "PyTorch",
+      "summary": "Machine Learning framework"
+    },
+    {
+      "softwareId": 108,
+      "name": "Quantum Espresso",
+      "summary": "Integrated suite of codes for electronic-structure calculations and materials modeling at the nanoscale"
+    },
+    {
+      "softwareId": 109,
+      "name": "R",
+      "summary": "Language and environment and an IDE for statistical computing and graphs"
+    },
+    {
+      "softwareId": 110,
+      "name": "RAPIDS",
+      "summary": "Framework bundling libraries to execute end-to-end data science pipelines on top of GPUs"
+    },
+    {
+      "softwareId": 111,
+      "name": "RAxML",
+      "summary": "Maximum likelihood phylogeny estimation for interpreting relationships between sets of data"
+    },
+    {
+      "softwareId": 112,
+      "name": "Rclone",
+      "summary": "Tool for managing files in cloud storage"
+    },
+    {
+      "softwareId": 113,
+      "name": "RNAview",
+      "summary": "Generates 2-dimensional displays of RNA/DNA secondary structures with tertiary interactions"
+    },
+    {
+      "softwareId": 114,
+      "name": "SAMtools",
+      "summary": "Utilities for manipulating alignments in SAM format"
+    },
+    {
+      "softwareId": 115,
+      "name": "Scikit-learn",
+      "summary": "Simple and efficient tools for data mining and data analysis, built on NumPy, SciPy and matplotlib"
+    },
+    {
+      "softwareId": 116,
+      "name": "Siesta",
+      "summary": "Performing efficient electronic structure calculations and ab initio molecular dynamics simulations of molecules and solids"
+    },
+    {
+      "softwareId": 117,
+      "name": "Singularity",
+      "summary": "Open-source software container platform"
+    },
+    {
+      "softwareId": 118,
+      "name": "SPAdes",
+      "summary": "St. Petersburg genome assembler – an assembly toolkit with various assembly pipelines"
+    },
+    {
+      "softwareId": 119,
+      "name": "Spark",
+      "summary": "Open source software web application framework and domain-specific language written in Java"
+    },
+    {
+      "softwareId": 120,
+      "name": "SRA toolkit",
+      "summary": "Collection of tools and libraries for using data in the INSDC Sequence Read Archives"
+    },
+    {
+      "softwareId": 121,
+      "name": "STAR-Fusion",
+      "summary": "Uses the STAR aligner to identify candidate fusion transcripts supported by Illumina reads, maps junction and spanning reads to a reference annotation set"
+    },
+    {
+      "softwareId": 122,
+      "name": "STAR Aligner",
+      "summary": "Spliced Transcripts Alignment to Reference, an alignment tool for RNA sequences"
+    },
+    {
+      "softwareId": 123,
+      "name": "TensorFlow",
+      "summary": "Machine learning library for numerical computation using data flow graphs"
+    },
+    {
+      "softwareId": 124,
+      "name": "Theano",
+      "summary": "Python library that allows you to define, optimize, and evaluate mathematical expressions involving multi-dimensional arrays efficiently"
+    },
+    {
+      "softwareId": 125,
+      "name": "TIGER",
+      "summary": "Precisely maps IGEs in bacterial and archaeal genomes"
+    },
+    {
+      "softwareId": 126,
+      "name": "tmux",
+      "summary": "Terminal multiplexer; create and control multiple terminals"
+    },
+    {
+      "softwareId": 127,
+      "name": "Trinity",
+      "summary": "Package which enables the efficient and robust de novo reconstruction of transcriptomes from RNA-Seq data"
+    },
+    {
+      "softwareId": 128,
+      "name": "tRNAscan-se",
+      "summary": "Program for improved detection of transfer RNA genes in genomic sequence"
+    },
+    {
+      "softwareId": 129,
+      "name": "VASP",
+      "summary": "Atomic scale materials modeling, e.g. electronic structure calculations and quantum-mechanical molecular dynamics, from first principles"
+    },
+    {
+      "softwareId": 130,
+      "name": "VCF2MAF",
+      "summary": "Tool to convert VCFs to MAFs"
+    },
+    {
+      "softwareId": 131,
+      "name": "VCFtools",
+      "summary": "Tool providing easily accessible methods for working with complex genetic variation data in the form of VCF files"
+    },
+    {
+      "softwareId": 132,
+      "name": "VisiData",
+      "summary": "Interactive tool to manage tabula data"
+    },
+    {
+      "softwareId": 133,
+      "name": "Visit",
+      "summary": "Interactive and scalable visualization, animation and analysis tool"
+    },
+    {
+      "softwareId": 134,
+      "name": "VTune",
+      "summary": "Performance analysis tool for serial, multithreaded or MPI applications"
+    },
+    {
+      "softwareId": 135,
+      "name": "WIEN2k",
+      "summary": "Electronic structure calculations of solids using DFT"
+    },
+    {
+      "softwareId": 136,
+      "name": "Xfig and transfig",
+      "summary": "Interactive drawing tools"
+    },
+    {
+      "softwareId": 137,
+      "name": "Zoltan",
+      "summary": "Data management services for unstructured, adaptive and dynamic applications"
+    }
+  ]
+}
diff --git a/src/base.css b/src/base.css
index 20039fa..b49d10d 100644
--- a/src/base.css
+++ b/src/base.css
@@ -15,6 +15,7 @@
   --teal-400: #48c0b9;
   --teal-600: #107180;
   --teal-700: #1a5b6e;
+  --yellow-200: #fce5ab;
   --yellow-400: #ffc42d;
   --color: white;
   --padding: 30px;
diff --git a/src/components.css b/src/components.css
new file mode 100644
index 0000000..f2b3bb9
--- /dev/null
+++ b/src/components.css
@@ -0,0 +1,9 @@
+.flex-header {
+  align-items: center;
+  display: flex;
+  justify-content: space-between;
+}
+.highlight {
+  background-color: var(--yellow-200);
+  padding: 2px 0;
+}
diff --git a/src/content.css b/src/content.css
index 6b956cb..4721572 100644
--- a/src/content.css
+++ b/src/content.css
@@ -92,6 +92,16 @@ p {
   border-bottom: 1px solid var(--contrast);
   padding: 16px;
 }
+.table thead th {
+  text-align: left;
+}
 .table tbody th {
   text-align: right;
 }
+input {
+  border: 1px solid var(--contrast-8);
+  border-radius: 0;
+  color: var(--contrast);
+  font-size: 1rem;
+  padding: 6px 12px;
+}
diff --git a/src/grid-text.jsx b/src/grid-text.jsx
new file mode 100644
index 0000000..6bfdef6
--- /dev/null
+++ b/src/grid-text.jsx
@@ -0,0 +1,15 @@
+export default function GridText({ column, row, style = {} }) {
+  const value = column.format
+    ? column.format(row[column.key], row)
+    : row[column.key];
+
+  const classes = ["cell"];
+  if (column.class) classes.push(column.class);
+  if (column.rowClass) classes.push(column.rowClass(row));
+
+  return (
+    <td class={classes.join(" ")} style={style}>
+      {value}
+    </td>
+  );
+}
diff --git a/src/grid.css b/src/grid.css
new file mode 100644
index 0000000..8f1eaef
--- /dev/null
+++ b/src/grid.css
@@ -0,0 +1,56 @@
+.grid {
+  border-top: 1px solid var(--contrast);
+  max-height: 400px;
+  max-width: 100%;
+  margin-bottom: 1rem;
+  overflow: scroll;
+  position: relative;
+}
+.grid table {
+  border-collapse: separate;
+  border-spacing: 0;
+  border-top: 0 none transparent;
+  margin-bottom: 0;
+  position: relative;
+}
+.grid th {
+  position: sticky;
+  top: 0;
+  z-index: 10;
+}
+.grid th,
+.grid td {
+  background-color: white;
+}
+.grid th:last-child,
+.grid td:last-child {
+  border-right: 0 none transparent;
+}
+.grid th.important,
+.grid td.important {
+  background-color: #f8f9fa;
+}
+.grid th.input,
+.grid td.input {
+  background-color: var(--teal-200);
+}
+.grid .edited td,
+.grid .edited select {
+  background-color: #faf1d7;
+}
+.grid .edited td.important,
+.grid .edited select.important {
+  background-color: #fbeeca;
+}
+.grid .disabled td,
+.grid .disabled select {
+  background-color: #dddddd;
+}
+.grid .disabled td.important,
+.grid .disabled select.important {
+  background-color: #cccccc;
+}
+.grid tbody tr:last-child th,
+.grid tbody tr:last-child td {
+  border-bottom: 0 none transparent;
+}
diff --git a/src/grid.jsx b/src/grid.jsx
new file mode 100644
index 0000000..1a8221f
--- /dev/null
+++ b/src/grid.jsx
@@ -0,0 +1,93 @@
+import { useLayoutEffect, useRef } from "preact/hooks";
+
+import GridText from "./grid-text";
+
+const columnTypeComponents = {
+  text: GridText,
+};
+
+export default function Grid({
+  columns,
+  rows,
+  classes,
+  frozenColumns = 0,
+  minWidth,
+  rowClasses = [],
+  scrollBehavior = "smooth",
+  scrollResetOnUpdate = false,
+  scrollRowIndex = 0,
+}) {
+  const container = useRef();
+  useLayoutEffect(() => {
+    if (!container.current) return;
+    const row = container.current.querySelector(
+      `tbody tr:nth-child(${scrollRowIndex + 1})`
+    );
+    if (row)
+      row.scrollIntoView({
+        behavior: scrollBehavior,
+        block: "nearest",
+        inline: "nearest",
+      });
+  }, [scrollRowIndex, scrollBehavior]);
+
+  useLayoutEffect(() => {
+    if (container.current && scrollResetOnUpdate)
+      container.current.scrollTop = 0;
+  }, [rows]);
+
+  const columnLeft = [0];
+  for (let i = 0; i < frozenColumns; i++)
+    columnLeft[i + 1] = columnLeft[i] + (columns[i].width || 100);
+
+  const getStyle = (i, zIndex) =>
+    i < frozenColumns
+      ? {
+          position: "sticky",
+          left: `${columnLeft[i]}px`,
+          minWidth: `${columns[i].width || 100}px`,
+          width: `${columns[i].width || 100}px`,
+          zIndex: zIndex || 1,
+        }
+      : {};
+
+  const th = columns.map((column, i) => (
+    <th
+      key={column.key}
+      class={column.headerClass || column.class || ""}
+      style={getStyle(i, 100)}
+    >
+      {column.formatHeader
+        ? column.formatHeader(column.name, column)
+        : column.name}
+    </th>
+  ));
+
+  const tr = rows.map((row, i) => {
+    const td = columns.map((column, c) => {
+      const Cell = columnTypeComponents[column.type || "text"];
+      return (
+        <Cell key={column.key} column={column} row={row} style={getStyle(c)} />
+      );
+    });
+    return (
+      <tr key={i} class={rowClasses[i] || ""}>
+        {td}
+      </tr>
+    );
+  });
+
+  const style = {};
+  if (minWidth) style.minWidth = minWidth;
+
+  return (
+    <div class={`grid ${classes || ""}`} ref={container}>
+      <table class="table" style={style}>
+        <thead>
+          <tr>{th}</tr>
+        </thead>
+        <tbody>{tr}</tbody>
+      </table>
+    </div>
+  );
+}
diff --git a/src/highlight.jsx b/src/highlight.jsx
new file mode 100644
index 0000000..e624d2f
--- /dev/null
+++ b/src/highlight.jsx
@@ -0,0 +1,19 @@
+export default function Highlight({ highlight, text }) {
+  if (!highlight || !highlight.length) return text;
+  const re = new RegExp(
+    highlight.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"),
+    "gi"
+  );
+  const matches = [...text.matchAll(re)];
+  if (!matches.length) return text;
+  const result = [];
+  let currentIdx = 0;
+  for (let match of matches) {
+    if (match.index > currentIdx)
+      result.push(text.substr(currentIdx, match.index));
+    result.push(<span class="highlight">{match[0]}</span>);
+    currentIdx = match.index + match[0].length;
+  }
+  result.push(text.substr(currentIdx));
+  return result;
+}
diff --git a/src/resource-catalog.jsx b/src/resource-catalog.jsx
index 967fe43..171cc29 100644
--- a/src/resource-catalog.jsx
+++ b/src/resource-catalog.jsx
@@ -1,10 +1,12 @@
 import { ErrorBoundary, lazy, LocationProvider, Router } from "preact-iso";
 import accordionStyle from "./accordion.css?inline";
 import baseStyle from "./base.css?inline";
+import componentsStyle from "./components.css?inline";
 import contentStyle from "./content.css?inline";
 import iconStyle from "./icon.css?inline";
 import glideCoreStyle from "@glidejs/glide/dist/css/glide.core.min.css?inline";
 import glideThemeStyle from "@glidejs/glide/dist/css/glide.theme.min.css?inline";
+import gridStyle from "./grid.css?inline";
 import carouselStyle from "./carousel.css?inline";
 import resourceFiltersStyle from "./resource-filters.css?inline";
 import resourceGroupStyle from "./resource-group.css?inline";
@@ -42,10 +44,12 @@ export function ResourceCatalog({
       </LocationProvider>
       <style>{baseStyle}</style>
       <style>{contentStyle}</style>
+      <style>{componentsStyle}</style>
       <style>{accordionStyle}</style>
       <style>{iconStyle}</style>
       <style>{glideCoreStyle}</style>
       <style>{glideThemeStyle}</style>
+      <style>{gridStyle}</style>
       <style>{carouselStyle}</style>
       <style>{resourceFiltersStyle}</style>
       <style>{resourceGroupStyle}</style>
diff --git a/src/resource-group-detail.jsx b/src/resource-group-detail.jsx
index e764537..c71e322 100644
--- a/src/resource-group-detail.jsx
+++ b/src/resource-group-detail.jsx
@@ -1,5 +1,6 @@
 import ResourceGroupDescription from "./resource-group-description";
 import ResourceGroupResources from "./resource-group-resources";
+import ResourceGroupSoftware from "./resource-group-software";
 
 export default function ResourceGroupDetail({ baseUri, resourceGroupId }) {
   return (
@@ -12,6 +13,10 @@ export default function ResourceGroupDetail({ baseUri, resourceGroupId }) {
         baseUri={baseUri}
         resourceGroupId={resourceGroupId}
       />
+      <ResourceGroupSoftware
+        baseUri={baseUri}
+        resourceGroupId={resourceGroupId}
+      />
     </div>
   );
 }
diff --git a/src/resource-group-software.jsx b/src/resource-group-software.jsx
new file mode 100644
index 0000000..f3c6716
--- /dev/null
+++ b/src/resource-group-software.jsx
@@ -0,0 +1,65 @@
+import { useMemo, useState } from "preact/hooks";
+import { useJSON } from "./utils";
+import Fuse from "fuse.js";
+
+import Grid from "./grid";
+import Highlight from "./highlight";
+import Icon from "./icon";
+import Search from "./search";
+
+export default function ResourceGroupSoftware({ baseUri, resourceGroupId }) {
+  const data = useJSON(
+    `${baseUri}/api/resource-groups/${resourceGroupId}/software.json`,
+    null
+  );
+  const [searchText, setSearchText] = useState("");
+  const fuse = useMemo(
+    () =>
+      data && !data.error
+        ? new Fuse(data.software, {
+            keys: [
+              { name: "name", weight: 0.7 },
+              { name: "summary", weight: 0.3 },
+            ],
+          })
+        : null,
+    [data]
+  );
+  if (!data || data.error) return;
+
+  const highlightFormat = (value) => (
+    <Highlight text={value} highlight={searchText} />
+  );
+  const columns = [
+    {
+      key: "name",
+      name: "Package",
+      format: highlightFormat,
+    },
+    {
+      key: "summary",
+      name: "Description",
+      format: highlightFormat,
+    },
+  ];
+
+  const rows = searchText.length
+    ? fuse.search(searchText).map((result) => result.item)
+    : data.software;
+
+  return (
+    <>
+      <div class="flex-header">
+        <h2>
+          <Icon name="terminal" />
+          Software
+        </h2>
+        <Search
+          placeholder="Search software packages..."
+          setText={setSearchText}
+        />
+      </div>
+      <Grid columns={columns} rows={rows} scrollResetOnUpdate={true} />
+    </>
+  );
+}
diff --git a/src/search.jsx b/src/search.jsx
new file mode 100644
index 0000000..f3d8f03
--- /dev/null
+++ b/src/search.jsx
@@ -0,0 +1,23 @@
+import { useLayoutEffect, useRef } from "preact/hooks";
+
+export default function Search({
+  delay = 300,
+  placeholder,
+  setText,
+  width = "30%",
+}) {
+  const input = useRef(null);
+  const timeout = useRef(null);
+  useLayoutEffect(() => {
+    if (input.current)
+      input.current.addEventListener("keyup", () => {
+        if (timeout.current) clearTimeout(timeout.current);
+        timeout.current = setTimeout(() => {
+          timeout.current = null;
+          setText(input.current.value);
+        }, delay);
+      });
+  }, [input.current]);
+
+  return <input placeholder={placeholder} style={{ width }} ref={input} />;
+}

From 2e8f0e6d8e2ec92a6e47827223b324547edaed17 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Fri, 12 Jul 2024 09:41:26 -0400
Subject: [PATCH 019/113] feat(search): add clear button

---
 src/content.css                 |  9 +++++++++
 src/resource-catalog.jsx        |  2 ++
 src/resource-group-software.jsx |  2 +-
 src/search.css                  | 11 +++++++++++
 src/search.jsx                  | 34 +++++++++++++++++++++++++++++----
 5 files changed, 53 insertions(+), 5 deletions(-)
 create mode 100644 src/search.css

diff --git a/src/content.css b/src/content.css
index 4721572..0066acd 100644
--- a/src/content.css
+++ b/src/content.css
@@ -71,6 +71,15 @@ p {
   color: var(--contrast);
   cursor: pointer;
 }
+.btn-clear,
+.btn-clear.active,
+.btn-clear:active,
+.btn-clear:focus,
+.btn-clear:hover {
+  background-color: transparent;
+  border-color: transparent;
+  color: var(--contrast);
+}
 .btn:disabled {
   background-color: var(--contrast-8);
   border-color: var(--contrast-8);
diff --git a/src/resource-catalog.jsx b/src/resource-catalog.jsx
index 171cc29..3a87244 100644
--- a/src/resource-catalog.jsx
+++ b/src/resource-catalog.jsx
@@ -10,6 +10,7 @@ import gridStyle from "./grid.css?inline";
 import carouselStyle from "./carousel.css?inline";
 import resourceFiltersStyle from "./resource-filters.css?inline";
 import resourceGroupStyle from "./resource-group.css?inline";
+import searchStyle from "./search.css?inline";
 import tagsStyle from "./tags.css?inline";
 
 const ResourceGroupDetail = lazy(() => import("./resource-group-detail.jsx"));
@@ -53,6 +54,7 @@ export function ResourceCatalog({
       <style>{carouselStyle}</style>
       <style>{resourceFiltersStyle}</style>
       <style>{resourceGroupStyle}</style>
+      <style>{searchStyle}</style>
       <style>{tagsStyle}</style>
     </>
   );
diff --git a/src/resource-group-software.jsx b/src/resource-group-software.jsx
index f3c6716..660f592 100644
--- a/src/resource-group-software.jsx
+++ b/src/resource-group-software.jsx
@@ -56,7 +56,7 @@ export default function ResourceGroupSoftware({ baseUri, resourceGroupId }) {
         </h2>
         <Search
           placeholder="Search software packages..."
-          setText={setSearchText}
+          setSearchText={setSearchText}
         />
       </div>
       <Grid columns={columns} rows={rows} scrollResetOnUpdate={true} />
diff --git a/src/search.css b/src/search.css
new file mode 100644
index 0000000..4df5738
--- /dev/null
+++ b/src/search.css
@@ -0,0 +1,11 @@
+.search {
+  position: relative;
+}
+.search input {
+  padding-right: 35px;
+}
+.search .btn-clear {
+  position: absolute;
+  right: -5px;
+  top: -6px;
+}
diff --git a/src/search.jsx b/src/search.jsx
index f3d8f03..9759ef4 100644
--- a/src/search.jsx
+++ b/src/search.jsx
@@ -1,23 +1,49 @@
-import { useLayoutEffect, useRef } from "preact/hooks";
+import { useLayoutEffect, useRef, useState } from "preact/hooks";
+
+import Icon from "./icon";
 
 export default function Search({
   delay = 300,
   placeholder,
-  setText,
-  width = "30%",
+  setSearchText,
+  width = "calc(var(--width) / 4)",
 }) {
   const input = useRef(null);
   const timeout = useRef(null);
+  const [text, setText] = useState("");
+  const clearSearch = () => {
+    setText("");
+    setSearchText("");
+    input.current.value = "";
+    input.current.focus();
+  };
+
   useLayoutEffect(() => {
     if (input.current)
       input.current.addEventListener("keyup", () => {
         if (timeout.current) clearTimeout(timeout.current);
         timeout.current = setTimeout(() => {
           timeout.current = null;
+          setSearchText(input.current.value);
           setText(input.current.value);
         }, delay);
       });
   }, [input.current]);
 
-  return <input placeholder={placeholder} style={{ width }} ref={input} />;
+  return (
+    <>
+      <div class="search">
+        <input placeholder={placeholder} style={{ width }} ref={input} />
+        {text.length ? (
+          <button
+            class="btn btn-clear"
+            title="Clear search"
+            onClick={clearSearch}
+          >
+            <Icon name="x-lg" />
+          </button>
+        ) : null}
+      </div>
+    </>
+  );
 }

From 6f4da60bc6ab16c2358ef108ef62a8654a41706e Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Fri, 12 Jul 2024 16:07:50 -0400
Subject: [PATCH 020/113] feat(resource-catalog): add queue metrics component

---
 package-lock.json                             | 20 ++++-
 package.json                                  |  3 +-
 .../api/resource-groups/1/queue-metrics.json  | 31 ++++++++
 src/footer.css                                |  1 +
 src/info-tip.css                              | 26 +++++++
 src/info-tip.jsx                              | 22 ++++++
 src/resource-catalog.jsx                      |  4 +
 src/resource-group-detail.jsx                 |  5 ++
 src/resource-group-queue-metrics.jsx          | 74 +++++++++++++++++++
 9 files changed, 184 insertions(+), 2 deletions(-)
 create mode 100644 public/api/resource-groups/1/queue-metrics.json
 create mode 100644 src/info-tip.css
 create mode 100644 src/info-tip.jsx
 create mode 100644 src/resource-group-queue-metrics.jsx

diff --git a/package-lock.json b/package-lock.json
index 22a3c7e..4692a4b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,8 @@
         "@glidejs/glide": "^3.6.1",
         "fuse.js": "^7.0.0",
         "preact": "^10.13.1",
-        "preact-iso": "^2.6.3"
+        "preact-iso": "^2.6.3",
+        "tippy.js": "^6.3.7"
       },
       "devDependencies": {
         "@preact/preset-vite": "^2.5.0",
@@ -1036,6 +1037,15 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@popperjs/core": {
+      "version": "2.11.8",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
+      "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/popperjs"
+      }
+    },
     "node_modules/@preact/preset-vite": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/@preact/preset-vite/-/preset-vite-2.5.0.tgz",
@@ -3899,6 +3909,14 @@
       "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
       "dev": true
     },
+    "node_modules/tippy.js": {
+      "version": "6.3.7",
+      "resolved": "https://registry.npmjs.org/tippy.js/-/tippy.js-6.3.7.tgz",
+      "integrity": "sha512-E1d3oP2emgJ9dRQZdf3Kkn0qJgI6ZLpyS5z6ZkY1DF3kaQaBsGZsndEpHwx+eC+tYM41HaSNvNtLx8tU57FzTQ==",
+      "dependencies": {
+        "@popperjs/core": "^2.9.0"
+      }
+    },
     "node_modules/to-fast-properties": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
diff --git a/package.json b/package.json
index 6d2166d..fc8e891 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,8 @@
     "@glidejs/glide": "^3.6.1",
     "fuse.js": "^7.0.0",
     "preact": "^10.13.1",
-    "preact-iso": "^2.6.3"
+    "preact-iso": "^2.6.3",
+    "tippy.js": "^6.3.7"
   },
   "devDependencies": {
     "@preact/preset-vite": "^2.5.0",
diff --git a/public/api/resource-groups/1/queue-metrics.json b/public/api/resource-groups/1/queue-metrics.json
new file mode 100644
index 0000000..61f5fac
--- /dev/null
+++ b/public/api/resource-groups/1/queue-metrics.json
@@ -0,0 +1,31 @@
+{
+  "queueMetrics": [
+    {
+      "resourceId": 1,
+      "name": "Bridges-2 Regular Memory",
+      "resourceRepositoryKey": 2900,
+      "waitTime": 5.909166,
+      "wallTime": 2.007403,
+      "expansionFactor": 5.3611,
+      "order": 1
+    },
+    {
+      "resourceId": 2,
+      "name": "Bridges-2 Extreme Memory",
+      "resourceRepositoryKey": 2903,
+      "waitTime": 5.233983,
+      "wallTime": 6.61043,
+      "expansionFactor": 1.7911,
+      "order": 2
+    },
+    {
+      "resourceId": 3,
+      "name": "Bridges-2 GPU",
+      "resourceRepositoryKey": 2902,
+      "waitTime": 19.670669,
+      "wallTime": 2.072165,
+      "expansionFactor": 10.4929,
+      "order": 3
+    }
+  ]
+}
diff --git a/src/footer.css b/src/footer.css
index a65ccf4..439d55c 100644
--- a/src/footer.css
+++ b/src/footer.css
@@ -109,6 +109,7 @@ a.linkedin {
   text-indent: -999999px;
   transition: opacity 0.25s ease-out;
   width: 40px;
+  z-index: 100;
 }
 .scroll-to-top.visible {
   opacity: 1;
diff --git a/src/info-tip.css b/src/info-tip.css
new file mode 100644
index 0000000..e835362
--- /dev/null
+++ b/src/info-tip.css
@@ -0,0 +1,26 @@
+.info-tip {
+  background-color: transparent;
+  border: 0 none transparent;
+}
+.tippy-box[data-theme~="access"] {
+  background-color: var(--teal-700);
+  border-radius: 0;
+  color: white;
+  font-weight: 400;
+  padding: 5px;
+}
+.tippy-box[data-theme~="access"][data-placement^="top"] > .tippy-arrow::before {
+  border-top-color: var(--teal-700);
+}
+.tippy-box[data-theme~="access"][data-placement^="bottom"]
+  > .tippy-arrow::before {
+  border-bottom-color: var(--teal-700);
+}
+.tippy-box[data-theme~="access"][data-placement^="left"]
+  > .tippy-arrow::before {
+  border-left-color: var(--teal-700);
+}
+.tippy-box[data-theme~="access"][data-placement^="right"]
+  > .tippy-arrow::before {
+  border-right-color: var(--teal-700);
+}
diff --git a/src/info-tip.jsx b/src/info-tip.jsx
new file mode 100644
index 0000000..4e0d9f1
--- /dev/null
+++ b/src/info-tip.jsx
@@ -0,0 +1,22 @@
+import { useLayoutEffect, useRef } from "preact/hooks";
+import tippy from "tippy.js";
+
+import Icon from "./icon";
+
+export default function InfoTip({
+  color = "var(--contrast-6)",
+  icon = "info-circle-fill",
+  tooltip,
+}) {
+  const trigger = useRef(null);
+  useLayoutEffect(() => {
+    if (trigger.current)
+      tippy(trigger.current, { content: tooltip, theme: "access" });
+  }, [trigger.current]);
+
+  return (
+    <button class="info-tip" style={{ color }} ref={trigger}>
+      <Icon name={icon} />
+    </button>
+  );
+}
diff --git a/src/resource-catalog.jsx b/src/resource-catalog.jsx
index 3a87244..3bf364e 100644
--- a/src/resource-catalog.jsx
+++ b/src/resource-catalog.jsx
@@ -4,6 +4,7 @@ import baseStyle from "./base.css?inline";
 import componentsStyle from "./components.css?inline";
 import contentStyle from "./content.css?inline";
 import iconStyle from "./icon.css?inline";
+import infoTipStyle from "./info-tip.css?inline";
 import glideCoreStyle from "@glidejs/glide/dist/css/glide.core.min.css?inline";
 import glideThemeStyle from "@glidejs/glide/dist/css/glide.theme.min.css?inline";
 import gridStyle from "./grid.css?inline";
@@ -12,6 +13,7 @@ import resourceFiltersStyle from "./resource-filters.css?inline";
 import resourceGroupStyle from "./resource-group.css?inline";
 import searchStyle from "./search.css?inline";
 import tagsStyle from "./tags.css?inline";
+import tippyStyle from "tippy.js/dist/tippy.css?inline";
 
 const ResourceGroupDetail = lazy(() => import("./resource-group-detail.jsx"));
 const ResourceHome = lazy(() => import("./resource-home.jsx"));
@@ -48,6 +50,7 @@ export function ResourceCatalog({
       <style>{componentsStyle}</style>
       <style>{accordionStyle}</style>
       <style>{iconStyle}</style>
+      <style>{infoTipStyle}</style>
       <style>{glideCoreStyle}</style>
       <style>{glideThemeStyle}</style>
       <style>{gridStyle}</style>
@@ -56,6 +59,7 @@ export function ResourceCatalog({
       <style>{resourceGroupStyle}</style>
       <style>{searchStyle}</style>
       <style>{tagsStyle}</style>
+      <style>{tippyStyle}</style>
     </>
   );
 }
diff --git a/src/resource-group-detail.jsx b/src/resource-group-detail.jsx
index c71e322..861054a 100644
--- a/src/resource-group-detail.jsx
+++ b/src/resource-group-detail.jsx
@@ -1,4 +1,5 @@
 import ResourceGroupDescription from "./resource-group-description";
+import ResourceGroupQueueMetrics from "./resource-group-queue-metrics";
 import ResourceGroupResources from "./resource-group-resources";
 import ResourceGroupSoftware from "./resource-group-software";
 
@@ -17,6 +18,10 @@ export default function ResourceGroupDetail({ baseUri, resourceGroupId }) {
         baseUri={baseUri}
         resourceGroupId={resourceGroupId}
       />
+      <ResourceGroupQueueMetrics
+        baseUri={baseUri}
+        resourceGroupId={resourceGroupId}
+      />
     </div>
   );
 }
diff --git a/src/resource-group-queue-metrics.jsx b/src/resource-group-queue-metrics.jsx
new file mode 100644
index 0000000..ecfa25b
--- /dev/null
+++ b/src/resource-group-queue-metrics.jsx
@@ -0,0 +1,74 @@
+import { useJSON } from "./utils";
+
+import Grid from "./grid";
+import Icon from "./icon";
+import InfoTip from "./info-tip";
+
+const formatTime = (value) => {
+  const hours = Math.floor(value);
+  const minutes = Math.floor((value - hours) * 60);
+  const seconds = Math.round((value - hours) * 3600 - minutes * 60);
+  return [hours, minutes, seconds]
+    .map((value) => value.toString().padStart(2, "0"))
+    .join(":");
+};
+
+const formatHeaderTip = (content) => (value) => {
+  return (
+    <>
+      <span>{value}</span> <InfoTip tooltip={content} />
+    </>
+  );
+};
+
+export default function ResourceGroupQueueMetrics({
+  baseUri,
+  resourceGroupId,
+}) {
+  const data = useJSON(
+    `${baseUri}/api/resource-groups/${resourceGroupId}/queue-metrics.json`,
+    null
+  );
+  if (!data || data.error) return;
+
+  const columns = [
+    {
+      key: "name",
+      name: "Resource",
+    },
+    {
+      key: "waitTime",
+      name: "Wait Time",
+      format: formatTime,
+      formatHeader: formatHeaderTip(
+        "Wait time is the average time a job spends waiting in the queue before running on a resource."
+      ),
+    },
+    {
+      key: "wallTime",
+      name: "Wall Time",
+      format: formatTime,
+      formatHeader: formatHeaderTip(
+        "Wall time is the average time a job spends running on a resource."
+      ),
+    },
+    {
+      key: "expansionFactor",
+      name: "Expansion Factor",
+      format: (value) => value.toFixed(2),
+      formatHeader: formatHeaderTip(
+        'Expansion factor is the ratio of the total time (wait time and wall time) to the wall time. It measures how much waiting in the queue "expands" the total time taken to complete a job relative to its length.'
+      ),
+    },
+  ];
+
+  return (
+    <>
+      <h2>
+        <Icon name="clock" />
+        Queue Metrics
+      </h2>
+      <Grid columns={columns} rows={data.queueMetrics} />
+    </>
+  );
+}

From b3a4b5f20e2e16012916dd10109d6822b7403494 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 17 Jul 2024 13:17:42 -0400
Subject: [PATCH 021/113] feat(resource-group-queue-metrics): support multiple
 time periods

---
 .../30.json}                                  | 18 +++++------
 .../resource-groups/1/queue-metrics/365.json  | 31 +++++++++++++++++++
 .../resource-groups/1/queue-metrics/90.json   | 31 +++++++++++++++++++
 src/content.css                               | 11 ++++++-
 src/resource-group-queue-metrics.jsx          | 25 +++++++++++----
 src/utils.js                                  |  9 +-----
 6 files changed, 101 insertions(+), 24 deletions(-)
 rename public/api/resource-groups/1/{queue-metrics.json => queue-metrics/30.json} (60%)
 create mode 100644 public/api/resource-groups/1/queue-metrics/365.json
 create mode 100644 public/api/resource-groups/1/queue-metrics/90.json

diff --git a/public/api/resource-groups/1/queue-metrics.json b/public/api/resource-groups/1/queue-metrics/30.json
similarity index 60%
rename from public/api/resource-groups/1/queue-metrics.json
rename to public/api/resource-groups/1/queue-metrics/30.json
index 61f5fac..f52753d 100644
--- a/public/api/resource-groups/1/queue-metrics.json
+++ b/public/api/resource-groups/1/queue-metrics/30.json
@@ -4,27 +4,27 @@
       "resourceId": 1,
       "name": "Bridges-2 Regular Memory",
       "resourceRepositoryKey": 2900,
-      "waitTime": 5.909166,
-      "wallTime": 2.007403,
-      "expansionFactor": 5.3611,
+      "waitTime": 11.97372,
+      "wallTime": 3.080251,
+      "expansionFactor": 5.794,
       "order": 1
     },
     {
       "resourceId": 2,
       "name": "Bridges-2 Extreme Memory",
       "resourceRepositoryKey": 2903,
-      "waitTime": 5.233983,
-      "wallTime": 6.61043,
-      "expansionFactor": 1.7911,
+      "waitTime": 4.266471,
+      "wallTime": 5.40701,
+      "expansionFactor": 1.7939,
       "order": 2
     },
     {
       "resourceId": 3,
       "name": "Bridges-2 GPU",
       "resourceRepositoryKey": 2902,
-      "waitTime": 19.670669,
-      "wallTime": 2.072165,
-      "expansionFactor": 10.4929,
+      "waitTime": 57.526596,
+      "wallTime": 2.376414,
+      "expansionFactor": 25.0903,
       "order": 3
     }
   ]
diff --git a/public/api/resource-groups/1/queue-metrics/365.json b/public/api/resource-groups/1/queue-metrics/365.json
new file mode 100644
index 0000000..b5afd83
--- /dev/null
+++ b/public/api/resource-groups/1/queue-metrics/365.json
@@ -0,0 +1,31 @@
+{
+  "queueMetrics": [
+    {
+      "resourceId": 1,
+      "name": "Bridges-2 Regular Memory",
+      "resourceRepositoryKey": 2900,
+      "waitTime": 7.820775,
+      "wallTime": 1.699045,
+      "expansionFactor": 6.1959,
+      "order": 1
+    },
+    {
+      "resourceId": 2,
+      "name": "Bridges-2 Extreme Memory",
+      "resourceRepositoryKey": 2903,
+      "waitTime": 9.848182,
+      "wallTime": 6.751228,
+      "expansionFactor": 2.4567,
+      "order": 2
+    },
+    {
+      "resourceId": 3,
+      "name": "Bridges-2 GPU",
+      "resourceRepositoryKey": 2902,
+      "waitTime": 14.737766,
+      "wallTime": 2.025538,
+      "expansionFactor": 8.2869,
+      "order": 3
+    }
+  ]
+}
diff --git a/public/api/resource-groups/1/queue-metrics/90.json b/public/api/resource-groups/1/queue-metrics/90.json
new file mode 100644
index 0000000..d844ed1
--- /dev/null
+++ b/public/api/resource-groups/1/queue-metrics/90.json
@@ -0,0 +1,31 @@
+{
+  "queueMetrics": [
+    {
+      "resourceId": 1,
+      "name": "Bridges-2 Regular Memory",
+      "resourceRepositoryKey": 2900,
+      "waitTime": 12.564133,
+      "wallTime": 2.7384,
+      "expansionFactor": 7.684,
+      "order": 1
+    },
+    {
+      "resourceId": 2,
+      "name": "Bridges-2 Extreme Memory",
+      "resourceRepositoryKey": 2903,
+      "waitTime": 5.413989,
+      "wallTime": 6.426771,
+      "expansionFactor": 1.839,
+      "order": 2
+    },
+    {
+      "resourceId": 3,
+      "name": "Bridges-2 GPU",
+      "resourceRepositoryKey": 2902,
+      "waitTime": 44.75172,
+      "wallTime": 2.512934,
+      "expansionFactor": 18.7756,
+      "order": 3
+    }
+  ]
+}
diff --git a/src/content.css b/src/content.css
index 0066acd..f77affa 100644
--- a/src/content.css
+++ b/src/content.css
@@ -107,10 +107,19 @@ p {
 .table tbody th {
   text-align: right;
 }
-input {
+input,
+select {
   border: 1px solid var(--contrast-8);
   border-radius: 0;
   color: var(--contrast);
   font-size: 1rem;
   padding: 6px 12px;
 }
+select {
+  appearance: none;
+  background-color: white;
+  background-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='currentColor' viewBox='0 0 16 16'><path fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708'/></svg>");
+  background-position: right 12px center;
+  background-repeat: no-repeat;
+  padding: 6px 36px 6px 12px;
+}
diff --git a/src/resource-group-queue-metrics.jsx b/src/resource-group-queue-metrics.jsx
index ecfa25b..3eee503 100644
--- a/src/resource-group-queue-metrics.jsx
+++ b/src/resource-group-queue-metrics.jsx
@@ -1,3 +1,4 @@
+import { useState } from "preact/hooks";
 import { useJSON } from "./utils";
 
 import Grid from "./grid";
@@ -25,8 +26,9 @@ export default function ResourceGroupQueueMetrics({
   baseUri,
   resourceGroupId,
 }) {
+  const [days, setDays] = useState(30);
   const data = useJSON(
-    `${baseUri}/api/resource-groups/${resourceGroupId}/queue-metrics.json`,
+    `${baseUri}/api/resource-groups/${resourceGroupId}/queue-metrics/${days}.json`,
     null
   );
   if (!data || data.error) return;
@@ -55,7 +57,8 @@ export default function ResourceGroupQueueMetrics({
     {
       key: "expansionFactor",
       name: "Expansion Factor",
-      format: (value) => value.toFixed(2),
+      format: (_value, row) =>
+        ((row.waitTime + row.wallTime) / row.wallTime).toFixed(2),
       formatHeader: formatHeaderTip(
         'Expansion factor is the ratio of the total time (wait time and wall time) to the wall time. It measures how much waiting in the queue "expands" the total time taken to complete a job relative to its length.'
       ),
@@ -64,10 +67,20 @@ export default function ResourceGroupQueueMetrics({
 
   return (
     <>
-      <h2>
-        <Icon name="clock" />
-        Queue Metrics
-      </h2>
+      <div class="flex-header">
+        <h2>
+          <Icon name="clock" />
+          Queue Metrics
+        </h2>
+        <select
+          value={days}
+          onChange={(e) => setDays(parseInt(e.target.value))}
+        >
+          <option value="30">Last 30 days</option>
+          <option value="90">Last 90 days</option>
+          <option value="365">Last year</option>
+        </select>
+      </div>
       <Grid columns={columns} rows={data.queueMetrics} />
     </>
   );
diff --git a/src/utils.js b/src/utils.js
index 4553d3a..1be22e7 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -36,15 +36,8 @@ export const useJSON = (uri, defaultValue) => {
           setValue(data);
         }
       })();
-  }, []);
+  }, [uri]);
   return value;
 };
 
 export const sortOn = (prop) => (a, b) => a[prop] < b[prop] ? -1 : 1;
-
-// export const useActiveIds = (initial = []) => {
-//   const [ids, setIds] = useState(initial);
-//   const toggle = (id) => setIds(id in ids ? ids.filter((x) => x != id) : [...ids, id]);
-//   const clear = () => setIds([]);
-
-// }

From c1a32b443b5f2fdca1a21be5674562395c69936d Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Tue, 20 Aug 2024 16:27:33 -0400
Subject: [PATCH 022/113] feat(resource-group-events): add events and
 announcements

---
 .../api/resource-groups/1/announcements.json  |  9 +++
 public/api/resource-groups/1/events.json      | 12 ++++
 src/alert.css                                 | 12 ++++
 src/alert.jsx                                 | 10 +++
 src/resource-catalog.jsx                      |  4 ++
 src/resource-group-detail.jsx                 |  5 ++
 src/resource-group-event.css                  | 49 +++++++++++++++
 src/resource-group-event.jsx                  | 62 +++++++++++++++++++
 src/resource-group-events.jsx                 | 37 +++++++++++
 9 files changed, 200 insertions(+)
 create mode 100644 public/api/resource-groups/1/announcements.json
 create mode 100644 public/api/resource-groups/1/events.json
 create mode 100644 src/alert.css
 create mode 100644 src/alert.jsx
 create mode 100644 src/resource-group-event.css
 create mode 100644 src/resource-group-event.jsx
 create mode 100644 src/resource-group-events.jsx

diff --git a/public/api/resource-groups/1/announcements.json b/public/api/resource-groups/1/announcements.json
new file mode 100644
index 0000000..a3d63d4
--- /dev/null
+++ b/public/api/resource-groups/1/announcements.json
@@ -0,0 +1,9 @@
+{
+  "announcements": [
+    {
+      "type": "outage",
+      "description": "Bridges-2 compute, storage, and virtual machines will be unavailable on September 1, 2024 from 8:00 a.m. to 5:00 p.m. EDT for scheduled filesystem maintenance.",
+      "announcementUri": "https://www.psc.edu/resources/bridges-2/"
+    }
+  ]
+}
diff --git a/public/api/resource-groups/1/events.json b/public/api/resource-groups/1/events.json
new file mode 100644
index 0000000..3512c67
--- /dev/null
+++ b/public/api/resource-groups/1/events.json
@@ -0,0 +1,12 @@
+{
+  "events": [
+    {
+      "title": "Bridges-2 Webinar: Scaling Up Ecological Monitoring with AI: How Supercomputing Is Unlocking the Value of Autonomous Acoustic Sensing",
+      "startDateTime": "2024-08-23T13:00:00-04:00",
+      "endDateTime": "2024-08-23T14:00:00-04:00",
+      "eventUri": "https://www.psc.edu/events/bridges-2-webinar-series/scaling-up-ecological-monitoring-with-ai/",
+      "speaker": "Sam Lapp, University of Pittsburgh",
+      "description": "Automated acoustic recording devices monitor wildlife at an unprecedented scale. Using hundreds of sensors, bioacoustic monitoring transforms our understanding of birds, bats, and frogs, aiding biodiversity management."
+    }
+  ]
+}
diff --git a/src/alert.css b/src/alert.css
new file mode 100644
index 0000000..1e3e47c
--- /dev/null
+++ b/src/alert.css
@@ -0,0 +1,12 @@
+.alert {
+  align-items: center;
+  background-color: var(--yellow-200);
+  border-radius: 10px;
+  display: flex;
+  flex-direction: row;
+  margin-bottom: 20px;
+  padding: 20px;
+}
+.alert i {
+  margin-right: 20px;
+}
diff --git a/src/alert.jsx b/src/alert.jsx
new file mode 100644
index 0000000..2c46bcb
--- /dev/null
+++ b/src/alert.jsx
@@ -0,0 +1,10 @@
+import Icon from "./icon";
+
+export default function Alert({ children, icon = "megaphone-fill" }) {
+  return (
+    <div class="alert">
+      {icon ? <Icon name={icon} /> : null}
+      <div class="alert-body">{children}</div>
+    </div>
+  );
+}
diff --git a/src/resource-catalog.jsx b/src/resource-catalog.jsx
index 3bf364e..75a3d67 100644
--- a/src/resource-catalog.jsx
+++ b/src/resource-catalog.jsx
@@ -1,5 +1,6 @@
 import { ErrorBoundary, lazy, LocationProvider, Router } from "preact-iso";
 import accordionStyle from "./accordion.css?inline";
+import alertStyle from "./alert.css?inline";
 import baseStyle from "./base.css?inline";
 import componentsStyle from "./components.css?inline";
 import contentStyle from "./content.css?inline";
@@ -11,6 +12,7 @@ import gridStyle from "./grid.css?inline";
 import carouselStyle from "./carousel.css?inline";
 import resourceFiltersStyle from "./resource-filters.css?inline";
 import resourceGroupStyle from "./resource-group.css?inline";
+import resourceGroupEventStyle from "./resource-group-event.css?inline";
 import searchStyle from "./search.css?inline";
 import tagsStyle from "./tags.css?inline";
 import tippyStyle from "tippy.js/dist/tippy.css?inline";
@@ -49,6 +51,7 @@ export function ResourceCatalog({
       <style>{contentStyle}</style>
       <style>{componentsStyle}</style>
       <style>{accordionStyle}</style>
+      <style>{alertStyle}</style>
       <style>{iconStyle}</style>
       <style>{infoTipStyle}</style>
       <style>{glideCoreStyle}</style>
@@ -57,6 +60,7 @@ export function ResourceCatalog({
       <style>{carouselStyle}</style>
       <style>{resourceFiltersStyle}</style>
       <style>{resourceGroupStyle}</style>
+      <style>{resourceGroupEventStyle}</style>
       <style>{searchStyle}</style>
       <style>{tagsStyle}</style>
       <style>{tippyStyle}</style>
diff --git a/src/resource-group-detail.jsx b/src/resource-group-detail.jsx
index 861054a..49eef6b 100644
--- a/src/resource-group-detail.jsx
+++ b/src/resource-group-detail.jsx
@@ -1,4 +1,5 @@
 import ResourceGroupDescription from "./resource-group-description";
+import ResourceGroupEvents from "./resource-group-events";
 import ResourceGroupQueueMetrics from "./resource-group-queue-metrics";
 import ResourceGroupResources from "./resource-group-resources";
 import ResourceGroupSoftware from "./resource-group-software";
@@ -14,6 +15,10 @@ export default function ResourceGroupDetail({ baseUri, resourceGroupId }) {
         baseUri={baseUri}
         resourceGroupId={resourceGroupId}
       />
+      <ResourceGroupEvents
+        baseUri={baseUri}
+        resourceGroupId={resourceGroupId}
+      />
       <ResourceGroupSoftware
         baseUri={baseUri}
         resourceGroupId={resourceGroupId}
diff --git a/src/resource-group-event.css b/src/resource-group-event.css
new file mode 100644
index 0000000..715a324
--- /dev/null
+++ b/src/resource-group-event.css
@@ -0,0 +1,49 @@
+.event-icon,
+.event-icon:active,
+.event-icon:focus,
+.event-icon:hover {
+  align-items: center;
+  background-color: var(--teal-700);
+  color: white;
+  display: none;
+  flex: 0 0 auto;
+  flex-direction: column;
+  font-weight: 800;
+  justify-content: center;
+  height: calc((var(--width) - 140px) / 8);
+  text-decoration: none;
+  width: calc((var(--width) - 140px) / 8);
+}
+.event-icon span {
+  display: block;
+}
+.event-icon span:nth-child(2) {
+  font-size: 2rem;
+}
+.event-metadata {
+  margin-bottom: 1rem;
+}
+.event-metadata i:not(:first-child) {
+  margin-left: 1rem;
+}
+@media (min-width: 768px) {
+  .event {
+    display: flex;
+    flex-direction: row;
+  }
+  .event-icon,
+  .event-icon:active,
+  .event-icon:focus,
+  .event-icon:hover {
+    display: flex;
+    margin-right: 20px;
+  }
+  .event h3 {
+    margin-top: 0;
+  }
+}
+@media (min-width: 900px) {
+  .event-icon span:nth-child(2) {
+    font-size: 3rem;
+  }
+}
diff --git a/src/resource-group-event.jsx b/src/resource-group-event.jsx
new file mode 100644
index 0000000..cc26bee
--- /dev/null
+++ b/src/resource-group-event.jsx
@@ -0,0 +1,62 @@
+import Icon from "./icon";
+
+export default function ResourceGroupEvent({
+  title,
+  startDateTime,
+  endDateTime,
+  eventUri,
+  speaker,
+  description,
+}) {
+  const headingContent = eventUri ? <a href={eventUri}>{title}</a> : title;
+  const metadata = [];
+  let icon = null;
+
+  if (startDateTime) {
+    const start = new Date(startDateTime);
+    const end = new Date(endDateTime || startDateTime);
+    const [startDate, endDate] = [start, end].map((date) =>
+      date.toLocaleString("en-US", { dateStyle: "long" })
+    );
+    const [startTime, endTime] = [start, end].map((date) =>
+      date.toLocaleString("en-US", { timeStyle: "short" })
+    );
+    const tz = start
+      .toLocaleTimeString("en-US", { timeZoneName: "short" })
+      .split(" ")[2];
+    const parts = [`${startDate},`, startTime];
+    if (endTime != startTime || endDate != startDate) {
+      parts.push("-");
+      if (endDate != startDate) parts.push(`${endDate},`);
+      parts.push(endTime);
+    }
+    parts.push(`(${tz})`);
+    metadata.push(<Icon name="calendar" />, parts.join(" "));
+
+    const iconContent = start
+      .toLocaleString("en-US", { dateStyle: "medium" })
+      .split(",")[0]
+      .split(" ")
+      .map((part) => <span>{part}</span>);
+    icon = eventUri ? (
+      <a href={eventUri} class="event-icon">
+        {iconContent}
+      </a>
+    ) : (
+      <div class="event-icon">{iconContent}</div>
+    );
+  }
+
+  if (speaker) metadata.push(<Icon name="people-fill" />, speaker);
+
+  return (
+    <div class="event">
+      {icon}
+      <div class="event-details">
+        <h3>{headingContent}</h3>
+        {metadata.length ? <div class="event-metadata">{metadata}</div> : null}
+        {description ? <p>{description}</p> : null}
+      </div>
+    </div>
+  );
+}
diff --git a/src/resource-group-events.jsx b/src/resource-group-events.jsx
new file mode 100644
index 0000000..76b16dd
--- /dev/null
+++ b/src/resource-group-events.jsx
@@ -0,0 +1,37 @@
+import { useJSON } from "./utils";
+
+import Alert from "./alert";
+import Icon from "./icon";
+import ResourceGroupEvent from "./resource-group-event";
+
+export default function ResourceGroupEvents({ baseUri, resourceGroupId }) {
+  const announcementData = useJSON(
+    `${baseUri}/api/resource-groups/${resourceGroupId}/announcements.json`,
+    null
+  );
+  const eventData = useJSON(
+    `${baseUri}/api/resource-groups/${resourceGroupId}/events.json`,
+    null
+  );
+  if (!announcementData && !eventData) return;
+  return (
+    <>
+      <h2>
+        <Icon name="calendar3" />
+        Announcements and Events
+      </h2>
+      {announcementData &&
+        announcementData.announcements.map(
+          ({ description, announcementUri }) => (
+            <Alert>
+              {description}{" "}
+              {announcementUri ? (
+                <a href={announcementUri}>Learn more.</a>
+              ) : null}
+            </Alert>
+          )
+        )}
+      {eventData && eventData.events.map((event) => ResourceGroupEvent(event))}
+    </>
+  );
+}

From af0cefa5b5c80a8b0db74475cc311b72638c2814 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Tue, 20 Aug 2024 16:44:42 -0400
Subject: [PATCH 023/113] refactor(section): use section component in resource
 group children

---
 src/resource-group-events.jsx        | 10 +++------
 src/resource-group-queue-metrics.jsx | 32 +++++++++++++---------------
 src/resource-group-resources.jsx     | 10 +++------
 src/resource-group-software.jsx      | 27 ++++++++++++-----------
 src/section.jsx                      | 23 ++++++++++++++++++++
 5 files changed, 58 insertions(+), 44 deletions(-)
 create mode 100644 src/section.jsx

diff --git a/src/resource-group-events.jsx b/src/resource-group-events.jsx
index 76b16dd..b8c3aa7 100644
--- a/src/resource-group-events.jsx
+++ b/src/resource-group-events.jsx
@@ -1,8 +1,8 @@
 import { useJSON } from "./utils";
 
 import Alert from "./alert";
-import Icon from "./icon";
 import ResourceGroupEvent from "./resource-group-event";
+import Section from "./section";
 
 export default function ResourceGroupEvents({ baseUri, resourceGroupId }) {
   const announcementData = useJSON(
@@ -15,11 +15,7 @@ export default function ResourceGroupEvents({ baseUri, resourceGroupId }) {
   );
   if (!announcementData && !eventData) return;
   return (
-    <>
-      <h2>
-        <Icon name="calendar3" />
-        Announcements and Events
-      </h2>
+    <Section title="Announcements and Events" icon="calendar3">
       {announcementData &&
         announcementData.announcements.map(
           ({ description, announcementUri }) => (
@@ -32,6 +28,6 @@ export default function ResourceGroupEvents({ baseUri, resourceGroupId }) {
           )
         )}
       {eventData && eventData.events.map((event) => ResourceGroupEvent(event))}
-    </>
+    </Section>
   );
 }
diff --git a/src/resource-group-queue-metrics.jsx b/src/resource-group-queue-metrics.jsx
index 3eee503..c9a04c2 100644
--- a/src/resource-group-queue-metrics.jsx
+++ b/src/resource-group-queue-metrics.jsx
@@ -2,8 +2,8 @@ import { useState } from "preact/hooks";
 import { useJSON } from "./utils";
 
 import Grid from "./grid";
-import Icon from "./icon";
 import InfoTip from "./info-tip";
+import Section from "./section";
 
 const formatTime = (value) => {
   const hours = Math.floor(value);
@@ -65,23 +65,21 @@ export default function ResourceGroupQueueMetrics({
     },
   ];
 
+  const headerComponents = [
+    <select value={days} onChange={(e) => setDays(parseInt(e.target.value))}>
+      <option value="30">Last 30 days</option>
+      <option value="90">Last 90 days</option>
+      <option value="365">Last year</option>
+    </select>,
+  ];
+
   return (
-    <>
-      <div class="flex-header">
-        <h2>
-          <Icon name="clock" />
-          Queue Metrics
-        </h2>
-        <select
-          value={days}
-          onChange={(e) => setDays(parseInt(e.target.value))}
-        >
-          <option value="30">Last 30 days</option>
-          <option value="90">Last 90 days</option>
-          <option value="365">Last year</option>
-        </select>
-      </div>
+    <Section
+      title="Queue Metrics"
+      icon="clock"
+      headerComponents={headerComponents}
+    >
       <Grid columns={columns} rows={data.queueMetrics} />
-    </>
+    </Section>
   );
 }
diff --git a/src/resource-group-resources.jsx b/src/resource-group-resources.jsx
index 33c2057..ac50e37 100644
--- a/src/resource-group-resources.jsx
+++ b/src/resource-group-resources.jsx
@@ -3,8 +3,8 @@ import { defaultIcons } from "./icons";
 import { useJSON } from "./utils";
 
 import Accordion from "./accordion";
-import Icon from "./icon";
 import ResourceDetail from "./resource-detail";
+import Section from "./section";
 
 const linkResourceData = ({ resources, resourceTypes }) => {
   const resourceTypesMap = {};
@@ -35,17 +35,13 @@ export default function ResourceGroupResources({ baseUri, resourceGroupId }) {
   return types.resourceTypes.map(({ name, resources }) => {
     if (resources.length)
       return (
-        <>
-          <h2>
-            <Icon name={defaultIcons[name] || "stars"} />
-            {name}
-          </h2>
+        <Section title={name} icon={defaultIcons[name] || "stars"}>
           {resources.map((resource) => (
             <Accordion title={resource.name}>
               <ResourceDetail {...resource} />
             </Accordion>
           ))}
-        </>
+        </Section>
       );
   });
 }
diff --git a/src/resource-group-software.jsx b/src/resource-group-software.jsx
index 660f592..6cee42c 100644
--- a/src/resource-group-software.jsx
+++ b/src/resource-group-software.jsx
@@ -4,8 +4,8 @@ import Fuse from "fuse.js";
 
 import Grid from "./grid";
 import Highlight from "./highlight";
-import Icon from "./icon";
 import Search from "./search";
+import Section from "./section";
 
 export default function ResourceGroupSoftware({ baseUri, resourceGroupId }) {
   const data = useJSON(
@@ -47,19 +47,20 @@ export default function ResourceGroupSoftware({ baseUri, resourceGroupId }) {
     ? fuse.search(searchText).map((result) => result.item)
     : data.software;
 
+  const headerComponents = [
+    <Search
+      placeholder="Search software packages..."
+      setSearchText={setSearchText}
+    />,
+  ];
+
   return (
-    <>
-      <div class="flex-header">
-        <h2>
-          <Icon name="terminal" />
-          Software
-        </h2>
-        <Search
-          placeholder="Search software packages..."
-          setSearchText={setSearchText}
-        />
-      </div>
+    <Section
+      title="Software"
+      icon="terminal"
+      headerComponents={headerComponents}
+    >
       <Grid columns={columns} rows={rows} scrollResetOnUpdate={true} />
-    </>
+    </Section>
   );
 }
diff --git a/src/section.jsx b/src/section.jsx
new file mode 100644
index 0000000..59ee601
--- /dev/null
+++ b/src/section.jsx
@@ -0,0 +1,23 @@
+import Icon from "./icon";
+
+export default function Section({
+  children,
+  headerComponents = null,
+  icon = null,
+  sectionId = null,
+  title,
+}) {
+  const id = sectionId || title.toLowerCase().replace(/[^0-9a-z]+/g, "-");
+  return (
+    <>
+      <div class="flex-header">
+        <h2 id={id}>
+          {icon ? <Icon name={icon} /> : null}
+          {title}
+        </h2>
+        {headerComponents}
+      </div>
+      {children}
+    </>
+  );
+}

From 1c1be2137c8b2c798b2e19876d70f9ebbaf22acf Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 21 Aug 2024 10:02:48 -0400
Subject: [PATCH 024/113] fix(grid): remove buggy auto-scroll feature

---
 src/grid.jsx | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/grid.jsx b/src/grid.jsx
index 1a8221f..9c4bd7c 100644
--- a/src/grid.jsx
+++ b/src/grid.jsx
@@ -13,24 +13,9 @@ export default function Grid({
   frozenColumns = 0,
   minWidth,
   rowClasses = [],
-  scrollBehavior = "smooth",
   scrollResetOnUpdate = false,
-  scrollRowIndex = 0,
 }) {
   const container = useRef();
-  useLayoutEffect(() => {
-    if (!container.current) return;
-    const row = container.current.querySelector(
-      `tbody tr:nth-child(${scrollRowIndex + 1})`
-    );
-    if (row)
-      row.scrollIntoView({
-        behavior: scrollBehavior,
-        block: "nearest",
-        inline: "nearest",
-      });
-  }, [scrollRowIndex, scrollBehavior]);
-
   useLayoutEffect(() => {
     if (container.current && scrollResetOnUpdate)
       container.current.scrollTop = 0;

From 43204c5fc92a178877065d3c7acd962f9c60e38d Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 21 Aug 2024 10:03:27 -0400
Subject: [PATCH 025/113] feat(section-navigation): add section navigation
 component

---
 src/resource-catalog.jsx      |  2 ++
 src/resource-group-detail.jsx |  2 ++
 src/section-navigation.css    | 25 +++++++++++++++++++++
 src/section-navigation.jsx    | 41 +++++++++++++++++++++++++++++++++++
 src/section.jsx               | 17 ++++++++++++---
 5 files changed, 84 insertions(+), 3 deletions(-)
 create mode 100644 src/section-navigation.css
 create mode 100644 src/section-navigation.jsx

diff --git a/src/resource-catalog.jsx b/src/resource-catalog.jsx
index 75a3d67..7a9c4df 100644
--- a/src/resource-catalog.jsx
+++ b/src/resource-catalog.jsx
@@ -14,6 +14,7 @@ import resourceFiltersStyle from "./resource-filters.css?inline";
 import resourceGroupStyle from "./resource-group.css?inline";
 import resourceGroupEventStyle from "./resource-group-event.css?inline";
 import searchStyle from "./search.css?inline";
+import sectionNavigationStyle from "./section-navigation.css?inline";
 import tagsStyle from "./tags.css?inline";
 import tippyStyle from "tippy.js/dist/tippy.css?inline";
 
@@ -62,6 +63,7 @@ export function ResourceCatalog({
       <style>{resourceGroupStyle}</style>
       <style>{resourceGroupEventStyle}</style>
       <style>{searchStyle}</style>
+      <style>{sectionNavigationStyle}</style>
       <style>{tagsStyle}</style>
       <style>{tippyStyle}</style>
     </>
diff --git a/src/resource-group-detail.jsx b/src/resource-group-detail.jsx
index 49eef6b..a9a206f 100644
--- a/src/resource-group-detail.jsx
+++ b/src/resource-group-detail.jsx
@@ -3,6 +3,7 @@ import ResourceGroupEvents from "./resource-group-events";
 import ResourceGroupQueueMetrics from "./resource-group-queue-metrics";
 import ResourceGroupResources from "./resource-group-resources";
 import ResourceGroupSoftware from "./resource-group-software";
+import SectionNavigation from "./section-navigation";
 
 export default function ResourceGroupDetail({ baseUri, resourceGroupId }) {
   return (
@@ -11,6 +12,7 @@ export default function ResourceGroupDetail({ baseUri, resourceGroupId }) {
         baseUri={baseUri}
         resourceGroupId={resourceGroupId}
       />
+      <SectionNavigation />
       <ResourceGroupResources
         baseUri={baseUri}
         resourceGroupId={resourceGroupId}
diff --git a/src/section-navigation.css b/src/section-navigation.css
new file mode 100644
index 0000000..a0a2b0e
--- /dev/null
+++ b/src/section-navigation.css
@@ -0,0 +1,25 @@
+.section-navigation {
+  border-bottom: 1px solid var(--contrast-8);
+  border-top: 1px solid var(--contrast-8);
+  display: flex;
+  flex-direction: row;
+  margin: 20px 0;
+}
+.section-navigation h2 {
+  flex: 0 0 auto;
+  font-size: 1rem;
+  font-weight: 400;
+  margin: 20px 0;
+}
+.section-navigation ul {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  margin: 0;
+  padding: 10px 0;
+}
+.section-navigation li {
+  list-style-type: none;
+  flex: 0 0 auto;
+  margin: 10px 0 10px 20px;
+}
diff --git a/src/section-navigation.jsx b/src/section-navigation.jsx
new file mode 100644
index 0000000..6073c76
--- /dev/null
+++ b/src/section-navigation.jsx
@@ -0,0 +1,41 @@
+import { useEffect, useState } from "preact/hooks";
+
+import Icon from "./icon";
+
+export default function SectionNavigation({ prompt = "Jump To:" }) {
+  const [sections, setSections] = useState([]);
+  const updateSections = () => {
+    const newSections = [];
+    for (let heading of document.querySelectorAll("[data-section-title]"))
+      newSections.push({
+        icon: heading.dataset.sectionIcon,
+        id: heading.id,
+        title: heading.dataset.sectionTitle,
+      });
+
+    setSections(newSections);
+  };
+  useEffect(() => {
+    updateSections();
+    document.addEventListener("accessci-update-sections", updateSections);
+  }, []);
+  return (
+    <nav class="section-navigation">
+      {prompt ? <h2>{prompt}</h2> : null}
+      <ul>
+        {sections.map(({ icon, id, title }) => (
+          <li>
+            <a href={`#${id}`}>
+              {icon ? (
+                <>
+                  <Icon name={icon} />{" "}
+                </>
+              ) : null}
+              {title}
+            </a>
+          </li>
+        ))}
+      </ul>
+    </nav>
+  );
+}
diff --git a/src/section.jsx b/src/section.jsx
index 59ee601..fb08f3c 100644
--- a/src/section.jsx
+++ b/src/section.jsx
@@ -1,5 +1,12 @@
+import { useLayoutEffect } from "preact/hooks";
+
 import Icon from "./icon";
 
+const fireUpdateEvent = () => {
+  const event = new Event("accessci-update-sections");
+  document.dispatchEvent(event);
+};
+
 export default function Section({
   children,
   headerComponents = null,
@@ -8,16 +15,20 @@ export default function Section({
   title,
 }) {
   const id = sectionId || title.toLowerCase().replace(/[^0-9a-z]+/g, "-");
+  useLayoutEffect(() => {
+    fireUpdateEvent();
+    return fireUpdateEvent;
+  }, []);
   return (
-    <>
+    <section id={id} data-section-title={title} data-section-icon={icon}>
       <div class="flex-header">
-        <h2 id={id}>
+        <h2>
           {icon ? <Icon name={icon} /> : null}
           {title}
         </h2>
         {headerComponents}
       </div>
       {children}
-    </>
+    </section>
   );
 }

From 91570a4da805112c96cfacd18c00c7cbfaa9e7ab Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 21 Aug 2024 10:13:59 -0400
Subject: [PATCH 026/113] feat(resource-group-affinity-group): add affinity
 group component

---
 src/resource-group-affinity-group.jsx | 26 ++++++++++++++++++++++++++
 src/resource-group-detail.jsx         |  5 +++++
 2 files changed, 31 insertions(+)
 create mode 100644 src/resource-group-affinity-group.jsx

diff --git a/src/resource-group-affinity-group.jsx b/src/resource-group-affinity-group.jsx
new file mode 100644
index 0000000..9ee0f28
--- /dev/null
+++ b/src/resource-group-affinity-group.jsx
@@ -0,0 +1,26 @@
+import Section from "./section";
+
+export default function ResourceGroupAffinityGroup({
+  baseUri,
+  resourceGroupId,
+}) {
+  return (
+    <Section title="Affinity Group" icon="people-fill">
+      <>
+        <p>
+          Join the community! Members get update about announcements, events,
+          and outages.
+        </p>
+        <a href="#" class="btn">
+          Join
+        </a>
+        <a href="#" class="btn secondary">
+          Slack
+        </a>
+        <a href="#" class="btn secondary">
+          Q&A
+        </a>
+      </>
+    </Section>
+  );
+}
diff --git a/src/resource-group-detail.jsx b/src/resource-group-detail.jsx
index a9a206f..e03f7b3 100644
--- a/src/resource-group-detail.jsx
+++ b/src/resource-group-detail.jsx
@@ -1,3 +1,4 @@
+import ResourceGroupAffinityGroup from "./resource-group-affinity-group";
 import ResourceGroupDescription from "./resource-group-description";
 import ResourceGroupEvents from "./resource-group-events";
 import ResourceGroupQueueMetrics from "./resource-group-queue-metrics";
@@ -21,6 +22,10 @@ export default function ResourceGroupDetail({ baseUri, resourceGroupId }) {
         baseUri={baseUri}
         resourceGroupId={resourceGroupId}
       />
+      <ResourceGroupAffinityGroup
+        baseUri={baseUri}
+        resourceGroupId={resourceGroupId}
+      />
       <ResourceGroupSoftware
         baseUri={baseUri}
         resourceGroupId={resourceGroupId}

From 28ba67242fc0509dde1aa64b60699fdee9d12b58 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 21 Aug 2024 14:17:37 -0400
Subject: [PATCH 027/113] feat(resource-group-projects): add charts for project
 statistics

---
 .../api/resource-groups/1/projects/all.json   |  70 ++++++++
 .../resource-groups/1/projects/educator.json  |  30 ++++
 .../1/projects/grad-student.json              |  38 +++++
 .../1/projects/researcher.json                |  66 ++++++++
 src/base.css                                  |   1 +
 src/donut-chart.css                           |  39 +++++
 src/donut-chart.jsx                           | 155 ++++++++++++++++++
 src/resource-catalog.jsx                      |   4 +
 src/resource-group-affinity-group.jsx         |  28 ++--
 src/resource-group-detail.jsx                 |   5 +
 src/resource-group-projects.css               |  34 ++++
 src/resource-group-projects.jsx               |  59 +++++++
 12 files changed, 514 insertions(+), 15 deletions(-)
 create mode 100644 public/api/resource-groups/1/projects/all.json
 create mode 100644 public/api/resource-groups/1/projects/educator.json
 create mode 100644 public/api/resource-groups/1/projects/grad-student.json
 create mode 100644 public/api/resource-groups/1/projects/researcher.json
 create mode 100644 src/donut-chart.css
 create mode 100644 src/donut-chart.jsx
 create mode 100644 src/resource-group-projects.css
 create mode 100644 src/resource-group-projects.jsx

diff --git a/public/api/resource-groups/1/projects/all.json b/public/api/resource-groups/1/projects/all.json
new file mode 100644
index 0000000..723b16b
--- /dev/null
+++ b/public/api/resource-groups/1/projects/all.json
@@ -0,0 +1,70 @@
+{
+  "projects": {
+    "projectType": [
+      {
+        "name": "Explore ACCESS",
+        "count": 354
+      },
+      {
+        "name": "Discover ACCESS",
+        "count": 191
+      },
+      {
+        "name": "Accelerate ACCESS",
+        "count": 87
+      },
+      {
+        "name": "Maximize ACCESS",
+        "count": 14
+      }
+    ],
+    "fieldOfScience": [
+      {
+        "name": "Materials Engineering",
+        "count": 157
+      },
+      {
+        "name": "Physical Chemistry",
+        "count": 143
+      },
+      {
+        "name": "Applied Computer Science",
+        "count": 126
+      },
+      {
+        "name": "Health Sciences",
+        "count": 114
+      },
+      {
+        "name": "Ecology",
+        "count": 90
+      },
+      {
+        "name": "Training",
+        "count": 16
+      }
+    ],
+    "institution": [
+      {
+        "name": "Carnegie Mellon University",
+        "count": 321
+      },
+      {
+        "name": "University of Pittsburgh",
+        "count": 190
+      },
+      {
+        "name": "University of Somewhere",
+        "count": 110
+      },
+      {
+        "name": "Another University",
+        "count": 16
+      },
+      {
+        "name": "Computing College",
+        "count": 9
+      }
+    ]
+  }
+}
diff --git a/public/api/resource-groups/1/projects/educator.json b/public/api/resource-groups/1/projects/educator.json
new file mode 100644
index 0000000..e259095
--- /dev/null
+++ b/public/api/resource-groups/1/projects/educator.json
@@ -0,0 +1,30 @@
+{
+  "projects": {
+    "projectType": [
+      {
+        "name": "Explore ACCESS",
+        "count": 16
+      }
+    ],
+    "fieldOfScience": [
+      {
+        "name": "Applied Computer Science",
+        "count": 10
+      },
+      {
+        "name": "Training",
+        "count": 6
+      }
+    ],
+    "institution": [
+      {
+        "name": "Carnegie Mellon University",
+        "count": 8
+      },
+      {
+        "name": "University of Pittsburgh",
+        "count": 8
+      }
+    ]
+  }
+}
diff --git a/public/api/resource-groups/1/projects/grad-student.json b/public/api/resource-groups/1/projects/grad-student.json
new file mode 100644
index 0000000..2aaf25a
--- /dev/null
+++ b/public/api/resource-groups/1/projects/grad-student.json
@@ -0,0 +1,38 @@
+{
+  "projects": {
+    "projectType": [
+      {
+        "name": "Explore ACCESS",
+        "count": 52
+      }
+    ],
+    "fieldOfScience": [
+      {
+        "name": "Materials Engineering",
+        "count": 21
+      },
+      {
+        "name": "Physical Chemistry",
+        "count": 12
+      },
+      {
+        "name": "Applied Computer Science",
+        "count": 19
+      }
+    ],
+    "institution": [
+      {
+        "name": "University of Somewhere",
+        "count": 26
+      },
+      {
+        "name": "Another University",
+        "count": 22
+      },
+      {
+        "name": "Computing College",
+        "count": 4
+      }
+    ]
+  }
+}
diff --git a/public/api/resource-groups/1/projects/researcher.json b/public/api/resource-groups/1/projects/researcher.json
new file mode 100644
index 0000000..07e8ed1
--- /dev/null
+++ b/public/api/resource-groups/1/projects/researcher.json
@@ -0,0 +1,66 @@
+{
+  "projects": {
+    "projectType": [
+      {
+        "name": "Explore ACCESS",
+        "count": 264
+      },
+      {
+        "name": "Discover ACCESS",
+        "count": 36
+      },
+      {
+        "name": "Accelerate ACCESS",
+        "count": 9
+      },
+      {
+        "name": "Maximize ACCESS",
+        "count": 14
+      }
+    ],
+    "fieldOfScience": [
+      {
+        "name": "Materials Engineering",
+        "count": 99
+      },
+      {
+        "name": "Physical Chemistry",
+        "count": 67
+      },
+      {
+        "name": "Applied Computer Science",
+        "count": 66
+      },
+      {
+        "name": "Health Sciences",
+        "count": 49
+      },
+      {
+        "name": "Ecology",
+        "count": 42
+      }
+    ],
+    "institution": [
+      {
+        "name": "Carnegie Mellon University",
+        "count": 187
+      },
+      {
+        "name": "University of Pittsburgh",
+        "count": 65
+      },
+      {
+        "name": "University of Somewhere",
+        "count": 26
+      },
+      {
+        "name": "Another University",
+        "count": 36
+      },
+      {
+        "name": "Computing College",
+        "count": 9
+      }
+    ]
+  }
+}
diff --git a/src/base.css b/src/base.css
index b49d10d..8c59442 100644
--- a/src/base.css
+++ b/src/base.css
@@ -6,6 +6,7 @@
   --contrast-6: #999999;
   --contrast-8: #dfdfdf;
   --contrast-9: #f2f2f2;
+  --green-400: #288654;
   --red-400: #a70000;
   --orange-200: #f6d8ca;
   --orange-400: #f07537;
diff --git a/src/donut-chart.css b/src/donut-chart.css
new file mode 100644
index 0000000..ab23e90
--- /dev/null
+++ b/src/donut-chart.css
@@ -0,0 +1,39 @@
+.donut-chart svg path {
+  cursor: pointer;
+}
+.donut-chart .center-text {
+  align-items: center;
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  justify-content: center;
+  line-height: 1.2;
+}
+.donut-chart .center-text * {
+  cursor: default;
+  display: block;
+  margin-bottom: 0.25rem;
+  text-align: center;
+}
+.donut-chart .center-text .percent {
+  color: var(--contrast-2);
+  font-size: 0.7rem;
+}
+.donut-chart .top-items {
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
+}
+.donut-chart .top-items li {
+  display: flex;
+  flex-direction: row;
+  margin-bottom: 5px;
+}
+.donut-chart .symbol {
+  border-radius: 8px;
+  display: inline-block;
+  height: 16px;
+  margin-right: 5px;
+  vertical-align: text-top;
+  width: 16px;
+}
diff --git a/src/donut-chart.jsx b/src/donut-chart.jsx
new file mode 100644
index 0000000..190d2ca
--- /dev/null
+++ b/src/donut-chart.jsx
@@ -0,0 +1,155 @@
+import { useState } from "preact/hooks";
+
+const circleCoords = (pct, radius) =>
+  `${Math.cos(2 * Math.PI * pct) * radius} ${
+    Math.sin(2 * Math.PI * pct) * radius
+  }`;
+
+const formatItem = (
+  { name, count },
+  total = null,
+  itemLabel,
+  separator = "",
+  noBreak = false
+) => {
+  return (
+    <>
+      <strong>
+        {name}
+        {separator}
+      </strong>{" "}
+      <span>
+        {count.toLocaleString()}
+        {noBreak ? <>&nbsp;</> : " "}
+        {itemLabel}
+      </span>
+      {total !== null ? (
+        <>
+          {" "}
+          <span class="percent">
+            (
+            {((count * 100) / total).toLocaleString("en-US", {
+              maximumFractionDigits: 1,
+            })}
+            %)
+          </span>
+        </>
+      ) : null}
+    </>
+  );
+};
+
+export default function DonutChart({
+  colors = [
+    "var(--teal-700)",
+    "var(--yellow-400)",
+    "var(--teal-400)",
+    "var(--orange-400)",
+    "var(--green-400)",
+    "var(--red-400)",
+  ],
+  title,
+  itemLabel = "",
+  items,
+  topItems = 3,
+  topItemsHeading = null,
+}) {
+  const [activeIdx, setActiveIdx] = useState(null);
+  const sortedItems = items.toSorted((a, b) =>
+    a.count < b.count || (a.count == b.count && a.name < b.name) ? 1 : -1
+  );
+  const total = items
+    .map(({ count }) => count)
+    .reduce((result, count) => result + count, 0);
+  let cumulativePct = -0.25;
+
+  const svgPaths = sortedItems.map(({ name, count }, i) => {
+    const pct = count / total;
+    if (pct == 0) return null;
+    const startPct = cumulativePct;
+    const endPct = (cumulativePct += pct);
+    const lgArc = pct > 0.5 ? 1 : 0;
+    const pathData = [
+      `M ${circleCoords(startPct, 100)}`,
+      `A 100 100 0 ${lgArc} 1 ${circleCoords(endPct, 100)}`,
+      `L ${circleCoords(endPct, 75)}`,
+      `A 75 75 0 ${lgArc} 0 ${circleCoords(startPct, 75)}`,
+      `L ${circleCoords(startPct, 100)}`,
+    ].join(" ");
+    return (
+      <path
+        key={name}
+        d={pathData}
+        style={{
+          fill: colors[i % colors.length],
+          opacity: activeIdx === null ? 1 : i === activeIdx ? 1 : 0.5,
+        }}
+        onClick={(e) => {
+          e.stopPropagation();
+          setActiveIdx(activeIdx === i ? null : i);
+        }}
+      />
+    );
+  });
+  const activeItem = activeIdx === null ? null : items[activeIdx];
+  const labelContent =
+    activeItem === null ? (
+      <>
+        <strong>{title}</strong>{" "}
+        <span>
+          {total.toLocaleString()} {itemLabel}
+        </span>
+      </>
+    ) : (
+      <>
+        <strong>{activeItem.name}</strong>{" "}
+        <span>
+          {activeItem.count.toLocaleString()} {itemLabel}
+        </span>
+        <span class="percent">
+          (
+          {((activeItem.count * 100) / total).toLocaleString("en-US", {
+            maximumFractionDigits: 1,
+          })}
+          %)
+        </span>
+      </>
+    );
+  const svgLabel = (
+    <foreignObject key="center-text" x="-50" y="-50" width="100" height="100">
+      <div class="center-text">{labelContent}</div>
+    </foreignObject>
+  );
+
+  return (
+    <div class="donut-chart">
+      <svg
+        version="1.1"
+        viewBox="-100 -100 200 200"
+        width="200"
+        height="200"
+        xmlns="http://www.w3.org/2000/svg"
+        onClick={() => setActiveIdx(null)}
+      >
+        {svgPaths}
+        {svgLabel}
+      </svg>
+      {topItems > 0 ? (
+        <>
+          <h3>{topItemsHeading || `Top ${title}s`}</h3>
+          <ul class="top-items">
+            {sortedItems.slice(0, topItems).map((item, i) => (
+              <li>
+                <span
+                  class="symbol"
+                  style={{ backgroundColor: colors[i % colors.length] }}
+                ></span>
+                <span>{formatItem(item, null, itemLabel, ":", true)}</span>
+              </li>
+            ))}
+          </ul>
+        </>
+      ) : null}
+    </div>
+  );
+}
diff --git a/src/resource-catalog.jsx b/src/resource-catalog.jsx
index 7a9c4df..1341277 100644
--- a/src/resource-catalog.jsx
+++ b/src/resource-catalog.jsx
@@ -4,6 +4,7 @@ import alertStyle from "./alert.css?inline";
 import baseStyle from "./base.css?inline";
 import componentsStyle from "./components.css?inline";
 import contentStyle from "./content.css?inline";
+import donutChartStyle from "./donut-chart.css?inline";
 import iconStyle from "./icon.css?inline";
 import infoTipStyle from "./info-tip.css?inline";
 import glideCoreStyle from "@glidejs/glide/dist/css/glide.core.min.css?inline";
@@ -13,6 +14,7 @@ import carouselStyle from "./carousel.css?inline";
 import resourceFiltersStyle from "./resource-filters.css?inline";
 import resourceGroupStyle from "./resource-group.css?inline";
 import resourceGroupEventStyle from "./resource-group-event.css?inline";
+import resourceGroupProjectsStyle from "./resource-group-projects.css?inline";
 import searchStyle from "./search.css?inline";
 import sectionNavigationStyle from "./section-navigation.css?inline";
 import tagsStyle from "./tags.css?inline";
@@ -53,6 +55,7 @@ export function ResourceCatalog({
       <style>{componentsStyle}</style>
       <style>{accordionStyle}</style>
       <style>{alertStyle}</style>
+      <style>{donutChartStyle}</style>
       <style>{iconStyle}</style>
       <style>{infoTipStyle}</style>
       <style>{glideCoreStyle}</style>
@@ -62,6 +65,7 @@ export function ResourceCatalog({
       <style>{resourceFiltersStyle}</style>
       <style>{resourceGroupStyle}</style>
       <style>{resourceGroupEventStyle}</style>
+      <style>{resourceGroupProjectsStyle}</style>
       <style>{searchStyle}</style>
       <style>{sectionNavigationStyle}</style>
       <style>{tagsStyle}</style>
diff --git a/src/resource-group-affinity-group.jsx b/src/resource-group-affinity-group.jsx
index 9ee0f28..7d3e9d0 100644
--- a/src/resource-group-affinity-group.jsx
+++ b/src/resource-group-affinity-group.jsx
@@ -6,21 +6,19 @@ export default function ResourceGroupAffinityGroup({
 }) {
   return (
     <Section title="Affinity Group" icon="people-fill">
-      <>
-        <p>
-          Join the community! Members get update about announcements, events,
-          and outages.
-        </p>
-        <a href="#" class="btn">
-          Join
-        </a>
-        <a href="#" class="btn secondary">
-          Slack
-        </a>
-        <a href="#" class="btn secondary">
-          Q&A
-        </a>
-      </>
+      <p>
+        Join the community! Members get update about announcements, events, and
+        outages.
+      </p>
+      <a href="#" class="btn">
+        Join
+      </a>
+      <a href="#" class="btn secondary">
+        Slack
+      </a>
+      <a href="#" class="btn secondary">
+        Q&A
+      </a>
     </Section>
   );
 }
diff --git a/src/resource-group-detail.jsx b/src/resource-group-detail.jsx
index e03f7b3..2a0a19c 100644
--- a/src/resource-group-detail.jsx
+++ b/src/resource-group-detail.jsx
@@ -1,6 +1,7 @@
 import ResourceGroupAffinityGroup from "./resource-group-affinity-group";
 import ResourceGroupDescription from "./resource-group-description";
 import ResourceGroupEvents from "./resource-group-events";
+import ResourceGroupProjects from "./resource-group-projects";
 import ResourceGroupQueueMetrics from "./resource-group-queue-metrics";
 import ResourceGroupResources from "./resource-group-resources";
 import ResourceGroupSoftware from "./resource-group-software";
@@ -30,6 +31,10 @@ export default function ResourceGroupDetail({ baseUri, resourceGroupId }) {
         baseUri={baseUri}
         resourceGroupId={resourceGroupId}
       />
+      <ResourceGroupProjects
+        baseUri={baseUri}
+        resourceGroupId={resourceGroupId}
+      />
       <ResourceGroupQueueMetrics
         baseUri={baseUri}
         resourceGroupId={resourceGroupId}
diff --git a/src/resource-group-projects.css b/src/resource-group-projects.css
new file mode 100644
index 0000000..68e42e3
--- /dev/null
+++ b/src/resource-group-projects.css
@@ -0,0 +1,34 @@
+.projects-columns {
+  --chart-width: min(350px, var(--width));
+}
+.projects-columns .column {
+  align-items: center;
+  display: flex;
+  flex-direction: column;
+  margin-bottom: 20px;
+}
+.projects-columns svg {
+  height: var(--chart-width);
+  margin: 0 auto;
+  width: var(--chart-width);
+}
+.projects-columns .donut-chart .center-text {
+  font-size: 0.8rem;
+}
+@media (min-width: 768px) {
+  .projects-columns {
+    display: flex;
+    flex-direction: row;
+    --chart-width: calc((var(--width) - 120px) / 3);
+  }
+  .projects-columns .column {
+    align-items: flex-start;
+    width: var(--chart-width);
+  }
+  .projects-columns .column:not(:last-child) {
+    margin-right: 60px;
+  }
+  .projects-columns svg {
+    margin: 0;
+  }
+}
diff --git a/src/resource-group-projects.jsx b/src/resource-group-projects.jsx
new file mode 100644
index 0000000..5beddb8
--- /dev/null
+++ b/src/resource-group-projects.jsx
@@ -0,0 +1,59 @@
+import { useState } from "preact/hooks";
+import { useJSON } from "./utils";
+
+import DonutChart from "./donut-chart";
+import Section from "./section";
+
+const column = (items, title, topItemsHeading = null) => {
+  return (
+    <div class="column">
+      <DonutChart
+        items={items}
+        title={title}
+        itemLabel="projects"
+        topItemsHeading={topItemsHeading}
+      />
+    </div>
+  );
+};
+
+export default function ResourceGroupProjects({ baseUri, resourceGroupId }) {
+  const [persona, setPersona] = useState("all");
+  const data = useJSON(
+    `${baseUri}/api/resource-groups/${resourceGroupId}/projects/${persona}.json`,
+    null
+  );
+
+  if (!data || data.error) return;
+
+  const headerComponents = [
+    <select value={persona} onChange={(e) => setPersona(e.target.value)}>
+      <option value="all">All PIs</option>
+      <option value="researcher">Researchers</option>
+      <option value="educator">Educators</option>
+      <option value="grad-student">Graduate Students</option>
+    </select>,
+  ];
+
+  return (
+    <Section
+      title="Current Projects"
+      icon="pc-display"
+      headerComponents={headerComponents}
+    >
+      <div class="projects-columns">
+        {column(data.projects.projectType, "Project Type")}
+        {column(
+          data.projects.fieldOfScience,
+          "Field of Science",
+          "Top Fields of Science"
+        )}
+        {column(
+          data.projects.institution,
+          "PI's Institution",
+          "Top Institutions"
+        )}
+      </div>
+    </Section>
+  );
+}

From c3069b96061c87da40d0658a41f573873e06ca6a Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 21 Aug 2024 14:35:01 -0400
Subject: [PATCH 028/113] feat(resource-group-documentation): add list of
 documentation links

---
 .../api/resource-groups/1/documentation.json  | 12 +++++++++
 src/content.css                               |  7 ++++-
 src/donut-chart.css                           |  2 ++
 src/resource-group-detail.jsx                 |  5 ++++
 src/resource-group-documentation.jsx          | 27 +++++++++++++++++++
 5 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 public/api/resource-groups/1/documentation.json
 create mode 100644 src/resource-group-documentation.jsx

diff --git a/public/api/resource-groups/1/documentation.json b/public/api/resource-groups/1/documentation.json
new file mode 100644
index 0000000..72ea911
--- /dev/null
+++ b/public/api/resource-groups/1/documentation.json
@@ -0,0 +1,12 @@
+{
+  "documentation": [
+    {
+      "name": "Bridges-2 Home Page",
+      "documentationUri": "https://www.psc.edu/resources/bridges-2/"
+    },
+    {
+      "name": "Bridges-2 User Guide",
+      "documentationUri": "https://www.psc.edu/resources/bridges-2/user-guide/"
+    }
+  ]
+}
diff --git a/src/content.css b/src/content.css
index f77affa..e2129ca 100644
--- a/src/content.css
+++ b/src/content.css
@@ -30,11 +30,16 @@ a:hover {
   color: var(--teal-600);
   text-decoration: none;
 }
-p {
+ol,
+p,
+ul {
   font-size: 1.125rem;
   line-height: 1.875rem;
   margin: 0 0 1.25rem;
 }
+li {
+  margin-bottom: 0.5rem;
+}
 .btn {
   background-color: var(--teal-700);
   border: 4px solid var(--teal-700);
diff --git a/src/donut-chart.css b/src/donut-chart.css
index ab23e90..d66d779 100644
--- a/src/donut-chart.css
+++ b/src/donut-chart.css
@@ -25,8 +25,10 @@
   padding: 0;
 }
 .donut-chart .top-items li {
+  align-items: center;
   display: flex;
   flex-direction: row;
+  font-size: 1rem;
   margin-bottom: 5px;
 }
 .donut-chart .symbol {
diff --git a/src/resource-group-detail.jsx b/src/resource-group-detail.jsx
index 2a0a19c..62e2c7f 100644
--- a/src/resource-group-detail.jsx
+++ b/src/resource-group-detail.jsx
@@ -1,5 +1,6 @@
 import ResourceGroupAffinityGroup from "./resource-group-affinity-group";
 import ResourceGroupDescription from "./resource-group-description";
+import ResourceGroupDocumentation from "./resource-group-documentation";
 import ResourceGroupEvents from "./resource-group-events";
 import ResourceGroupProjects from "./resource-group-projects";
 import ResourceGroupQueueMetrics from "./resource-group-queue-metrics";
@@ -39,6 +40,10 @@ export default function ResourceGroupDetail({ baseUri, resourceGroupId }) {
         baseUri={baseUri}
         resourceGroupId={resourceGroupId}
       />
+      <ResourceGroupDocumentation
+        baseUri={baseUri}
+        resourceGroupId={resourceGroupId}
+      />
     </div>
   );
 }
diff --git a/src/resource-group-documentation.jsx b/src/resource-group-documentation.jsx
new file mode 100644
index 0000000..9bd5c7f
--- /dev/null
+++ b/src/resource-group-documentation.jsx
@@ -0,0 +1,27 @@
+import { useJSON } from "./utils";
+
+import Section from "./section";
+
+export default function ResourceGroupDocumentation({
+  baseUri,
+  resourceGroupId,
+}) {
+  const data = useJSON(
+    `${baseUri}/api/resource-groups/${resourceGroupId}/documentation.json`,
+    null
+  );
+
+  if (!data || data.error) return;
+
+  return (
+    <Section title="Documentation" icon="book">
+      <ul>
+        {data.documentation.map(({ name, documentationUri }) => (
+          <li>
+            <a href={documentationUri}>{name}</a>
+          </li>
+        ))}
+      </ul>
+    </Section>
+  );
+}

From 4c12099d9491b6d836f036401ae855ffc2a4a2f9 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 21 Aug 2024 14:59:22 -0400
Subject: [PATCH 029/113] feat(resource-group-discussion): add discussion
 topics component

---
 public/api/resource-groups/1/discussion.json | 25 +++++++++++
 src/resource-group-affinity-group.jsx        |  6 +--
 src/resource-group-detail.jsx                |  5 +++
 src/resource-group-discussion.jsx            | 46 ++++++++++++++++++++
 src/section.jsx                              |  2 +-
 5 files changed, 80 insertions(+), 4 deletions(-)
 create mode 100644 public/api/resource-groups/1/discussion.json
 create mode 100644 src/resource-group-discussion.jsx

diff --git a/public/api/resource-groups/1/discussion.json b/public/api/resource-groups/1/discussion.json
new file mode 100644
index 0000000..59637f5
--- /dev/null
+++ b/public/api/resource-groups/1/discussion.json
@@ -0,0 +1,25 @@
+{
+  "categoryUri": "https://ask.cyberinfrastructure.org/c/access-forums/access-bridges/78",
+  "topics": [
+    {
+      "topic": "Bridges-2 suitability for computational chemistry workloads (mainly Gaussian)?",
+      "updateDate": "2023-07-26",
+      "topicUri": "https://ask.cyberinfrastructure.org/t/bridges-2-suitability-for-computational-chemistry-workloads-mainly-gaussian/2886"
+    },
+    {
+      "topic": "How do access Bridges2 globus endpoint",
+      "updateDate": "2023-05-26",
+      "topicUri": "https://ask.cyberinfrastructure.org/t/how-do-access-bridges2-globus-endpoint/2769"
+    },
+    {
+      "topic": "AlphaFold 2 Bridges",
+      "updateDate": "2022-09-14",
+      "topicUri": "https://ask.cyberinfrastructure.org/t/alphafold-2-bridges/2493"
+    },
+    {
+      "topic": "About the ACCESS-Bridges category",
+      "updateDate": "2022-08-29",
+      "topicUri": "https://ask.cyberinfrastructure.org/t/about-the-access-bridges-category/2474"
+    }
+  ]
+}
diff --git a/src/resource-group-affinity-group.jsx b/src/resource-group-affinity-group.jsx
index 7d3e9d0..17fed2b 100644
--- a/src/resource-group-affinity-group.jsx
+++ b/src/resource-group-affinity-group.jsx
@@ -10,13 +10,13 @@ export default function ResourceGroupAffinityGroup({
         Join the community! Members get update about announcements, events, and
         outages.
       </p>
-      <a href="#" class="btn">
+      <a href="#" class="btn secondary">
         Join
       </a>
-      <a href="#" class="btn secondary">
+      <a href="#" class="btn">
         Slack
       </a>
-      <a href="#" class="btn secondary">
+      <a href="#" class="btn">
         Q&A
       </a>
     </Section>
diff --git a/src/resource-group-detail.jsx b/src/resource-group-detail.jsx
index 62e2c7f..e44daac 100644
--- a/src/resource-group-detail.jsx
+++ b/src/resource-group-detail.jsx
@@ -1,5 +1,6 @@
 import ResourceGroupAffinityGroup from "./resource-group-affinity-group";
 import ResourceGroupDescription from "./resource-group-description";
+import ResourceGroupDiscussion from "./resource-group-discussion";
 import ResourceGroupDocumentation from "./resource-group-documentation";
 import ResourceGroupEvents from "./resource-group-events";
 import ResourceGroupProjects from "./resource-group-projects";
@@ -44,6 +45,10 @@ export default function ResourceGroupDetail({ baseUri, resourceGroupId }) {
         baseUri={baseUri}
         resourceGroupId={resourceGroupId}
       />
+      <ResourceGroupDiscussion
+        baseUri={baseUri}
+        resourceGroupId={resourceGroupId}
+      />
     </div>
   );
 }
diff --git a/src/resource-group-discussion.jsx b/src/resource-group-discussion.jsx
new file mode 100644
index 0000000..c842ed1
--- /dev/null
+++ b/src/resource-group-discussion.jsx
@@ -0,0 +1,46 @@
+import { useJSON } from "./utils";
+
+import Grid from "./grid";
+import Section from "./section";
+
+export default function ResourceGroupDiscussion({ baseUri, resourceGroupId }) {
+  const data = useJSON(
+    `${baseUri}/api/resource-groups/${resourceGroupId}/discussion.json`,
+    null
+  );
+
+  if (!data || data.error) return;
+
+  const columns = [
+    {
+      key: "topic",
+      name: "Topic",
+      format: (value, row) => <a href={row.topicUri}>{value}</a>,
+    },
+    {
+      key: "updateDate",
+      name: "Last Update",
+      format: (value) =>
+        new Date(value).toLocaleString("en-US", { dateStyle: "medium" }),
+    },
+  ];
+
+  const headerComponents = [
+    <a href={data.categoryUri} class="btn secondary">
+      Ask a Question
+    </a>,
+    <a href={data.categoryUri} class="btn">
+      View All Topics
+    </a>,
+  ];
+
+  return (
+    <Section
+      title="Ask.CI Topics"
+      icon="chat-fill"
+      headerComponents={headerComponents}
+    >
+      <Grid columns={columns} rows={data.topics} />
+    </Section>
+  );
+}
diff --git a/src/section.jsx b/src/section.jsx
index fb08f3c..d762ce3 100644
--- a/src/section.jsx
+++ b/src/section.jsx
@@ -26,7 +26,7 @@ export default function Section({
           {icon ? <Icon name={icon} /> : null}
           {title}
         </h2>
-        {headerComponents}
+        <div>{headerComponents}</div>
       </div>
       {children}
     </section>

From 5c7ef8a340b44b49422216c30cce602d7c3ae13e Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 21 Aug 2024 15:01:02 -0400
Subject: [PATCH 030/113] fix(section-navigation): set font size and line
 height

---
 src/section-navigation.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/section-navigation.css b/src/section-navigation.css
index a0a2b0e..bef9c51 100644
--- a/src/section-navigation.css
+++ b/src/section-navigation.css
@@ -19,7 +19,10 @@
   padding: 10px 0;
 }
 .section-navigation li {
+  line-height: 1;
   list-style-type: none;
   flex: 0 0 auto;
+  font-size: 1rem;
   margin: 10px 0 10px 20px;
+  padding: 0;
 }

From 70ec29dc4ed40a064a4e8ea712d18c4b1d0e30a3 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 21 Aug 2024 15:05:47 -0400
Subject: [PATCH 031/113] fix(donut-chart): reset the active index when the
 items change

---
 src/donut-chart.css | 1 +
 src/donut-chart.jsx | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/donut-chart.css b/src/donut-chart.css
index d66d779..2db5f06 100644
--- a/src/donut-chart.css
+++ b/src/donut-chart.css
@@ -29,6 +29,7 @@
   display: flex;
   flex-direction: row;
   font-size: 1rem;
+  line-height: 1.2;
   margin-bottom: 5px;
 }
 .donut-chart .symbol {
diff --git a/src/donut-chart.jsx b/src/donut-chart.jsx
index 190d2ca..8a8a6ce 100644
--- a/src/donut-chart.jsx
+++ b/src/donut-chart.jsx
@@ -1,4 +1,4 @@
-import { useState } from "preact/hooks";
+import { useEffect, useState } from "preact/hooks";
 
 const circleCoords = (pct, radius) =>
   `${Math.cos(2 * Math.PI * pct) * radius} ${
@@ -55,6 +55,10 @@ export default function DonutChart({
   topItemsHeading = null,
 }) {
   const [activeIdx, setActiveIdx] = useState(null);
+
+  // Reset the active index when the items change.
+  useEffect(() => setActiveIdx(null), [items]);
+
   const sortedItems = items.toSorted((a, b) =>
     a.count < b.count || (a.count == b.count && a.name < b.name) ? 1 : -1
   );

From 8cc5bce0d9e04980b67d3ce8e7027d3a47022cb6 Mon Sep 17 00:00:00 2001
From: John-Paul Navarro <navarro@anl.gov>
Date: Thu, 29 Aug 2024 16:14:14 -0500
Subject: [PATCH 032/113] Initial CiDeR Resource Group design and sample
 information

---
 public/api/cider_README.txt           |  66 ++++++++
 public/api/cider_resource_groups.json | 223 ++++++++++++++++++++++++++
 public/api/cider_view_groups.json     |  87 ++++++++++
 3 files changed, 376 insertions(+)
 create mode 100644 public/api/cider_README.txt
 create mode 100644 public/api/cider_resource_groups.json
 create mode 100644 public/api/cider_view_groups.json

diff --git a/public/api/cider_README.txt b/public/api/cider_README.txt
new file mode 100644
index 0000000..4c8c14c
--- /dev/null
+++ b/public/api/cider_README.txt
@@ -0,0 +1,66 @@
+##
+## CiDeR Resource Groups - Introduction
+##
+
+## Background
+
+- CiDeR is used by multiple projects to maintain public descriptive information about resources (Affiliations)
+- CiDeR includes these externally visible identifiers that are globally unique across projects (Affiliations)
+  -- Resource Identifiers (info_resourceid)
+  -- Resource Group Identifiers (info_groupid)
+  -- Resource Group View Identifiers (info_groupviewid)
+
+These identifiers should be used in other database and catalogs to associate information with CiDeR resources or
+resource groups.
+
+
+## Design
+
+To make the above identifiers globally unique and meaningful (at least to developers and technical staff), we have
+chosen to make them look like DNS hostnames: they are derived from real owned domains that identifies their
+scope and guarantees that they will be unique accross projects and affiliations. These identifiers are NOT
+required to be DNS resolvable hostnames.
+
+A Resource Group is a collectios of Resources.
+
+A Resource Group View is a collections of Resource Groups that are viewed through the common interface.
+
+
+## Example
+
+The ACCESS Resource Catalog needs to display resource information organized by resource groups, where resource
+groups are made up of 1 or more tightly coupled resources.
+
+The above design would be applied to this example as follows:
+
+1) Associate all bridges2 related resources to a shared resource group
+   These resources (info_resourceid)
+    - bridges2-em.psc.access-ci.org
+    - bridges2-gpu-ai.psc.access-ci.org
+    - bridges2-gpu.psc.access-ci.org
+    - bridges2-ocean.psc.access-ci.org
+    - bridges2-rm..psc.access-ci.org
+   Would all be associated with group (info_groupid): bridges2.psc.access-ci.org
+
+2) Associate resource groups with the ACCESS Resource Catalog view
+   These resource groups (info_groupid):
+   - aces.tamu.access-ci.org
+   - bridges2.psc.access-ci.org
+   - expanse.sdsc.access-ci.org
+   - <many more groups>
+   Would all be associated with the group view (info_groupviewid): resource-catalog.access-ci.org
+   
+   
+## Persona Interfaces
+
+Resource catalog developers:
+- retrieve by API all the info_groupviewid=resource-catalog.access-ci.org associated resource groups
+- retrieve by API all CiDeR resources affiliated with ACCESS, which includes what groups each resource is in
+- retrieve other information from other resources that include either info_resourceid or info_groupid indicating
+  what resource or group the information is associated with.
+  
+ACCESS staff:
+- Define resource group views and which resoure groups are in each view
+
+Resource provider staff:
+- Associate each of their resoures with one or more resource groups
diff --git a/public/api/cider_resource_groups.json b/public/api/cider_resource_groups.json
new file mode 100644
index 0000000..380ea32
--- /dev/null
+++ b/public/api/cider_resource_groups.json
@@ -0,0 +1,223 @@
+[
+    {
+        "info_resourceid": "granite.ncsa.access-ci.org",
+        "info_groupids": [
+            "granite.ncsa.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "aces.tamu.access-ci.org",
+        "info_groupids": [
+            "aces.tamu.access-ci.org",
+        ],
+    },
+        "info_resourceid": "anton2.psc.access-ci.org",
+        "info_groupids": [
+            "anton2.psc.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "anvil-gpu.purdue.access-ci.org",
+        "info_groupids": [
+            "anvil.purdue.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "anvil.purdue.access-ci.org",
+        "info_groupids": [
+            "anvil.purdue.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "bridges2-em.psc.access-ci.org",
+        "info_groupids": [
+            "bridges2.psc.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "bridges2-gpu-ai.psc.access-ci.org",
+        "info_groupids": [
+            "bridges2.psc.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "bridges2-gpu.psc.access-ci.org",
+        "info_groupids": [
+            "bridges2.psc.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "bridges2-ocean.psc.access-ci.org",
+        "info_groupids": [
+            "bridges2.psc.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "bridges2-rm.psc.access-ci.org",
+        "info_groupids": [
+            "bridges2.psc.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "darwin-gpu.udel.access-ci.org",
+        "info_groupids": [
+            "darwin.udel.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "darwin-storage.udel.access-ci.org",
+        "info_groupids": [
+            "darwin.udel.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "darwin.udel.access-ci.org",
+        "info_groupids": [
+            "darwin.udel.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "delta-cpu.ncsa.access-ci.org",
+        "info_groupids": [
+            "delta.ncsa.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "delta-gpu.ncsa.access-ci.org",
+        "info_groupids": [
+            "delta.ncsa.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "delta-storage.ncsa.access-ci.org",
+        "info_groupids": [
+            "delta.ncsa.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "deltaai.ncsa.access-ci.org",
+        "info_groupids": [
+            "delta.ncsa.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "derecho-gpu.ncar.ucar.edu",
+        "info_groupids": [
+            "derecho.ncar.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "derecho.ncar.ucar.edu",
+        "info_groupids": [
+            "derecho.ncar.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "expanse-gpu.sdsc.access-ci.org",
+        "info_groupids": [
+            "expanse.sdsc.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "expanse-ps.sdsc.access-ci.org",
+        "info_groupids": [
+            "expanse.sdsc.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "expanse.sdsc.access-ci.org",
+        "info_groupids": [
+            "expanse.sdsc.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "faster.tamu.access-ci.org",
+        "info_groupids": [
+            "faster.tamu.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "grid1.osg.access-ci.org",
+        "info_groupids": [
+            "osg.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "hive.gatech.access-ci.org",
+        "info_groupids": [
+            "hive.gatech.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "jetstream2-gpu.indiana.access-ci.org",
+        "info_groupids": [
+            "jetstream2.indiana.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "jetstream2-lm.indiana.access-ci.org",
+        "info_groupids": [
+            "jetstream2.indiana.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "jetstream2-storage.indiana.access-ci.org",
+        "info_groupids": [
+            "jetstream2.indiana.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "jetstream2.indiana.access-ci.org",
+        "info_groupids": [
+            "jetstream2.indiana.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "kyric.uky.access-ci.org",
+        "info_groupids": [
+            "kyric.uky.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "launch.tamu.access-ci.org",
+        "info_groupids": [
+            "launch.tamu.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "neocortex-sdflex.psc.access-ci.org",
+        "info_groupids": [
+            "neocortex.psc.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "ookami.sbu.access-ci.org",
+        "info_groupids": [
+            "ookami.sbu.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "osn.osn.access-ci.org",
+        "info_groupids": [
+            "osn.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "ranch.tacc.access-ci.org",
+        "info_groupids": [
+            "ranch.tacc.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "stampede3.tacc.access-ci.org",
+        "info_groupids": [
+            "stampede3.tacc.access-ci.org",
+        ],
+    },
+    {
+        "info_resourceid": "voyager.sdsc.access-ci.org",
+        "info_groupids": [
+            "voyager.sdsc.access-ci.org",
+        ],
+    },
+]   
diff --git a/public/api/cider_view_groups.json b/public/api/cider_view_groups.json
new file mode 100644
index 0000000..1cc89de
--- /dev/null
+++ b/public/api/cider_view_groups.json
@@ -0,0 +1,87 @@
+[
+    {
+        "info_groupviewid": "resource-catalog.access-ci.org",
+        "info_groupid": "aces.tamu.access-ci.org"},
+    },
+    {
+        "info_groupviewid": "resource-catalog.access-ci.org",
+        "info_groupid": "anvil.purdue.access-ci.org"},
+    },
+    {
+        "info_groupviewid": "resource-catalog.access-ci.org",
+        "info_groupid": "bridges2.psc.access-ci.org"},
+    },
+    {
+        "info_groupviewid": "resource-catalog.access-ci.org",
+        "info_groupid": "darwin.udel.access-ci.org"},
+    },
+    {
+        "info_groupviewid": "resource-catalog.access-ci.org",
+        "info_groupid": "darwin.udel.access-ci.org"},
+    },
+    {
+        "info_groupviewid": "resource-catalog.access-ci.org",
+        "info_groupid": "delta.ncsa.access-ci.org"},
+    },
+    {
+        "info_groupviewid": "resource-catalog.access-ci.org",
+        "info_groupid": "derecho.ncar.access-ci.org"},
+    },
+    {
+        "info_groupviewid": "resource-catalog.access-ci.org",
+        "info_groupid": "expanse.sdsc.access-ci.org"},
+    },
+    {
+        "info_groupviewid": "resource-catalog.access-ci.org",
+        "info_groupid": "faster.tamu.access-ci.org"},
+    },
+    {
+        "info_groupviewid": "resource-catalog.access-ci.org",
+        "info_groupid": "granite.ncsa.access-ci.org"},
+    },
+    {
+        "info_groupviewid": "resource-catalog.access-ci.org",
+        "info_groupid": "osg.access-ci.org"},
+    },
+    {
+        "info_groupviewid": "resource-catalog.access-ci.org",
+        "info_groupid": "hive.gatech.access-ci.org"},
+    },
+    {
+        "info_groupviewid": "resource-catalog.access-ci.org",
+        "info_groupid": "jetstream2.indiana.access-ci.org"},
+    },
+    {
+        "info_groupviewid": "resource-catalog.access-ci.org",
+        "info_groupid": "kyric.uky.access-ci.org"},
+    },
+    {
+        "info_groupviewid": "resource-catalog.access-ci.org",
+        "info_groupid": "launch.tamu.access-ci.org"},
+    },
+    {
+        "info_groupviewid": "resource-catalog.access-ci.org",
+        "info_groupid": "neocortex.psc.access-ci.org"},
+    },
+    {
+        "info_groupviewid": "resource-catalog.access-ci.org",
+        "info_groupid": "ookami.sbu.access-ci.org"},
+    },
+    {
+        "info_groupviewid": "resource-catalog.access-ci.org",
+        "info_groupid": "osn.access-ci.org"},
+    },
+    {
+        "info_groupviewid": "resource-catalog.access-ci.org",
+        "info_groupid": "ranch.tacc.access-ci.org"},
+    },
+    {
+        "info_groupviewid": "resource-catalog.access-ci.org",
+        "info_groupid": "stampede3.tacc.access-ci.org"},
+    },
+    {
+        "info_groupviewid": "resource-catalog.access-ci.org",
+        "info_groupid": "voyager.sdsc.access-ci.org"},
+    },
+
+]

From ad3e9a705272f301b028af20000dfc35e3904880 Mon Sep 17 00:00:00 2001
From: John-Paul Navarro <navarro@anl.gov>
Date: Thu, 29 Aug 2024 17:01:34 -0500
Subject: [PATCH 033/113] Improve the README

---
 public/api/cider_README.txt | 55 +++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/public/api/cider_README.txt b/public/api/cider_README.txt
index 4c8c14c..56b1690 100644
--- a/public/api/cider_README.txt
+++ b/public/api/cider_README.txt
@@ -1,35 +1,34 @@
 ##
 ## CiDeR Resource Groups - Introduction
 ##
+## Background & Design
+##
 
-## Background
+CiDeR is used to maintain public descriptive information about resources by multiple projects (Affiliations)
 
-- CiDeR is used by multiple projects to maintain public descriptive information about resources (Affiliations)
-- CiDeR includes these externally visible identifiers that are globally unique across projects (Affiliations)
-  -- Resource Identifiers (info_resourceid)
-  -- Resource Group Identifiers (info_groupid)
+CiDeR includes (or will) externally visible identifiers that are globally unique across projects.
+  -- Resource Identifier (info_resourceid)
+  -- Resource Group Identifier (info_groupid)
   -- Resource Group View Identifiers (info_groupviewid)
 
-These identifiers should be used in other database and catalogs to associate information with CiDeR resources or
-resource groups.
-
-
-## Design
+So that all the information published by ACCESS can be cross-referenced these identifiers should be used in other
+database and catalogs to associate information with CiDeR resources or resource groups.
 
 To make the above identifiers globally unique and meaningful (at least to developers and technical staff), we have
-chosen to make them look like DNS hostnames: they are derived from real owned domains that identifies their
-scope and guarantees that they will be unique accross projects and affiliations. These identifiers are NOT
-required to be DNS resolvable hostnames.
+chosen to make them look like hostnames: they are derived from real owned domains which identify their scope and
+guarantees that they will be unique across projects and affiliations. These identifiers are NOT required to be
+DNS resolvable hostnames.
 
 A Resource Group is a collectios of Resources.
 
-A Resource Group View is a collections of Resource Groups that are viewed through the common interface.
-
+A Resource Group View is a collections of Resource Groups that are displayed through a common view or interface.
 
+##
 ## Example
+##
 
-The ACCESS Resource Catalog needs to display resource information organized by resource groups, where resource
-groups are made up of 1 or more tightly coupled resources.
+The ACCESS Resource Catalog efforts needs to display resource information organized by resource groups, where resource
+groups are made up of 1 or more tightly coupled resources at an RP.
 
 The above design would be applied to this example as follows:
 
@@ -50,17 +49,21 @@ The above design would be applied to this example as follows:
    - <many more groups>
    Would all be associated with the group view (info_groupviewid): resource-catalog.access-ci.org
    
-   
+##
 ## Persona Interfaces
+##
 
-Resource catalog developers:
-- retrieve by API all the info_groupviewid=resource-catalog.access-ci.org associated resource groups
-- retrieve by API all CiDeR resources affiliated with ACCESS, which includes what groups each resource is in
-- retrieve other information from other resources that include either info_resourceid or info_groupid indicating
-  what resource or group the information is associated with.
-  
 ACCESS staff:
-- Define resource group views and which resoure groups are in each view
+- Define Resource Group Views and which Resource Groups are visible through each view
+- Document and communicate Resource Groups available for RPs to select
 
 Resource provider staff:
-- Associate each of their resoures with one or more resource groups
+- Associate each of their Resources with one or more Resource Groups
+
+Resource catalog developers:
+- Retrieve by API all the Resource Groups associated with info_groupviewid = resource-catalog.access-ci.org
+- Retrieve by API all ACCESS affiliated CiDeR resources, which includes what Resource Groups each is in
+- Retrieve other information from other sources which must include either the info_resourceid or info_groupid
+  that the information is associated with.
+- Build a resource catalog wi
+  

From da9e6857a56e64b46b86dfd73525dfea837f667f Mon Sep 17 00:00:00 2001
From: John-Paul Navarro <navarro@anl.gov>
Date: Thu, 29 Aug 2024 17:02:41 -0500
Subject: [PATCH 034/113] Fix type

---
 public/api/cider_resource_groups.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/api/cider_resource_groups.json b/public/api/cider_resource_groups.json
index 380ea32..4e3b2e4 100644
--- a/public/api/cider_resource_groups.json
+++ b/public/api/cider_resource_groups.json
@@ -11,6 +11,7 @@
             "aces.tamu.access-ci.org",
         ],
     },
+    {
         "info_resourceid": "anton2.psc.access-ci.org",
         "info_groupids": [
             "anton2.psc.access-ci.org",

From 8948de8e8d45c9ef94fedde0244f0e05d7c1317b Mon Sep 17 00:00:00 2001
From: John-Paul Navarro <navarro@anl.gov>
Date: Fri, 30 Aug 2024 06:59:56 -0500
Subject: [PATCH 035/113] Improve README

---
 public/api/cider_README.txt | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/public/api/cider_README.txt b/public/api/cider_README.txt
index 56b1690..c51728a 100644
--- a/public/api/cider_README.txt
+++ b/public/api/cider_README.txt
@@ -1,28 +1,33 @@
 ##
-## CiDeR Resource Groups - Introduction
+## CiDeR Resource Groups
 ##
 ## Background & Design
 ##
 
-CiDeR is used to maintain public descriptive information about resources by multiple projects (Affiliations)
+CiDeR is used to maintain public descriptive information about resources by multiple projects (Affiliations) besides ACCESS
 
 CiDeR includes (or will) externally visible identifiers that are globally unique across projects.
-  -- Resource Identifier (info_resourceid)
-  -- Resource Group Identifier (info_groupid)
-  -- Resource Group View Identifiers (info_groupviewid)
+  - Resource Identifier (info_resourceid)
+  - Resource Group Identifier (info_groupid)
+  - Resource Group View Identifier (info_groupviewid)
 
 So that all the information published by ACCESS can be cross-referenced these identifiers should be used in other
 database and catalogs to associate information with CiDeR resources or resource groups.
 
 To make the above identifiers globally unique and meaningful (at least to developers and technical staff), we have
-chosen to make them look like hostnames: they are derived from real owned domains which identify their scope and
-guarantees that they will be unique across projects and affiliations. These identifiers are NOT required to be
-DNS resolvable hostnames.
+chosen to make them look like hostnames: they are derived from real owned domains which identifies their scope and
+guarantees that they will be unique across projects and affiliations. These identifiers do NOT have to be DNS
+DNS resolvable.
 
-A Resource Group is a collectios of Resources.
+A Resource Group is a collection of Resources.
 
 A Resource Group View is a collections of Resource Groups that are displayed through a common view or interface.
 
+This design supports any combination of resources and resource groups to be visible through multiple configurable
+views. Resource providers associate their resources with groups, and view developers associate groups with their
+views. Resource providers and view developers collaborate to define which groups are needed to achive needed
+views.
+
 ##
 ## Example
 ##
@@ -48,7 +53,7 @@ The above design would be applied to this example as follows:
    - expanse.sdsc.access-ci.org
    - <many more groups>
    Would all be associated with the group view (info_groupviewid): resource-catalog.access-ci.org
-   
+
 ##
 ## Persona Interfaces
 ##
@@ -60,10 +65,10 @@ ACCESS staff:
 Resource provider staff:
 - Associate each of their Resources with one or more Resource Groups
 
-Resource catalog developers:
-- Retrieve by API all the Resource Groups associated with info_groupviewid = resource-catalog.access-ci.org
-- Retrieve by API all ACCESS affiliated CiDeR resources, which includes what Resource Groups each is in
-- Retrieve other information from other sources which must include either the info_resourceid or info_groupid
+Resource Catalog developers:
+- Retrieve by API all the Resource Groups associated with their info_groupviewid = resource-catalog.access-ci.org
+- Retrieve by API all ACCESS affiliated CiDeR resources, each of which lists what Resource Groups they are a part of
+- Retrieve other information from other sources all of which MUST include either the info_resourceid or info_groupid
   that the information is associated with.
-- Build a resource catalog wi
-  
+- Metadata about the view could be stored somewhere by info_groupviewid
+- Build a resource catalog displaying all the resource groups and associated resources

From 35274e5965332e4c6e8202badfe808030ed1711f Mon Sep 17 00:00:00 2001
From: John-Paul Navarro <navarro@anl.gov>
Date: Fri, 30 Aug 2024 11:48:53 -0500
Subject: [PATCH 036/113] Improvements

---
 public/api/cider_README.txt       |  34 ++++++----
 public/api/cider_view_groups.json | 105 +++++++-----------------------
 2 files changed, 43 insertions(+), 96 deletions(-)

diff --git a/public/api/cider_README.txt b/public/api/cider_README.txt
index c51728a..980725d 100644
--- a/public/api/cider_README.txt
+++ b/public/api/cider_README.txt
@@ -33,26 +33,32 @@ views.
 ##
 
 The ACCESS Resource Catalog efforts needs to display resource information organized by resource groups, where resource
-groups are made up of 1 or more tightly coupled resources at an RP.
+groups are made up of 1 or more tightly coupled resources.
 
 The above design would be applied to this example as follows:
 
 1) Associate all bridges2 related resources to a shared resource group
-   These resources (info_resourceid)
-    - bridges2-em.psc.access-ci.org
-    - bridges2-gpu-ai.psc.access-ci.org
-    - bridges2-gpu.psc.access-ci.org
-    - bridges2-ocean.psc.access-ci.org
-    - bridges2-rm..psc.access-ci.org
-   Would all be associated with group (info_groupid): bridges2.psc.access-ci.org
+    These resources (info_resourceid)
+        - bridges2-em.psc.access-ci.org
+        - bridges2-gpu-ai.psc.access-ci.org
+        - bridges2-gpu.psc.access-ci.org
+        - bridges2-ocean.psc.access-ci.org
+        - bridges2-rm.psc.access-ci.org
+    Would all be associated with group (info_groupid):
+        - bridges2.psc.access-ci.org
+    
+    See an example of these mappings in the file: cider_resource_groups.json
 
 2) Associate resource groups with the ACCESS Resource Catalog view
-   These resource groups (info_groupid):
-   - aces.tamu.access-ci.org
-   - bridges2.psc.access-ci.org
-   - expanse.sdsc.access-ci.org
-   - <many more groups>
-   Would all be associated with the group view (info_groupviewid): resource-catalog.access-ci.org
+    These resource groups (info_groupid):
+        - aces.tamu.access-ci.org
+        - bridges2.psc.access-ci.org
+        - expanse.sdsc.access-ci.org
+        - <many more groups>
+   Would all be associated with the group view (info_groupviewid):
+        - resource-catalog.access-ci.org
+
+    See an example of these mappings in the file: cider_view_groups.json
 
 ##
 ## Persona Interfaces
diff --git a/public/api/cider_view_groups.json b/public/api/cider_view_groups.json
index 1cc89de..b70cea2 100644
--- a/public/api/cider_view_groups.json
+++ b/public/api/cider_view_groups.json
@@ -1,87 +1,28 @@
 [
     {
         "info_groupviewid": "resource-catalog.access-ci.org",
-        "info_groupid": "aces.tamu.access-ci.org"},
+        "info_groupids": [
+            "aces.tamu.access-ci.org",
+            "anvil.purdue.access-ci.org",
+            "bridges2.psc.access-ci.org",
+            "darwin.udel.access-ci.org",
+            "darwin.udel.access-ci.org",
+            "delta.ncsa.access-ci.org",
+            "derecho.ncar.access-ci.org",
+            "expanse.sdsc.access-ci.org",
+            "faster.tamu.access-ci.org",
+            "granite.ncsa.access-ci.org",
+            "osg.access-ci.org",
+            "hive.gatech.access-ci.org",
+            "jetstream2.indiana.access-ci.org",
+            "kyric.uky.access-ci.org",
+            "launch.tamu.access-ci.org",
+            "neocortex.psc.access-ci.org",
+            "ookami.sbu.access-ci.org",
+            "osn.access-ci.org",
+            "ranch.tacc.access-ci.org",
+            "stampede3.tacc.access-ci.org",
+            "voyager.sdsc.access-ci.org",
+        ]
     },
-    {
-        "info_groupviewid": "resource-catalog.access-ci.org",
-        "info_groupid": "anvil.purdue.access-ci.org"},
-    },
-    {
-        "info_groupviewid": "resource-catalog.access-ci.org",
-        "info_groupid": "bridges2.psc.access-ci.org"},
-    },
-    {
-        "info_groupviewid": "resource-catalog.access-ci.org",
-        "info_groupid": "darwin.udel.access-ci.org"},
-    },
-    {
-        "info_groupviewid": "resource-catalog.access-ci.org",
-        "info_groupid": "darwin.udel.access-ci.org"},
-    },
-    {
-        "info_groupviewid": "resource-catalog.access-ci.org",
-        "info_groupid": "delta.ncsa.access-ci.org"},
-    },
-    {
-        "info_groupviewid": "resource-catalog.access-ci.org",
-        "info_groupid": "derecho.ncar.access-ci.org"},
-    },
-    {
-        "info_groupviewid": "resource-catalog.access-ci.org",
-        "info_groupid": "expanse.sdsc.access-ci.org"},
-    },
-    {
-        "info_groupviewid": "resource-catalog.access-ci.org",
-        "info_groupid": "faster.tamu.access-ci.org"},
-    },
-    {
-        "info_groupviewid": "resource-catalog.access-ci.org",
-        "info_groupid": "granite.ncsa.access-ci.org"},
-    },
-    {
-        "info_groupviewid": "resource-catalog.access-ci.org",
-        "info_groupid": "osg.access-ci.org"},
-    },
-    {
-        "info_groupviewid": "resource-catalog.access-ci.org",
-        "info_groupid": "hive.gatech.access-ci.org"},
-    },
-    {
-        "info_groupviewid": "resource-catalog.access-ci.org",
-        "info_groupid": "jetstream2.indiana.access-ci.org"},
-    },
-    {
-        "info_groupviewid": "resource-catalog.access-ci.org",
-        "info_groupid": "kyric.uky.access-ci.org"},
-    },
-    {
-        "info_groupviewid": "resource-catalog.access-ci.org",
-        "info_groupid": "launch.tamu.access-ci.org"},
-    },
-    {
-        "info_groupviewid": "resource-catalog.access-ci.org",
-        "info_groupid": "neocortex.psc.access-ci.org"},
-    },
-    {
-        "info_groupviewid": "resource-catalog.access-ci.org",
-        "info_groupid": "ookami.sbu.access-ci.org"},
-    },
-    {
-        "info_groupviewid": "resource-catalog.access-ci.org",
-        "info_groupid": "osn.access-ci.org"},
-    },
-    {
-        "info_groupviewid": "resource-catalog.access-ci.org",
-        "info_groupid": "ranch.tacc.access-ci.org"},
-    },
-    {
-        "info_groupviewid": "resource-catalog.access-ci.org",
-        "info_groupid": "stampede3.tacc.access-ci.org"},
-    },
-    {
-        "info_groupviewid": "resource-catalog.access-ci.org",
-        "info_groupid": "voyager.sdsc.access-ci.org"},
-    },
-
 ]

From 9469516f9f301df2f1809ba8240d276331f03e1f Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Thu, 19 Sep 2024 17:00:36 -0400
Subject: [PATCH 037/113] refactor(resource-catalog): replace resource group ID
 with info group ID

---
 public/api/cider_resource_groups.json         | 372 +++++++-----------
 public/api/cider_view_groups.json             |  52 +--
 public/api/resource-groups.json               |   4 +-
 ...1.json => bridges2.psc.access-ci.org.json} |   0
 .../announcements.json                        |   0
 .../discussion.json                           |   0
 .../documentation.json                        |   0
 .../events.json                               |   0
 .../projects/all.json                         |   0
 .../projects/educator.json                    |   0
 .../projects/grad-student.json                |   0
 .../projects/researcher.json                  |   0
 .../queue-metrics/30.json                     |   0
 .../queue-metrics/365.json                    |   0
 .../queue-metrics/90.json                     |   0
 .../resources.json                            |   0
 .../software.json                             |   0
 ... => jetstream2.indiana.access-ci.org.json} |   0
 src/resource-catalog.jsx                      |   2 +-
 src/resource-category.jsx                     |   4 +-
 src/resource-group-affinity-group.jsx         |   5 +-
 src/resource-group-description.jsx            |   4 +-
 src/resource-group-detail.jsx                 |  47 +--
 src/resource-group-discussion.jsx             |   4 +-
 src/resource-group-documentation.jsx          |   7 +-
 src/resource-group-events.jsx                 |   6 +-
 src/resource-group-projects.jsx               |   4 +-
 src/resource-group-queue-metrics.jsx          |   7 +-
 src/resource-group-resources.jsx              |   4 +-
 src/resource-group-software.jsx               |   4 +-
 src/resource-group.jsx                        |   4 +-
 src/resource-home.jsx                         |   6 +-
 32 files changed, 212 insertions(+), 324 deletions(-)
 rename public/api/resource-groups/{1.json => bridges2.psc.access-ci.org.json} (100%)
 rename public/api/resource-groups/{1 => bridges2.psc.access-ci.org}/announcements.json (100%)
 rename public/api/resource-groups/{1 => bridges2.psc.access-ci.org}/discussion.json (100%)
 rename public/api/resource-groups/{1 => bridges2.psc.access-ci.org}/documentation.json (100%)
 rename public/api/resource-groups/{1 => bridges2.psc.access-ci.org}/events.json (100%)
 rename public/api/resource-groups/{1 => bridges2.psc.access-ci.org}/projects/all.json (100%)
 rename public/api/resource-groups/{1 => bridges2.psc.access-ci.org}/projects/educator.json (100%)
 rename public/api/resource-groups/{1 => bridges2.psc.access-ci.org}/projects/grad-student.json (100%)
 rename public/api/resource-groups/{1 => bridges2.psc.access-ci.org}/projects/researcher.json (100%)
 rename public/api/resource-groups/{1 => bridges2.psc.access-ci.org}/queue-metrics/30.json (100%)
 rename public/api/resource-groups/{1 => bridges2.psc.access-ci.org}/queue-metrics/365.json (100%)
 rename public/api/resource-groups/{1 => bridges2.psc.access-ci.org}/queue-metrics/90.json (100%)
 rename public/api/resource-groups/{1 => bridges2.psc.access-ci.org}/resources.json (100%)
 rename public/api/resource-groups/{1 => bridges2.psc.access-ci.org}/software.json (100%)
 rename public/api/resource-groups/{2.json => jetstream2.indiana.access-ci.org.json} (100%)

diff --git a/public/api/cider_resource_groups.json b/public/api/cider_resource_groups.json
index 4e3b2e4..eef0c73 100644
--- a/public/api/cider_resource_groups.json
+++ b/public/api/cider_resource_groups.json
@@ -1,224 +1,150 @@
 [
-    {
-        "info_resourceid": "granite.ncsa.access-ci.org",
-        "info_groupids": [
-            "granite.ncsa.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "aces.tamu.access-ci.org",
-        "info_groupids": [
-            "aces.tamu.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "anton2.psc.access-ci.org",
-        "info_groupids": [
-            "anton2.psc.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "anvil-gpu.purdue.access-ci.org",
-        "info_groupids": [
-            "anvil.purdue.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "anvil.purdue.access-ci.org",
-        "info_groupids": [
-            "anvil.purdue.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "bridges2-em.psc.access-ci.org",
-        "info_groupids": [
-            "bridges2.psc.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "bridges2-gpu-ai.psc.access-ci.org",
-        "info_groupids": [
-            "bridges2.psc.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "bridges2-gpu.psc.access-ci.org",
-        "info_groupids": [
-            "bridges2.psc.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "bridges2-ocean.psc.access-ci.org",
-        "info_groupids": [
-            "bridges2.psc.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "bridges2-rm.psc.access-ci.org",
-        "info_groupids": [
-            "bridges2.psc.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "darwin-gpu.udel.access-ci.org",
-        "info_groupids": [
-            "darwin.udel.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "darwin-storage.udel.access-ci.org",
-        "info_groupids": [
-            "darwin.udel.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "darwin.udel.access-ci.org",
-        "info_groupids": [
-            "darwin.udel.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "delta-cpu.ncsa.access-ci.org",
-        "info_groupids": [
-            "delta.ncsa.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "delta-gpu.ncsa.access-ci.org",
-        "info_groupids": [
-            "delta.ncsa.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "delta-storage.ncsa.access-ci.org",
-        "info_groupids": [
-            "delta.ncsa.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "deltaai.ncsa.access-ci.org",
-        "info_groupids": [
-            "delta.ncsa.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "derecho-gpu.ncar.ucar.edu",
-        "info_groupids": [
-            "derecho.ncar.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "derecho.ncar.ucar.edu",
-        "info_groupids": [
-            "derecho.ncar.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "expanse-gpu.sdsc.access-ci.org",
-        "info_groupids": [
-            "expanse.sdsc.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "expanse-ps.sdsc.access-ci.org",
-        "info_groupids": [
-            "expanse.sdsc.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "expanse.sdsc.access-ci.org",
-        "info_groupids": [
-            "expanse.sdsc.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "faster.tamu.access-ci.org",
-        "info_groupids": [
-            "faster.tamu.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "grid1.osg.access-ci.org",
-        "info_groupids": [
-            "osg.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "hive.gatech.access-ci.org",
-        "info_groupids": [
-            "hive.gatech.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "jetstream2-gpu.indiana.access-ci.org",
-        "info_groupids": [
-            "jetstream2.indiana.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "jetstream2-lm.indiana.access-ci.org",
-        "info_groupids": [
-            "jetstream2.indiana.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "jetstream2-storage.indiana.access-ci.org",
-        "info_groupids": [
-            "jetstream2.indiana.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "jetstream2.indiana.access-ci.org",
-        "info_groupids": [
-            "jetstream2.indiana.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "kyric.uky.access-ci.org",
-        "info_groupids": [
-            "kyric.uky.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "launch.tamu.access-ci.org",
-        "info_groupids": [
-            "launch.tamu.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "neocortex-sdflex.psc.access-ci.org",
-        "info_groupids": [
-            "neocortex.psc.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "ookami.sbu.access-ci.org",
-        "info_groupids": [
-            "ookami.sbu.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "osn.osn.access-ci.org",
-        "info_groupids": [
-            "osn.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "ranch.tacc.access-ci.org",
-        "info_groupids": [
-            "ranch.tacc.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "stampede3.tacc.access-ci.org",
-        "info_groupids": [
-            "stampede3.tacc.access-ci.org",
-        ],
-    },
-    {
-        "info_resourceid": "voyager.sdsc.access-ci.org",
-        "info_groupids": [
-            "voyager.sdsc.access-ci.org",
-        ],
-    },
-]   
+  {
+    "info_resourceid": "granite.ncsa.access-ci.org",
+    "info_groupids": ["granite.ncsa.access-ci.org"]
+  },
+  {
+    "info_resourceid": "aces.tamu.access-ci.org",
+    "info_groupids": ["aces.tamu.access-ci.org"]
+  },
+  {
+    "info_resourceid": "anton2.psc.access-ci.org",
+    "info_groupids": ["anton2.psc.access-ci.org"]
+  },
+  {
+    "info_resourceid": "anvil-gpu.purdue.access-ci.org",
+    "info_groupids": ["anvil.purdue.access-ci.org"]
+  },
+  {
+    "info_resourceid": "anvil.purdue.access-ci.org",
+    "info_groupids": ["anvil.purdue.access-ci.org"]
+  },
+  {
+    "info_resourceid": "bridges2-em.psc.access-ci.org",
+    "info_groupids": ["bridges2.psc.access-ci.org"]
+  },
+  {
+    "info_resourceid": "bridges2-gpu-ai.psc.access-ci.org",
+    "info_groupids": ["bridges2.psc.access-ci.org"]
+  },
+  {
+    "info_resourceid": "bridges2-gpu.psc.access-ci.org",
+    "info_groupids": ["bridges2.psc.access-ci.org"]
+  },
+  {
+    "info_resourceid": "bridges2-ocean.psc.access-ci.org",
+    "info_groupids": ["bridges2.psc.access-ci.org"]
+  },
+  {
+    "info_resourceid": "bridges2-rm.psc.access-ci.org",
+    "info_groupids": ["bridges2.psc.access-ci.org"]
+  },
+  {
+    "info_resourceid": "darwin-gpu.udel.access-ci.org",
+    "info_groupids": ["darwin.udel.access-ci.org"]
+  },
+  {
+    "info_resourceid": "darwin-storage.udel.access-ci.org",
+    "info_groupids": ["darwin.udel.access-ci.org"]
+  },
+  {
+    "info_resourceid": "darwin.udel.access-ci.org",
+    "info_groupids": ["darwin.udel.access-ci.org"]
+  },
+  {
+    "info_resourceid": "delta-cpu.ncsa.access-ci.org",
+    "info_groupids": ["delta.ncsa.access-ci.org"]
+  },
+  {
+    "info_resourceid": "delta-gpu.ncsa.access-ci.org",
+    "info_groupids": ["delta.ncsa.access-ci.org"]
+  },
+  {
+    "info_resourceid": "delta-storage.ncsa.access-ci.org",
+    "info_groupids": ["delta.ncsa.access-ci.org"]
+  },
+  {
+    "info_resourceid": "deltaai.ncsa.access-ci.org",
+    "info_groupids": ["delta.ncsa.access-ci.org"]
+  },
+  {
+    "info_resourceid": "derecho-gpu.ncar.ucar.edu",
+    "info_groupids": ["derecho.ncar.access-ci.org"]
+  },
+  {
+    "info_resourceid": "derecho.ncar.ucar.edu",
+    "info_groupids": ["derecho.ncar.access-ci.org"]
+  },
+  {
+    "info_resourceid": "expanse-gpu.sdsc.access-ci.org",
+    "info_groupids": ["expanse.sdsc.access-ci.org"]
+  },
+  {
+    "info_resourceid": "expanse-ps.sdsc.access-ci.org",
+    "info_groupids": ["expanse.sdsc.access-ci.org"]
+  },
+  {
+    "info_resourceid": "expanse.sdsc.access-ci.org",
+    "info_groupids": ["expanse.sdsc.access-ci.org"]
+  },
+  {
+    "info_resourceid": "faster.tamu.access-ci.org",
+    "info_groupids": ["faster.tamu.access-ci.org"]
+  },
+  {
+    "info_resourceid": "grid1.osg.access-ci.org",
+    "info_groupids": ["osg.access-ci.org"]
+  },
+  {
+    "info_resourceid": "hive.gatech.access-ci.org",
+    "info_groupids": ["hive.gatech.access-ci.org"]
+  },
+  {
+    "info_resourceid": "jetstream2-gpu.indiana.access-ci.org",
+    "info_groupids": ["jetstream2.indiana.access-ci.org"]
+  },
+  {
+    "info_resourceid": "jetstream2-lm.indiana.access-ci.org",
+    "info_groupids": ["jetstream2.indiana.access-ci.org"]
+  },
+  {
+    "info_resourceid": "jetstream2-storage.indiana.access-ci.org",
+    "info_groupids": ["jetstream2.indiana.access-ci.org"]
+  },
+  {
+    "info_resourceid": "jetstream2.indiana.access-ci.org",
+    "info_groupids": ["jetstream2.indiana.access-ci.org"]
+  },
+  {
+    "info_resourceid": "kyric.uky.access-ci.org",
+    "info_groupids": ["kyric.uky.access-ci.org"]
+  },
+  {
+    "info_resourceid": "launch.tamu.access-ci.org",
+    "info_groupids": ["launch.tamu.access-ci.org"]
+  },
+  {
+    "info_resourceid": "neocortex-sdflex.psc.access-ci.org",
+    "info_groupids": ["neocortex.psc.access-ci.org"]
+  },
+  {
+    "info_resourceid": "ookami.sbu.access-ci.org",
+    "info_groupids": ["ookami.sbu.access-ci.org"]
+  },
+  {
+    "info_resourceid": "osn.osn.access-ci.org",
+    "info_groupids": ["osn.access-ci.org"]
+  },
+  {
+    "info_resourceid": "ranch.tacc.access-ci.org",
+    "info_groupids": ["ranch.tacc.access-ci.org"]
+  },
+  {
+    "info_resourceid": "stampede3.tacc.access-ci.org",
+    "info_groupids": ["stampede3.tacc.access-ci.org"]
+  },
+  {
+    "info_resourceid": "voyager.sdsc.access-ci.org",
+    "info_groupids": ["voyager.sdsc.access-ci.org"]
+  }
+]
diff --git a/public/api/cider_view_groups.json b/public/api/cider_view_groups.json
index b70cea2..c977015 100644
--- a/public/api/cider_view_groups.json
+++ b/public/api/cider_view_groups.json
@@ -1,28 +1,28 @@
 [
-    {
-        "info_groupviewid": "resource-catalog.access-ci.org",
-        "info_groupids": [
-            "aces.tamu.access-ci.org",
-            "anvil.purdue.access-ci.org",
-            "bridges2.psc.access-ci.org",
-            "darwin.udel.access-ci.org",
-            "darwin.udel.access-ci.org",
-            "delta.ncsa.access-ci.org",
-            "derecho.ncar.access-ci.org",
-            "expanse.sdsc.access-ci.org",
-            "faster.tamu.access-ci.org",
-            "granite.ncsa.access-ci.org",
-            "osg.access-ci.org",
-            "hive.gatech.access-ci.org",
-            "jetstream2.indiana.access-ci.org",
-            "kyric.uky.access-ci.org",
-            "launch.tamu.access-ci.org",
-            "neocortex.psc.access-ci.org",
-            "ookami.sbu.access-ci.org",
-            "osn.access-ci.org",
-            "ranch.tacc.access-ci.org",
-            "stampede3.tacc.access-ci.org",
-            "voyager.sdsc.access-ci.org",
-        ]
-    },
+  {
+    "info_groupviewid": "resource-catalog.access-ci.org",
+    "info_groupids": [
+      "aces.tamu.access-ci.org",
+      "anvil.purdue.access-ci.org",
+      "bridges2.psc.access-ci.org",
+      "darwin.udel.access-ci.org",
+      "darwin.udel.access-ci.org",
+      "delta.ncsa.access-ci.org",
+      "derecho.ncar.access-ci.org",
+      "expanse.sdsc.access-ci.org",
+      "faster.tamu.access-ci.org",
+      "granite.ncsa.access-ci.org",
+      "osg.access-ci.org",
+      "hive.gatech.access-ci.org",
+      "jetstream2.indiana.access-ci.org",
+      "kyric.uky.access-ci.org",
+      "launch.tamu.access-ci.org",
+      "neocortex.psc.access-ci.org",
+      "ookami.sbu.access-ci.org",
+      "osn.access-ci.org",
+      "ranch.tacc.access-ci.org",
+      "stampede3.tacc.access-ci.org",
+      "voyager.sdsc.access-ci.org"
+    ]
+  }
 ]
diff --git a/public/api/resource-groups.json b/public/api/resource-groups.json
index 124d811..cedb081 100644
--- a/public/api/resource-groups.json
+++ b/public/api/resource-groups.json
@@ -14,7 +14,7 @@
   ],
   "resourceGroups": [
     {
-      "resourceGroupId": 1,
+      "infoGroupId": "bridges2.psc.access-ci.org",
       "name": "Bridges-2",
       "summary": "Bridges-2 is an integrated compute and storage platform that combines traditional high-performance computing with artificial intelligence and big data capabilities.",
       "imageType": "photo",
@@ -23,7 +23,7 @@
       "tagIds": [1, 3, 4, 5, 6]
     },
     {
-      "resourceGroupId": 2,
+      "infoGroupId": "jetstream2.indiana.access-ci.org",
       "name": "Jetstream2",
       "summary": "Jetstream2 is a hybrid-cloud platform that provides flexible, on-demand, programmable cyberinfrastructure, including interactive virtual machine services.",
       "imageType": "logo",
diff --git a/public/api/resource-groups/1.json b/public/api/resource-groups/bridges2.psc.access-ci.org.json
similarity index 100%
rename from public/api/resource-groups/1.json
rename to public/api/resource-groups/bridges2.psc.access-ci.org.json
diff --git a/public/api/resource-groups/1/announcements.json b/public/api/resource-groups/bridges2.psc.access-ci.org/announcements.json
similarity index 100%
rename from public/api/resource-groups/1/announcements.json
rename to public/api/resource-groups/bridges2.psc.access-ci.org/announcements.json
diff --git a/public/api/resource-groups/1/discussion.json b/public/api/resource-groups/bridges2.psc.access-ci.org/discussion.json
similarity index 100%
rename from public/api/resource-groups/1/discussion.json
rename to public/api/resource-groups/bridges2.psc.access-ci.org/discussion.json
diff --git a/public/api/resource-groups/1/documentation.json b/public/api/resource-groups/bridges2.psc.access-ci.org/documentation.json
similarity index 100%
rename from public/api/resource-groups/1/documentation.json
rename to public/api/resource-groups/bridges2.psc.access-ci.org/documentation.json
diff --git a/public/api/resource-groups/1/events.json b/public/api/resource-groups/bridges2.psc.access-ci.org/events.json
similarity index 100%
rename from public/api/resource-groups/1/events.json
rename to public/api/resource-groups/bridges2.psc.access-ci.org/events.json
diff --git a/public/api/resource-groups/1/projects/all.json b/public/api/resource-groups/bridges2.psc.access-ci.org/projects/all.json
similarity index 100%
rename from public/api/resource-groups/1/projects/all.json
rename to public/api/resource-groups/bridges2.psc.access-ci.org/projects/all.json
diff --git a/public/api/resource-groups/1/projects/educator.json b/public/api/resource-groups/bridges2.psc.access-ci.org/projects/educator.json
similarity index 100%
rename from public/api/resource-groups/1/projects/educator.json
rename to public/api/resource-groups/bridges2.psc.access-ci.org/projects/educator.json
diff --git a/public/api/resource-groups/1/projects/grad-student.json b/public/api/resource-groups/bridges2.psc.access-ci.org/projects/grad-student.json
similarity index 100%
rename from public/api/resource-groups/1/projects/grad-student.json
rename to public/api/resource-groups/bridges2.psc.access-ci.org/projects/grad-student.json
diff --git a/public/api/resource-groups/1/projects/researcher.json b/public/api/resource-groups/bridges2.psc.access-ci.org/projects/researcher.json
similarity index 100%
rename from public/api/resource-groups/1/projects/researcher.json
rename to public/api/resource-groups/bridges2.psc.access-ci.org/projects/researcher.json
diff --git a/public/api/resource-groups/1/queue-metrics/30.json b/public/api/resource-groups/bridges2.psc.access-ci.org/queue-metrics/30.json
similarity index 100%
rename from public/api/resource-groups/1/queue-metrics/30.json
rename to public/api/resource-groups/bridges2.psc.access-ci.org/queue-metrics/30.json
diff --git a/public/api/resource-groups/1/queue-metrics/365.json b/public/api/resource-groups/bridges2.psc.access-ci.org/queue-metrics/365.json
similarity index 100%
rename from public/api/resource-groups/1/queue-metrics/365.json
rename to public/api/resource-groups/bridges2.psc.access-ci.org/queue-metrics/365.json
diff --git a/public/api/resource-groups/1/queue-metrics/90.json b/public/api/resource-groups/bridges2.psc.access-ci.org/queue-metrics/90.json
similarity index 100%
rename from public/api/resource-groups/1/queue-metrics/90.json
rename to public/api/resource-groups/bridges2.psc.access-ci.org/queue-metrics/90.json
diff --git a/public/api/resource-groups/1/resources.json b/public/api/resource-groups/bridges2.psc.access-ci.org/resources.json
similarity index 100%
rename from public/api/resource-groups/1/resources.json
rename to public/api/resource-groups/bridges2.psc.access-ci.org/resources.json
diff --git a/public/api/resource-groups/1/software.json b/public/api/resource-groups/bridges2.psc.access-ci.org/software.json
similarity index 100%
rename from public/api/resource-groups/1/software.json
rename to public/api/resource-groups/bridges2.psc.access-ci.org/software.json
diff --git a/public/api/resource-groups/2.json b/public/api/resource-groups/jetstream2.indiana.access-ci.org.json
similarity index 100%
rename from public/api/resource-groups/2.json
rename to public/api/resource-groups/jetstream2.indiana.access-ci.org.json
diff --git a/src/resource-catalog.jsx b/src/resource-catalog.jsx
index 1341277..18c32f6 100644
--- a/src/resource-catalog.jsx
+++ b/src/resource-catalog.jsx
@@ -45,7 +45,7 @@ export function ResourceCatalog({
             />
             <ResourceGroupDetail
               baseUri={baseUri}
-              path={`${baseUri}/resources/:resourceGroupId`}
+              path={`${baseUri}/resources/:infoGroupId`}
             />
           </Router>
         </ErrorBoundary>
diff --git a/src/resource-category.jsx b/src/resource-category.jsx
index 582c1d5..81771ee 100644
--- a/src/resource-category.jsx
+++ b/src/resource-category.jsx
@@ -11,9 +11,7 @@ export function ResourceCategory({
     <>
       <h2>{name}</h2>
       {resourceGroups
-        .filter(({ resourceGroupId }) =>
-          active.resourceGroupIds.has(resourceGroupId)
-        )
+        .filter(({ infoGroupId }) => active.infoGroupIds.has(infoGroupId))
         .map((resourceGroup) => (
           <ResourceGroup
             {...resourceGroup}
diff --git a/src/resource-group-affinity-group.jsx b/src/resource-group-affinity-group.jsx
index 17fed2b..d386637 100644
--- a/src/resource-group-affinity-group.jsx
+++ b/src/resource-group-affinity-group.jsx
@@ -1,9 +1,6 @@
 import Section from "./section";
 
-export default function ResourceGroupAffinityGroup({
-  baseUri,
-  resourceGroupId,
-}) {
+export default function ResourceGroupAffinityGroup({ baseUri, infoGroupId }) {
   return (
     <Section title="Affinity Group" icon="people-fill">
       <p>
diff --git a/src/resource-group-description.jsx b/src/resource-group-description.jsx
index eae321f..bc3189e 100644
--- a/src/resource-group-description.jsx
+++ b/src/resource-group-description.jsx
@@ -2,9 +2,9 @@ import { useJSON } from "./utils";
 
 import Icon from "./icon";
 
-export default function ResourceGroupDescription({ baseUri, resourceGroupId }) {
+export default function ResourceGroupDescription({ baseUri, infoGroupId }) {
   const data = useJSON(
-    `${baseUri}/api/resource-groups/${resourceGroupId}.json`,
+    `${baseUri}/api/resource-groups/${infoGroupId}.json`,
     null
   );
   if (!data) return;
diff --git a/src/resource-group-detail.jsx b/src/resource-group-detail.jsx
index e44daac..9d01433 100644
--- a/src/resource-group-detail.jsx
+++ b/src/resource-group-detail.jsx
@@ -9,46 +9,19 @@ import ResourceGroupResources from "./resource-group-resources";
 import ResourceGroupSoftware from "./resource-group-software";
 import SectionNavigation from "./section-navigation";
 
-export default function ResourceGroupDetail({ baseUri, resourceGroupId }) {
+export default function ResourceGroupDetail({ baseUri, infoGroupId }) {
   return (
     <div class="resource-group-detail">
-      <ResourceGroupDescription
-        baseUri={baseUri}
-        resourceGroupId={resourceGroupId}
-      />
+      <ResourceGroupDescription baseUri={baseUri} infoGroupId={infoGroupId} />
       <SectionNavigation />
-      <ResourceGroupResources
-        baseUri={baseUri}
-        resourceGroupId={resourceGroupId}
-      />
-      <ResourceGroupEvents
-        baseUri={baseUri}
-        resourceGroupId={resourceGroupId}
-      />
-      <ResourceGroupAffinityGroup
-        baseUri={baseUri}
-        resourceGroupId={resourceGroupId}
-      />
-      <ResourceGroupSoftware
-        baseUri={baseUri}
-        resourceGroupId={resourceGroupId}
-      />
-      <ResourceGroupProjects
-        baseUri={baseUri}
-        resourceGroupId={resourceGroupId}
-      />
-      <ResourceGroupQueueMetrics
-        baseUri={baseUri}
-        resourceGroupId={resourceGroupId}
-      />
-      <ResourceGroupDocumentation
-        baseUri={baseUri}
-        resourceGroupId={resourceGroupId}
-      />
-      <ResourceGroupDiscussion
-        baseUri={baseUri}
-        resourceGroupId={resourceGroupId}
-      />
+      <ResourceGroupResources baseUri={baseUri} infoGroupId={infoGroupId} />
+      <ResourceGroupEvents baseUri={baseUri} infoGroupId={infoGroupId} />
+      <ResourceGroupAffinityGroup baseUri={baseUri} infoGroupId={infoGroupId} />
+      <ResourceGroupSoftware baseUri={baseUri} infoGroupId={infoGroupId} />
+      <ResourceGroupProjects baseUri={baseUri} infoGroupId={infoGroupId} />
+      <ResourceGroupQueueMetrics baseUri={baseUri} infoGroupId={infoGroupId} />
+      <ResourceGroupDocumentation baseUri={baseUri} infoGroupId={infoGroupId} />
+      <ResourceGroupDiscussion baseUri={baseUri} infoGroupId={infoGroupId} />
     </div>
   );
 }
diff --git a/src/resource-group-discussion.jsx b/src/resource-group-discussion.jsx
index c842ed1..cb485e8 100644
--- a/src/resource-group-discussion.jsx
+++ b/src/resource-group-discussion.jsx
@@ -3,9 +3,9 @@ import { useJSON } from "./utils";
 import Grid from "./grid";
 import Section from "./section";
 
-export default function ResourceGroupDiscussion({ baseUri, resourceGroupId }) {
+export default function ResourceGroupDiscussion({ baseUri, infoGroupId }) {
   const data = useJSON(
-    `${baseUri}/api/resource-groups/${resourceGroupId}/discussion.json`,
+    `${baseUri}/api/resource-groups/${infoGroupId}/discussion.json`,
     null
   );
 
diff --git a/src/resource-group-documentation.jsx b/src/resource-group-documentation.jsx
index 9bd5c7f..6a566d7 100644
--- a/src/resource-group-documentation.jsx
+++ b/src/resource-group-documentation.jsx
@@ -2,12 +2,9 @@ import { useJSON } from "./utils";
 
 import Section from "./section";
 
-export default function ResourceGroupDocumentation({
-  baseUri,
-  resourceGroupId,
-}) {
+export default function ResourceGroupDocumentation({ baseUri, infoGroupId }) {
   const data = useJSON(
-    `${baseUri}/api/resource-groups/${resourceGroupId}/documentation.json`,
+    `${baseUri}/api/resource-groups/${infoGroupId}/documentation.json`,
     null
   );
 
diff --git a/src/resource-group-events.jsx b/src/resource-group-events.jsx
index b8c3aa7..9151a06 100644
--- a/src/resource-group-events.jsx
+++ b/src/resource-group-events.jsx
@@ -4,13 +4,13 @@ import Alert from "./alert";
 import ResourceGroupEvent from "./resource-group-event";
 import Section from "./section";
 
-export default function ResourceGroupEvents({ baseUri, resourceGroupId }) {
+export default function ResourceGroupEvents({ baseUri, infoGroupId }) {
   const announcementData = useJSON(
-    `${baseUri}/api/resource-groups/${resourceGroupId}/announcements.json`,
+    `${baseUri}/api/resource-groups/${infoGroupId}/announcements.json`,
     null
   );
   const eventData = useJSON(
-    `${baseUri}/api/resource-groups/${resourceGroupId}/events.json`,
+    `${baseUri}/api/resource-groups/${infoGroupId}/events.json`,
     null
   );
   if (!announcementData && !eventData) return;
diff --git a/src/resource-group-projects.jsx b/src/resource-group-projects.jsx
index 5beddb8..6d60a9c 100644
--- a/src/resource-group-projects.jsx
+++ b/src/resource-group-projects.jsx
@@ -17,10 +17,10 @@ const column = (items, title, topItemsHeading = null) => {
   );
 };
 
-export default function ResourceGroupProjects({ baseUri, resourceGroupId }) {
+export default function ResourceGroupProjects({ baseUri, infoGroupId }) {
   const [persona, setPersona] = useState("all");
   const data = useJSON(
-    `${baseUri}/api/resource-groups/${resourceGroupId}/projects/${persona}.json`,
+    `${baseUri}/api/resource-groups/${infoGroupId}/projects/${persona}.json`,
     null
   );
 
diff --git a/src/resource-group-queue-metrics.jsx b/src/resource-group-queue-metrics.jsx
index c9a04c2..28adb65 100644
--- a/src/resource-group-queue-metrics.jsx
+++ b/src/resource-group-queue-metrics.jsx
@@ -22,13 +22,10 @@ const formatHeaderTip = (content) => (value) => {
   );
 };
 
-export default function ResourceGroupQueueMetrics({
-  baseUri,
-  resourceGroupId,
-}) {
+export default function ResourceGroupQueueMetrics({ baseUri, infoGroupId }) {
   const [days, setDays] = useState(30);
   const data = useJSON(
-    `${baseUri}/api/resource-groups/${resourceGroupId}/queue-metrics/${days}.json`,
+    `${baseUri}/api/resource-groups/${infoGroupId}/queue-metrics/${days}.json`,
     null
   );
   if (!data || data.error) return;
diff --git a/src/resource-group-resources.jsx b/src/resource-group-resources.jsx
index ac50e37..4ec2647 100644
--- a/src/resource-group-resources.jsx
+++ b/src/resource-group-resources.jsx
@@ -22,9 +22,9 @@ const linkResourceData = ({ resources, resourceTypes }) => {
   return { resources, resourceTypes };
 };
 
-export default function ResourceGroupResources({ baseUri, resourceGroupId }) {
+export default function ResourceGroupResources({ baseUri, infoGroupId }) {
   const allTypes = useJSON(
-    `${baseUri}/api/resource-groups/${resourceGroupId}/resources.json`,
+    `${baseUri}/api/resource-groups/${infoGroupId}/resources.json`,
     null
   );
   const types = useMemo(
diff --git a/src/resource-group-software.jsx b/src/resource-group-software.jsx
index 6cee42c..79b7845 100644
--- a/src/resource-group-software.jsx
+++ b/src/resource-group-software.jsx
@@ -7,9 +7,9 @@ import Highlight from "./highlight";
 import Search from "./search";
 import Section from "./section";
 
-export default function ResourceGroupSoftware({ baseUri, resourceGroupId }) {
+export default function ResourceGroupSoftware({ baseUri, infoGroupId }) {
   const data = useJSON(
-    `${baseUri}/api/resource-groups/${resourceGroupId}/software.json`,
+    `${baseUri}/api/resource-groups/${infoGroupId}/software.json`,
     null
   );
   const [searchText, setSearchText] = useState("");
diff --git a/src/resource-group.jsx b/src/resource-group.jsx
index cc3da0c..4687be9 100644
--- a/src/resource-group.jsx
+++ b/src/resource-group.jsx
@@ -8,11 +8,11 @@ export function ResourceGroup({
   imageUri,
   name,
   summary,
-  resourceGroupId,
+  infoGroupId,
   tags,
   toggleTag,
 }) {
-  const detailUri = `${baseUri}/resources/${resourceGroupId}`;
+  const detailUri = `${baseUri}/resources/${infoGroupId}`;
   return (
     <div class="resource-group">
       <a
diff --git a/src/resource-home.jsx b/src/resource-home.jsx
index 2d094ab..a37b109 100644
--- a/src/resource-home.jsx
+++ b/src/resource-home.jsx
@@ -43,7 +43,7 @@ const linkGroupData = ({
 
 const getActive = ({ resourceGroups, tags, tagCategories }, activeTagIds) => {
   const resourceCategoryIds = new Set();
-  const resourceGroupIds = new Set();
+  const infoGroupIds = new Set();
   const tagCategoryIds = new Set();
   const tagIds = new Set(activeTagIds);
 
@@ -81,7 +81,7 @@ const getActive = ({ resourceGroups, tags, tagCategories }, activeTagIds) => {
       }
     }
     if (resourceGroupActive) {
-      resourceGroupIds.add(resourceGroup.resourceGroupId);
+      infoGroupIds.add(resourceGroup.infoGroupId);
       resourceCategoryIds.add(resourceGroup.resourceCategoryId);
       for (let tagId of resourceGroup.tagIds) disabledTagIds.delete(tagId);
     }
@@ -90,7 +90,7 @@ const getActive = ({ resourceGroups, tags, tagCategories }, activeTagIds) => {
   return {
     disabledTagIds,
     resourceCategoryIds,
-    resourceGroupIds,
+    infoGroupIds,
     tagCategoryIds,
     tagIds,
   };

From fec69cd34f32eb22076b9d190b2fc8c01bc36edb Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Fri, 20 Sep 2024 09:24:19 -0400
Subject: [PATCH 038/113] build: update Vite to fix dev server reload

---
 package-lock.json | 4215 ++++++++++-----------------------------------
 package.json      |    8 +-
 2 files changed, 951 insertions(+), 3272 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4692a4b..ae8fc24 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,81 +11,74 @@
       "dependencies": {
         "@glidejs/glide": "^3.6.1",
         "fuse.js": "^7.0.0",
-        "preact": "^10.13.1",
+        "preact": "^10.23.1",
         "preact-iso": "^2.6.3",
         "tippy.js": "^6.3.7"
       },
       "devDependencies": {
-        "@preact/preset-vite": "^2.5.0",
-        "eslint": "^8.46.0",
-        "eslint-config-preact": "^1.3.0",
-        "vite": "^4.3.2"
-      }
-    },
-    "node_modules/@aashutoshrathi/word-wrap": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
-      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
+        "@preact/preset-vite": "^2.9.0",
+        "vite": "^5.4.1"
       }
     },
     "node_modules/@ampproject/remapping": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
-      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.0",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
       },
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.10.tgz",
-      "integrity": "sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
+      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/highlight": "^7.22.10",
-        "chalk": "^2.4.2"
+        "@babel/highlight": "^7.24.7",
+        "picocolors": "^1.0.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz",
-      "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==",
+      "version": "7.25.4",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz",
+      "integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz",
-      "integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
+      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.22.10",
-        "@babel/generator": "^7.22.10",
-        "@babel/helper-compilation-targets": "^7.22.10",
-        "@babel/helper-module-transforms": "^7.22.9",
-        "@babel/helpers": "^7.22.10",
-        "@babel/parser": "^7.22.10",
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.10",
-        "@babel/types": "^7.22.10",
-        "convert-source-map": "^1.7.0",
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.25.0",
+        "@babel/helper-compilation-targets": "^7.25.2",
+        "@babel/helper-module-transforms": "^7.25.2",
+        "@babel/helpers": "^7.25.0",
+        "@babel/parser": "^7.25.0",
+        "@babel/template": "^7.25.0",
+        "@babel/traverse": "^7.25.2",
+        "@babel/types": "^7.25.2",
+        "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.2",
+        "json5": "^2.2.3",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -96,42 +89,16 @@
         "url": "https://opencollective.com/babel"
       }
     },
-    "node_modules/@babel/eslint-parser": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.22.10.tgz",
-      "integrity": "sha512-0J8DNPRXQRLeR9rPaUMM3fA+RbixjnVLe/MRMYCkp3hzgsSuxCHQ8NN8xQG1wIHKJ4a1DTROTvFJdW+B5/eOsg==",
-      "dev": true,
-      "dependencies": {
-        "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
-        "eslint-visitor-keys": "^2.1.0",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": "^10.13.0 || ^12.13.0 || >=14.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.11.0",
-        "eslint": "^7.5.0 || ^8.0.0"
-      }
-    },
-    "node_modules/@babel/eslint-parser/node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@babel/generator": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz",
-      "integrity": "sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==",
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz",
+      "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.10",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "@jridgewell/trace-mapping": "^0.3.17",
+        "@babel/types": "^7.25.6",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^2.5.1"
       },
       "engines": {
@@ -139,26 +106,28 @@
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
-      "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
+      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz",
-      "integrity": "sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz",
+      "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.22.9",
-        "@babel/helper-validator-option": "^7.22.5",
-        "browserslist": "^4.21.9",
+        "@babel/compat-data": "^7.25.2",
+        "@babel/helper-validator-option": "^7.24.8",
+        "browserslist": "^4.23.1",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
       },
@@ -166,63 +135,31 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
-      "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-function-name": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
-      "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.22.5",
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
-      "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
+      "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz",
-      "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz",
+      "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-module-imports": "^7.22.5",
-        "@babel/helper-simple-access": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.5"
+        "@babel/helper-module-imports": "^7.24.7",
+        "@babel/helper-simple-access": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.24.7",
+        "@babel/traverse": "^7.25.2"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -232,98 +169,98 @@
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
-      "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz",
+      "integrity": "sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-simple-access": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
-      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
+      "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
-      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
+      "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
-      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
+      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
-      "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==",
+      "version": "7.24.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz",
+      "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.10.tgz",
-      "integrity": "sha512-a41J4NW8HyZa1I1vAndrraTlPZ/eZoga2ZgS7fEr0tZJGVU4xqdE80CEm0CcNjha5EZ8fTBYLKHF0kqDUuAwQw==",
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz",
+      "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.10",
-        "@babel/types": "^7.22.10"
+        "@babel/template": "^7.25.0",
+        "@babel/types": "^7.25.6"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.10.tgz",
-      "integrity": "sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
+      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.24.7",
         "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0"
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.0.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.10.tgz",
-      "integrity": "sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ==",
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz",
+      "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.25.6"
+      },
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -331,40 +268,14 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/@babel/plugin-syntax-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-syntax-decorators": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.22.10.tgz",
-      "integrity": "sha512-z1KTVemBjnz+kSEilAsI4lbkPOl5TvJH7YDSY1CTIzvLWJ+KHXp+mRe8VPmfnyvqOPqar1V2gid2PleKzRUstQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz",
-      "integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz",
+      "integrity": "sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -374,16 +285,17 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.22.5.tgz",
-      "integrity": "sha512-rog5gZaVbUip5iWDMTYbVM15XQq+RkUKhET/IHR6oizR+JEoN6CAfTTuHcK4vwUyzca30qqHqEpzBOnaRMWYMA==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.2.tgz",
+      "integrity": "sha512-KQsqEAVBpU82NM/B/N9j9WOdphom1SZH3R+2V7INrQUH+V9EBFwZsEJl8eBIVeQE62FxJCc70jzEZwqU7RcVqA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-module-imports": "^7.22.5",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/plugin-syntax-jsx": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/helper-annotate-as-pure": "^7.24.7",
+        "@babel/helper-module-imports": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.8",
+        "@babel/plugin-syntax-jsx": "^7.24.7",
+        "@babel/types": "^7.25.2"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -393,12 +305,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-react-jsx-development": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.22.5.tgz",
-      "integrity": "sha512-bDhuzwWMuInwCYeDeMzyi7TaBgRQei6DqxhbyniL7/VG4RSS7HtSL2QbY4eESy1KJqlWt8g3xeEBGPuo+XqC8A==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.24.7.tgz",
+      "integrity": "sha512-QG9EnzoGn+Qar7rxuW+ZOsbWOt56FvvI93xInqsZDC5fsekx1AlIO4KIJ5M+D0p0SqSH156EpmZyXq630B8OlQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/plugin-transform-react-jsx": "^7.22.5"
+        "@babel/plugin-transform-react-jsx": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -408,34 +321,33 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
-      "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz",
+      "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.22.5",
-        "@babel/parser": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/code-frame": "^7.24.7",
+        "@babel/parser": "^7.25.0",
+        "@babel/types": "^7.25.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz",
-      "integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==",
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz",
+      "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.22.10",
-        "@babel/generator": "^7.22.10",
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-function-name": "^7.22.5",
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.22.10",
-        "@babel/types": "^7.22.10",
-        "debug": "^4.1.0",
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.25.6",
+        "@babel/parser": "^7.25.6",
+        "@babel/template": "^7.25.0",
+        "@babel/types": "^7.25.6",
+        "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -443,27 +355,46 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz",
-      "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==",
+      "version": "7.25.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz",
+      "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.5",
+        "@babel/helper-string-parser": "^7.24.8",
+        "@babel/helper-validator-identifier": "^7.24.7",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz",
-      "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -473,13 +404,14 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz",
-      "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -489,13 +421,14 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz",
-      "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
@@ -505,13 +438,14 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz",
-      "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -521,13 +455,14 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz",
-      "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
@@ -537,13 +472,14 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz",
-      "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
@@ -553,13 +489,14 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz",
-      "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
@@ -569,13 +506,14 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz",
-      "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
       "cpu": [
         "arm"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -585,13 +523,14 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz",
-      "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -601,13 +540,14 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz",
-      "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
       "cpu": [
         "ia32"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -617,13 +557,14 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz",
-      "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
       "cpu": [
         "loong64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -633,13 +574,14 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz",
-      "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
       "cpu": [
         "mips64el"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -649,13 +591,14 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz",
-      "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
       "cpu": [
         "ppc64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -665,13 +608,14 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz",
-      "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
       "cpu": [
         "riscv64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -681,13 +625,14 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz",
-      "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
       "cpu": [
         "s390x"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -697,13 +642,14 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz",
-      "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -713,13 +659,14 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz",
-      "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "netbsd"
@@ -729,13 +676,14 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz",
-      "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "openbsd"
@@ -745,13 +693,14 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz",
-      "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "sunos"
@@ -761,13 +710,14 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz",
-      "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
       "cpu": [
         "arm64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -777,13 +727,14 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz",
-      "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
       "cpu": [
         "ia32"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -793,13 +744,14 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz",
-      "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -808,275 +760,113 @@
         "node": ">=12"
       }
     },
-    "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
-      "dev": true,
-      "dependencies": {
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
-      }
-    },
-    "node_modules/@eslint-community/regexpp": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz",
-      "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==",
-      "dev": true,
-      "engines": {
-        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
-      }
-    },
-    "node_modules/@eslint/eslintrc": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.1.tgz",
-      "integrity": "sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.20.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@eslint/js": {
-      "version": "8.46.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.46.0.tgz",
-      "integrity": "sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
     "node_modules/@glidejs/glide": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/@glidejs/glide/-/glide-3.6.1.tgz",
-      "integrity": "sha512-5hduecGlGI/R14bxEelKS3sG+cDUwtCAlxS2U3nte0o9NdYltYlW4OWtAyMHUF6USl6n1XqCru2pQZ0s+Ytmzw=="
-    },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
-      "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
-      "dev": true,
-      "dependencies": {
-        "@humanwhocodes/object-schema": "^1.2.1",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.5"
-      },
-      "engines": {
-        "node": ">=10.10.0"
-      }
-    },
-    "node_modules/@humanwhocodes/module-importer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
-      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.22"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
-      }
-    },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-      "dev": true
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/@glidejs/glide/-/glide-3.6.2.tgz",
+      "integrity": "sha512-oXw7In0IZV69PC0PChQakY+yh+UnqIb5+zfVuEIzub6Kkfl1foo7TAhr2PZXPzihOG9YS57t8wvdzBFEZ0aPVA==",
+      "license": "MIT"
     },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
-      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/set-array": "^1.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
+        "@jridgewell/trace-mapping": "^0.3.24"
       },
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
-      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/set-array": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
-      "dev": true
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.19",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz",
-      "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==",
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
-    "node_modules/@mdn/browser-compat-data": {
-      "version": "5.3.8",
-      "resolved": "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-5.3.8.tgz",
-      "integrity": "sha512-WE2eeLb0gZJcQEnPhCIQWs+5KpNK2VI0EOWFUvR39/iks2vDSzJO//78hVz/gYdOGXz6mo4jg0T7RygsUbyZ8w==",
-      "dev": true
-    },
-    "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
-      "version": "5.1.1-v1",
-      "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
-      "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
-      "dev": true,
-      "dependencies": {
-        "eslint-scope": "5.1.1"
-      }
-    },
-    "node_modules/@nicolo-ribaudo/eslint-scope-5-internals/node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@nicolo-ribaudo/eslint-scope-5-internals/node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/@popperjs/core": {
       "version": "2.11.8",
       "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
       "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
+      "license": "MIT",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/popperjs"
       }
     },
     "node_modules/@preact/preset-vite": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@preact/preset-vite/-/preset-vite-2.5.0.tgz",
-      "integrity": "sha512-BUhfB2xQ6ex0yPkrT1Z3LbfPzjpJecOZwQ/xJrXGFSZD84+ObyS//41RdEoQCMWsM0t7UHGaujUxUBub7WM1Jw==",
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/@preact/preset-vite/-/preset-vite-2.9.1.tgz",
+      "integrity": "sha512-JecWzrOx7ogFhklSMhY+aH/24pajL0Vx+beEgau3WDMUUAo32cpUo/UqerPhLOyhCKXlxK9a3cRoa8g68ZAp5g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/plugin-transform-react-jsx": "^7.14.9",
-        "@babel/plugin-transform-react-jsx-development": "^7.16.7",
-        "@prefresh/vite": "^2.2.8",
+        "@babel/code-frame": "^7.22.13",
+        "@babel/plugin-transform-react-jsx": "^7.22.15",
+        "@babel/plugin-transform-react-jsx-development": "^7.22.5",
+        "@prefresh/vite": "^2.4.1",
         "@rollup/pluginutils": "^4.1.1",
         "babel-plugin-transform-hook-names": "^1.0.2",
-        "debug": "^4.3.1",
-        "kolorist": "^1.2.10",
-        "resolve": "^1.20.0"
+        "debug": "^4.3.4",
+        "kolorist": "^1.8.0",
+        "magic-string": "0.30.5",
+        "node-html-parser": "^6.1.10",
+        "source-map": "^0.7.4",
+        "stack-trace": "^1.0.0-pre2"
       },
       "peerDependencies": {
         "@babel/core": "7.x",
-        "vite": "2.x || 3.x || 4.x"
+        "vite": "2.x || 3.x || 4.x || 5.x"
       }
     },
     "node_modules/@prefresh/babel-plugin": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/@prefresh/babel-plugin/-/babel-plugin-0.5.0.tgz",
-      "integrity": "sha512-joAwpkUDwo7ZqJnufXRGzUb+udk20RBgfA8oLPBh5aJH2LeStmV1luBfeJTztPdyCscC2j2SmZ/tVxFRMIxAEw==",
-      "dev": true
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/@prefresh/babel-plugin/-/babel-plugin-0.5.1.tgz",
+      "integrity": "sha512-uG3jGEAysxWoyG3XkYfjYHgaySFrSsaEb4GagLzYaxlydbuREtaX+FTxuIidp241RaLl85XoHg9Ej6E4+V1pcg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@prefresh/core": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/@prefresh/core/-/core-1.5.1.tgz",
-      "integrity": "sha512-e0mB0Oxtog6ZpKPDBYbzFniFJDIktuKMzOHp7sguntU+ot0yi6dbhJRE9Css1qf0u16wdSZjpL2W2ODWuU05Cw==",
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/@prefresh/core/-/core-1.5.2.tgz",
+      "integrity": "sha512-A/08vkaM1FogrCII5PZKCrygxSsc11obExBScm3JF1CryK2uDS3ZXeni7FeKCx1nYdUkj4UcJxzPzc1WliMzZA==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "preact": "^10.0.0"
       }
@@ -1085,16 +875,18 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@prefresh/utils/-/utils-1.2.0.tgz",
       "integrity": "sha512-KtC/fZw+oqtwOLUFM9UtiitB0JsVX0zLKNyRTA332sqREqSALIIQQxdUCS1P3xR/jT1e2e8/5rwH6gdcMLEmsQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@prefresh/vite": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@prefresh/vite/-/vite-2.4.1.tgz",
-      "integrity": "sha512-vthWmEqu8TZFeyrBNc9YE5SiC3DVSzPgsOCp/WQ7FqdHpOIJi7Z8XvCK06rBPOtG4914S52MjG9Ls22eVAiuqQ==",
+      "version": "2.4.6",
+      "resolved": "https://registry.npmjs.org/@prefresh/vite/-/vite-2.4.6.tgz",
+      "integrity": "sha512-miYbTl2J1YNaQJWyWHJzyIpNh7vKUuXC1qCDRzPeWjhQ+9bxeXkUBGDGd9I1f37R5GQYi1S65AN5oR0BR2WzvQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.22.1",
-        "@prefresh/babel-plugin": "0.5.0",
+        "@prefresh/babel-plugin": "0.5.1",
         "@prefresh/core": "^1.5.1",
         "@prefresh/utils": "^1.2.0",
         "@rollup/pluginutils": "^4.2.1"
@@ -1109,6 +901,7 @@
       "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz",
       "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "estree-walker": "^2.0.1",
         "picomatch": "^2.2.2"
@@ -1117,282 +910,243 @@
         "node": ">= 8.0.0"
       }
     },
-    "node_modules/@tsconfig/node14": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
-      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
-      "dev": true
-    },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.12",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz",
-      "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==",
-      "dev": true
-    },
-    "node_modules/@types/semver": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz",
-      "integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/experimental-utils": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.62.0.tgz",
-      "integrity": "sha512-RTXpeB3eMkpoclG3ZHft6vG/Z30azNHuqY6wKPBHlVMZFuEvrtlEDe8gMqDb+SO+9hjC/pLekeSCryf9vMZlCw==",
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.22.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.2.tgz",
+      "integrity": "sha512-8Ao+EDmTPjZ1ZBABc1ohN7Ylx7UIYcjReZinigedTOnGFhIctyGPxY2II+hJ6gD2/vkDKZTyQ0e7++kwv6wDrw==",
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
-      "dependencies": {
-        "@typescript-eslint/utils": "5.62.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
     },
-    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
-      "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.22.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.2.tgz",
+      "integrity": "sha512-I+B1v0a4iqdS9DvYt1RJZ3W+Oh9EVWjbY6gp79aAYipIbxSLEoQtFQlZEnUuwhDXCqMxJ3hluxKAdPD+GiluFQ==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/visitor-keys": "5.62.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
     },
-    "node_modules/@typescript-eslint/types": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
-      "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.22.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.2.tgz",
+      "integrity": "sha512-BTHO7rR+LC67OP7I8N8GvdvnQqzFujJYWo7qCQ8fGdQcb8Gn6EQY+K1P+daQLnDCuWKbZ+gHAQZuKiQkXkqIYg==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
     },
-    "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
-      "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.22.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.2.tgz",
+      "integrity": "sha512-1esGwDNFe2lov4I6GsEeYaAMHwkqk0IbuGH7gXGdBmd/EP9QddJJvTtTF/jv+7R8ZTYPqwcdLpMTxK8ytP6k6Q==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/visitor-keys": "5.62.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.22.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.2.tgz",
+      "integrity": "sha512-GBHuY07x96OTEM3OQLNaUSUwrOhdMea/LDmlFHi/HMonrgF6jcFrrFFwJhhe84XtA1oK/Qh4yFS+VMREf6dobg==",
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.22.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.2.tgz",
+      "integrity": "sha512-Dbfa9Sc1G1lWxop0gNguXOfGhaXQWAGhZUcqA0Vs6CnJq8JW/YOw/KvyGtQFmz4yDr0H4v9X248SM7bizYj4yQ==",
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/utils": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
-      "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.22.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.2.tgz",
+      "integrity": "sha512-Z1YpgBvFYhZIyBW5BoopwSg+t7yqEhs5HCei4JbsaXnhz/eZehT18DaXl957aaE9QK7TRGFryCAtStZywcQe1A==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@types/json-schema": "^7.0.9",
-        "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.62.0",
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/typescript-estree": "5.62.0",
-        "eslint-scope": "^5.1.1",
-        "semver": "^7.3.7"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
     },
-    "node_modules/@typescript-eslint/utils/node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.22.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.2.tgz",
+      "integrity": "sha512-66Zszr7i/JaQ0u/lefcfaAw16wh3oT72vSqubIMQqWzOg85bGCPhoeykG/cC5uvMzH80DQa2L539IqKht6twVA==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
     },
-    "node_modules/@typescript-eslint/utils/node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
+      "version": "4.22.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.2.tgz",
+      "integrity": "sha512-HpJCMnlMTfEhwo19bajvdraQMcAq3FX08QDx3OfQgb+414xZhKNf3jNvLFYKbbDSGBBrQh5yNwWZrdK0g0pokg==",
+      "cpu": [
+        "ppc64"
+      ],
       "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
     },
-    "node_modules/@typescript-eslint/utils/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.22.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.2.tgz",
+      "integrity": "sha512-/egzQzbOSRef2vYCINKITGrlwkzP7uXRnL+xU2j75kDVp3iPdcF0TIlfwTRF8woBZllhk3QaxNOEj2Ogh3t9hg==",
+      "cpu": [
+        "riscv64"
+      ],
       "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
     },
-    "node_modules/@typescript-eslint/utils/node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.22.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.2.tgz",
+      "integrity": "sha512-qgYbOEbrPfEkH/OnUJd1/q4s89FvNJQIUldx8X2F/UM5sEbtkqZpf2s0yly2jSCKr1zUUOY1hnTP2J1WOzMAdA==",
+      "cpu": [
+        "s390x"
+      ],
       "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
     },
-    "node_modules/@typescript-eslint/utils/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
-      "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
+    "node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.22.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.2.tgz",
+      "integrity": "sha512-a0lkvNhFLhf+w7A95XeBqGQaG0KfS3hPFJnz1uraSdUe/XImkp/Psq0Ca0/UdD5IEAGoENVmnYrzSC9Y2a2uKQ==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
     },
-    "node_modules/acorn": {
-      "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
+    "node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.22.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.2.tgz",
+      "integrity": "sha512-sSWBVZgzwtsuG9Dxi9kjYOUu/wKW+jrbzj4Cclabqnfkot8Z3VEHcIgyenA3lLn/Fu11uDviWjhctulkhEO60g==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
     },
-    "node_modules/acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.22.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.2.tgz",
+      "integrity": "sha512-t/YgCbZ638R/r7IKb9yCM6nAek1RUvyNdfU0SHMDLOf6GFe/VG1wdiUAsxTWHKqjyzkRGg897ZfCpdo1bsCSsA==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
     },
-    "node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.22.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.2.tgz",
+      "integrity": "sha512-kTmX5uGs3WYOA+gYDgI6ITkZng9SP71FEMoHNkn+cnmb9Zuyyay8pf0oO5twtTwSjNGy1jlaWooTIr+Dw4tIbw==",
+      "cpu": [
+        "ia32"
+      ],
       "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
     },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.22.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.2.tgz",
+      "integrity": "sha512-Yy8So+SoRz8I3NS4Bjh91BICPOSVgdompTIPYTByUqU66AXSIOgmW3Lv1ke3NORPqxdF+RdrZET+8vYai6f4aA==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
+      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/ansi-styles": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^1.9.0"
       },
@@ -1400,184 +1154,27 @@
         "node": ">=4"
       }
     },
-    "node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "node_modules/array-buffer-byte-length": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
-      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "is-array-buffer": "^3.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-includes": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
-      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "get-intrinsic": "^1.1.3",
-        "is-string": "^1.0.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/array.prototype.flat": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
-      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.flatmap": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
-      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/array.prototype.tosorted": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz",
-      "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0",
-        "get-intrinsic": "^1.1.3"
-      }
-    },
-    "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz",
-      "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==",
-      "dev": true,
-      "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "get-intrinsic": "^1.2.1",
-        "is-array-buffer": "^3.0.2",
-        "is-shared-array-buffer": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/ast-metadata-inferer": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/ast-metadata-inferer/-/ast-metadata-inferer-0.8.0.tgz",
-      "integrity": "sha512-jOMKcHht9LxYIEQu+RVd22vtgrPaVCtDRQ/16IGmurdzxvYbDd5ynxjnyrzLnieG96eTcAyaoj/wN/4/1FyyeA==",
-      "dev": true,
-      "dependencies": {
-        "@mdn/browser-compat-data": "^5.2.34"
-      }
-    },
-    "node_modules/available-typed-arrays": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
-      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/babel-plugin-transform-hook-names": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-hook-names/-/babel-plugin-transform-hook-names-1.0.2.tgz",
       "integrity": "sha512-5gafyjyyBTTdX/tQQ0hRgu4AhNHG/hqWi0ZZmg2xvs2FgRkJXzDNKBZCyoYqgFkovfDrgM8OoKg8karoUvWeCw==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "@babel/core": "^7.12.10"
       }
     },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+    "node_modules/boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
       "dev": true,
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
+      "license": "ISC"
     },
     "node_modules/browserslist": {
-      "version": "4.21.10",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz",
-      "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==",
+      "version": "4.23.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz",
+      "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==",
       "dev": true,
       "funding": [
         {
@@ -1593,11 +1190,12 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001517",
-        "electron-to-chromium": "^1.4.477",
-        "node-releases": "^2.0.13",
-        "update-browserslist-db": "^1.0.11"
+        "caniuse-lite": "^1.0.30001646",
+        "electron-to-chromium": "^1.5.4",
+        "node-releases": "^2.0.18",
+        "update-browserslist-db": "^1.1.0"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -1606,32 +1204,10 @@
         "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
       }
     },
-    "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001519",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz",
-      "integrity": "sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg==",
+      "version": "1.0.30001662",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001662.tgz",
+      "integrity": "sha512-sgMUVwLmGseH8ZIrm1d51UbrhqMCH3jvS7gF/M6byuHOnKyLOBL7W8yz5V02OHwgLGA36o/AFhWzzh4uc5aqTA==",
       "dev": true,
       "funding": [
         {
@@ -1646,13 +1222,15 @@
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
-      ]
+      ],
+      "license": "CC-BY-4.0"
     },
     "node_modules/chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
@@ -1667,6 +1245,7 @@
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "color-name": "1.1.3"
       }
@@ -1675,41 +1254,54 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
       "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/convert-source-map": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
-      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
-      "dev": true
-    },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/css-select": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
+      "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
+        "boolbase": "^1.0.0",
+        "css-what": "^6.1.0",
+        "domhandler": "^5.0.2",
+        "domutils": "^3.0.1",
+        "nth-check": "^2.0.1"
       },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/css-what": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
-        "node": ">= 8"
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
       }
     },
     "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -1720,193 +1312,130 @@
         }
       }
     },
-    "node_modules/deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
-    },
-    "node_modules/define-properties": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
-      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
+    "node_modules/dom-serializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.2",
+        "entities": "^4.2.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
       }
     },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+    "node_modules/domelementtype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/domhandler": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "path-type": "^4.0.0"
+        "domelementtype": "^2.3.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
       }
     },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+    "node_modules/domutils": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
+      "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "esutils": "^2.0.2"
+        "dom-serializer": "^2.0.0",
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3"
       },
-      "engines": {
-        "node": ">=6.0.0"
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.487",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.487.tgz",
-      "integrity": "sha512-XbCRs/34l31np/p33m+5tdBrdXu9jJkZxSbNxj5I0H1KtV2ZMSB+i/HYqDiRzHaFx2T5EdytjoBRe8QRJE2vQg==",
-      "dev": true
-    },
-    "node_modules/es-abstract": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz",
-      "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==",
+      "version": "1.5.26",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.26.tgz",
+      "integrity": "sha512-Z+OMe9M/V6Ep9n/52+b7lkvYEps26z4Yz3vjWL1V61W0q+VLF1pOHhMY17sa4roz4AWmULSI8E6SAojZA5L0YQ==",
       "dev": true,
-      "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
-        "arraybuffer.prototype.slice": "^1.0.1",
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "es-set-tostringtag": "^2.0.1",
-        "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.2.1",
-        "get-symbol-description": "^1.0.0",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.1",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.5",
-        "is-array-buffer": "^3.0.2",
-        "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.10",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.3",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.5.0",
-        "safe-array-concat": "^1.0.0",
-        "safe-regex-test": "^1.0.0",
-        "string.prototype.trim": "^1.2.7",
-        "string.prototype.trimend": "^1.0.6",
-        "string.prototype.trimstart": "^1.0.6",
-        "typed-array-buffer": "^1.0.0",
-        "typed-array-byte-length": "^1.0.0",
-        "typed-array-byte-offset": "^1.0.0",
-        "typed-array-length": "^1.0.4",
-        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.10"
-      },
+      "license": "ISC"
+    },
+    "node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=0.12"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
-    "node_modules/es-set-tostringtag": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
-      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
+    "node_modules/esbuild": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
       "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.3",
-        "has": "^1.0.3",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-shim-unscopables": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
-      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      }
-    },
-    "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/esbuild": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz",
-      "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "esbuild": "bin/esbuild"
       },
       "engines": {
         "node": ">=12"
       },
       "optionalDependencies": {
-        "@esbuild/android-arm": "0.18.20",
-        "@esbuild/android-arm64": "0.18.20",
-        "@esbuild/android-x64": "0.18.20",
-        "@esbuild/darwin-arm64": "0.18.20",
-        "@esbuild/darwin-x64": "0.18.20",
-        "@esbuild/freebsd-arm64": "0.18.20",
-        "@esbuild/freebsd-x64": "0.18.20",
-        "@esbuild/linux-arm": "0.18.20",
-        "@esbuild/linux-arm64": "0.18.20",
-        "@esbuild/linux-ia32": "0.18.20",
-        "@esbuild/linux-loong64": "0.18.20",
-        "@esbuild/linux-mips64el": "0.18.20",
-        "@esbuild/linux-ppc64": "0.18.20",
-        "@esbuild/linux-riscv64": "0.18.20",
-        "@esbuild/linux-s390x": "0.18.20",
-        "@esbuild/linux-x64": "0.18.20",
-        "@esbuild/netbsd-x64": "0.18.20",
-        "@esbuild/openbsd-x64": "0.18.20",
-        "@esbuild/sunos-x64": "0.18.20",
-        "@esbuild/win32-arm64": "0.18.20",
-        "@esbuild/win32-ia32": "0.18.20",
-        "@esbuild/win32-x64": "0.18.20"
+        "@esbuild/aix-ppc64": "0.21.5",
+        "@esbuild/android-arm": "0.21.5",
+        "@esbuild/android-arm64": "0.21.5",
+        "@esbuild/android-x64": "0.21.5",
+        "@esbuild/darwin-arm64": "0.21.5",
+        "@esbuild/darwin-x64": "0.21.5",
+        "@esbuild/freebsd-arm64": "0.21.5",
+        "@esbuild/freebsd-x64": "0.21.5",
+        "@esbuild/linux-arm": "0.21.5",
+        "@esbuild/linux-arm64": "0.21.5",
+        "@esbuild/linux-ia32": "0.21.5",
+        "@esbuild/linux-loong64": "0.21.5",
+        "@esbuild/linux-mips64el": "0.21.5",
+        "@esbuild/linux-ppc64": "0.21.5",
+        "@esbuild/linux-riscv64": "0.21.5",
+        "@esbuild/linux-s390x": "0.21.5",
+        "@esbuild/linux-x64": "0.21.5",
+        "@esbuild/netbsd-x64": "0.21.5",
+        "@esbuild/openbsd-x64": "0.21.5",
+        "@esbuild/sunos-x64": "0.21.5",
+        "@esbuild/win32-arm64": "0.21.5",
+        "@esbuild/win32-ia32": "0.21.5",
+        "@esbuild/win32-x64": "0.21.5"
       }
     },
     "node_modules/escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -1916,2171 +1445,393 @@
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
       }
     },
-    "node_modules/eslint": {
-      "version": "8.46.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.46.0.tgz",
-      "integrity": "sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==",
-      "dev": true,
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.1",
-        "@eslint/js": "^8.46.0",
-        "@humanwhocodes/config-array": "^0.11.10",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "ajv": "^6.12.4",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.2",
-        "eslint-visitor-keys": "^3.4.2",
-        "espree": "^9.6.1",
-        "esquery": "^1.4.2",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "graphemer": "^1.4.0",
-        "ignore": "^5.2.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.3",
-        "strip-ansi": "^6.0.1",
-        "text-table": "^0.2.0"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-config-preact": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-preact/-/eslint-config-preact-1.3.0.tgz",
-      "integrity": "sha512-yHYXg5qNzEJd3D/30AmsIW0W8MuY858KpApXp7xxBF08IYUljSKCOqMx+dVucXHQnAm7+11wOnMkgVHIBAechw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.13.16",
-        "@babel/eslint-parser": "^7.13.14",
-        "@babel/plugin-syntax-class-properties": "^7.12.13",
-        "@babel/plugin-syntax-decorators": "^7.12.13",
-        "@babel/plugin-syntax-jsx": "^7.12.13",
-        "eslint-plugin-compat": "^4.0.0",
-        "eslint-plugin-jest": "^25.2.4",
-        "eslint-plugin-react": "^7.27.0",
-        "eslint-plugin-react-hooks": "^4.3.0"
-      },
-      "peerDependencies": {
-        "eslint": "6.x || 7.x || 8.x"
-      }
-    },
-    "node_modules/eslint-plugin-compat": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-compat/-/eslint-plugin-compat-4.1.4.tgz",
-      "integrity": "sha512-RxySWBmzfIROLFKgeJBJue2BU/6vM2KJWXWAUq+oW4QtrsZXRxbjgxmO1OfF3sHcRuuIenTS/wgo3GyUWZF24w==",
-      "dev": true,
-      "dependencies": {
-        "@mdn/browser-compat-data": "^5.2.47",
-        "@tsconfig/node14": "^1.0.3",
-        "ast-metadata-inferer": "^0.8.0",
-        "browserslist": "^4.21.5",
-        "caniuse-lite": "^1.0.30001473",
-        "find-up": "^5.0.0",
-        "lodash.memoize": "4.1.2",
-        "semver": "7.3.8"
-      },
-      "engines": {
-        "node": ">=14.x"
-      },
-      "peerDependencies": {
-        "eslint": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-compat/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/eslint-plugin-compat/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/eslint-plugin-compat/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/eslint-plugin-jest": {
-      "version": "25.7.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.7.0.tgz",
-      "integrity": "sha512-PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/experimental-utils": "^5.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/eslint-plugin": "^4.0.0 || ^5.0.0",
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@typescript-eslint/eslint-plugin": {
-          "optional": true
-        },
-        "jest": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint-plugin-react": {
-      "version": "7.33.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.1.tgz",
-      "integrity": "sha512-L093k0WAMvr6VhNwReB8VgOq5s2LesZmrpPdKz/kZElQDzqS7G7+DnKoqT+w4JwuiGeAhAvHO0fvy0Eyk4ejDA==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flatmap": "^1.3.1",
-        "array.prototype.tosorted": "^1.1.1",
-        "doctrine": "^2.1.0",
-        "estraverse": "^5.3.0",
-        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "minimatch": "^3.1.2",
-        "object.entries": "^1.1.6",
-        "object.fromentries": "^2.0.6",
-        "object.hasown": "^1.1.2",
-        "object.values": "^1.1.6",
-        "prop-types": "^15.8.1",
-        "resolve": "^2.0.0-next.4",
-        "semver": "^6.3.1",
-        "string.prototype.matchall": "^4.0.8"
-      },
-      "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
-      }
-    },
-    "node_modules/eslint-plugin-react-hooks": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
-      "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
-      }
-    },
-    "node_modules/eslint-plugin-react/node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-react/node_modules/resolve": {
-      "version": "2.0.0-next.4",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz",
-      "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.9.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/eslint-scope": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
-      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-visitor-keys": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz",
-      "integrity": "sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/globals": {
-      "version": "13.20.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
-      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
-      "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eslint/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/espree": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^8.9.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.1"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/esquery": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
-      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "dependencies": {
-        "estraverse": "^5.2.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
     "node_modules/estree-walker": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
       "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
-      "dev": true
-    },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "node_modules/fast-glob": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
-      "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/fast-glob/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true
-    },
-    "node_modules/fastq": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
-      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
-      "dev": true,
-      "dependencies": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
       "dev": true,
-      "dependencies": {
-        "flat-cache": "^3.0.4"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
+      "license": "MIT"
     },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
       "engines": {
-        "node": ">=8"
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
     },
-    "node_modules/find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      },
+    "node_modules/fuse.js": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-7.0.0.tgz",
+      "integrity": "sha512-14F4hBIxqKvD4Zz/XjDc3y94mNZN6pRv3U13Udo0lNLCWRBUsrMv2xwcF/y/Z5sV6+FQW+/ow68cHpm4sunt8Q==",
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "dev": true,
-      "dependencies": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
-      },
+      "license": "MIT",
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/flatted": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
-      "dev": true
-    },
-    "node_modules/for-each": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
-      "dev": true,
-      "dependencies": {
-        "is-callable": "^1.1.3"
-      }
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "node_modules/function.prototype.name": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz",
-      "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/fuse.js": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-7.0.0.tgz",
-      "integrity": "sha512-14F4hBIxqKvD4Zz/XjDc3y94mNZN6pRv3U13Udo0lNLCWRBUsrMv2xwcF/y/Z5sV6+FQW+/ow68cHpm4sunt8Q==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/get-intrinsic": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-symbol-description": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
-      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
+        "node": ">=6.9.0"
       }
     },
     "node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/globalthis": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
-      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/graphemer": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "dev": true
-    },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/has-property-descriptors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.1.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/ignore": {
-      "version": "5.2.4",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
-      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/internal-slot": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
-      "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.2.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/is-array-buffer": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
-      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.0",
-        "is-typed-array": "^1.1.10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "dev": true,
-      "dependencies": {
-        "has-bigints": "^1.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-callable": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-core-module": {
-      "version": "2.13.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
-      "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
-      "dev": true,
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-negative-zero": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
-      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "dev": true,
-      "dependencies": {
-        "has-symbols": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-typed-array": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
-      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
-      "dev": true,
-      "dependencies": {
-        "which-typed-array": "^1.1.11"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true,
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
-    },
-    "node_modules/json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "dev": true,
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/jsx-ast-utils": {
-      "version": "3.3.5",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
-      "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flat": "^1.3.1",
-        "object.assign": "^4.1.4",
-        "object.values": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/kolorist": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/kolorist/-/kolorist-1.8.0.tgz",
-      "integrity": "sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==",
-      "dev": true
-    },
-    "node_modules/levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
-      "dev": true
-    },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dev": true,
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
-      }
-    },
-    "node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-      "dev": true,
-      "dependencies": {
-        "braces": "^3.0.2",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/nanoid": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
-      "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true
-    },
-    "node_modules/node-releases": {
-      "version": "2.0.13",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
-      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==",
-      "dev": true
-    },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.assign": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "has-symbols": "^1.0.3",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.entries": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz",
-      "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/object.fromentries": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
-      "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.hasown": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz",
-      "integrity": "sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/object.values": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
-      "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dev": true,
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/optionator": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
-      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
-      "dev": true,
-      "dependencies": {
-        "@aashutoshrathi/word-wrap": "^1.2.3",
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
-    },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/postcss": {
-      "version": "8.4.27",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.27.tgz",
-      "integrity": "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "nanoid": "^3.3.6",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
-    "node_modules/preact": {
-      "version": "10.16.0",
-      "resolved": "https://registry.npmjs.org/preact/-/preact-10.16.0.tgz",
-      "integrity": "sha512-XTSj3dJ4roKIC93pald6rWuB2qQJO9gO2iLLyTe87MrjQN+HklueLsmskbywEWqCHlclgz3/M4YLL2iBr9UmMA==",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/preact"
-      }
-    },
-    "node_modules/preact-iso": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/preact-iso/-/preact-iso-2.6.3.tgz",
-      "integrity": "sha512-2JqNi+Elyt7rf0kULtMn/QskbZE10cDMrhmoanGKWJX3gOCTIfLt/ta5xWu+kQUsyInPkTQIVp3fS5Im0V+X8A==",
-      "peerDependencies": {
-        "preact": ">=10",
-        "preact-render-to-string": ">=6.4.0"
-      }
-    },
-    "node_modules/preact-render-to-string": {
-      "version": "6.5.5",
-      "resolved": "https://registry.npmjs.org/preact-render-to-string/-/preact-render-to-string-6.5.5.tgz",
-      "integrity": "sha512-KiMFTKNTmT/ccE79BURR/r6XRc2I2TCTZ0MpeWqHW2XnllbeghXvwGsdAfF/MzMilUcTfODtSmMxgoRFL9TM5g==",
-      "peer": true,
-      "peerDependencies": {
-        "preact": ">=10"
-      }
-    },
-    "node_modules/prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dev": true,
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
-    "node_modules/punycode": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-      "dev": true
-    },
-    "node_modules/regexp.prototype.flags": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
-      "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "functions-have-names": "^1.2.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/resolve": {
-      "version": "1.22.4",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz",
-      "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==",
-      "dev": true,
-      "dependencies": {
-        "is-core-module": "^2.13.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true,
-      "engines": {
-        "iojs": ">=1.0.0",
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/rollup": {
-      "version": "3.27.2",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.27.2.tgz",
-      "integrity": "sha512-YGwmHf7h2oUHkVBT248x0yt6vZkYQ3/rvE5iQuVBh3WO8GcJ6BNeOkpoX1yMHIiBm18EMLjBPIoUDkhgnyxGOQ==",
-      "dev": true,
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=14.18.0",
-        "npm": ">=8.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "node_modules/safe-array-concat": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
-      "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.0",
-        "has-symbols": "^1.0.3",
-        "isarray": "^2.0.5"
-      },
-      "engines": {
-        "node": ">=0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/safe-regex-test": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
-      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
-        "is-regex": "^1.1.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
       "dev": true,
-      "dependencies": {
-        "shebang-regex": "^3.0.0"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
-    "node_modules/shebang-regex": {
+    "node_modules/has-flag": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
-    "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+    "node_modules/he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
       "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "license": "MIT",
+      "bin": {
+        "he": "bin/he"
       }
     },
-    "node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
       "dev": true,
+      "license": "MIT",
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
-    "node_modules/source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "dev": true,
+      "license": "MIT",
+      "bin": {
+        "json5": "lib/cli.js"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
       }
     },
-    "node_modules/string.prototype.matchall": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz",
-      "integrity": "sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==",
+    "node_modules/kolorist": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/kolorist/-/kolorist-1.8.0.tgz",
+      "integrity": "sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "get-intrinsic": "^1.1.3",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.3",
-        "regexp.prototype.flags": "^1.4.3",
-        "side-channel": "^1.0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "yallist": "^3.0.2"
       }
     },
-    "node_modules/string.prototype.trim": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
-      "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
+    "node_modules/magic-string": {
+      "version": "0.30.5",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
+      "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "@jridgewell/sourcemap-codec": "^1.4.15"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=12"
       }
     },
-    "node_modules/string.prototype.trimend": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+      "license": "MIT"
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
       }
     },
-    "node_modules/string.prototype.trimstart": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+    "node_modules/node-html-parser": {
+      "version": "6.1.13",
+      "resolved": "https://registry.npmjs.org/node-html-parser/-/node-html-parser-6.1.13.tgz",
+      "integrity": "sha512-qIsTMOY4C/dAa5Q5vsobRpOOvPfC4pB61UVW2uSwZNUp0QU/jCekTal1vMmbO0DgdHeLUJpv/ARmDqErVxA3Sg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "css-select": "^5.1.0",
+        "he": "1.2.0"
       }
     },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+    "node_modules/node-releases": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
+      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/nth-check": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "ansi-regex": "^5.0.1"
+        "boolbase": "^1.0.0"
       },
-      "engines": {
-        "node": ">=8"
+      "funding": {
+        "url": "https://github.com/fb55/nth-check?sponsor=1"
       }
     },
-    "node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+    "node_modules/picocolors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
+      "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=8.6"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+    "node_modules/postcss": {
+      "version": "8.4.47",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
+      "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
       "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "nanoid": "^3.3.7",
+        "picocolors": "^1.1.0",
+        "source-map-js": "^1.2.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": "^10 || ^12 || >=14"
       }
     },
-    "node_modules/supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
-      },
+    "node_modules/preact": {
+      "version": "10.24.0",
+      "resolved": "https://registry.npmjs.org/preact/-/preact-10.24.0.tgz",
+      "integrity": "sha512-aK8Cf+jkfyuZ0ZZRG9FbYqwmEiGQ4y/PUO4SuTWoyWL244nZZh7bd5h2APd4rSNDYTBNghg1L+5iJN3Skxtbsw==",
+      "license": "MIT",
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "type": "opencollective",
+        "url": "https://opencollective.com/preact"
       }
     },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
-    },
-    "node_modules/tippy.js": {
-      "version": "6.3.7",
-      "resolved": "https://registry.npmjs.org/tippy.js/-/tippy.js-6.3.7.tgz",
-      "integrity": "sha512-E1d3oP2emgJ9dRQZdf3Kkn0qJgI6ZLpyS5z6ZkY1DF3kaQaBsGZsndEpHwx+eC+tYM41HaSNvNtLx8tU57FzTQ==",
-      "dependencies": {
-        "@popperjs/core": "^2.9.0"
+    "node_modules/preact-iso": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/preact-iso/-/preact-iso-2.6.3.tgz",
+      "integrity": "sha512-2JqNi+Elyt7rf0kULtMn/QskbZE10cDMrhmoanGKWJX3gOCTIfLt/ta5xWu+kQUsyInPkTQIVp3fS5Im0V+X8A==",
+      "license": "MIT",
+      "peerDependencies": {
+        "preact": ">=10",
+        "preact-render-to-string": ">=6.4.0"
       }
     },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
+    "node_modules/preact-render-to-string": {
+      "version": "6.5.11",
+      "resolved": "https://registry.npmjs.org/preact-render-to-string/-/preact-render-to-string-6.5.11.tgz",
+      "integrity": "sha512-ubnauqoGczeGISiOh6RjX0/cdaF8v/oDXIjO85XALCQjwQP+SB4RDXXtvZ6yTYSjG+PC1QRP2AhPgCEsM2EvUw==",
+      "license": "MIT",
+      "peer": true,
+      "peerDependencies": {
+        "preact": ">=10"
       }
     },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+    "node_modules/rollup": {
+      "version": "4.22.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.2.tgz",
+      "integrity": "sha512-JWWpTrZmqQGQWt16xvNn6KVIUz16VtZwl984TKw0dfqqRpFwtLJYYk1/4BTgplndMQKWUk/yB4uOShYmMzA2Vg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-number": "^7.0.0"
+        "@types/estree": "1.0.5"
       },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
-    "node_modules/tsutils": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.8.1"
+      "bin": {
+        "rollup": "dist/bin/rollup"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=18.0.0",
+        "npm": ">=8.0.0"
       },
-      "peerDependencies": {
-        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
+      "optionalDependencies": {
+        "@rollup/rollup-android-arm-eabi": "4.22.2",
+        "@rollup/rollup-android-arm64": "4.22.2",
+        "@rollup/rollup-darwin-arm64": "4.22.2",
+        "@rollup/rollup-darwin-x64": "4.22.2",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.22.2",
+        "@rollup/rollup-linux-arm-musleabihf": "4.22.2",
+        "@rollup/rollup-linux-arm64-gnu": "4.22.2",
+        "@rollup/rollup-linux-arm64-musl": "4.22.2",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.22.2",
+        "@rollup/rollup-linux-riscv64-gnu": "4.22.2",
+        "@rollup/rollup-linux-s390x-gnu": "4.22.2",
+        "@rollup/rollup-linux-x64-gnu": "4.22.2",
+        "@rollup/rollup-linux-x64-musl": "4.22.2",
+        "@rollup/rollup-win32-arm64-msvc": "4.22.2",
+        "@rollup/rollup-win32-ia32-msvc": "4.22.2",
+        "@rollup/rollup-win32-x64-msvc": "4.22.2",
+        "fsevents": "~2.3.2"
       }
     },
-    "node_modules/type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+    "node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
-    "node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+    "node_modules/source-map": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">= 8"
       }
     },
-    "node_modules/typed-array-buffer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
-      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
+    "node_modules/source-map-js": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
       "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1",
-        "is-typed-array": "^1.1.10"
-      },
+      "license": "BSD-3-Clause",
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/typed-array-byte-length": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
-      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
+    "node_modules/stack-trace": {
+      "version": "1.0.0-pre2",
+      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-1.0.0-pre2.tgz",
+      "integrity": "sha512-2ztBJRek8IVofG9DBJqdy2N5kulaacX30Nz7xmkYF6ale9WBVmIy6mFBchvGX7Vx/MyjBhx+Rcxqrj+dbOnQ6A==",
       "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "has-proto": "^1.0.1",
-        "is-typed-array": "^1.1.10"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=16"
       }
     },
-    "node_modules/typed-array-byte-offset": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
-      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
+    "node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "has-proto": "^1.0.1",
-        "is-typed-array": "^1.1.10"
+        "has-flag": "^3.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=4"
       }
     },
-    "node_modules/typed-array-length": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
-      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
-      "dev": true,
+    "node_modules/tippy.js": {
+      "version": "6.3.7",
+      "resolved": "https://registry.npmjs.org/tippy.js/-/tippy.js-6.3.7.tgz",
+      "integrity": "sha512-E1d3oP2emgJ9dRQZdf3Kkn0qJgI6ZLpyS5z6ZkY1DF3kaQaBsGZsndEpHwx+eC+tYM41HaSNvNtLx8tU57FzTQ==",
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "is-typed-array": "^1.1.9"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "@popperjs/core": "^2.9.0"
       }
     },
-    "node_modules/typescript": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz",
-      "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==",
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
       "dev": true,
-      "peer": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=14.17"
-      }
-    },
-    "node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=4"
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
-      "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
+      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
       "dev": true,
       "funding": [
         {
@@ -4096,9 +1847,10 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
-        "escalade": "^3.1.1",
-        "picocolors": "^1.0.0"
+        "escalade": "^3.1.2",
+        "picocolors": "^1.0.1"
       },
       "bin": {
         "update-browserslist-db": "cli.js"
@@ -4107,42 +1859,35 @@
         "browserslist": ">= 4.21.0"
       }
     },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
     "node_modules/vite": {
-      "version": "4.4.9",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.9.tgz",
-      "integrity": "sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==",
+      "version": "5.4.6",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.6.tgz",
+      "integrity": "sha512-IeL5f8OO5nylsgzd9tq4qD2QqI0k2CQLGrWD0rCN0EQJZpBK5vJAx0I+GDkMOXxQX/OfFHMuLIx6ddAxGX/k+Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "esbuild": "^0.18.10",
-        "postcss": "^8.4.27",
-        "rollup": "^3.27.1"
+        "esbuild": "^0.21.3",
+        "postcss": "^8.4.43",
+        "rollup": "^4.20.0"
       },
       "bin": {
         "vite": "bin/vite.js"
       },
       "engines": {
-        "node": "^14.18.0 || >=16.0.0"
+        "node": "^18.0.0 || >=20.0.0"
       },
       "funding": {
         "url": "https://github.com/vitejs/vite?sponsor=1"
       },
       "optionalDependencies": {
-        "fsevents": "~2.3.2"
+        "fsevents": "~2.3.3"
       },
       "peerDependencies": {
-        "@types/node": ">= 14",
+        "@types/node": "^18.0.0 || >=20.0.0",
         "less": "*",
         "lightningcss": "^1.21.0",
         "sass": "*",
+        "sass-embedded": "*",
         "stylus": "*",
         "sugarss": "*",
         "terser": "^5.4.0"
@@ -4160,6 +1905,9 @@
         "sass": {
           "optional": true
         },
+        "sass-embedded": {
+          "optional": true
+        },
         "stylus": {
           "optional": true
         },
@@ -4171,79 +1919,12 @@
         }
       }
     },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "dev": true,
-      "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/which-typed-array": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
-      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
-      "dev": true,
-      "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
-    },
     "node_modules/yallist": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
-    },
-    "node_modules/yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+      "license": "ISC"
     }
   }
 }
diff --git a/package.json b/package.json
index fc8e891..3b49a3f 100644
--- a/package.json
+++ b/package.json
@@ -23,15 +23,13 @@
   "dependencies": {
     "@glidejs/glide": "^3.6.1",
     "fuse.js": "^7.0.0",
-    "preact": "^10.13.1",
+    "preact": "^10.23.1",
     "preact-iso": "^2.6.3",
     "tippy.js": "^6.3.7"
   },
   "devDependencies": {
-    "@preact/preset-vite": "^2.5.0",
-    "eslint": "^8.46.0",
-    "eslint-config-preact": "^1.3.0",
-    "vite": "^4.3.2"
+    "@preact/preset-vite": "^2.9.0",
+    "vite": "^5.4.1"
   },
   "eslintConfig": {
     "extends": "preact"

From e69937d5b74513a11a1441581a67f6b61c65275f Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Fri, 20 Sep 2024 09:26:06 -0400
Subject: [PATCH 039/113] feat(resource-group-projects): use real project
 statistics

---
 src/resource-group-projects.jsx | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/resource-group-projects.jsx b/src/resource-group-projects.jsx
index 6d60a9c..2464365 100644
--- a/src/resource-group-projects.jsx
+++ b/src/resource-group-projects.jsx
@@ -19,19 +19,30 @@ const column = (items, title, topItemsHeading = null) => {
 
 export default function ResourceGroupProjects({ baseUri, infoGroupId }) {
   const [persona, setPersona] = useState("all");
+  const apiBaseUrl =
+    "https://allocations.access-ci.org/current-projects/summary.json";
+  const apiUrl = `${apiBaseUrl}?info_groupid=${infoGroupId}&persona=${persona}`;
   const data = useJSON(
-    `${baseUri}/api/resource-groups/${infoGroupId}/projects/${persona}.json`,
+    `https://corsproxy.io/?${encodeURIComponent(apiUrl)}`,
     null
   );
 
   if (!data || data.error) return;
 
+  const stats = {
+    "allocation-type": [],
+    "field-of-science": [],
+    "pi-institution": [],
+  };
+  for (let stat of data.projectStatistics)
+    stats[stat["type"]].push({ name: stat.value, count: stat.count });
+
   const headerComponents = [
     <select value={persona} onChange={(e) => setPersona(e.target.value)}>
       <option value="all">All PIs</option>
       <option value="researcher">Researchers</option>
       <option value="educator">Educators</option>
-      <option value="grad-student">Graduate Students</option>
+      <option value="graduate-student">Graduate Students</option>
     </select>,
   ];
 
@@ -42,14 +53,14 @@ export default function ResourceGroupProjects({ baseUri, infoGroupId }) {
       headerComponents={headerComponents}
     >
       <div class="projects-columns">
-        {column(data.projects.projectType, "Project Type")}
+        {column(stats["allocation-type"], "Project Type")}
         {column(
-          data.projects.fieldOfScience,
+          stats["field-of-science"],
           "Field of Science",
           "Top Fields of Science"
         )}
         {column(
-          data.projects.institution,
+          stats["pi-institution"],
           "PI's Institution",
           "Top Institutions"
         )}

From c618fcd2a34d168ff8bc83b465a933643a2a794d Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Fri, 20 Sep 2024 10:16:10 -0400
Subject: [PATCH 040/113] feat(mini-bar): add mini bar chart component

---
 src/mini-bar.css |  9 +++++++++
 src/mini-bar.jsx | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 src/mini-bar.css
 create mode 100644 src/mini-bar.jsx

diff --git a/src/mini-bar.css b/src/mini-bar.css
new file mode 100644
index 0000000..0014778
--- /dev/null
+++ b/src/mini-bar.css
@@ -0,0 +1,9 @@
+.mini-bar {
+  flex: 0 0 auto;
+  position: relative;
+  width: 100px;
+}
+.mini-bar .bar {
+  background-color: #dddddd;
+  height: 1em;
+}
diff --git a/src/mini-bar.jsx b/src/mini-bar.jsx
new file mode 100644
index 0000000..185d764
--- /dev/null
+++ b/src/mini-bar.jsx
@@ -0,0 +1,37 @@
+const hexToRgb = (hex) =>
+  /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i
+    .exec(hex)
+    .slice(1)
+    .map((band) => parseInt(band, 16));
+
+const rgbToHex = ([r, g, b]) =>
+  `#${((1 << 24) | (r << 16) | (g << 8) | b).toString(16).slice(1)}`;
+
+const interpolateColor = (pct, hex1, hex2) => {
+  const rgb1 = hexToRgb(hex1);
+  const rgb2 = hexToRgb(hex2);
+  return rgbToHex(rgb1.map((band, i) => band + (rgb2[i] - band) * pct));
+};
+
+export function MiniBar({
+  value,
+  maxValue,
+  maxColor = "#ffc42d",
+  minColor = "#1a5b6e",
+}) {
+  return (
+    <div class="mini-bar">
+      <div
+        class="bar"
+        style={{
+          backgroundColor: interpolateColor(
+            value / maxValue,
+            minColor,
+            maxColor
+          ),
+          width: `${(100 * value) / maxValue}%`,
+        }}
+      ></div>
+    </div>
+  );
+}

From d1b5dd3f354b245e8a9e418d83d0d6cbfa482ee1 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Fri, 20 Sep 2024 10:18:04 -0400
Subject: [PATCH 041/113] feat(resource-group-projects): use grid with mini bar
 for displaying projects

---
 src/resource-catalog.jsx        |  2 ++
 src/resource-group-projects.css | 27 ++++++++++++---------------
 src/resource-group-projects.jsx | 31 ++++++++++++++++++++-----------
 3 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/src/resource-catalog.jsx b/src/resource-catalog.jsx
index 18c32f6..52cb9c1 100644
--- a/src/resource-catalog.jsx
+++ b/src/resource-catalog.jsx
@@ -11,6 +11,7 @@ import glideCoreStyle from "@glidejs/glide/dist/css/glide.core.min.css?inline";
 import glideThemeStyle from "@glidejs/glide/dist/css/glide.theme.min.css?inline";
 import gridStyle from "./grid.css?inline";
 import carouselStyle from "./carousel.css?inline";
+import miniBarStyle from "./mini-bar.css?inline";
 import resourceFiltersStyle from "./resource-filters.css?inline";
 import resourceGroupStyle from "./resource-group.css?inline";
 import resourceGroupEventStyle from "./resource-group-event.css?inline";
@@ -62,6 +63,7 @@ export function ResourceCatalog({
       <style>{glideThemeStyle}</style>
       <style>{gridStyle}</style>
       <style>{carouselStyle}</style>
+      <style>{miniBarStyle}</style>
       <style>{resourceFiltersStyle}</style>
       <style>{resourceGroupStyle}</style>
       <style>{resourceGroupEventStyle}</style>
diff --git a/src/resource-group-projects.css b/src/resource-group-projects.css
index 68e42e3..0ae1372 100644
--- a/src/resource-group-projects.css
+++ b/src/resource-group-projects.css
@@ -1,34 +1,31 @@
-.projects-columns {
-  --chart-width: min(350px, var(--width));
-}
 .projects-columns .column {
   align-items: center;
   display: flex;
   flex-direction: column;
   margin-bottom: 20px;
 }
-.projects-columns svg {
-  height: var(--chart-width);
-  margin: 0 auto;
-  width: var(--chart-width);
+.projects-columns .project-count {
+  display: flex;
+  flex-direction: row;
 }
-.projects-columns .donut-chart .center-text {
-  font-size: 0.8rem;
+.projects-columns .project-count .count {
+  margin-right: 0.5rem;
+  text-align: right;
+  width: 3rem;
 }
 @media (min-width: 768px) {
   .projects-columns {
     display: flex;
     flex-direction: row;
-    --chart-width: calc((var(--width) - 120px) / 3);
   }
   .projects-columns .column {
     align-items: flex-start;
-    width: var(--chart-width);
+    width: calc((var(--width) - 40px) / 3);
   }
-  .projects-columns .column:not(:last-child) {
-    margin-right: 60px;
+  .projects-columns .column > * {
+    width: calc((var(--width) - 40px) / 3);
   }
-  .projects-columns svg {
-    margin: 0;
+  .projects-columns .column:not(:last-child) {
+    margin-right: 20px;
   }
 }
diff --git a/src/resource-group-projects.jsx b/src/resource-group-projects.jsx
index 2464365..0e9140a 100644
--- a/src/resource-group-projects.jsx
+++ b/src/resource-group-projects.jsx
@@ -1,18 +1,28 @@
 import { useState } from "preact/hooks";
 import { useJSON } from "./utils";
 
-import DonutChart from "./donut-chart";
+import Grid from "./grid";
+import { MiniBar } from "./mini-bar";
 import Section from "./section";
 
-const column = (items, title, topItemsHeading = null) => {
+const column = (items, title, topItemsHeading) => {
+  const columns = [
+    { key: "value", name: title },
+    {
+      key: "count",
+      name: "Projects",
+      format: (value) => (
+        <div class="project-count">
+          <span class="count">{value.toLocaleString("en-US")}</span>
+          <MiniBar value={value} maxValue={items[0].count} />
+        </div>
+      ),
+    },
+  ];
   return (
     <div class="column">
-      <DonutChart
-        items={items}
-        title={title}
-        itemLabel="projects"
-        topItemsHeading={topItemsHeading}
-      />
+      <h3>{topItemsHeading}</h3>
+      <Grid columns={columns} rows={items} />
     </div>
   );
 };
@@ -34,8 +44,7 @@ export default function ResourceGroupProjects({ baseUri, infoGroupId }) {
     "field-of-science": [],
     "pi-institution": [],
   };
-  for (let stat of data.projectStatistics)
-    stats[stat["type"]].push({ name: stat.value, count: stat.count });
+  for (let stat of data.projectStatistics) stats[stat["type"]].push(stat);
 
   const headerComponents = [
     <select value={persona} onChange={(e) => setPersona(e.target.value)}>
@@ -53,7 +62,7 @@ export default function ResourceGroupProjects({ baseUri, infoGroupId }) {
       headerComponents={headerComponents}
     >
       <div class="projects-columns">
-        {column(stats["allocation-type"], "Project Type")}
+        {column(stats["allocation-type"], "Project Type", "Top Project Types")}
         {column(
           stats["field-of-science"],
           "Field of Science",

From 69ca73156d6d7596d61ffb6a9abed3a237ec894e Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 9 Oct 2024 13:12:33 -0400
Subject: [PATCH 042/113] refactor(resource-group-description): use affinity
 group API data for now

In the long term, most of this information will come from CIDeR once
resource groups are available there.
---
 src/resource-group-description.jsx | 15 ++++++++++-----
 src/resource-group-projects.jsx    |  5 +----
 src/{utils.js => utils.jsx}        | 30 ++++++++++++++++++++++++++++--
 3 files changed, 39 insertions(+), 11 deletions(-)
 rename src/{utils.js => utils.jsx} (61%)

diff --git a/src/resource-group-description.jsx b/src/resource-group-description.jsx
index bc3189e..68af7dd 100644
--- a/src/resource-group-description.jsx
+++ b/src/resource-group-description.jsx
@@ -1,14 +1,19 @@
-import { useJSON } from "./utils";
+import { htmlToJsx, useJSON } from "./utils";
 
 import Icon from "./icon";
 
 export default function ResourceGroupDescription({ baseUri, infoGroupId }) {
   const data = useJSON(
-    `${baseUri}/api/resource-groups/${infoGroupId}.json`,
-    null
+    `https://support.access-ci.org/api/1.0/affinity_groups/${infoGroupId}`,
+    null,
+    { corsProxy: true }
   );
-  if (!data) return;
-  const { name, resourceProvider, imageUri, description, userGuideUri } = data;
+  if (!data || !data.length) return;
+  const name = data[0].title;
+  const imageUri = `https://support.access-ci.org/${data[0].field_image}`;
+  const description = htmlToJsx(data[0].description);
+  // TODO: Add resource provider and user guide data.
+  const { resourceProvider, userGuideUri } = data;
   return (
     <div class="resource-group-description">
       {imageUri ? (
diff --git a/src/resource-group-projects.jsx b/src/resource-group-projects.jsx
index 0e9140a..b2ce1d8 100644
--- a/src/resource-group-projects.jsx
+++ b/src/resource-group-projects.jsx
@@ -32,10 +32,7 @@ export default function ResourceGroupProjects({ baseUri, infoGroupId }) {
   const apiBaseUrl =
     "https://allocations.access-ci.org/current-projects/summary.json";
   const apiUrl = `${apiBaseUrl}?info_groupid=${infoGroupId}&persona=${persona}`;
-  const data = useJSON(
-    `https://corsproxy.io/?${encodeURIComponent(apiUrl)}`,
-    null
-  );
+  const data = useJSON(apiUrl, null, { corsProxy: true });
 
   if (!data || data.error) return;
 
diff --git a/src/utils.js b/src/utils.jsx
similarity index 61%
rename from src/utils.js
rename to src/utils.jsx
index 1be22e7..e351bca 100644
--- a/src/utils.js
+++ b/src/utils.jsx
@@ -23,12 +23,18 @@ export const getScrollTop = () =>
     : (document.documentElement || document.body.parentNode || document.body)
         .scrollTop;
 
-export const useJSON = (uri, defaultValue) => {
+export const useJSON = (
+  uri,
+  defaultValue,
+  { corsProxy } = { corsProxy: false }
+) => {
   const [value, setValue] = useState(defaultValue);
   useEffect(() => {
     if (uri)
       (async () => {
-        const res = await fetch(uri);
+        const res = await fetch(
+          corsProxy ? `https://corsproxy.io/?${encodeURIComponent(uri)}` : uri
+        );
         if (res.status < 200 || res.status > 299) {
           setValue({ error: { status: res.status } });
         } else {
@@ -41,3 +47,23 @@ export const useJSON = (uri, defaultValue) => {
 };
 
 export const sortOn = (prop) => (a, b) => a[prop] < b[prop] ? -1 : 1;
+
+export const htmlToJsx = (html) => {
+  const links = Array.from(html.matchAll(/<a([^>]+)>([^<]+)<\/a>/g));
+  const textNodes = html.split(/<a[^<]+<\/a>/g);
+  const result = [];
+  while (textNodes.length > 0) {
+    result.push(
+      textNodes
+        .shift()
+        .replace(/(<[^>]+>)/g, "")
+        .replace(/&nbsp;/g, " ")
+    );
+    let link = links.shift();
+    if (link) {
+      let href = link[1].match(/href="([^"]+)"/g);
+      if (href) result.push(<a href={href[1]}>{link[2]}</a>);
+    }
+  }
+  return result;
+};

From bd849035d111cec67bdf49f489e9cafec317e1f3 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 9 Oct 2024 13:34:31 -0400
Subject: [PATCH 043/113] feat(resource-group-affinity-group): make links
 active

---
 src/resource-group-affinity-group.jsx | 26 +++++++++++++++++++-------
 src/utils.jsx                         | 10 ++++------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/resource-group-affinity-group.jsx b/src/resource-group-affinity-group.jsx
index d386637..681e606 100644
--- a/src/resource-group-affinity-group.jsx
+++ b/src/resource-group-affinity-group.jsx
@@ -1,20 +1,32 @@
+import { stripTags, useJSON } from "./utils";
+
+import Icon from "./icon";
 import Section from "./section";
 
 export default function ResourceGroupAffinityGroup({ baseUri, infoGroupId }) {
+  const data = useJSON(
+    `https://support.access-ci.org/api/1.0/affinity_groups/${infoGroupId}`,
+    null,
+    { corsProxy: true }
+  );
+  if (!data || !data.length) return;
+  const slackUri = stripTags(data[0].slack_link);
   return (
     <Section title="Affinity Group" icon="people-fill">
       <p>
         Join the community! Members get update about announcements, events, and
         outages.
       </p>
-      <a href="#" class="btn secondary">
-        Join
-      </a>
-      <a href="#" class="btn">
-        Slack
+      <a href="https://support.access-ci.org/user" class="btn secondary">
+        <Icon name="person-plus-fill" /> Join Affinity Group
       </a>
-      <a href="#" class="btn">
-        Q&A
+      {slackUri ? (
+        <a href={slackUri} class="btn">
+          <Icon name="slack" /> Connect on Slack
+        </a>
+      ) : null}
+      <a href="#ask-ci-topics" class="btn">
+        <Icon name="chat-fill" /> Ask and Answer Questions
       </a>
     </Section>
   );
diff --git a/src/utils.jsx b/src/utils.jsx
index e351bca..6775f04 100644
--- a/src/utils.jsx
+++ b/src/utils.jsx
@@ -48,17 +48,15 @@ export const useJSON = (
 
 export const sortOn = (prop) => (a, b) => a[prop] < b[prop] ? -1 : 1;
 
+export const stripTags = (html) =>
+  html.replace(/(<[^>]+>)/g, "").replace(/&nbsp;/g, " ");
+
 export const htmlToJsx = (html) => {
   const links = Array.from(html.matchAll(/<a([^>]+)>([^<]+)<\/a>/g));
   const textNodes = html.split(/<a[^<]+<\/a>/g);
   const result = [];
   while (textNodes.length > 0) {
-    result.push(
-      textNodes
-        .shift()
-        .replace(/(<[^>]+>)/g, "")
-        .replace(/&nbsp;/g, " ")
-    );
+    result.push(stripTags(textNodes.shift()));
     let link = links.shift();
     if (link) {
       let href = link[1].match(/href="([^"]+)"/g);

From dd0c8ab027a3882956a8fadd98a776d961d323dc Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 9 Oct 2024 13:38:49 -0400
Subject: [PATCH 044/113] feat(utils): improve error handling while parsing
 JSON

---
 src/resource-group-affinity-group.jsx | 2 +-
 src/resource-group-description.jsx    | 2 +-
 src/utils.jsx                         | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/resource-group-affinity-group.jsx b/src/resource-group-affinity-group.jsx
index 681e606..29404d7 100644
--- a/src/resource-group-affinity-group.jsx
+++ b/src/resource-group-affinity-group.jsx
@@ -9,7 +9,7 @@ export default function ResourceGroupAffinityGroup({ baseUri, infoGroupId }) {
     null,
     { corsProxy: true }
   );
-  if (!data || !data.length) return;
+  if (!data || data.error || !data.length) return;
   const slackUri = stripTags(data[0].slack_link);
   return (
     <Section title="Affinity Group" icon="people-fill">
diff --git a/src/resource-group-description.jsx b/src/resource-group-description.jsx
index 68af7dd..ce1b405 100644
--- a/src/resource-group-description.jsx
+++ b/src/resource-group-description.jsx
@@ -8,7 +8,7 @@ export default function ResourceGroupDescription({ baseUri, infoGroupId }) {
     null,
     { corsProxy: true }
   );
-  if (!data || !data.length) return;
+  if (!data || data.error || !data.length) return;
   const name = data[0].title;
   const imageUri = `https://support.access-ci.org/${data[0].field_image}`;
   const description = htmlToJsx(data[0].description);
diff --git a/src/utils.jsx b/src/utils.jsx
index 6775f04..c80cf66 100644
--- a/src/utils.jsx
+++ b/src/utils.jsx
@@ -38,7 +38,12 @@ export const useJSON = (
         if (res.status < 200 || res.status > 299) {
           setValue({ error: { status: res.status } });
         } else {
-          const data = await res.json();
+          let data;
+          try {
+            data = await res.json();
+          } catch (error) {
+            setValue({ error: { message: error } });
+          }
           setValue(data);
         }
       })();

From 8227e2692179184eca8f23f99cff2445b7636c1c Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 9 Oct 2024 14:08:27 -0400
Subject: [PATCH 045/113] feat(resource-group-documentation): get data from
 Support knowledge base API

---
 src/resource-group-documentation.jsx | 26 +++++++++++++++++---------
 src/utils.jsx                        | 10 ++++++++--
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/resource-group-documentation.jsx b/src/resource-group-documentation.jsx
index 6a566d7..0258a0c 100644
--- a/src/resource-group-documentation.jsx
+++ b/src/resource-group-documentation.jsx
@@ -1,23 +1,31 @@
-import { useJSON } from "./utils";
+import { extractHref, stripTags, useJSON } from "./utils";
 
+import InfoTip from "./info-tip";
 import Section from "./section";
 
 export default function ResourceGroupDocumentation({ baseUri, infoGroupId }) {
   const data = useJSON(
-    `${baseUri}/api/resource-groups/${infoGroupId}/documentation.json`,
-    null
+    `https://support.access-ci.org/api/1.0/kb/${infoGroupId}`,
+    null,
+    { corsProxy: true }
   );
 
-  if (!data || data.error) return;
+  if (!data || data.error || !data.length) return;
 
   return (
     <Section title="Documentation" icon="book">
       <ul>
-        {data.documentation.map(({ name, documentationUri }) => (
-          <li>
-            <a href={documentationUri}>{name}</a>
-          </li>
-        ))}
+        {data.map(({ title, description, link }) => {
+          console.log(link, extractHref(link));
+          return (
+            <li>
+              <a href={extractHref(link)}>{title}</a>
+              {description ? (
+                <InfoTip tooltip={stripTags(description)} />
+              ) : null}
+            </li>
+          );
+        })}
       </ul>
     </Section>
   );
diff --git a/src/utils.jsx b/src/utils.jsx
index c80cf66..75b6bfc 100644
--- a/src/utils.jsx
+++ b/src/utils.jsx
@@ -53,6 +53,12 @@ export const useJSON = (
 
 export const sortOn = (prop) => (a, b) => a[prop] < b[prop] ? -1 : 1;
 
+export const extractHref = (html) => {
+  let href = html.match(/href="([^"]+)"/);
+  if (href) return href[1];
+  return null;
+};
+
 export const stripTags = (html) =>
   html.replace(/(<[^>]+>)/g, "").replace(/&nbsp;/g, " ");
 
@@ -64,8 +70,8 @@ export const htmlToJsx = (html) => {
     result.push(stripTags(textNodes.shift()));
     let link = links.shift();
     if (link) {
-      let href = link[1].match(/href="([^"]+)"/g);
-      if (href) result.push(<a href={href[1]}>{link[2]}</a>);
+      let href = extractHref(link[1]);
+      if (href) result.push(<a href={href}>{link[2]}</a>);
     }
   }
   return result;

From a1052ca25d10b8380d51f5138c72c24b77246c01 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 9 Oct 2024 14:20:31 -0400
Subject: [PATCH 046/113] chore: remove debug logging

---
 src/resource-group-documentation.jsx | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/resource-group-documentation.jsx b/src/resource-group-documentation.jsx
index 0258a0c..0472dbd 100644
--- a/src/resource-group-documentation.jsx
+++ b/src/resource-group-documentation.jsx
@@ -15,17 +15,12 @@ export default function ResourceGroupDocumentation({ baseUri, infoGroupId }) {
   return (
     <Section title="Documentation" icon="book">
       <ul>
-        {data.map(({ title, description, link }) => {
-          console.log(link, extractHref(link));
-          return (
-            <li>
-              <a href={extractHref(link)}>{title}</a>
-              {description ? (
-                <InfoTip tooltip={stripTags(description)} />
-              ) : null}
-            </li>
-          );
-        })}
+        {data.map(({ title, description, link }) => (
+          <li>
+            <a href={extractHref(link)}>{title}</a>
+            {description ? <InfoTip tooltip={stripTags(description)} /> : null}
+          </li>
+        ))}
       </ul>
     </Section>
   );

From 82e86ce81377e650fff1e864bc447605990626d1 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 9 Oct 2024 16:47:06 -0400
Subject: [PATCH 047/113] feat(resource-group-events): get data from affinity
 group events API

---
 src/expand-text.css           | 29 +++++++++++++++++++++++++++++
 src/expand-text.jsx           | 17 +++++++++++++++++
 src/resource-catalog.jsx      |  2 ++
 src/resource-group-event.css  |  3 +++
 src/resource-group-event.jsx  | 32 ++++++++++++++++++++++++--------
 src/resource-group-events.jsx | 16 ++++++++++++----
 6 files changed, 87 insertions(+), 12 deletions(-)
 create mode 100644 src/expand-text.css
 create mode 100644 src/expand-text.jsx

diff --git a/src/expand-text.css b/src/expand-text.css
new file mode 100644
index 0000000..b086d92
--- /dev/null
+++ b/src/expand-text.css
@@ -0,0 +1,29 @@
+.expand-text {
+  margin-bottom: 1rem;
+  position: relative;
+}
+.expand-text.contracted {
+  max-height: 5.3rem;
+  overflow: hidden;
+}
+.expand-text button {
+  background-color: white;
+  border: 0 none transparent;
+  color: var(--teal-700);
+  cursor: pointer;
+  font-size: 1rem;
+  font-weight: 700;
+}
+.expand-text.contracted button {
+  background: linear-gradient(
+    to right,
+    rgba(255, 255, 255, 0),
+    white 50%,
+    white 100%
+  );
+  position: absolute;
+  right: 0;
+  text-align: right;
+  bottom: 0;
+  width: 12rem;
+}
diff --git a/src/expand-text.jsx b/src/expand-text.jsx
new file mode 100644
index 0000000..3e4c825
--- /dev/null
+++ b/src/expand-text.jsx
@@ -0,0 +1,17 @@
+import { useState } from "preact/hooks";
+
+import Icon from "./icon";
+
+export default function ExpandText({ children }) {
+  const [expanded, setExpanded] = useState(false);
+
+  return (
+    <div class={`expand-text ${expanded ? "expanded" : "contracted"}`}>
+      {children}
+      <button class="expand-button" onClick={() => setExpanded(!expanded)}>
+        <Icon name={`caret-${expanded ? "up" : "left"}-fill`} />
+        {expanded ? "Less" : "More"}
+      </button>
+    </div>
+  );
+}
diff --git a/src/resource-catalog.jsx b/src/resource-catalog.jsx
index 52cb9c1..dec6c78 100644
--- a/src/resource-catalog.jsx
+++ b/src/resource-catalog.jsx
@@ -5,6 +5,7 @@ import baseStyle from "./base.css?inline";
 import componentsStyle from "./components.css?inline";
 import contentStyle from "./content.css?inline";
 import donutChartStyle from "./donut-chart.css?inline";
+import expandTextStyle from "./expand-text.css?inline";
 import iconStyle from "./icon.css?inline";
 import infoTipStyle from "./info-tip.css?inline";
 import glideCoreStyle from "@glidejs/glide/dist/css/glide.core.min.css?inline";
@@ -57,6 +58,7 @@ export function ResourceCatalog({
       <style>{accordionStyle}</style>
       <style>{alertStyle}</style>
       <style>{donutChartStyle}</style>
+      <style>{expandTextStyle}</style>
       <style>{iconStyle}</style>
       <style>{infoTipStyle}</style>
       <style>{glideCoreStyle}</style>
diff --git a/src/resource-group-event.css b/src/resource-group-event.css
index 715a324..c35d065 100644
--- a/src/resource-group-event.css
+++ b/src/resource-group-event.css
@@ -1,3 +1,6 @@
+.event:not(:last-child) {
+  margin-bottom: 1.5rem;
+}
 .event-icon,
 .event-icon:active,
 .event-icon:focus,
diff --git a/src/resource-group-event.jsx b/src/resource-group-event.jsx
index cc26bee..9434642 100644
--- a/src/resource-group-event.jsx
+++ b/src/resource-group-event.jsx
@@ -1,17 +1,25 @@
+import { extractHref, htmlToJsx } from "./utils";
+
+import ExpandText from "./expand-text";
 import Icon from "./icon";
 
 export default function ResourceGroupEvent({
-  title,
-  startDateTime,
-  endDateTime,
-  eventUri,
-  speaker,
+  date__end,
+  date__start,
   description,
+  location,
+  registration,
+  speaker,
+  title,
 }) {
+  const eventUri = extractHref(registration || "");
   const headingContent = eventUri ? <a href={eventUri}>{title}</a> : title;
   const metadata = [];
   let icon = null;
 
+  // Start and end time
+  const startDateTime = date__start;
+  const endDateTime = date__end;
   if (startDateTime) {
     const start = new Date(startDateTime);
     const end = new Date(endDateTime || startDateTime);
@@ -33,6 +41,12 @@ export default function ResourceGroupEvent({
     parts.push(`(${tz})`);
     metadata.push(<Icon name="calendar" />, parts.join(" "));
 
+    // Speaker
+    if (speaker) metadata.push(<Icon name="people-fill" />, speaker);
+
+    // Event location
+    if (location) metadata.push(<Icon name="geo-alt-fill" />, location);
+
     const iconContent = start
       .toLocaleString("en-US", { dateStyle: "medium" })
       .split(",")[0]
@@ -47,15 +61,17 @@ export default function ResourceGroupEvent({
     );
   }
 
-  if (speaker) metadata.push(<Icon name="people-fill" />, speaker);
-
   return (
     <div class="event">
       {icon}
       <div class="event-details">
         <h3>{headingContent}</h3>
         {metadata.length ? <div class="event-metadata">{metadata}</div> : null}
-        {description ? <p>{description}</p> : null}
+        {description ? (
+          <ExpandText>
+            <p>{htmlToJsx(description)}</p>
+          </ExpandText>
+        ) : null}
       </div>
     </div>
   );
diff --git a/src/resource-group-events.jsx b/src/resource-group-events.jsx
index 9151a06..27f4826 100644
--- a/src/resource-group-events.jsx
+++ b/src/resource-group-events.jsx
@@ -9,10 +9,18 @@ export default function ResourceGroupEvents({ baseUri, infoGroupId }) {
     `${baseUri}/api/resource-groups/${infoGroupId}/announcements.json`,
     null
   );
-  const eventData = useJSON(
-    `${baseUri}/api/resource-groups/${infoGroupId}/events.json`,
-    null
+  // FIXME: Once events can be looked up by info_groupid, the request to get
+  // affinity group data can be removed.
+  const affinityGroupData = useJSON(
+    `https://support.access-ci.org/api/1.0/affinity_groups/${infoGroupId}`,
+    null,
+    { corsProxy: true }
   );
+  const eventUri =
+    affinityGroupData && !affinityGroupData.error && affinityGroupData.length
+      ? `https://support.access-ci.org/api/1.0/events/ag/${affinityGroupData[0].nid}`
+      : null;
+  const eventData = useJSON(eventUri, null, { corsProxy: true });
   if (!announcementData && !eventData) return;
   return (
     <Section title="Announcements and Events" icon="calendar3">
@@ -27,7 +35,7 @@ export default function ResourceGroupEvents({ baseUri, infoGroupId }) {
             </Alert>
           )
         )}
-      {eventData && eventData.events.map((event) => ResourceGroupEvent(event))}
+      {eventData && eventData.map((event) => ResourceGroupEvent(event))}
     </Section>
   );
 }

From 14132410a5cb37a40852591b3f9875b72789d22b Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Tue, 15 Oct 2024 10:55:59 -0400
Subject: [PATCH 048/113] feat(resource-group-discussion): use data from the
 Ask.CI API

---
 src/resource-group-affinity-group.jsx |  8 +--
 src/resource-group-discussion.jsx     | 79 +++++++++++++++++++++++----
 2 files changed, 72 insertions(+), 15 deletions(-)

diff --git a/src/resource-group-affinity-group.jsx b/src/resource-group-affinity-group.jsx
index 29404d7..b846f95 100644
--- a/src/resource-group-affinity-group.jsx
+++ b/src/resource-group-affinity-group.jsx
@@ -12,10 +12,10 @@ export default function ResourceGroupAffinityGroup({ baseUri, infoGroupId }) {
   if (!data || data.error || !data.length) return;
   const slackUri = stripTags(data[0].slack_link);
   return (
-    <Section title="Affinity Group" icon="people-fill">
+    <Section title="User Community" icon="people-fill">
       <p>
-        Join the community! Members get update about announcements, events, and
-        outages.
+        Join the community by participating in an affinity group! Members get
+        update about announcements, events, and outages.
       </p>
       <a href="https://support.access-ci.org/user" class="btn secondary">
         <Icon name="person-plus-fill" /> Join Affinity Group
@@ -25,7 +25,7 @@ export default function ResourceGroupAffinityGroup({ baseUri, infoGroupId }) {
           <Icon name="slack" /> Connect on Slack
         </a>
       ) : null}
-      <a href="#ask-ci-topics" class="btn">
+      <a href="#questions-and-answers" class="btn">
         <Icon name="chat-fill" /> Ask and Answer Questions
       </a>
     </Section>
diff --git a/src/resource-group-discussion.jsx b/src/resource-group-discussion.jsx
index cb485e8..2d5a20c 100644
--- a/src/resource-group-discussion.jsx
+++ b/src/resource-group-discussion.jsx
@@ -1,46 +1,103 @@
 import { useJSON } from "./utils";
 
 import Grid from "./grid";
+import Icon from "./icon";
 import Section from "./section";
 
+const getCategoryUri = (category, siteData) => {
+  if (!category) return null;
+  let uri = `${category.slug}/${category.id}.json`;
+  let currentCategory = category;
+  while (currentCategory.parent_category_id) {
+    currentCategory = siteData.categories.find(
+      (cat) => cat.id == currentCategory.parent_category_id
+    );
+    uri = `${currentCategory.slug}/${uri}`;
+  }
+  return `https://ask.cyberinfrastructure.org/c/${uri}`;
+};
+
 export default function ResourceGroupDiscussion({ baseUri, infoGroupId }) {
-  const data = useJSON(
-    `${baseUri}/api/resource-groups/${infoGroupId}/discussion.json`,
-    null
+  const siteData = useJSON(
+    `https://ask.cyberinfrastructure.org/site.json`,
+    null,
+    {
+      corsProxy: true,
+    }
   );
+  // Try to find a category with a slug that matches the info group ID.
+  // TODO: Replace this with better logic once the CID and slug are available
+  // in the Support APIs.
+  const slugNeedle = infoGroupId.split(".")[0].replace(/[^a-z]/g, "");
+  const category =
+    !siteData || siteData.error
+      ? null
+      : siteData.categories.find((cat) =>
+          cat.slug.split("-").includes(slugNeedle)
+        );
+
+  const categoryDataUri = getCategoryUri(category, siteData);
+  const categoryData = useJSON(categoryDataUri, null, {
+    corsProxy: true,
+  });
 
-  if (!data || data.error) return;
+  if (
+    !categoryData ||
+    categoryData.error ||
+    !categoryData.topic_list ||
+    !categoryData.topic_list.topics ||
+    !categoryData.topic_list.topics.length
+  )
+    return;
 
   const columns = [
     {
-      key: "topic",
+      key: "title",
       name: "Topic",
-      format: (value, row) => <a href={row.topicUri}>{value}</a>,
+      format: (value, row) => (
+        <>
+          {row.pinned ? <Icon name="pin-fill" /> : null}
+          <a
+            href={`https://ask.cyberinfrastructure.org/t/${row.slug}/${row.id}`}
+          >
+            {value}
+          </a>
+        </>
+      ),
+    },
+    {
+      key: "posts_count",
+      name: "Posts",
+      format: (value) => value.toLocaleString("en-us"),
     },
     {
-      key: "updateDate",
+      key: "bumped_at",
       name: "Last Update",
       format: (value) =>
         new Date(value).toLocaleString("en-US", { dateStyle: "medium" }),
     },
   ];
 
+  const categoryWebUri = categoryDataUri.replace(/\.json$/, "");
   const headerComponents = [
-    <a href={data.categoryUri} class="btn secondary">
+    <a href={categoryWebUri} class="btn secondary">
       Ask a Question
     </a>,
-    <a href={data.categoryUri} class="btn">
+    <a href={categoryWebUri} class="btn">
       View All Topics
     </a>,
   ];
 
   return (
     <Section
-      title="Ask.CI Topics"
+      title="Questions and Answers"
       icon="chat-fill"
       headerComponents={headerComponents}
     >
-      <Grid columns={columns} rows={data.topics} />
+      <Grid
+        columns={columns}
+        rows={categoryData.topic_list.topics.slice(0, 5)}
+      />
     </Section>
   );
 }

From 46fc4f5fa9e129bf3eb669b6080f83971630fe97 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Mon, 21 Oct 2024 13:58:23 -0400
Subject: [PATCH 049/113] feat(resource-group-software): load software data
 from SDS API

---
 .env                                     |  1 +
 .github/workflows/build-deploy-pages.yml |  2 +
 src/resource-group-software.jsx          | 85 +++++++++++++++++++++---
 3 files changed, 77 insertions(+), 11 deletions(-)
 create mode 100644 .env

diff --git a/.env b/.env
new file mode 100644
index 0000000..4bd8e0a
--- /dev/null
+++ b/.env
@@ -0,0 +1 @@
+VITE_SDS_API_KEY=z0CiQbts8t4pnv6fJQD4g9nskbCOl6UD-67akYK68wk
\ No newline at end of file
diff --git a/.github/workflows/build-deploy-pages.yml b/.github/workflows/build-deploy-pages.yml
index fbc5c55..f598290 100644
--- a/.github/workflows/build-deploy-pages.yml
+++ b/.github/workflows/build-deploy-pages.yml
@@ -28,6 +28,8 @@ jobs:
         run: npm ci
       - name: Build project
         run: npm run build
+        env:
+          VITE_SDS_API_KEY: ${{ secrets.VITE_SDS_API_KEY }}
       - name: Copy index to 404 page
         run: cp dist/index.html dist/404.html
       - name: Setup Pages
diff --git a/src/resource-group-software.jsx b/src/resource-group-software.jsx
index 79b7845..cd2fdc1 100644
--- a/src/resource-group-software.jsx
+++ b/src/resource-group-software.jsx
@@ -4,48 +4,111 @@ import Fuse from "fuse.js";
 
 import Grid from "./grid";
 import Highlight from "./highlight";
+import Icon from "./icon";
 import Search from "./search";
 import Section from "./section";
 
+const apiFields = [
+  "software_name",
+  "software_description",
+  "software_web_page",
+  "software_documentation",
+  "software_use_link",
+];
+
 export default function ResourceGroupSoftware({ baseUri, infoGroupId }) {
   const data = useJSON(
-    `${baseUri}/api/resource-groups/${infoGroupId}/software.json`,
+    `https://ara-db.ccs.uky.edu/api=API_0/${
+      import.meta.env.VITE_SDS_API_KEY
+    }/rp=${infoGroupId}?include=${apiFields.join(",")}`,
     null
   );
   const [searchText, setSearchText] = useState("");
   const fuse = useMemo(
     () =>
-      data && !data.error
-        ? new Fuse(data.software, {
+      data && data.length
+        ? new Fuse(data, {
             keys: [
-              { name: "name", weight: 0.7 },
-              { name: "summary", weight: 0.3 },
+              { name: "software_name", weight: 0.6 },
+              { name: "software_description", weight: 0.4 },
             ],
           })
         : null,
     [data]
   );
-  if (!data || data.error) return;
+  if (!data || !data.length) return;
 
   const highlightFormat = (value) => (
     <Highlight text={value} highlight={searchText} />
   );
+  const nameFormat = (value, row) => {
+    const result = [];
+    const name = highlightFormat(value);
+    const nameLink = row.software_web_page || row.software_documentation;
+    result.push(nameLink ? <a href={nameLink}>{name}</a> : name);
+    if (row.software_documentation)
+      result.push(
+        <> </>,
+        <a
+          href={row.software_documentation}
+          title={`Documentation for ${value}`}
+        >
+          <Icon name="book" />
+        </a>
+      );
+    if (
+      row.software_use_link &&
+      row.software_use_link != row.software_documentation
+    )
+      result.push(
+        <> </>,
+        <a href={row.software_use_link} title={`Usage example for ${value}`}>
+          <Icon name="terminal" />
+        </a>
+      );
+    return <span style={{ lineHeight: 1.3 }}>{result}</span>;
+  };
+  const descriptionFormat = (value, row) => {
+    const sourcePattern = /Description Source:[ ]+(http[^ ]+)/;
+    const match = value.match(sourcePattern);
+    return (
+      <>
+        {highlightFormat(value.replace(sourcePattern, ""))}{" "}
+        {match ? (
+          <a
+            href={match[1]}
+            title={`Description source for ${row.software_name}`}
+          >
+            <Icon name="info-circle" />
+          </a>
+        ) : null}
+      </>
+    );
+  };
+  const versionsFormat = (value, row) => {
+    return value.map((item) => item.replace(`${row.rp_name}: `, ""));
+  };
   const columns = [
     {
-      key: "name",
+      key: "software_name",
       name: "Package",
-      format: highlightFormat,
+      format: nameFormat,
+    },
+    {
+      key: "software_versions",
+      name: "Versions",
+      format: versionsFormat,
     },
     {
-      key: "summary",
+      key: "software_description",
       name: "Description",
-      format: highlightFormat,
+      format: descriptionFormat,
     },
   ];
 
   const rows = searchText.length
     ? fuse.search(searchText).map((result) => result.item)
-    : data.software;
+    : data;
 
   const headerComponents = [
     <Search

From 9c83113f9de93fb1cf7c71112a6f7fdc52bb8410 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 23 Oct 2024 11:09:06 -0400
Subject: [PATCH 050/113] feat(resource-group-description): link Get Started
 button to Allocations site

---
 src/resource-group-description.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/resource-group-description.jsx b/src/resource-group-description.jsx
index ce1b405..93ec8c6 100644
--- a/src/resource-group-description.jsx
+++ b/src/resource-group-description.jsx
@@ -36,7 +36,7 @@ export default function ResourceGroupDescription({ baseUri, infoGroupId }) {
         </p>
       ) : null}
       {description ? <p>{description}</p> : null}
-      <a href="#" class="btn secondary lg">
+      <a href="https://allocations.access-ci.org" class="btn secondary lg">
         <Icon name="check2-circle" /> Get Started with {name}
       </a>
       {userGuideUri ? (

From 3c34ce1c676fbf2af9fd8966069ca8359a67a441 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 23 Oct 2024 11:11:19 -0400
Subject: [PATCH 051/113] feat(resource-group-events): filter events to include
 only future events

---
 src/resource-group-events.jsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/resource-group-events.jsx b/src/resource-group-events.jsx
index 27f4826..53423f1 100644
--- a/src/resource-group-events.jsx
+++ b/src/resource-group-events.jsx
@@ -21,7 +21,11 @@ export default function ResourceGroupEvents({ baseUri, infoGroupId }) {
       ? `https://support.access-ci.org/api/1.0/events/ag/${affinityGroupData[0].nid}`
       : null;
   const eventData = useJSON(eventUri, null, { corsProxy: true });
-  if (!announcementData && !eventData) return;
+  const filteredEvents =
+    eventData && !eventData.error
+      ? eventData.filter((event) => new Date(event.date__start) >= new Date())
+      : [];
+  if (!announcementData && !filteredEvents.length) return;
   return (
     <Section title="Announcements and Events" icon="calendar3">
       {announcementData &&
@@ -35,7 +39,7 @@ export default function ResourceGroupEvents({ baseUri, infoGroupId }) {
             </Alert>
           )
         )}
-      {eventData && eventData.map((event) => ResourceGroupEvent(event))}
+      {filteredEvents.map((event) => ResourceGroupEvent(event))}
     </Section>
   );
 }

From 60f9dd0e791b48128980973455c45c7db1106397 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 23 Oct 2024 11:18:47 -0400
Subject: [PATCH 052/113] feat(resource-home): use resource group data exported
 from CIDeR

---
 public/api/resource-groups.json | 213 +++++++++++++++++++++++++-------
 src/resource-group-projects.jsx |   2 +-
 src/resource-group.jsx          |   4 +-
 src/resource-home.jsx           |  94 +++++++++-----
 4 files changed, 234 insertions(+), 79 deletions(-)

diff --git a/public/api/resource-groups.json b/public/api/resource-groups.json
index cedb081..161f92a 100644
--- a/public/api/resource-groups.json
+++ b/public/api/resource-groups.json
@@ -1,60 +1,179 @@
 {
-  "resourceCategories": [
+  "groups": [
     {
-      "resourceCategoryId": 1,
-      "name": "General Purpose Compute & Storage",
-      "order": 1
+      "infoGroupid": "aces.tamu.access-ci.org",
+      "name": "ACES",
+      "description": "Accelerating Computing for Emerging Sciences (ACES) is a NSF-Category II-funded test bed (award number 2112356) that offers state of the art GPUs and other novel accelerators in a composable environment.",
+      "groupTypes": ["resource-catalog.access-ci.org"],
+      "groupLogoUrl": "/groups/1/group_logo",
+      "infoResourceids": ["aces.tamu.access-ci.org"]
     },
     {
-      "resourceCategoryId": 2,
-      "name": "Specialized Compute & Storage",
-      "order": 2
+      "infoGroupid": "anvil.purdue.access-ci.org",
+      "name": "Anvil",
+      "description": "Purdue University is the home of Anvil, a powerful new supercomputer that provides advanced computing capabilities to support a wide range of computational and data-intensive research spanning from traditional high-performance computing to modern artificial intelligence applications.",
+      "groupTypes": ["resource-catalog.access-ci.org"],
+      "groupLogoUrl": "/groups/2/group_logo",
+      "infoResourceids": [
+        "anvil-gpu.purdue.access-ci.org",
+        "anvil.purdue.access-ci.org"
+      ]
     },
-    { "resourceCategoryId": 3, "name": "Coordination & Support", "order": 3 }
-  ],
-  "resourceGroups": [
     {
-      "infoGroupId": "bridges2.psc.access-ci.org",
+      "infoGroupid": "bridges2.psc.access-ci.org",
       "name": "Bridges-2",
-      "summary": "Bridges-2 is an integrated compute and storage platform that combines traditional high-performance computing with artificial intelligence and big data capabilities.",
-      "imageType": "photo",
-      "imageUri": "https://i0.wp.com/www.psc.edu/wp-content/uploads/2024/02/bridges-2-50.png?w=694&ssl=1",
-      "resourceCategoryId": 1,
-      "tagIds": [1, 3, 4, 5, 6]
+      "description": "Bridges-2, a resource of Pittsburgh Supercomputing Center, is designed for converged HPC + AI + Data. Its custom topology is optimized for data-centric HPC, AI, and HPDA (High Performance Data Analytics). An extremely flexible software environment along with community data collections and BDaaS (Big Data as a Service) provide the tools necessary for modern pioneering research. The data management system, Ocean, consists of two-tiers, disk and tape, transparently managed as a single, highly usable namespace.",
+      "groupTypes": ["resource-catalog.access-ci.org"],
+      "groupLogoUrl": "/groups/3/group_logo",
+      "infoResourceids": [
+        "bridges2-em.psc.access-ci.org",
+        "bridges2-gpu.psc.access-ci.org",
+        "bridges2-gpu-ai.psc.access-ci.org",
+        "bridges2-rm.psc.access-ci.org",
+        "bridges2-ocean.psc.access-ci.org"
+      ]
     },
     {
-      "infoGroupId": "jetstream2.indiana.access-ci.org",
+      "infoGroupid": "delta.ncsa.access-ci.org",
+      "name": "DELTA",
+      "description": "DELTA is a dedicated, ACCESS-allocated resource designed by HPE and NCSA, delivering a highly capable GPU-focused compute environment for GPU and CPU workloads.",
+      "groupTypes": ["resource-catalog.access-ci.org"],
+      "groupLogoUrl": "/groups/35/group_logo",
+      "infoResourceids": [
+        "delta-cpu.ncsa.access-ci.org",
+        "delta-gpu.ncsa.access-ci.org",
+        "delta-storage.ncsa.access-ci.org",
+        "deltaai.ncsa.access-ci.org"
+      ]
+    },
+    {
+      "infoGroupid": "expanse.sdsc.access-ci.org",
+      "name": "Expanse",
+      "description": "Expanse is a dedicated ACCESS cluster designed by Dell and SDSC delivering 5.16 peak petaflops, and will offer Composable Systems and Cloud Bursting.",
+      "groupTypes": ["resource-catalog.access-ci.org"],
+      "groupLogoUrl": "/groups/37/group_logo",
+      "infoResourceids": [
+        "expanse-gpu.sdsc.access-ci.org",
+        "expanse-ps.sdsc.access-ci.org",
+        "expanse.sdsc.access-ci.org"
+      ]
+    },
+    {
+      "infoGroupid": "faster.tamu.access-ci.org",
+      "name": "FASTER",
+      "description": "Fostering Accelerated Scientific Transformations, Education, and Research (FASTER) is a NSF-MRI-funded cluster (award number 2019129) that offers state of the art CPUs, GPUs, and NVMe (Non-Volatile MemoryExpress) based storage in a composable environment.",
+      "groupTypes": ["resource-catalog.access-ci.org"],
+      "groupLogoUrl": "/groups/38/group_logo",
+      "infoResourceids": ["faster.tamu.access-ci.org"]
+    },
+    {
+      "infoGroupid": "derecho.ncar.access-ci.org",
+      "name": "Derecho",
+      "description": "Installed in 2023, Derecho is NCAR's latest supercomputer. The HPE Cray EX cluster is a 19.87-petaflops system. University researchers and NSF NCAR scientists can use Derecho to pursue work in Earth systems science and related sciences.",
+      "groupTypes": ["resource-catalog.access-ci.org"],
+      "groupLogoUrl": "/groups/36/group_logo",
+      "infoResourceids": ["derecho-gpu.ncar.ucar.edu", "derecho.ncar.ucar.edu"]
+    },
+    {
+      "infoGroupid": "granite.ncsa.access-ci.org",
+      "name": "Granite",
+      "description": "Granite is NCSA’s tape archive system, closely integrated with Taiga, to provide users with a place to store long-term archive datasets. The system is built using a 19-frame Spectra TFinity tape library outfitted with 20 LTO-9 tape drives and can hold over 300PB of replicated data.",
+      "groupTypes": ["resource-catalog.access-ci.org"],
+      "groupLogoUrl": "/groups/39/group_logo",
+      "infoResourceids": ["granite.ncsa.access-ci.org"]
+    },
+    {
+      "infoGroupid": "osg.access-ci.org",
+      "name": "Open Science Grid",
+      "description": "The OSG provides technologies and services for supporting pools of distributed high-throughput computing (dHTC) and data capacity that serve a number of research communities, worldwide. Among these services, the OSG operates the Open Science Pool (OSPool), which includes capacity contributed from clusters at campuses and national labs across and beyond the US, organized as a single virtual cluster.",
+      "groupTypes": ["resource-catalog.access-ci.org"],
+      "groupLogoUrl": "/groups/40/group_logo",
+      "infoResourceids": ["grid1.osg.access-ci.org"]
+    },
+    {
+      "infoGroupid": "hive.gatech.access-ci.org",
+      "name": "Hive",
+      "description": "The Partnership for an Advanced Computing Environment (PACE) at Georgia Institute of Technology has deployed a new high performance computing (HPC) cluster, Hive.",
+      "groupTypes": ["resource-catalog.access-ci.org"],
+      "groupLogoUrl": "/groups/41/group_logo",
+      "infoResourceids": ["hive.gatech.access-ci.org"]
+    },
+    {
+      "infoGroupid": "jetstream2.indiana.access-ci.org",
       "name": "Jetstream2",
-      "summary": "Jetstream2 is a hybrid-cloud platform that provides flexible, on-demand, programmable cyberinfrastructure, including interactive virtual machine services.",
-      "imageType": "logo",
-      "imageUri": "https://jetstream-cloud.org/images/home/jetstream-2.png",
-      "resourceCategoryId": 1,
-      "tagIds": [2, 3, 4, 5, 6, 7]
+      "description": "Jetstream2 is a transformative update to the NSF’s science and engineering cloud infrastructure and provides 8 petaFLOPS of supercomputing power to simplify data analysis, boost discovery, and increase availability of AI resources. It is an NSF-funded, user-friendly cloud environment designed to allow “always on” research infrastructure and to give researchers access to interactive computing and data analysis resources on demand, whenever and wherever they want to analyze their data.",
+      "groupTypes": ["resource-catalog.access-ci.org"],
+      "groupLogoUrl": "/groups/42/group_logo",
+      "infoResourceids": [
+        "jetstream2-gpu.indiana.access-ci.org",
+        "jetstream2-lm.indiana.access-ci.org",
+        "jetstream2-storage.indiana.access-ci.org",
+        "jetstream2.indiana.access-ci.org"
+      ]
+    },
+    {
+      "infoGroupid": "kyric.uky.access-ci.org",
+      "name": "KyRIC",
+      "description": "The KyRIC cluster will advance several exciting research programs across many disciplines, such as Bioinformatics and System Biology Algorithms, Large Graph and Evolutionary Network Analysis, Image Processing, and Computational Modeling and Simulation.",
+      "groupTypes": ["resource-catalog.access-ci.org"],
+      "groupLogoUrl": "/groups/43/group_logo",
+      "infoResourceids": ["kyric.uky.access-ci.org"]
+    },
+    {
+      "infoGroupid": "launch.tamu.access-ci.org",
+      "name": "Launch",
+      "description": "Launch is a Dell cluster with AMD EPYC Genoa 9654 processors and NVIDIA A30 GPUs. The compute nodes are interconnected with HDR100 InfiniBand connections for MPI and access to the NFS storage.",
+      "groupTypes": ["resource-catalog.access-ci.org"],
+      "groupLogoUrl": null,
+      "infoResourceids": ["launch.tamu.access-ci.org"]
+    },
+    {
+      "infoGroupid": "neocortex.psc.access-ci.org",
+      "name": "Neocortex",
+      "description": "Neocortex is a highly innovative resource that targets the acceleration of AI-powered scientific discovery by greatly shortening the time required for deep learning training and by fostering greater integration of artificial deep learning with scientific workflows. The revolutionary hardware in Neocortex facilitates the development of more efficient algorithms for artificial intelligence and graph analytics.",
+      "groupTypes": ["resource-catalog.access-ci.org"],
+      "groupLogoUrl": "/groups/45/group_logo",
+      "infoResourceids": ["neocortex-sdflex.psc.access-ci.org"]
+    },
+    {
+      "infoGroupid": "ookami.sbu.access-ci.org",
+      "name": "Ookami",
+      "description": "Ookami is a computer technology testbed supported by the National Science Foundation under grant OAC 1927880. It provides researchers with access to the A64FX processor developed by Riken and Fujitsu for the Japanese path to exascale computing and is currently deployed in the until June 2022 fastest computer in the world, Fugaku.",
+      "groupTypes": ["resource-catalog.access-ci.org"],
+      "groupLogoUrl": "/groups/46/group_logo",
+      "infoResourceids": ["ookami.sbu.access-ci.org"]
+    },
+    {
+      "infoGroupid": "osn.access-ci.org",
+      "name": "Open Storage Network",
+      "description": "The Open Storage Network (OSN) is a distributed data sharing and transfer service intended to facilitate exchanges of active scientific data sets between research organizations, communities and projects, providing easy access and high bandwidth delivery of large data sets to researchers.",
+      "groupTypes": ["resource-catalog.access-ci.org"],
+      "groupLogoUrl": "/groups/47/group_logo",
+      "infoResourceids": ["osn.osn.access-ci.org"]
+    },
+    {
+      "infoGroupid": "ranch.tacc.access-ci.org",
+      "name": "Ranch",
+      "description": "TACC's High Performance Computing (HPC) systems are used primarily for scientific computing and while their disk systems are large, they are unable to store the long-term final data generated on these systems. The Ranch archive system fills this need for high capacity long-term storage, by providing a massive high performance file system and tape-based backing store designed, implemented, and supported specifically for archival purposes.",
+      "groupTypes": ["resource-catalog.access-ci.org"],
+      "groupLogoUrl": "/groups/48/group_logo",
+      "infoResourceids": ["ranch.tacc.access-ci.org"]
+    },
+    {
+      "infoGroupid": "stampede3.tacc.access-ci.org",
+      "name": "Stampede3",
+      "description": "Stampede3 is generously funded through the National Science Foundation and is designed to serve today's researchers as well as support the research community on an evolutionary path toward many-core processors and accelerated technologies. Stampede 3 maintains the familiar programming model for all of today's users, and thus will be broadly useful for traditional simulation users, users performing data intensive computations, and emerging classes of new users.",
+      "groupTypes": ["resource-catalog.access-ci.org"],
+      "groupLogoUrl": "/groups/49/group_logo",
+      "infoResourceids": ["stampede3.tacc.access-ci.org"]
+    },
+    {
+      "infoGroupid": "voyager.sdsc.access-ci.org",
+      "name": "Voyager",
+      "description": "Voyager is an innovative AI system designed specifically for science and engineering research at scale. Voyager is focused on supporting research in science and engineering that is increasingly dependent upon artificial intelligence and deep learning as a critical element in the experimental and/or computational work.",
+      "groupTypes": ["resource-catalog.access-ci.org"],
+      "groupLogoUrl": "/groups/50/group_logo",
+      "infoResourceids": ["voyager.sdsc.access-ci.org"]
     }
-  ],
-  "tags": [
-    {
-      "tagId": 1,
-      "name": "Pittsburgh Supercomputing Center",
-      "iconUri": "https://i0.wp.com/www.psc.edu/wp-content/uploads/2020/09/cropped-PSClogo_Gradient-e1600870263745.jpg?fit=32%2C32&ssl=1",
-      "tagCategoryId": 1,
-      "order": 1
-    },
-    {
-      "tagId": 2,
-      "name": "Indiana University",
-      "iconUri": "https://www.iu.edu/favicon.ico",
-      "tagCategoryId": 1,
-      "order": 2
-    },
-    { "tagId": 3, "name": "CPU", "tagCategoryId": 2, "order": 1 },
-    { "tagId": 4, "name": "GPU", "tagCategoryId": 2, "order": 2 },
-    { "tagId": 5, "name": "Storage", "tagCategoryId": 2, "order": 3 },
-    { "tagId": 6, "name": "Large Memory", "tagCategoryId": 2, "order": 4 },
-    { "tagId": 7, "name": "Virtual Machines", "tagCategoryId": 2, "order": 5 }
-  ],
-  "tagCategories": [
-    { "tagCategoryId": 1, "name": "Resource Provider", "order": 1 },
-    { "tagCategoryId": 2, "name": "Compute & Storage Feature", "order": 2 }
   ]
 }
diff --git a/src/resource-group-projects.jsx b/src/resource-group-projects.jsx
index b2ce1d8..9c44d48 100644
--- a/src/resource-group-projects.jsx
+++ b/src/resource-group-projects.jsx
@@ -34,7 +34,7 @@ export default function ResourceGroupProjects({ baseUri, infoGroupId }) {
   const apiUrl = `${apiBaseUrl}?info_groupid=${infoGroupId}&persona=${persona}`;
   const data = useJSON(apiUrl, null, { corsProxy: true });
 
-  if (!data || data.error) return;
+  if (!data || data.error || !data.projectStatistics.length) return;
 
   const stats = {
     "allocation-type": [],
diff --git a/src/resource-group.jsx b/src/resource-group.jsx
index 4687be9..461efa1 100644
--- a/src/resource-group.jsx
+++ b/src/resource-group.jsx
@@ -4,10 +4,10 @@ import { Tags } from "./tags";
 export function ResourceGroup({
   active,
   baseUri,
+  description,
   imageType,
   imageUri,
   name,
-  summary,
   infoGroupId,
   tags,
   toggleTag,
@@ -31,7 +31,7 @@ export function ResourceGroup({
           ))}
         </Tags>
         <p>
-          {summary && summary}{" "}
+          {description && description}{" "}
           <a href={detailUri}>Learn more about {name} &raquo;</a>
         </p>
       </div>
diff --git a/src/resource-home.jsx b/src/resource-home.jsx
index a37b109..ee21883 100644
--- a/src/resource-home.jsx
+++ b/src/resource-home.jsx
@@ -5,37 +5,67 @@ import { Carousel, CarouselSlide } from "./carousel";
 import { ResourceCategory } from "./resource-category";
 import { ResourceFilters } from "./resource-filters";
 
-const linkGroupData = ({
-  resourceCategories,
-  resourceGroups,
-  tags,
-  tagCategories,
-}) => {
-  const tagCategoryMap = {};
-  for (let tagCategory of tagCategories) {
-    tagCategory.tags = [];
-    tagCategoryMap[tagCategory.tagCategoryId] = tagCategory;
-  }
-
-  const tagMap = {};
-  for (let tag of tags) {
-    tag.tagCategory = tagCategoryMap[tag.tagCategoryId];
-    tag.tagCategory.tags.push(tag);
-    tag.resources = [];
-    tagMap[tag.tagId] = tag;
-  }
+const makeMap = (items, key) => {
+  const map = {};
+  for (let item of items) map[item[key]] = item;
+  return map;
+};
 
-  const resourceCategoryMap = {};
-  for (let resourceCategory of resourceCategories) {
-    resourceCategory.resourceGroups = [];
-    resourceCategoryMap[resourceCategory.resourceCategoryId] = resourceCategory;
-  }
+const linkGroupData = ({ groups: resourceGroups }, { results: resources }) => {
+  const tagCategories = [
+    {
+      tagCategoryId: 1,
+      name: "Resource Provider",
+      tags: [],
+    },
+  ];
+  const resourceCategories = [
+    {
+      resourceCategoryId: 1,
+      name: "Compute & Storage Resources",
+      resourceGroups: [],
+      resourceGroupIds: [],
+    },
+  ];
+  let nextTagId = 1;
+  const tags = [];
+  const rpTagMap = {};
+  const resourceMap = makeMap(resources, "info_resourceid");
+  const tagCategoryMap = makeMap(tagCategories, "tagCategoryId");
+  const resourceCategoryMap = makeMap(resourceCategories, "resourceCategoryId");
 
   for (let resourceGroup of resourceGroups) {
-    resourceGroup.resourceCategory =
-      resourceCategoryMap[resourceGroup.resourceCategoryId];
+    resourceGroup.infoGroupId = resourceGroup.infoGroupid;
+    delete resourceGroup.infoGroupid;
+    resourceGroup.tags = [];
+    resourceGroup.tagIds = [];
+    for (let infoResourceId of resourceGroup.infoResourceids) {
+      let resource = resourceMap[infoResourceId];
+      if (resource.organization_name) {
+        let tag = rpTagMap[resource.organization_name];
+        if (!tag) {
+          tag = {
+            tagId: nextTagId++,
+            tagCategoryId: 1,
+            name: resource.organization_name,
+          };
+          tags.push(tag);
+          rpTagMap[resource.organization_name] = tag;
+          tagCategoryMap[1].tags.push(tag);
+          tag.tagCategory = tagCategoryMap[1];
+        }
+        if (!resourceGroup.tagIds.includes(tag.tagId)) {
+          resourceGroup.tagIds.push(tag.tagId);
+          resourceGroup.tags.push(tag);
+        }
+      }
+    }
+    resourceGroup.resourceCategoryId = 1;
+    resourceGroup.resourceCategory = resourceCategoryMap[1];
     resourceGroup.resourceCategory.resourceGroups.push(resourceGroup);
-    resourceGroup.tags = resourceGroup.tagIds.map((tagId) => tagMap[tagId]);
+    resourceGroup.resourceCategory.resourceGroupIds.push(
+      resourceGroup.infoGroupId
+    );
   }
 
   return { resourceCategories, resourceGroups, tags, tagCategories };
@@ -106,9 +136,15 @@ export default function ResourceHome({
   const [activeTagIds, setActiveTagIds] = useState([]);
   const slides = useJSON(`${baseUri}${slidesURI}`, null);
   const allGroups = useJSON(`${baseUri}${groupsURI}`, null);
+  const allResources = useJSON(
+    "https://operations-api.access-ci.org/wh2/cider/v2/access-active/"
+  );
   const groups = useMemo(
-    () => (allGroups && !allGroups.error ? linkGroupData(allGroups) : null),
-    [allGroups]
+    () =>
+      allGroups && !allGroups.error && allResources && !allResources.error
+        ? linkGroupData(allGroups, allResources)
+        : null,
+    [allGroups, allResources]
   );
   const active = useMemo(
     () => (groups ? getActive(groups, activeTagIds) : null),

From aac7aa61562e8ee77b131cc68b5daf08384c4e9f Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 23 Oct 2024 14:25:11 -0400
Subject: [PATCH 053/113] fix(resource-filters): fix vertical alignment of
 dropdown menu

---
 src/resource-filters.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/resource-filters.css b/src/resource-filters.css
index 17823be..ecb5a58 100644
--- a/src/resource-filters.css
+++ b/src/resource-filters.css
@@ -8,7 +8,7 @@
   padding: 20px;
   position: absolute;
   right: 0;
-  top: 40px;
+  top: 42px;
   width: calc(var(--width) * 0.4);
 }
 .filters-inner h2 {

From 35f4b1740497b84e73e54528810f0047a22746dd Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 23 Oct 2024 15:06:57 -0400
Subject: [PATCH 054/113] feat(resource-pathways): add pathways buttons

---
 public/api/resource-slides.json |  2 +-
 src/carousel.css                | 34 ++++++++++-----
 src/resource-catalog.jsx        |  2 +
 src/resource-filters.css        |  2 +-
 src/resource-home.jsx           | 51 +++++++++++-----------
 src/resource-pathways.css       | 75 +++++++++++++++++++++++++++++++++
 src/resource-pathways.jsx       | 44 +++++++++++++++++++
 7 files changed, 174 insertions(+), 36 deletions(-)
 create mode 100644 src/resource-pathways.css
 create mode 100644 src/resource-pathways.jsx

diff --git a/public/api/resource-slides.json b/public/api/resource-slides.json
index e7013cb..7e13f07 100644
--- a/public/api/resource-slides.json
+++ b/public/api/resource-slides.json
@@ -2,7 +2,7 @@
   "slides": [
     {
       "title": "Stampede3 Now Available!",
-      "description": "Stampede3, the latest compute and storage resource from TACC, is now accepting allocation requests. This powerful Dell Technologies and Intel based supercomputer is the only system in the ACCESS environment to integrate the new Intel Max Series GPUs.",
+      "description": "Stampede3, the latest resource from TACC, is now accepting allocation requests. This powerful Dell Technologies and Intel based supercomputer is the only system in the ACCESS environment to integrate the new Intel Max Series GPUs.",
       "linkText": "Learn more about Stampede3",
       "linkURI": "https://tacc.utexas.edu/systems/stampede3/",
       "imageURI": "/access-ci-ui/images/stampede3.jpg",
diff --git a/src/carousel.css b/src/carousel.css
index 19cb3ea..f94525c 100644
--- a/src/carousel.css
+++ b/src/carousel.css
@@ -3,6 +3,7 @@
   width: var(--width);
 }
 .slide-inner {
+  background-color: var(--contrast-9);
   display: flex;
   flex-direction: column;
 }
@@ -11,18 +12,26 @@
   width: 100%;
 }
 .slide-text {
-  background-color: var(--teal-100);
   box-sizing: border-box;
   display: flex;
   flex-direction: column;
-  font-size: 14px;
   justify-content: center;
   padding: 20px;
 }
 .slide-text h2 {
-  font-size: 20px;
+  font-size: 16px;
+  line-height: 1.1;
   margin: 0 0 0.25rem;
 }
+.slide-text a {
+  font-size: 14px;
+  line-height: 1.1;
+}
+.slide-text p {
+  font-size: 14px;
+  line-height: 1.2;
+  margin-bottom: 0.5rem;
+}
 .glide__arrow {
   align-items: center;
   background-color: var(--contrast-3);
@@ -47,24 +56,29 @@
 .glide__arrow--right {
   margin-right: -66px;
 }
-@media (min-width: 900px) {
+@media (min-width: 768px) {
   .slide-inner {
     flex-direction: row;
   }
   .slide-image img {
-    width: calc(var(--width) * 5 / 8 + 80px);
+    width: calc((var(--width) - 20px) / 2);
   }
 }
 @media (min-width: 1024px) {
-  .slide-text {
-    font-size: 16px;
+  .slide-image img {
+    width: calc((var(--width) - 40px) / 3);
   }
 }
 @media (min-width: 1280px) {
-  .slide-text {
+  .slide-text h2 {
     font-size: 18px;
   }
-  .slide-text h2 {
-    font-size: 24px;
+  .slide-text a {
+    font-size: 16px;
+  }
+  .slide-text p {
+    font-size: 16px;
+    line-height: 1.2;
+    margin-bottom: 0.5rem;
   }
 }
diff --git a/src/resource-catalog.jsx b/src/resource-catalog.jsx
index dec6c78..de36682 100644
--- a/src/resource-catalog.jsx
+++ b/src/resource-catalog.jsx
@@ -17,6 +17,7 @@ import resourceFiltersStyle from "./resource-filters.css?inline";
 import resourceGroupStyle from "./resource-group.css?inline";
 import resourceGroupEventStyle from "./resource-group-event.css?inline";
 import resourceGroupProjectsStyle from "./resource-group-projects.css?inline";
+import resourcePathwaysStyle from "./resource-pathways.css?inline";
 import searchStyle from "./search.css?inline";
 import sectionNavigationStyle from "./section-navigation.css?inline";
 import tagsStyle from "./tags.css?inline";
@@ -70,6 +71,7 @@ export function ResourceCatalog({
       <style>{resourceGroupStyle}</style>
       <style>{resourceGroupEventStyle}</style>
       <style>{resourceGroupProjectsStyle}</style>
+      <style>{resourcePathwaysStyle}</style>
       <style>{searchStyle}</style>
       <style>{sectionNavigationStyle}</style>
       <style>{tagsStyle}</style>
diff --git a/src/resource-filters.css b/src/resource-filters.css
index ecb5a58..1da7307 100644
--- a/src/resource-filters.css
+++ b/src/resource-filters.css
@@ -8,7 +8,7 @@
   padding: 20px;
   position: absolute;
   right: 0;
-  top: 42px;
+  top: 41px;
   width: calc(var(--width) * 0.4);
 }
 .filters-inner h2 {
diff --git a/src/resource-home.jsx b/src/resource-home.jsx
index ee21883..755b1ee 100644
--- a/src/resource-home.jsx
+++ b/src/resource-home.jsx
@@ -4,6 +4,7 @@ import { useJSON } from "./utils";
 import { Carousel, CarouselSlide } from "./carousel";
 import { ResourceCategory } from "./resource-category";
 import { ResourceFilters } from "./resource-filters";
+import { ResourcePathways } from "./resource-pathways";
 
 const makeMap = (items, key) => {
   const map = {};
@@ -163,35 +164,37 @@ export default function ResourceHome({
   return (
     <>
       {title && <h1 class={showTitle ? "" : "visually-hidden"}>{title}</h1>}
+      <ResourcePathways />
       {slides && slides.slides.length ? (
         <Carousel>
           {slides.slides.map((slide) => CarouselSlide(slide))}
         </Carousel>
       ) : null}
-
-      {active ? (
-        <ResourceFilters
-          tagCategories={groups.tagCategories}
-          active={active}
-          clearTags={clearTags}
-          toggleTag={toggleTag}
-        />
-      ) : null}
-      {groups
-        ? groups.resourceCategories
-            .filter(({ resourceCategoryId }) =>
-              active.resourceCategoryIds.has(resourceCategoryId)
-            )
-            .map((resourceCategory) => (
-              <ResourceCategory
-                {...resourceCategory}
-                active={active}
-                baseUri={baseUri}
-                clearTags={clearTags}
-                toggleTag={toggleTag}
-              />
-            ))
-        : null}
+      <div id="browse-resources">
+        {active ? (
+          <ResourceFilters
+            tagCategories={groups.tagCategories}
+            active={active}
+            clearTags={clearTags}
+            toggleTag={toggleTag}
+          />
+        ) : null}
+        {groups
+          ? groups.resourceCategories
+              .filter(({ resourceCategoryId }) =>
+                active.resourceCategoryIds.has(resourceCategoryId)
+              )
+              .map((resourceCategory) => (
+                <ResourceCategory
+                  {...resourceCategory}
+                  active={active}
+                  baseUri={baseUri}
+                  clearTags={clearTags}
+                  toggleTag={toggleTag}
+                />
+              ))
+          : null}
+      </div>
     </>
   );
 }
diff --git a/src/resource-pathways.css b/src/resource-pathways.css
new file mode 100644
index 0000000..b1f0b7d
--- /dev/null
+++ b/src/resource-pathways.css
@@ -0,0 +1,75 @@
+ul.resource-pathways {
+  list-style-type: none;
+  margin: 0 0 20px;
+  padding: 0;
+}
+ul.resource-pathways li {
+  margin: 0 0 20px;
+}
+ul.resource-pathways li a {
+  align-items: center;
+  border: 5px solid transparent;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  padding: 35px;
+  text-decoration: none;
+}
+ul.resource-pathways a > .bi {
+  font-size: 3rem;
+  margin-bottom: 1rem;
+}
+ul.resource-pathways .title {
+  font-size: 1.4rem;
+}
+ul.resource-pathways .description {
+  font-weight: 400;
+}
+ul.resource-pathways .login {
+  font-size: 0.9rem;
+  font-style: italic;
+  font-weight: 400;
+}
+ul.resource-pathways .login .bi {
+  vertical-align: middle;
+}
+.resource-pathway-0 {
+  background-color: var(--yellow-400);
+}
+.resource-pathway-1 {
+  background-color: var(--teal-600);
+}
+.resource-pathway-1 a {
+  color: white;
+}
+.resource-pathway-2 {
+  background-color: var(--orange-400);
+}
+ul.resource-pathways li a:active,
+ul.resource-pathways li a:focus,
+ul.resource-pathways li a:hover {
+  background-color: white;
+  border: 5px solid var(--contrast);
+  color: var(--contrast);
+}
+@media (min-width: 768px) {
+  ul.resource-pathways {
+    display: flex;
+    flex-direction: row;
+  }
+  ul.resource-pathways li {
+    margin: 0 20px 0 0;
+    position: relative;
+  }
+  ul.resource-pathways li:last-child {
+    margin-right: 0;
+  }
+  ul.resource-pathways li a {
+    height: 100%;
+    width: calc((var(--width) - 40px) / 3);
+  }
+  ul.resource-pathways a > .bi {
+    font-size: 5rem;
+  }
+}
diff --git a/src/resource-pathways.jsx b/src/resource-pathways.jsx
new file mode 100644
index 0000000..a6f51d4
--- /dev/null
+++ b/src/resource-pathways.jsx
@@ -0,0 +1,44 @@
+import Icon from "./icon";
+
+export function ResourcePathways() {
+  const pathways = [
+    {
+      title: "Browse resources",
+      icon: "filter-square",
+      href: "#browse-resources",
+      description: "Filter resources to find the best match for your research.",
+    },
+    {
+      title: "Ask a question",
+      icon: "question-circle",
+      href: "https://support.access-ci.org/",
+      description: "You have resource questions. Our Q&A bot has answers!",
+      login: true,
+    },
+    {
+      title: "Take a quiz",
+      icon: "card-checklist",
+      href: "https://access-ara.ccs.uky.edu:8080/",
+      description:
+        "Tell us about your research to get resource recommendations.",
+    },
+  ];
+  return (
+    <ul class="resource-pathways">
+      {pathways.map(({ title, icon, href, description, login }, i) => (
+        <li class={`resource-pathway-${i}`}>
+          <a href={href}>
+            {icon ? <Icon name={icon} /> : null}
+            <span class="title">{title}</span>
+            <span class="description">{description}</span>
+            {login ? (
+              <span class="login">
+                <Icon name="key" /> Requires ACCESS Login
+              </span>
+            ) : null}
+          </a>
+        </li>
+      ))}
+    </ul>
+  );
+}

From a41234c53c7de077a77a9afdbf35726815d2ec44 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Mon, 28 Oct 2024 09:57:16 -0400
Subject: [PATCH 055/113] perf(resource-group-events): use events API version
 1.1

---
 src/resource-group-events.jsx | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/resource-group-events.jsx b/src/resource-group-events.jsx
index 53423f1..cf0dda6 100644
--- a/src/resource-group-events.jsx
+++ b/src/resource-group-events.jsx
@@ -9,18 +9,11 @@ export default function ResourceGroupEvents({ baseUri, infoGroupId }) {
     `${baseUri}/api/resource-groups/${infoGroupId}/announcements.json`,
     null
   );
-  // FIXME: Once events can be looked up by info_groupid, the request to get
-  // affinity group data can be removed.
-  const affinityGroupData = useJSON(
-    `https://support.access-ci.org/api/1.0/affinity_groups/${infoGroupId}`,
+  const eventData = useJSON(
+    `https://support.access-ci.org/api/1.1/events/ag/${infoGroupId}`,
     null,
     { corsProxy: true }
   );
-  const eventUri =
-    affinityGroupData && !affinityGroupData.error && affinityGroupData.length
-      ? `https://support.access-ci.org/api/1.0/events/ag/${affinityGroupData[0].nid}`
-      : null;
-  const eventData = useJSON(eventUri, null, { corsProxy: true });
   const filteredEvents =
     eventData && !eventData.error
       ? eventData.filter((event) => new Date(event.date__start) >= new Date())

From ef6c7657fdbf81331e40f8b5618ff989139984e2 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Mon, 28 Oct 2024 10:33:14 -0400
Subject: [PATCH 056/113] perf(utils): optionally cache JSON responses

---
 src/utils.jsx | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/utils.jsx b/src/utils.jsx
index 75b6bfc..07abd61 100644
--- a/src/utils.jsx
+++ b/src/utils.jsx
@@ -23,30 +23,37 @@ export const getScrollTop = () =>
     : (document.documentElement || document.body.parentNode || document.body)
         .scrollTop;
 
+const jsonCache = {};
 export const useJSON = (
   uri,
   defaultValue,
-  { corsProxy } = { corsProxy: false }
+  { cache = true, corsProxy = false } = { cache: true, corsProxy: false }
 ) => {
   const [value, setValue] = useState(defaultValue);
   useEffect(() => {
     if (uri)
-      (async () => {
-        const res = await fetch(
-          corsProxy ? `https://corsproxy.io/?${encodeURIComponent(uri)}` : uri
-        );
-        if (res.status < 200 || res.status > 299) {
-          setValue({ error: { status: res.status } });
-        } else {
-          let data;
-          try {
-            data = await res.json();
-          } catch (error) {
-            setValue({ error: { message: error } });
-          }
+      if (cache && jsonCache[uri]) {
+        setValue(jsonCache[uri]);
+        return;
+      }
+    (async () => {
+      const res = await fetch(
+        corsProxy ? `https://corsproxy.io/?${encodeURIComponent(uri)}` : uri
+      );
+      if (res.status < 200 || res.status > 299) {
+        setValue({ error: { status: res.status } });
+      } else {
+        let data;
+        try {
+          data = await res.json();
+        } catch (error) {
+          data = { error: { message: error } };
+        } finally {
           setValue(data);
+          if (cache) jsonCache[uri] = data;
         }
-      })();
+      }
+    })();
   }, [uri]);
   return value;
 };

From a351040b0dba3adc9eebd68091b5fde0b62d0188 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Mon, 28 Oct 2024 14:34:43 -0400
Subject: [PATCH 057/113] feat(resource-group-events): use announcement data
 from the Operations API

---
 src/resource-group-events.jsx | 53 ++++++++++++++++++-----------
 src/resource-home.jsx         |  1 -
 src/utils.jsx                 | 63 ++++++++++++++++++++++++-----------
 3 files changed, 78 insertions(+), 39 deletions(-)

diff --git a/src/resource-group-events.jsx b/src/resource-group-events.jsx
index cf0dda6..216a4f5 100644
--- a/src/resource-group-events.jsx
+++ b/src/resource-group-events.jsx
@@ -1,12 +1,17 @@
-import { useJSON } from "./utils";
+import { useJSON, useResourceGroupJSON, useTransform } from "./utils";
 
 import Alert from "./alert";
 import ResourceGroupEvent from "./resource-group-event";
 import Section from "./section";
 
 export default function ResourceGroupEvents({ baseUri, infoGroupId }) {
-  const announcementData = useJSON(
-    `${baseUri}/api/resource-groups/${infoGroupId}/announcements.json`,
+  const groupData = useResourceGroupJSON(infoGroupId);
+  const currentAnnouncementData = useJSON(
+    "https://operations-api.access-ci.org/wh2/news/v1/affiliation/access-ci.org/current_outages/",
+    null
+  );
+  const futureAnnouncementData = useJSON(
+    "https://operations-api.access-ci.org/wh2/news/v1/affiliation/access-ci.org/future_outages/",
     null
   );
   const eventData = useJSON(
@@ -14,24 +19,34 @@ export default function ResourceGroupEvents({ baseUri, infoGroupId }) {
     null,
     { corsProxy: true }
   );
-  const filteredEvents =
-    eventData && !eventData.error
-      ? eventData.filter((event) => new Date(event.date__start) >= new Date())
-      : [];
-  if (!announcementData && !filteredEvents.length) return;
+  const filteredAnnouncements = useTransform(
+    [groupData, currentAnnouncementData, futureAnnouncementData],
+    (groups, current, future) =>
+      [...current.results, ...future.results].filter((ann) =>
+        ann.AffectedResources.some((res) =>
+          groups.infoResourceids.includes(res.ResourceID)
+        )
+      ),
+    []
+  );
+  const filteredEvents = useTransform(
+    [eventData],
+    (events) =>
+      events.filter((event) => new Date(event.date__start) >= new Date()),
+    []
+  );
+
+  if (!filteredAnnouncements.length && !filteredEvents.length) return;
   return (
     <Section title="Announcements and Events" icon="calendar3">
-      {announcementData &&
-        announcementData.announcements.map(
-          ({ description, announcementUri }) => (
-            <Alert>
-              {description}{" "}
-              {announcementUri ? (
-                <a href={announcementUri}>Learn more.</a>
-              ) : null}
-            </Alert>
-          )
-        )}
+      {filteredAnnouncements.map(({ Subject: subject, Content: content }) => (
+        <Alert>
+          {subject}{" "}
+          <a href="https://operations.access-ci.org/infrastructure_news_view">
+            Learn more.
+          </a>
+        </Alert>
+      ))}
       {filteredEvents.map((event) => ResourceGroupEvent(event))}
     </Section>
   );
diff --git a/src/resource-home.jsx b/src/resource-home.jsx
index 755b1ee..200db61 100644
--- a/src/resource-home.jsx
+++ b/src/resource-home.jsx
@@ -37,7 +37,6 @@ const linkGroupData = ({ groups: resourceGroups }, { results: resources }) => {
 
   for (let resourceGroup of resourceGroups) {
     resourceGroup.infoGroupId = resourceGroup.infoGroupid;
-    delete resourceGroup.infoGroupid;
     resourceGroup.tags = [];
     resourceGroup.tagIds = [];
     for (let infoResourceId of resourceGroup.infoResourceids) {
diff --git a/src/utils.jsx b/src/utils.jsx
index 07abd61..5546daa 100644
--- a/src/utils.jsx
+++ b/src/utils.jsx
@@ -1,5 +1,5 @@
 import { render } from "preact";
-import { useEffect, useState } from "preact/hooks";
+import { useEffect, useMemo, useState } from "preact/hooks";
 
 export const getMode = (breakpoint = 900) =>
   document.body.clientWidth >= breakpoint ? "desktop" : "mobile";
@@ -31,33 +31,58 @@ export const useJSON = (
 ) => {
   const [value, setValue] = useState(defaultValue);
   useEffect(() => {
-    if (uri)
+    if (uri) {
       if (cache && jsonCache[uri]) {
         setValue(jsonCache[uri]);
         return;
       }
-    (async () => {
-      const res = await fetch(
-        corsProxy ? `https://corsproxy.io/?${encodeURIComponent(uri)}` : uri
-      );
-      if (res.status < 200 || res.status > 299) {
-        setValue({ error: { status: res.status } });
-      } else {
-        let data;
-        try {
-          data = await res.json();
-        } catch (error) {
-          data = { error: { message: error } };
-        } finally {
-          setValue(data);
-          if (cache) jsonCache[uri] = data;
+      (async () => {
+        const res = await fetch(
+          corsProxy ? `https://corsproxy.io/?${encodeURIComponent(uri)}` : uri
+        );
+        if (res.status < 200 || res.status > 299) {
+          setValue({ error: { status: res.status } });
+        } else {
+          let data;
+          try {
+            data = await res.json();
+          } catch (error) {
+            data = { error: { message: error } };
+          } finally {
+            setValue(data);
+            if (cache) jsonCache[uri] = data;
+          }
         }
-      }
-    })();
+      })();
+    }
   }, [uri]);
   return value;
 };
 
+export const useResourceGroupJSON = (infoGroupId, defaultValue = null) => {
+  // TODO: Replace this with the individual group endpoint once it is available.
+  const groupsData = useJSON(
+    "/access-ci-ui/api/resource-groups.json",
+    defaultValue
+  );
+  return groupsData
+    ? groupsData.groups.find((group) => group.infoGroupid == infoGroupId) ||
+        defaultValue
+    : defaultValue;
+};
+
+export const useTransform = (
+  responseArray,
+  transformFunction,
+  defaultValue = null
+) => {
+  return useMemo(() => {
+    for (let response of responseArray)
+      if (!response || response.error) return defaultValue;
+    return transformFunction.apply(null, responseArray);
+  }, responseArray);
+};
+
 export const sortOn = (prop) => (a, b) => a[prop] < b[prop] ? -1 : 1;
 
 export const extractHref = (html) => {

From f12d16f519a1c38218142fe56e0adc51c55e1bee Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 30 Oct 2024 11:54:59 -0400
Subject: [PATCH 058/113] feat(utils): allow useJSON to accept multiple URIs

---
 src/resource-group-affinity-group.jsx |  1 -
 src/resource-group-description.jsx    |  1 -
 src/resource-group-discussion.jsx     | 12 ++---
 src/resource-group-documentation.jsx  |  1 -
 src/resource-group-events.jsx         |  7 +--
 src/resource-group-projects.jsx       |  2 +-
 src/resource-group-queue-metrics.jsx  |  3 +-
 src/resource-group-resources.jsx      |  3 +-
 src/resource-group-software.jsx       |  3 +-
 src/resource-home.jsx                 |  4 +-
 src/utils.jsx                         | 69 +++++++++++++++++----------
 11 files changed, 55 insertions(+), 51 deletions(-)

diff --git a/src/resource-group-affinity-group.jsx b/src/resource-group-affinity-group.jsx
index b846f95..a2c71cf 100644
--- a/src/resource-group-affinity-group.jsx
+++ b/src/resource-group-affinity-group.jsx
@@ -6,7 +6,6 @@ import Section from "./section";
 export default function ResourceGroupAffinityGroup({ baseUri, infoGroupId }) {
   const data = useJSON(
     `https://support.access-ci.org/api/1.0/affinity_groups/${infoGroupId}`,
-    null,
     { corsProxy: true }
   );
   if (!data || data.error || !data.length) return;
diff --git a/src/resource-group-description.jsx b/src/resource-group-description.jsx
index 93ec8c6..1e3f4bc 100644
--- a/src/resource-group-description.jsx
+++ b/src/resource-group-description.jsx
@@ -5,7 +5,6 @@ import Icon from "./icon";
 export default function ResourceGroupDescription({ baseUri, infoGroupId }) {
   const data = useJSON(
     `https://support.access-ci.org/api/1.0/affinity_groups/${infoGroupId}`,
-    null,
     { corsProxy: true }
   );
   if (!data || data.error || !data.length) return;
diff --git a/src/resource-group-discussion.jsx b/src/resource-group-discussion.jsx
index 2d5a20c..7606706 100644
--- a/src/resource-group-discussion.jsx
+++ b/src/resource-group-discussion.jsx
@@ -18,13 +18,9 @@ const getCategoryUri = (category, siteData) => {
 };
 
 export default function ResourceGroupDiscussion({ baseUri, infoGroupId }) {
-  const siteData = useJSON(
-    `https://ask.cyberinfrastructure.org/site.json`,
-    null,
-    {
-      corsProxy: true,
-    }
-  );
+  const siteData = useJSON(`https://ask.cyberinfrastructure.org/site.json`, {
+    corsProxy: true,
+  });
   // Try to find a category with a slug that matches the info group ID.
   // TODO: Replace this with better logic once the CID and slug are available
   // in the Support APIs.
@@ -37,7 +33,7 @@ export default function ResourceGroupDiscussion({ baseUri, infoGroupId }) {
         );
 
   const categoryDataUri = getCategoryUri(category, siteData);
-  const categoryData = useJSON(categoryDataUri, null, {
+  const categoryData = useJSON(categoryDataUri, {
     corsProxy: true,
   });
 
diff --git a/src/resource-group-documentation.jsx b/src/resource-group-documentation.jsx
index 0472dbd..30bde22 100644
--- a/src/resource-group-documentation.jsx
+++ b/src/resource-group-documentation.jsx
@@ -6,7 +6,6 @@ import Section from "./section";
 export default function ResourceGroupDocumentation({ baseUri, infoGroupId }) {
   const data = useJSON(
     `https://support.access-ci.org/api/1.0/kb/${infoGroupId}`,
-    null,
     { corsProxy: true }
   );
 
diff --git a/src/resource-group-events.jsx b/src/resource-group-events.jsx
index 216a4f5..ebe7aa8 100644
--- a/src/resource-group-events.jsx
+++ b/src/resource-group-events.jsx
@@ -7,16 +7,13 @@ import Section from "./section";
 export default function ResourceGroupEvents({ baseUri, infoGroupId }) {
   const groupData = useResourceGroupJSON(infoGroupId);
   const currentAnnouncementData = useJSON(
-    "https://operations-api.access-ci.org/wh2/news/v1/affiliation/access-ci.org/current_outages/",
-    null
+    "https://operations-api.access-ci.org/wh2/news/v1/affiliation/access-ci.org/current_outages/"
   );
   const futureAnnouncementData = useJSON(
-    "https://operations-api.access-ci.org/wh2/news/v1/affiliation/access-ci.org/future_outages/",
-    null
+    "https://operations-api.access-ci.org/wh2/news/v1/affiliation/access-ci.org/future_outages/"
   );
   const eventData = useJSON(
     `https://support.access-ci.org/api/1.1/events/ag/${infoGroupId}`,
-    null,
     { corsProxy: true }
   );
   const filteredAnnouncements = useTransform(
diff --git a/src/resource-group-projects.jsx b/src/resource-group-projects.jsx
index 9c44d48..e25c1cf 100644
--- a/src/resource-group-projects.jsx
+++ b/src/resource-group-projects.jsx
@@ -32,7 +32,7 @@ export default function ResourceGroupProjects({ baseUri, infoGroupId }) {
   const apiBaseUrl =
     "https://allocations.access-ci.org/current-projects/summary.json";
   const apiUrl = `${apiBaseUrl}?info_groupid=${infoGroupId}&persona=${persona}`;
-  const data = useJSON(apiUrl, null, { corsProxy: true });
+  const data = useJSON(apiUrl, { corsProxy: true });
 
   if (!data || data.error || !data.projectStatistics.length) return;
 
diff --git a/src/resource-group-queue-metrics.jsx b/src/resource-group-queue-metrics.jsx
index 28adb65..99dcc83 100644
--- a/src/resource-group-queue-metrics.jsx
+++ b/src/resource-group-queue-metrics.jsx
@@ -25,8 +25,7 @@ const formatHeaderTip = (content) => (value) => {
 export default function ResourceGroupQueueMetrics({ baseUri, infoGroupId }) {
   const [days, setDays] = useState(30);
   const data = useJSON(
-    `${baseUri}/api/resource-groups/${infoGroupId}/queue-metrics/${days}.json`,
-    null
+    `${baseUri}/api/resource-groups/${infoGroupId}/queue-metrics/${days}.json`
   );
   if (!data || data.error) return;
 
diff --git a/src/resource-group-resources.jsx b/src/resource-group-resources.jsx
index 4ec2647..b629879 100644
--- a/src/resource-group-resources.jsx
+++ b/src/resource-group-resources.jsx
@@ -24,8 +24,7 @@ const linkResourceData = ({ resources, resourceTypes }) => {
 
 export default function ResourceGroupResources({ baseUri, infoGroupId }) {
   const allTypes = useJSON(
-    `${baseUri}/api/resource-groups/${infoGroupId}/resources.json`,
-    null
+    `${baseUri}/api/resource-groups/${infoGroupId}/resources.json`
   );
   const types = useMemo(
     () => (allTypes && !allTypes.error ? linkResourceData(allTypes) : null),
diff --git a/src/resource-group-software.jsx b/src/resource-group-software.jsx
index cd2fdc1..9756303 100644
--- a/src/resource-group-software.jsx
+++ b/src/resource-group-software.jsx
@@ -20,8 +20,7 @@ export default function ResourceGroupSoftware({ baseUri, infoGroupId }) {
   const data = useJSON(
     `https://ara-db.ccs.uky.edu/api=API_0/${
       import.meta.env.VITE_SDS_API_KEY
-    }/rp=${infoGroupId}?include=${apiFields.join(",")}`,
-    null
+    }/rp=${infoGroupId}?include=${apiFields.join(",")}`
   );
   const [searchText, setSearchText] = useState("");
   const fuse = useMemo(
diff --git a/src/resource-home.jsx b/src/resource-home.jsx
index 200db61..e080970 100644
--- a/src/resource-home.jsx
+++ b/src/resource-home.jsx
@@ -134,8 +134,8 @@ export default function ResourceHome({
   groupsURI,
 }) {
   const [activeTagIds, setActiveTagIds] = useState([]);
-  const slides = useJSON(`${baseUri}${slidesURI}`, null);
-  const allGroups = useJSON(`${baseUri}${groupsURI}`, null);
+  const slides = useJSON(`${baseUri}${slidesURI}`);
+  const allGroups = useJSON(`${baseUri}${groupsURI}`);
   const allResources = useJSON(
     "https://operations-api.access-ci.org/wh2/cider/v2/access-active/"
   );
diff --git a/src/utils.jsx b/src/utils.jsx
index 5546daa..6d6adbd 100644
--- a/src/utils.jsx
+++ b/src/utils.jsx
@@ -25,46 +25,63 @@ export const getScrollTop = () =>
 
 const jsonCache = {};
 export const useJSON = (
-  uri,
-  defaultValue,
-  { cache = true, corsProxy = false } = { cache: true, corsProxy: false }
+  uris,
+  { cache = true, corsProxy = false, defaultValue = null } = {
+    cache: true,
+    corsProxy: false,
+    defaultValue: null,
+  }
 ) => {
   const [value, setValue] = useState(defaultValue);
+  let single = false;
+  if (!Array.isArray(uris)) {
+    uris = uris ? [uris] : [];
+    single = true;
+  }
   useEffect(() => {
-    if (uri) {
-      if (cache && jsonCache[uri]) {
-        setValue(jsonCache[uri]);
+    if (uris.length) {
+      const cacheKey = uris.join(" ");
+      if (cache && jsonCache[cacheKey]) {
+        setValue(jsonCache[cacheKey]);
         return;
       }
       (async () => {
-        const res = await fetch(
-          corsProxy ? `https://corsproxy.io/?${encodeURIComponent(uri)}` : uri
+        const responses = await Promise.all(
+          uris.map((uri) =>
+            fetch(
+              corsProxy
+                ? `https://corsproxy.io/?${encodeURIComponent(uri)}`
+                : uri
+            )
+          )
+        );
+        const json = await Promise.all(
+          responses.map((response) => {
+            if (response.status < 200 || response.status > 299) {
+              return { error: { status: response.status } };
+            } else {
+              try {
+                return response.json();
+              } catch (error) {
+                return { error: { message: error } };
+              }
+            }
+          })
         );
-        if (res.status < 200 || res.status > 299) {
-          setValue({ error: { status: res.status } });
-        } else {
-          let data;
-          try {
-            data = await res.json();
-          } catch (error) {
-            data = { error: { message: error } };
-          } finally {
-            setValue(data);
-            if (cache) jsonCache[uri] = data;
-          }
-        }
+        const result = single ? json[0] : json;
+        setValue(result);
+        if (cache) jsonCache[cacheKey] = result;
       })();
     }
-  }, [uri]);
+  }, [...uris]);
   return value;
 };
 
 export const useResourceGroupJSON = (infoGroupId, defaultValue = null) => {
   // TODO: Replace this with the individual group endpoint once it is available.
-  const groupsData = useJSON(
-    "/access-ci-ui/api/resource-groups.json",
-    defaultValue
-  );
+  const groupsData = useJSON("/access-ci-ui/api/resource-groups.json", {
+    defaultValue,
+  });
   return groupsData
     ? groupsData.groups.find((group) => group.infoGroupid == infoGroupId) ||
         defaultValue

From 3bc90791395565b6fd3c9311a089d607aa35c454 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 30 Oct 2024 16:08:08 -0400
Subject: [PATCH 059/113] feat(resource-catalog): use group data from the
 Operations API

---
 src/resource-catalog.jsx |  2 --
 src/resource-group.css   | 21 ++++++++++++++++++---
 src/resource-group.jsx   |  3 ++-
 src/resource-home.jsx    | 34 ++++++++++++++++++++++------------
 4 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/src/resource-catalog.jsx b/src/resource-catalog.jsx
index de36682..d3d012a 100644
--- a/src/resource-catalog.jsx
+++ b/src/resource-catalog.jsx
@@ -30,7 +30,6 @@ export function ResourceCatalog({
   title = "Resource Catalog",
   showTitle = false,
   baseUri = "/access-ci-ui",
-  groupsURI = "/api/resource-groups.json",
   slidesURI = "/api/resource-slides.json",
 }) {
   return (
@@ -44,7 +43,6 @@ export function ResourceCatalog({
               title={title}
               showTitle={showTitle}
               slidesURI={slidesURI}
-              groupsURI={groupsURI}
             />
             <ResourceGroupDetail
               baseUri={baseUri}
diff --git a/src/resource-group.css b/src/resource-group.css
index c570a06..4756a11 100644
--- a/src/resource-group.css
+++ b/src/resource-group.css
@@ -3,16 +3,31 @@
   align-items: flex-start;
   display: flex;
   flex-direction: row;
-  margin-bottom: 20px;
+  margin-bottom: 40px;
 }
 .resource-group-image {
+  --image-width: calc((var(--width) - 140px) / 4 + 20px);
+  align-items: center;
+  background-color: var(--contrast-9);
   border: 1px solid var(--contrast);
+  color: var(--contrast-8);
+  display: flex;
   flex: 0 0 auto;
+  flex-direction: column;
+  font-size: 5rem;
+  justify-content: center;
   margin-right: 20px;
+  min-height: calc(var(--image-width) / 3 * 2);
   position: relative;
-  width: calc((var(--width) - 140px) / 4 + 20px);
+  width: var(--image-width);
 }
-.resource-group-image > * {
+.resource-group-image:active,
+.resource-group-image:focus,
+.resource-group-image:hover {
+  color: var(--contrast-8);
+}
+
+.resource-group-image > img {
   display: block;
   width: 100%;
 }
diff --git a/src/resource-group.jsx b/src/resource-group.jsx
index 461efa1..e9eaee6 100644
--- a/src/resource-group.jsx
+++ b/src/resource-group.jsx
@@ -1,3 +1,4 @@
+import Icon from "./icon";
 import { Tag } from "./tag";
 import { Tags } from "./tags";
 
@@ -19,7 +20,7 @@ export function ResourceGroup({
         class={`resource-group-image image-type-${imageType}`}
         href={detailUri}
       >
-        {imageUri ? <img src={imageUri} /> : null}
+        {imageUri ? <img src={imageUri} /> : <Icon name="motherboard" />}
       </a>
       <div class="resource-group-text">
         <h3>
diff --git a/src/resource-home.jsx b/src/resource-home.jsx
index e080970..4195b71 100644
--- a/src/resource-home.jsx
+++ b/src/resource-home.jsx
@@ -12,7 +12,21 @@ const makeMap = (items, key) => {
   return map;
 };
 
-const linkGroupData = ({ groups: resourceGroups }, { results: resources }) => {
+const linkGroupData = ({ results: groupResults }, { results: resources }) => {
+  const resourceGroups = groupResults
+    .filter((group) => group.info_resourceids)
+    .map((group) => ({
+      infoGroupId: group.info_groupid,
+      name: group.group_descriptive_name,
+      description: group.group_description,
+      infoResourceIds: group.info_resourceids,
+      imageUri: group.group_logo_url
+        ? `https://cider.access-ci.org/public/groups/${
+            group.group_logo_url.match(/[0-9]+/)[0]
+          }/logo`
+        : null,
+    }))
+    .sort((a, b) => a.name.localeCompare(b.name));
   const tagCategories = [
     {
       tagCategoryId: 1,
@@ -36,11 +50,12 @@ const linkGroupData = ({ groups: resourceGroups }, { results: resources }) => {
   const resourceCategoryMap = makeMap(resourceCategories, "resourceCategoryId");
 
   for (let resourceGroup of resourceGroups) {
-    resourceGroup.infoGroupId = resourceGroup.infoGroupid;
+    resourceGroup.infoGroupId = resourceGroup.infoGroupId;
     resourceGroup.tags = [];
     resourceGroup.tagIds = [];
-    for (let infoResourceId of resourceGroup.infoResourceids) {
+    for (let infoResourceId of resourceGroup.infoResourceIds) {
       let resource = resourceMap[infoResourceId];
+      if (!resource) continue;
       if (resource.organization_name) {
         let tag = rpTagMap[resource.organization_name];
         if (!tag) {
@@ -67,7 +82,6 @@ const linkGroupData = ({ groups: resourceGroups }, { results: resources }) => {
       resourceGroup.infoGroupId
     );
   }
-
   return { resourceCategories, resourceGroups, tags, tagCategories };
 };
 
@@ -126,16 +140,12 @@ const getActive = ({ resourceGroups, tags, tagCategories }, activeTagIds) => {
   };
 };
 
-export default function ResourceHome({
-  baseUri,
-  title,
-  showTitle,
-  slidesURI,
-  groupsURI,
-}) {
+export default function ResourceHome({ baseUri, title, showTitle, slidesURI }) {
   const [activeTagIds, setActiveTagIds] = useState([]);
   const slides = useJSON(`${baseUri}${slidesURI}`);
-  const allGroups = useJSON(`${baseUri}${groupsURI}`);
+  const allGroups = useJSON(
+    `https://operations-api.access-ci.org/wh2/cider/v1/groups/group_type/resource-catalog.access-ci.org/`
+  );
   const allResources = useJSON(
     "https://operations-api.access-ci.org/wh2/cider/v2/access-active/"
   );

From 1ec99734034f769dc3a2c539b0c27a010bf63a19 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 30 Oct 2024 16:39:18 -0400
Subject: [PATCH 060/113] refactor(utils): consolidate logic for getting
 resource group data

---
 public/api/cider_README.txt           |  80 ------------
 public/api/cider_resource_groups.json | 150 ---------------------
 public/api/cider_view_groups.json     |  28 ----
 public/api/resource-groups.json       | 179 --------------------------
 src/resource-group-events.jsx         |   2 +-
 src/resource-home.jsx                 |  22 +---
 src/utils.jsx                         |  31 ++++-
 7 files changed, 29 insertions(+), 463 deletions(-)
 delete mode 100644 public/api/cider_README.txt
 delete mode 100644 public/api/cider_resource_groups.json
 delete mode 100644 public/api/cider_view_groups.json
 delete mode 100644 public/api/resource-groups.json

diff --git a/public/api/cider_README.txt b/public/api/cider_README.txt
deleted file mode 100644
index 980725d..0000000
--- a/public/api/cider_README.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-##
-## CiDeR Resource Groups
-##
-## Background & Design
-##
-
-CiDeR is used to maintain public descriptive information about resources by multiple projects (Affiliations) besides ACCESS
-
-CiDeR includes (or will) externally visible identifiers that are globally unique across projects.
-  - Resource Identifier (info_resourceid)
-  - Resource Group Identifier (info_groupid)
-  - Resource Group View Identifier (info_groupviewid)
-
-So that all the information published by ACCESS can be cross-referenced these identifiers should be used in other
-database and catalogs to associate information with CiDeR resources or resource groups.
-
-To make the above identifiers globally unique and meaningful (at least to developers and technical staff), we have
-chosen to make them look like hostnames: they are derived from real owned domains which identifies their scope and
-guarantees that they will be unique across projects and affiliations. These identifiers do NOT have to be DNS
-DNS resolvable.
-
-A Resource Group is a collection of Resources.
-
-A Resource Group View is a collections of Resource Groups that are displayed through a common view or interface.
-
-This design supports any combination of resources and resource groups to be visible through multiple configurable
-views. Resource providers associate their resources with groups, and view developers associate groups with their
-views. Resource providers and view developers collaborate to define which groups are needed to achive needed
-views.
-
-##
-## Example
-##
-
-The ACCESS Resource Catalog efforts needs to display resource information organized by resource groups, where resource
-groups are made up of 1 or more tightly coupled resources.
-
-The above design would be applied to this example as follows:
-
-1) Associate all bridges2 related resources to a shared resource group
-    These resources (info_resourceid)
-        - bridges2-em.psc.access-ci.org
-        - bridges2-gpu-ai.psc.access-ci.org
-        - bridges2-gpu.psc.access-ci.org
-        - bridges2-ocean.psc.access-ci.org
-        - bridges2-rm.psc.access-ci.org
-    Would all be associated with group (info_groupid):
-        - bridges2.psc.access-ci.org
-    
-    See an example of these mappings in the file: cider_resource_groups.json
-
-2) Associate resource groups with the ACCESS Resource Catalog view
-    These resource groups (info_groupid):
-        - aces.tamu.access-ci.org
-        - bridges2.psc.access-ci.org
-        - expanse.sdsc.access-ci.org
-        - <many more groups>
-   Would all be associated with the group view (info_groupviewid):
-        - resource-catalog.access-ci.org
-
-    See an example of these mappings in the file: cider_view_groups.json
-
-##
-## Persona Interfaces
-##
-
-ACCESS staff:
-- Define Resource Group Views and which Resource Groups are visible through each view
-- Document and communicate Resource Groups available for RPs to select
-
-Resource provider staff:
-- Associate each of their Resources with one or more Resource Groups
-
-Resource Catalog developers:
-- Retrieve by API all the Resource Groups associated with their info_groupviewid = resource-catalog.access-ci.org
-- Retrieve by API all ACCESS affiliated CiDeR resources, each of which lists what Resource Groups they are a part of
-- Retrieve other information from other sources all of which MUST include either the info_resourceid or info_groupid
-  that the information is associated with.
-- Metadata about the view could be stored somewhere by info_groupviewid
-- Build a resource catalog displaying all the resource groups and associated resources
diff --git a/public/api/cider_resource_groups.json b/public/api/cider_resource_groups.json
deleted file mode 100644
index eef0c73..0000000
--- a/public/api/cider_resource_groups.json
+++ /dev/null
@@ -1,150 +0,0 @@
-[
-  {
-    "info_resourceid": "granite.ncsa.access-ci.org",
-    "info_groupids": ["granite.ncsa.access-ci.org"]
-  },
-  {
-    "info_resourceid": "aces.tamu.access-ci.org",
-    "info_groupids": ["aces.tamu.access-ci.org"]
-  },
-  {
-    "info_resourceid": "anton2.psc.access-ci.org",
-    "info_groupids": ["anton2.psc.access-ci.org"]
-  },
-  {
-    "info_resourceid": "anvil-gpu.purdue.access-ci.org",
-    "info_groupids": ["anvil.purdue.access-ci.org"]
-  },
-  {
-    "info_resourceid": "anvil.purdue.access-ci.org",
-    "info_groupids": ["anvil.purdue.access-ci.org"]
-  },
-  {
-    "info_resourceid": "bridges2-em.psc.access-ci.org",
-    "info_groupids": ["bridges2.psc.access-ci.org"]
-  },
-  {
-    "info_resourceid": "bridges2-gpu-ai.psc.access-ci.org",
-    "info_groupids": ["bridges2.psc.access-ci.org"]
-  },
-  {
-    "info_resourceid": "bridges2-gpu.psc.access-ci.org",
-    "info_groupids": ["bridges2.psc.access-ci.org"]
-  },
-  {
-    "info_resourceid": "bridges2-ocean.psc.access-ci.org",
-    "info_groupids": ["bridges2.psc.access-ci.org"]
-  },
-  {
-    "info_resourceid": "bridges2-rm.psc.access-ci.org",
-    "info_groupids": ["bridges2.psc.access-ci.org"]
-  },
-  {
-    "info_resourceid": "darwin-gpu.udel.access-ci.org",
-    "info_groupids": ["darwin.udel.access-ci.org"]
-  },
-  {
-    "info_resourceid": "darwin-storage.udel.access-ci.org",
-    "info_groupids": ["darwin.udel.access-ci.org"]
-  },
-  {
-    "info_resourceid": "darwin.udel.access-ci.org",
-    "info_groupids": ["darwin.udel.access-ci.org"]
-  },
-  {
-    "info_resourceid": "delta-cpu.ncsa.access-ci.org",
-    "info_groupids": ["delta.ncsa.access-ci.org"]
-  },
-  {
-    "info_resourceid": "delta-gpu.ncsa.access-ci.org",
-    "info_groupids": ["delta.ncsa.access-ci.org"]
-  },
-  {
-    "info_resourceid": "delta-storage.ncsa.access-ci.org",
-    "info_groupids": ["delta.ncsa.access-ci.org"]
-  },
-  {
-    "info_resourceid": "deltaai.ncsa.access-ci.org",
-    "info_groupids": ["delta.ncsa.access-ci.org"]
-  },
-  {
-    "info_resourceid": "derecho-gpu.ncar.ucar.edu",
-    "info_groupids": ["derecho.ncar.access-ci.org"]
-  },
-  {
-    "info_resourceid": "derecho.ncar.ucar.edu",
-    "info_groupids": ["derecho.ncar.access-ci.org"]
-  },
-  {
-    "info_resourceid": "expanse-gpu.sdsc.access-ci.org",
-    "info_groupids": ["expanse.sdsc.access-ci.org"]
-  },
-  {
-    "info_resourceid": "expanse-ps.sdsc.access-ci.org",
-    "info_groupids": ["expanse.sdsc.access-ci.org"]
-  },
-  {
-    "info_resourceid": "expanse.sdsc.access-ci.org",
-    "info_groupids": ["expanse.sdsc.access-ci.org"]
-  },
-  {
-    "info_resourceid": "faster.tamu.access-ci.org",
-    "info_groupids": ["faster.tamu.access-ci.org"]
-  },
-  {
-    "info_resourceid": "grid1.osg.access-ci.org",
-    "info_groupids": ["osg.access-ci.org"]
-  },
-  {
-    "info_resourceid": "hive.gatech.access-ci.org",
-    "info_groupids": ["hive.gatech.access-ci.org"]
-  },
-  {
-    "info_resourceid": "jetstream2-gpu.indiana.access-ci.org",
-    "info_groupids": ["jetstream2.indiana.access-ci.org"]
-  },
-  {
-    "info_resourceid": "jetstream2-lm.indiana.access-ci.org",
-    "info_groupids": ["jetstream2.indiana.access-ci.org"]
-  },
-  {
-    "info_resourceid": "jetstream2-storage.indiana.access-ci.org",
-    "info_groupids": ["jetstream2.indiana.access-ci.org"]
-  },
-  {
-    "info_resourceid": "jetstream2.indiana.access-ci.org",
-    "info_groupids": ["jetstream2.indiana.access-ci.org"]
-  },
-  {
-    "info_resourceid": "kyric.uky.access-ci.org",
-    "info_groupids": ["kyric.uky.access-ci.org"]
-  },
-  {
-    "info_resourceid": "launch.tamu.access-ci.org",
-    "info_groupids": ["launch.tamu.access-ci.org"]
-  },
-  {
-    "info_resourceid": "neocortex-sdflex.psc.access-ci.org",
-    "info_groupids": ["neocortex.psc.access-ci.org"]
-  },
-  {
-    "info_resourceid": "ookami.sbu.access-ci.org",
-    "info_groupids": ["ookami.sbu.access-ci.org"]
-  },
-  {
-    "info_resourceid": "osn.osn.access-ci.org",
-    "info_groupids": ["osn.access-ci.org"]
-  },
-  {
-    "info_resourceid": "ranch.tacc.access-ci.org",
-    "info_groupids": ["ranch.tacc.access-ci.org"]
-  },
-  {
-    "info_resourceid": "stampede3.tacc.access-ci.org",
-    "info_groupids": ["stampede3.tacc.access-ci.org"]
-  },
-  {
-    "info_resourceid": "voyager.sdsc.access-ci.org",
-    "info_groupids": ["voyager.sdsc.access-ci.org"]
-  }
-]
diff --git a/public/api/cider_view_groups.json b/public/api/cider_view_groups.json
deleted file mode 100644
index c977015..0000000
--- a/public/api/cider_view_groups.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
-  {
-    "info_groupviewid": "resource-catalog.access-ci.org",
-    "info_groupids": [
-      "aces.tamu.access-ci.org",
-      "anvil.purdue.access-ci.org",
-      "bridges2.psc.access-ci.org",
-      "darwin.udel.access-ci.org",
-      "darwin.udel.access-ci.org",
-      "delta.ncsa.access-ci.org",
-      "derecho.ncar.access-ci.org",
-      "expanse.sdsc.access-ci.org",
-      "faster.tamu.access-ci.org",
-      "granite.ncsa.access-ci.org",
-      "osg.access-ci.org",
-      "hive.gatech.access-ci.org",
-      "jetstream2.indiana.access-ci.org",
-      "kyric.uky.access-ci.org",
-      "launch.tamu.access-ci.org",
-      "neocortex.psc.access-ci.org",
-      "ookami.sbu.access-ci.org",
-      "osn.access-ci.org",
-      "ranch.tacc.access-ci.org",
-      "stampede3.tacc.access-ci.org",
-      "voyager.sdsc.access-ci.org"
-    ]
-  }
-]
diff --git a/public/api/resource-groups.json b/public/api/resource-groups.json
deleted file mode 100644
index 161f92a..0000000
--- a/public/api/resource-groups.json
+++ /dev/null
@@ -1,179 +0,0 @@
-{
-  "groups": [
-    {
-      "infoGroupid": "aces.tamu.access-ci.org",
-      "name": "ACES",
-      "description": "Accelerating Computing for Emerging Sciences (ACES) is a NSF-Category II-funded test bed (award number 2112356) that offers state of the art GPUs and other novel accelerators in a composable environment.",
-      "groupTypes": ["resource-catalog.access-ci.org"],
-      "groupLogoUrl": "/groups/1/group_logo",
-      "infoResourceids": ["aces.tamu.access-ci.org"]
-    },
-    {
-      "infoGroupid": "anvil.purdue.access-ci.org",
-      "name": "Anvil",
-      "description": "Purdue University is the home of Anvil, a powerful new supercomputer that provides advanced computing capabilities to support a wide range of computational and data-intensive research spanning from traditional high-performance computing to modern artificial intelligence applications.",
-      "groupTypes": ["resource-catalog.access-ci.org"],
-      "groupLogoUrl": "/groups/2/group_logo",
-      "infoResourceids": [
-        "anvil-gpu.purdue.access-ci.org",
-        "anvil.purdue.access-ci.org"
-      ]
-    },
-    {
-      "infoGroupid": "bridges2.psc.access-ci.org",
-      "name": "Bridges-2",
-      "description": "Bridges-2, a resource of Pittsburgh Supercomputing Center, is designed for converged HPC + AI + Data. Its custom topology is optimized for data-centric HPC, AI, and HPDA (High Performance Data Analytics). An extremely flexible software environment along with community data collections and BDaaS (Big Data as a Service) provide the tools necessary for modern pioneering research. The data management system, Ocean, consists of two-tiers, disk and tape, transparently managed as a single, highly usable namespace.",
-      "groupTypes": ["resource-catalog.access-ci.org"],
-      "groupLogoUrl": "/groups/3/group_logo",
-      "infoResourceids": [
-        "bridges2-em.psc.access-ci.org",
-        "bridges2-gpu.psc.access-ci.org",
-        "bridges2-gpu-ai.psc.access-ci.org",
-        "bridges2-rm.psc.access-ci.org",
-        "bridges2-ocean.psc.access-ci.org"
-      ]
-    },
-    {
-      "infoGroupid": "delta.ncsa.access-ci.org",
-      "name": "DELTA",
-      "description": "DELTA is a dedicated, ACCESS-allocated resource designed by HPE and NCSA, delivering a highly capable GPU-focused compute environment for GPU and CPU workloads.",
-      "groupTypes": ["resource-catalog.access-ci.org"],
-      "groupLogoUrl": "/groups/35/group_logo",
-      "infoResourceids": [
-        "delta-cpu.ncsa.access-ci.org",
-        "delta-gpu.ncsa.access-ci.org",
-        "delta-storage.ncsa.access-ci.org",
-        "deltaai.ncsa.access-ci.org"
-      ]
-    },
-    {
-      "infoGroupid": "expanse.sdsc.access-ci.org",
-      "name": "Expanse",
-      "description": "Expanse is a dedicated ACCESS cluster designed by Dell and SDSC delivering 5.16 peak petaflops, and will offer Composable Systems and Cloud Bursting.",
-      "groupTypes": ["resource-catalog.access-ci.org"],
-      "groupLogoUrl": "/groups/37/group_logo",
-      "infoResourceids": [
-        "expanse-gpu.sdsc.access-ci.org",
-        "expanse-ps.sdsc.access-ci.org",
-        "expanse.sdsc.access-ci.org"
-      ]
-    },
-    {
-      "infoGroupid": "faster.tamu.access-ci.org",
-      "name": "FASTER",
-      "description": "Fostering Accelerated Scientific Transformations, Education, and Research (FASTER) is a NSF-MRI-funded cluster (award number 2019129) that offers state of the art CPUs, GPUs, and NVMe (Non-Volatile MemoryExpress) based storage in a composable environment.",
-      "groupTypes": ["resource-catalog.access-ci.org"],
-      "groupLogoUrl": "/groups/38/group_logo",
-      "infoResourceids": ["faster.tamu.access-ci.org"]
-    },
-    {
-      "infoGroupid": "derecho.ncar.access-ci.org",
-      "name": "Derecho",
-      "description": "Installed in 2023, Derecho is NCAR's latest supercomputer. The HPE Cray EX cluster is a 19.87-petaflops system. University researchers and NSF NCAR scientists can use Derecho to pursue work in Earth systems science and related sciences.",
-      "groupTypes": ["resource-catalog.access-ci.org"],
-      "groupLogoUrl": "/groups/36/group_logo",
-      "infoResourceids": ["derecho-gpu.ncar.ucar.edu", "derecho.ncar.ucar.edu"]
-    },
-    {
-      "infoGroupid": "granite.ncsa.access-ci.org",
-      "name": "Granite",
-      "description": "Granite is NCSA’s tape archive system, closely integrated with Taiga, to provide users with a place to store long-term archive datasets. The system is built using a 19-frame Spectra TFinity tape library outfitted with 20 LTO-9 tape drives and can hold over 300PB of replicated data.",
-      "groupTypes": ["resource-catalog.access-ci.org"],
-      "groupLogoUrl": "/groups/39/group_logo",
-      "infoResourceids": ["granite.ncsa.access-ci.org"]
-    },
-    {
-      "infoGroupid": "osg.access-ci.org",
-      "name": "Open Science Grid",
-      "description": "The OSG provides technologies and services for supporting pools of distributed high-throughput computing (dHTC) and data capacity that serve a number of research communities, worldwide. Among these services, the OSG operates the Open Science Pool (OSPool), which includes capacity contributed from clusters at campuses and national labs across and beyond the US, organized as a single virtual cluster.",
-      "groupTypes": ["resource-catalog.access-ci.org"],
-      "groupLogoUrl": "/groups/40/group_logo",
-      "infoResourceids": ["grid1.osg.access-ci.org"]
-    },
-    {
-      "infoGroupid": "hive.gatech.access-ci.org",
-      "name": "Hive",
-      "description": "The Partnership for an Advanced Computing Environment (PACE) at Georgia Institute of Technology has deployed a new high performance computing (HPC) cluster, Hive.",
-      "groupTypes": ["resource-catalog.access-ci.org"],
-      "groupLogoUrl": "/groups/41/group_logo",
-      "infoResourceids": ["hive.gatech.access-ci.org"]
-    },
-    {
-      "infoGroupid": "jetstream2.indiana.access-ci.org",
-      "name": "Jetstream2",
-      "description": "Jetstream2 is a transformative update to the NSF’s science and engineering cloud infrastructure and provides 8 petaFLOPS of supercomputing power to simplify data analysis, boost discovery, and increase availability of AI resources. It is an NSF-funded, user-friendly cloud environment designed to allow “always on” research infrastructure and to give researchers access to interactive computing and data analysis resources on demand, whenever and wherever they want to analyze their data.",
-      "groupTypes": ["resource-catalog.access-ci.org"],
-      "groupLogoUrl": "/groups/42/group_logo",
-      "infoResourceids": [
-        "jetstream2-gpu.indiana.access-ci.org",
-        "jetstream2-lm.indiana.access-ci.org",
-        "jetstream2-storage.indiana.access-ci.org",
-        "jetstream2.indiana.access-ci.org"
-      ]
-    },
-    {
-      "infoGroupid": "kyric.uky.access-ci.org",
-      "name": "KyRIC",
-      "description": "The KyRIC cluster will advance several exciting research programs across many disciplines, such as Bioinformatics and System Biology Algorithms, Large Graph and Evolutionary Network Analysis, Image Processing, and Computational Modeling and Simulation.",
-      "groupTypes": ["resource-catalog.access-ci.org"],
-      "groupLogoUrl": "/groups/43/group_logo",
-      "infoResourceids": ["kyric.uky.access-ci.org"]
-    },
-    {
-      "infoGroupid": "launch.tamu.access-ci.org",
-      "name": "Launch",
-      "description": "Launch is a Dell cluster with AMD EPYC Genoa 9654 processors and NVIDIA A30 GPUs. The compute nodes are interconnected with HDR100 InfiniBand connections for MPI and access to the NFS storage.",
-      "groupTypes": ["resource-catalog.access-ci.org"],
-      "groupLogoUrl": null,
-      "infoResourceids": ["launch.tamu.access-ci.org"]
-    },
-    {
-      "infoGroupid": "neocortex.psc.access-ci.org",
-      "name": "Neocortex",
-      "description": "Neocortex is a highly innovative resource that targets the acceleration of AI-powered scientific discovery by greatly shortening the time required for deep learning training and by fostering greater integration of artificial deep learning with scientific workflows. The revolutionary hardware in Neocortex facilitates the development of more efficient algorithms for artificial intelligence and graph analytics.",
-      "groupTypes": ["resource-catalog.access-ci.org"],
-      "groupLogoUrl": "/groups/45/group_logo",
-      "infoResourceids": ["neocortex-sdflex.psc.access-ci.org"]
-    },
-    {
-      "infoGroupid": "ookami.sbu.access-ci.org",
-      "name": "Ookami",
-      "description": "Ookami is a computer technology testbed supported by the National Science Foundation under grant OAC 1927880. It provides researchers with access to the A64FX processor developed by Riken and Fujitsu for the Japanese path to exascale computing and is currently deployed in the until June 2022 fastest computer in the world, Fugaku.",
-      "groupTypes": ["resource-catalog.access-ci.org"],
-      "groupLogoUrl": "/groups/46/group_logo",
-      "infoResourceids": ["ookami.sbu.access-ci.org"]
-    },
-    {
-      "infoGroupid": "osn.access-ci.org",
-      "name": "Open Storage Network",
-      "description": "The Open Storage Network (OSN) is a distributed data sharing and transfer service intended to facilitate exchanges of active scientific data sets between research organizations, communities and projects, providing easy access and high bandwidth delivery of large data sets to researchers.",
-      "groupTypes": ["resource-catalog.access-ci.org"],
-      "groupLogoUrl": "/groups/47/group_logo",
-      "infoResourceids": ["osn.osn.access-ci.org"]
-    },
-    {
-      "infoGroupid": "ranch.tacc.access-ci.org",
-      "name": "Ranch",
-      "description": "TACC's High Performance Computing (HPC) systems are used primarily for scientific computing and while their disk systems are large, they are unable to store the long-term final data generated on these systems. The Ranch archive system fills this need for high capacity long-term storage, by providing a massive high performance file system and tape-based backing store designed, implemented, and supported specifically for archival purposes.",
-      "groupTypes": ["resource-catalog.access-ci.org"],
-      "groupLogoUrl": "/groups/48/group_logo",
-      "infoResourceids": ["ranch.tacc.access-ci.org"]
-    },
-    {
-      "infoGroupid": "stampede3.tacc.access-ci.org",
-      "name": "Stampede3",
-      "description": "Stampede3 is generously funded through the National Science Foundation and is designed to serve today's researchers as well as support the research community on an evolutionary path toward many-core processors and accelerated technologies. Stampede 3 maintains the familiar programming model for all of today's users, and thus will be broadly useful for traditional simulation users, users performing data intensive computations, and emerging classes of new users.",
-      "groupTypes": ["resource-catalog.access-ci.org"],
-      "groupLogoUrl": "/groups/49/group_logo",
-      "infoResourceids": ["stampede3.tacc.access-ci.org"]
-    },
-    {
-      "infoGroupid": "voyager.sdsc.access-ci.org",
-      "name": "Voyager",
-      "description": "Voyager is an innovative AI system designed specifically for science and engineering research at scale. Voyager is focused on supporting research in science and engineering that is increasingly dependent upon artificial intelligence and deep learning as a critical element in the experimental and/or computational work.",
-      "groupTypes": ["resource-catalog.access-ci.org"],
-      "groupLogoUrl": "/groups/50/group_logo",
-      "infoResourceids": ["voyager.sdsc.access-ci.org"]
-    }
-  ]
-}
diff --git a/src/resource-group-events.jsx b/src/resource-group-events.jsx
index ebe7aa8..1c75574 100644
--- a/src/resource-group-events.jsx
+++ b/src/resource-group-events.jsx
@@ -21,7 +21,7 @@ export default function ResourceGroupEvents({ baseUri, infoGroupId }) {
     (groups, current, future) =>
       [...current.results, ...future.results].filter((ann) =>
         ann.AffectedResources.some((res) =>
-          groups.infoResourceids.includes(res.ResourceID)
+          groups.infoResourceIds.includes(res.ResourceID)
         )
       ),
     []
diff --git a/src/resource-home.jsx b/src/resource-home.jsx
index 4195b71..2353c4b 100644
--- a/src/resource-home.jsx
+++ b/src/resource-home.jsx
@@ -1,5 +1,5 @@
 import { useMemo, useState } from "preact/hooks";
-import { useJSON } from "./utils";
+import { useJSON, useResourceGroupsJSON } from "./utils";
 
 import { Carousel, CarouselSlide } from "./carousel";
 import { ResourceCategory } from "./resource-category";
@@ -12,21 +12,7 @@ const makeMap = (items, key) => {
   return map;
 };
 
-const linkGroupData = ({ results: groupResults }, { results: resources }) => {
-  const resourceGroups = groupResults
-    .filter((group) => group.info_resourceids)
-    .map((group) => ({
-      infoGroupId: group.info_groupid,
-      name: group.group_descriptive_name,
-      description: group.group_description,
-      infoResourceIds: group.info_resourceids,
-      imageUri: group.group_logo_url
-        ? `https://cider.access-ci.org/public/groups/${
-            group.group_logo_url.match(/[0-9]+/)[0]
-          }/logo`
-        : null,
-    }))
-    .sort((a, b) => a.name.localeCompare(b.name));
+const linkGroupData = (resourceGroups, { results: resources }) => {
   const tagCategories = [
     {
       tagCategoryId: 1,
@@ -143,9 +129,7 @@ const getActive = ({ resourceGroups, tags, tagCategories }, activeTagIds) => {
 export default function ResourceHome({ baseUri, title, showTitle, slidesURI }) {
   const [activeTagIds, setActiveTagIds] = useState([]);
   const slides = useJSON(`${baseUri}${slidesURI}`);
-  const allGroups = useJSON(
-    `https://operations-api.access-ci.org/wh2/cider/v1/groups/group_type/resource-catalog.access-ci.org/`
-  );
+  const allGroups = useResourceGroupsJSON();
   const allResources = useJSON(
     "https://operations-api.access-ci.org/wh2/cider/v2/access-active/"
   );
diff --git a/src/utils.jsx b/src/utils.jsx
index 6d6adbd..9b24b02 100644
--- a/src/utils.jsx
+++ b/src/utils.jsx
@@ -77,14 +77,33 @@ export const useJSON = (
   return value;
 };
 
+export const useResourceGroupsJSON = () => {
+  const data = useJSON(
+    `https://operations-api.access-ci.org/wh2/cider/v1/groups/group_type/resource-catalog.access-ci.org/`
+  );
+  return useTransform([data], (response) =>
+    response.results
+      .filter((group) => group.info_resourceids)
+      .map((group) => ({
+        infoGroupId: group.info_groupid,
+        name: group.group_descriptive_name,
+        description: group.group_description,
+        infoResourceIds: group.info_resourceids,
+        imageUri: group.group_logo_url
+          ? `https://cider.access-ci.org/public/groups/${
+              group.group_logo_url.match(/[0-9]+/)[0]
+            }/logo`
+          : null,
+      }))
+      .sort((a, b) => a.name.localeCompare(b.name))
+  );
+};
+
 export const useResourceGroupJSON = (infoGroupId, defaultValue = null) => {
   // TODO: Replace this with the individual group endpoint once it is available.
-  const groupsData = useJSON("/access-ci-ui/api/resource-groups.json", {
-    defaultValue,
-  });
-  return groupsData
-    ? groupsData.groups.find((group) => group.infoGroupid == infoGroupId) ||
-        defaultValue
+  const groups = useResourceGroupsJSON();
+  return groups
+    ? groups.find((group) => group.infoGroupId == infoGroupId) || defaultValue
     : defaultValue;
 };
 

From a66ed72ed97429e4a27e2c30852d4653a0ac8a04 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Thu, 31 Oct 2024 10:45:40 -0400
Subject: [PATCH 061/113] refactor(resource-home): move helper functions to
 utils

---
 src/resource-home.jsx | 131 +++---------------------------------------
 src/utils.jsx         | 123 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 131 insertions(+), 123 deletions(-)

diff --git a/src/resource-home.jsx b/src/resource-home.jsx
index 2353c4b..8287a07 100644
--- a/src/resource-home.jsx
+++ b/src/resource-home.jsx
@@ -1,131 +1,16 @@
 import { useMemo, useState } from "preact/hooks";
-import { useJSON, useResourceGroupsJSON } from "./utils";
+import {
+  filterResourceGroups,
+  linkResourceGroups,
+  useJSON,
+  useResourceGroupsJSON,
+} from "./utils";
 
 import { Carousel, CarouselSlide } from "./carousel";
 import { ResourceCategory } from "./resource-category";
 import { ResourceFilters } from "./resource-filters";
 import { ResourcePathways } from "./resource-pathways";
 
-const makeMap = (items, key) => {
-  const map = {};
-  for (let item of items) map[item[key]] = item;
-  return map;
-};
-
-const linkGroupData = (resourceGroups, { results: resources }) => {
-  const tagCategories = [
-    {
-      tagCategoryId: 1,
-      name: "Resource Provider",
-      tags: [],
-    },
-  ];
-  const resourceCategories = [
-    {
-      resourceCategoryId: 1,
-      name: "Compute & Storage Resources",
-      resourceGroups: [],
-      resourceGroupIds: [],
-    },
-  ];
-  let nextTagId = 1;
-  const tags = [];
-  const rpTagMap = {};
-  const resourceMap = makeMap(resources, "info_resourceid");
-  const tagCategoryMap = makeMap(tagCategories, "tagCategoryId");
-  const resourceCategoryMap = makeMap(resourceCategories, "resourceCategoryId");
-
-  for (let resourceGroup of resourceGroups) {
-    resourceGroup.infoGroupId = resourceGroup.infoGroupId;
-    resourceGroup.tags = [];
-    resourceGroup.tagIds = [];
-    for (let infoResourceId of resourceGroup.infoResourceIds) {
-      let resource = resourceMap[infoResourceId];
-      if (!resource) continue;
-      if (resource.organization_name) {
-        let tag = rpTagMap[resource.organization_name];
-        if (!tag) {
-          tag = {
-            tagId: nextTagId++,
-            tagCategoryId: 1,
-            name: resource.organization_name,
-          };
-          tags.push(tag);
-          rpTagMap[resource.organization_name] = tag;
-          tagCategoryMap[1].tags.push(tag);
-          tag.tagCategory = tagCategoryMap[1];
-        }
-        if (!resourceGroup.tagIds.includes(tag.tagId)) {
-          resourceGroup.tagIds.push(tag.tagId);
-          resourceGroup.tags.push(tag);
-        }
-      }
-    }
-    resourceGroup.resourceCategoryId = 1;
-    resourceGroup.resourceCategory = resourceCategoryMap[1];
-    resourceGroup.resourceCategory.resourceGroups.push(resourceGroup);
-    resourceGroup.resourceCategory.resourceGroupIds.push(
-      resourceGroup.infoGroupId
-    );
-  }
-  return { resourceCategories, resourceGroups, tags, tagCategories };
-};
-
-const getActive = ({ resourceGroups, tags, tagCategories }, activeTagIds) => {
-  const resourceCategoryIds = new Set();
-  const infoGroupIds = new Set();
-  const tagCategoryIds = new Set();
-  const tagIds = new Set(activeTagIds);
-
-  for (let tag of tags)
-    if (tagIds.has(tag.tagId)) tagCategoryIds.add(tag.tagCategoryId);
-
-  const activeTagCategories = tagCategories.filter(({ tagCategoryId }) =>
-    tagCategoryIds.has(tagCategoryId)
-  );
-
-  // TODO: Improve logic for disabled tags. Tags should be disabled if the active
-  // tags in all *other* tag categories eliminate all resource groups containing
-  // that tag. The current logic fails to disable some tags when another tag in
-  // the same tag category is active.
-  const disabledTagIds = new Set(
-    tags
-      .filter((tag) => !tagCategoryIds.has(tag.tagCategoryId))
-      .map((tag) => tag.tagId)
-  );
-
-  for (let resourceGroup of resourceGroups) {
-    let resourceGroupActive = true;
-    for (let tagCategory of activeTagCategories) {
-      let hasCategory = false;
-      for (let tag of tagCategory.tags) {
-        if (!tagIds.has(tag.tagId)) continue;
-        if (resourceGroup.tags.includes(tag)) {
-          hasCategory = true;
-          break;
-        }
-      }
-      if (!hasCategory) {
-        resourceGroupActive = false;
-        break;
-      }
-    }
-    if (resourceGroupActive) {
-      infoGroupIds.add(resourceGroup.infoGroupId);
-      resourceCategoryIds.add(resourceGroup.resourceCategoryId);
-      for (let tagId of resourceGroup.tagIds) disabledTagIds.delete(tagId);
-    }
-  }
-
-  return {
-    disabledTagIds,
-    resourceCategoryIds,
-    infoGroupIds,
-    tagCategoryIds,
-    tagIds,
-  };
-};
-
 export default function ResourceHome({ baseUri, title, showTitle, slidesURI }) {
   const [activeTagIds, setActiveTagIds] = useState([]);
   const slides = useJSON(`${baseUri}${slidesURI}`);
@@ -136,12 +21,12 @@ export default function ResourceHome({ baseUri, title, showTitle, slidesURI }) {
   const groups = useMemo(
     () =>
       allGroups && !allGroups.error && allResources && !allResources.error
-        ? linkGroupData(allGroups, allResources)
+        ? linkResourceGroups(allGroups, allResources)
         : null,
     [allGroups, allResources]
   );
   const active = useMemo(
-    () => (groups ? getActive(groups, activeTagIds) : null),
+    () => (groups ? filterResourceGroups(groups, activeTagIds) : null),
     [groups, activeTagIds]
   );
 
diff --git a/src/utils.jsx b/src/utils.jsx
index 9b24b02..ed51fac 100644
--- a/src/utils.jsx
+++ b/src/utils.jsx
@@ -119,6 +119,129 @@ export const useTransform = (
   }, responseArray);
 };
 
+const makeMap = (items, key) => {
+  const map = {};
+  for (let item of items) map[item[key]] = item;
+  return map;
+};
+
+export const linkResourceGroups = (resourceGroups, { results: resources }) => {
+  const tagCategories = [
+    {
+      tagCategoryId: 1,
+      name: "Resource Provider",
+      tags: [],
+    },
+  ];
+  const resourceCategories = [
+    {
+      resourceCategoryId: 1,
+      name: "Compute & Storage Resources",
+      resourceGroups: [],
+      resourceGroupIds: [],
+    },
+  ];
+  let nextTagId = 1;
+  const tags = [];
+  const rpTagMap = {};
+  const resourceMap = makeMap(resources, "info_resourceid");
+  const tagCategoryMap = makeMap(tagCategories, "tagCategoryId");
+  const resourceCategoryMap = makeMap(resourceCategories, "resourceCategoryId");
+
+  for (let resourceGroup of resourceGroups) {
+    resourceGroup.infoGroupId = resourceGroup.infoGroupId;
+    resourceGroup.tags = [];
+    resourceGroup.tagIds = [];
+    for (let infoResourceId of resourceGroup.infoResourceIds) {
+      let resource = resourceMap[infoResourceId];
+      if (!resource) continue;
+      if (resource.organization_name) {
+        let tag = rpTagMap[resource.organization_name];
+        if (!tag) {
+          tag = {
+            tagId: nextTagId++,
+            tagCategoryId: 1,
+            name: resource.organization_name,
+          };
+          tags.push(tag);
+          rpTagMap[resource.organization_name] = tag;
+          tagCategoryMap[1].tags.push(tag);
+          tag.tagCategory = tagCategoryMap[1];
+        }
+        if (!resourceGroup.tagIds.includes(tag.tagId)) {
+          resourceGroup.tagIds.push(tag.tagId);
+          resourceGroup.tags.push(tag);
+        }
+      }
+    }
+    resourceGroup.resourceCategoryId = 1;
+    resourceGroup.resourceCategory = resourceCategoryMap[1];
+    resourceGroup.resourceCategory.resourceGroups.push(resourceGroup);
+    resourceGroup.resourceCategory.resourceGroupIds.push(
+      resourceGroup.infoGroupId
+    );
+  }
+  return { resourceCategories, resourceGroups, tags, tagCategories };
+};
+
+export const filterResourceGroups = (
+  { resourceGroups, tags, tagCategories },
+  activeTagIds
+) => {
+  const resourceCategoryIds = new Set();
+  const infoGroupIds = new Set();
+  const tagCategoryIds = new Set();
+  const tagIds = new Set(activeTagIds);
+
+  for (let tag of tags)
+    if (tagIds.has(tag.tagId)) tagCategoryIds.add(tag.tagCategoryId);
+
+  const activeTagCategories = tagCategories.filter(({ tagCategoryId }) =>
+    tagCategoryIds.has(tagCategoryId)
+  );
+
+  // TODO: Improve logic for disabled tags. Tags should be disabled if the active
+  // tags in all *other* tag categories eliminate all resource groups containing
+  // that tag. The current logic fails to disable some tags when another tag in
+  // the same tag category is active.
+  const disabledTagIds = new Set(
+    tags
+      .filter((tag) => !tagCategoryIds.has(tag.tagCategoryId))
+      .map((tag) => tag.tagId)
+  );
+
+  for (let resourceGroup of resourceGroups) {
+    let resourceGroupActive = true;
+    for (let tagCategory of activeTagCategories) {
+      let hasCategory = false;
+      for (let tag of tagCategory.tags) {
+        if (!tagIds.has(tag.tagId)) continue;
+        if (resourceGroup.tags.includes(tag)) {
+          hasCategory = true;
+          break;
+        }
+      }
+      if (!hasCategory) {
+        resourceGroupActive = false;
+        break;
+      }
+    }
+    if (resourceGroupActive) {
+      infoGroupIds.add(resourceGroup.infoGroupId);
+      resourceCategoryIds.add(resourceGroup.resourceCategoryId);
+      for (let tagId of resourceGroup.tagIds) disabledTagIds.delete(tagId);
+    }
+  }
+
+  return {
+    disabledTagIds,
+    resourceCategoryIds,
+    infoGroupIds,
+    tagCategoryIds,
+    tagIds,
+  };
+};
+
 export const sortOn = (prop) => (a, b) => a[prop] < b[prop] ? -1 : 1;
 
 export const extractHref = (html) => {

From ee422fc4ec474b514d29aed03f9be8b9c8eeae11 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Thu, 31 Oct 2024 13:17:12 -0400
Subject: [PATCH 062/113] refactor(utils): include linked data in resource
 group hooks

---
 src/resource-group-events.jsx |  4 ++--
 src/resource-home.jsx         | 19 ++-----------------
 src/utils.jsx                 | 29 ++++++++++++++++++-----------
 3 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/src/resource-group-events.jsx b/src/resource-group-events.jsx
index 1c75574..5859441 100644
--- a/src/resource-group-events.jsx
+++ b/src/resource-group-events.jsx
@@ -1,11 +1,11 @@
-import { useJSON, useResourceGroupJSON, useTransform } from "./utils";
+import { useJSON, useResourceGroup, useTransform } from "./utils";
 
 import Alert from "./alert";
 import ResourceGroupEvent from "./resource-group-event";
 import Section from "./section";
 
 export default function ResourceGroupEvents({ baseUri, infoGroupId }) {
-  const groupData = useResourceGroupJSON(infoGroupId);
+  const groupData = useResourceGroup(infoGroupId);
   const currentAnnouncementData = useJSON(
     "https://operations-api.access-ci.org/wh2/news/v1/affiliation/access-ci.org/current_outages/"
   );
diff --git a/src/resource-home.jsx b/src/resource-home.jsx
index 8287a07..6a6bf4c 100644
--- a/src/resource-home.jsx
+++ b/src/resource-home.jsx
@@ -1,10 +1,5 @@
 import { useMemo, useState } from "preact/hooks";
-import {
-  filterResourceGroups,
-  linkResourceGroups,
-  useJSON,
-  useResourceGroupsJSON,
-} from "./utils";
+import { filterResourceGroups, useJSON, useResourceGroups } from "./utils";
 
 import { Carousel, CarouselSlide } from "./carousel";
 import { ResourceCategory } from "./resource-category";
@@ -14,17 +9,7 @@ import { ResourcePathways } from "./resource-pathways";
 export default function ResourceHome({ baseUri, title, showTitle, slidesURI }) {
   const [activeTagIds, setActiveTagIds] = useState([]);
   const slides = useJSON(`${baseUri}${slidesURI}`);
-  const allGroups = useResourceGroupsJSON();
-  const allResources = useJSON(
-    "https://operations-api.access-ci.org/wh2/cider/v2/access-active/"
-  );
-  const groups = useMemo(
-    () =>
-      allGroups && !allGroups.error && allResources && !allResources.error
-        ? linkResourceGroups(allGroups, allResources)
-        : null,
-    [allGroups, allResources]
-  );
+  const groups = useResourceGroups();
   const active = useMemo(
     () => (groups ? filterResourceGroups(groups, activeTagIds) : null),
     [groups, activeTagIds]
diff --git a/src/utils.jsx b/src/utils.jsx
index ed51fac..de4a4f9 100644
--- a/src/utils.jsx
+++ b/src/utils.jsx
@@ -77,12 +77,16 @@ export const useJSON = (
   return value;
 };
 
-export const useResourceGroupsJSON = () => {
-  const data = useJSON(
-    `https://operations-api.access-ci.org/wh2/cider/v1/groups/group_type/resource-catalog.access-ci.org/`
+export const useResourceGroups = () => {
+  const responses = useJSON(
+    [
+      "https://operations-api.access-ci.org/wh2/cider/v1/groups/group_type/resource-catalog.access-ci.org/",
+      "https://operations-api.access-ci.org/wh2/cider/v2/access-active/",
+    ],
+    { defaultValue: [] }
   );
-  return useTransform([data], (response) =>
-    response.results
+  return useTransform(responses, (allGroups, allResources) => {
+    const resourceGroups = allGroups.results
       .filter((group) => group.info_resourceids)
       .map((group) => ({
         infoGroupId: group.info_groupid,
@@ -95,15 +99,17 @@ export const useResourceGroupsJSON = () => {
             }/logo`
           : null,
       }))
-      .sort((a, b) => a.name.localeCompare(b.name))
-  );
+      .sort((a, b) => a.name.localeCompare(b.name));
+    return linkResourceGroups(resourceGroups, allResources.results);
+  });
 };
 
-export const useResourceGroupJSON = (infoGroupId, defaultValue = null) => {
+export const useResourceGroup = (infoGroupId, defaultValue = null) => {
   // TODO: Replace this with the individual group endpoint once it is available.
-  const groups = useResourceGroupsJSON();
+  const groups = useResourceGroups();
   return groups
-    ? groups.find((group) => group.infoGroupId == infoGroupId) || defaultValue
+    ? groups.resourceGroups.find((group) => group.infoGroupId == infoGroupId) ||
+        defaultValue
     : defaultValue;
 };
 
@@ -113,6 +119,7 @@ export const useTransform = (
   defaultValue = null
 ) => {
   return useMemo(() => {
+    if (!responseArray.length) return defaultValue;
     for (let response of responseArray)
       if (!response || response.error) return defaultValue;
     return transformFunction.apply(null, responseArray);
@@ -125,7 +132,7 @@ const makeMap = (items, key) => {
   return map;
 };
 
-export const linkResourceGroups = (resourceGroups, { results: resources }) => {
+export const linkResourceGroups = (resourceGroups, resources) => {
   const tagCategories = [
     {
       tagCategoryId: 1,

From 4bac6f07ccd45526162273f8345481116223c3be Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Thu, 31 Oct 2024 14:16:57 -0400
Subject: [PATCH 063/113] feat(resource-group-description): use CIDeR resource
 group data

---
 src/resource-group-description.jsx | 47 ++++++++++++------------------
 1 file changed, 18 insertions(+), 29 deletions(-)

diff --git a/src/resource-group-description.jsx b/src/resource-group-description.jsx
index 1e3f4bc..5ecf3cf 100644
--- a/src/resource-group-description.jsx
+++ b/src/resource-group-description.jsx
@@ -1,48 +1,37 @@
-import { htmlToJsx, useJSON } from "./utils";
+import { useResourceGroup } from "./utils";
 
 import Icon from "./icon";
 
 export default function ResourceGroupDescription({ baseUri, infoGroupId }) {
-  const data = useJSON(
-    `https://support.access-ci.org/api/1.0/affinity_groups/${infoGroupId}`,
-    { corsProxy: true }
-  );
-  if (!data || data.error || !data.length) return;
-  const name = data[0].title;
-  const imageUri = `https://support.access-ci.org/${data[0].field_image}`;
-  const description = htmlToJsx(data[0].description);
-  // TODO: Add resource provider and user guide data.
-  const { resourceProvider, userGuideUri } = data;
+  const resourceGroup = useResourceGroup(infoGroupId);
+  if (!resourceGroup) return;
+  const { name, description, imageUri, tags } = resourceGroup;
   return (
     <div class="resource-group-description">
       {imageUri ? (
         <img class="resource-group-feature-image" src={imageUri} />
       ) : null}
-      <h1>{name}</h1>
-      {resourceProvider ? (
-        <p>
-          <a
-            href={`/resource-providers/${resourceProvider.resourceProviderId}`}
-          >
-            {resourceProvider.iconUri ? (
-              <Icon
-                alt={resourceProvider.name}
-                src={resourceProvider.iconUri}
-              />
-            ) : null}
-            {resourceProvider.name}
-          </a>
-        </p>
-      ) : null}
+      <h1>{resourceGroup.name}</h1>
+
+      {tags
+        .filter((tag) => tag.tagCategory.name == "Resource Provider")
+        .map((tag) => (
+          <p>
+            <a href="#">
+              {tag.iconUri ? <Icon alt={tag.name} src={tag.iconUri} /> : null}
+              {tag.name}
+            </a>
+          </p>
+        ))}
       {description ? <p>{description}</p> : null}
       <a href="https://allocations.access-ci.org" class="btn secondary lg">
         <Icon name="check2-circle" /> Get Started with {name}
       </a>
-      {userGuideUri ? (
+      {/* {userGuideUri ? (
         <a href={userGuideUri} class="btn lg">
           <Icon name="book" /> User Guide
         </a>
-      ) : null}
+      ) : null} */}
     </div>
   );
 }

From 096778b582491e9ec57405ea762b838db27c5a9f Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Fri, 1 Nov 2024 10:43:04 -0400
Subject: [PATCH 064/113] feat(resource-group-detail): use resource data from
 CIDeR

---
 .../bridges2.psc.access-ci.org.json           |  11 -
 .../announcements.json                        |   9 -
 .../discussion.json                           |  25 -
 .../documentation.json                        |  12 -
 .../bridges2.psc.access-ci.org/events.json    |  12 -
 .../projects/all.json                         |  70 --
 .../projects/educator.json                    |  30 -
 .../projects/grad-student.json                |  38 -
 .../projects/researcher.json                  |  66 --
 .../queue-metrics/30.json                     |  31 -
 .../queue-metrics/365.json                    |  31 -
 .../queue-metrics/90.json                     |  31 -
 .../bridges2.psc.access-ci.org/resources.json |  97 ---
 .../bridges2.psc.access-ci.org/software.json  | 678 ------------------
 .../jetstream2.indiana.access-ci.org.json     |  11 -
 public/api/resource-slides.json               |  20 -
 src/grid.css                                  |   1 -
 src/grid.jsx                                  |  13 +-
 src/resource-detail.jsx                       |  26 +-
 src/resource-group-detail.jsx                 |   6 +-
 src/resource-group-hardware.jsx               | 120 ++++
 src/resource-group-resources.jsx              |  46 --
 src/resource-home.jsx                         |   9 +-
 src/resource-node-types.jsx                   |  35 -
 24 files changed, 156 insertions(+), 1272 deletions(-)
 delete mode 100644 public/api/resource-groups/bridges2.psc.access-ci.org.json
 delete mode 100644 public/api/resource-groups/bridges2.psc.access-ci.org/announcements.json
 delete mode 100644 public/api/resource-groups/bridges2.psc.access-ci.org/discussion.json
 delete mode 100644 public/api/resource-groups/bridges2.psc.access-ci.org/documentation.json
 delete mode 100644 public/api/resource-groups/bridges2.psc.access-ci.org/events.json
 delete mode 100644 public/api/resource-groups/bridges2.psc.access-ci.org/projects/all.json
 delete mode 100644 public/api/resource-groups/bridges2.psc.access-ci.org/projects/educator.json
 delete mode 100644 public/api/resource-groups/bridges2.psc.access-ci.org/projects/grad-student.json
 delete mode 100644 public/api/resource-groups/bridges2.psc.access-ci.org/projects/researcher.json
 delete mode 100644 public/api/resource-groups/bridges2.psc.access-ci.org/queue-metrics/30.json
 delete mode 100644 public/api/resource-groups/bridges2.psc.access-ci.org/queue-metrics/365.json
 delete mode 100644 public/api/resource-groups/bridges2.psc.access-ci.org/queue-metrics/90.json
 delete mode 100644 public/api/resource-groups/bridges2.psc.access-ci.org/resources.json
 delete mode 100644 public/api/resource-groups/bridges2.psc.access-ci.org/software.json
 delete mode 100644 public/api/resource-groups/jetstream2.indiana.access-ci.org.json
 delete mode 100644 public/api/resource-slides.json
 create mode 100644 src/resource-group-hardware.jsx
 delete mode 100644 src/resource-group-resources.jsx
 delete mode 100644 src/resource-node-types.jsx

diff --git a/public/api/resource-groups/bridges2.psc.access-ci.org.json b/public/api/resource-groups/bridges2.psc.access-ci.org.json
deleted file mode 100644
index 14b2714..0000000
--- a/public/api/resource-groups/bridges2.psc.access-ci.org.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "name": "Bridges-2",
-  "resourceProvider": {
-    "resourceProviderId": 1,
-    "name": "Pittsburgh Supercomputing Center",
-    "iconUri": "https://i0.wp.com/www.psc.edu/wp-content/uploads/2020/09/cropped-PSClogo_Gradient-e1600870263745.jpg?fit=32%2C32&ssl=1"
-  },
-  "imageUri": "https://i0.wp.com/www.psc.edu/wp-content/uploads/2024/02/bridges-2-50.png?w=694&ssl=1",
-  "description": "Bridges-2 provides transformative capability for rapidly evolving computation- and data-intensive research, and creates opportunities for collaboration and convergence research. It supports both traditional and non-traditional research communities and applications. Bridges-2 integrates new technologies for converged, scalable HPC, machine learning and data; prioritizes researcher productivity and ease of use; and provides an extensible architecture for interoperation with complementary data-intensive projects, campus resources, and clouds.",
-  "userGuideUri": "https://www.psc.edu/resources/bridges-2/user-guide/"
-}
diff --git a/public/api/resource-groups/bridges2.psc.access-ci.org/announcements.json b/public/api/resource-groups/bridges2.psc.access-ci.org/announcements.json
deleted file mode 100644
index a3d63d4..0000000
--- a/public/api/resource-groups/bridges2.psc.access-ci.org/announcements.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "announcements": [
-    {
-      "type": "outage",
-      "description": "Bridges-2 compute, storage, and virtual machines will be unavailable on September 1, 2024 from 8:00 a.m. to 5:00 p.m. EDT for scheduled filesystem maintenance.",
-      "announcementUri": "https://www.psc.edu/resources/bridges-2/"
-    }
-  ]
-}
diff --git a/public/api/resource-groups/bridges2.psc.access-ci.org/discussion.json b/public/api/resource-groups/bridges2.psc.access-ci.org/discussion.json
deleted file mode 100644
index 59637f5..0000000
--- a/public/api/resource-groups/bridges2.psc.access-ci.org/discussion.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "categoryUri": "https://ask.cyberinfrastructure.org/c/access-forums/access-bridges/78",
-  "topics": [
-    {
-      "topic": "Bridges-2 suitability for computational chemistry workloads (mainly Gaussian)?",
-      "updateDate": "2023-07-26",
-      "topicUri": "https://ask.cyberinfrastructure.org/t/bridges-2-suitability-for-computational-chemistry-workloads-mainly-gaussian/2886"
-    },
-    {
-      "topic": "How do access Bridges2 globus endpoint",
-      "updateDate": "2023-05-26",
-      "topicUri": "https://ask.cyberinfrastructure.org/t/how-do-access-bridges2-globus-endpoint/2769"
-    },
-    {
-      "topic": "AlphaFold 2 Bridges",
-      "updateDate": "2022-09-14",
-      "topicUri": "https://ask.cyberinfrastructure.org/t/alphafold-2-bridges/2493"
-    },
-    {
-      "topic": "About the ACCESS-Bridges category",
-      "updateDate": "2022-08-29",
-      "topicUri": "https://ask.cyberinfrastructure.org/t/about-the-access-bridges-category/2474"
-    }
-  ]
-}
diff --git a/public/api/resource-groups/bridges2.psc.access-ci.org/documentation.json b/public/api/resource-groups/bridges2.psc.access-ci.org/documentation.json
deleted file mode 100644
index 72ea911..0000000
--- a/public/api/resource-groups/bridges2.psc.access-ci.org/documentation.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "documentation": [
-    {
-      "name": "Bridges-2 Home Page",
-      "documentationUri": "https://www.psc.edu/resources/bridges-2/"
-    },
-    {
-      "name": "Bridges-2 User Guide",
-      "documentationUri": "https://www.psc.edu/resources/bridges-2/user-guide/"
-    }
-  ]
-}
diff --git a/public/api/resource-groups/bridges2.psc.access-ci.org/events.json b/public/api/resource-groups/bridges2.psc.access-ci.org/events.json
deleted file mode 100644
index 3512c67..0000000
--- a/public/api/resource-groups/bridges2.psc.access-ci.org/events.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "events": [
-    {
-      "title": "Bridges-2 Webinar: Scaling Up Ecological Monitoring with AI: How Supercomputing Is Unlocking the Value of Autonomous Acoustic Sensing",
-      "startDateTime": "2024-08-23T13:00:00-04:00",
-      "endDateTime": "2024-08-23T14:00:00-04:00",
-      "eventUri": "https://www.psc.edu/events/bridges-2-webinar-series/scaling-up-ecological-monitoring-with-ai/",
-      "speaker": "Sam Lapp, University of Pittsburgh",
-      "description": "Automated acoustic recording devices monitor wildlife at an unprecedented scale. Using hundreds of sensors, bioacoustic monitoring transforms our understanding of birds, bats, and frogs, aiding biodiversity management."
-    }
-  ]
-}
diff --git a/public/api/resource-groups/bridges2.psc.access-ci.org/projects/all.json b/public/api/resource-groups/bridges2.psc.access-ci.org/projects/all.json
deleted file mode 100644
index 723b16b..0000000
--- a/public/api/resource-groups/bridges2.psc.access-ci.org/projects/all.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  "projects": {
-    "projectType": [
-      {
-        "name": "Explore ACCESS",
-        "count": 354
-      },
-      {
-        "name": "Discover ACCESS",
-        "count": 191
-      },
-      {
-        "name": "Accelerate ACCESS",
-        "count": 87
-      },
-      {
-        "name": "Maximize ACCESS",
-        "count": 14
-      }
-    ],
-    "fieldOfScience": [
-      {
-        "name": "Materials Engineering",
-        "count": 157
-      },
-      {
-        "name": "Physical Chemistry",
-        "count": 143
-      },
-      {
-        "name": "Applied Computer Science",
-        "count": 126
-      },
-      {
-        "name": "Health Sciences",
-        "count": 114
-      },
-      {
-        "name": "Ecology",
-        "count": 90
-      },
-      {
-        "name": "Training",
-        "count": 16
-      }
-    ],
-    "institution": [
-      {
-        "name": "Carnegie Mellon University",
-        "count": 321
-      },
-      {
-        "name": "University of Pittsburgh",
-        "count": 190
-      },
-      {
-        "name": "University of Somewhere",
-        "count": 110
-      },
-      {
-        "name": "Another University",
-        "count": 16
-      },
-      {
-        "name": "Computing College",
-        "count": 9
-      }
-    ]
-  }
-}
diff --git a/public/api/resource-groups/bridges2.psc.access-ci.org/projects/educator.json b/public/api/resource-groups/bridges2.psc.access-ci.org/projects/educator.json
deleted file mode 100644
index e259095..0000000
--- a/public/api/resource-groups/bridges2.psc.access-ci.org/projects/educator.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "projects": {
-    "projectType": [
-      {
-        "name": "Explore ACCESS",
-        "count": 16
-      }
-    ],
-    "fieldOfScience": [
-      {
-        "name": "Applied Computer Science",
-        "count": 10
-      },
-      {
-        "name": "Training",
-        "count": 6
-      }
-    ],
-    "institution": [
-      {
-        "name": "Carnegie Mellon University",
-        "count": 8
-      },
-      {
-        "name": "University of Pittsburgh",
-        "count": 8
-      }
-    ]
-  }
-}
diff --git a/public/api/resource-groups/bridges2.psc.access-ci.org/projects/grad-student.json b/public/api/resource-groups/bridges2.psc.access-ci.org/projects/grad-student.json
deleted file mode 100644
index 2aaf25a..0000000
--- a/public/api/resource-groups/bridges2.psc.access-ci.org/projects/grad-student.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "projects": {
-    "projectType": [
-      {
-        "name": "Explore ACCESS",
-        "count": 52
-      }
-    ],
-    "fieldOfScience": [
-      {
-        "name": "Materials Engineering",
-        "count": 21
-      },
-      {
-        "name": "Physical Chemistry",
-        "count": 12
-      },
-      {
-        "name": "Applied Computer Science",
-        "count": 19
-      }
-    ],
-    "institution": [
-      {
-        "name": "University of Somewhere",
-        "count": 26
-      },
-      {
-        "name": "Another University",
-        "count": 22
-      },
-      {
-        "name": "Computing College",
-        "count": 4
-      }
-    ]
-  }
-}
diff --git a/public/api/resource-groups/bridges2.psc.access-ci.org/projects/researcher.json b/public/api/resource-groups/bridges2.psc.access-ci.org/projects/researcher.json
deleted file mode 100644
index 07e8ed1..0000000
--- a/public/api/resource-groups/bridges2.psc.access-ci.org/projects/researcher.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "projects": {
-    "projectType": [
-      {
-        "name": "Explore ACCESS",
-        "count": 264
-      },
-      {
-        "name": "Discover ACCESS",
-        "count": 36
-      },
-      {
-        "name": "Accelerate ACCESS",
-        "count": 9
-      },
-      {
-        "name": "Maximize ACCESS",
-        "count": 14
-      }
-    ],
-    "fieldOfScience": [
-      {
-        "name": "Materials Engineering",
-        "count": 99
-      },
-      {
-        "name": "Physical Chemistry",
-        "count": 67
-      },
-      {
-        "name": "Applied Computer Science",
-        "count": 66
-      },
-      {
-        "name": "Health Sciences",
-        "count": 49
-      },
-      {
-        "name": "Ecology",
-        "count": 42
-      }
-    ],
-    "institution": [
-      {
-        "name": "Carnegie Mellon University",
-        "count": 187
-      },
-      {
-        "name": "University of Pittsburgh",
-        "count": 65
-      },
-      {
-        "name": "University of Somewhere",
-        "count": 26
-      },
-      {
-        "name": "Another University",
-        "count": 36
-      },
-      {
-        "name": "Computing College",
-        "count": 9
-      }
-    ]
-  }
-}
diff --git a/public/api/resource-groups/bridges2.psc.access-ci.org/queue-metrics/30.json b/public/api/resource-groups/bridges2.psc.access-ci.org/queue-metrics/30.json
deleted file mode 100644
index f52753d..0000000
--- a/public/api/resource-groups/bridges2.psc.access-ci.org/queue-metrics/30.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "queueMetrics": [
-    {
-      "resourceId": 1,
-      "name": "Bridges-2 Regular Memory",
-      "resourceRepositoryKey": 2900,
-      "waitTime": 11.97372,
-      "wallTime": 3.080251,
-      "expansionFactor": 5.794,
-      "order": 1
-    },
-    {
-      "resourceId": 2,
-      "name": "Bridges-2 Extreme Memory",
-      "resourceRepositoryKey": 2903,
-      "waitTime": 4.266471,
-      "wallTime": 5.40701,
-      "expansionFactor": 1.7939,
-      "order": 2
-    },
-    {
-      "resourceId": 3,
-      "name": "Bridges-2 GPU",
-      "resourceRepositoryKey": 2902,
-      "waitTime": 57.526596,
-      "wallTime": 2.376414,
-      "expansionFactor": 25.0903,
-      "order": 3
-    }
-  ]
-}
diff --git a/public/api/resource-groups/bridges2.psc.access-ci.org/queue-metrics/365.json b/public/api/resource-groups/bridges2.psc.access-ci.org/queue-metrics/365.json
deleted file mode 100644
index b5afd83..0000000
--- a/public/api/resource-groups/bridges2.psc.access-ci.org/queue-metrics/365.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "queueMetrics": [
-    {
-      "resourceId": 1,
-      "name": "Bridges-2 Regular Memory",
-      "resourceRepositoryKey": 2900,
-      "waitTime": 7.820775,
-      "wallTime": 1.699045,
-      "expansionFactor": 6.1959,
-      "order": 1
-    },
-    {
-      "resourceId": 2,
-      "name": "Bridges-2 Extreme Memory",
-      "resourceRepositoryKey": 2903,
-      "waitTime": 9.848182,
-      "wallTime": 6.751228,
-      "expansionFactor": 2.4567,
-      "order": 2
-    },
-    {
-      "resourceId": 3,
-      "name": "Bridges-2 GPU",
-      "resourceRepositoryKey": 2902,
-      "waitTime": 14.737766,
-      "wallTime": 2.025538,
-      "expansionFactor": 8.2869,
-      "order": 3
-    }
-  ]
-}
diff --git a/public/api/resource-groups/bridges2.psc.access-ci.org/queue-metrics/90.json b/public/api/resource-groups/bridges2.psc.access-ci.org/queue-metrics/90.json
deleted file mode 100644
index d844ed1..0000000
--- a/public/api/resource-groups/bridges2.psc.access-ci.org/queue-metrics/90.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "queueMetrics": [
-    {
-      "resourceId": 1,
-      "name": "Bridges-2 Regular Memory",
-      "resourceRepositoryKey": 2900,
-      "waitTime": 12.564133,
-      "wallTime": 2.7384,
-      "expansionFactor": 7.684,
-      "order": 1
-    },
-    {
-      "resourceId": 2,
-      "name": "Bridges-2 Extreme Memory",
-      "resourceRepositoryKey": 2903,
-      "waitTime": 5.413989,
-      "wallTime": 6.426771,
-      "expansionFactor": 1.839,
-      "order": 2
-    },
-    {
-      "resourceId": 3,
-      "name": "Bridges-2 GPU",
-      "resourceRepositoryKey": 2902,
-      "waitTime": 44.75172,
-      "wallTime": 2.512934,
-      "expansionFactor": 18.7756,
-      "order": 3
-    }
-  ]
-}
diff --git a/public/api/resource-groups/bridges2.psc.access-ci.org/resources.json b/public/api/resource-groups/bridges2.psc.access-ci.org/resources.json
deleted file mode 100644
index 15496d6..0000000
--- a/public/api/resource-groups/bridges2.psc.access-ci.org/resources.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-  "resources": [
-    {
-      "resourceId": 1,
-      "name": "Bridges-2 Regular Memory",
-      "summary": "Regular Memory (RM) nodes provide extremely powerful general-purpose computing, pre- and post-processing, AI inferencing, and machine learning and data analytics. Most RM nodes contain 256GB of RAM, but 16 of them have 512GB.",
-      "resourceTypeId": 1,
-      "nodeTypes": [
-        {
-          "count": 488,
-          "cpu": "2 AMD EPYC 7742 CPUs, 64 cores per CPU, 128 cores per node, 2.25-3.40 GHz",
-          "ram": "256GB",
-          "cache": "256MB L3, 8 memory channels",
-          "localStorage": "3.84TB NVMe SSD",
-          "network": "Mellanox ConnectX-6-HDR Infiniband 200Gb/s Adapter"
-        },
-        {
-          "count": 16,
-          "cpu": "2 AMD EPYC 7742 CPUs, 64 cores per CPU, 128 cores per node, 2.25-3.40 GHz",
-          "ram": "512GB",
-          "cache": "256MB L3, 8 memory channels",
-          "localStorage": "3.84TB NVMe SSD",
-          "network": "Mellanox ConnectX-6-HDR Infiniband 200Gb/s Adapter"
-        }
-      ],
-      "order": 1
-    },
-    {
-      "resourceId": 2,
-      "name": "Bridges-2 Extreme Memory",
-      "summary": "Extreme Memory (EM) nodes provide 4TB of shared memory for statistics, graph analytics, genome sequence assembly, and other applications requiring a large amount of memory for which distributed-memory implementations are not available.",
-      "resourceTypeId": 1,
-      "nodeTypes": [
-        {
-          "count": 4,
-          "cpu": "4 Intel Xeon Platinum 8260M Cascade lake CPUs, 24 cores per CPU, 96 cores per node, 2.40-3.90 GHz",
-          "ram": "4TB, DDR4-2933",
-          "cache": "37.75MB LLC, 6 memory channels",
-          "localStorage": "7.68TB NVMe SSD",
-          "network": "Mellanox ConnectX-6-HDR Infiniband 200Gb/s Adapter"
-        }
-      ],
-      "order": 2
-    },
-    {
-      "resourceId": 3,
-      "name": "Bridges-2 GPU",
-      "summary": "Bridges-2's GPU nodes provide exceptional performance and scalability for deep learning and accelerated computing, with a total of 40, 960 CUDA cores and 5,120 tensor cores. Bridges' GPU-AI resources have been migrated to Bridges-2, adding the DGX-2 and nine more V100 GPU nodes to Bridges-2's GPU resources.",
-      "resourceTypeId": 1,
-      "nodeTypes": [
-        {
-          "count": 24,
-          "gpu": "8 NVIDIA Tesla V100-32GB SXM2",
-          "gpuMemory": "32 GB per GPU, 256GB total/node",
-          "gpuPerformance": "1 Pf/s tensor",
-          "cpu": "2 Intel Xeon Gold 6248 Cascade Lake CPUs, 20 cores per CPU, 40 cores per node, 2.50-3.90 GHz",
-          "ram": "512GB, DDR4-2933",
-          "interconnect": "NVLink",
-          "nvCache": "27.5MB LLC, 6 memory channels",
-          "localStorage": "7.68TB NVMe SSD",
-          "network": "2 Mellanox ConnectX-6 HDR Infiniband 200 Gbs/s Adapters"
-        },
-        {
-          "count": 9,
-          "gpu": "8 NVIDIA V100-16GB",
-          "gpuMemory": "16GB per GPU, 128GB total/node",
-          "cpu": "2 Intel Xeon Gold 6148 CPUs, 20 cores per CPU, 40 cores per node, 2.4-3.7 GHz",
-          "ram": "192 GB, DDR4-2666",
-          "interconnect": "PCIe",
-          "localStorage": "4 NVMe SSDs, 2TB each (total 8TB)"
-        },
-        {
-          "count": 1,
-          "gpu": "16 NVIDIA Volta V100-32GB",
-          "gpuMemory": "32GB per GPU, 512GB total",
-          "cpu": "2 Intel Xeon Platinum 8168, 24 cores per CPU, 48 cores total, 2.7-3.7 GHz",
-          "ram": "1.5 TB, DDR4-2666",
-          "interconnect": "NVLink",
-          "nvCache": "33MB",
-          "localStorage": "8 NVMe SSDs, 8.84TB each (total ~30TB)"
-        }
-      ],
-      "order": 3
-    },
-    {
-      "resourceId": 4,
-      "name": "Bridges-2 Ocean",
-      "summary": "Data management on Bridges-2 is accomplished through a unified, high performance filesystem for active project data, archive, and resilience, named Ocean. Used for active project data, Ocean is a high performance, internally resilient Lustre parallel filesystem with 15PB of usable capacity, configured to deliver up to 129GB/s and 142GB/s of read and write bandwidth, respectively.",
-      "resourceTypeId": 2,
-      "order": 4
-    }
-  ],
-  "resourceTypes": [
-    { "resourceTypeId": 1, "name": "Compute Resources" },
-    { "resourceTypeId": 2, "name": "Storage Resources" }
-  ]
-}
diff --git a/public/api/resource-groups/bridges2.psc.access-ci.org/software.json b/public/api/resource-groups/bridges2.psc.access-ci.org/software.json
deleted file mode 100644
index eaa8751..0000000
--- a/public/api/resource-groups/bridges2.psc.access-ci.org/software.json
+++ /dev/null
@@ -1,678 +0,0 @@
-{
-  "software": [
-    {
-      "softwareId": 0,
-      "name": "Abinit",
-      "summary": "Calculates electronic density and derived properties of materials (incl. molecules, surfaces & solids) within DFT using pseudopotentials and a planewave or wavelet basis"
-    },
-    {
-      "softwareId": 1,
-      "name": "ABySS",
-      "summary": "Parallel assembler for short read sequence data"
-    },
-    {
-      "softwareId": 2,
-      "name": "AI/ML/BD environments",
-      "summary": "Prebuilt environments of AI/ML/BD packages"
-    },
-    {
-      "softwareId": 3,
-      "name": "AMBER",
-      "summary": "Package of molecular simulation programs"
-    },
-    {
-      "softwareId": 4,
-      "name": "Anaconda",
-      "summary": "Open data science platform, includes popular Python, R and SCALA packages"
-    },
-    {
-      "softwareId": 5,
-      "name": "ANSYS",
-      "summary": "General purpose finite element modeling package"
-    },
-    {
-      "softwareId": 6,
-      "name": "AOCL",
-      "summary": "Numerical library suite optimized for AMD processors"
-    },
-    {
-      "softwareId": 7,
-      "name": "Arriba",
-      "summary": "Detects gene fusions from RNA-Seq data"
-    },
-    {
-      "softwareId": 8,
-      "name": "asciinema",
-      "summary": "Allows recording and sharing terminal sessions"
-    },
-    {
-      "softwareId": 9,
-      "name": "AUGUSTUS",
-      "summary": "Predicts genes in eukaryotic genomic sequences"
-    },
-    {
-      "softwareId": 10,
-      "name": "BAMTools",
-      "summary": "C++ API and toolkit for analyzing and managing BAM files"
-    },
-    {
-      "softwareId": 11,
-      "name": "BCFTools",
-      "summary": "Utilities for variant calling and manipulating VCFs and BCFs"
-    },
-    {
-      "softwareId": 12,
-      "name": "Bedops",
-      "summary": "Tools to address common questions raised in genomics studies"
-    },
-    {
-      "softwareId": 13,
-      "name": "Bedtools",
-      "summary": "Utilities for comparing, summarizing and intersecting genomic features in the UCSC Genome Browser BED format"
-    },
-    {
-      "softwareId": 14,
-      "name": "Bismark",
-      "summary": "Bisulfite read mapper and methylation caller"
-    },
-    {
-      "softwareId": 15,
-      "name": "BLAST",
-      "summary": "Search tool that finds regions of local similarity between nucleotide or protein sequences"
-    },
-    {
-      "softwareId": 16,
-      "name": "BLAT",
-      "summary": "Alignment tool like BLAST, but structured differently"
-    },
-    {
-      "softwareId": 17,
-      "name": "Boost",
-      "summary": "Peer reviewed C++ source libraries"
-    },
-    {
-      "softwareId": 18,
-      "name": "Bowtie2",
-      "summary": "Ultrafast, memory-efficient tool for aligning sequencing reads to long reference sequences. See related tool Bowtie."
-    },
-    {
-      "softwareId": 19,
-      "name": "BUSCO",
-      "summary": "Assesses genome assembly and annotation completeness"
-    },
-    {
-      "softwareId": 20,
-      "name": "BWA",
-      "summary": "Fast light-weight tool that aligns relatively short sequences to a sequence database"
-    },
-    {
-      "softwareId": 21,
-      "name": "C, C++",
-      "summary": "Programming languages"
-    },
-    { "softwareId": 22, "name": "Caffe", "summary": "Deep learning framework" },
-    {
-      "softwareId": 23,
-      "name": "CheckM",
-      "summary": "Tools to assess the quality of genomes recovered from isolates, single cells, or metagenomes"
-    },
-    {
-      "softwareId": 24,
-      "name": "Circos",
-      "summary": "Displays data in a circular layout"
-    },
-    {
-      "softwareId": 25,
-      "name": "CMake",
-      "summary": "Tools to control the compilation process, build, test and package software"
-    },
-    {
-      "softwareId": 26,
-      "name": "Conda",
-      "summary": "Environment manager for all languages"
-    },
-    {
-      "softwareId": 27,
-      "name": "CP2K",
-      "summary": "Atomistic simulations of solid state, liquid, molecular, periodic, material, crystal, and biological systems"
-    },
-    {
-      "softwareId": 28,
-      "name": "CUDA",
-      "summary": "Parallel computing platform and API model"
-    },
-    {
-      "softwareId": 29,
-      "name": "Cutadapt",
-      "summary": "Reads a FASTA or FASTQ file, finds and removes adapters, writes the changed sequence to standard output"
-    },
-    {
-      "softwareId": 30,
-      "name": "DDT",
-      "summary": "Debugger for C, C++ and Fortran 90 threaded and parallel codes"
-    },
-    {
-      "softwareId": 31,
-      "name": "deal.ii",
-      "summary": "C++ library for finite element codes"
-    },
-    {
-      "softwareId": 32,
-      "name": "Dorado",
-      "summary": "High-performance, easy-to-use, open source basecaller for Oxford Nanopore reads"
-    },
-    {
-      "softwareId": 33,
-      "name": "DReAMM",
-      "summary": "Designs, renders and animates the output from a MCell simulation"
-    },
-    {
-      "softwareId": 34,
-      "name": "FastANI",
-      "summary": "Fast alignment-free computation of whole-genome Average Nucleotide Identity (ANI)"
-    },
-    {
-      "softwareId": 35,
-      "name": "FASTA-Splitter",
-      "summary": "Divides a single FASTA file into multiple files"
-    },
-    {
-      "softwareId": 36,
-      "name": "FASTQ-Splitter",
-      "summary": "Divides a single FASTQ file into multiple files"
-    },
-    {
-      "softwareId": 37,
-      "name": "FastQC",
-      "summary": "Quality control tool for high throughput sequence data"
-    },
-    {
-      "softwareId": 38,
-      "name": "FASTX Toolkit",
-      "summary": "Command line tools for Short-Reads FASTA/FASTQ files preprocessing"
-    },
-    {
-      "softwareId": 39,
-      "name": "FFTW3",
-      "summary": "C subroutine library for computing the DFT in one or more dimensions, of arbitrary input size, of both real and complex data"
-    },
-    {
-      "softwareId": 40,
-      "name": "Filtlong",
-      "summary": "Tool to filter long reads by quality"
-    },
-    {
-      "softwareId": 41,
-      "name": "FLASh",
-      "summary": "Fast and accurate tool to merge paired-end reads from NGS experiments"
-    },
-    {
-      "softwareId": 42,
-      "name": "Fluent",
-      "summary": "Computational fluid dynamics, part of ANSYS"
-    },
-    {
-      "softwareId": 43,
-      "name": "Fortran",
-      "summary": "Programming language"
-    },
-    {
-      "softwareId": 44,
-      "name": "Funannotate",
-      "summary": "Genome prediction, annotation and comparison"
-    },
-    {
-      "softwareId": 45,
-      "name": "GAMESS",
-      "summary": "Ab initio molecular quantum chemistry"
-    },
-    {
-      "softwareId": 46,
-      "name": "GATK",
-      "summary": "Genome Analysis Toolkit, for high-throughput sequencing data"
-    },
-    {
-      "softwareId": 47,
-      "name": "Gaussian",
-      "summary": "Electronic structure program"
-    },
-    {
-      "softwareId": 48,
-      "name": "GCC",
-      "summary": "(GNU Compiler Collection) Compiler system supporting various programming languages"
-    },
-    {
-      "softwareId": 49,
-      "name": "GeneMark-ES",
-      "summary": "Gene prediction in eukaryotes"
-    },
-    {
-      "softwareId": 50,
-      "name": "GeNT",
-      "summary": "Computes the cross entropy for groups of sequences that have been assigned to groups on the basis of biochemical, physiological, or another biological property"
-    },
-    {
-      "softwareId": 51,
-      "name": "Git",
-      "summary": "Version control system for tracking changes in files and coordinating work on files among multiple people"
-    },
-    {
-      "softwareId": 52,
-      "name": "GNU Parallel",
-      "summary": "Shell tool for executing jobs in parallel using one or more computers"
-    },
-    {
-      "softwareId": 53,
-      "name": "GROMACS",
-      "summary": "Molecular dynamics software primarily designed for biomolecular systems"
-    },
-    {
-      "softwareId": 54,
-      "name": "Guppy",
-      "summary": "Data processing toolkit containing the Oxford Nanopore Technologies’ basecalling algorithms"
-    },
-    {
-      "softwareId": 55,
-      "name": "Gurobi",
-      "summary": "Mathematical programming solver"
-    },
-    {
-      "softwareId": 56,
-      "name": "hashdeep",
-      "summary": "Computes hash files, or message digests, for any number of files"
-    },
-    {
-      "softwareId": 57,
-      "name": "HDF5/PHDF5",
-      "summary": "Data model, library, and file format for storing and managing data and its parallel version"
-    },
-    {
-      "softwareId": 58,
-      "name": "HISAT2",
-      "summary": "Fast, sensitive alignment, mapping NGS reads (DNA & RNA) to a population of human genomes or against a single reference genome"
-    },
-    {
-      "softwareId": 59,
-      "name": "HMMER",
-      "summary": "Biosequence analysis using profile hidden Markov models"
-    },
-    {
-      "softwareId": 60,
-      "name": "Homer",
-      "summary": "Suite of tools for motif discovery and next-gen sequence analysis"
-    },
-    {
-      "softwareId": 61,
-      "name": "HPN-SSH",
-      "summary": "Series of patches for OpenSSH to provide improved performance and functionality"
-    },
-    {
-      "softwareId": 62,
-      "name": "HTSlib",
-      "summary": "C library for reading and writing high-throughput sequence data"
-    },
-    {
-      "softwareId": 63,
-      "name": "iCommands",
-      "summary": "Library of commands to access iRODS servers"
-    },
-    {
-      "softwareId": 64,
-      "name": "Infernal",
-      "summary": "Searches DNA sequence databases for RNA structure and sequence similarities"
-    },
-    {
-      "softwareId": 65,
-      "name": "ICC (Intel)",
-      "summary": "Intel compilers, libraries and MPI implementation"
-    },
-    { "softwareId": 66, "name": "Java", "summary": "Programming language" },
-    {
-      "softwareId": 67,
-      "name": "Julia",
-      "summary": "High-level, high performance dynamic programming language for numerical computing"
-    },
-    {
-      "softwareId": 68,
-      "name": "Jupyter",
-      "summary": "Create and share code, visualizations, equations, more"
-    },
-    {
-      "softwareId": 69,
-      "name": "Keras",
-      "summary": "Minimalist, highly modular neural networks library written in Python and capable of running on top of either TensorFlow or Theano"
-    },
-    {
-      "softwareId": 70,
-      "name": "Kracken2",
-      "summary": "Taxonomic sequence classifier that assigns taxonomic labels to DNA sequences"
-    },
-    {
-      "softwareId": 71,
-      "name": "LAMMPS",
-      "summary": "Classical molecular dynamics code"
-    },
-    {
-      "softwareId": 72,
-      "name": "lazygit",
-      "summary": "Simple terminal UI for git commands"
-    },
-    {
-      "softwareId": 73,
-      "name": "lowcharts",
-      "summary": "Tool to draw low-resolution charts in the terminal"
-    },
-    {
-      "softwareId": 74,
-      "name": "LSMS",
-      "summary": "Locally Self-consistent Multiple Scattering method, an order-N approach to the calculating the electronic structure of large systems within the local density approximation"
-    },
-    {
-      "softwareId": 75,
-      "name": "MATLAB",
-      "summary": "High-level language and interactive environment, performs computationally intensive tasks faster than traditional languages"
-    },
-    {
-      "softwareId": 76,
-      "name": "MCell",
-      "summary": "Monte Carlo Cell, simulates the movements and reactions of molecules within and between cells"
-    },
-    {
-      "softwareId": 77,
-      "name": "MEME Suite",
-      "summary": "Collection of tools for the discovery and analysis of sequence motifs"
-    },
-    {
-      "softwareId": 78,
-      "name": "Methylpy",
-      "summary": "Bisulfate sequencing data processing and differential methylation analysis"
-    },
-    {
-      "softwareId": 79,
-      "name": "Minialign",
-      "summary": "A little bit fast and moderately accurate nucleotide sequence alignment tool for PacBio & Nanopore long reads"
-    },
-    {
-      "softwareId": 80,
-      "name": "MKL",
-      "summary": "Math Kernel Library, highly optimized and threaded routines for linear algebra, FFTs, vector math and random number generators"
-    },
-    {
-      "softwareId": 81,
-      "name": "MPI",
-      "summary": "Message Passing Interface. Both Intel MPI and Open MPI are available."
-    },
-    {
-      "softwareId": 82,
-      "name": "MVAPICH",
-      "summary": "Library exploiting novel features and mechanisms of high performance networking technologies. Delivers improved performance and scalability to MPI applications."
-    },
-    {
-      "softwareId": 83,
-      "name": "NAMD",
-      "summary": "Parallel, object-oriented molecular dynamics code designed for high performance simulation of large biomolecular systems"
-    },
-    {
-      "softwareId": 84,
-      "name": "Nanoplot",
-      "summary": "Plotting tool for long read sequencing data and alignments"
-    },
-    { "softwareId": 85, "name": "Ncdu", "summary": "Disk usage analyzer" },
-    {
-      "softwareId": 86,
-      "name": "ncview",
-      "summary": "Viewer for netCDF format files"
-    },
-    {
-      "softwareId": 87,
-      "name": "Nextflow",
-      "summary": "DSL for parallel and scalable computational pipelines"
-    },
-    {
-      "softwareId": 88,
-      "name": "NVHPC",
-      "summary": "NVHPC (formerly called PGI) compilers and Tools"
-    },
-    {
-      "softwareId": 89,
-      "name": "NWCHEM",
-      "summary": "Computes the properties of molecular and periodic systems using standard quantum mechanical descriptions of the electronic wavefunction or density"
-    },
-    {
-      "softwareId": 90,
-      "name": "Octave",
-      "summary": "High-level programming language, intended for computation"
-    },
-    {
-      "softwareId": 91,
-      "name": "OnDemand",
-      "summary": "Web browser interface to manage files, submit and track jobs on Bridges-2"
-    },
-    {
-      "softwareId": 92,
-      "name": "OpenBLAS",
-      "summary": "Optimized BLAS library"
-    },
-    {
-      "softwareId": 93,
-      "name": "OpenCV",
-      "summary": "Open source library of several hundred computer vision algorithms"
-    },
-    {
-      "softwareId": 94,
-      "name": "OpenFOAM",
-      "summary": "Finite volume CFD package"
-    },
-    {
-      "softwareId": 95,
-      "name": "OpenMPI",
-      "summary": "high performance message passing library"
-    },
-    {
-      "softwareId": 96,
-      "name": "ORCA",
-      "summary": "Ab-initio quantum chemistry"
-    },
-    { "softwareId": 97, "name": "Perl", "summary": "Programming language" },
-    {
-      "softwareId": 98,
-      "name": "PGI",
-      "summary": "NVHPC (formerly called PGI) compilers and Tools"
-    },
-    {
-      "softwareId": 99,
-      "name": "PHYLIP",
-      "summary": "Package for inferring phylogenies"
-    },
-    {
-      "softwareId": 100,
-      "name": "Picard",
-      "summary": "Java-based command-line utilities that manipulate SAM files, and a Java API (SAM-JDK) for creating new programs that read and write SAM files"
-    },
-    {
-      "softwareId": 101,
-      "name": "PLUMED",
-      "summary": "Library of enhanced sampling methods, free energy methods, tools to analyze data for MD simulations"
-    },
-    {
-      "softwareId": 102,
-      "name": "Porechop",
-      "summary": "Tool which finds and removes adapters from Oxford Nanopore reads"
-    },
-    {
-      "softwareId": 103,
-      "name": "pnetCDF",
-      "summary": "high performance, parallel library for files compatible with netCDF"
-    },
-    {
-      "softwareId": 104,
-      "name": "Prodigal",
-      "summary": "Open source lightweight microbial genefinding program"
-    },
-    {
-      "softwareId": 105,
-      "name": "Prokka",
-      "summary": "Software tool for rapid annotation of prokaryotic genomes"
-    },
-    {
-      "softwareId": 106,
-      "name": "Python (including numpy, scipy)",
-      "summary": "Powerful, object-oriented programming language"
-    },
-    {
-      "softwareId": 107,
-      "name": "PyTorch",
-      "summary": "Machine Learning framework"
-    },
-    {
-      "softwareId": 108,
-      "name": "Quantum Espresso",
-      "summary": "Integrated suite of codes for electronic-structure calculations and materials modeling at the nanoscale"
-    },
-    {
-      "softwareId": 109,
-      "name": "R",
-      "summary": "Language and environment and an IDE for statistical computing and graphs"
-    },
-    {
-      "softwareId": 110,
-      "name": "RAPIDS",
-      "summary": "Framework bundling libraries to execute end-to-end data science pipelines on top of GPUs"
-    },
-    {
-      "softwareId": 111,
-      "name": "RAxML",
-      "summary": "Maximum likelihood phylogeny estimation for interpreting relationships between sets of data"
-    },
-    {
-      "softwareId": 112,
-      "name": "Rclone",
-      "summary": "Tool for managing files in cloud storage"
-    },
-    {
-      "softwareId": 113,
-      "name": "RNAview",
-      "summary": "Generates 2-dimensional displays of RNA/DNA secondary structures with tertiary interactions"
-    },
-    {
-      "softwareId": 114,
-      "name": "SAMtools",
-      "summary": "Utilities for manipulating alignments in SAM format"
-    },
-    {
-      "softwareId": 115,
-      "name": "Scikit-learn",
-      "summary": "Simple and efficient tools for data mining and data analysis, built on NumPy, SciPy and matplotlib"
-    },
-    {
-      "softwareId": 116,
-      "name": "Siesta",
-      "summary": "Performing efficient electronic structure calculations and ab initio molecular dynamics simulations of molecules and solids"
-    },
-    {
-      "softwareId": 117,
-      "name": "Singularity",
-      "summary": "Open-source software container platform"
-    },
-    {
-      "softwareId": 118,
-      "name": "SPAdes",
-      "summary": "St. Petersburg genome assembler – an assembly toolkit with various assembly pipelines"
-    },
-    {
-      "softwareId": 119,
-      "name": "Spark",
-      "summary": "Open source software web application framework and domain-specific language written in Java"
-    },
-    {
-      "softwareId": 120,
-      "name": "SRA toolkit",
-      "summary": "Collection of tools and libraries for using data in the INSDC Sequence Read Archives"
-    },
-    {
-      "softwareId": 121,
-      "name": "STAR-Fusion",
-      "summary": "Uses the STAR aligner to identify candidate fusion transcripts supported by Illumina reads, maps junction and spanning reads to a reference annotation set"
-    },
-    {
-      "softwareId": 122,
-      "name": "STAR Aligner",
-      "summary": "Spliced Transcripts Alignment to Reference, an alignment tool for RNA sequences"
-    },
-    {
-      "softwareId": 123,
-      "name": "TensorFlow",
-      "summary": "Machine learning library for numerical computation using data flow graphs"
-    },
-    {
-      "softwareId": 124,
-      "name": "Theano",
-      "summary": "Python library that allows you to define, optimize, and evaluate mathematical expressions involving multi-dimensional arrays efficiently"
-    },
-    {
-      "softwareId": 125,
-      "name": "TIGER",
-      "summary": "Precisely maps IGEs in bacterial and archaeal genomes"
-    },
-    {
-      "softwareId": 126,
-      "name": "tmux",
-      "summary": "Terminal multiplexer; create and control multiple terminals"
-    },
-    {
-      "softwareId": 127,
-      "name": "Trinity",
-      "summary": "Package which enables the efficient and robust de novo reconstruction of transcriptomes from RNA-Seq data"
-    },
-    {
-      "softwareId": 128,
-      "name": "tRNAscan-se",
-      "summary": "Program for improved detection of transfer RNA genes in genomic sequence"
-    },
-    {
-      "softwareId": 129,
-      "name": "VASP",
-      "summary": "Atomic scale materials modeling, e.g. electronic structure calculations and quantum-mechanical molecular dynamics, from first principles"
-    },
-    {
-      "softwareId": 130,
-      "name": "VCF2MAF",
-      "summary": "Tool to convert VCFs to MAFs"
-    },
-    {
-      "softwareId": 131,
-      "name": "VCFtools",
-      "summary": "Tool providing easily accessible methods for working with complex genetic variation data in the form of VCF files"
-    },
-    {
-      "softwareId": 132,
-      "name": "VisiData",
-      "summary": "Interactive tool to manage tabula data"
-    },
-    {
-      "softwareId": 133,
-      "name": "Visit",
-      "summary": "Interactive and scalable visualization, animation and analysis tool"
-    },
-    {
-      "softwareId": 134,
-      "name": "VTune",
-      "summary": "Performance analysis tool for serial, multithreaded or MPI applications"
-    },
-    {
-      "softwareId": 135,
-      "name": "WIEN2k",
-      "summary": "Electronic structure calculations of solids using DFT"
-    },
-    {
-      "softwareId": 136,
-      "name": "Xfig and transfig",
-      "summary": "Interactive drawing tools"
-    },
-    {
-      "softwareId": 137,
-      "name": "Zoltan",
-      "summary": "Data management services for unstructured, adaptive and dynamic applications"
-    }
-  ]
-}
diff --git a/public/api/resource-groups/jetstream2.indiana.access-ci.org.json b/public/api/resource-groups/jetstream2.indiana.access-ci.org.json
deleted file mode 100644
index f6c9d44..0000000
--- a/public/api/resource-groups/jetstream2.indiana.access-ci.org.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "name": "Jetstream2",
-  "resourceProvider": {
-    "resourceProviderId": 2,
-    "name": "Indiana University",
-    "iconUri": "https://www.iu.edu/favicon.ico"
-  },
-  "imageUri": "https://jetstream-cloud.org/images/home/jetstream-2.png",
-  "description": "Jetstream2 is a user-friendly cloud computing environment for researchers and educators running on OpenStack and featuring Exosphere as the primary user interface. It is built on the successes of Jetstream1 and continues the main features of that system while extending to a broader range of hardware and services, including GPUs, large memory nodes, virtual clustering, programmable cyberinfrastructure with OpenStack Heat and Terraform, and many other features. It is designed to provide both infrastructure for gateways and other “always on” services as well as giving researchers access to interactive computing and data analysis resources on demand.",
-  "userGuideUri": "https://docs.jetstream-cloud.org/"
-}
diff --git a/public/api/resource-slides.json b/public/api/resource-slides.json
deleted file mode 100644
index 7e13f07..0000000
--- a/public/api/resource-slides.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "slides": [
-    {
-      "title": "Stampede3 Now Available!",
-      "description": "Stampede3, the latest resource from TACC, is now accepting allocation requests. This powerful Dell Technologies and Intel based supercomputer is the only system in the ACCESS environment to integrate the new Intel Max Series GPUs.",
-      "linkText": "Learn more about Stampede3",
-      "linkURI": "https://tacc.utexas.edu/systems/stampede3/",
-      "imageURI": "/access-ci-ui/images/stampede3.jpg",
-      "imageAltText": "Cattle cross a dirt road behind the logo for Stampede3"
-    },
-    {
-      "title": "PSC Machine Room Tours",
-      "description": "Pittsburgh Supercomputing Center is offering tours of its machine room to interested uses of its Bridges-2 machine.",
-      "linkText": "Sign up for a tour",
-      "linkURI": "https://www.psc.edu/psc-machine-room-tours/",
-      "imageURI": "/access-ci-ui/images/psc-machine-room.jpg",
-      "imageAltText": "A PSC staff member explains the Bridges-2 supercomputer to a group of three visitors"
-    }
-  ]
-}
diff --git a/src/grid.css b/src/grid.css
index 8f1eaef..34e2a40 100644
--- a/src/grid.css
+++ b/src/grid.css
@@ -1,6 +1,5 @@
 .grid {
   border-top: 1px solid var(--contrast);
-  max-height: 400px;
   max-width: 100%;
   margin-bottom: 1rem;
   overflow: scroll;
diff --git a/src/grid.jsx b/src/grid.jsx
index 9c4bd7c..24212a4 100644
--- a/src/grid.jsx
+++ b/src/grid.jsx
@@ -11,6 +11,7 @@ export default function Grid({
   rows,
   classes,
   frozenColumns = 0,
+  maxHeight = 400,
   minWidth,
   rowClasses = [],
   scrollResetOnUpdate = false,
@@ -66,7 +67,17 @@ export default function Grid({
   if (minWidth) style.minWidth = minWidth;
 
   return (
-    <div class={`grid ${classes || ""}`} ref={container}>
+    <div
+      class={`grid ${classes || ""}`}
+      style={{
+        maxHeight: Number.isInteger(maxHeight)
+          ? `${maxHeight}px`
+          : maxHeight
+          ? maxHeight
+          : null,
+      }}
+      ref={container}
+    >
       <table class="table" style={style}>
         <thead>
           <tr>{th}</tr>
diff --git a/src/resource-detail.jsx b/src/resource-detail.jsx
index a5b22e5..03e62d3 100644
--- a/src/resource-detail.jsx
+++ b/src/resource-detail.jsx
@@ -1,10 +1,24 @@
-import ResourceNodeTypes from "./resource-node-types";
+import Accordion from "./accordion";
 
-export default function ResourceDetail({ summary, nodeTypes }) {
+const toP = (text) =>
+  text ? text.split(/[\n\r]+/g).map((p) => <p>{p}</p>) : null;
+
+export default function ResourceDetail({
+  resource_descriptive_name,
+  resource_description,
+  compute,
+  storage,
+}) {
+  const recommendedUse = (compute || storage || {}).recommended_use;
   return (
-    <>
-      {summary ? <p>{summary}</p> : null}
-      {nodeTypes ? <ResourceNodeTypes nodeTypes={nodeTypes} /> : null}
-    </>
+    <Accordion title={resource_descriptive_name}>
+      {toP(resource_description)}
+      {recommendedUse ? (
+        <>
+          <h3>Recommended Use</h3>
+          {toP(recommendedUse)}
+        </>
+      ) : null}
+    </Accordion>
   );
 }
diff --git a/src/resource-group-detail.jsx b/src/resource-group-detail.jsx
index 9d01433..b8e4b2e 100644
--- a/src/resource-group-detail.jsx
+++ b/src/resource-group-detail.jsx
@@ -3,9 +3,9 @@ import ResourceGroupDescription from "./resource-group-description";
 import ResourceGroupDiscussion from "./resource-group-discussion";
 import ResourceGroupDocumentation from "./resource-group-documentation";
 import ResourceGroupEvents from "./resource-group-events";
+import ResourceGroupHardware from "./resource-group-hardware";
 import ResourceGroupProjects from "./resource-group-projects";
 import ResourceGroupQueueMetrics from "./resource-group-queue-metrics";
-import ResourceGroupResources from "./resource-group-resources";
 import ResourceGroupSoftware from "./resource-group-software";
 import SectionNavigation from "./section-navigation";
 
@@ -14,12 +14,12 @@ export default function ResourceGroupDetail({ baseUri, infoGroupId }) {
     <div class="resource-group-detail">
       <ResourceGroupDescription baseUri={baseUri} infoGroupId={infoGroupId} />
       <SectionNavigation />
-      <ResourceGroupResources baseUri={baseUri} infoGroupId={infoGroupId} />
+      <ResourceGroupHardware baseUri={baseUri} infoGroupId={infoGroupId} />
       <ResourceGroupEvents baseUri={baseUri} infoGroupId={infoGroupId} />
       <ResourceGroupAffinityGroup baseUri={baseUri} infoGroupId={infoGroupId} />
       <ResourceGroupSoftware baseUri={baseUri} infoGroupId={infoGroupId} />
       <ResourceGroupProjects baseUri={baseUri} infoGroupId={infoGroupId} />
-      <ResourceGroupQueueMetrics baseUri={baseUri} infoGroupId={infoGroupId} />
+      {/* <ResourceGroupQueueMetrics baseUri={baseUri} infoGroupId={infoGroupId} /> */}
       <ResourceGroupDocumentation baseUri={baseUri} infoGroupId={infoGroupId} />
       <ResourceGroupDiscussion baseUri={baseUri} infoGroupId={infoGroupId} />
     </div>
diff --git a/src/resource-group-hardware.jsx b/src/resource-group-hardware.jsx
new file mode 100644
index 0000000..7ca5078
--- /dev/null
+++ b/src/resource-group-hardware.jsx
@@ -0,0 +1,120 @@
+import { useJSON, useResourceGroup } from "./utils";
+
+import Grid from "./grid";
+import ResourceDetail from "./resource-detail";
+import Section from "./section";
+
+export default function ResourceGroupHardware({ baseUri, infoGroupId }) {
+  const resourceGroup = useResourceGroup(infoGroupId);
+  const resources = useJSON(
+    resourceGroup
+      ? resourceGroup.infoResourceIds.map(
+          (infoResourceId) =>
+            `https://operations-api.access-ci.org/wh2/cider/v1/info_resourceid/${infoResourceId}/?format=json`
+        )
+      : null,
+    { defaultValue: [] }
+  );
+  const computeComp = useJSON(
+    "https://operations-api.access-ci.org/wh2/cider/v1/coco/?format=json"
+  );
+  const compLoaded = computeComp && !computeComp.error;
+  const computeColumns =
+    compLoaded && resourceGroup
+      ? Object.values(computeComp.results.resources)
+          .filter((res) =>
+            resourceGroup.infoResourceIds.includes(res.info_resourceid)
+          )
+          .map((res) => ({
+            key: res.compute_resource_id,
+            name: res.short_name,
+            format: (value, row) =>
+              row.format && value
+                ? row.format(value, row)
+                : value || <>&mdash;</>,
+          }))
+      : [];
+
+  const computeRows = compLoaded
+    ? [
+        {
+          name: "Nodes",
+          attr: "node_count",
+          format: (value) => value.toLocaleString("en-us"),
+        },
+        { name: "CPU Type", attr: "cpu_type" },
+        {
+          name: "CPU Speed",
+          attr: "cpu_speed_ghz",
+          format: (value) => `${value} Ghz`,
+        },
+        { name: "CPU Cores per Node", attr: "cpu_count_per_node" },
+        {
+          name: "RAM per CPU Core",
+          attr: "memory_per_cpu_gb",
+          format: (value) => `${value.toLocaleString("en-us")} GB`,
+        },
+        {
+          name: "GPU",
+          attr: "gpu_description",
+        },
+        {
+          name: "Local Storage per Node",
+          attr: "local_storage_per_node_gb",
+          format: (value) => `${value.toLocaleString("en-us")} GB`,
+        },
+        {
+          name: "Network Interconnect",
+          attr: "interconnect",
+        },
+      ]
+        .map((row) => ({
+          ...row,
+          ...computeComp.results.attributes[row.attr],
+        }))
+        .filter((row) => computeColumns.some((col) => row[col.key]))
+    : [];
+
+  const nameColumn = {
+    key: "name",
+    name: "Attribute",
+    format: (value) => <strong>{value}</strong>,
+  };
+
+  const hasComputeGrid = computeColumns.length > 0 && computeRows.length > 0;
+  const resourceTypes = { compute: [], storage: [], other: {} };
+  for (let { results: res } of resources)
+    (resourceTypes[res.cider_type.toLowerCase()] || resourceTypes.other).push(
+      <ResourceDetail {...res} />
+    );
+
+  return (
+    <>
+      {hasComputeGrid || resourceTypes.compute.length > 0 ? (
+        <Section title="Compute Resources" icon="cpu-fill">
+          {resourceTypes.compute}
+          {hasComputeGrid && (
+            <>
+              <h3>Hardware Specifications</h3>
+              <Grid
+                columns={[nameColumn, ...computeColumns]}
+                rows={computeRows}
+                maxHeight={null}
+              />
+            </>
+          )}
+        </Section>
+      ) : null}
+      {resourceTypes.storage.length > 0 ? (
+        <Section title="Storage Resources" icon="hdd-fill">
+          {resourceTypes.storage}
+        </Section>
+      ) : null}
+      {resourceTypes.other.length > 0 ? (
+        <Section title="Specialized Resources" icon="hdd-fill">
+          {resourceTypes.storage}
+        </Section>
+      ) : null}
+    </>
+  );
+}
diff --git a/src/resource-group-resources.jsx b/src/resource-group-resources.jsx
deleted file mode 100644
index b629879..0000000
--- a/src/resource-group-resources.jsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { useMemo } from "preact/hooks";
-import { defaultIcons } from "./icons";
-import { useJSON } from "./utils";
-
-import Accordion from "./accordion";
-import ResourceDetail from "./resource-detail";
-import Section from "./section";
-
-const linkResourceData = ({ resources, resourceTypes }) => {
-  const resourceTypesMap = {};
-  for (let resourceType of resourceTypes) {
-    resourceType.resources = [];
-    resourceTypesMap[resourceType.resourceTypeId] = resourceType;
-  }
-
-  for (let resource of resources) {
-    let resourceType = resourceTypesMap[resource.resourceTypeId];
-    resourceType.resources.push(resource);
-    resource.resourceType = resourceType;
-  }
-
-  return { resources, resourceTypes };
-};
-
-export default function ResourceGroupResources({ baseUri, infoGroupId }) {
-  const allTypes = useJSON(
-    `${baseUri}/api/resource-groups/${infoGroupId}/resources.json`
-  );
-  const types = useMemo(
-    () => (allTypes && !allTypes.error ? linkResourceData(allTypes) : null),
-    [allTypes]
-  );
-  if (!types) return;
-  return types.resourceTypes.map(({ name, resources }) => {
-    if (resources.length)
-      return (
-        <Section title={name} icon={defaultIcons[name] || "stars"}>
-          {resources.map((resource) => (
-            <Accordion title={resource.name}>
-              <ResourceDetail {...resource} />
-            </Accordion>
-          ))}
-        </Section>
-      );
-  });
-}
diff --git a/src/resource-home.jsx b/src/resource-home.jsx
index 6a6bf4c..a2fbbb1 100644
--- a/src/resource-home.jsx
+++ b/src/resource-home.jsx
@@ -1,14 +1,12 @@
 import { useMemo, useState } from "preact/hooks";
-import { filterResourceGroups, useJSON, useResourceGroups } from "./utils";
+import { filterResourceGroups, useResourceGroups } from "./utils";
 
-import { Carousel, CarouselSlide } from "./carousel";
 import { ResourceCategory } from "./resource-category";
 import { ResourceFilters } from "./resource-filters";
 import { ResourcePathways } from "./resource-pathways";
 
 export default function ResourceHome({ baseUri, title, showTitle, slidesURI }) {
   const [activeTagIds, setActiveTagIds] = useState([]);
-  const slides = useJSON(`${baseUri}${slidesURI}`);
   const groups = useResourceGroups();
   const active = useMemo(
     () => (groups ? filterResourceGroups(groups, activeTagIds) : null),
@@ -28,11 +26,6 @@ export default function ResourceHome({ baseUri, title, showTitle, slidesURI }) {
     <>
       {title && <h1 class={showTitle ? "" : "visually-hidden"}>{title}</h1>}
       <ResourcePathways />
-      {slides && slides.slides.length ? (
-        <Carousel>
-          {slides.slides.map((slide) => CarouselSlide(slide))}
-        </Carousel>
-      ) : null}
       <div id="browse-resources">
         {active ? (
           <ResourceFilters
diff --git a/src/resource-node-types.jsx b/src/resource-node-types.jsx
deleted file mode 100644
index a3b4728..0000000
--- a/src/resource-node-types.jsx
+++ /dev/null
@@ -1,35 +0,0 @@
-const allFields = [
-  { key: "count", name: "Nodes" },
-  { key: "gpu", name: "GPU" },
-  { key: "gpuMemory", name: "GPU Memory" },
-  { key: "gpuPerformance", name: "GPU Performance" },
-  { key: "cpu", name: "CPU" },
-  { key: "ram", name: "RAM" },
-  { key: "interconnect", name: "Interconnect" },
-  { key: "cache", name: "Cache" },
-  { key: "nvCache", name: "NVCache" },
-  { key: "localStorage", name: "Local Storage" },
-  { key: "network", name: "Network" },
-];
-
-export default function ResourceNodeTypes({ nodeTypes }) {
-  const fields = new Set();
-  for (let nodeType of nodeTypes) for (let field in nodeType) fields.add(field);
-
-  const rows = allFields
-    .filter(({ key }) => fields.has(key))
-    .map(({ key, name }) => (
-      <tr>
-        <th>{name}</th>
-        {nodeTypes.map((nodeType) => (
-          <td>{nodeType[key]}</td>
-        ))}
-      </tr>
-    ));
-
-  return (
-    <table class="table">
-      <tbody>{rows}</tbody>
-    </table>
-  );
-}

From 67711a0e196b2876a08b8b968542c50ec396b6d6 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Fri, 1 Nov 2024 10:57:28 -0400
Subject: [PATCH 065/113] fix(section-navigation): hide for fewer than two
 sections

---
 src/section-navigation.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/section-navigation.jsx b/src/section-navigation.jsx
index 6073c76..9f480e5 100644
--- a/src/section-navigation.jsx
+++ b/src/section-navigation.jsx
@@ -19,7 +19,7 @@ export default function SectionNavigation({ prompt = "Jump To:" }) {
     updateSections();
     document.addEventListener("accessci-update-sections", updateSections);
   }, []);
-  return (
+  return sections.length >= 2 ? (
     <nav class="section-navigation">
       {prompt ? <h2>{prompt}</h2> : null}
       <ul>
@@ -37,5 +37,5 @@ export default function SectionNavigation({ prompt = "Jump To:" }) {
         ))}
       </ul>
     </nav>
-  );
+  ) : null;
 }

From 199e60507e39dbe54636a1e99d1886c57f623488 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Fri, 1 Nov 2024 11:44:47 -0400
Subject: [PATCH 066/113] feat(resource-group-hardware): add OS and batch
 system to specs table

---
 src/resource-group-hardware.jsx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/resource-group-hardware.jsx b/src/resource-group-hardware.jsx
index 7ca5078..b2a7695 100644
--- a/src/resource-group-hardware.jsx
+++ b/src/resource-group-hardware.jsx
@@ -67,6 +67,14 @@ export default function ResourceGroupHardware({ baseUri, infoGroupId }) {
           name: "Network Interconnect",
           attr: "interconnect",
         },
+        {
+          name: "Operating System",
+          attr: "operating_system",
+        },
+        {
+          name: "Batch System",
+          attr: "batch_system",
+        },
       ]
         .map((row) => ({
           ...row,
@@ -95,7 +103,7 @@ export default function ResourceGroupHardware({ baseUri, infoGroupId }) {
           {resourceTypes.compute}
           {hasComputeGrid && (
             <>
-              <h3>Hardware Specifications</h3>
+              <h3>Specifications</h3>
               <Grid
                 columns={[nameColumn, ...computeColumns]}
                 rows={computeRows}

From 24032484fdf8f57f426b0b0fe5c572d016346f6f Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Fri, 1 Nov 2024 11:48:36 -0400
Subject: [PATCH 067/113] fix: update resource providers link

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index d13063a..9db23e5 100644
--- a/index.html
+++ b/index.html
@@ -75,7 +75,7 @@
         },
         {
           name: "Resource Providers",
-          href: "/access-ci-ui/resource-providers",
+          href: "https://access-ci.org/about/resource-providers/",
         },
       ];
 

From ea84e5e5afc842b5f1122bf4c6ba4b65e17ef8f2 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Mon, 4 Nov 2024 15:02:41 -0500
Subject: [PATCH 068/113] feat(resource-group-queue-metrics): use overview data
 from XDMoD

---
 src/resource-group-detail.jsx        |   2 +-
 src/resource-group-queue-metrics.jsx | 134 ++++++++++++++-------------
 2 files changed, 69 insertions(+), 67 deletions(-)

diff --git a/src/resource-group-detail.jsx b/src/resource-group-detail.jsx
index b8e4b2e..2d0ca24 100644
--- a/src/resource-group-detail.jsx
+++ b/src/resource-group-detail.jsx
@@ -19,7 +19,7 @@ export default function ResourceGroupDetail({ baseUri, infoGroupId }) {
       <ResourceGroupAffinityGroup baseUri={baseUri} infoGroupId={infoGroupId} />
       <ResourceGroupSoftware baseUri={baseUri} infoGroupId={infoGroupId} />
       <ResourceGroupProjects baseUri={baseUri} infoGroupId={infoGroupId} />
-      {/* <ResourceGroupQueueMetrics baseUri={baseUri} infoGroupId={infoGroupId} /> */}
+      <ResourceGroupQueueMetrics baseUri={baseUri} infoGroupId={infoGroupId} />
       <ResourceGroupDocumentation baseUri={baseUri} infoGroupId={infoGroupId} />
       <ResourceGroupDiscussion baseUri={baseUri} infoGroupId={infoGroupId} />
     </div>
diff --git a/src/resource-group-queue-metrics.jsx b/src/resource-group-queue-metrics.jsx
index 99dcc83..4587614 100644
--- a/src/resource-group-queue-metrics.jsx
+++ b/src/resource-group-queue-metrics.jsx
@@ -1,81 +1,83 @@
 import { useState } from "preact/hooks";
-import { useJSON } from "./utils";
+import { useJSON, useResourceGroup } from "./utils";
 
-import Grid from "./grid";
-import InfoTip from "./info-tip";
 import Section from "./section";
 
-const formatTime = (value) => {
-  const hours = Math.floor(value);
-  const minutes = Math.floor((value - hours) * 60);
-  const seconds = Math.round((value - hours) * 3600 - minutes * 60);
-  return [hours, minutes, seconds]
-    .map((value) => value.toString().padStart(2, "0"))
-    .join(":");
-};
+const pluralize = (count, label, places = 0) =>
+  `${count.toFixed(places)} ${label}${count == 1 ? "" : "s"}`;
 
-const formatHeaderTip = (content) => (value) => {
-  return (
-    <>
-      <span>{value}</span> <InfoTip tooltip={content} />
-    </>
-  );
+const formatTime = (seconds) => {
+  const hours = seconds / 3600;
+  if (hours >= 1) return pluralize(hours, "hour", 1);
+  const minutes = seconds / 60;
+  if (minutes >= 1) return pluralize(minutes, "minute", 0);
+  return pluralize(seconds, "second", 0);
 };
 
-export default function ResourceGroupQueueMetrics({ baseUri, infoGroupId }) {
-  const [days, setDays] = useState(30);
-  const data = useJSON(
-    `${baseUri}/api/resource-groups/${infoGroupId}/queue-metrics/${days}.json`
+export default function ResourceGroupQueueMetrics({ infoGroupId }) {
+  const [view, setView] = useState("overview");
+  const resourceGroup = useResourceGroup(infoGroupId);
+  const resources = useJSON(
+    resourceGroup
+      ? resourceGroup.infoResourceIds.map(
+          (infoResourceId) =>
+            `https://operations-api.access-ci.org/wh2/cider/v1/info_resourceid/${infoResourceId}/?format=json`
+        )
+      : null,
+    { defaultValue: [] }
   );
-  if (!data || data.error) return;
+  const overviewMetrics = useJSON(
+    resourceGroup
+      ? resourceGroup.infoResourceIds.map(
+          (infoResourceId) =>
+            `https://rest-test.ccr.xdmod.org/rest/v0.1/custom_queries/wait_times/${infoResourceId}/`
+        )
+      : null,
+    { corsProxy: true, defaultValue: [] }
+  );
+
+  if (!overviewMetrics.length || !resources.length) return;
 
-  const columns = [
-    {
-      key: "name",
-      name: "Resource",
-    },
-    {
-      key: "waitTime",
-      name: "Wait Time",
-      format: formatTime,
-      formatHeader: formatHeaderTip(
-        "Wait time is the average time a job spends waiting in the queue before running on a resource."
-      ),
-    },
-    {
-      key: "wallTime",
-      name: "Wall Time",
-      format: formatTime,
-      formatHeader: formatHeaderTip(
-        "Wall time is the average time a job spends running on a resource."
-      ),
-    },
-    {
-      key: "expansionFactor",
-      name: "Expansion Factor",
-      format: (_value, row) =>
-        ((row.waitTime + row.wallTime) / row.wallTime).toFixed(2),
-      formatHeader: formatHeaderTip(
-        'Expansion factor is the ratio of the total time (wait time and wall time) to the wall time. It measures how much waiting in the queue "expands" the total time taken to complete a job relative to its length.'
-      ),
-    },
-  ];
+  const overview = overviewMetrics
+    .map((om, i) =>
+      om.error ? om : { ...om.data[0], ...resources[i].results }
+    )
+    .filter((data) => !data.error);
 
-  const headerComponents = [
-    <select value={days} onChange={(e) => setDays(parseInt(e.target.value))}>
-      <option value="30">Last 30 days</option>
-      <option value="90">Last 90 days</option>
-      <option value="365">Last year</option>
-    </select>,
-  ];
+  if (!overview.length) return;
 
   return (
-    <Section
-      title="Queue Metrics"
-      icon="clock"
-      headerComponents={headerComponents}
-    >
-      <Grid columns={columns} rows={data.queueMetrics} />
+    <Section title="Queue Metrics" icon="clock">
+      {overview.map(
+        ({
+          job_count,
+          median_expansion_factor,
+          median_wait_time,
+          median_wall_time,
+          resource_descriptive_name,
+        }) => {
+          return (
+            <p>
+              <strong>
+                {resource_descriptive_name.replace(/ \([^)]+\)/, "")}:
+              </strong>{" "}
+              Users ran{" "}
+              <strong>{parseInt(job_count).toLocaleString("en-us")}</strong>{" "}
+              jobs during the last 30 days. Waiting in the queue increased the
+              time to complete these jobs by{" "}
+              <strong>
+                {((median_expansion_factor - 1) * 100).toLocaleString("en-us", {
+                  maximumFractionDigits: 0,
+                })}
+                %
+              </strong>{" "}
+              on average. The median job waited for{" "}
+              <strong>{formatTime(median_wait_time)}</strong> and ran for{" "}
+              <strong>{formatTime(median_wall_time)}</strong>.
+            </p>
+          );
+        }
+      )}
     </Section>
   );
 }

From 1da49d8759e4e9528ad7a004216edd3734ecfd81 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Mon, 4 Nov 2024 15:52:49 -0500
Subject: [PATCH 069/113] chore(resource-catalog): use developent version of
 Support API

---
 src/resource-group-affinity-group.jsx |  3 +--
 src/resource-group-documentation.jsx  |  3 +--
 src/resource-group-event.jsx          |  2 +-
 src/resource-group-events.jsx         |  3 +--
 src/utils.jsx                         | 25 +++++++++++++++----------
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/resource-group-affinity-group.jsx b/src/resource-group-affinity-group.jsx
index a2c71cf..4916272 100644
--- a/src/resource-group-affinity-group.jsx
+++ b/src/resource-group-affinity-group.jsx
@@ -5,8 +5,7 @@ import Section from "./section";
 
 export default function ResourceGroupAffinityGroup({ baseUri, infoGroupId }) {
   const data = useJSON(
-    `https://support.access-ci.org/api/1.0/affinity_groups/${infoGroupId}`,
-    { corsProxy: true }
+    `https://md-2261-accessmatch.pantheonsite.io/api/1.0/affinity_groups/${infoGroupId}`
   );
   if (!data || data.error || !data.length) return;
   const slackUri = stripTags(data[0].slack_link);
diff --git a/src/resource-group-documentation.jsx b/src/resource-group-documentation.jsx
index 30bde22..fb82c5c 100644
--- a/src/resource-group-documentation.jsx
+++ b/src/resource-group-documentation.jsx
@@ -5,8 +5,7 @@ import Section from "./section";
 
 export default function ResourceGroupDocumentation({ baseUri, infoGroupId }) {
   const data = useJSON(
-    `https://support.access-ci.org/api/1.0/kb/${infoGroupId}`,
-    { corsProxy: true }
+    `https://md-2261-accessmatch.pantheonsite.io/api/1.0/kb/${infoGroupId}`
   );
 
   if (!data || data.error || !data.length) return;
diff --git a/src/resource-group-event.jsx b/src/resource-group-event.jsx
index 9434642..7340686 100644
--- a/src/resource-group-event.jsx
+++ b/src/resource-group-event.jsx
@@ -12,7 +12,7 @@ export default function ResourceGroupEvent({
   speaker,
   title,
 }) {
-  const eventUri = extractHref(registration || "");
+  const eventUri = registration;
   const headingContent = eventUri ? <a href={eventUri}>{title}</a> : title;
   const metadata = [];
   let icon = null;
diff --git a/src/resource-group-events.jsx b/src/resource-group-events.jsx
index 5859441..63cbcda 100644
--- a/src/resource-group-events.jsx
+++ b/src/resource-group-events.jsx
@@ -13,8 +13,7 @@ export default function ResourceGroupEvents({ baseUri, infoGroupId }) {
     "https://operations-api.access-ci.org/wh2/news/v1/affiliation/access-ci.org/future_outages/"
   );
   const eventData = useJSON(
-    `https://support.access-ci.org/api/1.1/events/ag/${infoGroupId}`,
-    { corsProxy: true }
+    `https://md-2261-accessmatch.pantheonsite.io/api/1.1/events/ag/${infoGroupId}`
   );
   const filteredAnnouncements = useTransform(
     [groupData, currentAnnouncementData, futureAnnouncementData],
diff --git a/src/utils.jsx b/src/utils.jsx
index de4a4f9..8d4936e 100644
--- a/src/utils.jsx
+++ b/src/utils.jsx
@@ -261,16 +261,21 @@ export const stripTags = (html) =>
   html.replace(/(<[^>]+>)/g, "").replace(/&nbsp;/g, " ");
 
 export const htmlToJsx = (html) => {
-  const links = Array.from(html.matchAll(/<a([^>]+)>([^<]+)<\/a>/g));
-  const textNodes = html.split(/<a[^<]+<\/a>/g);
-  const result = [];
-  while (textNodes.length > 0) {
-    result.push(stripTags(textNodes.shift()));
-    let link = links.shift();
-    if (link) {
-      let href = extractHref(link[1]);
-      if (href) result.push(<a href={href}>{link[2]}</a>);
+  const paragraphs = [];
+  for (let pText of html.split("</p>")) {
+    const links = Array.from(pText.matchAll(/<a([^>]+)>([^<]+)<\/a>/g));
+    const textNodes = pText.split(/<a[^<]+<\/a>/g);
+    const paragraph = [];
+    while (textNodes.length > 0) {
+      paragraph.push(stripTags(textNodes.shift()));
+      let link = links.shift();
+      if (link) {
+        let href = extractHref(link[1]);
+        if (href) paragraph.push(<a href={href}>{link[2]}</a>);
+      }
     }
+    paragraphs.push(<p>{paragraph}</p>);
   }
-  return result;
+
+  return paragraphs;
 };

From d04b882f760053a400fc1316cee1c46068210830 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Tue, 5 Nov 2024 09:14:37 -0500
Subject: [PATCH 070/113] feat(resource-news): add resource headlines to
 catalog

---
 index.html                         |   7 -----
 public/images/psc-machine-room.jpg | Bin 65601 -> 0 bytes
 public/images/stampede3.jpg        | Bin 51750 -> 0 bytes
 src/resource-catalog.jsx           |   8 +++--
 src/resource-home.css              |  11 +++++++
 src/resource-home.jsx              |   6 +++-
 src/resource-news.css              |  26 ++++++++++++++++
 src/resource-news.jsx              |  25 +++++++++++++++
 src/resource-pathways.css          |  48 +++++++++++++++++------------
 src/resource-pathways.jsx          |  39 ++++++++++++-----------
 10 files changed, 123 insertions(+), 47 deletions(-)
 delete mode 100644 public/images/psc-machine-room.jpg
 delete mode 100644 public/images/stampede3.jpg
 create mode 100644 src/resource-home.css
 create mode 100644 src/resource-news.css
 create mode 100644 src/resource-news.jsx

diff --git a/index.html b/index.html
index 9db23e5..bdc4595 100644
--- a/index.html
+++ b/index.html
@@ -42,13 +42,6 @@
     <div id="universal-menus"></div>
     <div id="header"></div>
     <div id="site-menus"></div>
-    <div id="banner">
-      This is a development prototype. For information about ACCESS resources,
-      visit the
-      <a href="https://allocations.access-ci.org/resources"
-        >resource catalog.</a
-      >
-    </div>
     <div id="main" class="container">
       <div id="body">
         <div id="resource-catalog"></div>
diff --git a/public/images/psc-machine-room.jpg b/public/images/psc-machine-room.jpg
deleted file mode 100644
index 097967f39aab2f7c416ccad6dd21d1def7e24560..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 65601
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
VU{y=V=@J>HWlZKL4$-4i|JlpiDy0Ab

diff --git a/public/images/stampede3.jpg b/public/images/stampede3.jpg
deleted file mode 100644
index eead21d4eddb02c5e845d1e095de588b17c7fc14..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 51750
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

diff --git a/src/resource-catalog.jsx b/src/resource-catalog.jsx
index d3d012a..e88ee1e 100644
--- a/src/resource-catalog.jsx
+++ b/src/resource-catalog.jsx
@@ -17,6 +17,8 @@ import resourceFiltersStyle from "./resource-filters.css?inline";
 import resourceGroupStyle from "./resource-group.css?inline";
 import resourceGroupEventStyle from "./resource-group-event.css?inline";
 import resourceGroupProjectsStyle from "./resource-group-projects.css?inline";
+import resourceHomeStyle from "./resource-home.css?inline";
+import resourceNewsStyle from "./resource-news.css?inline";
 import resourcePathwaysStyle from "./resource-pathways.css?inline";
 import searchStyle from "./search.css?inline";
 import sectionNavigationStyle from "./section-navigation.css?inline";
@@ -27,8 +29,8 @@ const ResourceGroupDetail = lazy(() => import("./resource-group-detail.jsx"));
 const ResourceHome = lazy(() => import("./resource-home.jsx"));
 
 export function ResourceCatalog({
-  title = "Resource Catalog",
-  showTitle = false,
+  title = "Resources",
+  showTitle = true,
   baseUri = "/access-ci-ui",
   slidesURI = "/api/resource-slides.json",
 }) {
@@ -69,6 +71,8 @@ export function ResourceCatalog({
       <style>{resourceGroupStyle}</style>
       <style>{resourceGroupEventStyle}</style>
       <style>{resourceGroupProjectsStyle}</style>
+      <style>{resourceHomeStyle}</style>
+      <style>{resourceNewsStyle}</style>
       <style>{resourcePathwaysStyle}</style>
       <style>{searchStyle}</style>
       <style>{sectionNavigationStyle}</style>
diff --git a/src/resource-home.css b/src/resource-home.css
new file mode 100644
index 0000000..5f875dd
--- /dev/null
+++ b/src/resource-home.css
@@ -0,0 +1,11 @@
+#resource-navigation {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
+@media (min-width: 1024px) {
+  #resource-navigation {
+    flex-direction: row;
+    gap: 20px;
+  }
+}
diff --git a/src/resource-home.jsx b/src/resource-home.jsx
index a2fbbb1..a4ced4a 100644
--- a/src/resource-home.jsx
+++ b/src/resource-home.jsx
@@ -4,6 +4,7 @@ import { filterResourceGroups, useResourceGroups } from "./utils";
 import { ResourceCategory } from "./resource-category";
 import { ResourceFilters } from "./resource-filters";
 import { ResourcePathways } from "./resource-pathways";
+import { ResourceNews } from "./resource-news";
 
 export default function ResourceHome({ baseUri, title, showTitle, slidesURI }) {
   const [activeTagIds, setActiveTagIds] = useState([]);
@@ -25,7 +26,10 @@ export default function ResourceHome({ baseUri, title, showTitle, slidesURI }) {
   return (
     <>
       {title && <h1 class={showTitle ? "" : "visually-hidden"}>{title}</h1>}
-      <ResourcePathways />
+      <div id="resource-navigation">
+        <ResourcePathways />
+        <ResourceNews />
+      </div>
       <div id="browse-resources">
         {active ? (
           <ResourceFilters
diff --git a/src/resource-news.css b/src/resource-news.css
new file mode 100644
index 0000000..52812b6
--- /dev/null
+++ b/src/resource-news.css
@@ -0,0 +1,26 @@
+#resource-news {
+  background-color: var(--teal-100);
+  padding: 20px;
+}
+#resource-news h2 {
+  font-size: 1.2rem;
+  font-weight: 200;
+  margin: 0 0 0.5rem;
+}
+#resource-news ul {
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
+}
+#resource-news li {
+  font-size: 1rem;
+  line-height: 1.3;
+  margin: 0 0 0.5rem;
+  padding: 0;
+}
+@media (min-width: 1024px) {
+  #resource-news {
+    box-sizing: border-box;
+    width: calc((var(--width) - 60px) / 4);
+  }
+}
diff --git a/src/resource-news.jsx b/src/resource-news.jsx
new file mode 100644
index 0000000..b10fd9b
--- /dev/null
+++ b/src/resource-news.jsx
@@ -0,0 +1,25 @@
+import { useJSON } from "./utils";
+
+export function ResourceNews({ maxItems = 2 }) {
+  const newsItems = useJSON("https://support.access-ci.org/access_news/api", {
+    corsProxy: true,
+    defaultValue: [],
+  });
+
+  if (!newsItems || newsItems.error || !newsItems.length) return;
+
+  return (
+    <section id="resource-news">
+      <h2>Resource News</h2>
+      <ul class="resource-news">
+        {newsItems.slice(0, maxItems).map(({ title, linkUrl }) => (
+          <li>
+            <a href={linkUrl} class="news-link">
+              {title.replace("&amp;", "&").replace("&nbsp;", " ")}
+            </a>
+          </li>
+        ))}
+      </ul>
+    </section>
+  );
+}
diff --git a/src/resource-pathways.css b/src/resource-pathways.css
index b1f0b7d..6ec3728 100644
--- a/src/resource-pathways.css
+++ b/src/resource-pathways.css
@@ -1,35 +1,49 @@
 ul.resource-pathways {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
   list-style-type: none;
-  margin: 0 0 20px;
+  margin: 0;
   padding: 0;
+  width: 100%;
 }
 ul.resource-pathways li {
-  margin: 0 0 20px;
+  margin: 0;
+  width: 100%;
 }
 ul.resource-pathways li a {
-  align-items: center;
+  align-items: flex-start;
   border: 5px solid transparent;
   box-sizing: border-box;
   display: flex;
-  flex-direction: column;
-  justify-content: center;
-  padding: 35px;
+  height: 100%;
+  flex-direction: row;
+  justify-content: flex-start;
+  line-height: 1.3;
+  padding: 20px;
   text-decoration: none;
 }
 ul.resource-pathways a > .bi {
-  font-size: 3rem;
+  font-size: 2rem;
   margin-bottom: 1rem;
 }
+ul.resource-pathways li a > .detail {
+  display: flex;
+  flex-direction: column;
+  margin-left: 20px;
+}
 ul.resource-pathways .title {
-  font-size: 1.4rem;
+  font-size: 1.2rem;
 }
 ul.resource-pathways .description {
+  font-size: 1rem;
   font-weight: 400;
 }
 ul.resource-pathways .login {
   font-size: 0.9rem;
   font-style: italic;
   font-weight: 400;
+  margin-top: 0.25rem;
 }
 ul.resource-pathways .login .bi {
   vertical-align: middle;
@@ -53,23 +67,19 @@ ul.resource-pathways li a:hover {
   border: 5px solid var(--contrast);
   color: var(--contrast);
 }
-@media (min-width: 768px) {
+@media (min-width: 1024px) {
   ul.resource-pathways {
-    display: flex;
     flex-direction: row;
+    gap: 20px;
   }
   ul.resource-pathways li {
-    margin: 0 20px 0 0;
-    position: relative;
-  }
-  ul.resource-pathways li:last-child {
-    margin-right: 0;
+    box-sizing: border-box;
+    width: calc((var(--width) - 60px) / 4);
   }
   ul.resource-pathways li a {
-    height: 100%;
-    width: calc((var(--width) - 40px) / 3);
+    flex-direction: column;
   }
-  ul.resource-pathways a > .bi {
-    font-size: 5rem;
+  ul.resource-pathways li a > .detail {
+    margin-left: 0;
   }
 }
diff --git a/src/resource-pathways.jsx b/src/resource-pathways.jsx
index a6f51d4..69b9310 100644
--- a/src/resource-pathways.jsx
+++ b/src/resource-pathways.jsx
@@ -16,29 +16,32 @@ export function ResourcePathways() {
       login: true,
     },
     {
-      title: "Take a quiz",
+      title: "Get suggestions",
       icon: "card-checklist",
       href: "https://access-ara.ccs.uky.edu:8080/",
-      description:
-        "Tell us about your research to get resource recommendations.",
+      description: "Fill out a form to get resource recommendations.",
     },
   ];
   return (
-    <ul class="resource-pathways">
-      {pathways.map(({ title, icon, href, description, login }, i) => (
-        <li class={`resource-pathway-${i}`}>
-          <a href={href}>
-            {icon ? <Icon name={icon} /> : null}
-            <span class="title">{title}</span>
-            <span class="description">{description}</span>
-            {login ? (
-              <span class="login">
-                <Icon name="key" /> Requires ACCESS Login
+    <section id="resource-pathways">
+      <ul class="resource-pathways">
+        {pathways.map(({ title, icon, href, description, login }, i) => (
+          <li class={`resource-pathway-${i}`}>
+            <a href={href}>
+              {icon ? <Icon name={icon} /> : null}
+              <span class="detail">
+                <span class="title">{title}</span>
+                <span class="description">{description}</span>
+                {login ? (
+                  <span class="login">
+                    <Icon name="key" /> Requires ACCESS Login
+                  </span>
+                ) : null}
               </span>
-            ) : null}
-          </a>
-        </li>
-      ))}
-    </ul>
+            </a>
+          </li>
+        ))}
+      </ul>
+    </section>
   );
 }

From 66dc1e0f00eca2566a5b49cc158e0d696857b907 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Tue, 5 Nov 2024 09:44:25 -0500
Subject: [PATCH 071/113] fix(style): fix mobile style bugs

---
 index.html                            |  1 +
 src/components.css                    | 29 ++++++++++++++++++++++-----
 src/resource-group-affinity-group.jsx | 22 +++++++++++---------
 src/resource-group.css                | 21 ++++++++++++++-----
 src/section.jsx                       |  4 +++-
 5 files changed, 56 insertions(+), 21 deletions(-)

diff --git a/index.html b/index.html
index bdc4595..b36474b 100644
--- a/index.html
+++ b/index.html
@@ -85,6 +85,7 @@
       siteMenus({
         items: siteItems,
         target: document.getElementById("site-menus"),
+        siteName: "Resources",
       });
 
       resourceCatalog({
diff --git a/src/components.css b/src/components.css
index f2b3bb9..8fded7b 100644
--- a/src/components.css
+++ b/src/components.css
@@ -1,9 +1,28 @@
-.flex-header {
-  align-items: center;
-  display: flex;
-  justify-content: space-between;
-}
 .highlight {
   background-color: var(--yellow-200);
   padding: 2px 0;
 }
+.header-components {
+  margin-bottom: 2rem;
+}
+.button-group .btn {
+  display: block;
+  margin: 0 0 10px;
+}
+@media (min-width: 768px) {
+  .flex-header {
+    align-items: center;
+    display: flex;
+    justify-content: space-between;
+  }
+  .header-components {
+    margin-bottom: 0;
+  }
+  .button-group {
+    display: flex;
+  }
+  .button-group .btn {
+    display: flex;
+    margin: 0 10px 0 0;
+  }
+}
diff --git a/src/resource-group-affinity-group.jsx b/src/resource-group-affinity-group.jsx
index 4916272..5e79bf1 100644
--- a/src/resource-group-affinity-group.jsx
+++ b/src/resource-group-affinity-group.jsx
@@ -15,17 +15,19 @@ export default function ResourceGroupAffinityGroup({ baseUri, infoGroupId }) {
         Join the community by participating in an affinity group! Members get
         update about announcements, events, and outages.
       </p>
-      <a href="https://support.access-ci.org/user" class="btn secondary">
-        <Icon name="person-plus-fill" /> Join Affinity Group
-      </a>
-      {slackUri ? (
-        <a href={slackUri} class="btn">
-          <Icon name="slack" /> Connect on Slack
+      <div class="button-group">
+        <a href="https://support.access-ci.org/user" class="btn secondary">
+          <Icon name="person-plus-fill" /> Join Affinity Group
         </a>
-      ) : null}
-      <a href="#questions-and-answers" class="btn">
-        <Icon name="chat-fill" /> Ask and Answer Questions
-      </a>
+        {slackUri ? (
+          <a href={slackUri} class="btn">
+            <Icon name="slack" /> Connect on Slack
+          </a>
+        ) : null}
+        <a href="#questions-and-answers" class="btn">
+          <Icon name="chat-fill" /> Ask and Answer Questions
+        </a>
+      </div>
     </Section>
   );
 }
diff --git a/src/resource-group.css b/src/resource-group.css
index 4756a11..6620e42 100644
--- a/src/resource-group.css
+++ b/src/resource-group.css
@@ -1,12 +1,13 @@
 /* Resource home page */
 .resource-group {
   align-items: flex-start;
+  clear: both;
   display: flex;
-  flex-direction: row;
-  margin-bottom: 40px;
+  flex-direction: column;
+  margin-bottom: 20px;
 }
 .resource-group-image {
-  --image-width: calc((var(--width) - 140px) / 4 + 20px);
+  --image-width: 100%;
   align-items: center;
   background-color: var(--contrast-9);
   border: 1px solid var(--contrast);
@@ -16,7 +17,7 @@
   flex-direction: column;
   font-size: 5rem;
   justify-content: center;
-  margin-right: 20px;
+  margin: 20px 0;
   min-height: calc(var(--image-width) / 3 * 2);
   position: relative;
   width: var(--image-width);
@@ -26,7 +27,6 @@
 .resource-group-image:hover {
   color: var(--contrast-8);
 }
-
 .resource-group-image > img {
   display: block;
   width: 100%;
@@ -51,6 +51,7 @@
 }
 .resource-group-feature-image {
   margin-top: 60px;
+  width: 100%;
 }
 .resource-group-description::after {
   clear: both;
@@ -58,6 +59,16 @@
   display: block;
 }
 
+@media (min-width: 768px) {
+  .resource-group {
+    flex-direction: row;
+    margin-bottom: 40px;
+  }
+  .resource-group-image {
+    --image-width: calc((var(--width) - 140px) / 4 + 20px);
+    margin: 0 20px 0 0;
+  }
+}
 @media (min-width: 900px) {
   .resource-group-feature-image {
     float: right;
diff --git a/src/section.jsx b/src/section.jsx
index d762ce3..5d695d6 100644
--- a/src/section.jsx
+++ b/src/section.jsx
@@ -26,7 +26,9 @@ export default function Section({
           {icon ? <Icon name={icon} /> : null}
           {title}
         </h2>
-        <div>{headerComponents}</div>
+        {headerComponents ? (
+          <div class="header-components">{headerComponents}</div>
+        ) : null}
       </div>
       {children}
     </section>

From b51aeac88b50b50f09f7255ddd2014c5f1c3b97f Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Tue, 5 Nov 2024 11:21:58 -0500
Subject: [PATCH 072/113] feat(utils): use organization and feature data from
 CIDeR

---
 src/icons.jsx |  18 ++++--
 src/tag.jsx   |   7 ++-
 src/utils.jsx | 163 +++++++++++++++++++++++++++++++-------------------
 3 files changed, 118 insertions(+), 70 deletions(-)

diff --git a/src/icons.jsx b/src/icons.jsx
index f69f310..76b7a15 100644
--- a/src/icons.jsx
+++ b/src/icons.jsx
@@ -1,9 +1,19 @@
 export const defaultIcons = {
+  "ACCESS Pegasus":
+    "https://pegasus.isi.edu/wordpress/wp-content/uploads/2016/01/favicon.ico",
+  "ACCESS OnDemand":
+    "https://openondemand.org/themes/fire/theme/assets/media/favicons/favicon.ico",
+  "Advance reservations": "calendar-check",
+  "Composable hardware fabric": "boxes",
   "Compute Resources": "cpu-fill",
-  CPU: "cpu-fill",
-  GPU: "cpu",
-  Storage: "hdd-fill",
+  "CPU Compute": "cpu-fill",
+  "GPU Compute": "cpu",
+  "Innovative / Novel Compute": "lightbulb",
+  "Large Memory Nodes": "arrows-fullscreen",
+  Preemption: "clock-history",
+  "Science Gateway support": "globe",
   "Storage Resources": "hdd-fill",
-  "Large Memory": "arrows-fullscreen",
   "Virtual Machines": "pc-display-horizontal",
+  Cloud: "cloud",
+  Storage: "hdd-fill",
 };
diff --git a/src/tag.jsx b/src/tag.jsx
index 595d926..e584e9d 100644
--- a/src/tag.jsx
+++ b/src/tag.jsx
@@ -3,6 +3,7 @@ import { defaultIcons } from "./icons";
 import Icon from "./icon";
 
 export function Tag({ active, tagCategory, tagId, iconUri, name, toggleTag }) {
+  const icon = iconUri || defaultIcons[name] || "tag";
   return (
     <li
       class={`tag tag-category-${tagCategory.name
@@ -17,10 +18,10 @@ export function Tag({ active, tagCategory, tagId, iconUri, name, toggleTag }) {
           toggleTag(tagId);
         }}
       >
-        {iconUri ? (
-          <Icon alt={name} src={iconUri} />
+        {icon.startsWith("http") ? (
+          <Icon alt={name} src={icon} />
         ) : (
-          <Icon name={defaultIcons[name] || "tag"} />
+          <Icon name={icon} />
         )}
         {name}
       </button>
diff --git a/src/utils.jsx b/src/utils.jsx
index 8d4936e..6ea515b 100644
--- a/src/utils.jsx
+++ b/src/utils.jsx
@@ -78,29 +78,89 @@ export const useJSON = (
 };
 
 export const useResourceGroups = () => {
-  const responses = useJSON(
-    [
-      "https://operations-api.access-ci.org/wh2/cider/v1/groups/group_type/resource-catalog.access-ci.org/",
-      "https://operations-api.access-ci.org/wh2/cider/v2/access-active/",
-    ],
-    { defaultValue: [] }
+  const response = useJSON(
+    "https://operations-api.access-ci.org/wh2/cider/v1/access-active-groups/type/resource-catalog.access-ci.org/"
   );
-  return useTransform(responses, (allGroups, allResources) => {
-    const resourceGroups = allGroups.results
-      .filter((group) => group.info_resourceids)
+  return useTransform([response], ({ results }) => {
+    const { active_groups, feature_categories, features, organizations } =
+      results;
+
+    const tagCategories = [
+      {
+        tagCategoryId: -1,
+        name: "Resource Provider",
+        tags: [],
+      },
+    ];
+    const tagCategoryIds = [-1];
+    for (let category of feature_categories)
+      if ([100, 102, 103].includes(category.feature_category_id)) {
+        tagCategories.push({
+          tagCategoryId: category.feature_category_id,
+          name: category.feature_category_name,
+          tags: [],
+        });
+        tagCategoryIds.push(category.feature_category_id);
+      }
+
+    const tags = features
+      .filter((feature) => tagCategoryIds.includes(feature.feature_category_id))
+      .map((feature) => ({
+        tagId: feature.feature_id,
+        name: feature.feature_name,
+        tagCategoryId: feature.feature_category_id,
+      }));
+    for (let organization of organizations)
+      tags.push({
+        tagId: organization.organization_id * -1,
+        name: organization.organization_name,
+        tagCategoryId: -1,
+        iconUri: organization.organization_logo_url
+          ? organization.organization_logo_url.replace(/\/logo$/, "/favicon")
+          : null,
+      });
+
+    const tagIds = tags.map((tag) => tag.tagId);
+
+    const resourceCategories = [
+      {
+        resourceCategoryId: 1,
+        name: "Compute & Storage Resources",
+        resourceGroups: [],
+        resourceGroupIds: [],
+      },
+    ];
+
+    const resourceGroups = active_groups
+      .filter((group) => group.rollup_info_resourceids)
       .map((group) => ({
         infoGroupId: group.info_groupid,
         name: group.group_descriptive_name,
         description: group.group_description,
-        infoResourceIds: group.info_resourceids,
+        infoResourceIds: group.rollup_info_resourceids,
         imageUri: group.group_logo_url
           ? `https://cider.access-ci.org/public/groups/${
               group.group_logo_url.match(/[0-9]+/)[0]
             }/logo`
           : null,
+        tagIds: [
+          ...group.rollup_organization_ids
+            .map((orgId) => orgId * -1)
+            .filter((tagId) => tagIds.includes(tagId)),
+          ...group.rollup_feature_ids.filter((featureId) =>
+            tagIds.includes(featureId)
+          ),
+        ],
+        resourceCategoryId: 1, // TODO: Implement other resource categories.
       }))
       .sort((a, b) => a.name.localeCompare(b.name));
-    return linkResourceGroups(resourceGroups, allResources.results);
+
+    return linkResourceGroups({
+      resourceCategories,
+      resourceGroups,
+      tags,
+      tagCategories,
+    });
   });
 };
 
@@ -132,62 +192,39 @@ const makeMap = (items, key) => {
   return map;
 };
 
-export const linkResourceGroups = (resourceGroups, resources) => {
-  const tagCategories = [
-    {
-      tagCategoryId: 1,
-      name: "Resource Provider",
-      tags: [],
-    },
-  ];
-  const resourceCategories = [
-    {
-      resourceCategoryId: 1,
-      name: "Compute & Storage Resources",
-      resourceGroups: [],
-      resourceGroupIds: [],
-    },
-  ];
-  let nextTagId = 1;
-  const tags = [];
-  const rpTagMap = {};
-  const resourceMap = makeMap(resources, "info_resourceid");
-  const tagCategoryMap = makeMap(tagCategories, "tagCategoryId");
-  const resourceCategoryMap = makeMap(resourceCategories, "resourceCategoryId");
+const linkResourceGroups = ({
+  resourceCategories,
+  resourceGroups,
+  tags,
+  tagCategories,
+}) => {
+  const tagCategoryMap = {};
+  for (let tagCategory of tagCategories) {
+    tagCategory.tags = [];
+    tagCategoryMap[tagCategory.tagCategoryId] = tagCategory;
+  }
+
+  const tagMap = {};
+  for (let tag of tags) {
+    tag.tagCategory = tagCategoryMap[tag.tagCategoryId];
+    tag.tagCategory.tags.push(tag);
+    tag.resources = [];
+    tagMap[tag.tagId] = tag;
+  }
+
+  const resourceCategoryMap = {};
+  for (let resourceCategory of resourceCategories) {
+    resourceCategory.resourceGroups = [];
+    resourceCategoryMap[resourceCategory.resourceCategoryId] = resourceCategory;
+  }
 
   for (let resourceGroup of resourceGroups) {
-    resourceGroup.infoGroupId = resourceGroup.infoGroupId;
-    resourceGroup.tags = [];
-    resourceGroup.tagIds = [];
-    for (let infoResourceId of resourceGroup.infoResourceIds) {
-      let resource = resourceMap[infoResourceId];
-      if (!resource) continue;
-      if (resource.organization_name) {
-        let tag = rpTagMap[resource.organization_name];
-        if (!tag) {
-          tag = {
-            tagId: nextTagId++,
-            tagCategoryId: 1,
-            name: resource.organization_name,
-          };
-          tags.push(tag);
-          rpTagMap[resource.organization_name] = tag;
-          tagCategoryMap[1].tags.push(tag);
-          tag.tagCategory = tagCategoryMap[1];
-        }
-        if (!resourceGroup.tagIds.includes(tag.tagId)) {
-          resourceGroup.tagIds.push(tag.tagId);
-          resourceGroup.tags.push(tag);
-        }
-      }
-    }
-    resourceGroup.resourceCategoryId = 1;
-    resourceGroup.resourceCategory = resourceCategoryMap[1];
+    resourceGroup.resourceCategory =
+      resourceCategoryMap[resourceGroup.resourceCategoryId];
     resourceGroup.resourceCategory.resourceGroups.push(resourceGroup);
-    resourceGroup.resourceCategory.resourceGroupIds.push(
-      resourceGroup.infoGroupId
-    );
+    resourceGroup.tags = resourceGroup.tagIds.map((tagId) => tagMap[tagId]);
   }
+
   return { resourceCategories, resourceGroups, tags, tagCategories };
 };
 

From e25b2bd5fa810f83fdc77797757b7ed6671f6ef4 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Tue, 5 Nov 2024 11:24:57 -0500
Subject: [PATCH 073/113] fix(tags): sort tags by name

---
 src/utils.jsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/utils.jsx b/src/utils.jsx
index 6ea515b..ef0120f 100644
--- a/src/utils.jsx
+++ b/src/utils.jsx
@@ -120,6 +120,8 @@ export const useResourceGroups = () => {
           : null,
       });
 
+    tags.sort((a, b) => a.name.localeCompare(b.name));
+
     const tagIds = tags.map((tag) => tag.tagId);
 
     const resourceCategories = [

From 308c265565dd2484d844efee77e29bac22dc38ab Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Tue, 5 Nov 2024 11:32:15 -0500
Subject: [PATCH 074/113] feat(tags): prevent long tags from wrapping

---
 src/tags.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/tags.css b/src/tags.css
index 07bf8c9..3720e50 100644
--- a/src/tags.css
+++ b/src/tags.css
@@ -6,6 +6,7 @@ li.tag {
   display: inline-block;
   list-style-type: none;
   margin: 0 5px 5px 0;
+  max-width: 100%;
 }
 .tag button {
   background-color: var(--teal-100);
@@ -17,8 +18,13 @@ li.tag {
   font-size: 16px;
   font-weight: 500;
   line-height: 18px;
+  max-width: 100%;
+  overflow: hidden;
   padding: 3px 7px;
+  text-align: left;
   text-decoration: none;
+  text-overflow: ellipsis;
+  text-wrap: nowrap;
 }
 .tag button:hover {
   background-color: var(--teal-200);

From a442135a46055defa703e25a65c56d7f85828c21 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Tue, 5 Nov 2024 11:34:41 -0500
Subject: [PATCH 075/113] feat(tags): sort tag categories by name

---
 src/utils.jsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/utils.jsx b/src/utils.jsx
index ef0120f..2402deb 100644
--- a/src/utils.jsx
+++ b/src/utils.jsx
@@ -103,6 +103,8 @@ export const useResourceGroups = () => {
         tagCategoryIds.push(category.feature_category_id);
       }
 
+    tagCategories.sort((a, b) => a.name.localeCompare(b.name));
+
     const tags = features
       .filter((feature) => tagCategoryIds.includes(feature.feature_category_id))
       .map((feature) => ({

From 8e34ed6ed24a10df31fe2c76d3abe78606699a04 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Mon, 11 Nov 2024 09:40:47 -0500
Subject: [PATCH 076/113] fix(resource-group-software): fix usage example link
 and version spacing

---
 src/resource-group-software.jsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/resource-group-software.jsx b/src/resource-group-software.jsx
index 9756303..e41437a 100644
--- a/src/resource-group-software.jsx
+++ b/src/resource-group-software.jsx
@@ -61,7 +61,10 @@ export default function ResourceGroupSoftware({ baseUri, infoGroupId }) {
     )
       result.push(
         <> </>,
-        <a href={row.software_use_link} title={`Usage example for ${value}`}>
+        <a
+          href={row.software_use_link.split("\n")[0].trim()}
+          title={`Usage example for ${value}`}
+        >
           <Icon name="terminal" />
         </a>
       );
@@ -85,7 +88,9 @@ export default function ResourceGroupSoftware({ baseUri, infoGroupId }) {
     );
   };
   const versionsFormat = (value, row) => {
-    return value.map((item) => item.replace(`${row.rp_name}: `, ""));
+    return value.map((item) =>
+      item.replace(`${row.rp_name}: `, "").split(",").join(", ")
+    );
   };
   const columns = [
     {

From 114912bf460b9d282ab3c4a569063fdf418b4282 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Thu, 14 Nov 2024 13:17:17 -0500
Subject: [PATCH 077/113] feat(resource-group-queue-metrics): remove CORS proxy

---
 src/resource-group-queue-metrics.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/resource-group-queue-metrics.jsx b/src/resource-group-queue-metrics.jsx
index 4587614..154fe2d 100644
--- a/src/resource-group-queue-metrics.jsx
+++ b/src/resource-group-queue-metrics.jsx
@@ -33,7 +33,7 @@ export default function ResourceGroupQueueMetrics({ infoGroupId }) {
             `https://rest-test.ccr.xdmod.org/rest/v0.1/custom_queries/wait_times/${infoResourceId}/`
         )
       : null,
-    { corsProxy: true, defaultValue: [] }
+    { defaultValue: [] }
   );
 
   if (!overviewMetrics.length || !resources.length) return;

From 294bb73cea8997b15e088516830e9c97dbfa7aab Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Thu, 14 Nov 2024 13:41:04 -0500
Subject: [PATCH 078/113] Revert "feat(resource-group-queue-metrics): remove
 CORS proxy"

This reverts commit 114912bf460b9d282ab3c4a569063fdf418b4282.
---
 src/resource-group-queue-metrics.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/resource-group-queue-metrics.jsx b/src/resource-group-queue-metrics.jsx
index 154fe2d..4587614 100644
--- a/src/resource-group-queue-metrics.jsx
+++ b/src/resource-group-queue-metrics.jsx
@@ -33,7 +33,7 @@ export default function ResourceGroupQueueMetrics({ infoGroupId }) {
             `https://rest-test.ccr.xdmod.org/rest/v0.1/custom_queries/wait_times/${infoResourceId}/`
         )
       : null,
-    { defaultValue: [] }
+    { corsProxy: true, defaultValue: [] }
   );
 
   if (!overviewMetrics.length || !resources.length) return;

From 99a4f6f96cbe4e2bb7ed1868b402a192208784c6 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Thu, 14 Nov 2024 14:49:00 -0500
Subject: [PATCH 079/113] feat(resource-group-queue-metrics): remove CORS proxy

---
 src/resource-group-queue-metrics.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/resource-group-queue-metrics.jsx b/src/resource-group-queue-metrics.jsx
index 4587614..154fe2d 100644
--- a/src/resource-group-queue-metrics.jsx
+++ b/src/resource-group-queue-metrics.jsx
@@ -33,7 +33,7 @@ export default function ResourceGroupQueueMetrics({ infoGroupId }) {
             `https://rest-test.ccr.xdmod.org/rest/v0.1/custom_queries/wait_times/${infoResourceId}/`
         )
       : null,
-    { corsProxy: true, defaultValue: [] }
+    { defaultValue: [] }
   );
 
   if (!overviewMetrics.length || !resources.length) return;

From f3c8e4ce4adbfd4d3a38992f40b32310d35e797d Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Fri, 15 Nov 2024 08:39:51 -0500
Subject: [PATCH 080/113] fix: use production URLs for Support APIs

---
 src/resource-group-affinity-group.jsx | 2 +-
 src/resource-group-documentation.jsx  | 2 +-
 src/resource-group-events.jsx         | 2 +-
 src/resource-news.jsx                 | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/resource-group-affinity-group.jsx b/src/resource-group-affinity-group.jsx
index 5e79bf1..39bfd0e 100644
--- a/src/resource-group-affinity-group.jsx
+++ b/src/resource-group-affinity-group.jsx
@@ -5,7 +5,7 @@ import Section from "./section";
 
 export default function ResourceGroupAffinityGroup({ baseUri, infoGroupId }) {
   const data = useJSON(
-    `https://md-2261-accessmatch.pantheonsite.io/api/1.0/affinity_groups/${infoGroupId}`
+    `https://support.access-ci.org/api/1.0/affinity_groups/${infoGroupId}`
   );
   if (!data || data.error || !data.length) return;
   const slackUri = stripTags(data[0].slack_link);
diff --git a/src/resource-group-documentation.jsx b/src/resource-group-documentation.jsx
index fb82c5c..250d902 100644
--- a/src/resource-group-documentation.jsx
+++ b/src/resource-group-documentation.jsx
@@ -5,7 +5,7 @@ import Section from "./section";
 
 export default function ResourceGroupDocumentation({ baseUri, infoGroupId }) {
   const data = useJSON(
-    `https://md-2261-accessmatch.pantheonsite.io/api/1.0/kb/${infoGroupId}`
+    `https://support.access-ci.org/api/1.0/kb/${infoGroupId}`
   );
 
   if (!data || data.error || !data.length) return;
diff --git a/src/resource-group-events.jsx b/src/resource-group-events.jsx
index 63cbcda..d8d3210 100644
--- a/src/resource-group-events.jsx
+++ b/src/resource-group-events.jsx
@@ -13,7 +13,7 @@ export default function ResourceGroupEvents({ baseUri, infoGroupId }) {
     "https://operations-api.access-ci.org/wh2/news/v1/affiliation/access-ci.org/future_outages/"
   );
   const eventData = useJSON(
-    `https://md-2261-accessmatch.pantheonsite.io/api/1.1/events/ag/${infoGroupId}`
+    `https://support.access-ci.org/api/1.1/events/ag/${infoGroupId}`
   );
   const filteredAnnouncements = useTransform(
     [groupData, currentAnnouncementData, futureAnnouncementData],
diff --git a/src/resource-news.jsx b/src/resource-news.jsx
index b10fd9b..e759567 100644
--- a/src/resource-news.jsx
+++ b/src/resource-news.jsx
@@ -2,7 +2,6 @@ import { useJSON } from "./utils";
 
 export function ResourceNews({ maxItems = 2 }) {
   const newsItems = useJSON("https://support.access-ci.org/access_news/api", {
-    corsProxy: true,
     defaultValue: [],
   });
 

From 8fed68f9ef66e31f810f8b7960a08f069c75cb01 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Mon, 18 Nov 2024 13:57:29 -0500
Subject: [PATCH 081/113] refactor(resource-catalog): remove unused base URI
 props

---
 src/resource-catalog.jsx              |  7 +------
 src/resource-group-affinity-group.jsx |  2 +-
 src/resource-group-description.jsx    |  2 +-
 src/resource-group-detail.jsx         | 20 ++++++++++----------
 src/resource-group-discussion.jsx     |  2 +-
 src/resource-group-documentation.jsx  |  2 +-
 src/resource-group-events.jsx         |  2 +-
 src/resource-group-hardware.jsx       |  2 +-
 src/resource-group-projects.jsx       |  2 +-
 src/resource-group-software.jsx       |  2 +-
 src/resource-home.jsx                 |  2 +-
 11 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/src/resource-catalog.jsx b/src/resource-catalog.jsx
index e88ee1e..c3604f5 100644
--- a/src/resource-catalog.jsx
+++ b/src/resource-catalog.jsx
@@ -32,7 +32,6 @@ export function ResourceCatalog({
   title = "Resources",
   showTitle = true,
   baseUri = "/access-ci-ui",
-  slidesURI = "/api/resource-slides.json",
 }) {
   return (
     <>
@@ -44,12 +43,8 @@ export function ResourceCatalog({
               baseUri={baseUri}
               title={title}
               showTitle={showTitle}
-              slidesURI={slidesURI}
-            />
-            <ResourceGroupDetail
-              baseUri={baseUri}
-              path={`${baseUri}/resources/:infoGroupId`}
             />
+            <ResourceGroupDetail path={`${baseUri}/resources/:infoGroupId`} />
           </Router>
         </ErrorBoundary>
       </LocationProvider>
diff --git a/src/resource-group-affinity-group.jsx b/src/resource-group-affinity-group.jsx
index 39bfd0e..5e12e52 100644
--- a/src/resource-group-affinity-group.jsx
+++ b/src/resource-group-affinity-group.jsx
@@ -3,7 +3,7 @@ import { stripTags, useJSON } from "./utils";
 import Icon from "./icon";
 import Section from "./section";
 
-export default function ResourceGroupAffinityGroup({ baseUri, infoGroupId }) {
+export default function ResourceGroupAffinityGroup({ infoGroupId }) {
   const data = useJSON(
     `https://support.access-ci.org/api/1.0/affinity_groups/${infoGroupId}`
   );
diff --git a/src/resource-group-description.jsx b/src/resource-group-description.jsx
index 5ecf3cf..5d3bc50 100644
--- a/src/resource-group-description.jsx
+++ b/src/resource-group-description.jsx
@@ -2,7 +2,7 @@ import { useResourceGroup } from "./utils";
 
 import Icon from "./icon";
 
-export default function ResourceGroupDescription({ baseUri, infoGroupId }) {
+export default function ResourceGroupDescription({ infoGroupId }) {
   const resourceGroup = useResourceGroup(infoGroupId);
   if (!resourceGroup) return;
   const { name, description, imageUri, tags } = resourceGroup;
diff --git a/src/resource-group-detail.jsx b/src/resource-group-detail.jsx
index 2d0ca24..aec4c4d 100644
--- a/src/resource-group-detail.jsx
+++ b/src/resource-group-detail.jsx
@@ -9,19 +9,19 @@ import ResourceGroupQueueMetrics from "./resource-group-queue-metrics";
 import ResourceGroupSoftware from "./resource-group-software";
 import SectionNavigation from "./section-navigation";
 
-export default function ResourceGroupDetail({ baseUri, infoGroupId }) {
+export default function ResourceGroupDetail({ infoGroupId }) {
   return (
     <div class="resource-group-detail">
-      <ResourceGroupDescription baseUri={baseUri} infoGroupId={infoGroupId} />
+      <ResourceGroupDescription infoGroupId={infoGroupId} />
       <SectionNavigation />
-      <ResourceGroupHardware baseUri={baseUri} infoGroupId={infoGroupId} />
-      <ResourceGroupEvents baseUri={baseUri} infoGroupId={infoGroupId} />
-      <ResourceGroupAffinityGroup baseUri={baseUri} infoGroupId={infoGroupId} />
-      <ResourceGroupSoftware baseUri={baseUri} infoGroupId={infoGroupId} />
-      <ResourceGroupProjects baseUri={baseUri} infoGroupId={infoGroupId} />
-      <ResourceGroupQueueMetrics baseUri={baseUri} infoGroupId={infoGroupId} />
-      <ResourceGroupDocumentation baseUri={baseUri} infoGroupId={infoGroupId} />
-      <ResourceGroupDiscussion baseUri={baseUri} infoGroupId={infoGroupId} />
+      <ResourceGroupHardware infoGroupId={infoGroupId} />
+      <ResourceGroupEvents infoGroupId={infoGroupId} />
+      <ResourceGroupAffinityGroup infoGroupId={infoGroupId} />
+      <ResourceGroupSoftware infoGroupId={infoGroupId} />
+      <ResourceGroupProjects infoGroupId={infoGroupId} />
+      <ResourceGroupQueueMetrics infoGroupId={infoGroupId} />
+      <ResourceGroupDocumentation infoGroupId={infoGroupId} />
+      <ResourceGroupDiscussion infoGroupId={infoGroupId} />
     </div>
   );
 }
diff --git a/src/resource-group-discussion.jsx b/src/resource-group-discussion.jsx
index 7606706..fa3925d 100644
--- a/src/resource-group-discussion.jsx
+++ b/src/resource-group-discussion.jsx
@@ -17,7 +17,7 @@ const getCategoryUri = (category, siteData) => {
   return `https://ask.cyberinfrastructure.org/c/${uri}`;
 };
 
-export default function ResourceGroupDiscussion({ baseUri, infoGroupId }) {
+export default function ResourceGroupDiscussion({ infoGroupId }) {
   const siteData = useJSON(`https://ask.cyberinfrastructure.org/site.json`, {
     corsProxy: true,
   });
diff --git a/src/resource-group-documentation.jsx b/src/resource-group-documentation.jsx
index 250d902..ba7154c 100644
--- a/src/resource-group-documentation.jsx
+++ b/src/resource-group-documentation.jsx
@@ -3,7 +3,7 @@ import { extractHref, stripTags, useJSON } from "./utils";
 import InfoTip from "./info-tip";
 import Section from "./section";
 
-export default function ResourceGroupDocumentation({ baseUri, infoGroupId }) {
+export default function ResourceGroupDocumentation({ infoGroupId }) {
   const data = useJSON(
     `https://support.access-ci.org/api/1.0/kb/${infoGroupId}`
   );
diff --git a/src/resource-group-events.jsx b/src/resource-group-events.jsx
index d8d3210..41f8655 100644
--- a/src/resource-group-events.jsx
+++ b/src/resource-group-events.jsx
@@ -4,7 +4,7 @@ import Alert from "./alert";
 import ResourceGroupEvent from "./resource-group-event";
 import Section from "./section";
 
-export default function ResourceGroupEvents({ baseUri, infoGroupId }) {
+export default function ResourceGroupEvents({ infoGroupId }) {
   const groupData = useResourceGroup(infoGroupId);
   const currentAnnouncementData = useJSON(
     "https://operations-api.access-ci.org/wh2/news/v1/affiliation/access-ci.org/current_outages/"
diff --git a/src/resource-group-hardware.jsx b/src/resource-group-hardware.jsx
index b2a7695..0640241 100644
--- a/src/resource-group-hardware.jsx
+++ b/src/resource-group-hardware.jsx
@@ -4,7 +4,7 @@ import Grid from "./grid";
 import ResourceDetail from "./resource-detail";
 import Section from "./section";
 
-export default function ResourceGroupHardware({ baseUri, infoGroupId }) {
+export default function ResourceGroupHardware({ infoGroupId }) {
   const resourceGroup = useResourceGroup(infoGroupId);
   const resources = useJSON(
     resourceGroup
diff --git a/src/resource-group-projects.jsx b/src/resource-group-projects.jsx
index e25c1cf..d059bc3 100644
--- a/src/resource-group-projects.jsx
+++ b/src/resource-group-projects.jsx
@@ -27,7 +27,7 @@ const column = (items, title, topItemsHeading) => {
   );
 };
 
-export default function ResourceGroupProjects({ baseUri, infoGroupId }) {
+export default function ResourceGroupProjects({ infoGroupId }) {
   const [persona, setPersona] = useState("all");
   const apiBaseUrl =
     "https://allocations.access-ci.org/current-projects/summary.json";
diff --git a/src/resource-group-software.jsx b/src/resource-group-software.jsx
index e41437a..7798a37 100644
--- a/src/resource-group-software.jsx
+++ b/src/resource-group-software.jsx
@@ -16,7 +16,7 @@ const apiFields = [
   "software_use_link",
 ];
 
-export default function ResourceGroupSoftware({ baseUri, infoGroupId }) {
+export default function ResourceGroupSoftware({ infoGroupId }) {
   const data = useJSON(
     `https://ara-db.ccs.uky.edu/api=API_0/${
       import.meta.env.VITE_SDS_API_KEY
diff --git a/src/resource-home.jsx b/src/resource-home.jsx
index a4ced4a..e138ad4 100644
--- a/src/resource-home.jsx
+++ b/src/resource-home.jsx
@@ -6,7 +6,7 @@ import { ResourceFilters } from "./resource-filters";
 import { ResourcePathways } from "./resource-pathways";
 import { ResourceNews } from "./resource-news";
 
-export default function ResourceHome({ baseUri, title, showTitle, slidesURI }) {
+export default function ResourceHome({ baseUri, title, showTitle }) {
   const [activeTagIds, setActiveTagIds] = useState([]);
   const groups = useResourceGroups();
   const active = useMemo(

From 37620ce2a5fe98644929d7e866370493b8d2dde8 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Mon, 18 Nov 2024 13:59:21 -0500
Subject: [PATCH 082/113] fix(resource-group-discussion): remove CORS proxy for
 Ask.CI API

---
 src/resource-group-discussion.jsx | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/resource-group-discussion.jsx b/src/resource-group-discussion.jsx
index fa3925d..94abd5b 100644
--- a/src/resource-group-discussion.jsx
+++ b/src/resource-group-discussion.jsx
@@ -18,9 +18,7 @@ const getCategoryUri = (category, siteData) => {
 };
 
 export default function ResourceGroupDiscussion({ infoGroupId }) {
-  const siteData = useJSON(`https://ask.cyberinfrastructure.org/site.json`, {
-    corsProxy: true,
-  });
+  const siteData = useJSON(`https://ask.cyberinfrastructure.org/site.json`);
   // Try to find a category with a slug that matches the info group ID.
   // TODO: Replace this with better logic once the CID and slug are available
   // in the Support APIs.
@@ -33,9 +31,7 @@ export default function ResourceGroupDiscussion({ infoGroupId }) {
         );
 
   const categoryDataUri = getCategoryUri(category, siteData);
-  const categoryData = useJSON(categoryDataUri, {
-    corsProxy: true,
-  });
+  const categoryData = useJSON(categoryDataUri);
 
   if (
     !categoryData ||

From 9295650ac18b6248b4de16bb0bf1fee820acc89a Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Tue, 19 Nov 2024 10:41:21 -0500
Subject: [PATCH 083/113] feat(resource-group-queue-metrics): add detail charts

---
 package-lock.json                    |  19 +++
 package.json                         |   4 +-
 src/chart.jsx                        |  50 ++++++++
 src/resource-group-queue-metrics.jsx | 175 +++++++++++++++++++--------
 src/utils.jsx                        |   7 ++
 5 files changed, 205 insertions(+), 50 deletions(-)
 create mode 100644 src/chart.jsx

diff --git a/package-lock.json b/package-lock.json
index eb7f753..986768d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,6 +10,7 @@
       "license": "Apache-2.0",
       "dependencies": {
         "@glidejs/glide": "^3.6.1",
+        "chart.js": "^4.4.6",
         "fuse.js": "^7.0.0",
         "preact": "^10.24.1",
         "preact-iso": "^2.6.3",
@@ -789,6 +790,12 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "node_modules/@kurkle/color": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@kurkle/color/-/color-0.3.2.tgz",
+      "integrity": "sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==",
+      "license": "MIT"
+    },
     "node_modules/@popperjs/core": {
       "version": "2.11.8",
       "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
@@ -1210,6 +1217,18 @@
       ],
       "license": "CC-BY-4.0"
     },
+    "node_modules/chart.js": {
+      "version": "4.4.6",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.4.6.tgz",
+      "integrity": "sha512-8Y406zevUPbbIBA/HRk33khEmQPk5+cxeflWE/2rx1NJsjVWMPw/9mSP9rxHP5eqi6LNoPBVMfZHxbwLSgldYA==",
+      "license": "MIT",
+      "dependencies": {
+        "@kurkle/color": "^0.3.0"
+      },
+      "engines": {
+        "pnpm": ">=8"
+      }
+    },
     "node_modules/convert-source-map": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
diff --git a/package.json b/package.json
index d363817..bbcfd7f 100644
--- a/package.json
+++ b/package.json
@@ -23,15 +23,15 @@
   },
   "dependencies": {
     "@glidejs/glide": "^3.6.1",
+    "chart.js": "^4.4.6",
     "fuse.js": "^7.0.0",
-    "preact-iso": "^2.6.3",
     "preact": "^10.24.1",
+    "preact-iso": "^2.6.3",
     "tippy.js": "^6.3.7"
   },
   "devDependencies": {
     "@preact/preset-vite": "^2.9.1",
     "vite": "^5.4.8"
-
   },
   "eslintConfig": {
     "extends": "preact"
diff --git a/src/chart.jsx b/src/chart.jsx
new file mode 100644
index 0000000..5b8a5c1
--- /dev/null
+++ b/src/chart.jsx
@@ -0,0 +1,50 @@
+import { useLayoutEffect, useRef } from "preact/hooks";
+
+import {
+  Chart as ChartJS,
+  Colors,
+  BarController,
+  BarElement,
+  CategoryScale,
+  LinearScale,
+  Legend,
+  Title,
+  Tooltip,
+} from "chart.js";
+
+ChartJS.register(
+  Colors,
+  BarController,
+  BarElement,
+  CategoryScale,
+  LinearScale,
+  Legend,
+  Title,
+  Tooltip
+);
+
+export default function Chart({ type = "bar", data, options }) {
+  const chart = useRef(null);
+  const canvas = useRef(null);
+  useLayoutEffect(() => {
+    if (!canvas.current) return;
+    if (!chart.current) {
+      chart.current = new ChartJS(canvas.current, {
+        type,
+        data: data,
+        options: options,
+      });
+    } else {
+      chart.current.options = options;
+      // TODO: Improve handling of existing datasets to enable animation.
+      chart.current.data = data;
+      chart.current.update();
+    }
+  }, [type, data, options]);
+
+  return (
+    <div class="chart">
+      <canvas ref={canvas}></canvas>
+    </div>
+  );
+}
diff --git a/src/resource-group-queue-metrics.jsx b/src/resource-group-queue-metrics.jsx
index 154fe2d..a99e229 100644
--- a/src/resource-group-queue-metrics.jsx
+++ b/src/resource-group-queue-metrics.jsx
@@ -1,7 +1,28 @@
 import { useState } from "preact/hooks";
-import { useJSON, useResourceGroup } from "./utils";
+import { useJSON, useResourceGroupResources } from "./utils";
 
 import Section from "./section";
+import Chart from "./chart";
+
+const colorVars = [
+  "--teal-700",
+  "--yellow-400",
+  "--teal-400",
+  "--orange-400",
+  "--green-400",
+  "--red-400",
+];
+
+const wallTimes = [
+  "0 - 1s",
+  "1 - 30s",
+  "30s - 30min",
+  "30 - 60min",
+  "1 - 5hr",
+  "5 - 10hr",
+  "10 - 18hr",
+  "18+hr",
+];
 
 const pluralize = (count, label, places = 0) =>
   `${count.toFixed(places)} ${label}${count == 1 ? "" : "s"}`;
@@ -14,70 +35,128 @@ const formatTime = (seconds) => {
   return pluralize(seconds, "second", 0);
 };
 
+const formatName = (name) => name.replace(/ \([^)]+\)/, "");
+
 export default function ResourceGroupQueueMetrics({ infoGroupId }) {
   const [view, setView] = useState("overview");
-  const resourceGroup = useResourceGroup(infoGroupId);
-  const resources = useJSON(
-    resourceGroup
-      ? resourceGroup.infoResourceIds.map(
-          (infoResourceId) =>
-            `https://operations-api.access-ci.org/wh2/cider/v1/info_resourceid/${infoResourceId}/?format=json`
-        )
-      : null,
-    { defaultValue: [] }
+  const resources = useResourceGroupResources(infoGroupId).filter(
+    (res) => res.cider_type == "Compute"
   );
+
   const overviewMetrics = useJSON(
-    resourceGroup
-      ? resourceGroup.infoResourceIds.map(
-          (infoResourceId) =>
-            `https://rest-test.ccr.xdmod.org/rest/v0.1/custom_queries/wait_times/${infoResourceId}/`
+    resources.length
+      ? resources.map(
+          (res) =>
+            `https://rest-test.ccr.xdmod.org/rest/v0.1/custom_queries/wait_times/${res.info_resourceid}/`
         )
       : null,
     { defaultValue: [] }
   );
 
+  const detailMetrics = useJSON(
+    view !== "overview"
+      ? `https://rest-test.ccr.xdmod.org/rest/v0.1/custom_queries/wait_times/${view}/queue/job_walltime`
+      : null
+  );
+
   if (!overviewMetrics.length || !resources.length) return;
 
   const overview = overviewMetrics
-    .map((om, i) =>
-      om.error ? om : { ...om.data[0], ...resources[i].results }
-    )
+    .map((om, i) => (om.error ? om : { ...om.data[0], ...resources[i] }))
     .filter((data) => !data.error);
 
   if (!overview.length) return;
 
+  const headerComponents = [
+    <select value={view} onChange={(e) => setView(e.target.value)}>
+      <option value="overview">Overview</option>
+      {overview.map((res) => (
+        <option value={res.info_resourceid}>
+          {formatName(res.resource_descriptive_name)}
+        </option>
+      ))}
+    </select>,
+  ];
+
+  let content = null;
+  if (view === "overview") {
+    content = overview.map(
+      ({
+        job_count,
+        median_expansion_factor,
+        median_wait_time,
+        median_wall_time,
+        resource_descriptive_name,
+      }) => {
+        return (
+          <p>
+            <strong>{formatName(resource_descriptive_name)}:</strong> Users ran{" "}
+            <strong>{parseInt(job_count).toLocaleString("en-us")}</strong> jobs
+            during the last 30 days. Waiting in the queue increased the time to
+            complete these jobs by{" "}
+            <strong>
+              {((median_expansion_factor - 1) * 100).toLocaleString("en-us", {
+                maximumFractionDigits: 0,
+              })}
+              %
+            </strong>{" "}
+            on average. The median job waited for{" "}
+            <strong>{formatTime(median_wait_time)}</strong> and ran for{" "}
+            <strong>{formatTime(median_wall_time)}</strong>.
+          </p>
+        );
+      }
+    );
+  } else if (detailMetrics && detailMetrics.info_resource_id === view) {
+    const datasetsMap = {};
+    const labels = wallTimes;
+    for (let item of detailMetrics.data) {
+      datasetsMap[item.queue] = datasetsMap[item.queue] || {
+        label: item.queue,
+        data: Array(wallTimes.length).fill(null),
+      };
+      datasetsMap[item.queue].data[wallTimes.indexOf(item.job_walltime)] =
+        item.median_wait_time / 60;
+    }
+    const datasets = Object.values(datasetsMap);
+    datasets.forEach((ds, i) => {
+      let colorVar = colorVars[i % (colorVars.length - 1)];
+      ds.backgroundColor = getComputedStyle(document.body).getPropertyValue(
+        colorVar
+      );
+    });
+    const options = {
+      interaction: {
+        intersect: false,
+        mode: "index",
+      },
+      plugins: {
+        title: {
+          display: true,
+          text: "Median Wait Time by Queue and Job Wall Time",
+        },
+      },
+      scales: {
+        x: {
+          title: { display: true, text: "Job Wall Time (Run Time)" },
+        },
+        y: {
+          title: { display: true, text: "Median Wait Time (Minutes)" },
+        },
+      },
+    };
+    content = (
+      <Chart type="bar" data={{ labels, datasets }} options={options} />
+    );
+  }
+
   return (
-    <Section title="Queue Metrics" icon="clock">
-      {overview.map(
-        ({
-          job_count,
-          median_expansion_factor,
-          median_wait_time,
-          median_wall_time,
-          resource_descriptive_name,
-        }) => {
-          return (
-            <p>
-              <strong>
-                {resource_descriptive_name.replace(/ \([^)]+\)/, "")}:
-              </strong>{" "}
-              Users ran{" "}
-              <strong>{parseInt(job_count).toLocaleString("en-us")}</strong>{" "}
-              jobs during the last 30 days. Waiting in the queue increased the
-              time to complete these jobs by{" "}
-              <strong>
-                {((median_expansion_factor - 1) * 100).toLocaleString("en-us", {
-                  maximumFractionDigits: 0,
-                })}
-                %
-              </strong>{" "}
-              on average. The median job waited for{" "}
-              <strong>{formatTime(median_wait_time)}</strong> and ran for{" "}
-              <strong>{formatTime(median_wall_time)}</strong>.
-            </p>
-          );
-        }
-      )}
+    <Section
+      title="Queue Metrics"
+      icon="clock"
+      headerComponents={headerComponents}
+    >
+      {content}
     </Section>
   );
 }
diff --git a/src/utils.jsx b/src/utils.jsx
index 2402deb..be651de 100644
--- a/src/utils.jsx
+++ b/src/utils.jsx
@@ -177,6 +177,13 @@ export const useResourceGroup = (infoGroupId, defaultValue = null) => {
     : defaultValue;
 };
 
+export const useResourceGroupResources = (infoGroupId, defaultValue = []) => {
+  const res = useJSON(
+    `https://operations-api.access-ci.org/wh2/cider/v1/access-active/info_groupid/${infoGroupId}/?format=json`
+  );
+  return res && !res.error ? res.results : defaultValue;
+};
+
 export const useTransform = (
   responseArray,
   transformFunction,

From ee0986b0ff9f419530e5098bac16a47fc028964d Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Tue, 19 Nov 2024 11:43:10 -0500
Subject: [PATCH 084/113] feat(resource-group-queue-metrics): improve
 formatting of overview metrics

---
 src/components.css                   |  16 ++++
 src/resource-catalog.jsx             |   2 +
 src/resource-group-queue-metrics.css |  12 +++
 src/resource-group-queue-metrics.jsx | 109 +++++++++++++++++++--------
 4 files changed, 109 insertions(+), 30 deletions(-)
 create mode 100644 src/resource-group-queue-metrics.css

diff --git a/src/components.css b/src/components.css
index 8fded7b..1afcb7f 100644
--- a/src/components.css
+++ b/src/components.css
@@ -9,6 +9,10 @@
   display: block;
   margin: 0 0 10px;
 }
+.card {
+  border: 5px solid var(--contrast);
+  padding: 20px;
+}
 @media (min-width: 768px) {
   .flex-header {
     align-items: center;
@@ -26,3 +30,15 @@
     margin: 0 10px 0 0;
   }
 }
+@media (min-width: 1024px) {
+  .cards {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    gap: 20px;
+  }
+  .card {
+    flex: 1 0 20%;
+    margin: 0;
+  }
+}
diff --git a/src/resource-catalog.jsx b/src/resource-catalog.jsx
index c3604f5..d463557 100644
--- a/src/resource-catalog.jsx
+++ b/src/resource-catalog.jsx
@@ -17,6 +17,7 @@ import resourceFiltersStyle from "./resource-filters.css?inline";
 import resourceGroupStyle from "./resource-group.css?inline";
 import resourceGroupEventStyle from "./resource-group-event.css?inline";
 import resourceGroupProjectsStyle from "./resource-group-projects.css?inline";
+import resourceGroupQueueMetricsStyle from "./resource-group-queue-metrics.css?inline";
 import resourceHomeStyle from "./resource-home.css?inline";
 import resourceNewsStyle from "./resource-news.css?inline";
 import resourcePathwaysStyle from "./resource-pathways.css?inline";
@@ -66,6 +67,7 @@ export function ResourceCatalog({
       <style>{resourceGroupStyle}</style>
       <style>{resourceGroupEventStyle}</style>
       <style>{resourceGroupProjectsStyle}</style>
+      <style>{resourceGroupQueueMetricsStyle}</style>
       <style>{resourceHomeStyle}</style>
       <style>{resourceNewsStyle}</style>
       <style>{resourcePathwaysStyle}</style>
diff --git a/src/resource-group-queue-metrics.css b/src/resource-group-queue-metrics.css
new file mode 100644
index 0000000..e0d5a70
--- /dev/null
+++ b/src/resource-group-queue-metrics.css
@@ -0,0 +1,12 @@
+.metrics-overview strong {
+  background-color: var(--yellow-200);
+  font-size: 1.2rem;
+  padding: 2px;
+  white-space: nowrap;
+}
+.metrics-overview .bi {
+  vertical-align: middle;
+}
+.metrics-overview .btn {
+  font-size: 1rem;
+}
diff --git a/src/resource-group-queue-metrics.jsx b/src/resource-group-queue-metrics.jsx
index a99e229..0c2ca54 100644
--- a/src/resource-group-queue-metrics.jsx
+++ b/src/resource-group-queue-metrics.jsx
@@ -3,6 +3,7 @@ import { useJSON, useResourceGroupResources } from "./utils";
 
 import Section from "./section";
 import Chart from "./chart";
+import Icon from "./icon";
 
 const colorVars = [
   "--teal-700",
@@ -80,32 +81,62 @@ export default function ResourceGroupQueueMetrics({ infoGroupId }) {
 
   let content = null;
   if (view === "overview") {
-    content = overview.map(
-      ({
-        job_count,
-        median_expansion_factor,
-        median_wait_time,
-        median_wall_time,
-        resource_descriptive_name,
-      }) => {
-        return (
-          <p>
-            <strong>{formatName(resource_descriptive_name)}:</strong> Users ran{" "}
-            <strong>{parseInt(job_count).toLocaleString("en-us")}</strong> jobs
-            during the last 30 days. Waiting in the queue increased the time to
-            complete these jobs by{" "}
-            <strong>
-              {((median_expansion_factor - 1) * 100).toLocaleString("en-us", {
-                maximumFractionDigits: 0,
-              })}
-              %
-            </strong>{" "}
-            on average. The median job waited for{" "}
-            <strong>{formatTime(median_wait_time)}</strong> and ran for{" "}
-            <strong>{formatTime(median_wall_time)}</strong>.
-          </p>
-        );
-      }
+    content = (
+      <div class="cards">
+        {overview.map(
+          ({
+            info_resourceid,
+            job_count,
+            median_expansion_factor,
+            median_wait_time,
+            median_wall_time,
+            resource_descriptive_name,
+          }) => {
+            return (
+              <p class="card metrics-overview">
+                <b>{formatName(resource_descriptive_name)}:</b> Users ran{" "}
+                <strong>
+                  <Icon name="file-earmark-code" />
+                  {parseInt(job_count).toLocaleString("en-us")} jobs
+                </strong>{" "}
+                during the last 30 days. Waiting in the queue caused an average{" "}
+                <strong>
+                  <Icon name="calculator" />
+                  {((median_expansion_factor - 1) * 100).toLocaleString(
+                    "en-us",
+                    {
+                      maximumFractionDigits: 0,
+                    }
+                  )}
+                  % increase
+                </strong>{" "}
+                in the total completion time. The average job waited for{" "}
+                <strong>
+                  <Icon name="hourglass-split" /> {formatTime(median_wait_time)}
+                </strong>{" "}
+                and ran for{" "}
+                <strong>
+                  <Icon name="stopwatch" />
+                  {formatTime(median_wall_time)}
+                </strong>
+                .{" "}
+                <a
+                  title={`Wait time chart for ${formatName(
+                    resource_descriptive_name
+                  )}`}
+                  href="#"
+                  onClick={(e) => {
+                    e.preventDefault();
+                    setView(info_resourceid);
+                  }}
+                >
+                  View chart &raquo;
+                </a>
+              </p>
+            );
+          }
+        )}
+      </div>
     );
   } else if (detailMetrics && detailMetrics.info_resource_id === view) {
     const datasetsMap = {};
@@ -125,6 +156,9 @@ export default function ResourceGroupQueueMetrics({ infoGroupId }) {
         colorVar
       );
     });
+    const overviewItem = overview.find(
+      (item) => item.info_resourceid == detailMetrics.info_resource_id
+    );
     const options = {
       interaction: {
         intersect: false,
@@ -133,7 +167,9 @@ export default function ResourceGroupQueueMetrics({ infoGroupId }) {
       plugins: {
         title: {
           display: true,
-          text: "Median Wait Time by Queue and Job Wall Time",
+          text: `Median Wait Time by Queue on ${formatName(
+            overviewItem.resource_descriptive_name
+          )}: Last 30 Days`,
         },
       },
       scales: {
@@ -146,14 +182,27 @@ export default function ResourceGroupQueueMetrics({ infoGroupId }) {
       },
     };
     content = (
-      <Chart type="bar" data={{ labels, datasets }} options={options} />
+      <>
+        <Chart type="bar" data={{ labels, datasets }} options={options} />
+        <p>
+          <a
+            href="#"
+            onClick={(e) => {
+              e.preventDefault();
+              setView("overview");
+            }}
+          >
+            &laquo; Back to overview
+          </a>
+        </p>
+      </>
     );
   }
 
   return (
     <Section
-      title="Queue Metrics"
-      icon="clock"
+      title="Wait Time"
+      icon="hourglass-split"
       headerComponents={headerComponents}
     >
       {content}

From f8611915c10070b099d254e0d2ab6b32bfbc74c3 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Tue, 19 Nov 2024 11:46:05 -0500
Subject: [PATCH 085/113] feat(resource-group-detail): move documentation up in
 order

---
 src/resource-group-detail.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/resource-group-detail.jsx b/src/resource-group-detail.jsx
index aec4c4d..04891ed 100644
--- a/src/resource-group-detail.jsx
+++ b/src/resource-group-detail.jsx
@@ -15,12 +15,12 @@ export default function ResourceGroupDetail({ infoGroupId }) {
       <ResourceGroupDescription infoGroupId={infoGroupId} />
       <SectionNavigation />
       <ResourceGroupHardware infoGroupId={infoGroupId} />
+      <ResourceGroupDocumentation infoGroupId={infoGroupId} />
       <ResourceGroupEvents infoGroupId={infoGroupId} />
       <ResourceGroupAffinityGroup infoGroupId={infoGroupId} />
       <ResourceGroupSoftware infoGroupId={infoGroupId} />
       <ResourceGroupProjects infoGroupId={infoGroupId} />
       <ResourceGroupQueueMetrics infoGroupId={infoGroupId} />
-      <ResourceGroupDocumentation infoGroupId={infoGroupId} />
       <ResourceGroupDiscussion infoGroupId={infoGroupId} />
     </div>
   );

From f82685b9aee5d0e79e1796ebb8407a472f9f04d8 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Thu, 21 Nov 2024 09:36:41 -0500
Subject: [PATCH 086/113] fix(utils): use favicon URL field from CIDeR

---
 src/utils.jsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/utils.jsx b/src/utils.jsx
index be651de..0995d40 100644
--- a/src/utils.jsx
+++ b/src/utils.jsx
@@ -112,14 +112,13 @@ export const useResourceGroups = () => {
         name: feature.feature_name,
         tagCategoryId: feature.feature_category_id,
       }));
+
     for (let organization of organizations)
       tags.push({
         tagId: organization.organization_id * -1,
         name: organization.organization_name,
         tagCategoryId: -1,
-        iconUri: organization.organization_logo_url
-          ? organization.organization_logo_url.replace(/\/logo$/, "/favicon")
-          : null,
+        iconUri: organization.organization_favicon_url || null,
       });
 
     tags.sort((a, b) => a.name.localeCompare(b.name));

From 2f4cfc638299c4ccfa8077356bc152557d6ac267 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Mon, 2 Dec 2024 14:04:47 -0500
Subject: [PATCH 087/113] feat(resource-group-projects): replace statistics
 with recent projects carousel

---
 src/carousel.jsx                |  21 +++--
 src/resource-catalog.jsx        |   2 +
 src/resource-group-event.jsx    |   2 +-
 src/resource-group-projects.css |  45 +++++------
 src/resource-group-projects.jsx | 139 ++++++++++++++++++--------------
 src/scroll-text.css             |  24 ++++++
 src/scroll-text.jsx             |   9 +++
 7 files changed, 147 insertions(+), 95 deletions(-)
 create mode 100644 src/scroll-text.css
 create mode 100644 src/scroll-text.jsx

diff --git a/src/carousel.jsx b/src/carousel.jsx
index f472b84..ee471b0 100644
--- a/src/carousel.jsx
+++ b/src/carousel.jsx
@@ -1,13 +1,13 @@
-import { useLayoutEffect, useRef } from "preact/hooks";
+import { useEffect, useRef } from "preact/hooks";
 import Glide, { Controls } from "@glidejs/glide/dist/glide.modular.esm";
 
-export function Carousel({ children }) {
+export default function Carousel({ children, cssClass = "" }) {
   const glide = useRef(null);
-  useLayoutEffect(() => {
+  useEffect(() => {
     if (glide.current) new Glide(glide.current).mount({ Controls });
   }, []);
   return (
-    <section class="carousel">
+    <section class={`carousel ${cssClass}`}>
       <div class="glide" ref={glide}>
         <div class="glide__track" data-glide-el="track">
           <ul class="glide__slides">{children}</ul>
@@ -39,7 +39,11 @@ export function Carousel({ children }) {
   );
 }
 
-export function CarouselSlide({
+function Slide({ children }) {
+  return <li class="glide__slide">{children}</li>;
+}
+
+function ImageSlide({
   title,
   description,
   linkText,
@@ -48,7 +52,7 @@ export function CarouselSlide({
   imageAltText,
 }) {
   return (
-    <li class="glide__slide">
+    <Slide>
       <span class="slide-inner">
         {imageURI && (
           <a href={linkURI} class="slide-image">
@@ -61,6 +65,9 @@ export function CarouselSlide({
           {linkText && <a href={linkURI}>{linkText}</a>}
         </span>
       </span>
-    </li>
+    </Slide>
   );
 }
+
+Carousel.Slide = Slide;
+Carousel.ImageSlide = ImageSlide;
diff --git a/src/resource-catalog.jsx b/src/resource-catalog.jsx
index d463557..995791c 100644
--- a/src/resource-catalog.jsx
+++ b/src/resource-catalog.jsx
@@ -21,6 +21,7 @@ import resourceGroupQueueMetricsStyle from "./resource-group-queue-metrics.css?i
 import resourceHomeStyle from "./resource-home.css?inline";
 import resourceNewsStyle from "./resource-news.css?inline";
 import resourcePathwaysStyle from "./resource-pathways.css?inline";
+import scrollTextStyle from "./scroll-text.css?inline";
 import searchStyle from "./search.css?inline";
 import sectionNavigationStyle from "./section-navigation.css?inline";
 import tagsStyle from "./tags.css?inline";
@@ -71,6 +72,7 @@ export function ResourceCatalog({
       <style>{resourceHomeStyle}</style>
       <style>{resourceNewsStyle}</style>
       <style>{resourcePathwaysStyle}</style>
+      <style>{scrollTextStyle}</style>
       <style>{searchStyle}</style>
       <style>{sectionNavigationStyle}</style>
       <style>{tagsStyle}</style>
diff --git a/src/resource-group-event.jsx b/src/resource-group-event.jsx
index 7340686..350abec 100644
--- a/src/resource-group-event.jsx
+++ b/src/resource-group-event.jsx
@@ -1,4 +1,4 @@
-import { extractHref, htmlToJsx } from "./utils";
+import { htmlToJsx } from "./utils";
 
 import ExpandText from "./expand-text";
 import Icon from "./icon";
diff --git a/src/resource-group-projects.css b/src/resource-group-projects.css
index 0ae1372..45a816d 100644
--- a/src/resource-group-projects.css
+++ b/src/resource-group-projects.css
@@ -1,31 +1,22 @@
-.projects-columns .column {
-  align-items: center;
-  display: flex;
-  flex-direction: column;
-  margin-bottom: 20px;
+.carousel-projects .glide__slide {
+  font-size: 16px;
 }
-.projects-columns .project-count {
-  display: flex;
-  flex-direction: row;
+.carousel-projects h3 {
+  margin: 0 0 0.25rem;
 }
-.projects-columns .project-count .count {
-  margin-right: 0.5rem;
-  text-align: right;
-  width: 3rem;
+.carousel-projects .project-metadata {
+  margin-bottom: 0.5rem;
 }
-@media (min-width: 768px) {
-  .projects-columns {
-    display: flex;
-    flex-direction: row;
-  }
-  .projects-columns .column {
-    align-items: flex-start;
-    width: calc((var(--width) - 40px) / 3);
-  }
-  .projects-columns .column > * {
-    width: calc((var(--width) - 40px) / 3);
-  }
-  .projects-columns .column:not(:last-child) {
-    margin-right: 20px;
-  }
+.carousel-projects .project-meta {
+  display: inline-block;
+  font-weight: bold;
+  line-height: 1.1;
+  margin-right: 1rem;
+  max-width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.carousel-projects .project-meta .bi {
+  vertical-align: middle;
 }
diff --git a/src/resource-group-projects.jsx b/src/resource-group-projects.jsx
index d059bc3..648f023 100644
--- a/src/resource-group-projects.jsx
+++ b/src/resource-group-projects.jsx
@@ -1,76 +1,95 @@
-import { useState } from "preact/hooks";
-import { useJSON } from "./utils";
+import { useJSON, useResourceGroup } from "./utils";
 
+import Carousel from "./carousel";
 import Grid from "./grid";
-import { MiniBar } from "./mini-bar";
+import Icon from "./icon";
+import ScrollText from "./scroll-text";
 import Section from "./section";
 
-const column = (items, title, topItemsHeading) => {
-  const columns = [
-    { key: "value", name: title },
-    {
-      key: "count",
-      name: "Projects",
-      format: (value) => (
-        <div class="project-count">
-          <span class="count">{value.toLocaleString("en-US")}</span>
-          <MiniBar value={value} maxValue={items[0].count} />
-        </div>
-      ),
-    },
-  ];
+const apiBaseUrl = "https://allocations.access-ci.org/current-projects.json";
+
+export function ProjectMetadata({ icon, text, title }) {
+  if (!text) return;
   return (
-    <div class="column">
-      <h3>{topItemsHeading}</h3>
-      <Grid columns={columns} rows={items} />
-    </div>
+    <abbr class="project-meta" title={title}>
+      <Icon name={icon} />
+      {text}
+    </abbr>
   );
-};
+  return;
+}
 
 export default function ResourceGroupProjects({ infoGroupId }) {
-  const [persona, setPersona] = useState("all");
-  const apiBaseUrl =
-    "https://allocations.access-ci.org/current-projects/summary.json";
-  const apiUrl = `${apiBaseUrl}?info_groupid=${infoGroupId}&persona=${persona}`;
-  const data = useJSON(apiUrl, { corsProxy: true });
-
-  if (!data || data.error || !data.projectStatistics.length) return;
+  const resourceGroup = useResourceGroup(infoGroupId);
+  const data = useJSON(
+    resourceGroup
+      ? `${apiBaseUrl}?${resourceGroup.infoResourceIds
+          .map((infoResourceId) => `info_resourceids[]=${infoResourceId}`)
+          .join("&")}`
+      : null
+  );
 
-  const stats = {
-    "allocation-type": [],
-    "field-of-science": [],
-    "pi-institution": [],
-  };
-  for (let stat of data.projectStatistics) stats[stat["type"]].push(stat);
+  if (!data || !data.projects || !data.projects.length) return null;
 
-  const headerComponents = [
-    <select value={persona} onChange={(e) => setPersona(e.target.value)}>
-      <option value="all">All PIs</option>
-      <option value="researcher">Researchers</option>
-      <option value="educator">Educators</option>
-      <option value="graduate-student">Graduate Students</option>
-    </select>,
+  const columns = [
+    { key: "resourceName", name: "Resource" },
+    {
+      key: "allocation",
+      name: "Current Allocation",
+      format: (value, row) =>
+        row.units == "[Yes = 1, No = 0]"
+          ? value == 1
+            ? "Yes"
+            : "No"
+          : `${value.toLocaleString("en-us")} ${row.units || ""}`,
+    },
   ];
 
   return (
-    <Section
-      title="Current Projects"
-      icon="pc-display"
-      headerComponents={headerComponents}
-    >
-      <div class="projects-columns">
-        {column(stats["allocation-type"], "Project Type", "Top Project Types")}
-        {column(
-          stats["field-of-science"],
-          "Field of Science",
-          "Top Fields of Science"
-        )}
-        {column(
-          stats["pi-institution"],
-          "PI's Institution",
-          "Top Institutions"
-        )}
-      </div>
+    <Section title="Recent Projects" icon="pc-display">
+      <Carousel cssClass="carousel-projects">
+        {data.projects.map((project) => (
+          <Carousel.Slide>
+            <h3>{project.requestTitle}</h3>
+            <div class="project-metadata">
+              <ProjectMetadata
+                icon="cash-coin"
+                text={project.allocationType}
+                title="Allocation Type"
+              />
+              <ProjectMetadata
+                icon="person-fill"
+                text={`${project.pi} (${project.piInstitution})`}
+                title="Primary Investigator"
+              />
+              <ProjectMetadata
+                icon="folder"
+                text={project.fos}
+                title="Field of Science"
+              />
+              <ProjectMetadata
+                icon="calendar-range"
+                text={[project.beginDate, project.endDate]
+                  .map((dateStr) =>
+                    new Date(dateStr).toLocaleString("en-US", {
+                      dateStyle: "medium",
+                    })
+                  )
+                  .join(" to ")}
+                title="Project Dates"
+              />
+            </div>
+            <ScrollText>
+              <p>{project.abstract}</p>
+              <Grid
+                columns={columns}
+                rows={project.resources}
+                maxHeight={null}
+              />
+            </ScrollText>
+          </Carousel.Slide>
+        ))}
+      </Carousel>
     </Section>
   );
 }
diff --git a/src/scroll-text.css b/src/scroll-text.css
new file mode 100644
index 0000000..d6120f8
--- /dev/null
+++ b/src/scroll-text.css
@@ -0,0 +1,24 @@
+.scroll-text {
+  position: relative;
+}
+.scroll-text::after {
+  background-color: red;
+  background: linear-gradient(
+    to bottom,
+    rgba(255, 255, 255, 0),
+    white 50%,
+    white 100%
+  );
+  bottom: 0;
+  content: "";
+  display: block;
+  height: 2rem;
+  left: 0;
+  position: absolute;
+  width: 100%;
+  z-index: 99999;
+}
+.scroll-text-inner {
+  padding-bottom: 2rem;
+  overflow-y: scroll;
+}
diff --git a/src/scroll-text.jsx b/src/scroll-text.jsx
new file mode 100644
index 0000000..9bdf634
--- /dev/null
+++ b/src/scroll-text.jsx
@@ -0,0 +1,9 @@
+export default function ScrollText({ children, maxHeight = "400px" }) {
+  return (
+    <div class="scroll-text">
+      <div class="scroll-text-inner" style={{ maxHeight }}>
+        {children}
+      </div>
+    </div>
+  );
+}

From a49d33e80b879a93b98e93086d245a2eded65f19 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Mon, 2 Dec 2024 15:18:49 -0500
Subject: [PATCH 088/113] feat(resource-catalog): render using shadow DOM

---
 src/index.jsx            |  5 ++--
 src/resource-catalog.css | 29 +++++++++++++++++++++
 src/resource-catalog.jsx | 56 ++--------------------------------------
 3 files changed, 33 insertions(+), 57 deletions(-)
 create mode 100644 src/resource-catalog.css

diff --git a/src/index.jsx b/src/index.jsx
index 1b2b22c..739204a 100644
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -1,5 +1,3 @@
-import { render } from "preact";
-
 import { Footer } from "./footer";
 import { Header } from "./header";
 import { FooterMenus, Menus } from "./menu";
@@ -76,7 +74,8 @@ const footerMenus = ({ items, target }) =>
 const tableOfContents = ({ headings = [], target }) =>
   renderShadow(<TableOfContents headings={headings} />, target);
 
-const resourceCatalog = ({ target }) => render(<ResourceCatalog />, target);
+const resourceCatalog = ({ target }) =>
+  renderShadow(<ResourceCatalog />, target);
 
 export {
   footer,
diff --git a/src/resource-catalog.css b/src/resource-catalog.css
new file mode 100644
index 0000000..469e66a
--- /dev/null
+++ b/src/resource-catalog.css
@@ -0,0 +1,29 @@
+@import url("@glidejs/glide/dist/css/glide.core.min.css");
+@import url("@glidejs/glide/dist/css/glide.theme.min.css");
+@import url("tippy.js/dist/tippy.css");
+
+@import url("./base.css");
+@import url("./content.css");
+
+@import url("./accordion.css");
+@import url("./alert.css");
+@import url("./carousel.css");
+@import url("./components.css");
+@import url("./donut-chart.css");
+@import url("./expand-text.css");
+@import url("./grid.css");
+@import url("./icon.css");
+@import url("./info-tip.css");
+@import url("./mini-bar.css");
+@import url("./resource-filters.css");
+@import url("./resource-group-event.css");
+@import url("./resource-group-projects.css");
+@import url("./resource-group-queue-metrics.css");
+@import url("./resource-group.css");
+@import url("./resource-home.css");
+@import url("./resource-news.css");
+@import url("./resource-pathways.css");
+@import url("./scroll-text.css");
+@import url("./search.css");
+@import url("./section-navigation.css");
+@import url("./tags.css");
diff --git a/src/resource-catalog.jsx b/src/resource-catalog.jsx
index 995791c..cf25e95 100644
--- a/src/resource-catalog.jsx
+++ b/src/resource-catalog.jsx
@@ -1,31 +1,5 @@
 import { ErrorBoundary, lazy, LocationProvider, Router } from "preact-iso";
-import accordionStyle from "./accordion.css?inline";
-import alertStyle from "./alert.css?inline";
-import baseStyle from "./base.css?inline";
-import componentsStyle from "./components.css?inline";
-import contentStyle from "./content.css?inline";
-import donutChartStyle from "./donut-chart.css?inline";
-import expandTextStyle from "./expand-text.css?inline";
-import iconStyle from "./icon.css?inline";
-import infoTipStyle from "./info-tip.css?inline";
-import glideCoreStyle from "@glidejs/glide/dist/css/glide.core.min.css?inline";
-import glideThemeStyle from "@glidejs/glide/dist/css/glide.theme.min.css?inline";
-import gridStyle from "./grid.css?inline";
-import carouselStyle from "./carousel.css?inline";
-import miniBarStyle from "./mini-bar.css?inline";
-import resourceFiltersStyle from "./resource-filters.css?inline";
-import resourceGroupStyle from "./resource-group.css?inline";
-import resourceGroupEventStyle from "./resource-group-event.css?inline";
-import resourceGroupProjectsStyle from "./resource-group-projects.css?inline";
-import resourceGroupQueueMetricsStyle from "./resource-group-queue-metrics.css?inline";
-import resourceHomeStyle from "./resource-home.css?inline";
-import resourceNewsStyle from "./resource-news.css?inline";
-import resourcePathwaysStyle from "./resource-pathways.css?inline";
-import scrollTextStyle from "./scroll-text.css?inline";
-import searchStyle from "./search.css?inline";
-import sectionNavigationStyle from "./section-navigation.css?inline";
-import tagsStyle from "./tags.css?inline";
-import tippyStyle from "tippy.js/dist/tippy.css?inline";
+import resourceCatalogStyle from "./resource-catalog.css?inline";
 
 const ResourceGroupDetail = lazy(() => import("./resource-group-detail.jsx"));
 const ResourceHome = lazy(() => import("./resource-home.jsx"));
@@ -50,33 +24,7 @@ export function ResourceCatalog({
           </Router>
         </ErrorBoundary>
       </LocationProvider>
-      <style>{baseStyle}</style>
-      <style>{contentStyle}</style>
-      <style>{componentsStyle}</style>
-      <style>{accordionStyle}</style>
-      <style>{alertStyle}</style>
-      <style>{donutChartStyle}</style>
-      <style>{expandTextStyle}</style>
-      <style>{iconStyle}</style>
-      <style>{infoTipStyle}</style>
-      <style>{glideCoreStyle}</style>
-      <style>{glideThemeStyle}</style>
-      <style>{gridStyle}</style>
-      <style>{carouselStyle}</style>
-      <style>{miniBarStyle}</style>
-      <style>{resourceFiltersStyle}</style>
-      <style>{resourceGroupStyle}</style>
-      <style>{resourceGroupEventStyle}</style>
-      <style>{resourceGroupProjectsStyle}</style>
-      <style>{resourceGroupQueueMetricsStyle}</style>
-      <style>{resourceHomeStyle}</style>
-      <style>{resourceNewsStyle}</style>
-      <style>{resourcePathwaysStyle}</style>
-      <style>{scrollTextStyle}</style>
-      <style>{searchStyle}</style>
-      <style>{sectionNavigationStyle}</style>
-      <style>{tagsStyle}</style>
-      <style>{tippyStyle}</style>
+      <style>{resourceCatalogStyle}</style>
     </>
   );
 }

From ff3de37d9bd8d494b49888a82879ce16dede4b3c Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Mon, 2 Dec 2024 15:21:40 -0500
Subject: [PATCH 089/113] fix(resource-catalog): include icon CSS in parent DOM

---
 index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/index.html b/index.html
index b36474b..6d20515 100644
--- a/index.html
+++ b/index.html
@@ -12,6 +12,7 @@
       media="all"
     />
     <link rel="stylesheet" href="/src/base.css" />
+    <link rel="stylesheet" href="/src/icon.css" />
     <style>
       body {
         color: #232323;

From aba2256a65e3958162d3b3c00b8b0d2edcfa0e2c Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Mon, 2 Dec 2024 15:49:31 -0500
Subject: [PATCH 090/113] feat(resource-catalog): remove resources path element

---
 src/resource-catalog.jsx | 2 +-
 src/resource-group.jsx   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/resource-catalog.jsx b/src/resource-catalog.jsx
index cf25e95..60266d0 100644
--- a/src/resource-catalog.jsx
+++ b/src/resource-catalog.jsx
@@ -20,7 +20,7 @@ export function ResourceCatalog({
               title={title}
               showTitle={showTitle}
             />
-            <ResourceGroupDetail path={`${baseUri}/resources/:infoGroupId`} />
+            <ResourceGroupDetail path={`${baseUri}/:infoGroupId`} />
           </Router>
         </ErrorBoundary>
       </LocationProvider>
diff --git a/src/resource-group.jsx b/src/resource-group.jsx
index e9eaee6..3b4eab7 100644
--- a/src/resource-group.jsx
+++ b/src/resource-group.jsx
@@ -13,7 +13,7 @@ export function ResourceGroup({
   tags,
   toggleTag,
 }) {
-  const detailUri = `${baseUri}/resources/${infoGroupId}`;
+  const detailUri = `${baseUri}/${infoGroupId}`;
   return (
     <div class="resource-group">
       <a

From 0e53090e8cab7087a26a97e6e1ae4951d03c6395 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Mon, 2 Dec 2024 15:50:12 -0500
Subject: [PATCH 091/113] chore(vite): re-enable production builds

---
 vite.config.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/vite.config.js b/vite.config.js
index 6c3450f..916fe40 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,16 +1,16 @@
-// import { resolve } from "path";
+import { resolve } from "path";
 import { defineConfig } from "vite";
 import preact from "@preact/preset-vite";
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  // build: {
-  //   lib: {
-  //     entry: resolve(__dirname, "src/index.jsx"),
-  //     name: "AccessCiUi",
-  //     fileName: "access-ci-ui",
-  //   },
-  // },
+  build: {
+    lib: {
+      entry: resolve(__dirname, "src/index.jsx"),
+      name: "AccessCiUi",
+      fileName: "access-ci-ui",
+    },
+  },
   base: "/access-ci-ui",
   plugins: [preact()],
 });

From 25dd0801b845300dd90d82f86d3447ad8f84b2a8 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Mon, 2 Dec 2024 15:50:42 -0500
Subject: [PATCH 092/113] ci(create-release): allow releases from the resource
 catalog branch

---
 .github/workflows/create-release.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index f5f4335..ddacb5e 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - resource-catalog
 
 jobs:
   release:

From bef34cad23efee6fe6410182d33bf8a02f113446 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Mon, 2 Dec 2024 16:45:27 -0500
Subject: [PATCH 093/113] ci(build-deploy-pages): disable library config for
 staging builds

---
 .github/workflows/build-deploy-pages.yml |  2 +-
 vite.config.js                           | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-deploy-pages.yml b/.github/workflows/build-deploy-pages.yml
index f598290..82137ce 100644
--- a/.github/workflows/build-deploy-pages.yml
+++ b/.github/workflows/build-deploy-pages.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Install dependencies
         run: npm ci
       - name: Build project
-        run: npm run build
+        run: npm run build -- --mode=staging
         env:
           VITE_SDS_API_KEY: ${{ secrets.VITE_SDS_API_KEY }}
       - name: Copy index to 404 page
diff --git a/vite.config.js b/vite.config.js
index 916fe40..ba842c9 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -3,14 +3,17 @@ import { defineConfig } from "vite";
 import preact from "@preact/preset-vite";
 
 // https://vitejs.dev/config/
-export default defineConfig({
-  build: {
-    lib: {
-      entry: resolve(__dirname, "src/index.jsx"),
-      name: "AccessCiUi",
-      fileName: "access-ci-ui",
-    },
-  },
+export default defineConfig(({ mode }) => ({
+  build:
+    mode !== "staging"
+      ? {
+          lib: {
+            entry: resolve(__dirname, "src/index.jsx"),
+            name: "AccessCiUi",
+            fileName: "access-ci-ui",
+          },
+        }
+      : null,
   base: "/access-ci-ui",
   plugins: [preact()],
-});
+}));

From 2386cafe0bbfd1f8aabea01cc1574ad8fbe65330 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Mon, 2 Dec 2024 16:51:38 -0500
Subject: [PATCH 094/113] ci(create-release): set target branch for Release
 Please action

---
 .github/workflows/create-release.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index ddacb5e..d1014fd 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -23,6 +23,7 @@ jobs:
         uses: googleapis/release-please-action@v4
         with:
           release-type: node
+          target-branch: ${{ github.ref_name }}
 
   build-publish:
     name: Build and publish module

From 2df5c15488013eaf77079c90476b9207b794c439 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Mon, 2 Dec 2024 16:53:28 -0500
Subject: [PATCH 095/113] chore: release 0.5.0-beta1

Release-As: 0.5.0-beta1

From 2e5ddcbf9a7c81eb7e9be57f32d853d2b7b88687 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Tue, 3 Dec 2024 13:19:13 -0500
Subject: [PATCH 096/113] fix(section-navigation): fix navigation in shadow DOM

---
 src/section-navigation.jsx | 66 +++++++++++++++++++++++++-------------
 1 file changed, 44 insertions(+), 22 deletions(-)

diff --git a/src/section-navigation.jsx b/src/section-navigation.jsx
index 9f480e5..a454400 100644
--- a/src/section-navigation.jsx
+++ b/src/section-navigation.jsx
@@ -1,12 +1,16 @@
-import { useEffect, useState } from "preact/hooks";
+import { useEffect, useRef, useState } from "preact/hooks";
 
 import Icon from "./icon";
 
 export default function SectionNavigation({ prompt = "Jump To:" }) {
   const [sections, setSections] = useState([]);
+  const container = useRef(null);
+
   const updateSections = () => {
     const newSections = [];
-    for (let heading of document.querySelectorAll("[data-section-title]"))
+    for (let heading of container.current.querySelectorAll(
+      "[data-section-title]"
+    ))
       newSections.push({
         icon: heading.dataset.sectionIcon,
         id: heading.id,
@@ -15,27 +19,45 @@ export default function SectionNavigation({ prompt = "Jump To:" }) {
 
     setSections(newSections);
   };
+
+  const scrollToSection = (sectionId) => {
+    const section = container.current.querySelector(`#${sectionId}`);
+    if (section) section.scrollIntoView();
+  };
+
   useEffect(() => {
+    if (!container.current) return;
     updateSections();
     document.addEventListener("accessci-update-sections", updateSections);
-  }, []);
-  return sections.length >= 2 ? (
-    <nav class="section-navigation">
-      {prompt ? <h2>{prompt}</h2> : null}
-      <ul>
-        {sections.map(({ icon, id, title }) => (
-          <li>
-            <a href={`#${id}`}>
-              {icon ? (
-                <>
-                  <Icon name={icon} />{" "}
-                </>
-              ) : null}
-              {title}
-            </a>
-          </li>
-        ))}
-      </ul>
-    </nav>
-  ) : null;
+  }, [container.current]);
+
+  return (
+    <div ref={(el) => (container.current = el?.parentElement)}>
+      {sections.length >= 2 ? (
+        <nav class="section-navigation">
+          {prompt ? <h2>{prompt}</h2> : null}
+          <ul>
+            {sections.map(({ icon, id, title }) => (
+              <li>
+                <a
+                  href={`#${id}`}
+                  onClick={(e) => {
+                    e.preventDefault();
+                    scrollToSection(id);
+                  }}
+                >
+                  {icon ? (
+                    <>
+                      <Icon name={icon} />{" "}
+                    </>
+                  ) : null}
+                  {title}
+                </a>
+              </li>
+            ))}
+          </ul>
+        </nav>
+      ) : null}
+    </div>
+  );
 }

From 30ae82743e2e9300f013379009d27dbee6d04600 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 4 Dec 2024 09:55:34 -0500
Subject: [PATCH 097/113] fix(resource-group-affinity-group): use affinity
 group URL from API

---
 src/resource-group-affinity-group.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/resource-group-affinity-group.jsx b/src/resource-group-affinity-group.jsx
index 5e12e52..4fd54e9 100644
--- a/src/resource-group-affinity-group.jsx
+++ b/src/resource-group-affinity-group.jsx
@@ -16,7 +16,7 @@ export default function ResourceGroupAffinityGroup({ infoGroupId }) {
         update about announcements, events, and outages.
       </p>
       <div class="button-group">
-        <a href="https://support.access-ci.org/user" class="btn secondary">
+        <a href={data[0].url} class="btn secondary">
           <Icon name="person-plus-fill" /> Join Affinity Group
         </a>
         {slackUri ? (

From 4934a14b81b864fa7efb0d6dabd2c5fb8e43555b Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 4 Dec 2024 10:34:03 -0500
Subject: [PATCH 098/113] fix(resource-group-discussion): get category ID from
 affinity group API

---
 src/resource-group-discussion.jsx | 32 ++++++-------------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/src/resource-group-discussion.jsx b/src/resource-group-discussion.jsx
index 94abd5b..215de39 100644
--- a/src/resource-group-discussion.jsx
+++ b/src/resource-group-discussion.jsx
@@ -4,33 +4,14 @@ import Grid from "./grid";
 import Icon from "./icon";
 import Section from "./section";
 
-const getCategoryUri = (category, siteData) => {
-  if (!category) return null;
-  let uri = `${category.slug}/${category.id}.json`;
-  let currentCategory = category;
-  while (currentCategory.parent_category_id) {
-    currentCategory = siteData.categories.find(
-      (cat) => cat.id == currentCategory.parent_category_id
-    );
-    uri = `${currentCategory.slug}/${uri}`;
-  }
-  return `https://ask.cyberinfrastructure.org/c/${uri}`;
-};
-
 export default function ResourceGroupDiscussion({ infoGroupId }) {
-  const siteData = useJSON(`https://ask.cyberinfrastructure.org/site.json`);
-  // Try to find a category with a slug that matches the info group ID.
-  // TODO: Replace this with better logic once the CID and slug are available
-  // in the Support APIs.
-  const slugNeedle = infoGroupId.split(".")[0].replace(/[^a-z]/g, "");
-  const category =
-    !siteData || siteData.error
-      ? null
-      : siteData.categories.find((cat) =>
-          cat.slug.split("-").includes(slugNeedle)
-        );
+  const data = useJSON(
+    `https://support.access-ci.org/api/1.0/affinity_groups/${infoGroupId}`
+  );
 
-  const categoryDataUri = getCategoryUri(category, siteData);
+  const categoryWebUri =
+    data && !data.error && data.length ? data[0].field_ask_ci_locale : null;
+  const categoryDataUri = categoryWebUri ? `${categoryWebUri}.json` : null;
   const categoryData = useJSON(categoryDataUri);
 
   if (
@@ -70,7 +51,6 @@ export default function ResourceGroupDiscussion({ infoGroupId }) {
     },
   ];
 
-  const categoryWebUri = categoryDataUri.replace(/\.json$/, "");
   const headerComponents = [
     <a href={categoryWebUri} class="btn secondary">
       Ask a Question

From 0804316697ce723c9cf645109a6aa5726fd8e1c4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 4 Dec 2024 15:35:22 +0000
Subject: [PATCH 099/113] chore(resource-catalog): release 0.5.0-beta1

---
 CHANGELOG.md      | 118 ++++++++++++++++++++++++++++++++++++++++++++++
 package-lock.json |   4 +-
 package.json      |   2 +-
 3 files changed, 121 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ca96e7..fe2b2fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,124 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [0.5.0-beta1](https://github.com/access-ci-org/access-ci-ui/compare/v0.5.0-beta1...v0.5.0-beta1) (2024-12-04)
+
+
+### Features
+
+* **footer:** add footer components ([1359aaa](https://github.com/access-ci-org/access-ci-ui/commit/1359aaad704e21ad289e4d8ab7e1dbf19c8a83b9))
+* **footer:** add How to Acknowledge ACCESS link ([3aa9801](https://github.com/access-ci-org/access-ci-ui/commit/3aa98015030d2293e8e31c6c9ae1ad4491663fbf))
+* **footer:** add persona links and update style ([deae672](https://github.com/access-ci-org/access-ci-ui/commit/deae672d658248c50079e6e8ed9960a96053ff27))
+* **footer:** add scroll-to-top button ([d84fafb](https://github.com/access-ci-org/access-ci-ui/commit/d84fafbb31259d23ff2d91712c442ce265e6bb7d))
+* **header:** add header and logo components ([8c6695f](https://github.com/access-ci-org/access-ci-ui/commit/8c6695f72bf643d5364ca882f3720c6d6f6816a5))
+* **index:** add warning banner with link to production catalog ([4309bb8](https://github.com/access-ci-org/access-ci-ui/commit/4309bb8491979bf3c96ad2caaa1b0fe3f0f164c1))
+* **logo:** adjust logo to match main ACCESS site ([e9491a9](https://github.com/access-ci-org/access-ci-ui/commit/e9491a99ca090e56ea127cd1310586d3b0b086b6))
+* **menus:** add footer menus ([0000b88](https://github.com/access-ci-org/access-ci-ui/commit/0000b88ef2bef1ff8641c4a2bb4457be5cbaf2d4))
+* **menus:** add universal and site menus ([c58291d](https://github.com/access-ci-org/access-ci-ui/commit/c58291d64f9e6b4f0c953e5e9755d20456c26613))
+* **menus:** highlight current site in universal menus ([a88dd51](https://github.com/access-ci-org/access-ci-ui/commit/a88dd5166157e2ccdad34fbda3008f7580a07d89))
+* **menus:** update search URL in universal nav ([c106f12](https://github.com/access-ci-org/access-ci-ui/commit/c106f1222eb2277cd19b3f75e636a8802772eeba))
+* **menus:** use FontAwesome home icon ([6101066](https://github.com/access-ci-org/access-ci-ui/commit/6101066748681eff99d0248ba15ec9ca549af178))
+* **menu:** update icons and spacing ([274d6db](https://github.com/access-ci-org/access-ci-ui/commit/274d6dbf387e69bfe82cacde4122c3ec98246087))
+* **menu:** update menu items and styles ([5d4ef70](https://github.com/access-ci-org/access-ci-ui/commit/5d4ef70624b2c4213a438d6b107e48b9548846db))
+* **mini-bar:** add mini bar chart component ([c618fcd](https://github.com/access-ci-org/access-ci-ui/commit/c618fcd2a34d168ff8bc83b465a933643a2a794d))
+* **resource-catalog:** add catalog and carousel components ([c0a354b](https://github.com/access-ci-org/access-ci-ui/commit/c0a354bca6772133ce466beaea934bd2f054d309))
+* **resource-catalog:** add filter icon ([b1963ae](https://github.com/access-ci-org/access-ci-ui/commit/b1963ae81f98e3305471d6c3ce71727b8d22a19e))
+* **resource-catalog:** add filter reset button ([db73d79](https://github.com/access-ci-org/access-ci-ui/commit/db73d79f49fa29dcec8e0fe04ddb1da35b76e07a))
+* **resource-catalog:** add filtering by tag ([a490306](https://github.com/access-ci-org/access-ci-ui/commit/a49030618838e17af7e2a310ad65ba1ca4d76e8b))
+* **resource-catalog:** add node details ([8665dd5](https://github.com/access-ci-org/access-ci-ui/commit/8665dd58e316ce68c60dc77509d645f5cf104b52))
+* **resource-catalog:** add queue metrics component ([6f4da60](https://github.com/access-ci-org/access-ci-ui/commit/6f4da60bc6ab16c2358ef108ef62a8654a41706e))
+* **resource-catalog:** add resource group description component ([a006f4e](https://github.com/access-ci-org/access-ci-ui/commit/a006f4ed855a5de42d063f49092aee2cf2eb33d5))
+* **resource-catalog:** add resource groups and tags ([f47a3ba](https://github.com/access-ci-org/access-ci-ui/commit/f47a3ba58054569aab248a80a7f36defd3c73c95))
+* **resource-catalog:** add software list to resource group detail page ([3c639cf](https://github.com/access-ci-org/access-ci-ui/commit/3c639cf26ae8ca5272883590afdfd20e045781c4))
+* **resource-catalog:** add support for custom base URI ([e12d79e](https://github.com/access-ci-org/access-ci-ui/commit/e12d79e9c17a29941e8c702dcbdee5409c00e630))
+* **resource-catalog:** add tags and filtering ([3a9965e](https://github.com/access-ci-org/access-ci-ui/commit/3a9965e4cd035364df58b164b71a04823f069f40))
+* **resource-catalog:** remove resources path element ([aba2256](https://github.com/access-ci-org/access-ci-ui/commit/aba2256a65e3958162d3b3c00b8b0d2edcfa0e2c))
+* **resource-catalog:** render using shadow DOM ([a49d33e](https://github.com/access-ci-org/access-ci-ui/commit/a49d33e80b879a93b98e93086d245a2eded65f19))
+* **resource-catalog:** use group data from the Operations API ([3bc9079](https://github.com/access-ci-org/access-ci-ui/commit/3bc90791395565b6fd3c9311a089d607aa35c454))
+* **resource-group-affinity-group:** add affinity group component ([91570a4](https://github.com/access-ci-org/access-ci-ui/commit/91570a4da805112c96cfacd18c00c7cbfaa9e7ab))
+* **resource-group-affinity-group:** make links active ([bd84903](https://github.com/access-ci-org/access-ci-ui/commit/bd849035d111cec67bdf49f489e9cafec317e1f3))
+* **resource-group-description:** link Get Started button to Allocations site ([9c83113](https://github.com/access-ci-org/access-ci-ui/commit/9c83113f9de93fb1cf7c71112a6f7fdc52bb8410))
+* **resource-group-description:** use CIDeR resource group data ([4bac6f0](https://github.com/access-ci-org/access-ci-ui/commit/4bac6f07ccd45526162273f8345481116223c3be))
+* **resource-group-detail:** move documentation up in order ([f861191](https://github.com/access-ci-org/access-ci-ui/commit/f8611915c10070b099d254e0d2ab6b32bfbc74c3))
+* **resource-group-detail:** use resource data from CIDeR ([096778b](https://github.com/access-ci-org/access-ci-ui/commit/096778b582491e9ec57405ea762b838db27c5a9f))
+* **resource-group-discussion:** add discussion topics component ([4c12099](https://github.com/access-ci-org/access-ci-ui/commit/4c12099d9491b6d836f036401ae855ffc2a4a2f9))
+* **resource-group-discussion:** use data from the Ask.CI API ([1413241](https://github.com/access-ci-org/access-ci-ui/commit/14132410a5cb37a40852591b3f9875b72789d22b))
+* **resource-group-documentation:** add list of documentation links ([c3069b9](https://github.com/access-ci-org/access-ci-ui/commit/c3069b96061c87da40d0658a41f573873e06ca6a))
+* **resource-group-documentation:** get data from Support knowledge base API ([8227e26](https://github.com/access-ci-org/access-ci-ui/commit/8227e2692179184eca8f23f99cff2445b7636c1c))
+* **resource-group-events:** add events and announcements ([c1a32b4](https://github.com/access-ci-org/access-ci-ui/commit/c1a32b443b5f2fdca1a21be5674562395c69936d))
+* **resource-group-events:** filter events to include only future events ([3c34ce1](https://github.com/access-ci-org/access-ci-ui/commit/3c34ce1c676fbf2af9fd8966069ca8359a67a441))
+* **resource-group-events:** get data from affinity group events API ([82e86ce](https://github.com/access-ci-org/access-ci-ui/commit/82e86ce81377e650fff1e864bc447605990626d1))
+* **resource-group-events:** use announcement data from the Operations API ([a351040](https://github.com/access-ci-org/access-ci-ui/commit/a351040b0dba3adc9eebd68091b5fde0b62d0188))
+* **resource-group-hardware:** add OS and batch system to specs table ([199e605](https://github.com/access-ci-org/access-ci-ui/commit/199e60507e39dbe54636a1e99d1886c57f623488))
+* **resource-group-projects:** add charts for project statistics ([28ba672](https://github.com/access-ci-org/access-ci-ui/commit/28ba67242fc0509dde1aa64b60699fdee9d12b58))
+* **resource-group-projects:** replace statistics with recent projects carousel ([2f4cfc6](https://github.com/access-ci-org/access-ci-ui/commit/2f4cfc638299c4ccfa8077356bc152557d6ac267))
+* **resource-group-projects:** use grid with mini bar for displaying projects ([d1b5dd3](https://github.com/access-ci-org/access-ci-ui/commit/d1b5dd3f354b245e8a9e418d83d0d6cbfa482ee1))
+* **resource-group-projects:** use real project statistics ([e69937d](https://github.com/access-ci-org/access-ci-ui/commit/e69937d5b74513a11a1441581a67f6b61c65275f))
+* **resource-group-queue-metrics:** add detail charts ([9295650](https://github.com/access-ci-org/access-ci-ui/commit/9295650ac18b6248b4de16bb0bf1fee820acc89a))
+* **resource-group-queue-metrics:** improve formatting of overview metrics ([ee0986b](https://github.com/access-ci-org/access-ci-ui/commit/ee0986b0ff9f419530e5098bac16a47fc028964d))
+* **resource-group-queue-metrics:** remove CORS proxy ([99a4f6f](https://github.com/access-ci-org/access-ci-ui/commit/99a4f6f96cbe4e2bb7ed1868b402a192208784c6))
+* **resource-group-queue-metrics:** remove CORS proxy ([114912b](https://github.com/access-ci-org/access-ci-ui/commit/114912bf460b9d282ab3c4a569063fdf418b4282))
+* **resource-group-queue-metrics:** support multiple time periods ([b3a4b5f](https://github.com/access-ci-org/access-ci-ui/commit/b3a4b5f20e2e16012916dd10109d6822b7403494))
+* **resource-group-queue-metrics:** use overview data from XDMoD ([ea84e5e](https://github.com/access-ci-org/access-ci-ui/commit/ea84e5e5afc842b5f1122bf4c6ba4b65e17ef8f2))
+* **resource-group-software:** load software data from SDS API ([46fc4f5](https://github.com/access-ci-org/access-ci-ui/commit/46fc4f5fa9e129bf3eb669b6080f83971630fe97))
+* **resource-home:** use resource group data exported from CIDeR ([60f9dd0](https://github.com/access-ci-org/access-ci-ui/commit/60f9dd0e791b48128980973455c45c7db1106397))
+* **resource-news:** add resource headlines to catalog ([d04b882](https://github.com/access-ci-org/access-ci-ui/commit/d04b882f760053a400fc1316cee1c46068210830))
+* **resource-pathways:** add pathways buttons ([35f4b17](https://github.com/access-ci-org/access-ci-ui/commit/35f4b1740497b84e73e54528810f0047a22746dd))
+* **search:** add clear button ([2e8f0e6](https://github.com/access-ci-org/access-ci-ui/commit/2e8f0e6d8e2ec92a6e47827223b324547edaed17))
+* **section-navigation:** add section navigation component ([43204c5](https://github.com/access-ci-org/access-ci-ui/commit/43204c5fc92a178877065d3c7acd962f9c60e38d))
+* **table-of-contents:** add table of contents component ([5be54ed](https://github.com/access-ci-org/access-ci-ui/commit/5be54ed374f61a9bb9628ed5ea7a25e9ef5cdf28))
+* **tags:** prevent long tags from wrapping ([308c265](https://github.com/access-ci-org/access-ci-ui/commit/308c265565dd2484d844efee77e29bac22dc38ab))
+* **tags:** sort tag categories by name ([a442135](https://github.com/access-ci-org/access-ci-ui/commit/a442135a46055defa703e25a65c56d7f85828c21))
+* **utils:** allow useJSON to accept multiple URIs ([f12d16f](https://github.com/access-ci-org/access-ci-ui/commit/f12d16f519a1c38218142fe56e0adc51c55e1bee))
+* **utils:** improve error handling while parsing JSON ([dd0c8ab](https://github.com/access-ci-org/access-ci-ui/commit/dd0c8ab027a3882956a8fadd98a776d961d323dc))
+* **utils:** use organization and feature data from CIDeR ([b51aeac](https://github.com/access-ci-org/access-ci-ui/commit/b51aeac88b50b50f09f7255ddd2014c5f1c3b97f))
+
+
+### Bug Fixes
+
+* **donut-chart:** reset the active index when the items change ([70ec29d](https://github.com/access-ci-org/access-ci-ui/commit/70ec29dc4ed40a064a4e8ea712d18c4b1d0e30a3))
+* **footer:** use lighter color for footer rule ([70a3d81](https://github.com/access-ci-org/access-ci-ui/commit/70a3d81850f3650e46a1521c116563c0debde1d8))
+* **footer:** use NSF acronym in disclaimer text ([f8fb3e8](https://github.com/access-ci-org/access-ci-ui/commit/f8fb3e844a01b1507dd1c867b85b5dbacb76e506))
+* **grid:** remove buggy auto-scroll feature ([1c1be21](https://github.com/access-ci-org/access-ci-ui/commit/1c1be2137c8b2c798b2e19876d70f9ebbaf22acf))
+* **header:** fix side padding on mobile ([83558e4](https://github.com/access-ci-org/access-ci-ui/commit/83558e4a1b91cfcf75be5104108372bf63130a40))
+* **header:** move styles to child element to avoid conflicts ([a5bd218](https://github.com/access-ci-org/access-ci-ui/commit/a5bd218754b0aa773aff88604d3bf2e044be4d70))
+* **header:** set parent element box sizing model ([dd4dd80](https://github.com/access-ci-org/access-ci-ui/commit/dd4dd802fc2124e1712b8503cd1e833cf5297389))
+* **logo:** include images in published bundle ([a8214b3](https://github.com/access-ci-org/access-ci-ui/commit/a8214b301a4c10be404d8fec00243c615886da13))
+* **menu:** fix error for sites without a top-level nav item ([3722bf8](https://github.com/access-ci-org/access-ci-ui/commit/3722bf8acbe5a082c52bdcc5c0c32ae64b11f793))
+* **menu:** rename Acceptable Use menu item ([d8a82bc](https://github.com/access-ci-org/access-ci-ui/commit/d8a82bc087a66a2d925fb77d06b97f8e9b9e75af))
+* **menus:** fix typo in reset password URL ([241c1d0](https://github.com/access-ci-org/access-ci-ui/commit/241c1d0ecdeed5daab6722b94b236ed9beefa622))
+* **menus:** use ACCESS skin for default login link ([762aada](https://github.com/access-ci-org/access-ci-ui/commit/762aadad3fe77e5c9c9127e8b52413165cf4c28f))
+* **resource-catalog:** allow body to be longer than browser height ([2cbfe38](https://github.com/access-ci-org/access-ci-ui/commit/2cbfe382b76c090fe478e32103c895d86f07d713))
+* **resource-catalog:** include icon CSS in parent DOM ([ff3de37](https://github.com/access-ci-org/access-ci-ui/commit/ff3de37d9bd8d494b49888a82879ce16dede4b3c))
+* **resource-filters:** fix vertical alignment of dropdown menu ([aac7aa6](https://github.com/access-ci-org/access-ci-ui/commit/aac7aa61562e8ee77b131cc68b5daf08384c4e9f))
+* **resource-group-affinity-group:** use affinity group URL from API ([30ae827](https://github.com/access-ci-org/access-ci-ui/commit/30ae82743e2e9300f013379009d27dbee6d04600))
+* **resource-group-discussion:** get category ID from affinity group API ([4934a14](https://github.com/access-ci-org/access-ci-ui/commit/4934a14b81b864fa7efb0d6dabd2c5fb8e43555b))
+* **resource-group-discussion:** remove CORS proxy for Ask.CI API ([37620ce](https://github.com/access-ci-org/access-ci-ui/commit/37620ce2a5fe98644929d7e866370493b8d2dde8))
+* **resource-group-software:** fix usage example link and version spacing ([8e34ed6](https://github.com/access-ci-org/access-ci-ui/commit/8e34ed6ed24a10df31fe2c76d3abe78606699a04))
+* **section-navigation:** fix navigation in shadow DOM ([2e5ddcb](https://github.com/access-ci-org/access-ci-ui/commit/2e5ddcbf9a7c81eb7e9be57f32d853d2b7b88687))
+* **section-navigation:** hide for fewer than two sections ([67711a0](https://github.com/access-ci-org/access-ci-ui/commit/67711a0e196b2876a08b8b968542c50ec396b6d6))
+* **section-navigation:** set font size and line height ([5c7ef8a](https://github.com/access-ci-org/access-ci-ui/commit/5c7ef8a340b44b49422216c30cce602d7c3ae13e))
+* **style:** fix mobile style bugs ([66dc1e0](https://github.com/access-ci-org/access-ci-ui/commit/66dc1e0f00eca2566a5b49cc158e0d696857b907))
+* **tags:** sort tags by name ([e25b2bd](https://github.com/access-ci-org/access-ci-ui/commit/e25b2bd5fa810f83fdc77797757b7ed6671f6ef4))
+* update resource providers link ([2403248](https://github.com/access-ci-org/access-ci-ui/commit/24032484fdf8f57f426b0b0fe5c572d016346f6f))
+* use production URLs for Support APIs ([f3c8e4c](https://github.com/access-ci-org/access-ci-ui/commit/f3c8e4ce4adbfd4d3a38992f40b32310d35e797d))
+* **utils:** use favicon URL field from CIDeR ([f82685b](https://github.com/access-ci-org/access-ci-ui/commit/f82685b9aee5d0e79e1796ebb8407a472f9f04d8))
+
+
+### Performance Improvements
+
+* **resource-group-events:** use events API version 1.1 ([a41234c](https://github.com/access-ci-org/access-ci-ui/commit/a41234c53c7de077a77a9afdbf35726815d2ec44))
+* **utils:** optionally cache JSON responses ([ef6c765](https://github.com/access-ci-org/access-ci-ui/commit/ef6c7657fdbf81331e40f8b5618ff989139984e2))
+
+
+### Miscellaneous Chores
+
+* release 0.3.0 ([c23b8a6](https://github.com/access-ci-org/access-ci-ui/commit/c23b8a6a8891227ac2393e6430a74283cbacf529))
+* release 0.3.0-beta1 ([e67a563](https://github.com/access-ci-org/access-ci-ui/commit/e67a563f2e8056feefdfedb3a67fd908d854a887))
+* release 0.3.0-beta2 ([b2f9985](https://github.com/access-ci-org/access-ci-ui/commit/b2f9985db7e2aca9056f3cfd9e195f0d10c62c11))
+* release 0.3.0-beta3 ([88db9a2](https://github.com/access-ci-org/access-ci-ui/commit/88db9a2eff9eb9b22156ffc0aa94332efbabd985))
+* release 0.5.0-beta1 ([2df5c15](https://github.com/access-ci-org/access-ci-ui/commit/2df5c15488013eaf77079c90476b9207b794c439))
+
 ## [0.4.0](https://github.com/access-ci-org/access-ci-ui/compare/v0.3.1...v0.4.0) (2024-10-28)
 
 
diff --git a/package-lock.json b/package-lock.json
index 986768d..9338790 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@access-ci/ui",
-  "version": "0.4.0",
+  "version": "0.5.0-beta1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@access-ci/ui",
-      "version": "0.4.0",
+      "version": "0.5.0-beta1",
       "license": "Apache-2.0",
       "dependencies": {
         "@glidejs/glide": "^3.6.1",
diff --git a/package.json b/package.json
index bbcfd7f..8c90484 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@access-ci/ui",
-  "version": "0.4.0",
+  "version": "0.5.0-beta1",
   "description": "User interface components for ACCESS CI",
   "repository": "github:access-ci-org/access-ci-ui",
   "license": "Apache-2.0",

From 1cc6df03d3b86e310e6b7c81e0e5960104351151 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Wed, 4 Dec 2024 15:18:23 -0500
Subject: [PATCH 100/113] fix(resource-catalog): allow base component props to
 be overriden

---
 src/index.jsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/index.jsx b/src/index.jsx
index 739204a..46fe816 100644
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -74,8 +74,11 @@ const footerMenus = ({ items, target }) =>
 const tableOfContents = ({ headings = [], target }) =>
   renderShadow(<TableOfContents headings={headings} />, target);
 
-const resourceCatalog = ({ target }) =>
-  renderShadow(<ResourceCatalog />, target);
+const resourceCatalog = ({ baseUri, showTitle, target, title }) =>
+  renderShadow(
+    <ResourceCatalog baseUri={baseUri} showTitle={showTitle} title={title} />,
+    target
+  );
 
 export {
   footer,

From 34640abc68c20cb77a14ad7c5b93148ba5d54788 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Fri, 6 Dec 2024 09:55:36 -0500
Subject: [PATCH 101/113] chore: release 0.5.0-beta2

Release-As: 0.5.0-beta2

From dadf3e9d326a381b8c32b9a5ec28b6fefe591900 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 6 Dec 2024 14:56:58 +0000
Subject: [PATCH 102/113] chore(resource-catalog): release 0.5.0-beta2

---
 CHANGELOG.md      | 120 ++++++++++++++++++++++++++++++++++++++++++++++
 package-lock.json |   4 +-
 package.json      |   2 +-
 3 files changed, 123 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe2b2fc..fa6a01d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,126 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [0.5.0-beta2](https://github.com/access-ci-org/access-ci-ui/compare/v0.5.1-beta1...v0.5.0-beta2) (2024-12-06)
+
+
+### Features
+
+* **footer:** add footer components ([1359aaa](https://github.com/access-ci-org/access-ci-ui/commit/1359aaad704e21ad289e4d8ab7e1dbf19c8a83b9))
+* **footer:** add How to Acknowledge ACCESS link ([3aa9801](https://github.com/access-ci-org/access-ci-ui/commit/3aa98015030d2293e8e31c6c9ae1ad4491663fbf))
+* **footer:** add persona links and update style ([deae672](https://github.com/access-ci-org/access-ci-ui/commit/deae672d658248c50079e6e8ed9960a96053ff27))
+* **footer:** add scroll-to-top button ([d84fafb](https://github.com/access-ci-org/access-ci-ui/commit/d84fafbb31259d23ff2d91712c442ce265e6bb7d))
+* **header:** add header and logo components ([8c6695f](https://github.com/access-ci-org/access-ci-ui/commit/8c6695f72bf643d5364ca882f3720c6d6f6816a5))
+* **index:** add warning banner with link to production catalog ([4309bb8](https://github.com/access-ci-org/access-ci-ui/commit/4309bb8491979bf3c96ad2caaa1b0fe3f0f164c1))
+* **logo:** adjust logo to match main ACCESS site ([e9491a9](https://github.com/access-ci-org/access-ci-ui/commit/e9491a99ca090e56ea127cd1310586d3b0b086b6))
+* **menus:** add footer menus ([0000b88](https://github.com/access-ci-org/access-ci-ui/commit/0000b88ef2bef1ff8641c4a2bb4457be5cbaf2d4))
+* **menus:** add universal and site menus ([c58291d](https://github.com/access-ci-org/access-ci-ui/commit/c58291d64f9e6b4f0c953e5e9755d20456c26613))
+* **menus:** highlight current site in universal menus ([a88dd51](https://github.com/access-ci-org/access-ci-ui/commit/a88dd5166157e2ccdad34fbda3008f7580a07d89))
+* **menus:** update search URL in universal nav ([c106f12](https://github.com/access-ci-org/access-ci-ui/commit/c106f1222eb2277cd19b3f75e636a8802772eeba))
+* **menus:** use FontAwesome home icon ([6101066](https://github.com/access-ci-org/access-ci-ui/commit/6101066748681eff99d0248ba15ec9ca549af178))
+* **menu:** update icons and spacing ([274d6db](https://github.com/access-ci-org/access-ci-ui/commit/274d6dbf387e69bfe82cacde4122c3ec98246087))
+* **menu:** update menu items and styles ([5d4ef70](https://github.com/access-ci-org/access-ci-ui/commit/5d4ef70624b2c4213a438d6b107e48b9548846db))
+* **mini-bar:** add mini bar chart component ([c618fcd](https://github.com/access-ci-org/access-ci-ui/commit/c618fcd2a34d168ff8bc83b465a933643a2a794d))
+* **resource-catalog:** add catalog and carousel components ([c0a354b](https://github.com/access-ci-org/access-ci-ui/commit/c0a354bca6772133ce466beaea934bd2f054d309))
+* **resource-catalog:** add filter icon ([b1963ae](https://github.com/access-ci-org/access-ci-ui/commit/b1963ae81f98e3305471d6c3ce71727b8d22a19e))
+* **resource-catalog:** add filter reset button ([db73d79](https://github.com/access-ci-org/access-ci-ui/commit/db73d79f49fa29dcec8e0fe04ddb1da35b76e07a))
+* **resource-catalog:** add filtering by tag ([a490306](https://github.com/access-ci-org/access-ci-ui/commit/a49030618838e17af7e2a310ad65ba1ca4d76e8b))
+* **resource-catalog:** add node details ([8665dd5](https://github.com/access-ci-org/access-ci-ui/commit/8665dd58e316ce68c60dc77509d645f5cf104b52))
+* **resource-catalog:** add queue metrics component ([6f4da60](https://github.com/access-ci-org/access-ci-ui/commit/6f4da60bc6ab16c2358ef108ef62a8654a41706e))
+* **resource-catalog:** add resource group description component ([a006f4e](https://github.com/access-ci-org/access-ci-ui/commit/a006f4ed855a5de42d063f49092aee2cf2eb33d5))
+* **resource-catalog:** add resource groups and tags ([f47a3ba](https://github.com/access-ci-org/access-ci-ui/commit/f47a3ba58054569aab248a80a7f36defd3c73c95))
+* **resource-catalog:** add software list to resource group detail page ([3c639cf](https://github.com/access-ci-org/access-ci-ui/commit/3c639cf26ae8ca5272883590afdfd20e045781c4))
+* **resource-catalog:** add support for custom base URI ([e12d79e](https://github.com/access-ci-org/access-ci-ui/commit/e12d79e9c17a29941e8c702dcbdee5409c00e630))
+* **resource-catalog:** add tags and filtering ([3a9965e](https://github.com/access-ci-org/access-ci-ui/commit/3a9965e4cd035364df58b164b71a04823f069f40))
+* **resource-catalog:** remove resources path element ([aba2256](https://github.com/access-ci-org/access-ci-ui/commit/aba2256a65e3958162d3b3c00b8b0d2edcfa0e2c))
+* **resource-catalog:** render using shadow DOM ([a49d33e](https://github.com/access-ci-org/access-ci-ui/commit/a49d33e80b879a93b98e93086d245a2eded65f19))
+* **resource-catalog:** use group data from the Operations API ([3bc9079](https://github.com/access-ci-org/access-ci-ui/commit/3bc90791395565b6fd3c9311a089d607aa35c454))
+* **resource-group-affinity-group:** add affinity group component ([91570a4](https://github.com/access-ci-org/access-ci-ui/commit/91570a4da805112c96cfacd18c00c7cbfaa9e7ab))
+* **resource-group-affinity-group:** make links active ([bd84903](https://github.com/access-ci-org/access-ci-ui/commit/bd849035d111cec67bdf49f489e9cafec317e1f3))
+* **resource-group-description:** link Get Started button to Allocations site ([9c83113](https://github.com/access-ci-org/access-ci-ui/commit/9c83113f9de93fb1cf7c71112a6f7fdc52bb8410))
+* **resource-group-description:** use CIDeR resource group data ([4bac6f0](https://github.com/access-ci-org/access-ci-ui/commit/4bac6f07ccd45526162273f8345481116223c3be))
+* **resource-group-detail:** move documentation up in order ([f861191](https://github.com/access-ci-org/access-ci-ui/commit/f8611915c10070b099d254e0d2ab6b32bfbc74c3))
+* **resource-group-detail:** use resource data from CIDeR ([096778b](https://github.com/access-ci-org/access-ci-ui/commit/096778b582491e9ec57405ea762b838db27c5a9f))
+* **resource-group-discussion:** add discussion topics component ([4c12099](https://github.com/access-ci-org/access-ci-ui/commit/4c12099d9491b6d836f036401ae855ffc2a4a2f9))
+* **resource-group-discussion:** use data from the Ask.CI API ([1413241](https://github.com/access-ci-org/access-ci-ui/commit/14132410a5cb37a40852591b3f9875b72789d22b))
+* **resource-group-documentation:** add list of documentation links ([c3069b9](https://github.com/access-ci-org/access-ci-ui/commit/c3069b96061c87da40d0658a41f573873e06ca6a))
+* **resource-group-documentation:** get data from Support knowledge base API ([8227e26](https://github.com/access-ci-org/access-ci-ui/commit/8227e2692179184eca8f23f99cff2445b7636c1c))
+* **resource-group-events:** add events and announcements ([c1a32b4](https://github.com/access-ci-org/access-ci-ui/commit/c1a32b443b5f2fdca1a21be5674562395c69936d))
+* **resource-group-events:** filter events to include only future events ([3c34ce1](https://github.com/access-ci-org/access-ci-ui/commit/3c34ce1c676fbf2af9fd8966069ca8359a67a441))
+* **resource-group-events:** get data from affinity group events API ([82e86ce](https://github.com/access-ci-org/access-ci-ui/commit/82e86ce81377e650fff1e864bc447605990626d1))
+* **resource-group-events:** use announcement data from the Operations API ([a351040](https://github.com/access-ci-org/access-ci-ui/commit/a351040b0dba3adc9eebd68091b5fde0b62d0188))
+* **resource-group-hardware:** add OS and batch system to specs table ([199e605](https://github.com/access-ci-org/access-ci-ui/commit/199e60507e39dbe54636a1e99d1886c57f623488))
+* **resource-group-projects:** add charts for project statistics ([28ba672](https://github.com/access-ci-org/access-ci-ui/commit/28ba67242fc0509dde1aa64b60699fdee9d12b58))
+* **resource-group-projects:** replace statistics with recent projects carousel ([2f4cfc6](https://github.com/access-ci-org/access-ci-ui/commit/2f4cfc638299c4ccfa8077356bc152557d6ac267))
+* **resource-group-projects:** use grid with mini bar for displaying projects ([d1b5dd3](https://github.com/access-ci-org/access-ci-ui/commit/d1b5dd3f354b245e8a9e418d83d0d6cbfa482ee1))
+* **resource-group-projects:** use real project statistics ([e69937d](https://github.com/access-ci-org/access-ci-ui/commit/e69937d5b74513a11a1441581a67f6b61c65275f))
+* **resource-group-queue-metrics:** add detail charts ([9295650](https://github.com/access-ci-org/access-ci-ui/commit/9295650ac18b6248b4de16bb0bf1fee820acc89a))
+* **resource-group-queue-metrics:** improve formatting of overview metrics ([ee0986b](https://github.com/access-ci-org/access-ci-ui/commit/ee0986b0ff9f419530e5098bac16a47fc028964d))
+* **resource-group-queue-metrics:** remove CORS proxy ([99a4f6f](https://github.com/access-ci-org/access-ci-ui/commit/99a4f6f96cbe4e2bb7ed1868b402a192208784c6))
+* **resource-group-queue-metrics:** remove CORS proxy ([114912b](https://github.com/access-ci-org/access-ci-ui/commit/114912bf460b9d282ab3c4a569063fdf418b4282))
+* **resource-group-queue-metrics:** support multiple time periods ([b3a4b5f](https://github.com/access-ci-org/access-ci-ui/commit/b3a4b5f20e2e16012916dd10109d6822b7403494))
+* **resource-group-queue-metrics:** use overview data from XDMoD ([ea84e5e](https://github.com/access-ci-org/access-ci-ui/commit/ea84e5e5afc842b5f1122bf4c6ba4b65e17ef8f2))
+* **resource-group-software:** load software data from SDS API ([46fc4f5](https://github.com/access-ci-org/access-ci-ui/commit/46fc4f5fa9e129bf3eb669b6080f83971630fe97))
+* **resource-home:** use resource group data exported from CIDeR ([60f9dd0](https://github.com/access-ci-org/access-ci-ui/commit/60f9dd0e791b48128980973455c45c7db1106397))
+* **resource-news:** add resource headlines to catalog ([d04b882](https://github.com/access-ci-org/access-ci-ui/commit/d04b882f760053a400fc1316cee1c46068210830))
+* **resource-pathways:** add pathways buttons ([35f4b17](https://github.com/access-ci-org/access-ci-ui/commit/35f4b1740497b84e73e54528810f0047a22746dd))
+* **search:** add clear button ([2e8f0e6](https://github.com/access-ci-org/access-ci-ui/commit/2e8f0e6d8e2ec92a6e47827223b324547edaed17))
+* **section-navigation:** add section navigation component ([43204c5](https://github.com/access-ci-org/access-ci-ui/commit/43204c5fc92a178877065d3c7acd962f9c60e38d))
+* **table-of-contents:** add table of contents component ([5be54ed](https://github.com/access-ci-org/access-ci-ui/commit/5be54ed374f61a9bb9628ed5ea7a25e9ef5cdf28))
+* **tags:** prevent long tags from wrapping ([308c265](https://github.com/access-ci-org/access-ci-ui/commit/308c265565dd2484d844efee77e29bac22dc38ab))
+* **tags:** sort tag categories by name ([a442135](https://github.com/access-ci-org/access-ci-ui/commit/a442135a46055defa703e25a65c56d7f85828c21))
+* **utils:** allow useJSON to accept multiple URIs ([f12d16f](https://github.com/access-ci-org/access-ci-ui/commit/f12d16f519a1c38218142fe56e0adc51c55e1bee))
+* **utils:** improve error handling while parsing JSON ([dd0c8ab](https://github.com/access-ci-org/access-ci-ui/commit/dd0c8ab027a3882956a8fadd98a776d961d323dc))
+* **utils:** use organization and feature data from CIDeR ([b51aeac](https://github.com/access-ci-org/access-ci-ui/commit/b51aeac88b50b50f09f7255ddd2014c5f1c3b97f))
+
+
+### Bug Fixes
+
+* **donut-chart:** reset the active index when the items change ([70ec29d](https://github.com/access-ci-org/access-ci-ui/commit/70ec29dc4ed40a064a4e8ea712d18c4b1d0e30a3))
+* **footer:** use lighter color for footer rule ([70a3d81](https://github.com/access-ci-org/access-ci-ui/commit/70a3d81850f3650e46a1521c116563c0debde1d8))
+* **footer:** use NSF acronym in disclaimer text ([f8fb3e8](https://github.com/access-ci-org/access-ci-ui/commit/f8fb3e844a01b1507dd1c867b85b5dbacb76e506))
+* **grid:** remove buggy auto-scroll feature ([1c1be21](https://github.com/access-ci-org/access-ci-ui/commit/1c1be2137c8b2c798b2e19876d70f9ebbaf22acf))
+* **header:** fix side padding on mobile ([83558e4](https://github.com/access-ci-org/access-ci-ui/commit/83558e4a1b91cfcf75be5104108372bf63130a40))
+* **header:** move styles to child element to avoid conflicts ([a5bd218](https://github.com/access-ci-org/access-ci-ui/commit/a5bd218754b0aa773aff88604d3bf2e044be4d70))
+* **header:** set parent element box sizing model ([dd4dd80](https://github.com/access-ci-org/access-ci-ui/commit/dd4dd802fc2124e1712b8503cd1e833cf5297389))
+* **logo:** include images in published bundle ([a8214b3](https://github.com/access-ci-org/access-ci-ui/commit/a8214b301a4c10be404d8fec00243c615886da13))
+* **menu:** fix error for sites without a top-level nav item ([3722bf8](https://github.com/access-ci-org/access-ci-ui/commit/3722bf8acbe5a082c52bdcc5c0c32ae64b11f793))
+* **menu:** rename Acceptable Use menu item ([d8a82bc](https://github.com/access-ci-org/access-ci-ui/commit/d8a82bc087a66a2d925fb77d06b97f8e9b9e75af))
+* **menus:** fix typo in reset password URL ([241c1d0](https://github.com/access-ci-org/access-ci-ui/commit/241c1d0ecdeed5daab6722b94b236ed9beefa622))
+* **menus:** use ACCESS skin for default login link ([762aada](https://github.com/access-ci-org/access-ci-ui/commit/762aadad3fe77e5c9c9127e8b52413165cf4c28f))
+* **resource-catalog:** allow base component props to be overriden ([1cc6df0](https://github.com/access-ci-org/access-ci-ui/commit/1cc6df03d3b86e310e6b7c81e0e5960104351151))
+* **resource-catalog:** allow body to be longer than browser height ([2cbfe38](https://github.com/access-ci-org/access-ci-ui/commit/2cbfe382b76c090fe478e32103c895d86f07d713))
+* **resource-catalog:** include icon CSS in parent DOM ([ff3de37](https://github.com/access-ci-org/access-ci-ui/commit/ff3de37d9bd8d494b49888a82879ce16dede4b3c))
+* **resource-filters:** fix vertical alignment of dropdown menu ([aac7aa6](https://github.com/access-ci-org/access-ci-ui/commit/aac7aa61562e8ee77b131cc68b5daf08384c4e9f))
+* **resource-group-affinity-group:** use affinity group URL from API ([30ae827](https://github.com/access-ci-org/access-ci-ui/commit/30ae82743e2e9300f013379009d27dbee6d04600))
+* **resource-group-discussion:** get category ID from affinity group API ([4934a14](https://github.com/access-ci-org/access-ci-ui/commit/4934a14b81b864fa7efb0d6dabd2c5fb8e43555b))
+* **resource-group-discussion:** remove CORS proxy for Ask.CI API ([37620ce](https://github.com/access-ci-org/access-ci-ui/commit/37620ce2a5fe98644929d7e866370493b8d2dde8))
+* **resource-group-software:** fix usage example link and version spacing ([8e34ed6](https://github.com/access-ci-org/access-ci-ui/commit/8e34ed6ed24a10df31fe2c76d3abe78606699a04))
+* **section-navigation:** fix navigation in shadow DOM ([2e5ddcb](https://github.com/access-ci-org/access-ci-ui/commit/2e5ddcbf9a7c81eb7e9be57f32d853d2b7b88687))
+* **section-navigation:** hide for fewer than two sections ([67711a0](https://github.com/access-ci-org/access-ci-ui/commit/67711a0e196b2876a08b8b968542c50ec396b6d6))
+* **section-navigation:** set font size and line height ([5c7ef8a](https://github.com/access-ci-org/access-ci-ui/commit/5c7ef8a340b44b49422216c30cce602d7c3ae13e))
+* **style:** fix mobile style bugs ([66dc1e0](https://github.com/access-ci-org/access-ci-ui/commit/66dc1e0f00eca2566a5b49cc158e0d696857b907))
+* **tags:** sort tags by name ([e25b2bd](https://github.com/access-ci-org/access-ci-ui/commit/e25b2bd5fa810f83fdc77797757b7ed6671f6ef4))
+* update resource providers link ([2403248](https://github.com/access-ci-org/access-ci-ui/commit/24032484fdf8f57f426b0b0fe5c572d016346f6f))
+* use production URLs for Support APIs ([f3c8e4c](https://github.com/access-ci-org/access-ci-ui/commit/f3c8e4ce4adbfd4d3a38992f40b32310d35e797d))
+* **utils:** use favicon URL field from CIDeR ([f82685b](https://github.com/access-ci-org/access-ci-ui/commit/f82685b9aee5d0e79e1796ebb8407a472f9f04d8))
+
+
+### Performance Improvements
+
+* **resource-group-events:** use events API version 1.1 ([a41234c](https://github.com/access-ci-org/access-ci-ui/commit/a41234c53c7de077a77a9afdbf35726815d2ec44))
+* **utils:** optionally cache JSON responses ([ef6c765](https://github.com/access-ci-org/access-ci-ui/commit/ef6c7657fdbf81331e40f8b5618ff989139984e2))
+
+
+### Miscellaneous Chores
+
+* release 0.3.0 ([c23b8a6](https://github.com/access-ci-org/access-ci-ui/commit/c23b8a6a8891227ac2393e6430a74283cbacf529))
+* release 0.3.0-beta1 ([e67a563](https://github.com/access-ci-org/access-ci-ui/commit/e67a563f2e8056feefdfedb3a67fd908d854a887))
+* release 0.3.0-beta2 ([b2f9985](https://github.com/access-ci-org/access-ci-ui/commit/b2f9985db7e2aca9056f3cfd9e195f0d10c62c11))
+* release 0.3.0-beta3 ([88db9a2](https://github.com/access-ci-org/access-ci-ui/commit/88db9a2eff9eb9b22156ffc0aa94332efbabd985))
+* release 0.5.0-beta1 ([2df5c15](https://github.com/access-ci-org/access-ci-ui/commit/2df5c15488013eaf77079c90476b9207b794c439))
+* release 0.5.0-beta2 ([34640ab](https://github.com/access-ci-org/access-ci-ui/commit/34640abc68c20cb77a14ad7c5b93148ba5d54788))
+
 ## [0.5.0-beta1](https://github.com/access-ci-org/access-ci-ui/compare/v0.5.0-beta1...v0.5.0-beta1) (2024-12-04)
 
 
diff --git a/package-lock.json b/package-lock.json
index 9338790..cefef3d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@access-ci/ui",
-  "version": "0.5.0-beta1",
+  "version": "0.5.0-beta2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@access-ci/ui",
-      "version": "0.5.0-beta1",
+      "version": "0.5.0-beta2",
       "license": "Apache-2.0",
       "dependencies": {
         "@glidejs/glide": "^3.6.1",
diff --git a/package.json b/package.json
index 8c90484..2883155 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@access-ci/ui",
-  "version": "0.5.0-beta1",
+  "version": "0.5.0-beta2",
   "description": "User interface components for ACCESS CI",
   "repository": "github:access-ci-org/access-ci-ui",
   "license": "Apache-2.0",

From a734addf9506f6569b052daae5308e6880c4ba90 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Fri, 6 Dec 2024 15:34:36 -0500
Subject: [PATCH 103/113] feat(resource-group): place learn more link on a new
 line

---
 src/resource-group.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/resource-group.jsx b/src/resource-group.jsx
index 3b4eab7..7f381e3 100644
--- a/src/resource-group.jsx
+++ b/src/resource-group.jsx
@@ -32,7 +32,8 @@ export function ResourceGroup({
           ))}
         </Tags>
         <p>
-          {description && description}{" "}
+          {description && description}
+          <br />
           <a href={detailUri}>Learn more about {name} &raquo;</a>
         </p>
       </div>

From 4150578817c4b52cf72f0dc5750a2855ea89a776 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Mon, 9 Dec 2024 14:05:25 -0500
Subject: [PATCH 104/113] feat(resource-pathways): temporarily replace
 headlines with news link

---
 src/content.css           |  3 +++
 src/resource-home.jsx     |  6 +----
 src/resource-pathways.css |  3 +++
 src/resource-pathways.jsx | 55 ++++++++++++++++++++++++++-------------
 4 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/src/content.css b/src/content.css
index e2129ca..62992dd 100644
--- a/src/content.css
+++ b/src/content.css
@@ -128,3 +128,6 @@ select {
   background-repeat: no-repeat;
   padding: 6px 36px 6px 12px;
 }
+.intro {
+  font-size: 24px;
+}
diff --git a/src/resource-home.jsx b/src/resource-home.jsx
index e138ad4..61f8ca6 100644
--- a/src/resource-home.jsx
+++ b/src/resource-home.jsx
@@ -4,7 +4,6 @@ import { filterResourceGroups, useResourceGroups } from "./utils";
 import { ResourceCategory } from "./resource-category";
 import { ResourceFilters } from "./resource-filters";
 import { ResourcePathways } from "./resource-pathways";
-import { ResourceNews } from "./resource-news";
 
 export default function ResourceHome({ baseUri, title, showTitle }) {
   const [activeTagIds, setActiveTagIds] = useState([]);
@@ -26,10 +25,7 @@ export default function ResourceHome({ baseUri, title, showTitle }) {
   return (
     <>
       {title && <h1 class={showTitle ? "" : "visually-hidden"}>{title}</h1>}
-      <div id="resource-navigation">
-        <ResourcePathways />
-        <ResourceNews />
-      </div>
+      <ResourcePathways />
       <div id="browse-resources">
         {active ? (
           <ResourceFilters
diff --git a/src/resource-pathways.css b/src/resource-pathways.css
index 6ec3728..7c584f4 100644
--- a/src/resource-pathways.css
+++ b/src/resource-pathways.css
@@ -60,6 +60,9 @@ ul.resource-pathways .login .bi {
 .resource-pathway-2 {
   background-color: var(--orange-400);
 }
+.resource-pathway-3 {
+  background-color: var(--teal-200);
+}
 ul.resource-pathways li a:active,
 ul.resource-pathways li a:focus,
 ul.resource-pathways li a:hover {
diff --git a/src/resource-pathways.jsx b/src/resource-pathways.jsx
index 69b9310..46adf9a 100644
--- a/src/resource-pathways.jsx
+++ b/src/resource-pathways.jsx
@@ -1,12 +1,19 @@
+import { useRef } from "preact/hooks";
 import Icon from "./icon";
 
 export function ResourcePathways() {
+  const container = useRef(null);
+
   const pathways = [
     {
       title: "Browse resources",
       icon: "filter-square",
-      href: "#browse-resources",
       description: "Filter resources to find the best match for your research.",
+      onClick: (e) => {
+        e.preventDefault();
+        if (container.current)
+          container.current.nextSibling.scrollIntoView({ bahavior: "smooth" });
+      },
     },
     {
       title: "Ask a question",
@@ -21,26 +28,38 @@ export function ResourcePathways() {
       href: "https://access-ara.ccs.uky.edu:8080/",
       description: "Fill out a form to get resource recommendations.",
     },
+    {
+      title: "Read news",
+      icon: "newspaper",
+      href: "https://access-ci.org/tag/resource-providers/",
+      description: "See the latest news from resource providers.",
+    },
   ];
   return (
-    <section id="resource-pathways">
+    <section id="resource-pathways" ref={container}>
+      <p class="intro">
+        ACCESS provides advanced computing resources <strong>at no cost</strong>{" "}
+        to researchers and educators.
+      </p>
       <ul class="resource-pathways">
-        {pathways.map(({ title, icon, href, description, login }, i) => (
-          <li class={`resource-pathway-${i}`}>
-            <a href={href}>
-              {icon ? <Icon name={icon} /> : null}
-              <span class="detail">
-                <span class="title">{title}</span>
-                <span class="description">{description}</span>
-                {login ? (
-                  <span class="login">
-                    <Icon name="key" /> Requires ACCESS Login
-                  </span>
-                ) : null}
-              </span>
-            </a>
-          </li>
-        ))}
+        {pathways.map(
+          ({ title, icon, href, description, login, onClick }, i) => (
+            <li class={`resource-pathway-${i}`}>
+              <a href={href || "#"} onClick={onClick}>
+                {icon ? <Icon name={icon} /> : null}{" "}
+                <span class="detail">
+                  <span class="title">{title}</span>
+                  <span class="description">{description}</span>
+                  {login ? (
+                    <span class="login">
+                      <Icon name="key" /> Requires ACCESS Login
+                    </span>
+                  ) : null}
+                </span>
+              </a>
+            </li>
+          )
+        )}
       </ul>
     </section>
   );

From 4bbb2159f03418f26d77ccbb65b01fce571005d8 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Thu, 12 Dec 2024 15:54:31 -0500
Subject: [PATCH 105/113] feat(resource-catalog): add support for other-type
 resources

---
 src/icons.jsx                   |  1 +
 src/resource-detail.jsx         |  9 ++++-----
 src/resource-group-hardware.jsx |  7 ++++---
 src/utils.jsx                   | 11 +++++++++--
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/icons.jsx b/src/icons.jsx
index 76b7a15..139b14f 100644
--- a/src/icons.jsx
+++ b/src/icons.jsx
@@ -12,6 +12,7 @@ export const defaultIcons = {
   "Large Memory Nodes": "arrows-fullscreen",
   Preemption: "clock-history",
   "Science Gateway support": "globe",
+  "Service / Other": "stars",
   "Storage Resources": "hdd-fill",
   "Virtual Machines": "pc-display-horizontal",
   Cloud: "cloud",
diff --git a/src/resource-detail.jsx b/src/resource-detail.jsx
index 03e62d3..da37ccb 100644
--- a/src/resource-detail.jsx
+++ b/src/resource-detail.jsx
@@ -1,7 +1,6 @@
-import Accordion from "./accordion";
+import { htmlToJsx } from "./utils";
 
-const toP = (text) =>
-  text ? text.split(/[\n\r]+/g).map((p) => <p>{p}</p>) : null;
+import Accordion from "./accordion";
 
 export default function ResourceDetail({
   resource_descriptive_name,
@@ -12,11 +11,11 @@ export default function ResourceDetail({
   const recommendedUse = (compute || storage || {}).recommended_use;
   return (
     <Accordion title={resource_descriptive_name}>
-      {toP(resource_description)}
+      {resource_description ? htmlToJsx(resource_description) : null}
       {recommendedUse ? (
         <>
           <h3>Recommended Use</h3>
-          {toP(recommendedUse)}
+          {htmlToJsx(recommendedUse)}
         </>
       ) : null}
     </Accordion>
diff --git a/src/resource-group-hardware.jsx b/src/resource-group-hardware.jsx
index 0640241..a9d7ac2 100644
--- a/src/resource-group-hardware.jsx
+++ b/src/resource-group-hardware.jsx
@@ -90,7 +90,8 @@ export default function ResourceGroupHardware({ infoGroupId }) {
   };
 
   const hasComputeGrid = computeColumns.length > 0 && computeRows.length > 0;
-  const resourceTypes = { compute: [], storage: [], other: {} };
+  const resourceTypes = { compute: [], storage: [], other: [] };
+
   for (let { results: res } of resources)
     (resourceTypes[res.cider_type.toLowerCase()] || resourceTypes.other).push(
       <ResourceDetail {...res} />
@@ -119,8 +120,8 @@ export default function ResourceGroupHardware({ infoGroupId }) {
         </Section>
       ) : null}
       {resourceTypes.other.length > 0 ? (
-        <Section title="Specialized Resources" icon="hdd-fill">
-          {resourceTypes.storage}
+        <Section title="Other Resources" icon="stars">
+          {resourceTypes.other}
         </Section>
       ) : null}
     </>
diff --git a/src/utils.jsx b/src/utils.jsx
index 0995d40..c81a010 100644
--- a/src/utils.jsx
+++ b/src/utils.jsx
@@ -132,6 +132,12 @@ export const useResourceGroups = () => {
         resourceGroups: [],
         resourceGroupIds: [],
       },
+      {
+        resourceCategoryId: 2,
+        name: "Program & Other Resources",
+        resourceGroups: [],
+        resourceGroupIds: [],
+      },
     ];
 
     const resourceGroups = active_groups
@@ -154,7 +160,7 @@ export const useResourceGroups = () => {
             tagIds.includes(featureId)
           ),
         ],
-        resourceCategoryId: 1, // TODO: Implement other resource categories.
+        resourceCategoryId: group.rollup_feature_ids.includes(137) ? 2 : 1,
       }))
       .sort((a, b) => a.name.localeCompare(b.name));
 
@@ -309,7 +315,8 @@ export const stripTags = (html) =>
 
 export const htmlToJsx = (html) => {
   const paragraphs = [];
-  for (let pText of html.split("</p>")) {
+  for (let pText of html.split(/(\<\/p\>)|[\n\r]+/g)) {
+    if (!pText) continue;
     const links = Array.from(pText.matchAll(/<a([^>]+)>([^<]+)<\/a>/g));
     const textNodes = pText.split(/<a[^<]+<\/a>/g);
     const paragraph = [];

From c8428d555ef079cfdb2cbad2dcde867f84615a86 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Thu, 12 Dec 2024 16:09:42 -0500
Subject: [PATCH 106/113] feat(resource-group-description): link RP name to RP
 website on resource detail page

---
 src/resource-group-description.jsx | 26 +++++++++++++++-----------
 src/utils.jsx                      | 15 ++++++++-------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/resource-group-description.jsx b/src/resource-group-description.jsx
index 5d3bc50..ea7afe8 100644
--- a/src/resource-group-description.jsx
+++ b/src/resource-group-description.jsx
@@ -4,8 +4,9 @@ import Icon from "./icon";
 
 export default function ResourceGroupDescription({ infoGroupId }) {
   const resourceGroup = useResourceGroup(infoGroupId);
+  console.log(resourceGroup);
   if (!resourceGroup) return;
-  const { name, description, imageUri, tags } = resourceGroup;
+  const { name, description, imageUri, organizations, tags } = resourceGroup;
   return (
     <div class="resource-group-description">
       {imageUri ? (
@@ -13,16 +14,19 @@ export default function ResourceGroupDescription({ infoGroupId }) {
       ) : null}
       <h1>{resourceGroup.name}</h1>
 
-      {tags
-        .filter((tag) => tag.tagCategory.name == "Resource Provider")
-        .map((tag) => (
-          <p>
-            <a href="#">
-              {tag.iconUri ? <Icon alt={tag.name} src={tag.iconUri} /> : null}
-              {tag.name}
-            </a>
-          </p>
-        ))}
+      {organizations.map((org) => (
+        <p>
+          <a href={org.organization_url || "#"}>
+            {org.organization_favicon_url ? (
+              <Icon
+                alt={org.organization_name}
+                src={org.organization_favicon_url}
+              />
+            ) : null}
+            {org.organization_name}
+          </a>
+        </p>
+      ))}
       {description ? <p>{description}</p> : null}
       <a href="https://allocations.access-ci.org" class="btn secondary lg">
         <Icon name="check2-circle" /> Get Started with {name}
diff --git a/src/utils.jsx b/src/utils.jsx
index c81a010..596c68c 100644
--- a/src/utils.jsx
+++ b/src/utils.jsx
@@ -113,13 +113,16 @@ export const useResourceGroups = () => {
         tagCategoryId: feature.feature_category_id,
       }));
 
-    for (let organization of organizations)
+    const organizationsMap = {};
+    for (let organization of organizations) {
       tags.push({
         tagId: organization.organization_id * -1,
         name: organization.organization_name,
         tagCategoryId: -1,
         iconUri: organization.organization_favicon_url || null,
       });
+      organizationsMap[organization.organization_id] = organization;
+    }
 
     tags.sort((a, b) => a.name.localeCompare(b.name));
 
@@ -161,6 +164,10 @@ export const useResourceGroups = () => {
           ),
         ],
         resourceCategoryId: group.rollup_feature_ids.includes(137) ? 2 : 1,
+        accessAllocated: group.rollup_feature_ids.includes(139),
+        organizations: group.rollup_organization_ids
+          .map((orgId) => organizationsMap[orgId])
+          .filter((org) => org),
       }))
       .sort((a, b) => a.name.localeCompare(b.name));
 
@@ -202,12 +209,6 @@ export const useTransform = (
   }, responseArray);
 };
 
-const makeMap = (items, key) => {
-  const map = {};
-  for (let item of items) map[item[key]] = item;
-  return map;
-};
-
 const linkResourceGroups = ({
   resourceCategories,
   resourceGroups,

From 5d072a6455ad34d82213645d42f990dd56848c7f Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Thu, 12 Dec 2024 16:39:39 -0500
Subject: [PATCH 107/113] feat(resource-group-description): show user guide
 button if available

---
 src/resource-group-description.jsx | 46 +++++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/resource-group-description.jsx b/src/resource-group-description.jsx
index ea7afe8..7ee3813 100644
--- a/src/resource-group-description.jsx
+++ b/src/resource-group-description.jsx
@@ -1,12 +1,29 @@
-import { useResourceGroup } from "./utils";
+import { useJSON, useResourceGroup } from "./utils";
 
 import Icon from "./icon";
 
 export default function ResourceGroupDescription({ infoGroupId }) {
   const resourceGroup = useResourceGroup(infoGroupId);
-  console.log(resourceGroup);
+  const firstResource = useJSON(
+    resourceGroup && resourceGroup.infoResourceIds.length
+      ? `https://operations-api.access-ci.org/wh2/cider/v1/info_resourceid/${resourceGroup.infoResourceIds[0]}/?format=json`
+      : null
+  );
+
   if (!resourceGroup) return;
-  const { name, description, imageUri, organizations, tags } = resourceGroup;
+  const { accessAllocated, name, description, imageUri, organizations } =
+    resourceGroup;
+
+  const getStartedUri = accessAllocated
+    ? "https://allocations.access-ci.org/get-your-first-project"
+    : null;
+
+  const userGuideUri =
+    firstResource && firstResource.results
+      ? (firstResource.results.compute || firstResource.results.storage || {})
+          .user_guide_url
+      : null;
+
   return (
     <div class="resource-group-description">
       {imageUri ? (
@@ -28,14 +45,21 @@ export default function ResourceGroupDescription({ infoGroupId }) {
         </p>
       ))}
       {description ? <p>{description}</p> : null}
-      <a href="https://allocations.access-ci.org" class="btn secondary lg">
-        <Icon name="check2-circle" /> Get Started with {name}
-      </a>
-      {/* {userGuideUri ? (
-        <a href={userGuideUri} class="btn lg">
-          <Icon name="book" /> User Guide
-        </a>
-      ) : null} */}
+
+      <div style={{ marginTop: "1rem" }}>
+        {getStartedUri ? (
+          <a href={getStartedUri} class="btn secondary lg">
+            <Icon name="check2-circle" /> Get Started with {name}
+          </a>
+        ) : null}
+        {userGuideUri ? (
+          <a href={userGuideUri} class="btn lg">
+            <Icon name="book" /> User Guide
+          </a>
+        ) : null}
+      </div>
+
+      {/*  */}
     </div>
   );
 }

From 1cc72899109c6db5b39305ec52a2a0b6e1341c9f Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Thu, 12 Dec 2024 16:45:10 -0500
Subject: [PATCH 108/113] fix(info-tip): fix style in shadow DOM

---
 src/info-tip.jsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/info-tip.jsx b/src/info-tip.jsx
index 4e0d9f1..80c8f08 100644
--- a/src/info-tip.jsx
+++ b/src/info-tip.jsx
@@ -11,7 +11,11 @@ export default function InfoTip({
   const trigger = useRef(null);
   useLayoutEffect(() => {
     if (trigger.current)
-      tippy(trigger.current, { content: tooltip, theme: "access" });
+      tippy(trigger.current, {
+        content: tooltip,
+        theme: "access",
+        appendTo: trigger.current.parentElement,
+      });
   }, [trigger.current]);
 
   return (

From 8a56d0c676243196be853f8e61c19f05ce80a566 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Fri, 13 Dec 2024 12:56:18 -0500
Subject: [PATCH 109/113] feat(breadcrumbs): add breadcrumbs component

---
 index.html                    | 25 +--------------
 src/base.css                  |  1 +
 src/breadcrumbs.css           | 59 +++++++++++++++++++++++++++++++++++
 src/breadcrumbs.jsx           | 29 +++++++++++++++++
 src/header.css                |  2 +-
 src/icons/home.svg            |  1 +
 src/index.jsx                 | 13 ++++++++
 src/resource-catalog.css      |  1 +
 src/resource-catalog.jsx      |  7 +++--
 src/resource-group-detail.jsx | 46 +++++++++++++++++++--------
 src/resource-home.jsx         | 15 ++++++++-
 11 files changed, 158 insertions(+), 41 deletions(-)
 create mode 100644 src/breadcrumbs.css
 create mode 100644 src/breadcrumbs.jsx
 create mode 100644 src/icons/home.svg

diff --git a/index.html b/index.html
index 6d20515..c4ec74c 100644
--- a/index.html
+++ b/index.html
@@ -53,26 +53,13 @@
     <script type="module">
       import {
         footer,
-        footerMenus,
         header,
         resourceCatalog,
-        siteMenus,
         tableOfContents,
         universalMenuItems,
         universalMenus,
       } from "/src/index.jsx";
 
-      const siteItems = [
-        {
-          name: "Resources",
-          href: "/access-ci-ui",
-        },
-        {
-          name: "Resource Providers",
-          href: "https://access-ci.org/about/resource-providers/",
-        },
-      ];
-
       universalMenus({
         loginUrl: "/login",
         logoutUrl: "/logout",
@@ -83,21 +70,11 @@
         target: document.getElementById("header"),
       });
 
-      siteMenus({
-        items: siteItems,
-        target: document.getElementById("site-menus"),
-        siteName: "Resources",
-      });
-
       resourceCatalog({
+        baseUri: "/access-ci-ui",
         target: document.getElementById("resource-catalog"),
       });
 
-      footerMenus({
-        items: siteItems,
-        target: document.getElementById("footer-menus"),
-      });
-
       footer({ target: document.getElementById("footer") });
     </script>
   </body>
diff --git a/src/base.css b/src/base.css
index 55bed2a..a109ada 100644
--- a/src/base.css
+++ b/src/base.css
@@ -4,6 +4,7 @@
   --contrast-2: #3f3f3f;
   --contrast-3: #707070;
   --contrast-6: #999999;
+  --contrast-7: #d9d9d9;
   --contrast-8: #dfdfdf;
   --contrast-9: #e5e5e5;
   --green-400: #288654;
diff --git a/src/breadcrumbs.css b/src/breadcrumbs.css
new file mode 100644
index 0000000..be0897f
--- /dev/null
+++ b/src/breadcrumbs.css
@@ -0,0 +1,59 @@
+ul.breadcrumbs {
+  --offset: calc((100vw - var(--width)) / 2);
+  border-bottom: 1px solid var(--contrast-7);
+  box-sizing: border-box;
+  font-size: 14px;
+  font-stretch: 70%;
+  font-weight: 600;
+  line-height: 20px;
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
+  padding-left: 30px;
+  padding-right: 30px;
+  width: 100vw;
+}
+ul.breadcrumbs.top-border {
+  border-top: 1px solid var(--contrast-7);
+}
+ul.breadcrumbs.expand {
+  margin-left: -30px;
+  margin-right: -30px;
+}
+ul.breadcrumbs li {
+  display: inline-block;
+  margin: 0;
+  padding: 11px 0 6px;
+  text-transform: uppercase;
+  vertical-align: middle;
+}
+ul.breadcrumbs li.home {
+  vertical-align: top;
+}
+ul.breadcrumbs li.home img {
+  height: 14px;
+  margin-top: 3px;
+}
+ul.breadcrumbs li:not(.home)::before {
+  content: "/";
+  margin: 0 12px;
+}
+ul.breadcrumbs li a {
+  color: var(--teal-700);
+  text-decoration: none;
+}
+ul.breadcrumbs li:not(.home) a:active,
+ul.breadcrumbs li:not(.home) a:focus,
+ul.breadcrumbs li:not(.home) a:hover {
+  text-decoration: underline;
+}
+@media (min-width: 600px) {
+  ul.breadcrumbs {
+    padding-left: var(--offset);
+    padding-right: var(--offset);
+  }
+  ul.breadcrumbs.expand {
+    margin-left: calc(var(--offset) * -1);
+    margin-right: calc(var(--offset) * -1);
+  }
+}
diff --git a/src/breadcrumbs.jsx b/src/breadcrumbs.jsx
new file mode 100644
index 0000000..6b62b0a
--- /dev/null
+++ b/src/breadcrumbs.jsx
@@ -0,0 +1,29 @@
+import homeIconUrl from "./icons/home.svg";
+
+export default function Breadcrumbs({
+  expandWidth = false,
+  homeTitle = "ACCESS Home",
+  homeUrl = "https://access-ci.org/",
+  items = [],
+  topBorder = false,
+}) {
+  if (!items || !items.length) return;
+  return (
+    <ul
+      class={`breadcrumbs ${expandWidth ? "expand" : ""} ${
+        topBorder ? "top-border" : ""
+      }`}
+    >
+      <li class="home">
+        <a href={homeUrl} title={homeTitle}>
+          <img src={homeIconUrl} alt={homeTitle} />
+        </a>
+      </li>
+      {items.map((item) => (
+        <li class={item.classes || ""}>
+          {item.href ? <a href={item.href}>{item.name}</a> : item.name}
+        </li>
+      ))}
+    </ul>
+  );
+}
diff --git a/src/header.css b/src/header.css
index 8a6c5b5..85f6079 100644
--- a/src/header.css
+++ b/src/header.css
@@ -5,7 +5,7 @@
 }
 @media (min-width: 900px) {
   .container {
-    height: 146px;
+    height: 144px;
     padding-top: 52px;
   }
 }
diff --git a/src/icons/home.svg b/src/icons/home.svg
new file mode 100644
index 0000000..471b473
--- /dev/null
+++ b/src/icons/home.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><!--!Font Awesome Free 6.7.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path fill="#1a5b6e" d="M575.8 255.5c0 18-15 32.1-32 32.1l-32 0 .7 160.2c0 2.7-.2 5.4-.5 8.1l0 16.2c0 22.1-17.9 40-40 40l-16 0c-1.1 0-2.2 0-3.3-.1c-1.4 .1-2.8 .1-4.2 .1L416 512l-24 0c-22.1 0-40-17.9-40-40l0-24 0-64c0-17.7-14.3-32-32-32l-64 0c-17.7 0-32 14.3-32 32l0 64 0 24c0 22.1-17.9 40-40 40l-24 0-31.9 0c-1.5 0-3-.1-4.5-.2c-1.2 .1-2.4 .2-3.6 .2l-16 0c-22.1 0-40-17.9-40-40l0-112c0-.9 0-1.9 .1-2.8l0-69.7-32 0c-18 0-32-14-32-32.1c0-9 3-17 10-24L266.4 8c7-7 15-8 22-8s15 2 21 7L564.8 231.5c8 7 12 15 11 24z"/></svg>
\ No newline at end of file
diff --git a/src/index.jsx b/src/index.jsx
index 46fe816..f49fe64 100644
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -1,3 +1,5 @@
+import Breadcrumbs from "./breadcrumbs";
+import breadcrumbsStyle from "./breadcrumbs.css?inline";
 import { Footer } from "./footer";
 import { Header } from "./header";
 import { FooterMenus, Menus } from "./menu";
@@ -6,6 +8,16 @@ import { ResourceCatalog } from "./resource-catalog";
 import { TableOfContents } from "./table-of-contents";
 import { renderShadow } from "./utils";
 
+const breadcrumbs = (params = {}) => {
+  renderShadow(
+    <>
+      <Breadcrumbs {...params} />
+      <style>{breadcrumbsStyle}</style>
+    </>,
+    params.target
+  );
+};
+
 const footer = (params = {}) => {
   renderShadow(<Footer {...params} />, params.target);
 };
@@ -81,6 +93,7 @@ const resourceCatalog = ({ baseUri, showTitle, target, title }) =>
   );
 
 export {
+  breadcrumbs,
   footer,
   header,
   footerMenus,
diff --git a/src/resource-catalog.css b/src/resource-catalog.css
index 469e66a..1de8079 100644
--- a/src/resource-catalog.css
+++ b/src/resource-catalog.css
@@ -7,6 +7,7 @@
 
 @import url("./accordion.css");
 @import url("./alert.css");
+@import url("./breadcrumbs.css");
 @import url("./carousel.css");
 @import url("./components.css");
 @import url("./donut-chart.css");
diff --git a/src/resource-catalog.jsx b/src/resource-catalog.jsx
index 60266d0..6152eca 100644
--- a/src/resource-catalog.jsx
+++ b/src/resource-catalog.jsx
@@ -7,7 +7,7 @@ const ResourceHome = lazy(() => import("./resource-home.jsx"));
 export function ResourceCatalog({
   title = "Resources",
   showTitle = true,
-  baseUri = "/access-ci-ui",
+  baseUri = "/resources",
 }) {
   return (
     <>
@@ -20,7 +20,10 @@ export function ResourceCatalog({
               title={title}
               showTitle={showTitle}
             />
-            <ResourceGroupDetail path={`${baseUri}/:infoGroupId`} />
+            <ResourceGroupDetail
+              path={`${baseUri}/:infoGroupId`}
+              baseUri={baseUri}
+            />
           </Router>
         </ErrorBoundary>
       </LocationProvider>
diff --git a/src/resource-group-detail.jsx b/src/resource-group-detail.jsx
index 04891ed..bf90884 100644
--- a/src/resource-group-detail.jsx
+++ b/src/resource-group-detail.jsx
@@ -1,3 +1,4 @@
+import Breadcrumbs from "./breadcrumbs";
 import ResourceGroupAffinityGroup from "./resource-group-affinity-group";
 import ResourceGroupDescription from "./resource-group-description";
 import ResourceGroupDiscussion from "./resource-group-discussion";
@@ -8,20 +9,39 @@ import ResourceGroupProjects from "./resource-group-projects";
 import ResourceGroupQueueMetrics from "./resource-group-queue-metrics";
 import ResourceGroupSoftware from "./resource-group-software";
 import SectionNavigation from "./section-navigation";
+import { useResourceGroup } from "./utils";
+
+export default function ResourceGroupDetail({
+  baseUri,
+  infoGroupId,
+  showBreadcrumbs = true,
+}) {
+  const resourceGroup = useResourceGroup(infoGroupId);
+
+  const breadcrumbItems = [{ name: "Resources", href: baseUri }];
+  if (resourceGroup) breadcrumbItems.push({ name: resourceGroup.name });
 
-export default function ResourceGroupDetail({ infoGroupId }) {
   return (
-    <div class="resource-group-detail">
-      <ResourceGroupDescription infoGroupId={infoGroupId} />
-      <SectionNavigation />
-      <ResourceGroupHardware infoGroupId={infoGroupId} />
-      <ResourceGroupDocumentation infoGroupId={infoGroupId} />
-      <ResourceGroupEvents infoGroupId={infoGroupId} />
-      <ResourceGroupAffinityGroup infoGroupId={infoGroupId} />
-      <ResourceGroupSoftware infoGroupId={infoGroupId} />
-      <ResourceGroupProjects infoGroupId={infoGroupId} />
-      <ResourceGroupQueueMetrics infoGroupId={infoGroupId} />
-      <ResourceGroupDiscussion infoGroupId={infoGroupId} />
-    </div>
+    <>
+      {showBreadcrumbs && (
+        <Breadcrumbs
+          expandWidth={true}
+          items={breadcrumbItems}
+          topBorder={true}
+        />
+      )}
+      <div class="resource-group-detail">
+        <ResourceGroupDescription infoGroupId={infoGroupId} />
+        <SectionNavigation />
+        <ResourceGroupHardware infoGroupId={infoGroupId} />
+        <ResourceGroupDocumentation infoGroupId={infoGroupId} />
+        <ResourceGroupEvents infoGroupId={infoGroupId} />
+        <ResourceGroupAffinityGroup infoGroupId={infoGroupId} />
+        <ResourceGroupSoftware infoGroupId={infoGroupId} />
+        <ResourceGroupProjects infoGroupId={infoGroupId} />
+        <ResourceGroupQueueMetrics infoGroupId={infoGroupId} />
+        <ResourceGroupDiscussion infoGroupId={infoGroupId} />
+      </div>
+    </>
   );
 }
diff --git a/src/resource-home.jsx b/src/resource-home.jsx
index 61f8ca6..4fb6b6d 100644
--- a/src/resource-home.jsx
+++ b/src/resource-home.jsx
@@ -1,11 +1,17 @@
 import { useMemo, useState } from "preact/hooks";
 import { filterResourceGroups, useResourceGroups } from "./utils";
 
+import Breadcrumbs from "./breadcrumbs";
 import { ResourceCategory } from "./resource-category";
 import { ResourceFilters } from "./resource-filters";
 import { ResourcePathways } from "./resource-pathways";
 
-export default function ResourceHome({ baseUri, title, showTitle }) {
+export default function ResourceHome({
+  baseUri,
+  title,
+  showBreadcrumbs = true,
+  showTitle = true,
+}) {
   const [activeTagIds, setActiveTagIds] = useState([]);
   const groups = useResourceGroups();
   const active = useMemo(
@@ -24,6 +30,13 @@ export default function ResourceHome({ baseUri, title, showTitle }) {
 
   return (
     <>
+      {showBreadcrumbs && (
+        <Breadcrumbs
+          expandWidth={true}
+          items={[{ name: "Resources" }]}
+          topBorder={true}
+        />
+      )}
       {title && <h1 class={showTitle ? "" : "visually-hidden"}>{title}</h1>}
       <ResourcePathways />
       <div id="browse-resources">

From 0e2b0502241edddc85c3aaceaaa50fc754fbd8d5 Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Fri, 13 Dec 2024 13:14:42 -0500
Subject: [PATCH 110/113] perf(utils): avoid fetching the same URL multiple
 times

---
 src/utils.jsx | 54 +++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/utils.jsx b/src/utils.jsx
index 596c68c..ca35f07 100644
--- a/src/utils.jsx
+++ b/src/utils.jsx
@@ -23,7 +23,32 @@ export const getScrollTop = () =>
     : (document.documentElement || document.body.parentNode || document.body)
         .scrollTop;
 
-const jsonCache = {};
+const fetchJsonDataCache = {};
+const fetchJsonPromiseCache = {};
+const fetchJson = (
+  uri,
+  { cache = true, corsProxy = false } = { cache: true, corsProxy: false }
+) => {
+  if (cache && uri in fetchJsonDataCache) return fetchJsonDataCache[uri];
+  if (uri in fetchJsonPromiseCache) return fetchJsonPromiseCache[uri];
+  const promise = fetch(
+    corsProxy ? `https://corsproxy.io/?${encodeURIComponent(uri)}` : uri
+  ).then((response) => {
+    delete fetchJsonPromiseCache[uri];
+    if (response.status < 200 || response.status > 299) {
+      return { error: { status: response.status } };
+    } else {
+      try {
+        return response.json();
+      } catch (error) {
+        return { error: { message: error } };
+      }
+    }
+  });
+  fetchJsonPromiseCache[uri] = promise;
+  return promise;
+};
+
 export const useJSON = (
   uris,
   { cache = true, corsProxy = false, defaultValue = null } = {
@@ -40,37 +65,12 @@ export const useJSON = (
   }
   useEffect(() => {
     if (uris.length) {
-      const cacheKey = uris.join(" ");
-      if (cache && jsonCache[cacheKey]) {
-        setValue(jsonCache[cacheKey]);
-        return;
-      }
       (async () => {
-        const responses = await Promise.all(
-          uris.map((uri) =>
-            fetch(
-              corsProxy
-                ? `https://corsproxy.io/?${encodeURIComponent(uri)}`
-                : uri
-            )
-          )
-        );
         const json = await Promise.all(
-          responses.map((response) => {
-            if (response.status < 200 || response.status > 299) {
-              return { error: { status: response.status } };
-            } else {
-              try {
-                return response.json();
-              } catch (error) {
-                return { error: { message: error } };
-              }
-            }
-          })
+          uris.map((uri) => fetchJson(uri, { cache, corsProxy }))
         );
         const result = single ? json[0] : json;
         setValue(result);
-        if (cache) jsonCache[cacheKey] = result;
       })();
     }
   }, [...uris]);

From a4b36d2214aae7eaae70d9ede9002de6ecd2116d Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Fri, 13 Dec 2024 14:22:56 -0500
Subject: [PATCH 111/113] chore: release 0.5.0-beta3

Release-As: 0.5.0-beta3

From f377b7debfae12b99bd2ffa81b8bac141324e17d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 13 Dec 2024 19:23:17 +0000
Subject: [PATCH 112/113] chore(resource-catalog): release 0.5.0-beta3

---
 CHANGELOG.md      | 27 +++++++++++++++++++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa6a01d..ba394eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,33 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [0.5.0-beta3](https://github.com/access-ci-org/access-ci-ui/compare/v0.5.0-beta2...v0.5.0-beta3) (2024-12-13)
+
+
+### Features
+
+* **breadcrumbs:** add breadcrumbs component ([8a56d0c](https://github.com/access-ci-org/access-ci-ui/commit/8a56d0c676243196be853f8e61c19f05ce80a566))
+* **resource-catalog:** add support for other-type resources ([4bbb215](https://github.com/access-ci-org/access-ci-ui/commit/4bbb2159f03418f26d77ccbb65b01fce571005d8))
+* **resource-group-description:** link RP name to RP website on resource detail page ([c8428d5](https://github.com/access-ci-org/access-ci-ui/commit/c8428d555ef079cfdb2cbad2dcde867f84615a86))
+* **resource-group-description:** show user guide button if available ([5d072a6](https://github.com/access-ci-org/access-ci-ui/commit/5d072a6455ad34d82213645d42f990dd56848c7f))
+* **resource-group:** place learn more link on a new line ([a734add](https://github.com/access-ci-org/access-ci-ui/commit/a734addf9506f6569b052daae5308e6880c4ba90))
+* **resource-pathways:** temporarily replace headlines with news link ([4150578](https://github.com/access-ci-org/access-ci-ui/commit/4150578817c4b52cf72f0dc5750a2855ea89a776))
+
+
+### Bug Fixes
+
+* **info-tip:** fix style in shadow DOM ([1cc7289](https://github.com/access-ci-org/access-ci-ui/commit/1cc72899109c6db5b39305ec52a2a0b6e1341c9f))
+
+
+### Performance Improvements
+
+* **utils:** avoid fetching the same URL multiple times ([0e2b050](https://github.com/access-ci-org/access-ci-ui/commit/0e2b0502241edddc85c3aaceaaa50fc754fbd8d5))
+
+
+### Miscellaneous Chores
+
+* release 0.5.0-beta3 ([a4b36d2](https://github.com/access-ci-org/access-ci-ui/commit/a4b36d2214aae7eaae70d9ede9002de6ecd2116d))
+
 ## [0.5.0-beta2](https://github.com/access-ci-org/access-ci-ui/compare/v0.5.1-beta1...v0.5.0-beta2) (2024-12-06)
 
 
diff --git a/package-lock.json b/package-lock.json
index cefef3d..2fa2254 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@access-ci/ui",
-  "version": "0.5.0-beta2",
+  "version": "0.5.0-beta3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@access-ci/ui",
-      "version": "0.5.0-beta2",
+      "version": "0.5.0-beta3",
       "license": "Apache-2.0",
       "dependencies": {
         "@glidejs/glide": "^3.6.1",
diff --git a/package.json b/package.json
index 2883155..133bbdf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@access-ci/ui",
-  "version": "0.5.0-beta2",
+  "version": "0.5.0-beta3",
   "description": "User interface components for ACCESS CI",
   "repository": "github:access-ci-org/access-ci-ui",
   "license": "Apache-2.0",

From 530c2562b6aef9d17cd665477b3ded2f29b8193b Mon Sep 17 00:00:00 2001
From: Matt Yoder <mjyoder@psc.edu>
Date: Mon, 16 Dec 2024 08:22:26 -0500
Subject: [PATCH 113/113] docs: list breadcrumbs and resource catalog

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 892a34a..3b0b79e 100644
--- a/README.md
+++ b/README.md
@@ -24,9 +24,11 @@ The library includes functions for rendering common ACCESS user interface compon
 - `universalMenus`: Universal navigation menus
 - `header`: Logo header
 - `siteMenus`: Site-specific navigation menus
+- `breadcrumbs`: Breadcrumb navigation
 - `tableOfContents`: Page table of contents
 - `footerMenus`: Site-specific navigation menus above the footer
 - `footer`: Universal footer
+- `resourceCatalog`: ACCESS resource catalog
 
 ## Example