[CORD-873] CRUD for Core and Service model from Chameleon
Change-Id: I45c533feba6720b82de3681d862773047e7fd6f8
diff --git a/src/app/views/crud/crud.html b/src/app/views/crud/crud.html
index 8d457e2..adb0500 100644
--- a/src/app/views/crud/crud.html
+++ b/src/app/views/crud/crud.html
@@ -26,11 +26,11 @@
</div>
<div class="col-lg-8 text-right">
<div class="btn-group">
- <a ng-if="vm.list" ng-repeat="r in vm.related" href="#/core/{{r.toLowerCase()}}s/" class="btn btn-default">
- {{r}}
+ <a ng-if="vm.list" ng-repeat="r in vm.related" href="#/core/{{r.model.toLowerCase()}}s/" class="btn btn-default">
+ {{r.model}}
</a>
- <a ng-if="!vm.list && vm.getRelatedItem(r, vm.model)" ng-repeat="r in vm.related" href="#/core/{{r.toLowerCase()}}s/{{vm.getRelatedItem(r, vm.model)}}" class="btn btn-default">
- {{r}}
+ <a ng-if="!vm.list && vm.getRelatedItem(r, vm.model)" ng-repeat="r in vm.related" href="#/core/{{r.model.toLowerCase()}}s/{{vm.getRelatedItem(r, vm.model)}}" class="btn btn-default">
+ {{r.model}}
</a>
</div>
</div>
diff --git a/src/app/views/crud/crud.ts b/src/app/views/crud/crud.ts
index 846a840..6b30edc 100644
--- a/src/app/views/crud/crud.ts
+++ b/src/app/views/crud/crud.ts
@@ -2,23 +2,38 @@
import {IXosModelStoreService} from '../../datasources/stores/model.store';
import {IXosConfigHelpersService} from '../../core/services/helpers/config.helpers';
import * as _ from 'lodash';
-import {IXosFormConfig} from '../../core/form/form';
+import {IXosFormCfg} from '../../core/form/form';
import {IXosResourceService} from '../../datasources/rest/model.rest';
import {IStoreHelpersService} from '../../datasources/helpers/store.helpers';
+import {IXosModelDiscovererService} from '../../datasources/helpers/model-discoverer.service';
+
export interface IXosCrudData {
model: string;
- related: string[];
+ related: IXosModelRelation[];
xosTableCfg: IXosTableCfg;
- xosFormCfg: IXosFormConfig;
+ xosFormCfg: IXosFormCfg;
+}
+
+export interface IXosModelRelation {
+ model: string;
+ type: string;
}
class CrudController {
- static $inject = ['$scope', '$state', '$stateParams', 'ModelStore', 'ConfigHelpers', 'ModelRest', 'StoreHelpers'];
+ static $inject = [
+ '$scope',
+ '$state',
+ '$stateParams',
+ 'XosModelStore',
+ 'ConfigHelpers',
+ 'ModelRest',
+ 'StoreHelpers',
+ 'XosModelDiscoverer'
+ ];
- public data: IXosCrudData;
+ public data: {model: string};
public tableCfg: IXosTableCfg;
public formCfg: any;
- public stateName: string;
public baseUrl: string;
public list: boolean;
public title: string;
@@ -33,19 +48,23 @@
private store: IXosModelStoreService,
private ConfigHelpers: IXosConfigHelpersService,
private ModelRest: IXosResourceService,
- private StoreHelpers: IStoreHelpersService
+ private StoreHelpers: IStoreHelpersService,
+ private XosModelDiscovererService: IXosModelDiscovererService
) {
this.data = this.$state.current.data;
- this.tableCfg = this.data.xosTableCfg;
+ this.model = this.XosModelDiscovererService.get(this.data.model);
this.title = this.ConfigHelpers.pluralize(this.data.model);
this.list = true;
- this.stateName = $state.current.name;
- this.baseUrl = '#/core' + $state.current.url.toString().replace(':id?', '');
+
+ // TODO get the proper URL from model discoverer
+ this.baseUrl = '#/' + this.model.clientUrl.replace(':id?', '');
+
this.related = $state.current.data.related;
- this.formCfg = $state.current.data.xosFormCfg;
+ this.tableCfg = this.model.tableCfg;
+ this.formCfg = this.model.formCfg;
this.store.query(this.data.model)
.subscribe(
@@ -70,6 +89,7 @@
// if it is the create page
if ($stateParams['id'] === 'add') {
// generate a resource for an empty model
+ // TODO get the proper URL from model discoverer
const endpoint = this.StoreHelpers.urlFromCoreModel(this.data.model);
const resource = this.ModelRest.getResource(endpoint);
this.model = new resource({});
@@ -77,9 +97,9 @@
}
}
- public getRelatedItem(relation: string, item: any): number {
- if (item && angular.isDefined(item[relation.toLowerCase()])) {
- return item[relation.toLowerCase()];
+ public getRelatedItem(relation: IXosModelRelation, item: any): number {
+ if (item && angular.isDefined(item[`${relation.model.toLowerCase()}_id`])) {
+ return item[`${relation.model.toLowerCase()}_id`];
}
return 0;
}
diff --git a/src/app/views/dashboard/dashboard.ts b/src/app/views/dashboard/dashboard.ts
index 00fc1b4..21fbbde 100644
--- a/src/app/views/dashboard/dashboard.ts
+++ b/src/app/views/dashboard/dashboard.ts
@@ -1,7 +1,7 @@
import {IXosModelStoreService} from '../../datasources/stores/model.store';
import {IXosAuthService} from '../../datasources/rest/auth.rest';
class DashboardController {
- static $inject = ['$scope', '$state', 'ModelStore', 'AuthService'];
+ static $inject = ['$scope', '$state', 'XosModelStore', 'AuthService'];
public nodes: number;
public slices: number;