Browse Source

Refactor isUUID()

pull/666/head
Thomas 3 years ago
parent
commit
b02884a57a
  1. 1
      apps/api/src/app/export/export.service.ts
  2. 6
      libs/common/src/lib/helper.ts
  3. 2
      libs/ui/src/lib/activities-table/activities-table.component.ts

1
apps/api/src/app/export/export.service.ts

@ -1,6 +1,5 @@
import { environment } from '@ghostfolio/api/environments/environment';
import { PrismaService } from '@ghostfolio/api/services/prisma.service';
import { isUUID } from '@ghostfolio/common/helper';
import { Export } from '@ghostfolio/common/interfaces';
import { Injectable } from '@nestjs/common';

6
libs/common/src/lib/helper.ts

@ -106,12 +106,6 @@ export function isGhostfolioScraperApiSymbol(aSymbol = '') {
return aSymbol.startsWith(ghostfolioScraperApiSymbolPrefix);
}
export function isUUID(aString: string) {
const regexExp =
/^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/gi;
return regexExp.test(aString);
}
export function resetHours(aDate: Date) {
const year = getYear(aDate);
const month = getMonth(aDate);

2
libs/ui/src/lib/activities-table/activities-table.component.ts

@ -21,10 +21,10 @@ import { MatTableDataSource } from '@angular/material/table';
import { Router } from '@angular/router';
import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
import { DEFAULT_DATE_FORMAT } from '@ghostfolio/common/config';
import { isUUID } from '@ghostfolio/common/helper';
import { OrderWithAccount } from '@ghostfolio/common/types';
import { DataSource } from '@prisma/client';
import Big from 'big.js';
import { isUUID } from 'class-validator';
import { endOfToday, format, isAfter } from 'date-fns';
import { isNumber } from 'lodash';
import { BehaviorSubject, Observable, Subject, Subscription } from 'rxjs';

Loading…
Cancel
Save