[CORD-873] CRUD for Core and Service model from Chameleon
Change-Id: I45c533feba6720b82de3681d862773047e7fd6f8
diff --git a/src/app/datasources/rest/auth.rest.ts b/src/app/datasources/rest/auth.rest.ts
index 2979bf1..edc2a65 100644
--- a/src/app/datasources/rest/auth.rest.ts
+++ b/src/app/datasources/rest/auth.rest.ts
@@ -7,9 +7,9 @@
export interface IAuthResponseData extends IHttpPromiseCallbackArg<any> {
data: {
- user: string;
- xoscsrftoken: string;
- xossessionid: string;
+ // user: string;
+ // xoscsrftoken: string;
+ sessionid: string;
};
}
@@ -37,12 +37,12 @@
public login(data: IAuthRequestData): Promise<any> {
const d = this.$q.defer();
- this.$http.post(`${this.AppConfig.apiEndpoint}/utility/login/`, data)
+ this.$http.post(`${this.AppConfig.apiEndpoint}/utility/login`, data)
.then((res: IAuthResponseData) => {
- this.$cookies.put('xoscsrftoken', res.data.xoscsrftoken, {path: '/'});
- this.$cookies.put('xossessionid', res.data.xossessionid, {path: '/'});
- this.$cookies.put('xosuser', res.data.user, {path: '/'});
- res.data.user = JSON.parse(res.data.user);
+ // this.$cookies.put('xoscsrftoken', res.data.xoscsrftoken, {path: '/'});
+ this.$cookies.put('sessionid', res.data.sessionid, {path: '/'});
+ // this.$cookies.put('xosuser', res.data.user, {path: '/'});
+ // res.data.user = JSON.parse(res.data.user);
d.resolve(res.data);
})
.catch(e => {
@@ -53,9 +53,9 @@
public logout(): Promise<any> {
const d = this.$q.defer();
- this.$http.post(`${this.AppConfig.apiEndpoint}/utility/logout/`, {
- xoscsrftoken: this.$cookies.get('xoscsrftoken'),
- xossessionid: this.$cookies.get('xossessionid')
+ this.$http.post(`${this.AppConfig.apiEndpoint}/utility/logout`, {
+ // xoscsrftoken: this.$cookies.get('xoscsrftoken'),
+ // sessionid: this.$cookies.get('sessionid')
})
.then(() => {
this.clearUser();
@@ -68,9 +68,9 @@
}
public clearUser(): void {
- this.$cookies.remove('xoscsrftoken', {path: '/'});
- this.$cookies.remove('xossessionid', {path: '/'});
- this.$cookies.remove('xosuser', {path: '/'});
+ // this.$cookies.remove('xoscsrftoken', {path: '/'});
+ this.$cookies.remove('sessionid', {path: '/'});
+ // this.$cookies.remove('xosuser', {path: '/'});
}
public getUser(): IXosUser {
@@ -82,8 +82,8 @@
}
public isAuthenticated(): boolean {
- const token = this.$cookies.get('xoscsrftoken');
- const session = this.$cookies.get('xossessionid');
- return angular.isDefined(token) && angular.isDefined(session);
+ // const token = this.$cookies.get('xoscsrftoken');
+ const session = this.$cookies.get('sessionid');
+ return angular.isDefined(session);
}
}
diff --git a/src/app/datasources/rest/model.rest.ts b/src/app/datasources/rest/model.rest.ts
index 12590af..4aa862c 100644
--- a/src/app/datasources/rest/model.rest.ts
+++ b/src/app/datasources/rest/model.rest.ts
@@ -16,7 +16,15 @@
public getResource(url: string): ng.resource.IResourceClass<ng.resource.IResource<any>> {
const resource: angular.resource.IResourceClass<any> = this.$resource(`${this.AppConfig.apiEndpoint}${url}/:id/`, {id: '@id'}, {
- update: { method: 'PUT' }
+ update: { method: 'PUT' },
+ query: {
+ method: 'GET',
+ isArray: true,
+ transformResponse: (res) => {
+ // FIXME chameleon return everything inside "items"
+ return res.items ? res.items : res;
+ }
+ }
});
resource.prototype.$save = function() {
diff --git a/src/app/datasources/rest/modeldefs.rest.spec.ts b/src/app/datasources/rest/modeldefs.rest.spec.ts
index 9dc4025..677463b 100644
--- a/src/app/datasources/rest/modeldefs.rest.spec.ts
+++ b/src/app/datasources/rest/modeldefs.rest.spec.ts
@@ -3,9 +3,9 @@
import 'angular-resource';
import 'angular-cookies';
import {xosDataSources} from '../index';
-import {IModeldefsService} from './modeldefs.rest';
+import {IXosModeldefsService} from './modeldefs.rest';
-let service: IModeldefsService;
+let service: IXosModeldefsService;
let httpBackend: ng.IHttpBackendService;
let $scope;
@@ -14,7 +14,7 @@
websocketClient: 'http://xos-test:3000'
};
-describe('The ModelDefs service', () => {
+describe('The XosModelDefs service', () => {
beforeEach(angular.mock.module(xosDataSources));
@@ -26,14 +26,13 @@
angular.mock.module(xosDataSources);
});
-
beforeEach(angular.mock.inject((
- ModelDefs: IModeldefsService,
+ XosModelDefs: IXosModeldefsService,
$httpBackend: ng.IHttpBackendService,
_$resource_: ng.resource.IResourceService,
_$rootScope_: ng.IRootScopeService
) => {
- service = ModelDefs;
+ service = XosModelDefs;
httpBackend = $httpBackend;
$scope = _$rootScope_;
}));
diff --git a/src/app/datasources/rest/modeldefs.rest.ts b/src/app/datasources/rest/modeldefs.rest.ts
index d927f8c..fdb4b99 100644
--- a/src/app/datasources/rest/modeldefs.rest.ts
+++ b/src/app/datasources/rest/modeldefs.rest.ts
@@ -1,17 +1,35 @@
import {IXosModelDefsField} from '../../core/services/helpers/config.helpers';
import {IXosAppConfig} from '../../../index';
-export interface IModeldef {
- fields: IXosModelDefsField[];
- relations?: string[];
+// Models interfaces
+export interface IXosModelDefsField {
name: string;
+ type: string;
+ validators?: any;
+ hint?: string;
+ relation?: {
+ model: string;
+ type: string;
+ };
}
-export interface IModeldefsService {
- get(): Promise<IModeldef[]>;
+export interface IXosModelDefsRelation {
+ model: string; // model name
+ type: string; // relation type
}
-export class ModeldefsService {
+export interface IXosModeldef {
+ fields: IXosModelDefsField[];
+ relations?: IXosModelDefsRelation[];
+ name: string;
+ app: string;
+}
+
+export interface IXosModeldefsService {
+ get(): Promise<IXosModeldef[]>;
+}
+
+export class XosModeldefsService implements IXosModeldefsService {
static $inject = ['$http', '$q', 'AppConfig'];
@@ -24,9 +42,9 @@
public get(): Promise<any> {
const d = this.$q.defer();
- this.$http.get(`${this.AppConfig.apiEndpoint}/utility/modeldefs/`)
- .then((res) => {
- d.resolve(res.data);
+ this.$http.get(`${this.AppConfig.apiEndpoint}/modeldefs`)
+ .then((res: any) => {
+ d.resolve(res.data.items);
})
.catch(e => {
d.reject(e);