Skip to content

Commit

Permalink
Removed class-transformer
Browse files Browse the repository at this point in the history
  • Loading branch information
mariotaku committed Jun 1, 2021
1 parent e3a332b commit b79db06
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 15 deletions.
1 change: 0 additions & 1 deletion main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ function createWindow(): BrowserWindow {
allowRunningInsecureContent: serve,
contextIsolation: false, // false if you want to run 2e2 test with Spectron
enableRemoteModule: true, // true if you want to run 2e2 test with Spectron or use remote module in renderer context (ie. Angular)
devTools: serve
},
});

Expand Down
6 changes: 0 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@
"bootstrap": "4.1.1",
"bootstrap-icons": "1.5.0",
"chai": "4.3.4",
"class-transformer": "0.4.0",
"conventional-changelog-cli": "2.1.1",
"core-js": "3.6.5",
"cross-env": "7.0.3",
Expand Down
15 changes: 12 additions & 3 deletions src/app/core/services/apps-repo.service.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { plainToClass, Type } from 'class-transformer';
import { map } from 'rxjs/operators';
import * as semver from 'semver';
import { ElectronService } from './electron.service';
Expand Down Expand Up @@ -29,7 +28,7 @@ export class AppsRepoService {
}

async showApp(id: string): Promise<RepositoryItem> {
return this.http.get(`${baseUrl}/apps/${id}.json`).pipe(map((body) => plainToClass(RepositoryItem, body))).toPromise();
return this.http.get(`${baseUrl}/apps/${id}.json`).pipe(map((body) => new RepositoryItem(body))).toPromise();
}

async showApps(...ids: string[]): Promise<Map<string, RepositoryItem>> {
Expand All @@ -43,6 +42,10 @@ export class PackageManifest {
version: string;
ipkUrl: string;

constructor(data: Partial<PackageManifest>) {
Object.assign(this, data);
}

hasUpdate(version: string): boolean {
let v1 = this.version, v2 = version;
const segs1 = this.version.split('.', 4), segs2 = version.split('.', 4);
Expand All @@ -69,8 +72,14 @@ export class PackageManifest {
export class RepositoryItem {
id: string;
title: string;
@Type(() => PackageManifest)
manifest?: PackageManifest;
manifestUrl?: string;

constructor(data: Partial<RepositoryItem>) {
Object.assign(this, data);
if (data.manifest) {
this.manifest = new PackageManifest(data.manifest);
}
}

}
8 changes: 4 additions & 4 deletions src/app/core/services/device-manager.service.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from "@angular/core";
import novacom from '@webosose/ares-cli/lib/base/novacom';
import * as net from 'net';
import { BehaviorSubject, Observable, ReplaySubject, Subject } from "rxjs";
import { Device, DeviceEditSpec, Resolver, Session } from '../../../types/novacom';
import { ElectronService } from './electron.service';
import * as util from 'util';
import * as net from 'net';
import { Device, DeviceEditSpec, Resolver, Session } from '../../../types/novacom';
import { cleanupSession } from '../../shared/util/ares-utils';
import { Exclude, plainToClass } from 'class-transformer';
import { ElectronService } from './electron.service';

@Injectable({
providedIn: 'root'
})
Expand Down

0 comments on commit b79db06

Please sign in to comment.