feat(resource-group-events): use announcement data from the Operation…

…s API
access-ci-org · Oct 28, 2024 · a351040 · a351040
1 parent ef6c765
commit a351040
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 39 deletions.
diff --git a/src/resource-group-events.jsx b/src/resource-group-events.jsx
@@ -1,37 +1,52 @@
-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(
     `https://support.access-ci.org/api/1.1/events/ag/${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
@@ -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
@@ -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) => {