Skip to content

Commit

Permalink
Add toolbar and provider settings
Browse files Browse the repository at this point in the history
settings for toolbar and provider is fetched from server, rather than from Json file.

Provider states are fetched as well from server, so creating new provider can be as generic as possible
  • Loading branch information
karelhala committed Jun 1, 2016
1 parent 8cd4465 commit 9d8b47c
Show file tree
Hide file tree
Showing 6 changed files with 246 additions and 9 deletions.
135 changes: 129 additions & 6 deletions dist/js/hawkular-ui-components.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions src/providers/loader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@

///<reference path="../tsd.d.ts"/>
import DataAccessService from './dataAccessService';
import NewProviderState from './newProviderState';

export default (module: ng.IModule) => {
module.provider('MiQDataAccessService', DataAccessService);
module.provider('MiQNewProviderStateService', NewProviderState);
}
54 changes: 54 additions & 0 deletions src/providers/newProviderState.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@

///<reference path="../tsd.d.ts"/>
export interface IProviderState {
addProviderStates(states, statePrefix?): void;
getProviderTypes(statePrefix): ng.IPromise<any[]>;
}

export default class NewProviderState implements ng.IServiceProvider {
private $http: ng.IHttpService;
private MiQDataAccessService: any;
private $state: any;
public $stateProvider: any;
public endpoints = {
types : '/types'
};

public addProviderStates(states) {
_.each(states, (oneState: any) => {
if (!this.$state.get(oneState.stateId)) {
this.$stateProvider.state(oneState.stateId, {
views: _.mapValues(oneState.views, (value) => {
return {'templateUrl': value};
})
});
}
});
}

public getProviderTypes(statePrefix): ng.IPromise<any[]> {
return this.httpGet(this.MiQDataAccessService.getUrlPrefix() + this.endpoints.types).then((typesData: any) => {
_.each(typesData, (type) => {
type.stateId = statePrefix + '.' + type.id;
});
return typesData;
});
}

private httpGet(url, requestData?) {
return this.$http.get(url, requestData).then((responseData) => {
return responseData.data;
});
}

/*@ngInject*/
public $get($http: any, $state: any, MiQDataAccessService: any) : IProviderState {
this.$http = $http;
this.$state = $state;
this.MiQDataAccessService = MiQDataAccessService;
return {
addProviderStates: (states) => this.addProviderStates(states),
getProviderTypes: (statePrefix) => this.getProviderTypes(statePrefix)
};
}
}
20 changes: 17 additions & 3 deletions src/services/dataTableService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export interface IRowsColsResponse {
}

export interface IDataTableService {
deleteItems(data): any;
retrieveRowsAndColumnsFromUrl(): ng.IPromise<IRowsColsResponse>;
sortItemsBy(sortBy: any, isAscending: boolean): any;
getSortedIndexAndAscending(): any;
Expand All @@ -42,13 +43,25 @@ export default class DataTableService implements ng.IServiceProvider {
public visibleCount: number = 0;
public visibleItems: any[];
public endpoints = {
list : '/list'
list : '/list',
deleteItems: '/delete'
};

public deleteItems(data): ng.IPromise<any> {
return this.$http({
url: this.MiQDataAccessService.getUrlPrefix() + this.endpoints.deleteItems,
method: 'POST',
data: data
}).then((responseData: any) => {
this.removeItems(responseData.data.removedIds);
return responseData.data;
});
}

public retrieveRowsAndColumnsFromUrl(): ng.IPromise<IRowsColsResponse> {
return this.$http({
method: 'GET',
url: location.origin + this.MiQDataAccessService.getUrlPrefix() + this.endpoints.list
url: this.MiQDataAccessService.getUrlPrefix() + this.endpoints.list
}).then((responseData) => {
this.columns = responseData.data.head;
this.rows = responseData.data.rows;
Expand Down Expand Up @@ -96,7 +109,7 @@ export default class DataTableService implements ng.IServiceProvider {

public removeItems(itemIds: any[]): any {
this.rows = _.filter(this.rows, (item) => {
return itemIds.indexOf(item.id) === -1;
return itemIds.indexOf(parseInt(item.id, 10)) === -1;
});
this.visibleCount -= this.perPage;
this.loadMore();
Expand Down Expand Up @@ -163,6 +176,7 @@ export default class DataTableService implements ng.IServiceProvider {
this.$http = $http;
this.MiQDataAccessService = MiQDataAccessService;
return {
deleteItems: (data) => this.deleteItems(data),
retrieveRowsAndColumnsFromUrl: () => this.retrieveRowsAndColumnsFromUrl(),
sortItemsBy: (sortBy: any, isAscending: boolean) => {
this.sortItemsBy(sortBy, isAscending);
Expand Down
2 changes: 2 additions & 0 deletions src/services/loader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@ import DataTableService from './dataTableService';
import FormValidatorService from './formValidatorService';
import NotificationService from './notificationService';
import ToolbarSettingsService from './toolbarSettingsService';
import ProvidersSettingsService from './providersSettingsService';

export default (module: ng.IModule) => {
module.provider('MiQDataTableService', DataTableService);
module.provider('MiQFormValidatorService', FormValidatorService);
module.provider('MiQToolbarSettingsService', ToolbarSettingsService);
module.provider('MiQProvidersSettingsService', ProvidersSettingsService);
module.service('MiQNotificationService', NotificationService);
}
42 changes: 42 additions & 0 deletions src/services/providersSettingsService.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
///
/// Copyright 2015-2016 Red Hat, Inc. and/or its affiliates
/// and other contributors as indicated by the @author tags.
///
/// Licensed under the Apache License, Version 2.0 (the "License");
/// you may not use this file except in compliance with the License.
/// You may obtain a copy of the License at
///
/// http://www.apache.org/licenses/LICENSE-2.0
///
/// Unless required by applicable law or agreed to in writing, software
/// distributed under the License is distributed on an "AS IS" BASIS,
/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
/// See the License for the specific language governing permissions and
/// limitations under the License.
///

///<reference path="../tsd.d.ts"/>
export default class ProvidersSettingsService {
private $http: any;
private MiQDataAccessService: any;
public endpoints = {
settings : '/list_providers_settings'
};

public getSettings() {
return this.httpGet(this.MiQDataAccessService.getUrlPrefix() + this.endpoints.settings);
}

private httpGet(url: string): any {
return this.$http.get(url)
.then(dataResponse => dataResponse.data);
}
/*@ngInject*/
public $get($http: any, MiQDataAccessService: any): any {
this.$http = $http;
this.MiQDataAccessService = MiQDataAccessService;
return {
getSettings: () => this.getSettings()
};
}
}

0 comments on commit 9d8b47c

Please sign in to comment.