diff --git a/.github/workflows/nextjs.yml b/.github/workflows/nextjs.yml index 37bfa9f7..d32d2a1a 100644 --- a/.github/workflows/nextjs.yml +++ b/.github/workflows/nextjs.yml @@ -65,15 +65,14 @@ jobs: # You may remove this line if you want to manage the configuration yourself. static_site_generator: next - name: Restore cache - uses: actions/cache@734d9cb93d6f7610c2400b0f789eaa6f9813e271 # v3 + uses: actions/cache@v4 with: path: | "${{ github.workspace }}/app/.next/cache" - # Generate a new cache whenever packages or source files change. key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }} - # If source files changed but packages didn't, rebuild from a prior cache. restore-keys: | ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}- + - name: Install dependencies run: cd "${{ github.workspace }}/app" && ${{ steps.detect-package-manager.outputs.manager }} ${{ steps.detect-package-manager.outputs.command }} - name: Build with Next.js diff --git a/app/src/components/RepositoriesTable.tsx b/app/src/components/RepositoriesTable.tsx index 9eb7d2a6..fbc2ea10 100644 --- a/app/src/components/RepositoriesTable.tsx +++ b/app/src/components/RepositoriesTable.tsx @@ -393,7 +393,6 @@ const getComparator = (sortColumn: keyof RepositoryResult): Comparator => { case 'mergedPullRequestsCount': case 'openIssuesCount': case 'openPullRequestsCount': - case 'projectsCount': case 'watchersCount': case 'openIssuesMedianAge': case 'openIssuesAverageAge': diff --git a/backend/src/fetchers/repository.ts b/backend/src/fetchers/repository.ts index 226af117..4c724d4e 100644 --- a/backend/src/fetchers/repository.ts +++ b/backend/src/fetchers/repository.ts @@ -1,5 +1,3 @@ -// Fetchers for repository data and metrics - import { Organization, Repository } from '@octokit/graphql-schema'; import { Fetcher } from '..'; import { RepositoryResult } from '../../../types'; @@ -15,8 +13,7 @@ export const addRepositoriesToResult: Fetcher = async ( ` query ($cursor: String, $organization: String!) { organization(login:$organization) { - repositories(privacy:PUBLIC, first:100, isFork:false, isArchived:false, after: $cursor) - { + repositories(privacy:PUBLIC, first:100, isFork:false, isArchived:false, after: $cursor) { pageInfo { hasNextPage endCursor @@ -31,9 +28,6 @@ export const addRepositoriesToResult: Fetcher = async ( hasIssuesEnabled hasProjectsEnabled hasDiscussionsEnabled - projects { - totalCount - } projectsV2 { totalCount } @@ -89,10 +83,9 @@ export const addRepositoriesToResult: Fetcher = async ( watchersCount: repo.watchers.totalCount, starsCount: repo.stargazerCount, issuesEnabled: repo.hasIssuesEnabled, - projectsEnabled: repo.hasProjectsEnabled, + projectsEnabled: repo.hasProjectsEnabled, // still valid (boolean) discussionsEnabled: repo.hasDiscussionsEnabled, collaboratorsCount: repo.collaborators?.totalCount || 0, - projectsCount: repo.projects.totalCount, projectsV2Count: repo.projectsV2.totalCount, } as RepositoryResult, }; diff --git a/config.yml b/config.yml index b45549ae..a3bd73d2 100644 --- a/config.yml +++ b/config.yml @@ -1,10 +1,10 @@ --- # Organization to pull metrics from -organization: 'github-community-projects' +organization: 'Falakme' # Start date to pull metrics from since: '2023-01-01' # GitHub Pages path to the repository # Used for handling relative paths for assets -basePath: '/org-metrics-dashboard' +basePath: '/metrics' diff --git a/types/index.ts b/types/index.ts index b1193b4b..56af58d5 100644 --- a/types/index.ts +++ b/types/index.ts @@ -6,7 +6,6 @@ export interface RepositoryResult { topics: string[]; // Counts of various things - projectsCount: number; projectsV2Count: number; discussionsCount: number; forksCount: number;