Update names part 2

Frontend/src/app/models/layer.model.ts

@@ -3,22 +3,22 @@ import { UntypedFormBuilder, Validators, UntypedFormGroup } from '@angular/forms
 import { HttpClient } from '@angular/common/http';
 import { environment } from 'src/environments/environment';
 import { map } from 'rxjs';
-import { DataRow } from './dataRow.model copy';
+import { Record } from 'src/app/models/record.model';
 
-export class DataSet extends Base {
+export class Layer extends Base {
     number?: Number;
     source?: string;
     name?: string;
-    dataRows: DataRow[] = [];
+    records: Record[] = [];
     created?: string;
 
-    constructor(data: Partial<DataSet> = {}) {
+    constructor(data: Partial<Layer> = {}) {
         super();
         Object.assign(this, data);
     }
     override deserialize(input: any): this {
         Object.assign(this, Object.assign(this, super.deserialize(input)));
-        if (this.dataRows) { this.dataRows = this.dataRows.map(x => new DataRow().deserialize(x)); }
+        if (this.records) { this.records = this.records.map(x => new Record().deserialize(x)); }
         return this;
     }
     override serialize() {
@@ -48,15 +48,15 @@ export class DataSet extends Base {
     }
     loadForm(form: UntypedFormGroup) {
         for (let field of Object.keys(form.controls)) {
-            this[field as keyof DataSet] = form.controls[field].value;
+            this[field as keyof Layer] = form.controls[field].value;
         }
         this.createdBy = undefined;
         this.modifiedBy = undefined;
     }
     //API Actions 
-    static add(input: DataSet, _http: HttpClient): Promise<string> {
+    static add(input: Layer, _http: HttpClient): Promise<string> {
         return new Promise((resolve, reject) => {
-            _http.post<string>(`${environment.api.url}/datasets`, { ...input.serialize(), }).subscribe({
+            _http.post<string>(`${environment.api.url}/layers`, { ...input.serialize(), }).subscribe({
                 next: (data) => resolve(data),
                 error: (e) => reject(e)
             }
@@ -65,28 +65,28 @@ export class DataSet extends Base {
     }
     static getList(_http: HttpClient): any {
         return new Promise((resolve, reject) => {
-            _http.get<DataSet[]>(`${environment.api.url}/datasets`)
-                .pipe(map(data => data.map(x => new DataSet().deserialize(x))))
+            _http.get<Layer[]>(`${environment.api.url}/layers`)
+                .pipe(map(data => data.map(x => new Layer().deserialize(x))))
                 .subscribe({
                     next: (data) => resolve(data),
                     error: (e) => reject(e)
                 })
         });
     }
-    static getById(id: string, _http: HttpClient): Promise<DataSet> {
+    static getById(id: string, _http: HttpClient): Promise<Layer> {
         return new Promise((resolve, reject) => {
-            _http.get<DataSet>(`${environment.api.url}/datasets/${id}`).pipe(map(x => new DataSet().deserialize(x))).subscribe({
+            _http.get<Layer>(`${environment.api.url}/layers/${id}`).pipe(map(x => new Layer().deserialize(x))).subscribe({
                 next: (data) => resolve(data),
                 error: (e) => reject(e)
             })
         });
     }
-    static parseFile(file: any, _http: HttpClient): Promise<DataRow[]> {
+    static parseFile(file: any, _http: HttpClient): Promise<Layer[]> {
         const formData = new FormData();
         formData.append(file.name, file);
         return new Promise((resolve, reject) => {
-            _http.post<DataRow[]>(`${environment.api.url}/datasets/parseFile`, formData,
-            ).pipe(map(data => data.map(x => new DataRow().deserialize(x))))
+            _http.post<Layer[]>(`${environment.api.url}/layers/parseFile`, formData,
+            ).pipe(map(data => data.map(x => new Layer().deserialize(x))))
                 .subscribe({
                     next: (data) => {
                         resolve(data);
@@ -95,10 +95,10 @@ export class DataSet extends Base {
                 })
         })
     }
-    static parseGoogleSheet(sheetId: string, _http: HttpClient): Promise<DataSet> {
+    static parseGoogleSheet(sheetId: string, _http: HttpClient): Promise<Layer> {
         return new Promise((resolve, reject) => {
-            _http.get<DataSet>(`${environment.api.url}/datasets/parseGoogleSheet/${sheetId}`,
-            ).pipe(map(data => new DataSet().deserialize(data)))
+            _http.get<Layer>(`${environment.api.url}/layers/parseGoogleSheet/${sheetId}`,
+            ).pipe(map(data => new Layer().deserialize(data)))
                 .subscribe({
                     next: (data) => {
                         resolve(data);
@@ -109,7 +109,7 @@ export class DataSet extends Base {
     }
     static exportToGoogleSheet(id: string, _http: HttpClient): Promise<boolean> {
         return new Promise((resolve, reject) => {
-            _http.get<boolean>(`${environment.api.url}/datasets/exportToGoogleSheet/${id}`,
+            _http.get<boolean>(`${environment.api.url}/layers/exportToGoogleSheet/${id}`,
             ).subscribe({
                 next: (data) => {
                     resolve(data);

Frontend/src/app/models/record.model.ts

@@ -5,7 +5,7 @@ import { environment } from 'src/environments/environment';
 import { DataService } from '../services/data.service';
 import { map } from 'rxjs';
 
-export class DataRow extends Base {
+export class Record extends Base {
     code?: string;
     value?: number;
     desc1?: string;
@@ -14,7 +14,7 @@ export class DataRow extends Base {
     desc4?: string;
     desc5?: string;
 
-    constructor(data: Partial<DataRow> = {}) {
+    constructor(data: Partial<Record> = {}) {
         super();
         Object.assign(this, data);
     }