@unitedstatespowersquadrons/components 1.3.7 → 1.3.9-1

package/Badges/{Suite.tsx → Checks/Check.tsx}

@@ -1,19 +1,18 @@
 import React from "react";
-import { github, shields } from "./remotes";
-import { badgeify } from "./helpers";
-import { CheckSuite } from "./types";
+import { github, shields } from "../remotes";
+import { badgeify } from "../helpers";
+import { CheckConclusion, CheckStatus } from "../types";
 
 interface Props {
-  suite?: CheckSuite;
-  repo?: string;
+  repo?: string | undefined;
+  label: string;
+  status: CheckStatus;
+  conclusion?: CheckConclusion | undefined;
+  skipCi?: boolean;
 }
 
-const SuiteBadge = (props: Props) => {
-  const { suite, repo } = props;
-
-  if (!suite || !suite.status) return null;
-
-  const { headBranch, conclusion, skipCi, status } = suite;
+const CheckBadge = (props: Props) => {
+  const { conclusion, label, repo, skipCi, status } = props;
 
   const suiteBadgeColor = () => {
     if (skipCi) return "lightgray";
@@ -67,11 +66,11 @@ const SuiteBadge = (props: Props) => {
   const color = suiteBadgeColor();
 
   const img =
-    <img src={`${shields}/badge/${badgeify(headBranch)}-${description() || "Unknown"}-${color}?logo=github`} />;
+    <img src={`${shields}/badge/${badgeify(label)}-${description() || "Unknown"}-${color}?logo=github`} />;
 
   if (!repo || conclusion === "success") return img;
 
   return <a href={`${github}/${repo}/actions/workflows/main.yml`} rel="noreferrer" target="_blank">{img}</a>;
 };
 
-export default SuiteBadge;
+export default CheckBadge;

package/Badges/Checks/Run.tsx

@@ -0,0 +1,22 @@
+import React from "react";
+import Check from "./Check";
+import { CheckRun } from "../types";
+
+interface Props {
+  run?: CheckRun;
+  repo?: string;
+}
+
+const RunBadge = (props: Props) => {
+  const { repo, run } = props;
+
+  if (!run || !run.status) return null;
+
+  const { conclusion, name, status } = run;
+
+  const skipCi = false;
+
+  return <Check conclusion={conclusion} label={name} repo={repo} skipCi={skipCi} status={status} />;
+};
+
+export default RunBadge;

package/Badges/Checks/Suite.tsx

@@ -0,0 +1,20 @@
+import React from "react";
+import Check from "./Check";
+import { CheckSuite } from "../types";
+
+interface Props {
+  suite?: CheckSuite;
+  repo?: string;
+}
+
+const SuiteBadge = (props: Props) => {
+  const { suite, repo } = props;
+
+  if (!suite || !suite.status) return null;
+
+  const { headBranch, conclusion, skipCi, status } = suite;
+
+  return <Check conclusion={conclusion} label={headBranch} repo={repo} skipCi={skipCi} status={status} />;
+};
+
+export default SuiteBadge;

package/Badges/Checks/index.ts

@@ -0,0 +1,13 @@
+import Check from "./Check";
+import Run from "./Run";
+import Suite from "./Suite";
+
+export { default as CheckBadge } from "./Check";
+export { default as CheckRunBadge } from "./Run";
+export { default as CheckSuiteBadge } from "./Suite";
+
+export default {
+  Check,
+  Run,
+  Suite,
+};

package/Badges/index.ts

@@ -1,5 +1,6 @@
 import Badge from "./Badge";
 import Branch from "./Branch";
+import Checks, { CheckBadge, CheckRunBadge, CheckSuiteBadge } from "./Checks";
 import Commit from "./Commit";
 import Date, { dateBadgeColor } from "./Date";
 import Dependency from "./Dependency";
@@ -9,11 +10,11 @@ import Npm from "./Npm";
 import PhpLibrary from "./PhpLibrary";
 import Reachable from "./Reachable";
 import Repo from "./Repo";
-import Suite from "./Suite";
 import Tag from "./Tag";
 
 export { default as Badge } from "./Badge";
 export { default as BranchBadge } from "./Branch";
+export { default as Checks } from "./Checks";
 export { default as CommitBadge } from "./Commit";
 export { default as DateBadge, dateBadgeColor } from "./Date";
 export { default as DependencyBadge } from "./Dependency";
@@ -23,7 +24,6 @@ export { default as NpmBadge } from "./Npm";
 export { default as PhpLibraryBadge } from "./PhpLibrary";
 export { default as ReachableBadge } from "./Reachable";
 export { default as RepoBadge } from "./Repo";
-export { default as SuiteBadge } from "./Suite";
 export { default as TagBadge } from "./Tag";
 
 export type { CheckSuite, ReachableStatus } from "./types";
@@ -31,6 +31,10 @@ export type { CheckSuite, ReachableStatus } from "./types";
 export default {
   Badge,
   Branch,
+  CheckBadge,
+  CheckRunBadge,
+  CheckSuiteBadge,
+  Checks,
   Commit,
   Date,
   Dependency,
@@ -40,7 +44,6 @@ export default {
   PhpLibrary,
   Reachable,
   Repo,
-  Suite,
   Tag,
   dateBadgeColor,
 };

package/Badges/types.ts

@@ -1,4 +1,4 @@
-type CheckStatus =
+export type CheckStatus =
   | "queued"
   | "in_progress"
   | "requested"
@@ -6,7 +6,7 @@ type CheckStatus =
   | "pending"
   | "completed";
 
-type CheckConclusion =
+export type CheckConclusion =
   | "success"
   | "failure"
   | "neutral"
@@ -23,6 +23,7 @@ export interface CheckSuite {
   conclusion?: CheckConclusion;
   updatedAt?: string;
   skipCi: boolean;
+  checkRuns?: CheckRun[];
 }
 
 export interface CheckRun {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unitedstatespowersquadrons/components",
-  "version": "1.3.7",
+  "version": "1.3.9-1",
   "description": "USPS shared React components library",
   "main": "index.tsx",
   "scripts": {