From 92e5f06a78bc3412ac83c515fad0f2e01e44d2ea Mon Sep 17 00:00:00 2001
From: Elizabeth Campolongo <38985481+egrace479@users.noreply.github.com>
Date: Thu, 11 Jun 2026 15:22:17 -0400
Subject: [PATCH 01/12] Set tests to run on 'dev' branch in workflow
Pull from Imagomics catalog [PR 109](https://github.com/Imageomics/catalog/pull/109)
Excluded agent md updates from the original commits.
dev will now be used before main
(cherry picked from commit 9a4b28089fe1711521e0f736603d5de74b5f1a5f)
---
.github/workflows/test.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9c4e063..031e843 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,7 +2,9 @@ name: Run tests
on:
pull_request:
- branches: [main]
+ branches:
+ - 'main'
+ - 'dev'
jobs:
test:
From 69ff9f52ec32a6f0b4f842d1daa390bffbe8982f Mon Sep 17 00:00:00 2001
From: Elizabeth Campolongo <38985481+egrace479@users.noreply.github.com>
Date: Tue, 16 Jun 2026 09:24:00 -0400
Subject: [PATCH 02/12] Allow for HF org with different name from code platform
org
Pull from Imageomics catalog [PR
110](https://github.com/Imageomics/catalog/pull/110)
Excluded agents md updates from the original commits.
* Allow for HF org with different name from codebase platform
* Add terminal rendered error message in case of missing/incorrect config keys at Vite start
* Improve validation
(cherry picked from commit: 2f1f18541e2e769f7ada5f45ee4dcb4beb42a314)
---
docs/personalization.md | 5 +++--
main.js | 22 +++++++++++++---------
public/config.yaml | 1 +
scripts/export-tags.js | 4 ++--
src/validateConfig.js | 28 ++++++++++++++++++++++++----
tests/validateConfig.test.js | 27 +++++++++++++++++++++++++++
vite.config.js | 28 ++++++++++++++++++++++++++++
7 files changed, 98 insertions(+), 17 deletions(-)
diff --git a/docs/personalization.md b/docs/personalization.md
index 3a6d161..cc26212 100644
--- a/docs/personalization.md
+++ b/docs/personalization.md
@@ -8,8 +8,9 @@ Welcome to your new catalog repo! The primary way to personalize this catalog is
### Organization & Repository Settings
- * `ORGANIZATION_NAME`: Your GitHub/Hugging Face organization name (lowercase for API calls)
- * `ORG_NAME`: Display name for your organization (can differ from API name); used as fallback site title if `CATALOG_TITLE` is not set
+ * `ORGANIZATION_NAME`: Your code platform (e.g., GitHub) organization name (for API calls)
+ * `HF_ORGANIZATION_NAME`: Your Hugging Face organization name (**case-sensitive**, for API calls)
+ * `ORG_NAME`: Display name for your organization (can differ from API name); used for logo alt-text and as fallback site title if `CATALOG_TITLE` is not set
* `CATALOG_REPO_NAME`: Repository name for the catalog itself (used for stats badge)
### Branding
diff --git a/main.js b/main.js
index bf6c297..780d760 100644
--- a/main.js
+++ b/main.js
@@ -24,7 +24,7 @@ const configPromise = fetch('config.yaml')
// Module-scope lets — assigned after config loads, used by all functions below
let CONFIG;
-let ORGANIZATION_NAME, CATALOG_REPO_NAME, PLATFORM, API_BASE_URL, REFRESH_INTERVAL_DAYS, ADDITIONAL_REPOS, ADDITIONAL_HF_REPOS;
+let ORGANIZATION_NAME, HF_ORGANIZATION_NAME, CATALOG_REPO_NAME, PLATFORM, API_BASE_URL, REFRESH_INTERVAL_DAYS, ADDITIONAL_REPOS, ADDITIONAL_HF_REPOS;
let ORG_API_URL, REPO_API_URL;
// Build a reverse lookup from TAG_GROUPS (defined in tag-groups.js): raw tag → [canonical tags]
@@ -279,7 +279,7 @@ const fetchHubItems = async (repoType) => {
}
// hugging face api requests for datasets/models/spaces
- const response = await fetch(`${API_BASE_URL}${repoType}?author=${ORGANIZATION_NAME}&full=true`);
+ const response = await fetch(`${API_BASE_URL}${repoType}?author=${HF_ORGANIZATION_NAME}&full=true`);
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status}`);
}
@@ -651,7 +651,7 @@ const initializeUIFromConfig = () => {
// Set header title and description
const headerTitle = document.getElementById('header-title');
if (headerTitle) {
- headerTitle.textContent = CONFIG.CATALOG_TITLE;
+ headerTitle.textContent = CONFIG.CATALOG_TITLE || `${CONFIG.ORG_NAME} Catalog`;
headerTitle.style.color = CONFIG.COLORS.primary;
}
@@ -703,7 +703,7 @@ document.addEventListener('DOMContentLoaded', async () => {
setTimeout(() => errorDiv.remove(), 10000);
// Fall back to defaults so the page isn't completely broken
CONFIG = {
- ORGANIZATION_NAME: '', CATALOG_REPO_NAME: '', ORG_NAME: '',
+ ORGANIZATION_NAME: '', HF_ORGANIZATION_NAME: '', CATALOG_REPO_NAME: '', ORG_NAME: '',
CATALOG_TITLE: 'Catalog', CATALOG_DESCRIPTION: '',
LOGO_URL: '', FAVICON_URL: '',
COLORS: { primary: '#92991c', secondary: '#5d8095', accent: '#0097b2', accentDark: '#4fd1eb', tag: '#9bcb5e' },
@@ -715,6 +715,7 @@ document.addEventListener('DOMContentLoaded', async () => {
// Assign module-scope variables used by all functions
ORGANIZATION_NAME = CONFIG.ORGANIZATION_NAME;
+ HF_ORGANIZATION_NAME = CONFIG.HF_ORGANIZATION_NAME;
CATALOG_REPO_NAME = CONFIG.CATALOG_REPO_NAME;
PLATFORM = CONFIG.PLATFORM;
ORG_API_URL = getPlatformApiUrls(PLATFORM, ORGANIZATION_NAME).org;
@@ -724,6 +725,14 @@ document.addEventListener('DOMContentLoaded', async () => {
ADDITIONAL_REPOS = CONFIG.ADDITIONAL_REPOS;
ADDITIONAL_HF_REPOS = CONFIG.ADDITIONAL_HF_REPOS;
+ // Guard: if ORGANIZATION_NAME or HF_ORGANIZATION_NAME is missing (e.g. config.yaml failed to load),
+ // stop here — proceeding would fire requests like ?author=&full=true which
+ // could return unbounded results from the Hugging Face API.
+ if (!ORGANIZATION_NAME || !HF_ORGANIZATION_NAME){
+ console.error("Organization name is missing for one or both APIs. Halting initialization.");
+ return;
+ }
+
// Apply CSS custom properties and document metadata
document.title = CONFIG.CATALOG_TITLE || `${CONFIG.ORG_NAME} Catalog`;
document.documentElement.style.setProperty('--color-primary', CONFIG.COLORS?.primary || '#92991c');
@@ -808,11 +817,6 @@ document.addEventListener('DOMContentLoaded', async () => {
});
// Initialize the Catalog Badge (Stars/Forks/Version)
- // Guard: if ORGANIZATION_NAME is missing (e.g. config.yaml failed to load),
- // stop here — proceeding would fire requests like ?author=&full=true which
- // could return unbounded results from the Hugging Face API.
- if (!ORGANIZATION_NAME) return;
-
fetchCatalogStats();
// Load pre-built release data (written by scripts/fetch-releases.js at build time)
diff --git a/public/config.yaml b/public/config.yaml
index d15d0ee..5442c13 100644
--- a/public/config.yaml
+++ b/public/config.yaml
@@ -42,6 +42,7 @@ ADDITIONAL_REPOS:
# Array of Hugging Face repos from outside the org to include.
# Each entry must specify "repo" (owner/name) and "type" (datasets, models, or spaces).
+# Organization names are case-sensitive in the Hugging Face API.
# ADDITIONAL_HF_REPOS:
# - repo: "user/dataset-name"
# type: "datasets"
diff --git a/scripts/export-tags.js b/scripts/export-tags.js
index f3ec2ba..8e046ec 100644
--- a/scripts/export-tags.js
+++ b/scripts/export-tags.js
@@ -35,7 +35,7 @@ if (errors.length) {
}
const CONFIG = rawConfig;
-const { ORGANIZATION_NAME, PLATFORM, API_BASE_URL, ADDITIONAL_REPOS } = CONFIG;
+const { ORGANIZATION_NAME, HF_ORGANIZATION_NAME, PLATFORM, API_BASE_URL, ADDITIONAL_REPOS } = CONFIG;
const ADDITIONAL_HF_REPOS = CONFIG.ADDITIONAL_HF_REPOS;
// ---------------------------------------------------------------------------
@@ -97,7 +97,7 @@ const collectCodePlatformTags = async () => {
const collectHFTags = async (repoType) => {
console.log(`Fetching HF ${repoType}...`);
- let items = (await get(`${API_BASE_URL}${repoType}?author=${ORGANIZATION_NAME}&full=true`)).json;
+ let items = (await get(`${API_BASE_URL}${repoType}?author=${HF_ORGANIZATION_NAME}&full=true`)).json;
// Fetch additional HF repos of this type
const additionalForType = ADDITIONAL_HF_REPOS.filter(entry => entry.type === repoType);
diff --git a/src/validateConfig.js b/src/validateConfig.js
index 7cac8f3..d903afe 100644
--- a/src/validateConfig.js
+++ b/src/validateConfig.js
@@ -14,15 +14,35 @@ export function validateConfig(config) {
return errors;
}
- if (!config.ORGANIZATION_NAME) errors.push('ORGANIZATION_NAME');
+ /** Validate organization names, existence and allowed characters */
+ const ghOrgRegex = /^[a-zA-Z0-9-]+$/;
+ const orgName = config.ORGANIZATION_NAME;
+ if (typeof orgName !== 'string' || !orgName.trim()) {
+ errors.push('ORGANIZATION_NAME');
+ } else if (!ghOrgRegex.test(orgName)) {
+ errors.push(`ORGANIZATION_NAME (${orgName}) is invalid, only letters, numbers, and hyphens are allowed`);
+ }
+ const hfOrgRegex = /^[a-zA-Z0-9_\-]+$/;
+ const hfOrgName = config.HF_ORGANIZATION_NAME;
+ if (typeof hfOrgName !== 'string' || !hfOrgName.trim()) {
+ errors.push('HF_ORGANIZATION_NAME');
+ } else if (!hfOrgRegex.test(hfOrgName)) {
+ errors.push(`HF_ORGANIZATION_NAME (${hfOrgName}) is invalid, only letters, numbers, hyphens, and underscores are allowed`);
+ }
if (!config.ORG_NAME) errors.push('ORG_NAME');
if (!config.CATALOG_REPO_NAME) errors.push('CATALOG_REPO_NAME');
- if (!config.PLATFORM) errors.push('PLATFORM');
- /** Update to include 'codeberg' and 'gitlab' once supported */
+
+ /** Update to include 'codeberg' and 'gitlab' once supported
+ * PLATFORM will be parsed without whitespace, but must be string to avoid undefined errors
+ */
const supportedPlatforms = ['github'];
- if (config.PLATFORM && !supportedPlatforms.includes(config.PLATFORM.toLowerCase())) {
+ const platform = config.PLATFORM;
+ if (!platform || typeof platform !== 'string') {
+ errors.push('PLATFORM');
+ } else if (!supportedPlatforms.includes(platform.toLowerCase())) {
errors.push(`PLATFORM must be one of: ${supportedPlatforms.join(', ')}`);
}
+
if (!config.API_BASE_URL) errors.push('API_BASE_URL');
if (config.REFRESH_INTERVAL_DAYS == null) errors.push('REFRESH_INTERVAL_DAYS');
diff --git a/tests/validateConfig.test.js b/tests/validateConfig.test.js
index a9ee8c1..089e2e6 100644
--- a/tests/validateConfig.test.js
+++ b/tests/validateConfig.test.js
@@ -3,6 +3,7 @@ import { validateConfig } from '../src/validateConfig.js';
const VALID_CONFIG = {
ORGANIZATION_NAME: 'imageomics',
+ HF_ORGANIZATION_NAME: 'imageomics',
ORG_NAME: 'Imageomics',
CATALOG_REPO_NAME: 'catalog',
PLATFORM: 'github',
@@ -53,6 +54,27 @@ describe('validateConfig', () => {
expect(validateConfig({ ...VALID_CONFIG, ORGANIZATION_NAME: '' })).toContain('ORGANIZATION_NAME');
});
+ it('errors when ORGANIZATION_NAME is not in accepted format', () => {
+ expect(
+ validateConfig({ ...VALID_CONFIG, ORGANIZATION_NAME: 'abc center' })
+ ).toContain('ORGANIZATION_NAME (abc center) is invalid, only letters, numbers, and hyphens are allowed');
+ });
+
+ it('errors when HF_ORGANIZATION_NAME is missing', () => {
+ const { HF_ORGANIZATION_NAME: _, ...config } = VALID_CONFIG;
+ expect(validateConfig(config)).toContain('HF_ORGANIZATION_NAME');
+ });
+
+ it('errors when HF_ORGANIZATION_NAME is empty string', () => {
+ expect(validateConfig({ ...VALID_CONFIG, HF_ORGANIZATION_NAME: '' })).toContain('HF_ORGANIZATION_NAME');
+ });
+
+ it('errors when HF_ORGANIZATION_NAME is not in accepted format', () => {
+ expect(
+ validateConfig({ ...VALID_CONFIG, HF_ORGANIZATION_NAME: 'abc center' })
+ ).toContain('HF_ORGANIZATION_NAME (abc center) is invalid, only letters, numbers, hyphens, and underscores are allowed');
+ });
+
it('errors when ORG_NAME is missing', () => {
const { ORG_NAME: _, ...config } = VALID_CONFIG;
expect(validateConfig(config)).toContain('ORG_NAME');
@@ -75,6 +97,10 @@ describe('validateConfig', () => {
const { PLATFORM: _, ...config } = VALID_CONFIG;
expect(validateConfig(config)).toContain('PLATFORM');
});
+
+ it('errors when PLATFORM is not a string', () => {
+ expect(validateConfig({ ...VALID_CONFIG, PLATFORM: 123 })).toContain('PLATFORM');
+ });
it('errors when PLATFORM is unrecognized', () => {
const errors = validateConfig({ ...VALID_CONFIG, PLATFORM: 'blah' });
@@ -141,6 +167,7 @@ describe('validateConfig', () => {
};
const errors = validateConfig(config);
expect(errors).toContain('ORGANIZATION_NAME');
+ expect(errors).toContain('HF_ORGANIZATION_NAME');
expect(errors).toContain('ORG_NAME');
expect(errors).toContain('CATALOG_REPO_NAME');
expect(errors).toContain('PLATFORM');
diff --git a/vite.config.js b/vite.config.js
index c216b73..fc44854 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,5 +1,33 @@
import tailwindcss from '@tailwindcss/vite'
import { defineConfig } from 'vite'
+import fs from 'fs';
+import jsYaml from 'js-yaml';
+import { validateConfig } from './src/validateConfig.js';
+
+const CONFIG_PATH = './public/config.yaml';
+let parsedConfig;
+
+// Run config validation before Vite starts (dev/build/preview)
+try {
+ const fileContents = fs.readFileSync(CONFIG_PATH, 'utf8');
+ parsedConfig = jsYaml.load(fileContents);
+} catch (error) {
+ console.error(`\n❌ [CONFIG ERROR] Failed to read or parse ${CONFIG_PATH}: ${error.message}\n`);
+ process.exit(1); // Stop Vite immediately if the file is completely unreadable or broken YAML
+}
+
+// Any errors will be collected in the 'errors' array, to be printed out and cause a safe crash if not empty.
+const errors = validateConfig(parsedConfig);
+if (errors && errors.length > 0) {
+ console.error('\n❌ [CONFIG ERROR] Vite failed to start due to the following configuration errors:\n');
+
+ errors.forEach((error, index) => {
+ console.error(` ${index + 1}. ${error}`);
+ });
+
+ console.error(`\n Please fix the listed issue(s) in ${CONFIG_PATH} and try again.\n`);
+ process.exit(1); // Safely kills the npm run dev terminal process
+}
const repoName = process.env.GITHUB_REPOSITORY?.split('/')[1]
From c00724e2698c3f67bc91f727660231d3ae8022b8 Mon Sep 17 00:00:00 2001
From: Elizabeth Campolongo <38985481+egrace479@users.noreply.github.com>
Date: Tue, 7 Jul 2026 12:40:33 -0400
Subject: [PATCH 03/12] Modularize the codebase
Pulled from Imageomics catalog [PR
115](https://github.com/Imageomics/catalog/pull/115)
Excluded agents md updates from the original commit.
* Move type/platform-based repo fetching to dedicated api modules
* Check releases are loaded before fetching code repos
* Move rendering, URL management, and UI logic to external modules
* Move tag lookup creation to tag-related utils file to reduce parameter passing
internal variable only required for normalizing tags
* Restructure repo to accommodate larger number of source files
arrange by purpose
* Update AGENTS repository layout description to reflect changes
initial description updates generated with Gemini 3.1 Pro in a modularization discussion thread
updated paths for test list
* Add tests for new API fetch modules and URL management
Tests constructed with aid of Gemini 3.1 Pro and Thinking
Switch to jsdom testing strategy, copilot suggestion
* Move HF default tag filtering to normalizeTag utility
consolidates tag processing, creating single location for potential personalization of tags
cherry-picked from commit: 76a1f4a16cdc1ba2e74d237d92e4ebc66c0b709c
---
README.md | 7 +-
docs/tag-grouping-process.md | 3 +-
main.js | 635 ++----------------
package-lock.json | 533 +++++++++++++++
package.json | 3 +-
scripts/export-tags.js | 6 +-
scripts/fetch-releases.js | 2 +-
src/api/fetchCodeRepos.js | 118 ++++
src/api/fetchHfRepos.js | 105 +++
src/api/fetchStats.js | 38 ++
src/normalizeTag.js | 18 -
src/ui/initUserInterface.js | 106 +++
src/ui/render.js | 164 +++++
src/ui/urlManager.js | 85 +++
src/{ => utils}/defineApiUrls.js | 0
src/{ => utils}/defineRibbonVals.js | 0
src/{ => utils}/filterAndSort.js | 0
src/{ => utils}/filterNewAdditionalEntries.js | 0
src/utils/normalizeTag.js | 64 ++
tests/api/fetchCodeRepos.test.js | 310 +++++++++
tests/api/fetchHfRepos.test.js | 341 ++++++++++
tests/ui/urlManager.test.js | 105 +++
tests/{ => utils}/filterAndSort.test.js | 2 +-
.../filterNewAdditionalEntries.test.js | 2 +-
tests/{ => utils}/normalizeTag.test.js | 2 +-
25 files changed, 2031 insertions(+), 618 deletions(-)
create mode 100644 src/api/fetchCodeRepos.js
create mode 100644 src/api/fetchHfRepos.js
create mode 100644 src/api/fetchStats.js
delete mode 100644 src/normalizeTag.js
create mode 100644 src/ui/initUserInterface.js
create mode 100644 src/ui/render.js
create mode 100644 src/ui/urlManager.js
rename src/{ => utils}/defineApiUrls.js (100%)
rename src/{ => utils}/defineRibbonVals.js (100%)
rename src/{ => utils}/filterAndSort.js (100%)
rename src/{ => utils}/filterNewAdditionalEntries.js (100%)
create mode 100644 src/utils/normalizeTag.js
create mode 100644 tests/api/fetchCodeRepos.test.js
create mode 100644 tests/api/fetchHfRepos.test.js
create mode 100644 tests/ui/urlManager.test.js
rename tests/{ => utils}/filterAndSort.test.js (99%)
rename tests/{ => utils}/filterNewAdditionalEntries.test.js (96%)
rename tests/{ => utils}/normalizeTag.test.js (96%)
diff --git a/README.md b/README.md
index e7d8774..cec9eca 100644
--- a/README.md
+++ b/README.md
@@ -28,12 +28,17 @@ The site runs based on four primary files:
* `public/config.yaml`: Contains all customizable settings including organization names, colors, branding, and API settings. This is the main file to edit for personalization. Placed in `public/` so Vite copies it to `dist/` without bundling, keeping it editable after deployment.
* `index.html`: The main HTML file that provides the structure of the webpage and links to the CSS and JavaScript files. Config values are applied dynamically from `config.yaml`.
* `style.css`: Custom styling for the application, including color schemes, layout, and animations. Colors are set via CSS custom properties that are populated from `config.yaml`.
-* `main.js`: Handles the application's logic, including config loading, API calls, data filtering, sorting, and dynamic rendering of the catalog items. Relies on the build-time Node script `fetch-releases.js` for version-tag badge feature.
+* `main.js`: Application manager, handles config loading, event listeners, and coordinates UI updates based on API fetches for dynamic rendering of the catalog items.
+* `src/`: Modular application logic, organized by purpose:
+ * `api/`: Data fetching modules for external platforms (GitHub and Hugging Face).
+ * `ui/`: DOM manipulation, HTML templating, and URL/State routing.
+ * `utils/`: Utility functions such as data filtering, sorting, and tag (keyword) normalization.
Two additional files support the build tooling:
* `package.json`: Declares npm dependencies (`vite`, `tailwindcss`, `@tailwindcss/vite`) and defines the `dev`, `build`, and `preview` scripts.
* `vite.config.js`: Vite configuration that registers the Tailwind CSS plugin.
+* `scripts/fetch-releases.js`: Build-time Node script to fetch GitHub repo release data for version-tag badge feature.
### Formatting Standard
diff --git a/docs/tag-grouping-process.md b/docs/tag-grouping-process.md
index b69a121..e73b013 100644
--- a/docs/tag-grouping-process.md
+++ b/docs/tag-grouping-process.md
@@ -19,8 +19,7 @@ const TAG_GROUPS = {
- The **key** (`"canonical tag"`) is the display tag shown in the UI filter dropdown.
- The **value array** lists every raw API tag that should be normalized to that key.
- Raw tags not present in any array pass through unchanged and appear as-is in the UI.
-- Raw tags that contain a colon (e.g. `license:mit`, `format:parquet`) are automatically
- filtered out as Hugging Face system metadata so they never reach the UI. This can be changed in [src/normalizeTag.js](../src/normalizeTag.js), by removing the marked option line.
+- Raw tags that contain a colon (e.g. `license:mit`, `format:parquet`) are automatically filtered out as Hugging Face system metadata so they never reach the UI. This can be changed in [src/normalizeTag.js](../src/normalizeTag.js), by removing the marked option lines in `normalizeTag` and `filterDisplayTags`.
- Raw tags are maintained and matched-against for keyword searching and do appear in repo cards.
---
diff --git a/main.js b/main.js
index 780d760..7c91a0a 100644
--- a/main.js
+++ b/main.js
@@ -7,11 +7,14 @@
//
import jsYaml from 'js-yaml';
-import { normalizeTag } from './src/normalizeTag.js';
-import { getPlatformApiUrls } from './src/defineApiUrls.js';
-import { getPlatformDisplay } from './src/defineRibbonVals.js';
-import { filterItems, sortItems } from './src/filterAndSort.js';
-import { filterNewAdditionalEntries } from './src/filterNewAdditionalEntries.js';
+import { initializeUIFromConfig, setThemeToggle } from './src/ui/initUserInterface.js';
+import { parseUrlParams, updateUrlParams, getCurrentState } from './src/ui/urlManager.js';
+import { renderItemList } from './src/ui/render.js';
+import { getPlatformApiUrls } from './src/utils/defineApiUrls.js';
+import { filterItems, sortItems } from './src/utils/filterAndSort.js';
+import { fetchCodeRepos } from './src/api/fetchCodeRepos.js';
+import { fetchHfRepos } from './src/api/fetchHfRepos.js';
+import { fetchCatalogStats } from './src/api/fetchStats.js';
// Start fetching config immediately when the module loads (before DOMContentLoaded)
// so the fetch is in-flight while the DOM is being parsed.
@@ -27,23 +30,6 @@ let CONFIG;
let ORGANIZATION_NAME, HF_ORGANIZATION_NAME, CATALOG_REPO_NAME, PLATFORM, API_BASE_URL, REFRESH_INTERVAL_DAYS, ADDITIONAL_REPOS, ADDITIONAL_HF_REPOS;
let ORG_API_URL, REPO_API_URL;
-// Build a reverse lookup from TAG_GROUPS (defined in tag-groups.js): raw tag → [canonical tags]
-// A raw tag may appear in multiple groups, so the value is an array.
-const tagLookup = Object.create(null);
-if (typeof TAG_GROUPS !== 'undefined') {
- for (const [canonical, aliases] of Object.entries(TAG_GROUPS)) {
- for (const alias of aliases) {
- const key = alias.toLowerCase();
- if (tagLookup[key]) {
- tagLookup[key].push(canonical);
- } else {
- tagLookup[key] = [canonical];
- }
- }
- }
-}
-
-
let releasesMap = {};
let allItems = {
@@ -65,103 +51,8 @@ let fetchedData = {
spaces: false
};
-// Utility function to handle errors and display a user-friendly message
-const handleError = (error, message) => {
- console.error(message, error);
- const itemList = document.getElementById('itemList');
- itemList.innerHTML = `
-
Error loading items.
-
${message}
-
`;
-};
-
-//
-// SECTION 1B: URL PARAMETER HANDLING
-//
-
-/**
- * Parses URL parameters from both query string (?key=value) and hash (#key=value).
- * Query parameters take precedence over hash parameters.
- * @returns {Object} An object containing the parsed parameters.
- */
-const parseUrlParams = () => {
- const params = {};
-
- // Parse query string parameters (e.g., ?type=datasets&q=fish)
- const queryString = window.location.search;
- const urlParams = new URLSearchParams(queryString);
-
- // Parse hash parameters (e.g., #type=datasets&q=fish)
- const hash = window.location.hash.slice(1); // Remove the leading '#'
- const hashParams = new URLSearchParams(hash);
-
- // Hash parameters first (lower precedence)
- for (const [key, value] of hashParams) {
- params[key] = value;
- }
-
- // Query parameters override hash parameters (higher precedence)
- for (const [key, value] of urlParams) {
- params[key] = value;
- }
-
- return params;
-};
-
-/**
- * Updates the URL hash with the current filter state without triggering a page reload.
- * @param {Object} state - The current state object with type, q, sort, tag properties.
- */
-const updateUrlParams = (state) => {
- const params = new URLSearchParams();
-
- // Only add non-default values to the URL
- if (state.type && state.type !== 'all') {
- params.set('type', state.type);
- }
- if (state.q && state.q.trim() !== '') {
- params.set('q', state.q);
- }
- if (state.sort && state.sort !== 'lastModified') {
- params.set('sort', state.sort);
- }
- if (state.tag && state.tag !== '') {
- params.set('tag', state.tag);
- }
- if (state.archived && state.archived !== 'active') {
- params.set('archived', state.archived);
- }
-
- const paramString = params.toString();
- const newHash = paramString ? `#${paramString}` : '';
-
- // Build the new URL preserving the pathname and any query parameters when clearing hash
- const baseUrl = window.location.pathname + window.location.search;
- const newUrl = newHash ? baseUrl + newHash : baseUrl;
-
- // Update the URL without triggering a page reload
- const currentUrl = window.location.pathname + window.location.search + window.location.hash;
- if (currentUrl !== newUrl) {
- history.replaceState(null, '', newUrl);
- }
-};
-
-/**
- * Gets the current filter state from form elements.
- * @returns {Object} The current state object.
- */
-const getCurrentState = () => {
- return {
- type: document.getElementById('repoType')?.value || 'all',
- q: document.getElementById('searchInput')?.value || '',
- sort: document.getElementById('sortBy')?.value || 'lastModified',
- tag: document.getElementById('tagFilter')?.value || '',
- archived: document.getElementById('archiveFilter')?.value || 'active'
- };
-};
-
//
-// SECTION 2: DATA FETCHING LOGIC
+// SECTION 2: DATA FETCHING
//
/**
@@ -178,388 +69,47 @@ const fetchHubItems = async (repoType) => {
const skeletons = document.querySelectorAll('.skeleton-card');
skeletons.forEach(s => s.classList.remove('hidden'));
- try {
- let items = [];
-
- // Platform-specific api requests for code
- if (repoType === "code") {
- if (fetchedData.code) return allItems.code // reuse if already fetched
-
- // Paginate through all public repos (Platform determines API max returns per page)
- let allRepos = [];
- let nextUrl = `${ORG_API_URL}`;
- while (nextUrl) {
- const ghResponse = await fetch(nextUrl);
-
- if (!ghResponse.ok) {
- const platformDisplay = getPlatformDisplay(PLATFORM);
- throw new Error(`${platformDisplay.displayName || PLATFORM} error: ${ghResponse.status}`);
- }
-
- const page = await ghResponse.json();
- allRepos = allRepos.concat(page);
-
- // Parse the Link header to find the next page URL, if any
- const linkHeader = ghResponse.headers.get('Link');
- const match = linkHeader && linkHeader.match(/<([^>]+)>;\s*rel="next"/);
- nextUrl = match ? match[1] : null;
- }
-
- // For org-owned entries in ADDITIONAL_REPOS, reuse data already in allRepos to avoid redundant API calls.
- // Only fetch entries that belong to a different org (external repos).
- const allReposByFullName = new Map(allRepos.map(r => [r.full_name, r]));
- const toFetch = ADDITIONAL_REPOS.filter(ownerRepo => !allReposByFullName.has(ownerRepo));
- const fromAllRepos = ADDITIONAL_REPOS.map(ownerRepo => allReposByFullName.get(ownerRepo)).filter(Boolean);
-
- const fetchedExternalData = await Promise.all(
- toFetch.map(ownerRepo =>
- fetch(`${REPO_API_URL}${ownerRepo}`)
- .then(r => {
- if (!r.ok) {
- console.warn(`Failed to fetch additional repo "${ownerRepo}": HTTP ${r.status}`);
- return null;
- }
- return r.json();
- })
- .catch(err => {
- console.warn(`Network error fetching additional repo "${ownerRepo}":`, err);
- return null;
- })
- )
- );
- const additionalRepos = [...fromAllRepos, ...fetchedExternalData.filter(Boolean)];
-
- // Keep only non-forks from org; deduplicate against additional repos by full_name
- const orgRepoNames = new Set(additionalRepos.map(r => r.full_name));
- const orgNonForks = allRepos.filter(repo => repo.name !== ".github" && !repo.fork && !orgRepoNames.has(repo.full_name));
-
- // Process additional repos and all remaining org non-forks to include metadata and 'new' flag as appropriate
- items = [...additionalRepos, ...orgNonForks]
- .map(repo => {
- const createdAt = new Date(repo.created_at);
- const lastModified = new Date(repo.updated_at);
- const isNew = (new Date() - createdAt) / (1000 * 60 * 60 * 24) < REFRESH_INTERVAL_DAYS;
-
- const rawTags = (repo.topics || []).map(t => t.toLowerCase());
- const tags = [...new Set(rawTags.flatMap(t => normalizeTag(t, tagLookup)).filter(Boolean))];
- const displayTags = rawTags.filter(t => !t.includes(':'));
- tags.forEach(tag => tagsMap.code.add(tag));
-
- const release = releasesMap[repo.full_name] ?? null;
-
- return {
- id: repo.full_name, // "Imageomics/", used as backup if can't get repo.name
- repoType: "code",
- createdAt,
- lastModified,
- isNew,
- archived: repo.archived || false,
- tags,
- rawTags,
- displayTags,
- description: repo.description || "No description provided.",
- html_url: repo.html_url,
- hasNewRelease: release?.isNew ?? false,
- latestReleaseUrl: release?.url ?? null,
- latestReleaseTag: release?.tag ?? null,
- cardData: {
- pretty_name: repo.name, // , the one used for card title display
- description: repo.description,
- stars: repo.stargazers_count
- }
- };
- });
-
- allItems.code = items;
- fetchedData.code = true;
-
- skeletons.forEach(s => s.classList.add('hidden'));
-
- return items;
- }
-
- // hugging face api requests for datasets/models/spaces
- const response = await fetch(`${API_BASE_URL}${repoType}?author=${HF_ORGANIZATION_NAME}&full=true`);
- if (!response.ok) {
- throw new Error(`HTTP error! status: ${response.status}`);
- }
- let hfItems = await response.json();
-
- // Fetch additional HF repos of this type from outside the org
- const additionalForType = ADDITIONAL_HF_REPOS.filter(entry => entry.type === repoType);
- if (additionalForType.length) {
- const existingIds = new Set(hfItems.map(item => item.id));
- const toFetch = filterNewAdditionalEntries(existingIds, additionalForType);
-
- const fetched = await Promise.all(
- toFetch.map(entry =>
- fetch(`${API_BASE_URL}${repoType}/${entry.repo}`)
- .then(r => {
- if (!r.ok) {
- console.warn(`Failed to fetch additional HF repo "${entry.repo}": HTTP ${r.status}`);
- return null;
- }
- return r.json();
- })
- .catch(err => {
- console.warn(`Network error fetching additional HF repo "${entry.repo}":`, err);
- return null;
- })
- )
- );
- hfItems = [...hfItems, ...fetched.filter(item => item && !existingIds.has(item.id))];
- }
+ let items = []
- // Step 2: If we are fetching models, get the full details for each one.
- if (repoType === 'models') {
- const detailPromises = hfItems.map(item =>
- fetch(`${API_BASE_URL}models/${item.id}`).then(res => {
- if (!res.ok) {
- console.error(`Failed to fetch details for ${item.id}`);
- return null; // Return null for failed requests
- }
- return res.json();
- })
- );
-
- // Wait for all detail requests to complete in parallel.
- const detailedItems = await Promise.all(detailPromises);
-
- // Filter out any models that failed to fetch and assign the detailed list.
- hfItems = detailedItems.filter(Boolean);
+ if (repoType === 'code') {
+ // Check that releasesMap is populated; if not, fetch it from releases.json
+ if (Object.keys(releasesMap).length === 0) {
+ releasesMap = await fetch('./releases.json')
+ .then(res => res.ok ? res.json() : {})
+ .catch(() => ({}));
}
-
- // Process the data to include metadata and a 'new' flag
- const processedItems = hfItems.map(item => {
- const createdAt = new Date(item.createdAt);
- const lastModified = new Date(item.lastModified);
- const isNew = (new Date() - createdAt) / (1000 * 60 * 60 * 24) < REFRESH_INTERVAL_DAYS;
-
- // Extract tags from the YAML metadata (handling different structures)
- const rawTags = (item.cardData?.tags || item.tags || []).map(t => String(t).toLowerCase());
- const tags = [...new Set(rawTags.flatMap(t => normalizeTag(t, tagLookup)).filter(Boolean))];
- const displayTags = rawTags.filter(t => !t.includes(':'));
- tags.forEach(tag => tagsMap[repoType].add(tag));
-
- return {
- ...item,
- repoType,
- createdAt,
- lastModified,
- isNew,
- archived: false,
- likes: item.likes || 0,
- tags,
- rawTags,
- displayTags
- };
- });
-
- allItems[repoType] = processedItems;
- fetchedData[repoType] = true;
-
- skeletons.forEach(s => s.classList.add('hidden'));
-
- return processedItems;
- } catch (error) {
- handleError(error, `Failed to fetch ${repoType}. Please check your network connection or the API.`);
- return [];
- }
-};
-
-/**
- * Fetches statistics for the Catalog repository itself (Stars, Forks, Version)
- * populates the badge in the top right corner.
- */
-const fetchCatalogStats = async () => {
- // Helper: Updates text, shows the specific stat, and ensures the divider is visible
- const update = (textId, containerId, value) => {
- const el = document.getElementById(textId);
- const container = document.getElementById(containerId);
- if (el && container && value !== undefined) {
- el.innerText = value;
- if (value != 0) {
- container.classList.remove('hidden');
- container.classList.add('flex');
- }
- }
- };
-
- try {
- //TODO: Update stars and forks to support other platforms (GitLab, Codeberg) once implemented
- // 1. Get Stars & Forks
- const repo = await fetch(`${REPO_API_URL}${ORGANIZATION_NAME}/${CATALOG_REPO_NAME}`).then(r => r.ok ? r.json() : {});
- if (repo.stargazers_count !== undefined) update('gh-stars', 'gh-star-container', repo.stargazers_count);
- if (repo.forks_count !== undefined) update('gh-forks', 'gh-fork-container', repo.forks_count);
-
- // 2. Get Version (Tag)
- // TODO: Import from package.json
- const release = await fetch(`${REPO_API_URL}${ORGANIZATION_NAME}/${CATALOG_REPO_NAME}/releases/latest`).then(r => r.ok ? r.json() : {});
- if (release.tag_name) update('gh-tag', 'gh-version-container', release.tag_name);
-
- } catch (e) {
- console.warn("Could not fetch Code Repo stats", e);
- }
-};
-
-//
-// SECTION 3: RENDERING LOGIC
-//
-
-/**
- * Escapes HTML special characters in a string to prevent XSS.
- * @param {string} str - The input string.
- * @returns {string} The escaped string.
- */
-const escapeHTML = (str) => {
- if (!str) return "";
- return str.replace(/[&<>"']/g, (m) => ({
- '&': '&',
- '<': '<',
- '>': '>',
- '"': '"',
- "'": '''
- }[m]));
-};
-
-/**
- * Adds word break opportunities after underscores to allow proper text wrapping.
- * @param {string} str - The input string.
- * @returns {string} The string with tags inserted after underscores.
- */
-const addWordBreakOpportunities = (str) => {
- if (!str) return "";
- // Replace underscores with underscore + word break opportunity
- return str.replace(/_/g, '_');
-};
-
-/**
- * Renders a single item card (code, dataset, model, or space) to HTML.
- * @param {Object} item - The item object to render.
- * @param {string} repoType - The type of repository.
- * @returns {string} The HTML string for the item card.
- */
-const renderHubItemCard = (item, repoType) => {
- const lastUpdatedDate = new Date(item.lastModified).toLocaleDateString();
- const tagsHtml = (item.displayTags || item.rawTags || []).map(tag =>
- `${tag}`
- ).join('');
-
- // Use pretty_name for the heading, with a fallback
- // HF API keys for CardData: https://huggingface.co/docs/huggingface_hub/main/en/package_reference/cards#huggingface_hub.CardData
- // datasets have pretty_name, models have model_name, spaces have title
- const prettyName = item.cardData?.pretty_name || item.cardData?.model_name || item.cardData?.title || item.id.split('/')[1];
-
- // Use the description from cardData, with fallbacks
- const displayDescription = item.cardData?.description || item.cardData?.model_description || item.description || 'No description provided.';
-
- // Construct the correct URL based on the repository type
- let itemUrl;
-
- switch (item.repoType) {
- case "code":
- itemUrl = item.html_url;
- break;
- case "datasets":
- itemUrl = `https://huggingface.co/datasets/${item.id}`;
- break;
- case "spaces":
- itemUrl = `https://huggingface.co/spaces/${item.id}`;
- break;
- case "models":
- itemUrl = `https://huggingface.co/${item.id}`;
- break;
- default:
- // fallback for "all"
- itemUrl = `https://huggingface.co/${item.id}`;
- break;
+ items = await fetchCodeRepos(
+ PLATFORM,
+ ADDITIONAL_REPOS,
+ ORG_API_URL,
+ REPO_API_URL,
+ REFRESH_INTERVAL_DAYS,
+ releasesMap
+ );
+ } else {
+ items = await fetchHfRepos(
+ repoType,
+ ADDITIONAL_HF_REPOS,
+ API_BASE_URL,
+ HF_ORGANIZATION_NAME,
+ REFRESH_INTERVAL_DAYS
+ );
}
- // stars for code repos
- const badgeHtml = (() => {
- if (item.isNew) {
- return `
- New!
- `;
- }
-
- if (typeof item.cardData.stars === "number" && item.cardData.stars > 0) {
- return `
- ⭐ ${item.cardData.stars}
- `;
- }
-
- if (typeof item.likes === "number" && item.likes > 0) {
- return `
-
- ❤️ ${item.likes}
- `;
- }
- return "";
- })();
-
- const escapedTitle = escapeHTML(prettyName);
- const displayTitle = addWordBreakOpportunities(escapedTitle);
-
- return `
-
diff --git a/public/config.yaml b/public/config.yaml
index c8b42d5..64f9781 100644
--- a/public/config.yaml
+++ b/public/config.yaml
@@ -22,7 +22,7 @@ COLORS:
tag: "#4fb797a1" # Tag background color (ABC turquoise 63% alpha)
# API & Behavior Settings
-# Codebase platform for API calls and link generation. Supported values: "github", pending: "codeberg" or "gitlab".
+# Codebase platform for API calls and link generation. Supported values: "github" or "codeberg", pending: "gitlab".
PLATFORM: github
# Dataset, model, and space (demo) default: Hugging Face, other platforms would require a custom module
API_BASE_URL: "https://huggingface.co/api/"
diff --git a/src/api/fetchCodeRepos.js b/src/api/fetchCodeRepos.js
index a427a2b..a0f87ea 100644
--- a/src/api/fetchCodeRepos.js
+++ b/src/api/fetchCodeRepos.js
@@ -2,6 +2,23 @@ import { handleError } from '../ui/render.js';
import { normalizeTag, filterDisplayTags } from '../utils/normalizeTag.js';
import { getPlatformDisplay } from '../utils/defineRibbonVals.js';
+// Define platform-specific values
+const PLATFORM_CONFIGS = {
+ github: {
+ starsKey: 'stargazers_count',
+ profileRepo: '.github'
+ },
+ /* gitlab: {
+ starsKey: 'star_count',
+ profileRepo: 'gitlab-profile',
+ //TODO
+ }, */
+ codeberg: {
+ starsKey: 'stars_count',
+ profileRepo: '.profile'
+ }
+};
+
/**
* Function for fetching code repositories from the specified platform (GitHub, GitLab, or Codeberg).
* Both org-owned (non-forks) and additional repos are fetched; metadata is processed for each repo.
@@ -28,6 +45,9 @@ export async function fetchCodeRepos(
let allRepos = [];
let nextUrl = `${orgApiUrl}`;
+ // get platform-specific keys
+ const platformConfig = PLATFORM_CONFIGS[platform.toLowerCase()];
+ const { starsKey, profileRepo } = platformConfig;
try {
while (nextUrl) {
const ghResponse = await fetch(nextUrl);
@@ -72,7 +92,10 @@ export async function fetchCodeRepos(
// Keep only non-forks from org; deduplicate against additional repos by full_name
const orgRepoNames = new Set(filteredAdditionalRepos.map(r => r.full_name));
- const orgNonForks = allRepos.filter(repo => repo.name !== ".github" && !repo.fork && !orgRepoNames.has(repo.full_name));
+ const orgNonForks = allRepos.filter(repo =>
+ repo.name !== profileRepo &&
+ !repo.fork &&
+ !orgRepoNames.has(repo.full_name));
// Process additional repos and all remaining org non-forks to include metadata and 'new' flag as appropriate
let processedItems = [...filteredAdditionalRepos, ...orgNonForks]
@@ -105,7 +128,7 @@ export async function fetchCodeRepos(
cardData: {
pretty_name: repo.name, // , the one used for card title display
description: repo.description,
- stars: repo.stargazers_count || 0
+ stars: repo[starsKey] ?? 0
}
};
});
diff --git a/src/api/fetchStats.js b/src/api/fetchStats.js
index fc0c0bd..76f6888 100644
--- a/src/api/fetchStats.js
+++ b/src/api/fetchStats.js
@@ -24,13 +24,13 @@ export const fetchCatalogStats = async (repoApiUrl, organizationName, catalogRep
//TODO: Update stars and forks to support other platforms (GitLab, Codeberg) once implemented
// 1. Get Stars & Forks
const repo = await fetch(`${repoApiUrl}${organizationName}/${catalogRepoName}`).then(r => r.ok ? r.json() : {});
- if (repo.stargazers_count !== undefined) update('gh-stars', 'gh-star-container', repo.stargazers_count);
+ if (repo.stargazers_count !== undefined || repo.stars_count !== undefined) update('gh-stars', 'gh-star-container', repo.stargazers_count || repo.stars_count);
if (repo.forks_count !== undefined) update('gh-forks', 'gh-fork-container', repo.forks_count);
// 2. Get Version (Tag)
// TODO: Import from package.json
const release = await fetch(`${repoApiUrl}${organizationName}/${catalogRepoName}/releases/latest`).then(r => r.ok ? r.json() : {});
- if (release.tag_name) update('gh-tag', 'gh-version-container', release.tag_name);
+ if (release.tag_name !== undefined) update('gh-tag', 'gh-version-container', release.tag_name);
} catch (e) {
console.warn("Could not fetch Code Repo stats", e);
diff --git a/src/assets/GitHub_Invertocat.svg b/src/assets/GitHub_Invertocat.svg
new file mode 100755
index 0000000..5300969
--- /dev/null
+++ b/src/assets/GitHub_Invertocat.svg
@@ -0,0 +1,10 @@
+
diff --git a/src/assets/codeberg-logo_icon_white.svg b/src/assets/codeberg-logo_icon_white.svg
new file mode 100644
index 0000000..74a0fa9
--- /dev/null
+++ b/src/assets/codeberg-logo_icon_white.svg
@@ -0,0 +1,164 @@
+
+
diff --git a/src/ui/initUserInterface.js b/src/ui/initUserInterface.js
index 8dd1691..c8c250d 100644
--- a/src/ui/initUserInterface.js
+++ b/src/ui/initUserInterface.js
@@ -55,8 +55,8 @@ export const initializeUIFromConfig = (config) => {
const platformDisplay = getPlatformDisplay(config.PLATFORM);
if (repoRibbon && platformDisplay) {
repoRibbon.href = `${platformDisplay.ribbonUrl}${config.ORGANIZATION_NAME}/${config.CATALOG_REPO_NAME}`;
- const pathElement = document.getElementById('repo-ribbon-icon');
- pathElement.setAttribute('d', platformDisplay.path);
+ const svgElement = document.getElementById('repo-ribbon-icon-container');
+ svgElement.innerHTML = platformDisplay.svg;
const platformDisplayName = document.getElementById('platform-display-name');
platformDisplayName.textContent = platformDisplay.displayName || config.PLATFORM;
repoRibbon.style.backgroundColor = config.COLORS.secondary;
diff --git a/src/utils/defineApiUrls.js b/src/utils/defineApiUrls.js
index 5b20e43..2d68025 100644
--- a/src/utils/defineApiUrls.js
+++ b/src/utils/defineApiUrls.js
@@ -1,17 +1,17 @@
/**
- * Defines API URLs based on the selected platform (GitHub, note: GitLab and Codeberg support under development).
+ * Defines API URLs based on the selected platform (GitHub or Codeberg, note: GitLab support under development).
* This allows the rest of the codebase to use these constants when making API calls,
* abstracting away platform-specific URL structures.
- *
+ *
* Usage: import { getPlatformApiUrls } from './defineApiUrls.js';
- *
+ *
* Input: platform and organizationName (e.g., 'github' and 'imageomics'), defined from config.yaml and passed to this function.
* Output: platformApiUrls[platform] = { org: ORG_API_URL, repo: REPO_API_URL }
*/
/**
* Utility function to get the platform-specific API URLs for organization repos and individual repo details.
- * @param {string} platform - 'github', pending: 'gitlab', or 'codeberg'
+ * @param {string} platform - 'github' or 'codeberg', pending: 'gitlab'
* @param {string} organizationName - The name of the organization (used in URL construction)
* @returns {object} An object containing ORG_API_URL and REPO_API_URL
*/
@@ -25,10 +25,10 @@ export function getPlatformApiUrls(platform, organizationName) {
// org: `https://gitlab.com/api/v4/groups/${organizationName}/projects?per_page=100`,
// repo: "https://gitlab.com/api/v4/projects/"
// },
- // codeberg: {
- // org: `https://codeberg.org/api/v1/orgs/${organizationName}/repos?limit=50`,
- // repo: "https://codeberg.org/api/v1/repos/"
- // }
+ codeberg: {
+ org: `https://codeberg.org/api/v1/orgs/${organizationName}/repos?limit=50`,
+ repo: "https://codeberg.org/api/v1/repos/"
+ }
};
return platformApiUrls[platform.toLowerCase()];
}
diff --git a/src/utils/defineRibbonVals.js b/src/utils/defineRibbonVals.js
index 9ab64a0..7a4486d 100644
--- a/src/utils/defineRibbonVals.js
+++ b/src/utils/defineRibbonVals.js
@@ -1,16 +1,19 @@
/**
- * A collection of platform-specific display information (e.g., SVG path data)
- * for code developer platforms including GitHub, pending: GitLab and Codeberg.
+ * A collection of platform-specific display information (e.g., SVGs and URLs)
+ * for code developer platforms including GitHub and Codeberg, pending: GitLab.
* Used for linking to repo and rendering icon and platform name in the ribbon component of the UI.
- * All paths are optimized for a 0 0 24 24 viewBox.
*
* Usage: import { getPlatformDisplay } from './defineRibbonVals.js';
*
* Input: platform (e.g., 'github'), defined from config.yaml and passed to this function.
- * Output: platformDisplays[platform] = { path: SVG_PATH_DATA, viewBox: VIEWBOX_DATA,
+ * Output: platformDisplays[platform] = { svg: CODE_PLATFORM_SVG,
* displayName: DISPLAY_NAME, ribbonUrl: RIBBON_URL }
*/
+import githubSvg from '../assets/GitHub_Invertocat.svg?raw';
+// import gitlabSvg from '../assets/gitlab-logo-700-rgb.svg?raw';
+import codebergSvg from '../assets/codeberg-logo_icon_white.svg?raw';
+
/**
* Utility function to get the full platform display information
* @param {string} platform - 'github', 'gitlab', or 'codeberg'
@@ -19,25 +22,20 @@
export function getPlatformDisplay(platform) {
const platformDisplays = {
github: {
- path: "M12 2C6.477 2 2 6.484 2 12.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0112 6.844c.85.004 1.705.115 2.504.337 1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.202 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.943.359.309.678.92.678 1.855 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.019 10.019 0 0022 12.017C22 6.484 17.522 2 12 2z",
- viewBox: "0 0 24 24",
+ svg: githubSvg,
displayName: "GitHub",
ribbonUrl: "https://github.com/"
},
// gitlab: {
- // path: "m23.71 11.83-2.13-6.52a.89.89 0 0 0-1.7 0l-2.13 6.52H6.25L4.12 5.31a.89.89 0 0 0-1.7 0L.29 11.83a1 1 0 0 0 .37 1.13l11.34 8.24 11.34-8.24a1 1 0 0 0 .37-1.13Z",
- // viewBox: "0 0 24 24",
- // color: "#FC6D26",
+ // svg: gitlabSvg,
// displayName: "GitLab",
// ribbonUrl: "https://gitlab.com/"
//},
- // codeberg: {
- // path: "M12.004 2.378a.636.636 0 0 0-.547.31L1.258 19.874a.636.636 0 0 0 .547.954h1.94c.143 0 .278-.074.354-.197L12 6.544l7.89 14.087a.406.406 0 0 0 .354.197h2.012a.636.636 0 0 0 .546-.954L12.551 2.688a.636.636 0 0 0-.547-.31Z",
- // viewBox: "0 0 24 24",
- // color: "#2185d0",
- // displayName: "Codeberg",
- // ribbonUrl: "https://codeberg.org/"
- //}
+ codeberg: {
+ svg: codebergSvg,
+ displayName: "Codeberg",
+ ribbonUrl: "https://codeberg.org/"
+ }
};
return platformDisplays[platform.toLowerCase()];
}
diff --git a/src/validateConfig.js b/src/validateConfig.js
index d903afe..78264d8 100644
--- a/src/validateConfig.js
+++ b/src/validateConfig.js
@@ -31,11 +31,11 @@ export function validateConfig(config) {
}
if (!config.ORG_NAME) errors.push('ORG_NAME');
if (!config.CATALOG_REPO_NAME) errors.push('CATALOG_REPO_NAME');
-
- /** Update to include 'codeberg' and 'gitlab' once supported
+
+ /** Update to include 'gitlab' once supported
* PLATFORM will be parsed without whitespace, but must be string to avoid undefined errors
*/
- const supportedPlatforms = ['github'];
+ const supportedPlatforms = ['github', 'codeberg'];
const platform = config.PLATFORM;
if (!platform || typeof platform !== 'string') {
errors.push('PLATFORM');
diff --git a/tests/api/fetchCodeRepos.test.js b/tests/api/fetchCodeRepos.test.js
index 98c594b..55e815e 100644
--- a/tests/api/fetchCodeRepos.test.js
+++ b/tests/api/fetchCodeRepos.test.js
@@ -14,7 +14,32 @@ vi.mock('../../src/utils/defineRibbonVals.js', () => ({
getPlatformDisplay: vi.fn(() => 'GitHub')
}));
-describe('fetchCodeRepos', () => {
+// define configs for each platform
+const platformConfigs = [
+ {
+ name: 'github',
+ orgApiUrl: 'https://api.github.com/orgs/test-org/repos',
+ repoApiUrl: 'https://api.github.com/repos/',
+ platformProfileRepo: '.github',
+ starsKey: 'stargazers_count'
+ },
+ /* {
+ name: 'gitlab',
+ orgApiUrl: 'https://gitlab.com/api/v4/groups/test-org/projects',
+ repoApiUrl: 'https://gitlab.com/api/v4/projects/',
+ platformProfileRepo: 'gitlab-profile',
+ starsKey: 'star_count'
+ }, */
+ {
+ name: 'codeberg',
+ orgApiUrl: 'https://codeberg.org/api/v1/orgs/test-org/repos',
+ repoApiUrl: 'https://codeberg.org/api/v1/repos/',
+ platformProfileRepo: '.profile',
+ starsKey: 'stars_count'
+ }
+];
+
+describe.each(platformConfigs)('fetchCodeRepos - $name', (platformConfig) => {
const originalFetch = global.fetch;
beforeEach(() => {
@@ -25,8 +50,11 @@ describe('fetchCodeRepos', () => {
vi.clearAllMocks();
});
- const orgApiUrl = 'https://api.github.com/orgs/test-org/repos';
- const repoApiUrl = 'https://api.github.com/repos/';
+ const orgApiUrl = platformConfig.orgApiUrl;
+ const repoApiUrl = platformConfig.repoApiUrl;
+ const platform = platformConfig.name;
+ const starsKey = platformConfig.starsKey;
+ const platformProfileRepo = platformConfig.platformProfileRepo;
const refreshIntervalDays = 30;
const releasesMap = {};
@@ -37,7 +65,7 @@ describe('fetchCodeRepos', () => {
const oldestDateISO = new Date(now.getTime() - 90 * 24 * 60 * 60 * 1000).toISOString(); // 90 days ago
it('maps raw repo data and attaches release data from releasesMap', async () => {
- // Mock a single page GitHub response
+ // Mock a single page platform response
global.fetch.mockResolvedValueOnce({
ok: true,
headers: { get: () => null }, // No 'link' header means no pagination
@@ -47,7 +75,7 @@ describe('fetchCodeRepos', () => {
updated_at: now.toISOString(),
created_at: recentDateISO,
topics: ['python'],
- stargazers_count: 42,
+ [starsKey]: 42,
}])
});
@@ -57,7 +85,7 @@ describe('fetchCodeRepos', () => {
};
const items = await fetchCodeRepos(
- 'github',
+ platform,
[], // No additional repos
orgApiUrl,
repoApiUrl,
@@ -108,7 +136,7 @@ describe('fetchCodeRepos', () => {
});
const items = await fetchCodeRepos(
- 'github',
+ platform,
[],
orgApiUrl,
repoApiUrl,
@@ -164,7 +192,7 @@ describe('fetchCodeRepos', () => {
];
const items = await fetchCodeRepos(
- 'github',
+ platform,
additionalRepos,
orgApiUrl,
repoApiUrl,
@@ -189,8 +217,8 @@ describe('fetchCodeRepos', () => {
expect(items.map(i => i.id)).toContain('external-org/external-additional');
});
- // Test that forks and .github repos are excluded from the final list
- it('excludes repository targets designated as forks and .github', async () => {
+ // Test that forks and platform profile repos are excluded from the final list
+ it('excludes repository targets designated as forks and platform profile repos', async () => {
global.fetch.mockResolvedValueOnce({
ok: true,
headers: { get: () => null },
@@ -217,8 +245,8 @@ describe('fetchCodeRepos', () => {
updated_at: recentDateISO
},
{
- full_name: 'test-org/.github',
- name: '.github',
+ full_name: `test-org/${platformProfileRepo}`,
+ name: platformProfileRepo,
fork: false,
created_at: recentDateISO,
updated_at: recentDateISO
@@ -231,7 +259,7 @@ describe('fetchCodeRepos', () => {
];
const items = await fetchCodeRepos(
- 'github',
+ platform,
additionalRepos,
orgApiUrl,
repoApiUrl,
@@ -242,7 +270,7 @@ describe('fetchCodeRepos', () => {
expect(items.map(i => i.id)).toContain('test-org/valid-repo');
expect(items.map(i => i.id)).toContain('test-org/forked-in-list');
expect(items.map(i => i.id)).not.toContain('test-org/forked-repo');
- expect(items.map(i => i.id)).not.toContain('test-org/.github');
+ expect(items.map(i => i.id)).not.toContain(`test-org/${platformProfileRepo}`);
});
// Test that isNew flag is set correctly based on creation date and refresh interval
@@ -267,7 +295,7 @@ describe('fetchCodeRepos', () => {
});
const items = await fetchCodeRepos(
- 'github',
+ platform,
[],
orgApiUrl,
repoApiUrl,
@@ -292,7 +320,7 @@ describe('fetchCodeRepos', () => {
});
const items = await fetchCodeRepos(
- 'github',
+ platform,
[],
orgApiUrl,
repoApiUrl,
@@ -302,7 +330,7 @@ describe('fetchCodeRepos', () => {
expect(handleError).toHaveBeenCalledWith(
expect.any(Error),
- expect.stringContaining('Failed to fetch code from github')
+ expect.stringContaining(`Failed to fetch code from ${platform}`)
);
expect(items).toEqual([]);
});
From ce180ae8284b247acf47f617cac499b352ead4f6 Mon Sep 17 00:00:00 2001
From: Elizabeth Campolongo <38985481+egrace479@users.noreply.github.com>
Date: Fri, 7 Aug 2026 11:14:57 -0500
Subject: [PATCH 07/12] Struct/platform keys
Pulled from Imageomics catalog [PR 126](https://github.com/Imageomics/catalog/pull/126)
cherry-pick commit: 1a5e7bad2f362acdcaee06802ba7e541ff909354
* Consolidate platform-specific non-ui value fetches in dedicated file
Reduces platform-specific edits required to token-handling in scripts
* Remove duplicated key from return
fallback defined at UI render
* Revise data mapping test
---
main.js | 33 ++++++----
scripts/export-tags.js | 7 ++-
scripts/fetch-releases.js | 17 +++---
src/api/fetchCodeRepos.js | 40 ++++--------
src/api/fetchStats.js | 8 ++-
src/utils/defineApiUrls.js | 34 -----------
src/utils/definePlatformVals.js | 78 ++++++++++++++++++++++++
tests/api/fetchCodeRepos.test.js | 101 ++++++++++++++++++-------------
8 files changed, 185 insertions(+), 133 deletions(-)
delete mode 100644 src/utils/defineApiUrls.js
create mode 100644 src/utils/definePlatformVals.js
diff --git a/main.js b/main.js
index 3fe7cb4..d47902b 100644
--- a/main.js
+++ b/main.js
@@ -10,7 +10,7 @@ import { load } from 'js-yaml';
import { initializeUIFromConfig, setThemeToggle } from './src/ui/initUserInterface.js';
import { parseUrlParams, updateUrlParams, getCurrentState } from './src/ui/urlManager.js';
import { renderItemList } from './src/ui/render.js';
-import { getPlatformApiUrls } from './src/utils/defineApiUrls.js';
+import { getPlatformApiUrls } from './src/utils/definePlatformVals.js';
import { filterItems, sortItems } from './src/utils/filterAndSort.js';
import { fetchCodeRepos } from './src/api/fetchCodeRepos.js';
import { fetchHfRepos } from './src/api/fetchHfRepos.js';
@@ -28,7 +28,7 @@ const configPromise = fetch('config.yaml')
// Module-scope lets — assigned after config loads, used by all functions below
let CONFIG;
let ORGANIZATION_NAME, HF_ORGANIZATION_NAME, CATALOG_REPO_NAME, PLATFORM, API_BASE_URL, REFRESH_INTERVAL_DAYS, ADDITIONAL_REPOS, ADDITIONAL_HF_REPOS;
-let ORG_API_URL, REPO_API_URL;
+let ORG_API_URL, REPO_API_URL, RELEASE_SUFFIX;
let releasesMap = {};
@@ -206,16 +206,23 @@ document.addEventListener('DOMContentLoaded', async () => {
}
// Assign module-scope variables used by all functions
- ORGANIZATION_NAME = CONFIG.ORGANIZATION_NAME;
- HF_ORGANIZATION_NAME = CONFIG.HF_ORGANIZATION_NAME;
- CATALOG_REPO_NAME = CONFIG.CATALOG_REPO_NAME;
- PLATFORM = CONFIG.PLATFORM;
- ORG_API_URL = getPlatformApiUrls(PLATFORM, ORGANIZATION_NAME).org;
- REPO_API_URL = getPlatformApiUrls(PLATFORM, ORGANIZATION_NAME).repo;
- API_BASE_URL = CONFIG.API_BASE_URL;
- REFRESH_INTERVAL_DAYS = CONFIG.REFRESH_INTERVAL_DAYS;
- ADDITIONAL_REPOS = CONFIG.ADDITIONAL_REPOS;
- ADDITIONAL_HF_REPOS = CONFIG.ADDITIONAL_HF_REPOS;
+ // Destructure CONFIG into individual variables for easier access
+ ({
+ ORGANIZATION_NAME,
+ HF_ORGANIZATION_NAME,
+ CATALOG_REPO_NAME,
+ PLATFORM,
+ API_BASE_URL,
+ REFRESH_INTERVAL_DAYS,
+ ADDITIONAL_REPOS,
+ ADDITIONAL_HF_REPOS
+ } = CONFIG);
+ // Destructure platform-specific API URLs from getPlatformApiUrls
+ ({
+ org: ORG_API_URL,
+ repo: REPO_API_URL,
+ releaseSuffix: RELEASE_SUFFIX
+ } = getPlatformApiUrls(PLATFORM, ORGANIZATION_NAME));
// Guard: if ORGANIZATION_NAME or HF_ORGANIZATION_NAME is missing (e.g. config.yaml failed to load),
// stop here — proceeding would fire requests like ?author=&full=true which
@@ -289,7 +296,7 @@ document.addEventListener('DOMContentLoaded', async () => {
});
// Initialize the Catalog Badge (Stars/Forks/Version)
- fetchCatalogStats(REPO_API_URL, ORGANIZATION_NAME, CATALOG_REPO_NAME)
+ fetchCatalogStats(REPO_API_URL, ORGANIZATION_NAME, CATALOG_REPO_NAME, RELEASE_SUFFIX)
// Load pre-built release data (written by scripts/fetch-releases.js at build time)
releasesMap = await fetch('./releases.json')
diff --git a/scripts/export-tags.js b/scripts/export-tags.js
index 7ab2497..ed18d6f 100644
--- a/scripts/export-tags.js
+++ b/scripts/export-tags.js
@@ -17,9 +17,9 @@ import path from 'path';
import { fileURLToPath } from 'url';
import { load } from 'js-yaml';
import { validateConfig } from '../src/validateConfig.js';
-import { getPlatformApiUrls } from '../src/utils/defineApiUrls.js';
import { getPlatformDisplay } from '../src/utils/defineRibbonVals.js';
import { filterNewAdditionalEntries } from '../src/utils/filterNewAdditionalEntries.js';
+import { getPlatformVals, getPlatformApiUrls } from '../src/utils/definePlatformVals.js';
const __dirname = path.dirname(fileURLToPath(import.meta.url));
@@ -60,6 +60,7 @@ const get = async (url) => {
// ---------------------------------------------------------------------------
const allTags = new Set();
const { org: ORG_API_URL, repo: REPO_API_URL } = getPlatformApiUrls(PLATFORM, ORGANIZATION_NAME);
+const { profileRepo, fullNameKey, forkKey } = getPlatformVals(PLATFORM);
const collectCodePlatformTags = async () => {
const platformDisplay = getPlatformDisplay(PLATFORM);
@@ -85,8 +86,8 @@ const collectCodePlatformTags = async () => {
);
const additionalRepos = additionalData.filter(Boolean);
- const additionalNames = new Set(additionalRepos.map(r => r.full_name));
- const orgNonForks = allRepos.filter(r => r.name !== '.github' && !r.fork && !additionalNames.has(r.full_name));
+ const additionalNames = new Set(additionalRepos.map(r => r[fullNameKey]));
+ const orgNonForks = allRepos.filter(r => r.name !== profileRepo && !r[forkKey] && !additionalNames.has(r[fullNameKey]));
[...additionalRepos, ...orgNonForks].forEach(repo => {
(repo.topics || []).forEach(t => allTags.add(t.toLowerCase()));
diff --git a/scripts/fetch-releases.js b/scripts/fetch-releases.js
index 933ce34..4d3f977 100644
--- a/scripts/fetch-releases.js
+++ b/scripts/fetch-releases.js
@@ -6,7 +6,7 @@ import { fileURLToPath } from 'url';
import { dirname, join } from 'path';
import { load } from 'js-yaml';
import { validateConfig } from '../src/validateConfig.js';
-import { getPlatformApiUrls } from '../src/utils/defineApiUrls.js';
+import { getPlatformVals, getPlatformApiUrls } from '../src/utils/definePlatformVals.js';
const __filename = fileURLToPath(import.meta.url);
const __dirname = dirname(__filename);
@@ -28,7 +28,8 @@ const headers = TOKEN
const TWO_WEEKS_MS = 14 * 24 * 60 * 60 * 1000;
// Step 1: Fetch all public org repos (paginated, same logic as main.js)
-const { org: ORG_API_URL, repo: REPO_API_URL } = getPlatformApiUrls(CONFIG.PLATFORM, CONFIG.ORGANIZATION_NAME);
+const { org: ORG_API_URL, repo: REPO_API_URL, releaseSuffix: RELEASE_SUFFIX } = getPlatformApiUrls(CONFIG.PLATFORM, CONFIG.ORGANIZATION_NAME);
+const { profileRepo, fullNameKey, forkKey, urlKey, releasePublishedAtKey } = getPlatformVals(CONFIG.PLATFORM);
let allOrgRepos = [];
let nextUrl = `${ORG_API_URL}`;
while (nextUrl) {
@@ -47,24 +48,24 @@ while (nextUrl) {
// Step 2: Collect all code repo IDs (mirrors main.js deduplication logic)
const additionalRepoIds = CONFIG.ADDITIONAL_REPOS || [];
const additionalRepoSet = new Set(additionalRepoIds);
-const orgNonForks = allOrgRepos.filter(r => r.name !== '.github' && !r.fork && !additionalRepoSet.has(r.full_name));
+const orgNonForks = allOrgRepos.filter(r => r.name !== profileRepo && !r[forkKey] && !additionalRepoSet.has(r[fullNameKey]));
const repoIds = [
...additionalRepoIds,
- ...orgNonForks.map(r => r.full_name),
+ ...orgNonForks.map(r => r[fullNameKey]),
];
// Step 3: Fetch latest release for each repo
const releases = {};
for (const id of repoIds) {
try {
- const res = await fetch(`${REPO_API_URL}${id}/releases/latest`, { headers });
+ const res = await fetch(`${REPO_API_URL}${id}/${RELEASE_SUFFIX}`, { headers });
if (!res.ok) { releases[id] = null; continue; }
const data = await res.json();
releases[id] = {
tag: data.tag_name,
- url: data.html_url,
- publishedAt: data.published_at,
- isNew: (Date.now() - new Date(data.published_at)) < TWO_WEEKS_MS,
+ url: data[urlKey],
+ publishedAt: data[releasePublishedAtKey],
+ isNew: (Date.now() - new Date(data[releasePublishedAtKey])) < TWO_WEEKS_MS,
};
} catch {
releases[id] = null;
diff --git a/src/api/fetchCodeRepos.js b/src/api/fetchCodeRepos.js
index a0f87ea..5f6dba4 100644
--- a/src/api/fetchCodeRepos.js
+++ b/src/api/fetchCodeRepos.js
@@ -1,23 +1,7 @@
import { handleError } from '../ui/render.js';
-import { normalizeTag, filterDisplayTags } from '../utils/normalizeTag.js';
+import { getPlatformVals } from '../utils/definePlatformVals.js';
import { getPlatformDisplay } from '../utils/defineRibbonVals.js';
-
-// Define platform-specific values
-const PLATFORM_CONFIGS = {
- github: {
- starsKey: 'stargazers_count',
- profileRepo: '.github'
- },
- /* gitlab: {
- starsKey: 'star_count',
- profileRepo: 'gitlab-profile',
- //TODO
- }, */
- codeberg: {
- starsKey: 'stars_count',
- profileRepo: '.profile'
- }
-};
+import { normalizeTag, filterDisplayTags } from '../utils/normalizeTag.js';
/**
* Function for fetching code repositories from the specified platform (GitHub, GitLab, or Codeberg).
@@ -46,8 +30,7 @@ export async function fetchCodeRepos(
let allRepos = [];
let nextUrl = `${orgApiUrl}`;
// get platform-specific keys
- const platformConfig = PLATFORM_CONFIGS[platform.toLowerCase()];
- const { starsKey, profileRepo } = platformConfig;
+ const { starsKey, profileRepo, fullNameKey, forkKey, urlKey } = getPlatformVals(platform);
try {
while (nextUrl) {
const ghResponse = await fetch(nextUrl);
@@ -68,7 +51,7 @@ export async function fetchCodeRepos(
// For org-owned entries in additionalRepos, reuse data already in allRepos to avoid redundant API calls.
// Only fetch entries that belong to a different org (external repos).
- const allReposByFullName = new Map(allRepos.map(r => [r.full_name, r]));
+ const allReposByFullName = new Map(allRepos.map(r => [r[fullNameKey], r]));
const toFetch = additionalRepos.filter(ownerRepo => !allReposByFullName.has(ownerRepo));
const fromAllRepos = additionalRepos.map(ownerRepo => allReposByFullName.get(ownerRepo)).filter(Boolean);
@@ -91,11 +74,11 @@ export async function fetchCodeRepos(
const filteredAdditionalRepos = [...fromAllRepos, ...fetchedExternalData.filter(Boolean)];
// Keep only non-forks from org; deduplicate against additional repos by full_name
- const orgRepoNames = new Set(filteredAdditionalRepos.map(r => r.full_name));
+ const orgRepoNames = new Set(filteredAdditionalRepos.map(r => r[fullNameKey]));
const orgNonForks = allRepos.filter(repo =>
repo.name !== profileRepo &&
- !repo.fork &&
- !orgRepoNames.has(repo.full_name));
+ !repo[forkKey] &&
+ !orgRepoNames.has(repo[fullNameKey]));
// Process additional repos and all remaining org non-forks to include metadata and 'new' flag as appropriate
let processedItems = [...filteredAdditionalRepos, ...orgNonForks]
@@ -108,10 +91,10 @@ export async function fetchCodeRepos(
const tags = [...new Set(rawTags.flatMap(t => normalizeTag(t)).filter(Boolean))];
const displayTags = filterDisplayTags(rawTags);
- const release = releasesMap[repo.full_name] ?? null;
+ const release = releasesMap[repo[fullNameKey]] ?? null;
return {
- id: repo.full_name, // "Imageomics/", used as backup if can't get repo.name
+ id: repo[fullNameKey], // "Imageomics/", used as backup if can't get repo.name
repoType: "code",
createdAt,
lastModified,
@@ -120,14 +103,13 @@ export async function fetchCodeRepos(
tags,
rawTags,
displayTags,
- description: repo.description || "No description provided.",
- html_url: repo.html_url,
+ description: repo.description, // fallback in display (render.js)
+ html_url: repo[urlKey],
hasNewRelease: release?.isNew ?? false,
latestReleaseUrl: release?.url ?? null,
latestReleaseTag: release?.tag ?? null,
cardData: {
pretty_name: repo.name, // , the one used for card title display
- description: repo.description,
stars: repo[starsKey] ?? 0
}
};
diff --git a/src/api/fetchStats.js b/src/api/fetchStats.js
index 76f6888..a287db8 100644
--- a/src/api/fetchStats.js
+++ b/src/api/fetchStats.js
@@ -4,9 +4,10 @@
* @param {string} repoApiUrl - The base API URL for the code platform (e.g., GitHub API URL)
* @param {string} organizationName - The organization name for the catalog repository
* @param {string} catalogRepoName - The repository name for the catalog itself
+ * @param {string} releaseSuffix - The suffix used for fetching the latest release information (e.g., 'releases/latest')
* @returns {Promise} - A promise that resolves when the stats have been fetched and displayed
*/
-export const fetchCatalogStats = async (repoApiUrl, organizationName, catalogRepoName) => {
+export const fetchCatalogStats = async (repoApiUrl, organizationName, catalogRepoName, releaseSuffix) => {
// Helper: Updates text, shows the specific stat, and ensures the divider is visible
const update = (textId, containerId, value) => {
const el = document.getElementById(textId);
@@ -21,7 +22,8 @@ export const fetchCatalogStats = async (repoApiUrl, organizationName, catalogRep
};
try {
- //TODO: Update stars and forks to support other platforms (GitLab, Codeberg) once implemented
+ //TODO: Update stars and forks to support other platforms: Add another || star for GitLab, platform isn't passed
+ // forks_count is shared
// 1. Get Stars & Forks
const repo = await fetch(`${repoApiUrl}${organizationName}/${catalogRepoName}`).then(r => r.ok ? r.json() : {});
if (repo.stargazers_count !== undefined || repo.stars_count !== undefined) update('gh-stars', 'gh-star-container', repo.stargazers_count || repo.stars_count);
@@ -29,7 +31,7 @@ export const fetchCatalogStats = async (repoApiUrl, organizationName, catalogRep
// 2. Get Version (Tag)
// TODO: Import from package.json
- const release = await fetch(`${repoApiUrl}${organizationName}/${catalogRepoName}/releases/latest`).then(r => r.ok ? r.json() : {});
+ const release = await fetch(`${repoApiUrl}${organizationName}/${catalogRepoName}/${releaseSuffix}`).then(r => r.ok ? r.json() : {});
if (release.tag_name !== undefined) update('gh-tag', 'gh-version-container', release.tag_name);
} catch (e) {
diff --git a/src/utils/defineApiUrls.js b/src/utils/defineApiUrls.js
deleted file mode 100644
index 2d68025..0000000
--- a/src/utils/defineApiUrls.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Defines API URLs based on the selected platform (GitHub or Codeberg, note: GitLab support under development).
- * This allows the rest of the codebase to use these constants when making API calls,
- * abstracting away platform-specific URL structures.
- *
- * Usage: import { getPlatformApiUrls } from './defineApiUrls.js';
- *
- * Input: platform and organizationName (e.g., 'github' and 'imageomics'), defined from config.yaml and passed to this function.
- * Output: platformApiUrls[platform] = { org: ORG_API_URL, repo: REPO_API_URL }
- */
-
-/**
- * Utility function to get the platform-specific API URLs for organization repos and individual repo details.
- * @param {string} platform - 'github' or 'codeberg', pending: 'gitlab'
- * @param {string} organizationName - The name of the organization (used in URL construction)
- * @returns {object} An object containing ORG_API_URL and REPO_API_URL
- */
-export function getPlatformApiUrls(platform, organizationName) {
- const platformApiUrls = {
- github: {
- org: `https://api.github.com/orgs/${organizationName}/repos?type=public&per_page=100`,
- repo: "https://api.github.com/repos/"
- },
- // gitlab: {
- // org: `https://gitlab.com/api/v4/groups/${organizationName}/projects?per_page=100`,
- // repo: "https://gitlab.com/api/v4/projects/"
- // },
- codeberg: {
- org: `https://codeberg.org/api/v1/orgs/${organizationName}/repos?limit=50`,
- repo: "https://codeberg.org/api/v1/repos/"
- }
- };
- return platformApiUrls[platform.toLowerCase()];
-}
diff --git a/src/utils/definePlatformVals.js b/src/utils/definePlatformVals.js
new file mode 100644
index 0000000..2cb9784
--- /dev/null
+++ b/src/utils/definePlatformVals.js
@@ -0,0 +1,78 @@
+/**
+ * Collection of functions to define platform-specific values for the catalog, such as API URLs, display values, and repo data keys.
+ * Each function returns dictionaries with the platform values that have been keyed by platform name (e.g., 'github', 'codeberg', 'gitlab') and potentially other instance-specific values (e.g., organizationName, repoApiUrl).
+ * Platform and organization name are defined from config.yaml and passed to the functions requiring them.
+*/
+
+
+/**
+ * Utility function to get platform-specific values for repo data keys (e.g., star count and profile repo name).
+ * @param {string} platform
+ * @returns {Object} platformVals - An object containing platform-specific values for repo data keys (e.g., star count and profile repo name)
+ */
+export function getPlatformVals(platform) {
+ const platformVals = {
+ github: {
+ starsKey: 'stargazers_count',
+ profileRepo: '.github',
+ fullNameKey: 'full_name',
+ forkKey: 'fork', //forks_count is shared
+ urlKey: 'html_url',
+ releasePublishedAtKey: 'published_at'
+ },
+ /* gitlab: {
+ starsKey: 'star_count',
+ profileRepo: 'gitlab-profile',
+ fullNameKey: 'name_with_namespace',
+ forkKey: 'forked_from_project',
+ urlKey: 'web_url',
+ releasePublishedAtKey: 'released_at'
+ }, */
+ codeberg: {
+ starsKey: 'stars_count',
+ profileRepo: '.profile',
+ fullNameKey: 'full_name',
+ forkKey: 'fork',
+ urlKey: 'html_url',
+ releasePublishedAtKey: 'published_at'
+ }
+};
+ return platformVals[platform.toLowerCase()];
+}
+
+
+/**
+ * Utility function to get the platform-specific API URLs for organization repos and individual repo details.
+ * Defines API URLs based on the selected platform (GitHub or Codeberg, note: GitLab support under development).
+ * This allows the rest of the codebase to use these constants when making API calls,
+ * abstracting away platform-specific URL structures.
+ *
+ * Usage: import { getPlatformApiUrls } from './definePlatformVals.js';
+ *
+ * Input: platform and organizationName (e.g., 'github' and 'imageomics'), defined from config.yaml and passed to this function.
+ * Output: platformApiUrls[platform] = { org: ORG_API_URL, repo: REPO_API_URL, releaseSuffix: RELEASE_SUFFIX }
+ *
+ * @param {string} platform - 'github' or 'codeberg', pending: 'gitlab'
+ * @param {string} organizationName - The name of the organization (used in URL construction)
+ * @returns {object} An object containing ORG_API_URL, REPO_API_URL, and RELEASE_SUFFIX
+ */
+export function getPlatformApiUrls(platform, organizationName) {
+ const platformApiUrls = {
+ github: {
+ org: `https://api.github.com/orgs/${organizationName}/repos?type=public&per_page=100`,
+ repo: "https://api.github.com/repos/",
+ releaseSuffix: "releases/latest"
+ },
+ // gitlab: {
+ // org: `https://gitlab.com/api/v4/groups/${organizationName}/projects?per_page=100`,
+ // repo: "https://gitlab.com/api/v4/projects/",
+ // releaseSuffix: "releases/permalink/latest"
+ // },
+ codeberg: {
+ org: `https://codeberg.org/api/v1/orgs/${organizationName}/repos?limit=50`,
+ repo: "https://codeberg.org/api/v1/repos/",
+ releaseSuffix: "releases/latest"
+ }
+ };
+ return platformApiUrls[platform.toLowerCase()];
+}
diff --git a/tests/api/fetchCodeRepos.test.js b/tests/api/fetchCodeRepos.test.js
index 55e815e..6ae0fdd 100644
--- a/tests/api/fetchCodeRepos.test.js
+++ b/tests/api/fetchCodeRepos.test.js
@@ -1,6 +1,7 @@
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
import { fetchCodeRepos } from '../../src/api/fetchCodeRepos.js';
import { handleError } from '../../src/ui/render.js';
+import { getPlatformVals, getPlatformApiUrls } from '../../src/utils/definePlatformVals.js';
// Mock the internal dependencies
vi.mock('../../src/utils/normalizeTag.js', () => ({
@@ -10,34 +11,34 @@ vi.mock('../../src/utils/normalizeTag.js', () => ({
vi.mock('../../src/ui/render.js', () => ({
handleError: vi.fn()
}));
-vi.mock('../../src/utils/defineRibbonVals.js', () => ({
- getPlatformDisplay: vi.fn(() => 'GitHub')
-}));
-// define configs for each platform
-const platformConfigs = [
- {
- name: 'github',
- orgApiUrl: 'https://api.github.com/orgs/test-org/repos',
- repoApiUrl: 'https://api.github.com/repos/',
- platformProfileRepo: '.github',
- starsKey: 'stargazers_count'
- },
- /* {
- name: 'gitlab',
- orgApiUrl: 'https://gitlab.com/api/v4/groups/test-org/projects',
- repoApiUrl: 'https://gitlab.com/api/v4/projects/',
- platformProfileRepo: 'gitlab-profile',
- starsKey: 'star_count'
- }, */
- {
- name: 'codeberg',
- orgApiUrl: 'https://codeberg.org/api/v1/orgs/test-org/repos',
- repoApiUrl: 'https://codeberg.org/api/v1/repos/',
- platformProfileRepo: '.profile',
- starsKey: 'stars_count'
+const SUPPORTED_PLATFORMS = ['github', 'codeberg']; // 'gitlab' is pending, tests should work on implementation
+const TEST_ORG = 'test-org';
+
+const platformConfigs = SUPPORTED_PLATFORMS.map(platform => {
+ const platformVals = getPlatformVals(platform);
+ const urls = getPlatformApiUrls(platform, TEST_ORG);
+
+ return {
+ name: platform,
+ orgApiUrl: urls.org,
+ repoApiUrl: urls.repo,
+ starsKey: platformVals.starsKey,
+ platformProfileRepo: platformVals.profileRepo,
+ forkKey: platformVals.forkKey,
+ fullNameKey: platformVals.fullNameKey,
+ urlKey: platformVals.urlKey,
+ };
+});
+
+const getMockForkValue = (isFork, platform) => {
+ if (!isFork) {
+ // GitLab leaves non-forks as undefined; GitHub/Codeberg return false
+ return platform === 'gitlab' ? undefined : false;
}
-];
+ // GitLab returns parent project object; GitHub/Codeberg return true
+ return platform === 'gitlab' ? { id: 999 } : true;
+};
describe.each(platformConfigs)('fetchCodeRepos - $name', (platformConfig) => {
const originalFetch = global.fetch;
@@ -55,6 +56,9 @@ describe.each(platformConfigs)('fetchCodeRepos - $name', (platformConfig) => {
const platform = platformConfig.name;
const starsKey = platformConfig.starsKey;
const platformProfileRepo = platformConfig.platformProfileRepo;
+ const forkKey = platformConfig.forkKey;
+ const fullNameKey = platformConfig.fullNameKey;
+ const urlKey = platformConfig.urlKey;
const refreshIntervalDays = 30;
const releasesMap = {};
@@ -64,18 +68,21 @@ describe.each(platformConfigs)('fetchCodeRepos - $name', (platformConfig) => {
const oldDateISO = new Date(now.getTime() - 45 * 24 * 60 * 60 * 1000).toISOString(); // 45 days ago
const oldestDateISO = new Date(now.getTime() - 90 * 24 * 60 * 60 * 1000).toISOString(); // 90 days ago
- it('maps raw repo data and attaches release data from releasesMap', async () => {
+ it('maps raw repo data, resolves platform keys, and attaches release data', async () => {
// Mock a single page platform response
global.fetch.mockResolvedValueOnce({
ok: true,
headers: { get: () => null }, // No 'link' header means no pagination
json: () => Promise.resolve([{
- full_name: 'test-org/code-repo',
+ [fullNameKey]: 'test-org/code-repo',
name: 'code-repo',
+ description: 'A test repository',
+ [forkKey]: getMockForkValue(false, platform),
updated_at: now.toISOString(),
created_at: recentDateISO,
topics: ['python'],
[starsKey]: 42,
+ [urlKey]: 'http://example.com/test-org/code-repo'
}])
});
@@ -94,15 +101,23 @@ describe.each(platformConfigs)('fetchCodeRepos - $name', (platformConfig) => {
);
expect(items).toHaveLength(1);
+ expect(items[0].id).toBe('test-org/code-repo');
expect(items[0].repoType).toBe('code');
+ expect(items[0].description).toBe('A test repository');
+ // fork is used for inclusion filtering only and is not returned by fetchCodeRepos
expect(items[0].hasNewRelease).toBe(true);
expect(items[0].latestReleaseTag).toBe('v1.0');
expect(items[0].tags).toContain('python');
+ expect(items[0].html_url).toBe('http://example.com/test-org/code-repo');
+
expect(items[0].cardData.pretty_name).toBe('code-repo');
expect(items[0].cardData.stars).toBe(42);
+
+ expect(global.fetch).toHaveBeenCalledTimes(1);
+ expect(global.fetch).toHaveBeenCalledWith(orgApiUrl);
});
- // Pagination test: simulate multiple pages of GitHub API results using the Link header
+ // Pagination test: simulate multiple pages of API results using the Link header
it('handles multi-page pagination', async () => {
global.fetch.mockImplementation((url) => {
if (url === orgApiUrl) {
@@ -115,7 +130,7 @@ describe.each(platformConfigs)('fetchCodeRepos - $name', (platformConfig) => {
: null
},
json: () => Promise.resolve([{
- full_name: 'test-org/repo-page1',
+ [fullNameKey]: 'test-org/repo-page1',
name: 'repo-page1',
created_at: recentDateISO,
updated_at: recentDateISO
@@ -127,7 +142,7 @@ describe.each(platformConfigs)('fetchCodeRepos - $name', (platformConfig) => {
ok: true,
headers: { get: () => null },
json: () => Promise.resolve([{
- full_name: 'test-org/repo-page2',
+ [fullNameKey]: 'test-org/repo-page2',
name: 'repo-page2',
created_at: recentDateISO,
updated_at: recentDateISO }])
@@ -156,14 +171,14 @@ describe.each(platformConfigs)('fetchCodeRepos - $name', (platformConfig) => {
it('fetches additional org repos once and fetches external repos', async () => {
// Base organization discovery lists 'test-org/internal-additional'
const mockOrgRepo = {
- full_name: 'test-org/internal-additional',
+ [fullNameKey]: 'test-org/internal-additional',
name: 'internal-additional',
created_at: recentDateISO,
updated_at: recentDateISO
};
const mockExternalRepo = {
- full_name: 'external-org/external-additional',
+ [fullNameKey]: 'external-org/external-additional',
name: 'external-additional',
created_at: recentDateISO,
updated_at: recentDateISO
@@ -224,30 +239,30 @@ describe.each(platformConfigs)('fetchCodeRepos - $name', (platformConfig) => {
headers: { get: () => null },
json: () => Promise.resolve([
{
- full_name: 'test-org/valid-repo',
+ [fullNameKey]: 'test-org/valid-repo',
name: 'valid-repo',
- fork: false,
+ [forkKey]: getMockForkValue(false, platform),
created_at: recentDateISO,
updated_at: recentDateISO
},
{
- full_name: 'test-org/forked-repo',
+ [fullNameKey]: 'test-org/forked-repo',
name: 'forked-repo',
- fork: true,
+ [forkKey]: getMockForkValue(true, platform),
created_at: recentDateISO,
updated_at: recentDateISO
},
{
- full_name: 'test-org/forked-in-list',
+ [fullNameKey]: 'test-org/forked-in-list',
name: 'forked-in-list',
- fork: true,
+ [forkKey]: getMockForkValue(true, platform),
created_at: recentDateISO,
updated_at: recentDateISO
},
{
- full_name: `test-org/${platformProfileRepo}`,
+ [fullNameKey]: `test-org/${platformProfileRepo}`,
name: platformProfileRepo,
- fork: false,
+ [forkKey]: getMockForkValue(false, platform),
created_at: recentDateISO,
updated_at: recentDateISO
}
@@ -280,13 +295,13 @@ describe.each(platformConfigs)('fetchCodeRepos - $name', (platformConfig) => {
headers: { get: () => null },
json: () => Promise.resolve([
{
- full_name: 'test-org/new-repo',
+ [fullNameKey]: 'test-org/new-repo',
name: 'new-repo',
created_at: recentDateISO,
updated_at: now.toISOString()
},
{
- full_name: 'test-org/old-repo',
+ [fullNameKey]: 'test-org/old-repo',
name: 'old-repo',
created_at: oldestDateISO,
updated_at: oldDateISO
From 5dda63ce7c079223db60045a455d6b3329843018 Mon Sep 17 00:00:00 2001
From: Elizabeth Campolongo <38985481+egrace479@users.noreply.github.com>
Date: Mon, 10 Aug 2026 12:13:26 -0500
Subject: [PATCH 08/12] Clarify demo (HF space) jargon
Pulled from Imageomics catalog [PR 132](https://github.com/Imageomics/catalog/pull/132)
cherry-pick commit: 7fb4eff9172509f30056ce0c8076560bb9a02a96
* Update terminology to be more general (use 'demos' instead of 'spaces')
* Update documentation where relevant to match
* removed contribution file & agent file, preserved ABC customization
while changing "space" to "demo"
---
.zenodo.json | 3 ++-
CITATION.cff | 3 ++-
README.md | 2 +-
index.html | 2 +-
package.json | 2 +-
public/config.yaml | 4 ++--
6 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/.zenodo.json b/.zenodo.json
index e13c82a..45c29e7 100644
--- a/.zenodo.json
+++ b/.zenodo.json
@@ -6,12 +6,13 @@
"affiliation": "The Ohio State University"
}
],
- "description": "
Catalog app for ABC Center code, data, models, and spaces hosted on GitHub and Hugging Face. Centralized resource to search ABC Center-affiliated products, the content is updated in real-time through calls to the GitHub and Hugging Face APIs. This repository was generated from the Imageomics Catalog Template.
Catalog app for ABC Center code, data, models, and demos hosted on GitHub and Hugging Face. Centralized resource to search ABC Center-affiliated products, the content is updated in real-time through calls to the GitHub and Hugging Face APIs. This repository was generated from the Imageomics Catalog Template.
",
"keywords": [
"code",
"data",
"models",
"spaces",
+ "demos",
"GitHub",
"Hugging Face",
"APIs",
diff --git a/CITATION.cff b/CITATION.cff
index a0cb884..be19394 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -1,4 +1,4 @@
-abstract: "Catalog app for ABC Center code, data, models, and spaces hosted on GitHub and Hugging Face. Centralized resource to search ABC Center-affiliated products, the content is updated in real-time through calls to the GitHub and Hugging Face APIs. This repository was generated from the Imageomics Catalog Template."
+abstract: "Catalog app for ABC Center code, data, models, and demos hosted on GitHub and Hugging Face. Centralized resource to search ABC Center-affiliated products, the content is updated in real-time through calls to the GitHub and Hugging Face APIs. This repository was generated from the Imageomics Catalog Template."
authors:
- family-names: "Campolongo"
given-names: "Elizabeth G."
@@ -18,6 +18,7 @@ keywords:
- data
- models
- spaces
+ - demos
- "GitHub"
- "Hugging Face"
- APIs
diff --git a/README.md b/README.md
index b5972cb..5792f28 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# AI & Biodiversity Change Global Center Catalog
-Repository for web-based ABC Center code, data, model, and spaces catalog. This catalog is designed to use the GitHub API for searching all code repositories created under the [ABC GitHub Organization](https://github.com/ABC-Center) and the Hugging Face API for searching all dataset, model, and spaces repositories created under the [ABC Hugging Face Organization](https://huggingface.co/ABC-Center). Non-ABC Org GitHub and Hugging Face repositories can be manually included through the `ADDITIONAL_REPOS` and `ADDITIONAL_HF_REPOS` parameters, respectively, in the [config file](public/config.yaml).
+Repository for web-based catalog of ABC Center code, data, model, and demos. This catalog is designed to use the GitHub API for searching all code repositories created under the [ABC GitHub Organization](https://github.com/ABC-Center) and the Hugging Face API for searching all dataset, model, and spaces repositories created under the [ABC Hugging Face Organization](https://huggingface.co/ABC-Center). Non-ABC Org GitHub and Hugging Face repositories can be manually included through the `ADDITIONAL_REPOS` and `ADDITIONAL_HF_REPOS` parameters, respectively, in the [config file](public/config.yaml).
This repository was generated and personalized from the [Imageomics Catalog](https://github.com/Imageomics/catalog). The following sections are pulled from the source repo.
diff --git a/index.html b/index.html
index 2fd0815..86f0d06 100644
--- a/index.html
+++ b/index.html
@@ -120,7 +120,7 @@
-
+
diff --git a/package.json b/package.json
index 5c40b60..83a4119 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "catalog",
"version": "1.0.0",
- "description": "Repository for web-based ABC-Center code, data, model, and spaces catalog. This catalog is designed to use the GitHub API for searching all code repositories created under the [ABC-Center GitHub Organization](https://github.com/ABC-Center) and the Hugging Face API for searching all dataset, model, and spaces repositories created under the [ABC-Center Hugging Face Organization](https://huggingface.co/ABC-Center).",
+ "description": "Repository for web-based ABC-Center code, data, model, and demoscatalog. This catalog is designed to use the GitHub API for searching all code repositories created under the [ABC-Center GitHub Organization](https://github.com/ABC-Center) and the Hugging Face API for searching all dataset, model, and spaces repositories created under the [ABC-Center Hugging Face Organization](https://huggingface.co/ABC-Center).",
"main": "main.js",
"scripts": {
"dev": "vite",
diff --git a/public/config.yaml b/public/config.yaml
index 64f9781..8bfac6b 100644
--- a/public/config.yaml
+++ b/public/config.yaml
@@ -24,7 +24,7 @@ COLORS:
# API & Behavior Settings
# Codebase platform for API calls and link generation. Supported values: "github" or "codeberg", pending: "gitlab".
PLATFORM: github
-# Dataset, model, and space (demo) default: Hugging Face, other platforms would require a custom module
+# Dataset, model, and demo default: Hugging Face, other platforms would require a custom module
API_BASE_URL: "https://huggingface.co/api/"
# Define "new" repository criteria
REFRESH_INTERVAL_DAYS: 30
@@ -42,7 +42,7 @@ ADDITIONAL_REPOS:
- "kitzeslab/Kitzes_MethodsEcolEvo_manuscript_2025"
# Array of Hugging Face repos from outside the org to include.
-# Each entry must specify "repo" (owner/name) and "type" (datasets, models, or spaces).
+# Each entry must specify "repo" (owner/name) and "type" (datasets, models, or spaces/demos).
# Organization names are case-sensitive in the Hugging Face API.
# ADDITIONAL_HF_REPOS:
# - repo: "user/dataset-name"
From c2b5634d757db49446416e6abaf46b6a9d0fa709 Mon Sep 17 00:00:00 2001
From: Elizabeth Campolongo <38985481+egrace479@users.noreply.github.com>
Date: Fri, 14 Aug 2026 16:44:18 -0400
Subject: [PATCH 09/12] Add GitLab as a code repository platform option
Pulled from Imageomics catalog [PR
134](https://github.com/Imageomics/catalog/pull/134)
cherry-pick commit: c5ce9487905f266448c33398025f678ea75ab825
* Update documentation to reflect increased code platform options
* ensure no private repos leak
* Use platform-specific token auth in release fetch script
* Move build-time helper functions to scripts utility
* Make org name testing more robust based on platform differences
* make build script requests more efficient and respectful
* Include projects from subgroups, but exclude shared projects for GitLab
consistent with the stated goal of the catalog and the way in which GitLab presents a group's projects
---
README.md | 2 +-
docs/personalization.md | 121 ++++++++++++++++++++++++++++-
public/config.yaml | 2 +-
scripts/export-tags.js | 21 +++--
scripts/fetch-releases.js | 80 ++++++++++++++-----
scripts/platformScriptHelpers.js | 73 +++++++++++++++++
src/api/fetchCodeRepos.js | 8 +-
src/api/fetchStats.js | 14 ++--
src/assets/gitlab-logo-700-rgb.svg | 1 +
src/utils/definePlatformVals.js | 33 ++++----
src/utils/defineRibbonVals.js | 14 ++--
src/validateConfig.js | 54 +++++++++----
tests/api/fetchCodeRepos.test.js | 46 +++++++----
tests/validateConfig.test.js | 18 ++++-
14 files changed, 383 insertions(+), 104 deletions(-)
create mode 100644 scripts/platformScriptHelpers.js
create mode 100644 src/assets/gitlab-logo-700-rgb.svg
diff --git a/README.md b/README.md
index 5792f28..0b173f0 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ This repository was generated and personalized from the [Imageomics Catalog](htt
The website is styled using the [tailwindcss](https://tailwindcss.com/) package.
-* **Real-time Data Fetching:** Displays all public organization repositories, fetched through the code platform and Hugging Face APIs. Includes semantically meaningful virtual markers:
+* **Real-time Data Fetching:** Displays all public organization repositories, fetched through the code platform (GitHub, GitLab, or Codeberg) and Hugging Face APIs. Includes semantically meaningful virtual markers:
* "New" badge highlights products created within the last 30 days;
* "🚀 version-tag" badge indicates a new release within the last 2 weeks for code repos, and links to that release;
* Star (⭐️) or like (❤️) counts displayed for code platform or Hugging Face repos, respectively;
diff --git a/docs/personalization.md b/docs/personalization.md
index d8a0756..d37ad12 100644
--- a/docs/personalization.md
+++ b/docs/personalization.md
@@ -32,7 +32,7 @@ Welcome to your new catalog repo! The primary way to personalize this catalog is
### API & Behavior Settings
- * `PLATFORM`: Coding platform used: 'github' or 'codeberg' (default: 'github', GitLab support in development). Please see [notes on platform setup](#non-github-code-platform-setup) if using for non-GitHub code repositories
+ * `PLATFORM`: Coding platform used: 'github', 'codeberg', or 'gitlab' (default: 'github'). Please see [notes on platform setup](#non-github-code-repository-platform-setup) if using for non-GitHub code repositories
* `API_BASE_URL`: Hugging Face API base URL (default: `"https://huggingface.co/api/"`)
* `REFRESH_INTERVAL_DAYS`: Number of days to consider an item "new" (default: `30`)
* `ADDITIONAL_REPOS`: Array of forked or non-org GitHub repositories to include, formatted `/` (non-forks are included by default). Use `[]` if there are none you wish to include
@@ -89,6 +89,121 @@ When first setting up your catalog, run the export script to generate a full lis
See **[tag-grouping-process.md](tag-grouping-process.md)** for full setup instructions, conventions, and guidance on using AI assistance for the initial grouping pass.
-## Code Repository Platform Setup
+## Non-GitHub Code Repository Platform Setup
+
+The default code repository platform for this catalog is GitHub. If you wish to use another supported platform (Codeberg or GitLab), please note that the workflows will require token and potentially other platform-specific updates if running from a non-GitHub repository. Otherwise, this app is set up to be able to run from Codeberg or GitLab to fetch and display repositories from the respective platform.
+
+Example configs, as used in testing the Catalog template for non-GitHub code platforms, are provided below.
+
+### Sample Codeberg Config
+
+```yaml
+# Configuration file for Catalog Template
+# Customize these values to personalize the catalog for your organization
+
+# Organization & Repository Settings
+ORGANIZATION_NAME: forgejo # Codebase platform organization name (for API calls)
+HF_ORGANIZATION_NAME: imageomics # Hugging Face organization name (case-sensitive, for API calls)
+ORG_NAME: Forgejo # Display name for Codebase platform organization (can differ from API name)
+CATALOG_REPO_NAME: forgejo # Repository name for the catalog itself (used for stats badge)
+
+# Branding
+CATALOG_TITLE: Fake Forgejo Catalog
+CATALOG_DESCRIPTION: "Explore and discover public code, datasets, models, and spaces."
+LOGO_URL: "https://github.com/Imageomics/Imageomics-guide/raw/3478acc0068a87a5604069d04a29bdb0795c2045/docs/logos/Imageomics_logo_butterfly.png"
+FAVICON_URL: "https://github.com/Imageomics/Imageomics-guide/raw/3478acc0068a87a5604069d04a29bdb0795c2045/docs/logos/Imageomics_logo_butterfly.png"
+
+# Colors (CSS custom properties)
+COLORS:
+ primary: "#92991c" # Primary brand color (Imageomics Green)
+ secondary: "#5d8095" # Secondary brand color (Imageomics Blue)
+ accent: "#0097b2" # Accent color (Dark Teal)
+ accentDark: "#4fd1eb" # Dark mode accent color (Light Cyan)
+ tag: "#9bcb5e" # Tag background color (Light Green)
+
+# API & Behavior Settings
+# Codebase platform for API calls and link generation. Supported values: "github", "codeberg", or "gitlab".
+PLATFORM: codeberg
+# Dataset, model, and space (demo) default: Hugging Face, other platforms would require a custom module
+API_BASE_URL: "https://huggingface.co/api/"
+# Define "new" repository criteria
+REFRESH_INTERVAL_DAYS: 30
+
+# Array of "owner/repo" strings to include in addition to non-forked org repos.
+# Use this for forked repos within the org and repos outside the org entirely.
+ADDITIONAL_REPOS: []
+
+# Array of Hugging Face repos from outside the org to include.
+# Each entry must specify "repo" (owner/name) and "type" (datasets, models, or spaces).
+# ADDITIONAL_HF_REPOS:
+# - repo: "user/dataset-name"
+# type: "datasets"
+# - repo: "user/model-name"
+# type: "models"
+# - repo: "user/space-name"
+# type: "spaces"
+ADDITIONAL_HF_REPOS:
+ - repo: "yoohj0416/predictbeetle"
+ type: "models"
+
+# Typography
+FONT_FAMILY: Inter # Font family for the site
+```
+
+### Sample GitLab Config
+
+```yaml
+# Configuration file for Catalog Template
+# Customize these values to personalize the catalog for your organization
+
+# Organization & Repository Settings
+ORGANIZATION_NAME: GitLab-com # Codebase platform organization name (for API calls)
+HF_ORGANIZATION_NAME: imageomics # Hugging Face organization name (case-sensitive, for API calls)
+ORG_NAME: Imageomics # Display name for Codebase platform organization (can differ from API name)
+CATALOG_REPO_NAME: www-gitlab-com # Repository name for the catalog itself (used for stats badge)
+
+# Branding
+CATALOG_TITLE: Fake GitLab.com Catalog
+CATALOG_DESCRIPTION: "Explore and discover public code, datasets, models, and demos."
+LOGO_URL: "https://github.com/Imageomics/Imageomics-guide/raw/3478acc0068a87a5604069d04a29bdb0795c2045/docs/logos/Imageomics_logo_butterfly.png"
+FAVICON_URL: "https://github.com/Imageomics/Imageomics-guide/raw/3478acc0068a87a5604069d04a29bdb0795c2045/docs/logos/Imageomics_logo_butterfly.png"
+
+# Colors (CSS custom properties)
+COLORS:
+ primary: "#92991c" # Primary brand color (Imageomics Green)
+ secondary: "#5d8095" # Secondary brand color (Imageomics Blue)
+ accent: "#0097b2" # Accent color (Dark Teal)
+ accentDark: "#4fd1eb" # Dark mode accent color (Light Cyan)
+ tag: "#9bcb5e" # Tag background color (Light Green)
+
+# API & Behavior Settings
+# Codebase platform for API calls and link generation. Supported values: "github", "codeberg", or "gitlab".
+PLATFORM: gitlab
+# Dataset, model, and demo default: Hugging Face, other platforms would require a custom module
+API_BASE_URL: "https://huggingface.co/api/"
+# Define "new" repository criteria
+REFRESH_INTERVAL_DAYS: 30
+
+# Array of "owner/repo" strings to include in addition to non-forked org repos.
+# Use this for forked repos within the org and repos outside the org entirely.
+ADDITIONAL_REPOS:
+ - "spectrelonewolf/proyectoprofesionalcore1" # ex: https://gitlab.com/spectrelonewolf/proyectoprofesionalcore1
+
+# Array of Hugging Face repos from outside the org to include.
+# Each entry must specify "repo" (owner/name) and "type" (datasets, models, or spaces/demos).
+# Organization names are case-sensitive in the Hugging Face API.
+# ADDITIONAL_HF_REPOS:
+# - repo: "user/dataset-name"
+# type: "datasets"
+# - repo: "user/model-name"
+# type: "models"
+# - repo: "user/space-name"
+# type: "spaces"
+ADDITIONAL_HF_REPOS:
+ - repo: "yoohj0416/predictbeetle"
+ type: "models"
+
+# Typography
+FONT_FAMILY: Inter # Font family for the site
-The default code repository platform for this catalog is GitHub. If you wish to use another supported platform (Codeberg), please note that the [tag export](../scripts/export-tags.js) and [fetch release](../scripts/fetch-releases.js) scripts may require header definition modifications to function properly. Workflows would also require token and other platform-specific updates if running from a non-GitHub repository. Otherwise, this app is set up to be able to run from Codeberg to fetch and display Codeberg repositories.
+```
diff --git a/public/config.yaml b/public/config.yaml
index 8bfac6b..2f05b58 100644
--- a/public/config.yaml
+++ b/public/config.yaml
@@ -22,7 +22,7 @@ COLORS:
tag: "#4fb797a1" # Tag background color (ABC turquoise 63% alpha)
# API & Behavior Settings
-# Codebase platform for API calls and link generation. Supported values: "github" or "codeberg", pending: "gitlab".
+# Codebase platform for API calls and link generation. Supported values: "github", "codeberg", or "gitlab".
PLATFORM: github
# Dataset, model, and demo default: Hugging Face, other platforms would require a custom module
API_BASE_URL: "https://huggingface.co/api/"
diff --git a/scripts/export-tags.js b/scripts/export-tags.js
index ed18d6f..3e1dce0 100644
--- a/scripts/export-tags.js
+++ b/scripts/export-tags.js
@@ -20,6 +20,7 @@ import { validateConfig } from '../src/validateConfig.js';
import { getPlatformDisplay } from '../src/utils/defineRibbonVals.js';
import { filterNewAdditionalEntries } from '../src/utils/filterNewAdditionalEntries.js';
import { getPlatformVals, getPlatformApiUrls } from '../src/utils/definePlatformVals.js';
+import { getPlatformHeaders } from './platformScriptHelpers.js';
const __dirname = path.dirname(fileURLToPath(import.meta.url));
@@ -41,15 +42,15 @@ const ADDITIONAL_HF_REPOS = CONFIG.ADDITIONAL_HF_REPOS;
// ---------------------------------------------------------------------------
// Fetch helpers
// ---------------------------------------------------------------------------
-// Update this section as needed for non-GitHub code platforms (e.g., Codeberg or GitLab)
-const GITHUB_TOKEN = process.env.GITHUB_TOKEN || process.env.GH_TOKEN;
+/* Update the corresponding workflow and token as needed for non-GitHub code platforms (e.g., Codeberg or GitLab)
+* `headers['Accept']` is only needed for GitHub to avoid 403 errors on some endpoints.
+*/
+const platform = (CONFIG.PLATFORM || 'github').toLowerCase();
+const { org: ORG_API_URL, repo: REPO_API_URL } = getPlatformApiUrls(platform, ORGANIZATION_NAME);
+const { profileRepo, fullNameKey, forkKey, encodeRepoId } = getPlatformVals(platform);
const get = async (url) => {
- const headers = {};
- if (GITHUB_TOKEN && url.includes('api.github.com')) {
- headers['Authorization'] = `Bearer ${GITHUB_TOKEN}`;
- headers['Accept'] = 'application/vnd.github+json';
- }
+ const headers = getPlatformHeaders(url, platform, ORGANIZATION_NAME);
const res = await fetch(url, { headers });
if (!res.ok) throw new Error(`HTTP ${res.status} — ${url}`);
return { json: await res.json(), headers: res.headers };
@@ -59,11 +60,9 @@ const get = async (url) => {
// Tag collection
// ---------------------------------------------------------------------------
const allTags = new Set();
-const { org: ORG_API_URL, repo: REPO_API_URL } = getPlatformApiUrls(PLATFORM, ORGANIZATION_NAME);
-const { profileRepo, fullNameKey, forkKey } = getPlatformVals(PLATFORM);
const collectCodePlatformTags = async () => {
- const platformDisplay = getPlatformDisplay(PLATFORM);
+ const platformDisplay = getPlatformDisplay(platform);
console.log(`Fetching ${platformDisplay.displayName || PLATFORM} repos...`);
let allRepos = [];
let nextUrl = `${ORG_API_URL}`;
@@ -79,7 +78,7 @@ const collectCodePlatformTags = async () => {
// Additional repos
const additionalData = await Promise.all(
ADDITIONAL_REPOS.map(ownerRepo =>
- get(`${REPO_API_URL}${ownerRepo}`)
+ get(`${REPO_API_URL}${encodeRepoId(ownerRepo)}`)
.then(({ json }) => json)
.catch(() => null)
)
diff --git a/scripts/fetch-releases.js b/scripts/fetch-releases.js
index 4d3f977..ca68010 100644
--- a/scripts/fetch-releases.js
+++ b/scripts/fetch-releases.js
@@ -1,5 +1,5 @@
// scripts/fetch-releases.js
-// Build-time script: fetches the latest GitHub release for each code repo
+// Build-time script: fetches the latest release for each code repo
// and writes public/releases.json. Runs as part of `npm run build`.
import { readFileSync, writeFileSync } from 'fs';
import { fileURLToPath } from 'url';
@@ -7,6 +7,7 @@ import { dirname, join } from 'path';
import { load } from 'js-yaml';
import { validateConfig } from '../src/validateConfig.js';
import { getPlatformVals, getPlatformApiUrls } from '../src/utils/definePlatformVals.js';
+import { getPlatformReleaseVals, getPlatformHeaders } from './platformScriptHelpers.js';
const __filename = fileURLToPath(import.meta.url);
const __dirname = dirname(__filename);
@@ -20,16 +21,20 @@ if (errors.length) {
throw new Error(`Invalid config at ${configPath}: ${errors.join('; ')}`);
}
-const TOKEN = process.env.GITHUB_TOKEN;
-const headers = TOKEN
- ? { Authorization: `Bearer ${TOKEN}`, 'User-Agent': 'catalog-build-script' }
- : { 'User-Agent': 'catalog-build-script' };
+/**
+ * Define platform-specific variables needed for script to fetch releases, including API URLs, headers, and repo data keys.
+ * Update the corresponding workflow and token as needed for non-GitHub code platforms (e.g., Codeberg or GitLab).
+*/
+const platform = (CONFIG.PLATFORM || 'github').toLowerCase();
+
+const { org: ORG_API_URL, repo: REPO_API_URL, releaseSuffix: RELEASE_SUFFIX } = getPlatformApiUrls(platform, CONFIG.ORGANIZATION_NAME);
+const { releasePublishedAtKey, getReleaseUrl } = getPlatformReleaseVals(platform);
+const { profileRepo, fullNameKey, forkKey, encodeRepoId } = getPlatformVals(platform);
+const headers = getPlatformHeaders(ORG_API_URL, platform, CONFIG.ORGANIZATION_NAME);
const TWO_WEEKS_MS = 14 * 24 * 60 * 60 * 1000;
// Step 1: Fetch all public org repos (paginated, same logic as main.js)
-const { org: ORG_API_URL, repo: REPO_API_URL, releaseSuffix: RELEASE_SUFFIX } = getPlatformApiUrls(CONFIG.PLATFORM, CONFIG.ORGANIZATION_NAME);
-const { profileRepo, fullNameKey, forkKey, urlKey, releasePublishedAtKey } = getPlatformVals(CONFIG.PLATFORM);
let allOrgRepos = [];
let nextUrl = `${ORG_API_URL}`;
while (nextUrl) {
@@ -54,23 +59,58 @@ const repoIds = [
...orgNonForks.map(r => r[fullNameKey]),
];
-// Step 3: Fetch latest release for each repo
-const releases = {};
-for (const id of repoIds) {
+// Step 3: Fetch latest releases in parallel with bounded concurrency (max 5 concurrent requests), key-value mapping for each repo ID
+
+/**
+ * Zero-dependency bounded concurrency worker pool
+ * @param {*} items - object to fetch
+ * @param {int} concurrency - maximum number of concurrent requests
+ * @param {*} fn - function to apply to each item
+ * @returns {Promise} - A promise resolving to an array of results
+ */
+async function mapConcurrent(items, concurrency, fn) {
+ const results = new Array(items.length);
+ let index = 0;
+ const workers = Array.from({ length: Math.min(concurrency, items.length) }, async () => {
+ while (index < items.length) {
+ const i = index++;
+ results[i] = await fn(items[i]);
+ }
+ });
+ await Promise.all(workers);
+ return results;
+}
+
+/**
+ * Fetch the latest release for a given repo ID.
+ * @param {String} id - repo ID ('owner/repo' format)
+ * @returns {Promise<[String, Object|null]>} - A promise resolving to a tuple of [repo ID, release data or null if not found]
+ */
+async function fetchRepoRelease(id) {
try {
- const res = await fetch(`${REPO_API_URL}${id}/${RELEASE_SUFFIX}`, { headers });
- if (!res.ok) { releases[id] = null; continue; }
+ const res = await fetch(`${REPO_API_URL}${encodeRepoId(id)}/${RELEASE_SUFFIX}`, { headers });
+ if (!res.ok) return [id, null];
+
const data = await res.json();
- releases[id] = {
+ const publishedAt = data[releasePublishedAtKey];
+ // gitlab's release API returns a different structure than GitHub/Codeberg
+ return [id, {
tag: data.tag_name,
- url: data[urlKey],
- publishedAt: data[releasePublishedAtKey],
- isNew: (Date.now() - new Date(data[releasePublishedAtKey])) < TWO_WEEKS_MS,
- };
- } catch {
- releases[id] = null;
+ url: getReleaseUrl(data, id),
+ publishedAt: publishedAt,
+ isNew: (Date.now() - new Date(publishedAt)) < TWO_WEEKS_MS,
+ }];
+ } catch (err) {
+ console.warn(`[fetch-releases] Network error for repo "${id}":`, err.message);
+ return [id, null];
}
-}
+};
+
+// fetch the repo releases
+const releaseEntries = await mapConcurrent(repoIds, 5, fetchRepoRelease);
+
+// Convert [id, releaseData] pairs into an object for JSON output
+const releases = Object.fromEntries(releaseEntries);
writeFileSync(join(__dirname, '../public/releases.json'), JSON.stringify(releases));
console.log(`Wrote releases.json (${Object.keys(releases).length} repos)`);
diff --git a/scripts/platformScriptHelpers.js b/scripts/platformScriptHelpers.js
new file mode 100644
index 0000000..9354f32
--- /dev/null
+++ b/scripts/platformScriptHelpers.js
@@ -0,0 +1,73 @@
+/**
+ * Script utilities for platform-specific API calls and headers when exporting tags or fetching repo release data.
+ * Collection of functions to define platform-specific values needed only in build-time/workflow scripts.
+ * Each function returns dictionaries with the platform values that have been keyed by platform name (e.g., 'github', 'gitlab', 'codeberg') and potentially other instance-specific values (e.g., organizationName, repoApiUrl).
+ * Platform and organization name are defined from config.yaml and passed to the functions requiring them.
+*/
+
+
+/**
+ * Utility function to get platform-specific values for repo data keys (e.g., star count and profile repo name).
+ * @param {string} platform - 'github', 'gitlab', or 'codeberg'
+ * @returns {Object} platformVals - An object containing platform-specific values for repo data keys (e.g., release URL and published date key)
+ */
+export function getPlatformReleaseVals(platform) {
+ const platformVals = {
+ github: {
+ getReleaseUrl: (data) => data.html_url,
+ releasePublishedAtKey: 'published_at'
+ },
+ gitlab: {
+ getReleaseUrl: (data, repoId) => {
+ const tag = encodeURIComponent(data.tag_name);
+ return `https://gitlab.com/${repoId}/-/releases/${tag}`;
+ },
+ releasePublishedAtKey: 'released_at'
+ },
+ codeberg: {
+ getReleaseUrl: (data) => data.html_url,
+ releasePublishedAtKey: 'published_at'
+ }
+};
+ return platformVals[platform.toLowerCase()];
+}
+
+// Define platform-specific token authentication and API host information for scripts to use when making API calls.
+const tokenAuthByPlatform = {
+ github: {
+ token: process.env.GITHUB_TOKEN || process.env.GH_TOKEN,
+ apiHost : 'api.github.com',
+ authScheme: 'Bearer',
+ },
+ gitlab: {
+ token: process.env.GITLAB_TOKEN,
+ apiHost : 'gitlab.com/api/v4',
+ authScheme: 'Bearer',
+ },
+ codeberg: {
+ token: process.env.CODEBERG_TOKEN,
+ apiHost : 'codeberg.org/api/v1',
+ authScheme: 'token'
+ },
+};
+/**
+ * Utility function for scripts to get platform-specific headers
+* Update the corresponding workflow as needed for non-GitHub code platforms (e.g., Codeberg or GitLab)
+* `headers['Accept']` is only needed for GitHub to avoid 403 errors on some endpoints.
+* @param {string} url - URL to check for the platform API host
+* @param {string} platform - 'github', 'gitlab', or 'codeberg'
+* @param {string} orgName - The name of the organization as used in API calls
+* @returns {object} headers - headers object to use for fetch requests
+*/
+export function getPlatformHeaders(url, platform, orgName) {
+ const { token, apiHost, authScheme } = tokenAuthByPlatform[platform];
+ const cleanedOrgName = orgName.replace(/[^a-zA-Z0-9_-]/g, '');
+ const headers = { 'User-Agent': `${cleanedOrgName}-catalog-build-script` };
+ if (token && apiHost && url.includes(apiHost)) {
+ headers['Authorization'] = `${authScheme} ${token}`;
+ if (platform === 'github') {
+ headers['Accept'] = 'application/vnd.github+json';
+ }
+ }
+ return headers;
+}
diff --git a/src/api/fetchCodeRepos.js b/src/api/fetchCodeRepos.js
index 5f6dba4..c918ac4 100644
--- a/src/api/fetchCodeRepos.js
+++ b/src/api/fetchCodeRepos.js
@@ -8,7 +8,7 @@ import { normalizeTag, filterDisplayTags } from '../utils/normalizeTag.js';
* Both org-owned (non-forks) and additional repos are fetched; metadata is processed for each repo.
* It also determines if a repo is "new" based on the provided refresh interval.
* @async
- * @param {string} platform - 'github', pending: 'gitlab', or 'codeberg'
+ * @param {string} platform - 'github', 'gitlab', or 'codeberg'
* @param {Array} additionalRepos - An array of additional "owner/repo" strings to include in addition to non-forked
* org repos.
* @param {string} orgApiUrl - The API URL for fetching organization repos
@@ -30,7 +30,7 @@ export async function fetchCodeRepos(
let allRepos = [];
let nextUrl = `${orgApiUrl}`;
// get platform-specific keys
- const { starsKey, profileRepo, fullNameKey, forkKey, urlKey } = getPlatformVals(platform);
+ const { starsKey, profileRepo, fullNameKey, updatedAtKey, forkKey, urlKey, encodeRepoId } = getPlatformVals(platform);
try {
while (nextUrl) {
const ghResponse = await fetch(nextUrl);
@@ -57,7 +57,7 @@ export async function fetchCodeRepos(
const fetchedExternalData = await Promise.all(
toFetch.map(ownerRepo =>
- fetch(`${repoApiUrl}${ownerRepo}`)
+ fetch(`${repoApiUrl}${encodeRepoId(ownerRepo)}`)
.then(r => {
if (!r.ok) {
console.warn(`Failed to fetch additional repo "${ownerRepo}": HTTP ${r.status}`);
@@ -84,7 +84,7 @@ export async function fetchCodeRepos(
let processedItems = [...filteredAdditionalRepos, ...orgNonForks]
.map(repo => {
const createdAt = new Date(repo.created_at);
- const lastModified = new Date(repo.updated_at);
+ const lastModified = new Date(repo[updatedAtKey]);
const isNew = (new Date() - createdAt) / (1000 * 60 * 60 * 24) < refreshIntervalDays;
const rawTags = (repo.topics || []).map(t => t.toLowerCase());
diff --git a/src/api/fetchStats.js b/src/api/fetchStats.js
index a287db8..c43c47d 100644
--- a/src/api/fetchStats.js
+++ b/src/api/fetchStats.js
@@ -21,17 +21,19 @@ export const fetchCatalogStats = async (repoApiUrl, organizationName, catalogRep
}
};
+ // Need to URL-encode the owner/repo for GitLab API ('%2F' instead of '/'), but need '/' for GitHub and Codeberg.
+ const ownerRepo = repoApiUrl.includes("gitlab") ? `${organizationName}%2F${catalogRepoName}` : `${organizationName}/${catalogRepoName}`;
+
try {
- //TODO: Update stars and forks to support other platforms: Add another || star for GitLab, platform isn't passed
- // forks_count is shared
+ // platform isn't passed, forks_count is shared
// 1. Get Stars & Forks
- const repo = await fetch(`${repoApiUrl}${organizationName}/${catalogRepoName}`).then(r => r.ok ? r.json() : {});
- if (repo.stargazers_count !== undefined || repo.stars_count !== undefined) update('gh-stars', 'gh-star-container', repo.stargazers_count || repo.stars_count);
+ const repo = await fetch(`${repoApiUrl}${ownerRepo}`).then(r => r.ok ? r.json() : {});
+ const star_count = repo.stargazers_count ?? repo.stars_count ?? repo.star_count;
+ if (star_count !== undefined) update('gh-stars', 'gh-star-container', star_count);
if (repo.forks_count !== undefined) update('gh-forks', 'gh-fork-container', repo.forks_count);
// 2. Get Version (Tag)
- // TODO: Import from package.json
- const release = await fetch(`${repoApiUrl}${organizationName}/${catalogRepoName}/${releaseSuffix}`).then(r => r.ok ? r.json() : {});
+ const release = await fetch(`${repoApiUrl}${ownerRepo}/${releaseSuffix}`).then(r => r.ok ? r.json() : {});
if (release.tag_name !== undefined) update('gh-tag', 'gh-version-container', release.tag_name);
} catch (e) {
diff --git a/src/assets/gitlab-logo-700-rgb.svg b/src/assets/gitlab-logo-700-rgb.svg
new file mode 100644
index 0000000..72e3232
--- /dev/null
+++ b/src/assets/gitlab-logo-700-rgb.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/utils/definePlatformVals.js b/src/utils/definePlatformVals.js
index 2cb9784..07dd579 100644
--- a/src/utils/definePlatformVals.js
+++ b/src/utils/definePlatformVals.js
@@ -1,6 +1,6 @@
/**
* Collection of functions to define platform-specific values for the catalog, such as API URLs, display values, and repo data keys.
- * Each function returns dictionaries with the platform values that have been keyed by platform name (e.g., 'github', 'codeberg', 'gitlab') and potentially other instance-specific values (e.g., organizationName, repoApiUrl).
+ * Each function returns dictionaries with the platform values that have been keyed by platform name (e.g., 'github', 'gitlab', 'codeberg') and potentially other instance-specific values (e.g., organizationName, repoApiUrl).
* Platform and organization name are defined from config.yaml and passed to the functions requiring them.
*/
@@ -16,25 +16,28 @@ export function getPlatformVals(platform) {
starsKey: 'stargazers_count',
profileRepo: '.github',
fullNameKey: 'full_name',
+ updatedAtKey: 'updated_at',
forkKey: 'fork', //forks_count is shared
urlKey: 'html_url',
- releasePublishedAtKey: 'published_at'
+ encodeRepoId: (ownerRepo) => ownerRepo
},
- /* gitlab: {
+ gitlab: {
starsKey: 'star_count',
profileRepo: 'gitlab-profile',
- fullNameKey: 'name_with_namespace',
+ fullNameKey: 'path_with_namespace',
+ updatedAtKey: 'last_activity_at', // key used by GitLab for project update ordering, may include broader group-based activity
forkKey: 'forked_from_project',
urlKey: 'web_url',
- releasePublishedAtKey: 'released_at'
- }, */
+ encodeRepoId: (ownerRepo) => encodeURIComponent(ownerRepo) // GitLab requires URL-encoded 'owner/repo' format
+ },
codeberg: {
starsKey: 'stars_count',
profileRepo: '.profile',
fullNameKey: 'full_name',
+ updatedAtKey: 'updated_at',
forkKey: 'fork',
urlKey: 'html_url',
- releasePublishedAtKey: 'published_at'
+ encodeRepoId: (ownerRepo) => ownerRepo
}
};
return platformVals[platform.toLowerCase()];
@@ -43,7 +46,7 @@ export function getPlatformVals(platform) {
/**
* Utility function to get the platform-specific API URLs for organization repos and individual repo details.
- * Defines API URLs based on the selected platform (GitHub or Codeberg, note: GitLab support under development).
+ * Defines API URLs based on the selected platform (GitHub, GitLab, or Codeberg).
* This allows the rest of the codebase to use these constants when making API calls,
* abstracting away platform-specific URL structures.
*
@@ -52,7 +55,7 @@ export function getPlatformVals(platform) {
* Input: platform and organizationName (e.g., 'github' and 'imageomics'), defined from config.yaml and passed to this function.
* Output: platformApiUrls[platform] = { org: ORG_API_URL, repo: REPO_API_URL, releaseSuffix: RELEASE_SUFFIX }
*
- * @param {string} platform - 'github' or 'codeberg', pending: 'gitlab'
+ * @param {string} platform - 'github', 'gitlab', or 'codeberg'
* @param {string} organizationName - The name of the organization (used in URL construction)
* @returns {object} An object containing ORG_API_URL, REPO_API_URL, and RELEASE_SUFFIX
*/
@@ -63,13 +66,13 @@ export function getPlatformApiUrls(platform, organizationName) {
repo: "https://api.github.com/repos/",
releaseSuffix: "releases/latest"
},
- // gitlab: {
- // org: `https://gitlab.com/api/v4/groups/${organizationName}/projects?per_page=100`,
- // repo: "https://gitlab.com/api/v4/projects/",
- // releaseSuffix: "releases/permalink/latest"
- // },
+ gitlab: {
+ org: `https://gitlab.com/api/v4/groups/${organizationName}/projects?visibility=public&include_subgroups=true&with_shared=false&per_page=100`,
+ repo: "https://gitlab.com/api/v4/projects/",
+ releaseSuffix: "releases/permalink/latest"
+ },
codeberg: {
- org: `https://codeberg.org/api/v1/orgs/${organizationName}/repos?limit=50`,
+ org: `https://codeberg.org/api/v1/orgs/${organizationName}/repos?type=public&limit=50`,
repo: "https://codeberg.org/api/v1/repos/",
releaseSuffix: "releases/latest"
}
diff --git a/src/utils/defineRibbonVals.js b/src/utils/defineRibbonVals.js
index 7a4486d..a03249c 100644
--- a/src/utils/defineRibbonVals.js
+++ b/src/utils/defineRibbonVals.js
@@ -1,6 +1,6 @@
/**
* A collection of platform-specific display information (e.g., SVGs and URLs)
- * for code developer platforms including GitHub and Codeberg, pending: GitLab.
+ * for code developer platforms including GitHub, GitLab, and Codeberg.
* Used for linking to repo and rendering icon and platform name in the ribbon component of the UI.
*
* Usage: import { getPlatformDisplay } from './defineRibbonVals.js';
@@ -11,7 +11,7 @@
*/
import githubSvg from '../assets/GitHub_Invertocat.svg?raw';
-// import gitlabSvg from '../assets/gitlab-logo-700-rgb.svg?raw';
+import gitlabSvg from '../assets/gitlab-logo-700-rgb.svg?raw';
import codebergSvg from '../assets/codeberg-logo_icon_white.svg?raw';
/**
@@ -26,11 +26,11 @@ export function getPlatformDisplay(platform) {
displayName: "GitHub",
ribbonUrl: "https://github.com/"
},
- // gitlab: {
- // svg: gitlabSvg,
- // displayName: "GitLab",
- // ribbonUrl: "https://gitlab.com/"
- //},
+ gitlab: {
+ svg: gitlabSvg,
+ displayName: "GitLab",
+ ribbonUrl: "https://gitlab.com/"
+ },
codeberg: {
svg: codebergSvg,
displayName: "Codeberg",
diff --git a/src/validateConfig.js b/src/validateConfig.js
index 78264d8..6c861ce 100644
--- a/src/validateConfig.js
+++ b/src/validateConfig.js
@@ -14,15 +14,48 @@ export function validateConfig(config) {
return errors;
}
- /** Validate organization names, existence and allowed characters */
- const ghOrgRegex = /^[a-zA-Z0-9-]+$/;
+ /**
+ * PLATFORM will be parsed without whitespace, but must be string to avoid undefined errors
+ */
+ const supportedPlatforms = ['github', 'gitlab', 'codeberg'];
+ const platform = config.PLATFORM;
+ var validPlatform = '';
+ if (!platform || typeof platform !== 'string') {
+ errors.push('PLATFORM');
+ } else if (!supportedPlatforms.includes(platform.toLowerCase())) {
+ errors.push(`PLATFORM must be one of: ${supportedPlatforms.join(', ')}`);
+ } else {
+ validPlatform = platform.toLowerCase();
+ }
+
+ /**
+ * Validate organization names, existence and allowed characters
+ *
+ * GitHub org names allow only letters, numbers, and hyphens; GitLab and Codeberg also allow underscores.
+ * All require alphanumeric characters at start and end.
+ * See: https://docs.gitlab.com/user/reserved_names/
+ * See: https://codeberg.org/forgejo-contrib/forgejo-cli/wiki/Organizations
+ */
const orgName = config.ORGANIZATION_NAME;
+ const ghOrgRegex = /^[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$/;
+ const glcbOrgRegex = /^[a-zA-Z0-9](?:[a-zA-Z0-9_\-]*[a-zA-Z0-9])?$/;
if (typeof orgName !== 'string' || !orgName.trim()) {
errors.push('ORGANIZATION_NAME');
- } else if (!ghOrgRegex.test(orgName)) {
- errors.push(`ORGANIZATION_NAME (${orgName}) is invalid, only letters, numbers, and hyphens are allowed`);
+ } else if (validPlatform != '') {
+ // If PLATFORM is invalid, we cannot determine which regex to use for ORGANIZATION_NAME validation.
+ if (validPlatform == 'github') {
+ var codeRegex = ghOrgRegex;
+ var codeRegexError = 'only letters, numbers, and hyphens';
+ } else {
+ var codeRegex = glcbOrgRegex;
+ var codeRegexError = 'only letters, numbers, hyphens, and underscores';
+ }
+ if (!codeRegex.test(orgName)) {
+ errors.push(`ORGANIZATION_NAME (${orgName}) is invalid for ${validPlatform} API calls, ${codeRegexError} are allowed`);
+ }
}
- const hfOrgRegex = /^[a-zA-Z0-9_\-]+$/;
+ // Hugging Face org names allow letters, numbers, hyphens, and underscores.
+ const hfOrgRegex = /^[a-zA-Z0-9](?:[a-zA-Z0-9_\-]*[a-zA-Z0-9])?$/;
const hfOrgName = config.HF_ORGANIZATION_NAME;
if (typeof hfOrgName !== 'string' || !hfOrgName.trim()) {
errors.push('HF_ORGANIZATION_NAME');
@@ -32,17 +65,6 @@ export function validateConfig(config) {
if (!config.ORG_NAME) errors.push('ORG_NAME');
if (!config.CATALOG_REPO_NAME) errors.push('CATALOG_REPO_NAME');
- /** Update to include 'gitlab' once supported
- * PLATFORM will be parsed without whitespace, but must be string to avoid undefined errors
- */
- const supportedPlatforms = ['github', 'codeberg'];
- const platform = config.PLATFORM;
- if (!platform || typeof platform !== 'string') {
- errors.push('PLATFORM');
- } else if (!supportedPlatforms.includes(platform.toLowerCase())) {
- errors.push(`PLATFORM must be one of: ${supportedPlatforms.join(', ')}`);
- }
-
if (!config.API_BASE_URL) errors.push('API_BASE_URL');
if (config.REFRESH_INTERVAL_DAYS == null) errors.push('REFRESH_INTERVAL_DAYS');
diff --git a/tests/api/fetchCodeRepos.test.js b/tests/api/fetchCodeRepos.test.js
index 6ae0fdd..ece9c1c 100644
--- a/tests/api/fetchCodeRepos.test.js
+++ b/tests/api/fetchCodeRepos.test.js
@@ -12,7 +12,7 @@ vi.mock('../../src/ui/render.js', () => ({
handleError: vi.fn()
}));
-const SUPPORTED_PLATFORMS = ['github', 'codeberg']; // 'gitlab' is pending, tests should work on implementation
+const SUPPORTED_PLATFORMS = ['github', 'gitlab', 'codeberg'];
const TEST_ORG = 'test-org';
const platformConfigs = SUPPORTED_PLATFORMS.map(platform => {
@@ -27,7 +27,9 @@ const platformConfigs = SUPPORTED_PLATFORMS.map(platform => {
platformProfileRepo: platformVals.profileRepo,
forkKey: platformVals.forkKey,
fullNameKey: platformVals.fullNameKey,
+ updatedAtKey: platformVals.updatedAtKey,
urlKey: platformVals.urlKey,
+ encodeRepoId: platformVals.encodeRepoId // used only for GitLab Additional Repos
};
});
@@ -58,7 +60,9 @@ describe.each(platformConfigs)('fetchCodeRepos - $name', (platformConfig) => {
const platformProfileRepo = platformConfig.platformProfileRepo;
const forkKey = platformConfig.forkKey;
const fullNameKey = platformConfig.fullNameKey;
+ const updatedAtKey = platformConfig.updatedAtKey;
const urlKey = platformConfig.urlKey;
+ const encodeRepoId = platformConfig.encodeRepoId;
const refreshIntervalDays = 30;
const releasesMap = {};
@@ -78,7 +82,7 @@ describe.each(platformConfigs)('fetchCodeRepos - $name', (platformConfig) => {
name: 'code-repo',
description: 'A test repository',
[forkKey]: getMockForkValue(false, platform),
- updated_at: now.toISOString(),
+ [updatedAtKey]: now.toISOString(),
created_at: recentDateISO,
topics: ['python'],
[starsKey]: 42,
@@ -105,6 +109,7 @@ describe.each(platformConfigs)('fetchCodeRepos - $name', (platformConfig) => {
expect(items[0].repoType).toBe('code');
expect(items[0].description).toBe('A test repository');
// fork is used for inclusion filtering only and is not returned by fetchCodeRepos
+ expect(items[0].lastModified).toStrictEqual(now);
expect(items[0].hasNewRelease).toBe(true);
expect(items[0].latestReleaseTag).toBe('v1.0');
expect(items[0].tags).toContain('python');
@@ -133,7 +138,7 @@ describe.each(platformConfigs)('fetchCodeRepos - $name', (platformConfig) => {
[fullNameKey]: 'test-org/repo-page1',
name: 'repo-page1',
created_at: recentDateISO,
- updated_at: recentDateISO
+ [updatedAtKey]: recentDateISO
}])
});
} else if (url === `${orgApiUrl}?page=2`) {
@@ -145,7 +150,7 @@ describe.each(platformConfigs)('fetchCodeRepos - $name', (platformConfig) => {
[fullNameKey]: 'test-org/repo-page2',
name: 'repo-page2',
created_at: recentDateISO,
- updated_at: recentDateISO }])
+ [updatedAtKey]: recentDateISO }])
});
}
});
@@ -174,14 +179,17 @@ describe.each(platformConfigs)('fetchCodeRepos - $name', (platformConfig) => {
[fullNameKey]: 'test-org/internal-additional',
name: 'internal-additional',
created_at: recentDateISO,
- updated_at: recentDateISO
+ [updatedAtKey]: recentDateISO
};
+ const externalRepoId = 'external-org/external-additional';
+ const expectedExternalRepoUrl = `${repoApiUrl}${encodeRepoId(externalRepoId)}`;
+
const mockExternalRepo = {
- [fullNameKey]: 'external-org/external-additional',
+ [fullNameKey]: externalRepoId,
name: 'external-additional',
created_at: recentDateISO,
- updated_at: recentDateISO
+ [updatedAtKey]: recentDateISO
};
global.fetch.mockImplementation((url) => {
@@ -192,7 +200,7 @@ describe.each(platformConfigs)('fetchCodeRepos - $name', (platformConfig) => {
json: () => Promise.resolve([mockOrgRepo])
});
}
- if (url === `${repoApiUrl}external-org/external-additional`) {
+ if (url === expectedExternalRepoUrl) {
return Promise.resolve({
ok: true,
headers: { get: () => null },
@@ -203,7 +211,7 @@ describe.each(platformConfigs)('fetchCodeRepos - $name', (platformConfig) => {
const additionalRepos = [
'test-org/internal-additional',
- 'external-org/external-additional'
+ externalRepoId
];
const items = await fetchCodeRepos(
@@ -220,6 +228,9 @@ describe.each(platformConfigs)('fetchCodeRepos - $name', (platformConfig) => {
* should not hit the network a second time.
*/
expect(global.fetch).toHaveBeenCalledTimes(2);
+ expect(global.fetch).toHaveBeenCalledWith(
+ `${expectedExternalRepoUrl}`
+ );
expect(global.fetch).not.toHaveBeenCalledWith(
`${repoApiUrl}test-org/internal-additional`
);
@@ -229,7 +240,7 @@ describe.each(platformConfigs)('fetchCodeRepos - $name', (platformConfig) => {
*/
expect(items).toHaveLength(2);
expect(items.map(i => i.id)).toContain('test-org/internal-additional');
- expect(items.map(i => i.id)).toContain('external-org/external-additional');
+ expect(items.map(i => i.id)).toContain(externalRepoId);
});
// Test that forks and platform profile repos are excluded from the final list
@@ -243,28 +254,28 @@ describe.each(platformConfigs)('fetchCodeRepos - $name', (platformConfig) => {
name: 'valid-repo',
[forkKey]: getMockForkValue(false, platform),
created_at: recentDateISO,
- updated_at: recentDateISO
+ [updatedAtKey]: recentDateISO
},
{
[fullNameKey]: 'test-org/forked-repo',
name: 'forked-repo',
[forkKey]: getMockForkValue(true, platform),
created_at: recentDateISO,
- updated_at: recentDateISO
+ [updatedAtKey]: recentDateISO
},
{
[fullNameKey]: 'test-org/forked-in-list',
name: 'forked-in-list',
[forkKey]: getMockForkValue(true, platform),
created_at: recentDateISO,
- updated_at: recentDateISO
+ [updatedAtKey]: recentDateISO
},
{
[fullNameKey]: `test-org/${platformProfileRepo}`,
name: platformProfileRepo,
[forkKey]: getMockForkValue(false, platform),
created_at: recentDateISO,
- updated_at: recentDateISO
+ [updatedAtKey]: recentDateISO
}
])
});
@@ -298,13 +309,13 @@ describe.each(platformConfigs)('fetchCodeRepos - $name', (platformConfig) => {
[fullNameKey]: 'test-org/new-repo',
name: 'new-repo',
created_at: recentDateISO,
- updated_at: now.toISOString()
+ [updatedAtKey]: now.toISOString()
},
{
[fullNameKey]: 'test-org/old-repo',
name: 'old-repo',
created_at: oldestDateISO,
- updated_at: oldDateISO
+ [updatedAtKey]: oldDateISO
}
])
});
@@ -321,6 +332,9 @@ describe.each(platformConfigs)('fetchCodeRepos - $name', (platformConfig) => {
const newRepo = items.find(i => i.id === 'test-org/new-repo');
const oldRepo = items.find(i => i.id === 'test-org/old-repo');
+ // check that the lastModified dates are set correctly based on the platform-specific updatedAtKey
+ expect(items[0].lastModified).toStrictEqual(now);
+ expect(items[1].lastModified).toStrictEqual(new Date(oldDateISO));
expect(newRepo.isNew).toBe(true);
expect(oldRepo.isNew).toBe(false);
});
diff --git a/tests/validateConfig.test.js b/tests/validateConfig.test.js
index 089e2e6..7354429 100644
--- a/tests/validateConfig.test.js
+++ b/tests/validateConfig.test.js
@@ -54,10 +54,20 @@ describe('validateConfig', () => {
expect(validateConfig({ ...VALID_CONFIG, ORGANIZATION_NAME: '' })).toContain('ORGANIZATION_NAME');
});
- it('errors when ORGANIZATION_NAME is not in accepted format', () => {
+ it('errors when ORGANIZATION_NAME is not in accepted format for selected platform: GitHub, but okay for other platforms', () => {
expect(
- validateConfig({ ...VALID_CONFIG, ORGANIZATION_NAME: 'abc center' })
- ).toContain('ORGANIZATION_NAME (abc center) is invalid, only letters, numbers, and hyphens are allowed');
+ validateConfig({ ...VALID_CONFIG, ORGANIZATION_NAME: 'abc_center' })
+ ).toContain('ORGANIZATION_NAME (abc_center) is invalid for github API calls, only letters, numbers, and hyphens are allowed');
+ });
+
+ it('does not error when ORGANIZATION_NAME is in accepted format for selected platform: GitLab, but not for GitHub', () => {
+ const config = { ...VALID_CONFIG, PLATFORM: 'gitlab', ORGANIZATION_NAME: 'abc_center' };
+ expect(validateConfig(config)).toEqual([]);
+ });
+
+ it('errors when ORGANIZATION_NAME is not in accepted format for selected platform: Codeberg, and other platforms', () => {
+ const config = { ...VALID_CONFIG, PLATFORM: 'codeberg', ORGANIZATION_NAME: 'abc center' };
+ expect(validateConfig(config)).toContain('ORGANIZATION_NAME (abc center) is invalid for codeberg API calls, only letters, numbers, hyphens, and underscores are allowed');
});
it('errors when HF_ORGANIZATION_NAME is missing', () => {
@@ -101,7 +111,7 @@ describe('validateConfig', () => {
it('errors when PLATFORM is not a string', () => {
expect(validateConfig({ ...VALID_CONFIG, PLATFORM: 123 })).toContain('PLATFORM');
});
-
+
it('errors when PLATFORM is unrecognized', () => {
const errors = validateConfig({ ...VALID_CONFIG, PLATFORM: 'blah' });
expect(errors.some(e => e.includes('PLATFORM'))).toBe(true);
From 2e3f1a5b49f7e0751934372978aa4537d23eae46 Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Mon, 17 Aug 2026 16:28:26 -0400
Subject: [PATCH 10/12] Add number of results display near search bar
Pulled from Imageomics catalog [PR
135](https://github.com/Imageomics/catalog/pull/135)
cherry-pick commit: 6933942875119ea87a1624cd80647032ceda30f0
* feat: display result count next to search bar, adjusts with all filters
Co-authored-by: egrace479 <38985481+egrace479@users.noreply.github.com>
* match formatting standard
* Add polite screen-reader notice of result count
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: egrace479 <38985481+egrace479@users.noreply.github.com>
---
index.html | 22 +++++++++++++---------
package-lock.json | 42 ------------------------------------------
src/ui/render.js | 5 +++++
3 files changed, 18 insertions(+), 51 deletions(-)
diff --git a/index.html b/index.html
index 86f0d06..9e61a46 100644
--- a/index.html
+++ b/index.html
@@ -98,15 +98,19 @@
-
-
-
-
+
+
+
+
+
+
+
diff --git a/package-lock.json b/package-lock.json
index 35ea501..0be73d3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -450,9 +450,6 @@
"arm64"
],
"dev": true,
- "libc": [
- "glibc"
- ],
"license": "MIT",
"optional": true,
"os": [
@@ -470,9 +467,6 @@
"arm64"
],
"dev": true,
- "libc": [
- "musl"
- ],
"license": "MIT",
"optional": true,
"os": [
@@ -490,9 +484,6 @@
"ppc64"
],
"dev": true,
- "libc": [
- "glibc"
- ],
"license": "MIT",
"optional": true,
"os": [
@@ -510,9 +501,6 @@
"s390x"
],
"dev": true,
- "libc": [
- "glibc"
- ],
"license": "MIT",
"optional": true,
"os": [
@@ -530,9 +518,6 @@
"x64"
],
"dev": true,
- "libc": [
- "glibc"
- ],
"license": "MIT",
"optional": true,
"os": [
@@ -550,9 +535,6 @@
"x64"
],
"dev": true,
- "libc": [
- "musl"
- ],
"license": "MIT",
"optional": true,
"os": [
@@ -779,9 +761,6 @@
"arm64"
],
"dev": true,
- "libc": [
- "glibc"
- ],
"license": "MIT",
"optional": true,
"os": [
@@ -799,9 +778,6 @@
"arm64"
],
"dev": true,
- "libc": [
- "musl"
- ],
"license": "MIT",
"optional": true,
"os": [
@@ -819,9 +795,6 @@
"x64"
],
"dev": true,
- "libc": [
- "glibc"
- ],
"license": "MIT",
"optional": true,
"os": [
@@ -839,9 +812,6 @@
"x64"
],
"dev": true,
- "libc": [
- "musl"
- ],
"license": "MIT",
"optional": true,
"os": [
@@ -1497,9 +1467,6 @@
"arm64"
],
"dev": true,
- "libc": [
- "glibc"
- ],
"license": "MPL-2.0",
"optional": true,
"os": [
@@ -1521,9 +1488,6 @@
"arm64"
],
"dev": true,
- "libc": [
- "musl"
- ],
"license": "MPL-2.0",
"optional": true,
"os": [
@@ -1545,9 +1509,6 @@
"x64"
],
"dev": true,
- "libc": [
- "glibc"
- ],
"license": "MPL-2.0",
"optional": true,
"os": [
@@ -1569,9 +1530,6 @@
"x64"
],
"dev": true,
- "libc": [
- "musl"
- ],
"license": "MPL-2.0",
"optional": true,
"os": [
diff --git a/src/ui/render.js b/src/ui/render.js
index 754280f..6ef015d 100644
--- a/src/ui/render.js
+++ b/src/ui/render.js
@@ -143,6 +143,11 @@ const renderHubItemCard = (item) => {
export const renderItemList = (items) => {
const itemListElement = document.getElementById('itemList');
const emptyStateElement = document.getElementById('emptyState');
+ const resultCountElement = document.getElementById('resultCount');
+
+ if (resultCountElement) {
+ resultCountElement.textContent = `${items.length} result${items.length !== 1 ? 's' : ''}`;
+ }
if (items.length === 0) {
itemListElement.innerHTML = '';
From 9ef866cacfe218110b56ac10faa8226d8340dc54 Mon Sep 17 00:00:00 2001
From: Elizabeth Campolongo <38985481+egrace479@users.noreply.github.com>
Date: Mon, 24 Aug 2026 12:38:12 -0400
Subject: [PATCH 11/12] Use config platform name for logging process
Pulled from Imageomics catalog [PR
139](https://github.com/Imageomics/catalog/pull/139)
cherry-pick commit: 51800ecaa94cd7698b57b6e5f6d0f1629581b219
Hugging Face fetch is hard-coded as 'HF', and pulling from display is incompatible with the SVG use in a Node environment
---
scripts/export-tags.js | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/scripts/export-tags.js b/scripts/export-tags.js
index 3e1dce0..7e762f2 100644
--- a/scripts/export-tags.js
+++ b/scripts/export-tags.js
@@ -17,7 +17,6 @@ import path from 'path';
import { fileURLToPath } from 'url';
import { load } from 'js-yaml';
import { validateConfig } from '../src/validateConfig.js';
-import { getPlatformDisplay } from '../src/utils/defineRibbonVals.js';
import { filterNewAdditionalEntries } from '../src/utils/filterNewAdditionalEntries.js';
import { getPlatformVals, getPlatformApiUrls } from '../src/utils/definePlatformVals.js';
import { getPlatformHeaders } from './platformScriptHelpers.js';
@@ -36,7 +35,7 @@ if (errors.length) {
}
const CONFIG = rawConfig;
-const { ORGANIZATION_NAME, HF_ORGANIZATION_NAME, PLATFORM, API_BASE_URL, ADDITIONAL_REPOS } = CONFIG;
+const { ORGANIZATION_NAME, HF_ORGANIZATION_NAME, API_BASE_URL, ADDITIONAL_REPOS } = CONFIG;
const ADDITIONAL_HF_REPOS = CONFIG.ADDITIONAL_HF_REPOS;
// ---------------------------------------------------------------------------
@@ -62,8 +61,7 @@ const get = async (url) => {
const allTags = new Set();
const collectCodePlatformTags = async () => {
- const platformDisplay = getPlatformDisplay(platform);
- console.log(`Fetching ${platformDisplay.displayName || PLATFORM} repos...`);
+ console.log(`Fetching ${platform} repos...`);
let allRepos = [];
let nextUrl = `${ORG_API_URL}`;
@@ -92,7 +90,7 @@ const collectCodePlatformTags = async () => {
(repo.topics || []).forEach(t => allTags.add(t.toLowerCase()));
});
- console.log(` ${platformDisplay.displayName || PLATFORM}: processed ${orgNonForks.length} org repos + ${additionalRepos.length} additional repos`);
+ console.log(` ${platform}: processed ${orgNonForks.length} org repos + ${additionalRepos.length} additional repos`);
};
const collectHFTags = async (repoType) => {
From c4a7ec5421d451b8203d1199a115f9f6e6bc74ca Mon Sep 17 00:00:00 2001
From: Net Zhang <48858129+NetZissou@users.noreply.github.com>
Date: Fri, 28 Aug 2026 18:45:14 -0400
Subject: [PATCH 12/12] Apply batched suggestions from code review
Co-authored-by: Elizabeth Campolongo <38985481+egrace479@users.noreply.github.com>
---
README.md | 2 +-
package.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 0b173f0..f7be6e3 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ This repository was generated and personalized from the [Imageomics Catalog](htt
The website is styled using the [tailwindcss](https://tailwindcss.com/) package.
-* **Real-time Data Fetching:** Displays all public organization repositories, fetched through the code platform (GitHub, GitLab, or Codeberg) and Hugging Face APIs. Includes semantically meaningful virtual markers:
+* **Real-time Data Fetching:** Displays all public ABC Center repositories, fetched through the code platform (GitHub) and Hugging Face APIs. Includes semantically meaningful virtual markers:
* "New" badge highlights products created within the last 30 days;
* "🚀 version-tag" badge indicates a new release within the last 2 weeks for code repos, and links to that release;
* Star (⭐️) or like (❤️) counts displayed for code platform or Hugging Face repos, respectively;
diff --git a/package.json b/package.json
index 83a4119..0141e12 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "catalog",
"version": "1.0.0",
- "description": "Repository for web-based ABC-Center code, data, model, and demoscatalog. This catalog is designed to use the GitHub API for searching all code repositories created under the [ABC-Center GitHub Organization](https://github.com/ABC-Center) and the Hugging Face API for searching all dataset, model, and spaces repositories created under the [ABC-Center Hugging Face Organization](https://huggingface.co/ABC-Center).",
+ "description": "Repository for web-based ABC-Center code, data, model, and demos catalog. This catalog is designed to use the GitHub API for searching all code repositories created under the [ABC-Center GitHub Organization](https://github.com/ABC-Center) and the Hugging Face API for searching all dataset, model, and spaces repositories created under the [ABC-Center Hugging Face Organization](https://huggingface.co/ABC-Center).",
"main": "main.js",
"scripts": {
"dev": "vite",