Merge pull request #57 from Zapper9982/bugfix/issue-51

fix: Made necessary changes for build to pass

Author: drtechie

.eslintrc.json

@@ -35,6 +35,7 @@
         "@typescript-eslint/no-explicit-any": 0,
         "@typescript-eslint/no-empty-function": 0,
         "@typescript-eslint/no-unused-vars": 0,
+        "@angular-eslint/template/click-events-have-key-events": 0,
         "eqeqeq": 1
       }
     },
@@ -55,6 +56,22 @@
           }
         ]
       }
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "env": {
+         "node": true
+      },
+      "extends": ["eslint:recommended"],
+      "parserOptions": {
+        "ecmaVersion": 2020,
+        "sourceType": "module"
+      },
+      "rules": {
+        "no-unused-vars": "warn",
+        "no-console": "error",
+        "eqeqeq": ["error", "always"]
+      }
     }
   ]
 }

.github/workflows/build-on-pull-request.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.ref }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
@@ -19,13 +19,13 @@ jobs:
         run: git submodule update --init --recursive
 
       - name: Setup JDK 17
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'adopt'
 
       - name: Set up Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: 18
 
@@ -34,8 +34,6 @@ jobs:
           npm config set legacy-peer-deps true
           npm install -g @angular/cli
           npm install [email protected] --save-dev
-          npm install [email protected]
-          npm install node-sass
           npm install --force
-          npm run build
+          npm run build-ci
 

.github/workflows/package-prod.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
 
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         submodules: true  # Include submodules
         fetch-depth: 0    # Ensure the full history is fetched
@@ -25,13 +25,13 @@ jobs:
       run: git submodule update --init --recursive
 
     - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
           java-version: '17'
           distribution: 'adopt'
 
     - name: Set up Node.js
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v4
       with:
           node-version: 18
 
@@ -40,16 +40,14 @@ jobs:
             npm config set legacy-peer-deps true
             npm install -g @angular/cli
             npm install [email protected] --save-dev
-            npm install [email protected]
-            npm install node-sass
             npm install --force
-            npm run build
+            npm run build-ci
 
     - name: Create WAR file
       run: jar -cvf tm-ui.war -C dist .
 
     - name: Upload WAR file as artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: TM-UI
-        path: tm-ui.war 
+        path: dist/tm-ui/tm-ui.war

.github/workflows/package.yml

@@ -43,3 +43,4 @@ testem.log
 Thumbs.db
 
 /src/environments/environment.ts
+/src/environments/environment.ci.ts

.gitignore

@@ -50,7 +50,13 @@
                 }
               ],
               "outputHashing": "all",
-              "optimization": true
+              "optimization": true,
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ]
             },
             "development": {
               "buildOptimizer": false,

angular.json

@@ -10,10 +10,10 @@
     "lint": "ng lint",
     "lint:fix": "ng lint --fix",
     "prepare": "husky install",
-    "build-dev": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng build --configuration=development --aot",
-    "build-prod": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng build --configuration=production --aot",
-    "build-ci": "chmod +x ./scripts/*.js && ./scripts/ci-prebuild.js && node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng build --configuration=ci --aot",
-    "build-test": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng build --configuration=test --aot"
+    "build-dev": "(test -f src/environments/environment.ts || touch src/environments/environment.ts) && node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng build --configuration=development --aot",
+    "build-prod": "(test -f src/environments/environment.ts || touch src/environments/environment.ts) && node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng build --configuration=production --aot",
+    "build-ci": "(test -f src/environments/environment.ts || touch src/environments/environment.ts) && chmod +x ./scripts/*.js && ./scripts/ci-prebuild.js && node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng build --configuration=ci --aot",
+    "build-test": "(test -f src/environments/environment.ts || touch src/environments/environment.ts) && node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng build --configuration=test --aot"
   },
   "lint-staged": {
     "src/**/*.{ts,html}": [