fix: the internal server on load more and implement archive filter in…

… query (#266)
EddieHubCommunity · Jan 12, 2023 · 48529ee · 48529ee
1 parent 79f86e6
commit 48529ee
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 12 deletions.
diff --git a/src/global.d.ts b/src/global.d.ts
@@ -9,7 +9,6 @@ export declare type Repository = {
   name: string;
   url: string;
   owner: Owner;
-  isArchived: boolean;
   primaryLanguage: PrimaryLanguage;
   codeOfConduct: CodeOfConduct;
   licenseInfo: LicenseInfo;

diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
@@ -11,8 +11,9 @@
   import { goto } from '$app/navigation';
   export let data: { data: SearchResponse; checked: boolean };
 
-  const globalQuery = 'is:open label:"EddieHub:good-first-issue" no:assignee';
-  const orgQuery = 'is:open label:"good first issue" org:EddieHubCommunity no:assignee';
+  const globalQuery = 'is:open archived:false label:"EddieHub:good-first-issue" no:assignee';
+  const orgQuery =
+    'is:open archived:false label:"good first issue" org:EddieHubCommunity no:assignee';
 
   let { checked } = data;
   let loadDisabled = false;

diff --git a/src/routes/+page.ts b/src/routes/+page.ts
@@ -7,8 +7,9 @@ export const load: Load = async ({ fetch, url, parent }) => {
     throw redirect(307, '/login');
   }
   let globalParam = false;
-  const globalQuery = 'is:open label:"EddieHub:good-first-issue" no:assignee';
-  const orgQuery = 'is:open label:"good first issue" org:EddieHubCommunity no:assignee';
+  const globalQuery = 'is:open archived:false label:"EddieHub:good-first-issue" no:assignee';
+  const orgQuery =
+    'is:open archived:false label:"good first issue" org:EddieHubCommunity no:assignee';
 
   try {
     globalParam = JSON.parse(url.searchParams.get('global') as string);

diff --git a/src/routes/api/get-issues/+server.ts b/src/routes/api/get-issues/+server.ts
@@ -18,7 +18,7 @@ export const POST: RequestHandler = async ({ request }) => {
   const body = (await request.json()) as { query: string; after?: string };
 
   const octokit = new Octokit({ auth: token });
-  let { search }: Response = await octokit.graphql(
+  const { search }: Response = await octokit.graphql(
     `query EddieHubIssues($queryString: String!, $skip: Int!, $after: String) {
   search(first: $skip, query: $queryString, type: ISSUE, after: $after) {
     issueCount
@@ -43,7 +43,6 @@ export const POST: RequestHandler = async ({ request }) => {
           repository {
             name
             url
-            isArchived
             primaryLanguage {
               color
               name
@@ -74,10 +73,6 @@ export const POST: RequestHandler = async ({ request }) => {
       after: body.after,
     },
   );
-
-  // filter out archived (read-only) repositories
-  search = { ...search, edges: search.edges.filter((edge) => !edge.node.repository.isArchived) };
-
   const labels = search.edges.map((el) => el.node.labels.edges.map((label) => label.node.name));
   const merged = labels.reduce((acc, val) => {
     return acc.concat(val);

diff --git a/src/stories/issue-card.story.svelte b/src/stories/issue-card.story.svelte
@@ -53,7 +53,6 @@
     repository: {
       name: 'LinkFree',
       url: 'https://github.com/EddieHubCommunity/LinkFree',
-      isArchived: false,
       primaryLanguage: {
         color: '#f1e05a',
         name: 'JavaScript',