Merge pull request #19117 from GordonSmith/HPCC-32663-TYPESCRIPT_ERROR

HPCC-32663 New TypeScript Error
hpcc-systems · Sep 13, 2024 · ecd5977 · ecd5977
2 parents 9d56cf8 + 46540e5
commit ecd5977
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/esp/src/src-react/hooks/platform.ts b/esp/src/src-react/hooks/platform.ts
@@ -137,8 +137,14 @@ export function useCheckFeatures(): Features {
         timestamp
     };
 }
-
-const fetchReleases = () => {
+interface OctokitRelease {
+    id: number;
+    draft: boolean;
+    prerelease: boolean;
+    tag_name: string;
+    html_url: string;
+}
+const fetchReleases = (): Promise<{ data: OctokitRelease[] }> => {
     const octokit = new Octokit({});
     return octokit.request("GET /repos/{owner}/{repo}/releases", {
         owner: "hpcc-systems",
@@ -149,16 +155,12 @@ const fetchReleases = () => {
         }
     });
 };
-type ReleasesPromise = ReturnType<typeof fetchReleases>;
-type ReleasesResponse = Awaited<ReleasesPromise>;
-type Releases = ReleasesResponse["data"];
-type Release = Releases[number];
 
-const _fetchLatestReleases = (): Promise<Releases> => {
+const _fetchLatestReleases = (): Promise<OctokitRelease[]> => {
     return fetchReleases().then(response => {
-        const latest: { [id: string]: Release } = response.data
+        const latest: { [releaseID: string]: OctokitRelease } = response.data
             .filter(release => !release.draft || !release.prerelease)
-            .reduce((prev, curr: Release) => {
+            .reduce((prev, curr: OctokitRelease) => {
                 const versionParts = curr.tag_name.split(".");
                 versionParts.length = 2;
                 const partialVersion = versionParts.join(".");
@@ -167,14 +169,14 @@ const _fetchLatestReleases = (): Promise<Releases> => {
                 }
                 return prev;
             }, {});
-        return Object.values(latest) as Releases;
+        return Object.values(latest);
     }).catch(err => {
         logger.error(err);
-        return [] as Releases;
+        return [];
     });
 };
-let releasesPromise: Promise<Releases> | undefined;
-export const fetchLatestReleases = (): Promise<Releases> => {
+let releasesPromise: Promise<any> | undefined;
+export const fetchLatestReleases = (): Promise<OctokitRelease[]> => {
     if (!releasesPromise) {
         releasesPromise = _fetchLatestReleases();
     }