Restoring the changes

Author: dibyanshu-pal-kushwaha

frontend/package.json

@@ -213,10 +213,6 @@
     "@vitest/coverage-istanbul": "^3.0.5",
     "eslint-plugin-license-header": "^0.8.0",
     "fast-check": "^4.5.3",
-<<<<<<< HEAD
-    "husky": "^4.3.8",
-=======
->>>>>>> aac9f6766 (root: ci: Add husky,commitlint.config.js& Update docs)
     "i18next-parser": "^9.1.0",
     "jsdom": "^24.0.0",
     "lint-staged": "^10.5.4",

frontend/src/lib/k8s/api/v2/multiplexer.ts

@@ -76,21 +76,15 @@ export const WebSocketManager = {
    */
   async connect(): Promise<WebSocket> {
     // Return existing connection if available
-    if (
-      typeof WebSocket !== 'undefined' &&
-      this.socketMultiplexer?.readyState === WebSocket.OPEN
-    ) {
+    if (this.socketMultiplexer?.readyState === WebSocket.OPEN) {
       return this.socketMultiplexer;
     }
 
     // Wait for existing connection attempt if in progress
     if (this.connecting) {
       return new Promise(resolve => {
         const checkConnection = setInterval(() => {
-          if (
-            typeof WebSocket !== 'undefined' &&
-            this.socketMultiplexer?.readyState === WebSocket.OPEN
-          ) {
+          if (this.socketMultiplexer?.readyState === WebSocket.OPEN) {
             clearInterval(checkConnection);
             resolve(this.socketMultiplexer);
           }
@@ -240,10 +234,7 @@ export const WebSocketManager = {
             this.activeSubscriptions.delete(key);
             this.completedPaths.delete(key);
 
-            if (
-              typeof WebSocket !== 'undefined' &&
-              this.socketMultiplexer?.readyState === WebSocket.OPEN
-            ) {
+            if (this.socketMultiplexer?.readyState === WebSocket.OPEN) {
               const userId = getUserIdFromLocalStorage();
               const closeMsg: WebSocketMessage = {
                 clusterId,

frontend/src/setupTests.ts

@@ -17,10 +17,8 @@
 /// <reference types="@testing-library/jest-dom" />
 import '@testing-library/jest-dom/vitest';
 import indexeddb from 'fake-indexeddb';
-import WS from 'vitest-websocket-mock';
 
 globalThis.indexedDB = indexeddb;
-(globalThis as any).WebSocket = WS;
 
 if (typeof TextDecoder === 'undefined' && typeof require !== 'undefined') {
   (global as any).TextDecoder = require('util').TextDecoder;

frontend/tsconfig.json

@@ -21,11 +21,6 @@
   "typedocOptions": {
     "out": "../docs/development/api",
     "plugin": ["typedoc-plugin-markdown", "typedoc-plugin-rename-defaults"],
-    "exclude": [
-      "**/*.test.tsx",
-      "**/*.test.ts",
-      "src/setupTests.ts"
-    ],
     "entryPoints": [
       "src/lib/k8s/",
       "src/redux/reducers/reducers.tsx",

package.json

@@ -21,14 +21,9 @@
     "dev": "npm run start",
     "start": "concurrently \"npm run backend:start\" \"npm run frontend:start\" --names \"backend,frontend\" --prefix-colors \"blue,green\"",
     "test": "npm run backend:test && npm run frontend:test",
-<<<<<<< HEAD
-    "lint": "npm run backend:lint && npm run frontend:lint && npm run app:lint",
-    "lint:fix": "npm run backend:lint:fix && npm run frontend:lint:fix && npm run app:lint:fix",
-=======
     "lint": "npm run backend:lint && npm run frontend:lint && npm run lint:commit",
     "lint:commit": "commitlint --from=origin/main",
     "lint:fix": "npm run backend:lint:fix && npm run frontend:lint:fix",
->>>>>>> aac9f6766 (root: ci: Add husky,commitlint.config.js& Update docs)
     "clean": "rm -rf frontend/build frontend/node_modules app/node_modules app/dist backend/headlamp-server backend/headlamp-server.exe node_modules",
     "backend:build": "cd backend && go build -o ./headlamp-server ./cmd",
     "backend:lint": "npm run backend:install:linter && cd backend && ./tools/golangci-lint run",