Merge branch 'main' into dashboard/project-ranking-factor

Author: aramattamara

.github/workflows/run-ci-cd.yaml

@@ -302,6 +302,7 @@ jobs:
           echo "NEXT_PUBLIC_GRAPHQL_URL=${{ secrets.VITE_GRAPHQL_URL }}" >> frontend/.env
           echo "NEXT_PUBLIC_GTM_ID=${{ secrets.NEXT_PUBLIC_GTM_ID }}" >> frontend/.env
           echo "NEXT_PUBLIC_IDX_URL=${{ secrets.VITE_IDX_URL }}" >> frontend/.env
+          echo "NEXT_PUBLIC_IS_PROJECT_HEALTH_ENABLED=${{ secrets.NEXT_PUBLIC_IS_PROJECT_HEALTH_ENABLED }}" >> frontend/.env
           echo "NEXT_PUBLIC_RELEASE_VERSION=${{ github.event.release.tag_name }}" >> frontend/.env
           echo "NEXT_PUBLIC_SENTRY_DSN=${{ secrets.VITE_SENTRY_DSN }}" >> frontend/.env
 
@@ -535,6 +536,7 @@ jobs:
           echo "NEXT_PUBLIC_GRAPHQL_URL=${{ secrets.VITE_GRAPHQL_URL }}" >> frontend/.env
           echo "NEXT_PUBLIC_GTM_ID=${{ secrets.NEXT_PUBLIC_GTM_ID }}" >> frontend/.env
           echo "NEXT_PUBLIC_IDX_URL=${{ secrets.VITE_IDX_URL }}" >> frontend/.env
+          echo "NEXT_PUBLIC_IS_PROJECT_HEALTH_ENABLED=${{ secrets.NEXT_PUBLIC_IS_PROJECT_HEALTH_ENABLED }}" >> frontend/.env
           echo "NEXT_PUBLIC_RELEASE_VERSION=${{ github.event.release.tag_name }}" >> frontend/.env
           echo "NEXT_PUBLIC_SENTRY_DSN=${{ secrets.VITE_SENTRY_DSN }}" >> frontend/.env
 

backend/apps/github/index/user.py

@@ -43,8 +43,9 @@ class UserIndex(IndexBase):
         "minProximity": 4,
         "customRanking": [
             "desc(idx_contributions_count)",
-            "desc(idx_created_at)",
             "desc(idx_followers_count)",
+            "desc(idx_public_repositories_count)",
+            "asc(idx_created_at)",
         ],
         "ranking": [
             "typo",

frontend/.env.example

@@ -4,6 +4,7 @@ NEXT_PUBLIC_ENVIRONMENT=local
 NEXT_PUBLIC_GRAPHQL_URL=http://localhost:8000/graphql/
 NEXT_PUBLIC_GTM_ID=
 NEXT_PUBLIC_IDX_URL=http://localhost:8000/idx/
+NEXT_PUBLIC_IS_PROJECT_HEALTH_ENABLED=true
 NEXT_PUBLIC_RELEASE_VERSION=
 NEXT_PUBLIC_SENTRY_DSN=
 NEXT_SERVER_CSRF_URL=http://backend:8000/csrf/

frontend/Makefile

@@ -9,9 +9,9 @@ clean-frontend-dependencies:
 
 clean-frontend-docker:
 	@docker container rm -f nest-frontend >/dev/null 2>&1 || true
-	@docker image rm -f docker-frontend >/dev/null 2>&1 || true
-	@docker volume rm -f docker_frontend-next >/dev/null 2>&1 || true
-	@docker volume rm -f docker_frontend-node-modules >/dev/null 2>&1 || true
+	@docker image rm -f nest-local-frontend >/dev/null 2>&1 || true
+	@docker volume rm -f nest-local_frontend-next >/dev/null 2>&1 || true
+	@docker volume rm -f nest-local_frontend-node-modules >/dev/null 2>&1 || true
 
 exec-frontend-command:
 	@docker exec -t nest-frontend $(CMD)

frontend/pnpm-lock.yaml

@@ -12,6 +12,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import Link from 'next/link'
 import type { DetailsCardProps } from 'types/card'
 import { capitalize } from 'utils/capitalize'
+import { IS_PROJECT_HEALTH_ENABLED } from 'utils/credentials'
 import { getSocialIcon } from 'utils/urlIconMappings'
 import AnchorTitle from 'components/AnchorTitle'
 import ChapterMapWrapper from 'components/ChapterMapWrapper'
@@ -65,7 +66,7 @@ const DetailsCard = ({
         <div className="mt-4 flex flex-row items-center">
           <div className="flex w-full items-center justify-between">
             <h1 className="text-4xl font-bold">{title}</h1>
-            {type === 'project' && healthMetricsData.length > 0 && (
+            {IS_PROJECT_HEALTH_ENABLED && type === 'project' && healthMetricsData.length > 0 && (
               <Link href="#issues-trend">
                 <div
                   className={`group relative flex h-20 w-20 flex-col items-center justify-center rounded-full border-2 shadow-lg transition-all duration-300 hover:scale-105 hover:shadow-xl ${scoreStyle}`}
@@ -236,7 +237,7 @@ const DetailsCard = ({
               <RepositoriesCard repositories={repositories} />
             </SecondaryCard>
           )}
-        {type === 'project' && healthMetricsData.length > 0 && (
+        {IS_PROJECT_HEALTH_ENABLED && type === 'project' && healthMetricsData.length > 0 && (
           <HealthMetrics data={healthMetricsData} />
         )}
       </div>

frontend/src/components/CardDetailsPage.tsx

@@ -9,6 +9,8 @@ export const IDX_URL = process.env.NEXT_PUBLIC_IDX_URL
 export const IS_GITHUB_AUTH_ENABLED = Boolean(
   process.env.NEXT_SERVER_GITHUB_CLIENT_ID && process.env.NEXT_SERVER_GITHUB_CLIENT_SECRET
 )
+export const IS_PROJECT_HEALTH_ENABLED =
+  process.env.NEXT_PUBLIC_IS_PROJECT_HEALTH_ENABLED === 'true'
 export const NEXTAUTH_SECRET = process.env.NEXTAUTH_SECRET
 export const NEXTAUTH_URL = process.env.NEXTAUTH_URL
 export const RELEASE_VERSION = process.env.NEXT_PUBLIC_RELEASE_VERSION