Skip to content

Commit 6ef0eb7

Browse files
NewatiaNewatia
authored andcommitted
fixed impurities import
1 parent 9329feb commit 6ef0eb7

4 files changed

Lines changed: 11 additions & 7 deletions

File tree

src/app/fda/impurities/impurities-form/impurities-form.component.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { AppNotification, NotificationType } from '@gsrs-core/main-notification'
88
import { DomSanitizer, SafeUrl } from '@angular/platform-browser';
99
import { Subscription } from 'rxjs';
1010
import { Title } from '@angular/platform-browser';
11-
import { jp } from 'jsonpath';
11+
import jp from 'jsonpath';
1212
import { take, map } from 'rxjs/operators';
1313
import * as moment from 'moment';
1414
import * as _ from 'lodash';
@@ -31,10 +31,10 @@ import { SubstanceFormResults } from '@gsrs-core/substance-form/substance-form.m
3131
import { Impurities, ImpuritiesDetails, ImpuritiesUnspecified, SubRelationship, ValidationMessage } from '../model/impurities.model';
3232

3333
@Component({
34-
selector: 'app-impurities-form',
35-
templateUrl: './impurities-form.component.html',
36-
styleUrls: ['./impurities-form.component.scss'],
37-
standalone: false
34+
selector: 'app-impurities-form',
35+
templateUrl: './impurities-form.component.html',
36+
styleUrls: ['./impurities-form.component.scss'],
37+
standalone: false
3838
})
3939
export class ImpuritiesFormComponent implements OnInit, OnDestroy {
4040

@@ -128,6 +128,7 @@ export class ImpuritiesFormComponent implements OnInit, OnDestroy {
128128
// if ((record) && this.jsonValid(record)) {
129129
const response = JSON.parse(record);
130130
if (response) {
131+
// scrub ids and audit information before saving in import json
131132
this.scrub(response);
132133

133134
this.impuritiesService.loadImpurities(response);
@@ -762,6 +763,7 @@ export class ImpuritiesFormComponent implements OnInit, OnDestroy {
762763
delete intVersionHolders[i].internalVersion;
763764
}
764765

766+
delete old['id'];
765767
delete old['creationDate'];
766768
delete old['createdBy'];
767769
delete old['modifiedBy'];

src/app/fda/impurities/service/impurities.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ export class ImpuritiesService extends BaseHttpService {
150150
}
151151

152152
saveImpurities(): Observable<Impurities> {
153-
const url = this.apiBaseUrl + `impurities`;
153+
const url = this.apiBaseUrlWithEntityContext;
154154
const params = new HttpParams();
155155
const options = {
156156
params: params,
@@ -181,7 +181,7 @@ export class ImpuritiesService extends BaseHttpService {
181181
}
182182

183183
validateImpur(): Observable<ValidationResults> {
184-
const url = `${this.configService.configData.apiBaseUrl}api/v1/impurities/@validate`;
184+
const url = this.apiBaseUrlWithEntityContext + '@validate';
185185
return this.http.post(url, this.impurities);
186186
}
187187

src/app/fda/invitro-pharmacology/invitro-pharmacology-form/invitro-pharmacology-summary-form/invitro-pharmacology-summary-form.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -995,6 +995,7 @@ export class InvitroPharmacologySummaryFormComponent implements OnInit, OnDestro
995995
delete assayResults[i]._assayResults;
996996
}
997997

998+
delete old['id'];
998999
delete old['creationDate'];
9991000
delete old['createdBy'];
10001001
delete old['modifiedBy'];

src/app/fda/product/product-form/product-form.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1136,6 +1136,7 @@ export class ProductFormComponent implements OnInit, AfterViewInit, OnDestroy {
11361136
delete intVersionHolders[i].internalVersion;
11371137
}
11381138

1139+
delete old['id'];
11391140
delete old['creationDate'];
11401141
delete old['createdBy'];
11411142
delete old['modifiedBy'];

0 commit comments

Comments
 (0)