hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-18 15:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

58789: Preventing submit from firing multiple times + some code cleanup

Browse Source
This commit is contained in:
Kristof De Langhe
2019-01-22 13:51:57 +01:00
parent 27f3f9c7a1
commit 2f853f09b9
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
View File

@@ -5,7 +5,7 @@ import { RemoteData } from '../../../core/data/remote-data';
import { PaginatedList } from '../../../core/data/paginated-list'; import { PaginatedList } from '../../../core/data/paginated-list';
import { MetadataSchema } from '../../../core/metadata/metadataschema.model'; import { MetadataSchema } from '../../../core/metadata/metadataschema.model';
import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model'; import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
import { map } from 'rxjs/operators'; import { map, take } from 'rxjs/operators';
import { hasValue } from '../../../shared/empty.util'; import { hasValue } from '../../../shared/empty.util';
import { RestResponse } from '../../../core/cache/response.models'; import { RestResponse } from '../../../core/cache/response.models';
import { zip } from 'rxjs/internal/observable/zip'; import { zip } from 'rxjs/internal/observable/zip';
@@ -70,7 +70,7 @@ export class MetadataRegistryComponent {
} }
deleteSchemas() { deleteSchemas() {
this.registryService.getSelectedMetadataSchemas().subscribe( this.registryService.getSelectedMetadataSchemas().pipe(take(1)).subscribe(
(schemas) => { (schemas) => {
const tasks$ = []; const tasks$ = [];
for (const schema of schemas) { for (const schema of schemas) {

8
src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
View File

@@ -8,9 +8,6 @@ import {
import { FormGroup } from '@angular/forms'; import { FormGroup } from '@angular/forms';
import { RegistryService } from '../../../../core/registry/registry.service'; import { RegistryService } from '../../../../core/registry/registry.service';
import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service'; import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
import { FormService } from '../../../../shared/form/form.service';
import { Store } from '@ngrx/store';
import { AppState } from '../../../../app.reducer';
import { take } from 'rxjs/operators'; import { take } from 'rxjs/operators';
import { MetadataSchema } from '../../../../core/metadata/metadataschema.model'; import { MetadataSchema } from '../../../../core/metadata/metadataschema.model';
@@ -73,11 +70,10 @@ export class MetadataSchemaFormComponent implements OnInit {
@Output() submitForm: EventEmitter<any> = new EventEmitter(); @Output() submitForm: EventEmitter<any> = new EventEmitter();
constructor(private registryService: RegistryService, private formBuilderService: FormBuilderService, private formService: FormService, private store: Store<AppState>) { constructor(private registryService: RegistryService, private formBuilderService: FormBuilderService) {
} }
ngOnInit() { ngOnInit() {
this.formGroup = this.formBuilderService.createFormGroup(this.formModel); this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
this.registryService.getActiveMetadataSchema().subscribe((schema) => { this.registryService.getActiveMetadataSchema().subscribe((schema) => {
this.formGroup.patchValue({ this.formGroup.patchValue({
@@ -95,7 +91,7 @@ export class MetadataSchemaFormComponent implements OnInit {
} }
onSubmit() { onSubmit() {
this.registryService.getActiveMetadataSchema().subscribe( this.registryService.getActiveMetadataSchema().pipe(take(1)).subscribe(
(schema) => { (schema) => {
const values = { const values = {
prefix: this.name.value, prefix: this.name.value,