Move QueryColumn interface into its own class

frontend/app/components/api/api-v3/hal-resources/query-resource.service.ts

@@ -27,14 +27,13 @@
 //++
 
 import {HalResource} from './hal-resource.service';
-import {CollectionResource, CollectionResourceInterface, } from './collection-resource.service';
-import {WorkPackageCollectionResource, WorkPackageCollectionResourceInterface} from './wp-collection-resource.service';
-import {QueryFilterResource} from './query-filter-resource.service';
+import {WorkPackageCollectionResourceInterface} from './wp-collection-resource.service';
 import {QueryFilterInstanceResource} from './query-filter-instance-resource.service';
 import {QuerySortByResource} from './query-sort-by-resource.service';
 import {QueryGroupByResource} from './query-group-by-resource.service';
 import {ProjectResource} from './project-resource.service';
 import {opApiModule} from '../../../../angular-modules';
+import {QueryColumn} from '../../../wp-query/query-column';
 
 interface QueryResourceEmbedded {
   results:WorkPackageCollectionResourceInterface;
@@ -77,27 +76,5 @@ function queryResource() {
 export interface QueryResourceInterface extends QueryResourceEmbedded, QueryResource {
 }
 
-/**
- * A reference to a query column object as returned from the API.
- */
-export interface QueryColumn extends HalResource {
-  id:string;
-  name:string;
-  _links?: {
-    self:{ href:string, title:string };
-  }
-}
-
-export interface TypeRelationQueryColumn extends QueryColumn {
-  type:{ href: string },
-  _links?: {
-    self:{ href:string, title:string },
-    type:{ href:string }
-  }
-}
-
-export interface RelationQueryColumn extends QueryColumn {
-  relationType: string;
-}
 
 opApiModule.factory('QueryResource', queryResource);

frontend/app/components/api/api-v3/hal-resources/query-sort-by-resource.service.ts

@@ -27,21 +27,21 @@
 //++
 
 import {HalResource} from './hal-resource.service';
-import {QueryColumn} from './query-resource.service';
 import {opApiModule} from '../../../../angular-modules';
+import {QueryColumn} from '../../../wp-query/query-column';
 
 export const QUERY_SORT_BY_ASC = "urn:openproject-org:api:v3:queries:directions:asc"
 export const QUERY_SORT_BY_DESC = "urn:openproject-org:api:v3:queries:directions:desc"
 
 interface QuerySortByResourceEmbedded {
-  column: QueryColumn;
-  direction: QuerySortByDirection;
+  column:QueryColumn;
+  direction:QuerySortByDirection;
 }
 
 export class QuerySortByResource extends HalResource {
-  public $embedded: QuerySortByResourceEmbedded;
-  public column: QueryColumn;
-  public direction: QuerySortByDirection;
+  public $embedded:QuerySortByResourceEmbedded;
+  public column:QueryColumn;
+  public direction:QuerySortByDirection;
 }
 
 /**

frontend/app/components/context-menus/column-context-menu/column-context-menu.controller.ts

@@ -1,4 +1,3 @@
-import { WorkPackageTableHierarchiesService } from './../../wp-fast-table/state/wp-table-hierarchy.service';
 // -- copyright
 // OpenProject is a project management system.
 // Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
@@ -27,10 +26,10 @@ import { WorkPackageTableHierarchiesService } from './../../wp-fast-table/state/
 // See doc/COPYRIGHT.rdoc for more details.
 // ++
 
+import {WorkPackageTableHierarchiesService} from './../../wp-fast-table/state/wp-table-hierarchy.service';
 import {WorkPackageTableColumnsService} from '../../wp-fast-table/state/wp-table-columns.service';
 import {WorkPackageTableSortByService} from '../../wp-fast-table/state/wp-table-sort-by.service';
 import {WorkPackageTableGroupByService} from '../../wp-fast-table/state/wp-table-group-by.service';
-import {QueryColumn} from '../../api/api-v3/hal-resources/query-resource.service';
 
 angular
   .module('openproject.workPackages')

frontend/app/components/context-menus/column-context-menu/column-context-menu.service.test.ts

@@ -26,8 +26,7 @@
 // See doc/COPYRIGHT.rdoc for more details.
 // ++
 
-import {QueryColumn} from '../../api/api-v3/hal-resources/query-resource.service';
-
+import {QueryColumn} from '../../wp-query/query-column';
 describe('columnContextMenu', function() {
   var container:any, contextMenu:any, wpTableColumns:any, wpTableGroupBy:any, wpTableSortBy:any, $rootScope:any, scope:any, ngContextMenu:any;
 

frontend/app/components/modals/columns-modal/columns-modal.controller.ts

@@ -28,7 +28,7 @@
 
 import {wpControllersModule} from '../../../angular-modules';
 import {WorkPackageTableColumnsService} from '../../wp-fast-table/state/wp-table-columns.service';
-import {QueryColumn} from '../../api/api-v3/hal-resources/query-resource.service'
+import {QueryColumn} from '../../wp-query/query-column';
 
 function ColumnsModalController(this:any,
                                 $scope:any,

frontend/app/components/modals/sorting-modal/sorting-modal.controller.ts

@@ -27,15 +27,13 @@
 //++
 
 import {wpControllersModule} from '../../../angular-modules';
-import {LoadingIndicatorService} from '../../common/loading-indicator/loading-indicator.service';
 import {WorkPackageTableSortByService} from '../../wp-fast-table/state/wp-table-sort-by.service';
 import {
-  QuerySortByResource,
-  QuerySortByDirection,
   QUERY_SORT_BY_ASC,
-  QUERY_SORT_BY_DESC
+  QUERY_SORT_BY_DESC,
+  QuerySortByResource
 } from '../../api/api-v3/hal-resources/query-sort-by-resource.service';
-import {QueryColumn} from '../../api/api-v3/hal-resources/query-resource.service';
+import {QueryColumn} from '../../wp-query/query-column';
 
 class SortModalObject {
   constructor(public column: QueryColumn|null,

frontend/app/components/wp-fast-table/builders/modes/hierarchy/single-hierarchy-row-builder.ts

@@ -1,16 +1,17 @@
-import {WorkPackageTable} from "../../../wp-fast-table";
-import {WorkPackageTableRow} from "../../../wp-table.interfaces";
-import {WorkPackageResourceInterface} from "../../../../api/api-v3/hal-resources/work-package-resource.service";
-import {WorkPackageTableHierarchiesService} from "../../../state/wp-table-hierarchy.service";
-import {$injectFields} from "../../../../angular/angular-injector-bridge.functions";
-import {RowRefreshBuilder} from "../../rows/row-refresh-builder";
-import {WorkPackageEditForm} from "../../../../wp-edit-form/work-package-edit-form";
+import {WorkPackageTable} from '../../../wp-fast-table';
+import {WorkPackageTableRow} from '../../../wp-table.interfaces';
+import {WorkPackageResourceInterface} from '../../../../api/api-v3/hal-resources/work-package-resource.service';
+import {WorkPackageTableHierarchiesService} from '../../../state/wp-table-hierarchy.service';
+import {$injectFields} from '../../../../angular/angular-injector-bridge.functions';
+import {RowRefreshBuilder} from '../../rows/row-refresh-builder';
+import {WorkPackageEditForm} from '../../../../wp-edit-form/work-package-edit-form';
 import {
-  collapsedGroupClass, hasChildrenInTable,
+  collapsedGroupClass,
+  hasChildrenInTable,
   hierarchyRootClass
-} from "../../../helpers/wp-table-hierarchy-helpers";
-import {QueryColumn} from "../../../../api/api-v3/hal-resources/query-resource.service";
-import {UiStateLinkBuilder} from "../../ui-state-link-builder";
+} from '../../../helpers/wp-table-hierarchy-helpers';
+import {UiStateLinkBuilder} from '../../ui-state-link-builder';
+import {QueryColumn} from '../../../../wp-query/query-column';
 
 export const indicatorCollapsedClass = '-hierarchy-collapsed';
 export const hierarchyCellClassName = 'wp-table--hierarchy-span';

frontend/app/components/wp-fast-table/builders/relation-cell-builder.ts

@@ -1,19 +1,12 @@
-import {
-  WorkPackageResource,
-  WorkPackageResourceInterface
-} from './../../api/api-v3/hal-resources/work-package-resource.service';
-import {DisplayField} from './../../wp-display/wp-display-field/wp-display-field.module';
+import {WorkPackageResourceInterface} from './../../api/api-v3/hal-resources/work-package-resource.service';
 import {WorkPackageDisplayFieldService} from './../../wp-display/wp-display-field/wp-display-field.service';
-import {$injectFields, injectorBridge} from '../../angular/angular-injector-bridge.functions';
+import {$injectFields} from '../../angular/angular-injector-bridge.functions';
 import {States} from '../../states.service';
 import {tdClassName} from './cell-builder';
-import {QueryColumn} from '../../api/api-v3/hal-resources/query-resource.service';
-import {
-  RelationsStateValue,
-  WorkPackageRelationsService
-} from '../../wp-relations/wp-relations.service';
+import {WorkPackageRelationsService} from '../../wp-relations/wp-relations.service';
 import {WorkPackageTableRelationColumnsService} from '../state/wp-table-relation-columns.service';
 import {RelationResource} from '../../api/api-v3/hal-resources/relation-resource.service';
+import {QueryColumn} from '../../wp-query/query-column';
 
 export const relationCellTdClassName = 'wp-table--relation-cell-td';
 export const relationCellIndicatorClassName = 'wp-table--relation-indicator';

frontend/app/components/wp-fast-table/builders/relations/relation-row-builder.ts

@@ -2,11 +2,11 @@ import {
   WorkPackageResource,
   WorkPackageResourceInterface
 } from '../../../api/api-v3/hal-resources/work-package-resource.service';
-import {QueryColumn} from '../../../api/api-v3/hal-resources/query-resource.service';
 import {WorkPackageTable} from '../../wp-fast-table';
 import {commonRowClassName, rowClassName, SingleRowBuilder} from '../rows/single-row-builder';
 import {RelationResource} from '../../../api/api-v3/hal-resources/relation-resource.service';
 import {UiStateLinkBuilder} from '../ui-state-link-builder';
+import {QueryColumn} from '../../../wp-query/query-column';
 
 export function relationGroupClass(workPackageId:string) {
   return `__relations-expanded-from-${workPackageId}`;

frontend/app/components/wp-fast-table/builders/rows/row-refresh-builder.ts

@@ -1,10 +1,10 @@
-import {QueryColumn} from "../../../api/api-v3/hal-resources/query-resource.service";
-import {WorkPackageEditForm} from "../../../wp-edit-form/work-package-edit-form";
-import {locateRow} from "../../helpers/wp-table-row-helpers";
-import {WorkPackageTableRow} from "../../wp-table.interfaces";
-import {wpCellTdClassName} from "../cell-builder";
-import {SingleRowBuilder} from "./single-row-builder";
+import {WorkPackageEditForm} from '../../../wp-edit-form/work-package-edit-form';
+import {locateRow} from '../../helpers/wp-table-row-helpers';
+import {WorkPackageTableRow} from '../../wp-table.interfaces';
+import {wpCellTdClassName} from '../cell-builder';
+import {SingleRowBuilder} from './single-row-builder';
 import {debugLog} from '../../../../helpers/debug_output';
+import {QueryColumn} from '../../../wp-query/query-column';
 
 export class RowRefreshBuilder extends SingleRowBuilder {
 

frontend/app/components/wp-fast-table/builders/rows/single-row-builder.ts

@@ -1,18 +1,16 @@
-import {WorkPackageTableSelection} from "../../state/wp-table-selection.service";
-import {CellBuilder} from "../cell-builder";
-import {DetailsLinkBuilder} from "../details-link-builder";
-import {$injectFields} from "../../../angular/angular-injector-bridge.functions";
+import {WorkPackageTableSelection} from '../../state/wp-table-selection.service';
+import {CellBuilder} from '../cell-builder';
+import {DetailsLinkBuilder} from '../details-link-builder';
+import {$injectFields} from '../../../angular/angular-injector-bridge.functions';
 import {
   WorkPackageResource,
   WorkPackageResourceInterface
-} from "../../../api/api-v3/hal-resources/work-package-resource.service";
-import {WorkPackageTableColumnsService} from "../../state/wp-table-columns.service";
-import {QueryColumn} from "../../../api/api-v3/hal-resources/query-resource.service";
-import {checkedClassName} from "../ui-state-link-builder";
-import {rowId} from "../../helpers/wp-table-row-helpers";
-import {Observable} from "rxjs";
-import {WorkPackageTable} from "../../wp-fast-table";
-import {queryColumnTypes} from '../../../wp-query/query-column';
+} from '../../../api/api-v3/hal-resources/work-package-resource.service';
+import {WorkPackageTableColumnsService} from '../../state/wp-table-columns.service';
+import {checkedClassName} from '../ui-state-link-builder';
+import {rowId} from '../../helpers/wp-table-row-helpers';
+import {WorkPackageTable} from '../../wp-fast-table';
+import {QueryColumn, queryColumnTypes} from '../../../wp-query/query-column';
 import {RelationCellbuilder} from '../relation-cell-builder';
 
 // Work package table row entries

frontend/app/components/wp-fast-table/state/wp-table-columns.service.ts

@@ -27,21 +27,16 @@
 // ++
 
 import {
-  WorkPackageTableBaseService,
-  TableStateStates, WorkPackageQueryStateService
+  TableStateStates,
+  WorkPackageQueryStateService,
+  WorkPackageTableBaseService
 } from './wp-table-base.service';
-import {
-  States
-} from '../../states.service';
+import {States} from '../../states.service';
 import {opServicesModule} from '../../../angular-modules';
-import {WPTableRowSelectionState} from '../wp-table.interfaces';
-import {QueryColumn} from '../../api/api-v3/hal-resources/query-resource.service'
-import {Observable} from 'rxjs/Observable';
-import {WorkPackageTableColumns} from '../wp-table-columns'
-import {WorkPackageTableBaseState} from '../wp-table-base';
 import {QueryResource} from '../../api/api-v3/hal-resources/query-resource.service';
+import {WorkPackageTableColumns} from '../wp-table-columns';
 import {QuerySchemaResourceInterface} from '../../api/api-v3/hal-resources/query-schema-resource.service';
-import {queryColumnTypes} from '../../wp-query/query-column';
+import {QueryColumn, queryColumnTypes} from '../../wp-query/query-column';
 
 export class WorkPackageTableColumnsService extends WorkPackageTableBaseService implements WorkPackageQueryStateService {
   protected stateName = 'columns' as TableStateStates;

frontend/app/components/wp-fast-table/state/wp-table-group-by.service.ts

@@ -26,21 +26,18 @@
 // See doc/COPYRIGHT.rdoc for more details.
 // ++
 
-import {
-  QueryResource,
-  QueryColumn
-} from '../../api/api-v3/hal-resources/query-resource.service';
+import {QueryResource} from '../../api/api-v3/hal-resources/query-resource.service';
 import {QuerySchemaResourceInterface} from '../../api/api-v3/hal-resources/query-schema-resource.service';
 import {QueryGroupByResource} from '../../api/api-v3/hal-resources/query-group-by-resource.service';
 import {opServicesModule} from '../../../angular-modules';
-import {
-  States
-} from '../../states.service';
+import {States} from '../../states.service';
 import {WorkPackageTableGroupBy} from '../wp-table-group-by';
 import {
-  WorkPackageTableBaseService,
-  TableStateStates, WorkPackageQueryStateService
+  TableStateStates,
+  WorkPackageQueryStateService,
+  WorkPackageTableBaseService
 } from './wp-table-base.service';
+import {QueryColumn} from '../../wp-query/query-column';
 
 export class WorkPackageTableGroupByService extends WorkPackageTableBaseService implements WorkPackageQueryStateService {
   protected stateName = 'groupBy' as TableStateStates;

frontend/app/components/wp-fast-table/state/wp-table-relation-columns.service.ts

@@ -29,30 +29,21 @@
 import {opServicesModule} from '../../../angular-modules';
 import {States} from '../../states.service';
 import {WorkPackageTableRelationColumns} from '../wp-table-relation-columns';
-import {
-  WorkPackageResource,
-  WorkPackageResourceInterface
-} from '../../api/api-v3/hal-resources/work-package-resource.service';
+import {WorkPackageResourceInterface} from '../../api/api-v3/hal-resources/work-package-resource.service';
 import {
   RelationsStateValue,
   WorkPackageRelationsService
 } from '../../wp-relations/wp-relations.service';
 import {WorkPackageTableColumnsService} from './wp-table-columns.service';
-import {
-  TableStateStates, WorkPackageQueryStateService,
-  WorkPackageTableBaseService
-} from './wp-table-base.service';
+import {TableStateStates, WorkPackageTableBaseService} from './wp-table-base.service';
 import {RelationResource} from '../../api/api-v3/hal-resources/relation-resource.service';
-import {queryColumnTypes} from '../../wp-query/query-column';
+import {
+  QueryColumn, queryColumnTypes, RelationQueryColumn,
+  TypeRelationQueryColumn
+} from '../../wp-query/query-column';
 import {IQService} from 'angular';
 import {HalRequestService} from '../../api/api-v3/hal-request/hal-request.service';
 import {WorkPackageCacheService} from '../../work-packages/work-package-cache.service';
-import {
-  QueryColumn,
-  QueryResource,
-  RelationQueryColumn,
-  TypeRelationQueryColumn
-} from '../../api/api-v3/hal-resources/query-resource.service';
 
 export class WorkPackageTableRelationColumnsService extends WorkPackageTableBaseService {
   protected stateName = 'relationColumns' as TableStateStates;

frontend/app/components/wp-fast-table/state/wp-table-sort-by.service.ts

@@ -27,20 +27,21 @@
 // ++
 
 import {
-  WorkPackageTableBaseService,
-  TableStateStates, WorkPackageQueryStateService
+  TableStateStates,
+  WorkPackageQueryStateService,
+  WorkPackageTableBaseService
 } from './wp-table-base.service';
-import {QueryColumn} from '../../api/api-v3/hal-resources/query-resource.service';
 import {QueryResource} from '../../api/api-v3/hal-resources/query-resource.service';
 import {QuerySchemaResourceInterface} from '../../api/api-v3/hal-resources/query-schema-resource.service';
 import {
-  QuerySortByResource,
   QUERY_SORT_BY_ASC,
-  QUERY_SORT_BY_DESC
+  QUERY_SORT_BY_DESC,
+  QuerySortByResource
 } from '../../api/api-v3/hal-resources/query-sort-by-resource.service';
 import {opServicesModule} from '../../../angular-modules';
 import {States} from '../../states.service';
 import {WorkPackageTableSortBy} from '../wp-table-sort-by';
+import {QueryColumn} from '../../wp-query/query-column';
 
 export class WorkPackageTableSortByService extends WorkPackageTableBaseService implements WorkPackageQueryStateService {
   protected stateName = 'sortBy' as TableStateStates;

frontend/app/components/wp-fast-table/state/wp-table-sum.service.ts

@@ -27,15 +27,11 @@
 // ++
 
 import {
-  WorkPackageTableBaseService,
-  TableStateStates, WorkPackageQueryStateService
+  TableStateStates,
+  WorkPackageQueryStateService,
+  WorkPackageTableBaseService
 } from './wp-table-base.service';
-import {
-  QueryResource,
-  QueryColumn
-} from '../../api/api-v3/hal-resources/query-resource.service';
-import {QuerySchemaResourceInterface} from '../../api/api-v3/hal-resources/query-schema-resource.service';
-import {QueryGroupByResource} from '../../api/api-v3/hal-resources/query-group-by-resource.service';
+import {QueryResource} from '../../api/api-v3/hal-resources/query-resource.service';
 import {opServicesModule} from '../../../angular-modules';
 import {States} from '../../states.service';
 import {WorkPackageTableSum} from '../wp-table-sum';

frontend/app/components/wp-fast-table/wp-table-columns.ts

@@ -26,9 +26,10 @@
 // See doc/COPYRIGHT.rdoc for more details.
 // ++
 
-import {QueryColumn, QueryResource} from '../api/api-v3/hal-resources/query-resource.service';
+import {QueryResource} from '../api/api-v3/hal-resources/query-resource.service';
 import {QuerySchemaResourceInterface} from '../api/api-v3/hal-resources/query-schema-resource.service';
 import {WorkPackageTableBaseState} from './wp-table-base';
+import {QueryColumn} from '../wp-query/query-column';
 
 export class WorkPackageTableColumns extends WorkPackageTableBaseState<QueryColumn[]> {
 

frontend/app/components/wp-fast-table/wp-table-group-by.ts

@@ -27,12 +27,10 @@
 // ++
 
 import {QueryGroupByResource} from '../api/api-v3/hal-resources/query-group-by-resource.service';
-import {
-  QueryResource,
-  QueryColumn
-} from '../api/api-v3/hal-resources/query-resource.service';
+import {QueryResource} from '../api/api-v3/hal-resources/query-resource.service';
 import {QuerySchemaResourceInterface} from '../api/api-v3/hal-resources/query-schema-resource.service';
-import {WorkPackageTableBaseState} from "./wp-table-base";
+import {WorkPackageTableBaseState} from './wp-table-base';
+import {QueryColumn} from '../wp-query/query-column';
 
 export class WorkPackageTableGroupBy extends WorkPackageTableBaseState<QueryGroupByResource | undefined> {
   public available:QueryGroupByResource[] = [];

frontend/app/components/wp-fast-table/wp-table-sort-by.ts

@@ -31,9 +31,10 @@ import {
   QUERY_SORT_BY_DESC,
   QuerySortByResource
 } from '../api/api-v3/hal-resources/query-sort-by-resource.service';
-import {QueryColumn, QueryResource} from '../api/api-v3/hal-resources/query-resource.service';
+import {QueryResource} from '../api/api-v3/hal-resources/query-resource.service';
 import {QuerySchemaResourceInterface} from '../api/api-v3/hal-resources/query-schema-resource.service';
 import {WorkPackageTableBaseState} from './wp-table-base';
+import {QueryColumn} from '../wp-query/query-column';
 
 export class WorkPackageTableSortBy extends WorkPackageTableBaseState<QuerySortByResource[]> {
   public available: QuerySortByResource[] = [];

frontend/app/components/wp-inline-create/inline-create-row-builder.ts

@@ -1,4 +1,3 @@
-import {WorkPackageTableRow} from '../wp-fast-table/wp-table.interfaces';
 import {TableRowEditContext} from '../wp-edit-form/table-row-edit-context';
 import {WorkPackageEditForm} from '../wp-edit-form/work-package-edit-form';
 import {injectorBridge} from '../angular/angular-injector-bridge.functions';
@@ -6,22 +5,18 @@ import {
   WorkPackageResource,
   WorkPackageResourceInterface
 } from '../api/api-v3/hal-resources/work-package-resource.service';
-import {checkedClassName} from '../wp-fast-table/builders/ui-state-link-builder';
 import {rowId} from '../wp-fast-table/helpers/wp-table-row-helpers';
 import {States} from '../states.service';
 import {WorkPackageTableSelection} from '../wp-fast-table/state/wp-table-selection.service';
 import {WorkPackageTableColumnsService} from '../wp-fast-table/state/wp-table-columns.service';
-import {CellBuilder} from '../wp-fast-table/builders/cell-builder';
 import {
   internalDetailsColumn,
-  rowClassName,
-  SingleRowBuilder
+  rowClassName
 } from '../wp-fast-table/builders/rows/single-row-builder';
+import {WorkPackageTable} from '../wp-fast-table/wp-fast-table';
+import {RowRefreshBuilder} from '../wp-fast-table/builders/rows/row-refresh-builder';
 import IScope = angular.IScope;
-import {scopeDestroyed$} from "../../helpers/angular-rx-utils";
-import {WorkPackageTable} from "../wp-fast-table/wp-fast-table";
-import {QueryColumn} from '../api/api-v3/hal-resources/query-resource.service';
-import {RowRefreshBuilder} from "../wp-fast-table/builders/rows/row-refresh-builder";
+import {QueryColumn} from '../wp-query/query-column';
 
 export const inlineCreateRowClassName = 'wp-inline-create-row';
 export const inlineCreateCancelClassName = 'wp-table--cancel-create-link';

frontend/app/components/wp-list/wp-list-invalid-query.service.ts

@@ -26,10 +26,7 @@
 // See doc/COPYRIGHT.rdoc for more details.
 // ++
 
-import {
-  QueryResource,
-  QueryColumn
-} from '../api/api-v3/hal-resources/query-resource.service';
+import {QueryResource} from '../api/api-v3/hal-resources/query-resource.service';
 import {QueryFormResource} from '../api/api-v3/hal-resources/query-form-resource.service';
 import {QuerySortByResource} from '../api/api-v3/hal-resources/query-sort-by-resource.service';
 import {QueryGroupByResource} from '../api/api-v3/hal-resources/query-group-by-resource.service';
@@ -37,6 +34,7 @@ import {SchemaResource} from '../api/api-v3/hal-resources/schema-resource.servic
 import {QueryFilterResource} from '../api/api-v3/hal-resources/query-filter-resource.service';
 import {QueryFilterInstanceResource} from '../api/api-v3/hal-resources/query-filter-instance-resource.service';
 import {QueryFilterInstanceSchemaResource} from '../api/api-v3/hal-resources/query-filter-instance-schema-resource.service';
+import {QueryColumn} from '../wp-query/query-column';
 
 export class WorkPackagesListInvalidQueryService {
   constructor(protected QueryResource:QueryResource,

frontend/app/components/wp-query/query-column.ts

@@ -1,10 +1,31 @@
 
+import {HalResource} from '../api/api-v3/hal-resources/hal-resource.service';
 export const queryColumnTypes = {
   PROPERTY: 'QueryColumn::Property',
   RELATION_OF_TYPE: 'QueryColumn::RelationOfType',
   RELATION_TO_TYPE: 'QueryColumn::RelationToType',
 };
 
-export class QueryColumn {
-  public name:string;
+
+/**
+ * A reference to a query column object as returned from the API.
+ */
+export interface QueryColumn extends HalResource {
+  id:string;
+  name:string;
+  _links?: {
+    self:{ href:string, title:string };
+  }
+}
+
+export interface TypeRelationQueryColumn extends QueryColumn {
+  type:{ href: string },
+  _links?: {
+    self:{ href:string, title:string },
+    type:{ href:string }
+  }
+}
+
+export interface RelationQueryColumn extends QueryColumn {
+  relationType: string;
 }