add actions for builder and packages pages as well

Athena-OS · Dec 5, 2024 · ec9afbc · ec9afbc
1 parent faad035
commit ec9afbc
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 35 deletions.
diff --git a/src/actions/index.ts b/src/actions/index.ts
@@ -2,18 +2,16 @@ import { defineAction } from "astro:actions";
 import { z } from "astro:schema";
 
 let bearerToken = import.meta.env.STRAPI_WRITE_TOKEN;
+let strapiURL = import.meta.env.STRAPI_URL;
 
 const getDownloadCounts = async () => {
   try {
-    const response = await fetch(
-      `https://cms.athenaos.org/api/download-counts-list`,
-      {
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: `Bearer ${bearerToken}`,
-        },
-      }
-    );
+    const response = await fetch(`${strapiURL}/api/download-counts-list`, {
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${bearerToken}`,
+      },
+    });
     const result = await response.json();
     return result;
   } catch (error) {
@@ -34,7 +32,7 @@ const increaseDownloadCount = async (id: string) => {
     let countId = data.find((item) => item.download_type === id)?.id;
 
     const response = await fetch(
-      `https://cms.athenaos.org/api/download-count/${countId}/increment`,
+      `${strapiURL}/api/download-count/${countId}/increment`,
       {
         method: "POST",
         headers: {
@@ -50,7 +48,36 @@ const increaseDownloadCount = async (id: string) => {
   }
 };
 
+async function getBuilderData(input: any) {
+  const response = await fetch(
+    `${strapiURL}/api/builders?sort[1]=package_name:asc${input.searchString}${input.paginationString}${input.filterString}`,
+    {
+      headers: {
+        Authorization: `Bearer ${bearerToken}`,
+        "Content-Type": "application/json",
+      },
+    }
+  );
+
+  return await response.json();
+}
+
+async function getPackagesData(input: any) {
+  const response = await fetch(
+    `${strapiURL}/api/packages?sort[1]=package_name:asc${input.paginationString}${input.categoryString}${input.searchString}`,
+    {
+      headers: {
+        Authorization: `Bearer ${bearerToken}`,
+        "Content-Type": "application/json",
+      },
+    }
+  );
+
+  return await response.json();
+}
+
 export const server = {
+  // download counts
   getDownloadCount: defineAction({
     handler: async () => {
       return await getDownloadCounts();
@@ -64,4 +91,28 @@ export const server = {
       return await increaseDownloadCount(input.id);
     },
   }),
+
+  // builder
+  getBuilderData: defineAction({
+    input: z.object({
+      searchString: z.string(),
+      paginationString: z.string(),
+      filterString: z.string(),
+    }),
+    handler: async (input) => {
+      return await getBuilderData(input);
+    },
+  }),
+
+  // packages
+  getPackagesData: defineAction({
+    input: z.object({
+      paginationString: z.string(),
+      searchString: z.string(),
+      categoryString: z.string(),
+    }),
+    handler: async (input) => {
+      return await getPackagesData(input);
+    },
+  }),
 };
diff --git a/src/components/builder-table.astro b/src/components/builder-table.astro
@@ -74,8 +74,6 @@ let architectures = ["x86_64", "i686", "ARMv6h", "ARMv7h", "AArch64"];
 let statuses;
 if (builderData)
   statuses = architectures.map((str) => ({ [str]: getUniqueValues(str) }));
-
-let logURL = "https://logs.athenaos.org/";
 ---
 
 <SearchPackages placeholder="Search Builder" />
@@ -139,7 +137,11 @@ let logURL = "https://logs.athenaos.org/";
   </div>
 </div>
 
-<script define:vars={{ strapiURL, bearerToken, logURL, architectures }}>
+<script>
+  import { actions } from "astro:actions";
+
+  let logURL = "https://logs.athenaos.org/";
+  let architectures = ["x86_64", "i686", "ARMv6h", "ARMv7h", "AArch64"];
   const dataRows = document.getElementById("dataRows");
   const sentinel = document.getElementById("sentinel");
   let currentPage = 1;
@@ -170,17 +172,16 @@ let logURL = "https://logs.athenaos.org/";
         ? `&filters[status_${filterInput.platformName}][$eq]=${filterInput.value}`
         : "";
 
-    const response = await fetch(
-      `${strapiURL}/api/builders?sort[1]=package_name:asc${searchString}${paginationString}${filterString}`,
-      {
-        headers: {
-          Authorization: `Bearer ${bearerToken}`,
-          "Content-Type": "application/json",
-        },
-      }
-    );
     try {
-      const apiResponse = await response.json();
+      let response = await actions.getBuilderData({
+        searchString,
+        paginationString,
+        filterString,
+      });
+
+      let apiResponse = await response.data;
+      let error = await response.error;
+
       newRemoveLoadingSpinners();
 
       if (apiResponse.data.length === 0) {
@@ -214,7 +215,7 @@ let logURL = "https://logs.athenaos.org/";
       renderTable(builderData);
       currentPage++;
     } catch (e) {
-      showErrorMessage();
+      howErrorMessage();
       console.log(e);
     } finally {
       loading = false;

diff --git a/src/components/package-table.astro b/src/components/package-table.astro
@@ -108,7 +108,9 @@ let categoriesUnique: string[] = [...new Set(categoriesList.sort())];
   </div>
 </div>
 
-<script define:vars={{ strapiURL, bearerToken }}>
+<script>
+  import { actions } from "astro:actions";
+
   let currentPage = 1;
   let pageSize = 100;
   let categoryInput = null;
@@ -135,17 +137,13 @@ let categoriesUnique: string[] = [...new Set(categoriesList.sort())];
       : `&pagination[page]=1&pagination[pageSize]=${pageSize}`;
 
     try {
-      const response = await fetch(
-        `${strapiURL}/api/packages?sort[1]=package_name:asc${paginationString}${categoryString}${searchString}`,
-        {
-          headers: {
-            Authorization: `Bearer ${bearerToken}`,
-            "Content-Type": "application/json",
-          },
-        }
-      );
+      let response = await actions.getPackagesData({
+        searchString,
+        paginationString,
+        categoryString,
+      });
 
-      const apiResponse = await response.json();
+      const apiResponse = await response.data;
       newRemoveLoadingSpinners();
 
       if (apiResponse.data.length === 0) {