Refactor code and remove unused files

src/app/app.component.html

@@ -1,5 +1,5 @@
 @if (loading$ | async) {
-    <div class="app-loader">
+    <div class="full-size-loader">
         <nz-spin nzSimple nzSize="large"></nz-spin>
     </div>
 } @else {

src/app/app.component.scss

@@ -1,7 +0,0 @@
-.app-loader {
-  height: 100%;
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}

src/app/app.component.ts

@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { EventNotificationsComponent } from './components/event-notifications/event-notifications.component';
 import { Store } from '@ngrx/store';
-import { AppStore } from './interfaces/app-store';
+import { AppStore } from './interfaces/app-store.interface';
 import { LoadMachinesAction } from './stores/machines/machines.actions';
 import { LayoutComponent } from './components/layout/layout.component';
 import { selectLoading } from '@stores/machines/machines.selectors';

src/app/app.config.ts

@@ -4,9 +4,9 @@ import { provideRouter } from '@angular/router';
 import { routes } from './app.routes';
 import { provideStore } from '@ngrx/store';
 import { machinesReducer } from './stores/machines/machines.reducer';
-import { MACHINES_STORE } from './interfaces/machines-state';
+import { MACHINES_STORE } from './interfaces/machines-state.interface';
 import { provideStoreDevtools } from '@ngrx/store-devtools';
-import { PLACES_STORE } from './interfaces/place-state';
+import { PLACES_STORE } from './interfaces/place-state.interface';
 import { placesReducer } from './stores/places/places.reducer';
 import { provideEffects } from '@ngrx/effects';
 import { MachinesEffects } from './stores/machines/machines.effects';
@@ -20,7 +20,7 @@ import { registerLocaleData } from '@angular/common';
 import en from '@angular/common/locales/en';
 import { FormsModule } from '@angular/forms';
 import { provideAnimations } from '@angular/platform-browser/animations';
-import { SETTINGS_STORE } from '@interfaces/settings-state';
+import { SETTINGS_STORE } from '@interfaces/settings-state.interface';
 import { settingsReducer } from '@stores/settings/settings.reducer';
 
 registerLocaleData(en);

src/app/components/event-notifications/event-notifications.component.ts

@@ -9,18 +9,18 @@ import {
 } from '@angular/core';
 import { NzNotificationModule } from 'ng-zorro-antd/notification';
 import { NzNotificationService } from 'ng-zorro-antd/notification';
-import { MachineColorStatusMap } from '../../interfaces/machine-events-options';
 import { Subscription, bufferWhen, interval } from 'rxjs';
-import { AppStore } from '@interfaces/app-store';
+import { AppStore } from '@interfaces/app-store.interface';
 import { Store } from '@ngrx/store';
 import { selectSettingsFeature } from '@stores/settings/settings.selectors';
-import { NotificationLevelSettings } from '@interfaces/settings-state';
+import { NotificationLevelSettings } from '@interfaces/settings-state.interface';
 import { NzTagModule } from 'ng-zorro-antd/tag';
-import { MachineUpdateResponse } from '@interfaces/machine-update-response';
+import { MachineUpdateResponse } from '@interfaces/machine-update-response.interface';
 import { NzIconModule } from 'ng-zorro-antd/icon';
 import { RouterLink } from '@angular/router';
 import { NzGridModule } from 'ng-zorro-antd/grid';
 import { environment } from '@environments/environment';
+import { MACHINE_COLORS_STATUS_MAP } from '@constants/machine.constant';
 
 @Component({
     standalone: true,
@@ -91,11 +91,11 @@ export class EventNotificationsComponent implements OnInit, OnDestroy {
         if (this.settings.notificationLevel[event.status]) {
             this.notificationService.template(this.template!, {
                 nzData: {
-                    color: MachineColorStatusMap[event.status],
+                    color: MACHINE_COLORS_STATUS_MAP[event.status],
                     machine_id: event.machine_id,
                     status: event.status,
                 },
-                nzClass: MachineColorStatusMap[event.status],
+                nzClass: MACHINE_COLORS_STATUS_MAP[event.status],
                 nzPlacement: 'bottomRight',
             });
         }

src/app/components/map/map.component.spec.ts

@@ -1,7 +1,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { MapComponent } from './map.component';
-import { Place } from '@models/place';
+import { Place } from '@models/place.model';
 
 describe('MapComponent', () => {
     let component: MapComponent;

src/app/components/map/map.component.ts

@@ -11,9 +11,9 @@ import {
     ViewChild,
 } from '@angular/core';
 import { environment } from '@environments/environment';
-import { MachineCoordinate } from '@interfaces/place-state';
-import { Machine } from '@models/machine';
-import { Place } from '@models/place';
+import { MachineCoordinate } from '@interfaces/place-state.interface';
+import { Machine } from '@models/machine.model';
+import { Place } from '@models/place.model';
 import mapboxgl from 'mapbox-gl';
 import { NgxResizeObserverModule } from 'ngx-resize-observer';
 import { Subject, Subscription, debounceTime } from 'rxjs';
@@ -107,7 +107,6 @@ export class MapComponent
     }
 
     resizeMap(): void {
-        console.log('resize');
         this.map.resize();
     }
 }

src/app/constants/machine.constant.ts

@@ -0,0 +1,31 @@
+import { StatusFilterOption } from '@interfaces/machine-events-options.interface';
+import { NzTableFilterList } from 'ng-zorro-antd/table';
+
+export enum MACHINE_STATUS_MAP {
+    idle = 'idle',
+    running = 'running',
+    errored = 'errored',
+    repaired = 'repaired',
+    finished = 'finished',
+}
+
+export const MACHINE_STATUS_FILTERS: StatusFilterOption[] = [
+    { text: 'Idle', value: MACHINE_STATUS_MAP.idle },
+    { text: 'Running', value: MACHINE_STATUS_MAP.running },
+    { text: 'Errored', value: MACHINE_STATUS_MAP.errored },
+    { text: 'Repaired', value: MACHINE_STATUS_MAP.repaired },
+    { text: 'Finished', value: MACHINE_STATUS_MAP.finished },
+];
+
+export const MACHINE_COLORS_STATUS_MAP = {
+    [MACHINE_STATUS_MAP.idle]: 'info',
+    [MACHINE_STATUS_MAP.running]: 'warning',
+    [MACHINE_STATUS_MAP.errored]: 'error',
+    [MACHINE_STATUS_MAP.repaired]: 'success',
+    [MACHINE_STATUS_MAP.finished]: 'success',
+};
+
+export const MACHINE_TYPE_OPTIONS: NzTableFilterList = [
+    { text: 'Microscope', value: 'microscope' },
+    { text: 'Measurement', value: 'measurement' },
+];

src/app/interfaces/app-store.interface.ts

@@ -0,0 +1,5 @@
+import { MachinesStore } from './machines-state.interface';
+import { PlacesStore } from './place-state.interface';
+import { SettingsStore } from './settings-state.interface';
+
+export interface AppStore extends MachinesStore, PlacesStore, SettingsStore {}

src/app/interfaces/floor.ts → src/app/interfaces/floor.interface.ts

@@ -1,4 +1,4 @@
-import { Machine } from '../models/machine';
+import { Machine } from '../models/machine.model';
 
 export interface Floor {
     level: number;

src/app/interfaces/machine-events-options.interface.ts

@@ -0,0 +1,12 @@
+export type MachineStatus = 'idle' | 'running' | 'errored' | 'repaired';
+
+export interface StatusFilterOption {
+    text: string;
+    value: string;
+    byDefault?: boolean;
+}
+
+export interface MachineEventsOptions {
+    timestamp: string;
+    status: MachineStatus;
+}

src/app/interfaces/machine-options.ts → src/app/interfaces/machine-options.interface.ts

@@ -1,4 +1,4 @@
-import { MachineEventsOptions, MachineStatus } from './machine-events-options';
+import { MachineEventsOptions, MachineStatus } from './machine-events-options.interface';
 
 export interface MachineOptions {
     id: string;

src/app/interfaces/machine-response.ts → src/app/interfaces/machine-response.interface.ts

@@ -1,4 +1,4 @@
-import { MachineOptions } from './machine-options';
+import { MachineOptions } from './machine-options.interface';
 
 export interface MachineResponse {
     data: MachineOptions;

src/app/interfaces/machine-update-response.ts → src/app/interfaces/machine-update-response.interface.ts

@@ -1,4 +1,4 @@
-import { MachineEventsOptions } from './machine-events-options';
+import { MachineEventsOptions } from './machine-events-options.interface';
 
 export interface MachineUpdateResponse extends MachineEventsOptions {
     machine_id: string;

src/app/interfaces/machine.interface.ts

@@ -0,0 +1,7 @@
+import { NzSafeAny } from 'ng-zorro-antd/core/types';
+
+export interface MachineTypeOption {
+    text: string;
+    value: NzSafeAny;
+    byDefault?: boolean;
+}

src/app/interfaces/machines-response.ts → src/app/interfaces/machines-response.interface.ts

@@ -1,4 +1,4 @@
-import { MachineOptions } from './machine-options';
+import { MachineOptions } from './machine-options.interface';
 
 export interface MachinesResponse {
     data: MachineOptions[];

src/app/interfaces/machines-state.ts → src/app/interfaces/machines-state.interface.ts

@@ -1,5 +1,5 @@
 import { EntityState } from '@ngrx/entity';
-import { Machine } from '../models/machine';
+import { Machine } from '../models/machine.model';
 
 export const MACHINES_STORE = 'machinesStore';
 

src/app/interfaces/place-options.ts → src/app/interfaces/place-options.interface.ts

@@ -1,4 +1,4 @@
-import { Floor } from './floor';
+import { Floor } from './floor.interface';
 
 export interface PlaceOptions {
     longitude: number;

src/app/interfaces/place-state.ts → src/app/interfaces/place-state.interface.ts

@@ -1,6 +1,6 @@
 import { EntityState } from '@ngrx/entity';
-import { Place } from '../models/place';
-import { Machine } from '../models/machine';
+import { Place } from '../models/place.model';
+import { Machine } from '../models/machine.model';
 
 export const PLACES_STORE = 'placesStore';
 

src/app/models/machine-event.ts → src/app/models/machine-event.model.ts

@@ -1,7 +1,7 @@
 import {
     MachineEventsOptions,
     MachineStatus,
-} from '../interfaces/machine-events-options';
+} from '../interfaces/machine-events-options.interface';
 
 export class MachineEvent {
     timestamp: string;

src/app/models/machine.ts → src/app/models/machine.model.ts

@@ -1,5 +1,5 @@
-import { MachineOptions } from '../interfaces/machine-options';
-import { MachineEvent } from './machine-event';
+import { MachineOptions } from '../interfaces/machine-options.interface';
+import { MachineEvent } from './machine-event.model';
 
 export class Machine {
     id!: string;

src/app/models/place.model.ts

@@ -0,0 +1,27 @@
+import { PlaceOptions } from '../interfaces/place-options.interface';
+import { Machine } from './machine.model';
+import { v4 as uuidv4 } from 'uuid';
+
+export class Place {
+    id = uuidv4();
+    longitude!: number;
+    latitude!: number;
+    floors: PlaceOptions['floors'] = [];
+
+    constructor(options: PlaceOptions) {
+        this.longitude = options.longitude;
+        this.latitude = options.latitude;
+        this.floors = options.floors || [];
+    }
+
+    addMachine(machine: Machine) {
+        if (this.floors && this.floors[machine.floor]) {
+            this.floors[machine.floor].machines.push(machine.id);
+        } else if (this.floors) {
+            this.floors[machine.floor] = {
+                level: machine.floor,
+                machines: [machine.id],
+            };
+        }
+    }
+}

src/app/pages/dashboard/components/dashboard-page/dashboard-page.component.spec.ts

@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { DashboardPageComponent } from './dashboard-page.component';
 import { MockStore, provideMockStore } from '@ngrx/store/testing';
-import { AppStore } from '@interfaces/app-store';
+import { AppStore } from '@interfaces/app-store.interface';
 import { Store } from '@ngrx/store';
 
 describe('DashboardPageComponent', () => {