DR-804:convert code base to type script

src/app/app.component.ts

@@ -1,10 +1,9 @@
 
 import {FormBuilder} from '@angular/forms';
 import {SelectionModel} from '@angular/cdk/collections';
 import {MediaMatcher} from '@angular/cdk/layout';
 import {ChangeDetectorRef, Component, OnDestroy} from '@angular/core';
-// import { NavItem } from './nav-item';
 import {MatTableDataSource} from '@angular/material/table';
 
 
 @Component({
@@ -15,27 +14,27 @@
 export class AppComponent {
 
   constructor()
-  {
-
-         this.connectWallet();
-  }
-
-  getWindowEthereumProperty()
-  {
-    //@ts-ignore
+  {this.connectWallet();}
+  getWindowEthereumProperty(): Ethereum | undefined {
     return window.ethereum;
   }
+
   async connectWallet() {
 
     if (typeof window != "undefined" && typeof this.getWindowEthereumProperty() != "undefined") {
-      try {
-        /* MetaMask is installed */
-        const accounts = await this.getWindowEthereumProperty().request({
-          method: "eth_requestAccounts",
-        });
-
-      } catch (err) {
-
+      const ethereum = this.getWindowEthereumProperty();
+      if (ethereum) {
+        try {
+          /* MetaMask is installed */
+          const accounts = await ethereum.request({
+            method: "eth_requestAccounts",
+          });
+          console.log('Connected accounts:', accounts);
+        } catch (err) {
+          console.error('Error connecting to MetaMask:', err);
+        }
+      } else {
+        console.error('MetaMask not found');
       }
     }
   }

src/app/auth/authbase.service.ts

@@ -3,6 +3,7 @@ import { HttpClient, HttpHeaders, HttpErrorResponse } from '@angular/common/http
 //import {environment} from '../../environments/environment.dev';
 import { environment } from '../../environments/environment';
 import { Observable } from 'rxjs';
+
 @Injectable({
   providedIn: 'root'
 })

src/app/auth/services/invitation.service.ts

@@ -9,17 +9,15 @@ import { getapiuser_header } from '../../utils/apiuser_clientinfo'
 })
 export class InvitationService {
     url: String = environment.API_URL;
-    headersData = getapiuser_header();
     constructor(private httpClient: HttpClient) { }
 
     public Postuserinvitation(data: any, organizationId?: number, headers?: any): Observable<any> {
         let addUrl = `${this.url}invitation`;
         if (organizationId != null || organizationId != undefined) {
             addUrl += `?organizationId=${organizationId}`;
         }
-        let newheaders = new HttpHeaders(headers);
-        //@ts-ignore
-        return this.httpClient.post<any>(addUrl, data, { headers })
+
+        return this.httpClient.post<any>(addUrl, data)
 
     }
     public getinvitaion(): Observable<any> {

src/app/auth/services/organization.service.ts

@@ -35,7 +35,7 @@ export class OrganizationService {
 
     return this.httpClient.get<any>(environment.API_URL+ 'Organization/' + orgId);
   }
-  public GetApiUserAllOrganization(pagenumber?: number, limit?: number, searchData?: any): Observable<any> {
+  public GetApiUserAllOrganization(pagenumber?: number, limit?: number, searchData?: any): Observable<{ organizations: OrganizationInformation[] }> {
 
     let searchUrl = `${environment.API_URL}Organization/apiuser/all_organization`;
     if (pagenumber != undefined && limit != undefined) {
@@ -48,7 +48,7 @@ export class OrganizationService {
         searchUrl += `&organizationName=${searchData.organizationName}`;
       }
     }
-    return this.httpClient.get<any>(searchUrl);
+    return this.httpClient.get<{ organizations: OrganizationInformation[] }>(searchUrl);
   }
   public removeUser(userId: number): Observable<any> {
 

src/app/models/Device_type.model.ts

@@ -0,0 +1,24 @@
+export interface fulecodeType{
+    code:string;
+    name:string;
+}
+export interface devicecodeType{
+    code:string;
+    name:string;
+}
+
+export interface CountryInfo {
+    country: string;
+    alpha2: string;
+    alpha3: string;
+    numeric: string;
+    countryCode: string;
+    timezones: TimezoneInfo[];
+  }
+
+  interface TimezoneInfo {
+    name: string;
+    offset: number;
+  }
+
+

src/app/models/device.model.ts

@@ -1,31 +1,38 @@
+export interface Devicelist {
+  devices: Device[],
+  currentPage: number,
+  totalPages: number,
+  totalCount: number,
+}
+
 export interface Device {
-    id: number;
-    externalId: string;
-    developerExternalId?:string;
-    //status: DeviceStatus;
-    organizationId: number;
-    projectName: string;
-    address?: string;
-    latitude: string;
-    longitude: string;
-    countryCode: string;
-    fuelCode: string;
-    deviceTypeCode: string;
-    capacity: number;
-    commissioningDate: string;
-    gridInterconnection: boolean;
-    offTaker: string;
-    yieldValue: number;
-    impactStory?: string;
-    images?: string[];
-    groupId?: number | null;
-    deviceDescription?: string;
-    energyStorage?: boolean;
-    energyStorageCapacity?: number;
-    SDGBenefits?: string[];
-    qualityLabels?: string;
-    meterReadtype?: string;
-    createdAt?:Date;
-    version?:string;
-    timezone?:string;
-  }
+  id: number;
+  externalId: string;
+  developerExternalId?: string;
+  //status: DeviceStatus;
+  organizationId: number;
+  projectName: string;
+  address?: string;
+  latitude: string;
+  longitude: string;
+  countryCode: string;
+  fuelCode: string;
+  deviceTypeCode: string;
+  capacity: number;
+  commissioningDate: string;
+  gridInterconnection: boolean;
+  offTaker: string;
+  yieldValue: number;
+  impactStory?: string;
+  images?: string[];
+  groupId?: number | null;
+  deviceDescription?: string;
+  energyStorage?: boolean;
+  energyStorageCapacity?: number;
+  SDGBenefits?: string[];
+  qualityLabels?: string;
+  meterReadtype?: string;
+  createdAt?: Date;
+  version?: string;
+  timezone?: string;
+}

src/app/models/index.ts

@@ -0,0 +1,6 @@
+export * from './organization.model';
+export * from './blockchain-properties.model';
+export * from './device.model';
+export * from './user.model';
+export * from './yieldvalue.model';
+export * from './Device_type.model'

src/app/models/organization.model.ts

@@ -13,7 +13,8 @@ export interface OrganizationInformation
     documentIds: string[];
     signatoryDocumentIds: string[];
     blockchainAccountAddress: string;
-    blockchainAccountSignedMessage: string;   
+    blockchainAccountSignedMessage: string; 
+    api_user_id:string;  
 }
 export class IPublicOrganization {
     id: number;

src/app/utils/getTimezone_msg.ts

@@ -1,15 +1,11 @@
 
 export const getValidmsgTimezoneFormat = (msg: string) => {
     let message = msg;
-
     //"The sent date for reading 2023-01-01T07:44:34.000Z is less than last sent meter read date 2023-01-01T07:45:53.000Z"
     let r = /\d\d\d\d\-\d\d\-\d\d\T\d\d\:\d\d:\d\d\.\d\d\dZ/g;
-    //@ts-ignore
     let dates = message.match(r);
-    //@ts-ignore
     if (dates != null || dates != undefined) {
         dates.forEach(ele => {
-            //@ts-ignore
             message = message.replace(ele, new Date(ele).toString())
         })
     }

src/app/view/add-reservation/add-reservation.component.ts

@@ -14,7 +14,8 @@ import { MatBottomSheet, MatBottomSheetConfig, MatBottomSheetRef } from '@angula
 import { MeterReadTableComponent } from '../meter-read/meter-read-table/meter-read-table.component'
 import { Observable, Subscription, debounceTime } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
-import { DeviceDetailsComponent } from '../device/device-details/device-details.component'
+import { DeviceDetailsComponent } from '../device/device-details/device-details.component';
+import {OrganizationInformation,Device,fulecodeType,devicecodeType,CountryInfo } from '../../models'
 @Component({
   selector: 'app-add-reservation',
   templateUrl: './add-reservation.component.html',
@@ -28,7 +29,6 @@ export class AddReservationComponent {
     'projectName',
     'externalId',
     'countryCode',
-    // 'fuelCode',
     'commissioningDate',
     'status',
     'viewread'
@@ -39,13 +39,13 @@ export class AddReservationComponent {
   @ViewChild(MatPaginator) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
   dataSource: MatTableDataSource<any>;
-  data: any;
+  data: Device[]=[];
   loginuser: any
   deviceurl: any;
   pageSize: number = 20;
-  countrylist: any;
-  fuellist: any;
-  devicetypelist: any;
+  countrylist: CountryInfo[]=[];
+  fuellist: fulecodeType[]=[];
+  devicetypelist: devicecodeType[]=[];
   fuellistLoaded: boolean = false;
   devicetypeLoded: boolean = false;
   countrycodeLoded: boolean = false;
@@ -68,17 +68,15 @@ export class AddReservationComponent {
   showerror: boolean = false;
   orgname: string;
   orgId: number;
-  orglist: any;
-  filteredOrgList: any[] = [];
-  // countrycodeLoded: boolean = false;
+  orglist: OrganizationInformation[] = [];
+  filteredOrgList: OrganizationInformation[] = [];
   reservationbollean = { continewwithunavilableonedevice: true, continueWithTCLessDTC: true };
   constructor(private authService: AuthbaseService, private reservationService: ReservationService, private router: Router,
     public dialog: MatDialog, private bottomSheet: MatBottomSheet,
     private formBuilder: FormBuilder,
     private toastrService: ToastrService,
     private deviceservice: DeviceService,
     private orgService: OrganizationService) {
-    // this.loginuser = sessionStorage.getItem('loginuser');
     this.loginuser = JSON.parse(sessionStorage.getItem('loginuser')!);
     this.reservationForm = this.formBuilder.group({
       name: [null, Validators.required],
@@ -103,7 +101,6 @@ export class AddReservationComponent {
       SDGBenefits: [],
       start_date: [null],
       end_date: [null],
-      // pagenumber: [this.p]
     });
 
     this.FilterForm.valueChanges.subscribe(() => {
@@ -114,8 +111,10 @@ export class AddReservationComponent {
     if (this.loginuser.role === 'ApiUser') {
       this.orgService.GetApiUserAllOrganization().subscribe(
         (data) => {
-          //@ts-ignore
-          this.orglist = data.organizations.filter(org => org.organizationType != "Developer");
+
+          this.orglist = data.organizations.filter(
+            (org: OrganizationInformation) => org.organizationType !== 'Developer'
+          );
           // const buyerOrganizations = data.filter(org => org.organizationType === "Buyer");
           this.filteredOrgList = this.orglist;
         }
@@ -169,7 +168,7 @@ export class AddReservationComponent {
     });
   }
   selectOrg(event: any) {
-    //@ts-ignore
+
     const selectedCountry = this.orglist.find(option => option.name === event.option.value);
     if (selectedCountry) {
       this.orgId = selectedCountry.id;
@@ -184,7 +183,7 @@ export class AddReservationComponent {
     );
   }
 
-  private _filter(value: any): string[] {
+  private _filter(value: any): CountryInfo[] {
     const filterValue = value.toLowerCase();
     if (!(this.countrylist.filter((option: any) => option.country.toLowerCase().includes(filterValue)).length > 0)) {
       this.showerror = true;
@@ -321,21 +320,21 @@ export class AddReservationComponent {
         }
 
         this.data = data.devices;
-        //@ts-ignore
-        this.data.forEach(ele => {
-          //@ts-ignore
+
+        this.data.forEach((ele:any) => {
+
           ele['fuelname'] = this.fuellist.find((fuelType) => fuelType.code === ele.fuelCode,)?.name;
-          //@ts-ignore
+
           ele['devicetypename'] = this.devicetypelist.find(devicetype => devicetype.code == ele.deviceTypeCode)?.name;
-          //@ts-ignore
+
           ele['countryname'] = this.countrylist.find(countrycode => countrycode.alpha3 == ele.countryCode)?.country;
         })
         this.dataSource = new MatTableDataSource(this.data);
         this.totalRows = data.totalCount
         this.totalPages = data.totalPages
-        //this.dataSource.paginator = this.paginator;
+
         this.dataSource.sort = this.sort;
-        //@ts-ignore
+
       }
     )
   }

src/app/view/admin/add-users/add-users.component.ts

@@ -56,19 +56,9 @@ export class AddUsersComponent {
         confirmPassword: new FormControl(null),
 
       },
-      // {
-      //   validators: (control) => {
-
-      //     if (control.value.password !== control.value.confirmPassword) {
-      //       //@ts-ignore
-      //       control.get("confirmPassword").setErrors({ notSame: true });
-      //     }
-      //     return null;
-      //   },
-      // }
+
     );
 
-
   }
   emaiErrors() {
     return this.registerForm.get('email')?.hasError('required') ? 'This field is required' :