Merge remote-tracking branch 'origin/main' into fix/develop-update

Author: nsemets

.husky/pre-push

@@ -17,3 +17,4 @@ npm run test:check-coverage-thresholds || {
   #printf "\n\nPlease address them before proceeding.\n\n\n\n"
   # exit 1
 }
+

angular.json

@@ -29,9 +29,11 @@
               "cedar-embeddable-editor",
               "cedar-artifact-viewer",
               "markdown-it-video",
-              "ace-builds/src-noconflict/ext-language_tools"
+              "ace-builds/src-noconflict/ext-language_tools",
+              "@traptitech/markdown-it-katex"
             ],
             "assets": [
+              "src/favicon.ico",
               "src/assets",
               {
                 "glob": "**/*",
@@ -63,7 +65,7 @@
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "7MB",
+                  "maximumWarning": "9MB",
                   "maximumError": "10MB"
                 },
                 {
@@ -79,36 +81,58 @@
               "outputHashing": "none",
               "namedChunks": true
             },
-            "local": {
+            "development": {
               "optimization": false,
               "extractLicenses": false,
               "sourceMap": true,
               "fileReplacements": [
                 {
                   "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.local.ts"
+                  "with": "src/environments/environment.development.ts"
                 }
               ]
             },
-            "test-osf": {
+            "docker": {
               "optimization": false,
               "extractLicenses": false,
               "sourceMap": true,
               "fileReplacements": [
                 {
                   "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.test-osf.ts"
+                  "with": "src/environments/environment.docker.ts"
                 }
               ]
             },
-            "development": {
-              "optimization": false,
+            "staging": {
+              "optimization": true,
               "extractLicenses": false,
-              "sourceMap": true,
+              "sourceMap": false,
               "fileReplacements": [
                 {
                   "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.development.ts"
+                  "with": "src/environments/environment.staging.ts"
+                }
+              ]
+            },
+            "test": {
+              "optimization": true,
+              "extractLicenses": false,
+              "sourceMap": false,
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.test.ts"
+                }
+              ]
+            },
+            "test-osf": {
+              "optimization": true,
+              "extractLicenses": false,
+              "sourceMap": false,
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.test-osf.ts"
                 }
               ]
             }
@@ -125,8 +149,16 @@
               "buildTarget": "osf:build:development",
               "hmr": false
             },
-            "local": {
-              "buildTarget": "osf:build:local",
+            "docker": {
+              "buildTarget": "osf:build:docker",
+              "hmr": false
+            },
+            "staging": {
+              "buildTarget": "osf:build:staging",
+              "hmr": false
+            },
+            "test": {
+              "buildTarget": "osf:build:test",
               "hmr": false
             },
             "test-osf": {

docker-compose.yml

@@ -22,6 +22,7 @@ services:
       - ./angular.json:/app/angular.json
       - ./tsconfig.json:/app/tsconfig.json
       - ./tsconfig.app.json:/app/tsconfig.app.json
+      - ./docker/scripts:/app/docker
     # (CMD comes from Dockerfile, but you could override here if you wanted)
     command: ['npm', 'run', 'start:docker']
 

docker/scripts/check-config.js

@@ -0,0 +1,12 @@
+const fs = require('fs');
+const path = require('path');
+
+const configPath = path.join(__dirname, '../src/assets/config/config.json');
+const templatePath = path.join(__dirname, '../src/assets/config/template.json');
+
+if (!fs.existsSync(configPath)) {
+  console.log('[INFO] config.json not found. Copying from template.json...');
+  fs.copyFileSync(templatePath, configPath);
+} else {
+  console.log('[INFO] config.json already exists.');
+}

eslint.config.js

@@ -87,9 +87,6 @@ module.exports = tseslint.config(
   },
   {
     files: ['**/*.html'],
-    plugins: {
-      '@angular-eslint/template': angularEslintTemplate,
-    },
     languageOptions: {
       parser: angularTemplateParser,
     },

jest.config.js

@@ -28,13 +28,18 @@ module.exports = {
   coverageDirectory: 'coverage',
   collectCoverageFrom: [
     'src/app/**/*.{ts,js}',
+    '!src/app/core/theme/**',
     '!src/app/app.config.ts',
-    '!src/app/**/*.routes.{ts.js}',
+    '!src/app/app.routes.ts',
+    '!src/app/**/*.routes.{ts,js}',
+    '!src/app/**/**/*.routes.{ts,js}',
+    '!src/app/**/*.route.{ts,js}',
+    '!src/app/**/mappers/**',
+    '!src/app/shared/mappers/**',
     '!src/app/**/*.models.{ts.js}',
     '!src/app/**/*.model.{ts.js}',
-    '!src/app/**/*.route.{ts,js}',
-    '!src/app/**/*.enum.{ts,js}',
-    '!src/app/**/*.type.{ts,js}',
+    '!src/app/**/models/*.{ts,js}',
+    '!src/app/shared/models/**',
     '!src/app/**/*.enum.{ts,js}',
     '!src/app/**/*.type.{ts,js}',
     '!src/app/**/*.spec.{ts,js}',
@@ -45,10 +50,10 @@ module.exports = {
   extensionsToTreatAsEsm: ['.ts'],
   coverageThreshold: {
     global: {
-      branches: 14.27,
-      functions: 15.55,
-      lines: 42.6,
-      statements: 43.2,
+      branches: 24.1,
+      functions: 28.73,
+      lines: 56.52,
+      statements: 56.82,
     },
   },
   watchPathIgnorePatterns: [
@@ -60,24 +65,22 @@ module.exports = {
     '<rootDir>/src/@types/',
   ],
   testPathIgnorePatterns: [
+    '<rootDir>/src/environments',
     '<rootDir>/src/app/app.config.ts',
     '<rootDir>/src/app/app.routes.ts',
-    '<rootDir>/src/app/features/files/components',
     '<rootDir>/src/app/features/files/pages/file-detail',
-    '<rootDir>/src/app/features/preprints/',
-    '<rootDir>/src/app/features/project/',
-    '<rootDir>/src/app/features/registries/',
-    '<rootDir>/src/app/features/registry/',
+    '<rootDir>/src/app/features/project/addons/',
+    '<rootDir>/src/app/features/project/overview/',
+    '<rootDir>/src/app/features/project/registrations',
+    '<rootDir>/src/app/features/project/wiki',
+    '<rootDir>/src/app/features/registry/components',
+    '<rootDir>/src/app/features/registry/pages/registry-wiki/registry-wiki',
     '<rootDir>/src/app/features/settings/addons/',
     '<rootDir>/src/app/features/settings/tokens/store/',
     '<rootDir>/src/app/shared/components/file-menu/',
-    '<rootDir>/src/app/shared/components/files-tree/',
     '<rootDir>/src/app/shared/components/line-chart/',
-    '<rootDir>/src/app/shared/components/make-decision-dialog/',
     '<rootDir>/src/app/shared/components/pie-chart/',
-    '<rootDir>/src/app/shared/components/resource-citations/',
     '<rootDir>/src/app/shared/components/reusable-filter/',
     '<rootDir>/src/app/shared/components/wiki/edit-section/',
-    '<rootDir>/src/app/shared/components/wiki/wiki-list/',
   ],
 };