Merge pull request #61 from alercebroker/develop

Merge Develop into Main

package.json

@@ -8,14 +8,17 @@
     "test:unit": "vue-cli-service test:unit",
     "lint": "vue-cli-service lint",
     "prettier": "prettier --check .",
+    "prettier_write": "prettier --write .",
     "deploy": "vue-cli-service s3-deploy",
     "test": "jest"
   },
   "dependencies": {
     "@mdi/font": "^5.9.55",
     "axios": "^0.21.1",
     "core-js": "^3.6.5",
+    "htmx.org": "^1.9.12",
     "inversify-props": "^2.2.6",
+    "jsdom": "^24.1.0",
     "moment": "^2.29.1",
     "neverthrow": "^4.2.1",
     "papaparse": "5.3.1",
@@ -29,6 +32,7 @@
   },
   "devDependencies": {
     "@types/jest": "^24.9.1",
+    "@types/jsdom": "^21.1.7",
     "@types/papaparse": "5.2.6",
     "@typescript-eslint/eslint-plugin": "^4.18.0",
     "@typescript-eslint/parser": "^4.18.0",
@@ -55,4 +59,4 @@
     "vue-template-compiler": "^2.6.11",
     "vuetify-loader": "^1.7.0"
   }
-}
+}

src/app/filter/domain/Filter.ts

@@ -30,7 +30,7 @@ export class WatchlistFilter implements IWatchlistFilter {
     for (let i = 0; i < _steps.length; i++) {
       const fields_set: Set<Field> = new Set();
       fieldsList.forEach((fields) => {
-          fields[_steps[i]]!.forEach((field) => fields_set.add(field));
+        fields[_steps[i]]!.forEach((field) => fields_set.add(field));
       });
       result[_steps[i]] = Array.from(fields_set);
     }

src/app/target/infrastructure/__tests__/TargetService.mock.ts

@@ -11,7 +11,10 @@ import {
   ITargetRepository,
 } from "../../domain/Target.types";
 
-import { IWatchlistFilter, IWatchlistSingleFilter } from "@/app/filter/domain/Filter.types";
+import {
+  IWatchlistFilter,
+  IWatchlistSingleFilter,
+} from "@/app/filter/domain/Filter.types";
 import { FilterFields } from "@/app/filter/domain/Filter";
 
 const targetArray: ITargetData[] = [
@@ -95,10 +98,9 @@ export class MockTargetService implements ITargetRepository {
             dec: 20,
             radius: 30,
             filter: {
-              fields:{} as FilterFields, 
-              filters:[] as IWatchlistSingleFilter[]
+              fields: {} as FilterFields,
+              filters: [] as IWatchlistSingleFilter[],
             },
-
           } as ITargetData)
         );
       });

src/shared/http/HttpService.mock.ts

@@ -16,7 +16,6 @@ import {
 import { IWatchlistSingleFilter } from "@/app/filter/domain/Filter.types";
 import { FilterFields } from "@/app/filter/domain/Filter";
 
-
 export type TestActions =
   | "ok"
   | "error"
@@ -111,8 +110,8 @@ export class MockUserApi extends HttpService {
         ra: 0.960746,
         dec: -11.47467,
         filter: {
-          fields:{} as FilterFields, 
-          filters:[] as IWatchlistSingleFilter[]
+          fields: {} as FilterFields,
+          filters: [] as IWatchlistSingleFilter[],
         },
       };
       return [200, JSON.stringify(response)];
@@ -125,8 +124,8 @@ export class MockUserApi extends HttpService {
         ra: 0.960746,
         dec: -11.47467,
         filter: {
-          fields:{} as FilterFields, 
-          filters:[] as IWatchlistSingleFilter[]
+          fields: {} as FilterFields,
+          filters: [] as IWatchlistSingleFilter[],
         },
       };
       return [201, JSON.stringify(response)];

src/shared/types/filter.types.ts

@@ -6,7 +6,6 @@ export interface WatchlistFilter {
   }[];
 }
 
-
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface FilterParams {}