Changed (IBasicFilter | IAdvancedFilter) to IFilter (#39)

* Changed (IBasicFilter | IAdvancedFilter) to IFilter:'

* Removed docs update

Author: wbreza

gulpfile.js

@@ -20,7 +20,7 @@ var ghPages = require('gulp-gh-pages'),
   webpackTestConfig = require('./webpack.test.config'),
   runSequence = require('run-sequence'),
   argv = require('yargs').argv;
-  ;
+;
 
 var package = require('./package.json');
 var webpackBanner = package.name + " v" + package.version + " | (c) 2016 Microsoft Corporation " + package.license;

src/embed.ts

@@ -37,7 +37,7 @@ export interface IEmbedConfiguration {
   accessToken?: string;
   settings?: models.ISettings;
   pageName?: string;
-  filters?: (models.IBasicFilter | models.IAdvancedFilter)[];
+  filters?: models.IFilter[];
 }
 
 export interface IInternalEmbedConfiguration extends models.ILoadConfiguration {

src/ifilterable.ts

@@ -11,16 +11,16 @@ export interface IFilterable {
   /**
    * Gets the filters currently applied to the object.
    * 
-   * @returns {(Promise<(models.IBasicFilter | models.IAdvancedFilter)[]>)}
+   * @returns {(Promise<models.IFilter[]>)}
    */
-  getFilters(): Promise<(models.IBasicFilter | models.IAdvancedFilter)[]>;
+  getFilters(): Promise<models.IFilter[]>;
   /**
    * Replaces all filters on the current object with the specified filter values.
    * 
-   * @param {((models.IBasicFilter | models.IAdvancedFilter)[])} filters
+   * @param {(models.IFilter[])} filters
    * @returns {Promise<void>}
    */
-  setFilters(filters: (models.IBasicFilter | models.IAdvancedFilter)[]): Promise<void>;
+  setFilters(filters: models.IFilter[]): Promise<void>;
   /**
    * Removes all filters from the current object.
    * 

src/page.ts

@@ -64,9 +64,9 @@ export class Page implements IPageNode, IFilterable {
    *  .then(pages => { ... });
    * ```
    * 
-   * @returns {(Promise<(models.IBasicFilter | models.IAdvancedFilter)[]>)}
+   * @returns {(Promise<models.IFilter[]>)}
    */
-  getFilters(): Promise<(models.IBasicFilter | models.IAdvancedFilter)[]> {
+  getFilters(): Promise<models.IFilter[]> {
     return this.report.service.hpm.get<models.IFilter[]>(`/report/pages/${this.name}/filters`, { uid: this.report.config.uniqueId }, this.report.iframe.contentWindow)
       .then(response => response.body,
       response => {
@@ -138,10 +138,10 @@ export class Page implements IPageNode, IFilterable {
    *   .catch(errors => { ... });
    * ```
    * 
-   * @param {((models.IBasicFilter | models.IAdvancedFilter)[])} filters
+   * @param {(models.IFilter[])} filters
    * @returns {Promise<void>}
    */
-  setFilters(filters: (models.IBasicFilter | models.IAdvancedFilter)[]): Promise<void> {
+  setFilters(filters: models.IFilter[]): Promise<void> {
     return this.report.service.hpm.put<models.IError[]>(`/report/pages/${this.name}/filters`, filters, { uid: this.report.config.uniqueId }, this.report.iframe.contentWindow)
       .catch(response => {
         throw response.body;

src/report.ts

@@ -240,10 +240,10 @@ export class Report extends embed.Embed implements IReportNode, IFilterable {
    *  });
    * ```
    * 
-   * @param {((models.IBasicFilter | models.IAdvancedFilter)[])} filters
+   * @param {(models.IFilter[])} filters
    * @returns {Promise<void>}
    */
-  setFilters(filters: (models.IBasicFilter | models.IAdvancedFilter)[]): Promise<void> {
+  setFilters(filters: models.IFilter[]): Promise<void> {
     return this.service.hpm.put<models.IError[]>(`/report/filters`, filters, { uid: this.config.uniqueId }, this.iframe.contentWindow)
       .catch(response => {
         throw response.body;

src/visual.ts

@@ -48,9 +48,9 @@ export class Visual implements IVisualNode, IFilterable {
    *  .then(pages => { ... });
    * ```
    * 
-   * @returns {(Promise<(models.IBasicFilter | models.IAdvancedFilter)[]>)}
+   * @returns {(Promise<models.IFilter[]>)}
    */
-  getFilters(): Promise<(models.IBasicFilter | models.IAdvancedFilter)[]> {
+  getFilters(): Promise<models.IFilter[]> {
     return this.page.report.service.hpm.get<models.IFilter[]>(`/report/pages/${this.page.name}/visuals/${this.name}/filters`, { uid: this.page.report.config.uniqueId }, this.page.report.iframe.contentWindow)
       .then(response => response.body,
       response => {
@@ -79,10 +79,10 @@ export class Visual implements IVisualNode, IFilterable {
    *  .catch(errors => { ... });
    * ```
    * 
-   * @param {((models.IBasicFilter | models.IAdvancedFilter)[])} filters
+   * @param {(models.IFilter[])} filters
    * @returns {Promise<void>}
    */
-  setFilters(filters: (models.IBasicFilter | models.IAdvancedFilter)[]): Promise<void> {
+  setFilters(filters: models.IFilter[]): Promise<void> {
     return this.page.report.service.hpm.put<models.IError[]>(`/report/pages/${this.page.name}/visuals/${this.name}/filters`, filters, { uid: this.page.report.config.uniqueId }, this.page.report.iframe.contentWindow)
       .catch(response => {
         throw response.body;

test/utility/mockApp.ts

@@ -16,7 +16,7 @@ export interface IApp {
   validateVisual(visual: models.IVisual): Promise<models.IError[]>;
   // Filters
   getFilters(): Promise<models.IFilter[]>;
-  setFilters(filters: (models.IBasicFilter | models.IAdvancedFilter)[]): Promise<void>;
+  setFilters(filters: models.IFilter[]): Promise<void>;
   validateFilter(filter: models.IFilter): Promise<models.IError[]>;
   // Other
   print(): Promise<void>;