Merge branch 'main' into feat/preprint-details

Author: rrromchIk

.github/scripts/check-coverage-thresholds.js

@@ -14,7 +14,7 @@ for (const key of ['branches', 'functions', 'lines', 'statements']) {
   if (current > threshold) {
     errors.push(
       `Coverage for ${key} (${current}%) is above the threshold (${threshold}%).\n\tPlease update the coverageThreshold.global.${key} in the jest.config.js to ${current}!`
-    )
+    );
     failed = true;
   }
 }
@@ -26,6 +26,6 @@ if (failed) {
   console.log('Please update the coverage thresholds in jest.config.js.');
   console.log('You will need to commit again once you have updated the jst.config.js file.');
   console.log('This is only necessary until we hit 100% coverage.\n\n');
-  errors.forEach(err => console.error(`${err}\n`));
+  errors.forEach((err) => console.error(`${err}\n`));
   process.exit(1);
-}
+}

.gitignore

@@ -42,4 +42,3 @@ testem.log
 # System files
 .DS_Store
 Thumbs.db
-package-lock.json

.husky/pre-push

@@ -1,11 +1,11 @@
-npm run build
+# npm run build
 
-npm run test:coverage || {
-  printf "\n\nERROR: Testing errors or coverage issues were found. Please address them before proceeding.\n\n\n\n"
-  exit 1
-}
+# npm run test:coverage || {
+#   printf "\n\nERROR: Testing errors or coverage issues were found. Please address them before proceeding.\n\n\n\n"
+#   exit 1
+# }
 
-npm run test:check-coverage-thresholds || {
-  printf "\n\nERROR: Coverage thresholds were not met. Please address them before proceeding.\n\n\n\n"
-  exit 1
-}
+# npm run test:check-coverage-thresholds || {
+#   printf "\n\nERROR: Coverage thresholds were not met. Please address them before proceeding.\n\n\n\n"
+#   exit 1
+# }

.vscode/settings.json

@@ -5,9 +5,7 @@
     "source.fixAll.stylelint": "explicit",
     "source.fixAll.eslint": "explicit"
   },
-  "[html]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
   "scss.lint.unknownAtRules": "ignore",
   "eslint.validate": ["json"]
 }

eslint.config.js

@@ -85,5 +85,11 @@ module.exports = tseslint.config(
     files: ['**/*.html'],
     extends: [...angular.configs.templateRecommended, ...angular.configs.templateAccessibility],
     rules: {},
+  },
+  {
+    files: ['**/*.spec.ts'],
+    rules: {
+      '@typescript-eslint/no-explicit-any': 'off',
+    },
   }
 );

jest.config.js

@@ -27,6 +27,11 @@ module.exports = {
   coverageDirectory: 'coverage',
   collectCoverageFrom: [
     'src/app/**/*.{ts,js}',
+    '!src/app/app.config.ts',
+    '!src/app/**/*.routes.{ts.js}',
+    '!src/app/**/*.models.{ts.js}',
+    '!src/app/**/*.model.{ts.js}',
+    '!src/app/**/*.route.{ts,js}',
     '!src/app/**/*.spec.{ts,js}',
     '!src/app/**/*.module.ts',
     '!src/app/**/index.ts',
@@ -35,17 +40,25 @@ module.exports = {
   extensionsToTreatAsEsm: ['.ts'],
   coverageThreshold: {
     global: {
-      branches: 11.89,
-      functions: 12.12,
-      lines: 37.27,
-      statements: 37.83,
+      branches: 11.2,
+      functions: 11.34,
+      lines: 36.73,
+      statements: 37.33,
     },
   },
   testPathIgnorePatterns: [
+    '<rootDir>/src/app/app.config.ts',
+    '<rootDir>/src/app/app.routes.ts',
     '<rootDir>/src/app/features/registry/',
     '<rootDir>/src/app/features/project/',
     '<rootDir>/src/app/features/registries/',
-    '<rootDir>/src/app/features/settings/',
+    '<rootDir>/src/app/features/settings/addons/',
+    '<rootDir>/src/app/features/settings/notifications/',
+    '<rootDir>/src/app/features/settings/settings-container.component.ts',
+    '<rootDir>/src/app/features/settings/tokens/components/',
+    '<rootDir>/src/app/features/settings/tokens/mappers/',
+    '<rootDir>/src/app/features/settings/tokens/store/',
+    '<rootDir>/src/app/features/settings/tokens/pages/tokens-list/',
     '<rootDir>/src/app/shared/',
   ],
 };