| Edit |
diff --git a/src/app/system/global-configurations/global-configurations.component.scss b/src/app/system/configurations/global-configurations-tab/global-configurations-tab.component.scss
similarity index 100%
rename from src/app/system/global-configurations/global-configurations.component.scss
rename to src/app/system/configurations/global-configurations-tab/global-configurations-tab.component.scss
diff --git a/src/app/system/configurations/global-configurations-tab/global-configurations-tab.component.spec.ts b/src/app/system/configurations/global-configurations-tab/global-configurations-tab.component.spec.ts
new file mode 100644
index 000000000..7719af12e
--- /dev/null
+++ b/src/app/system/configurations/global-configurations-tab/global-configurations-tab.component.spec.ts
@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { GlobalConfigurationsTabComponent } from './global-configurations-tab.component';
+
+describe('GlobalConfigurationsTabComponent', () => {
+ let component: GlobalConfigurationsTabComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [ GlobalConfigurationsTabComponent ]
+ })
+ .compileComponents();
+ });
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(GlobalConfigurationsTabComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/system/global-configurations/global-configurations.component.ts b/src/app/system/configurations/global-configurations-tab/global-configurations-tab.component.ts
similarity index 66%
rename from src/app/system/global-configurations/global-configurations.component.ts
rename to src/app/system/configurations/global-configurations-tab/global-configurations-tab.component.ts
index c8206bc29..bc8c855da 100644
--- a/src/app/system/global-configurations/global-configurations.component.ts
+++ b/src/app/system/configurations/global-configurations-tab/global-configurations-tab.component.ts
@@ -6,22 +6,19 @@ import { MatTableDataSource } from '@angular/material/table';
import { ActivatedRoute, Router } from '@angular/router';
/** Custom Services */
-import { SystemService } from '../system.service';
+import { SystemService } from '../../system.service';
-/**
- * Global Configurations Component
- */
@Component({
- selector: 'mifosx-global-configurations',
- templateUrl: './global-configurations.component.html',
- styleUrls: ['./global-configurations.component.scss']
+ selector: 'mifosx-global-configurations-tab',
+ templateUrl: './global-configurations-tab.component.html',
+ styleUrls: ['./global-configurations-tab.component.scss']
})
-export class GlobalConfigurationsComponent implements OnInit {
+export class GlobalConfigurationsTabComponent implements OnInit {
/** Configuration data. */
configurationData: any;
/** Columns to be displayed in configurations table. */
- displayedColumns: string[] = ['name', 'enabled', 'value', 'action', 'edit'];
+ displayedColumns: string[] = ['name', 'enabled', 'value', 'edit'];
/** Data source for configurations table. */
dataSource: MatTableDataSource;
@@ -37,27 +34,28 @@ export class GlobalConfigurationsComponent implements OnInit {
* @param {Router} router Router for navigation.
*/
constructor(private route: ActivatedRoute,
- private systemService: SystemService,
- private router: Router) {
- this.route.data.subscribe((data: { configurations: any }) => {
- this.configurationData = data.configurations.globalConfiguration;
- });
+ private systemService: SystemService) {
+ this.configurationData = this.systemService.getConfigurations();
}
/**
* Sets the configurations table.
*/
ngOnInit() {
- this.setConfigurations();
+ this.setConfigurationData();
}
/**
* Initializes the data source, paginator and sorter for configurations table.
*/
- setConfigurations() {
- this.dataSource = new MatTableDataSource(this.configurationData);
- this.dataSource.paginator = this.paginator;
- this.dataSource.sort = this.sort;
+ setConfigurationData(): void {
+ this.systemService.getConfigurations()
+ .subscribe((configurationData: any) => {
+ this.configurationData = configurationData.globalConfiguration;
+ this.dataSource = new MatTableDataSource(this.configurationData);
+ this.dataSource.paginator = this.paginator;
+ this.dataSource.sort = this.sort;
+ });
}
/**
@@ -77,5 +75,4 @@ export class GlobalConfigurationsComponent implements OnInit {
configuration.enabled = response.changes.enabled;
});
}
-
}
diff --git a/src/app/system/global-configurations/global-configurations.resolver.ts b/src/app/system/configurations/global-configurations-tab/global-configurations.resolver.ts
similarity index 91%
rename from src/app/system/global-configurations/global-configurations.resolver.ts
rename to src/app/system/configurations/global-configurations-tab/global-configurations.resolver.ts
index e338456c5..b8cd18ae6 100644
--- a/src/app/system/global-configurations/global-configurations.resolver.ts
+++ b/src/app/system/configurations/global-configurations-tab/global-configurations.resolver.ts
@@ -6,7 +6,7 @@ import { Resolve } from '@angular/router';
import { Observable } from 'rxjs';
/** Custom Services */
-import { SystemService } from '../system.service';
+import { SystemService } from '../../system.service';
/**
* Configurations data resolver.
diff --git a/src/app/system/global-configurations/edit-configuration/edit-configuration.component.scss b/src/app/system/global-configurations/edit-configuration/edit-configuration.component.scss
deleted file mode 100644
index d774f68da..000000000
--- a/src/app/system/global-configurations/edit-configuration/edit-configuration.component.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.container {
- max-width: 37rem;
-}
diff --git a/src/app/system/global-configurations/global-configuration.resolver.ts b/src/app/system/global-configurations/global-configuration.resolver.ts
deleted file mode 100644
index 485dc9518..000000000
--- a/src/app/system/global-configurations/global-configuration.resolver.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/** Angular Imports */
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve } from '@angular/router';
-
-/** rxjs Imports */
-import { Observable } from 'rxjs';
-
-/** Custom Services */
-import { SystemService } from '../system.service';
-
-/**
- * Global Configuration data resolver.
- */
-@Injectable()
-export class GlobalConfigurationResolver implements Resolve |