resolve merge conflicts with feature/pbs-25.02

Author: mkovalua

.github/rules/All Branch Rules.json

@@ -2,9 +2,12 @@ name: Run Jest Tests
 
 on:
   pull_request:
-    branches: ['*'] # or change to match your default branch
   push:
-    branches: ['*']
+    branches:
+      - develop
+      - main
+      - 'release/*'
+      - 'hotfix/*'
   workflow_dispatch:
 
 jobs:
@@ -45,6 +48,10 @@ jobs:
 
       - name: Check coverage thresholds
         run: npm run test:check-coverage-thresholds
+      - name: Coveralls Report
+        uses: coverallsapp/github-action@v2
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
   lint:
     runs-on: ubuntu-latest
 

.github/rules/Main_Develop Branch Rules.json

@@ -48,7 +48,6 @@
             "styles": [
               "src/styles/styles.scss",
               "node_modules/primeflex/primeflex.css",
-              "node_modules/@fortawesome/fontawesome-free/css/all.min.css",
               "node_modules/ngx-markdown-editor/assets/highlight.js/agate.min.css"
             ],
             "stylePreprocessorOptions": {
@@ -74,7 +73,8 @@
                   "maximumError": "25kB"
                 }
               ],
-              "outputHashing": "all"
+              "outputHashing": "all",
+              "optimization": true
             },
             "analyze-bundle": {
               "sourceMap": true,
@@ -147,15 +147,15 @@
             },
             "development": {
               "buildTarget": "osf:build:development",
-              "hmr": false
+              "hmr": true
             },
             "docker": {
               "buildTarget": "osf:build:docker",
-              "hmr": false
+              "hmr": true
             },
             "staging": {
               "buildTarget": "osf:build:staging",
-              "hmr": false
+              "hmr": true
             },
             "test": {
               "buildTarget": "osf:build:test",

.github/workflows/review.yml

@@ -50,10 +50,10 @@ module.exports = {
   extensionsToTreatAsEsm: ['.ts'],
   coverageThreshold: {
     global: {
-      branches: 24.1,
-      functions: 28.73,
-      lines: 56.52,
-      statements: 56.82,
+      branches: 29.01,
+      functions: 32.75,
+      lines: 60.28,
+      statements: 60.77,
     },
   },
   watchPathIgnorePatterns: [