[ARVADOS-WORKBENCH2] updated: 1.3.0-81-g88f16d1

Git user git at public.curoverse.com
Mon Dec 10 12:17:59 EST 2018


Summary of changes:
 .../groups-panel/groups-panel-middleware-service.ts  | 20 +++++++++++++++++++-
 src/views/groups-panel/groups-panel.tsx              |  8 ++++----
 2 files changed, 23 insertions(+), 5 deletions(-)

       via  88f16d1a87decacf3dc395126912684ed90dc16f (commit)
       via  3e05c931b42b1b690f43e179aaa9b45c84475ba0 (commit)
       via  74d27e4a497bd9bf66d31e1f4578f63d71fb4d87 (commit)
      from  12531884583ab85a114eed12f5179ed0b5fb8a88 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 88f16d1a87decacf3dc395126912684ed90dc16f
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Mon Dec 10 18:14:46 2018 +0100

    Add ordering by group name
    
    Feature #14505
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/store/groups-panel/groups-panel-middleware-service.ts b/src/store/groups-panel/groups-panel-middleware-service.ts
index 3cfdf33..0b6f89b 100644
--- a/src/store/groups-panel/groups-panel-middleware-service.ts
+++ b/src/store/groups-panel/groups-panel-middleware-service.ts
@@ -7,10 +7,14 @@ import { DataExplorerMiddlewareService, listResultsToDataExplorerItemsMeta, data
 import { RootState } from "~/store/store";
 import { ServiceRepository } from "~/services/services";
 import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions';
-import { getDataExplorer } from "~/store/data-explorer/data-explorer-reducer";
+import { getDataExplorer, DataExplorer, getSortColumn } from "~/store/data-explorer/data-explorer-reducer";
 import { GroupsPanelActions } from '~/store/groups-panel/groups-panel-actions';
 import { FilterBuilder } from '~/services/api/filter-builder';
 import { updateResources } from '~/store/resources/resources-actions';
+import { OrderBuilder, OrderDirection } from '~/services/api/order-builder';
+import { GroupResource } from '~/models/group';
+import { SortDirection } from '~/components/data-table/data-column';
+import { GroupsPanelColumnNames } from '~/views/groups-panel/groups-panel';
 
 export class GroupsPanelMiddlewareService extends DataExplorerMiddlewareService {
 
@@ -30,6 +34,17 @@ export class GroupsPanelMiddlewareService extends DataExplorerMiddlewareService
 
             try {
 
+                const order = new OrderBuilder<GroupResource>();
+                const sortColumn = getSortColumn(dataExplorer);
+                if (sortColumn) {
+                    const direction =
+                        sortColumn.sortDirection === SortDirection.ASC && sortColumn.name === GroupsPanelColumnNames.GROUP
+                            ? OrderDirection.ASC
+                            : OrderDirection.DESC;
+
+                    order.addOrder(direction, 'name');
+                }
+
                 const filters = new FilterBuilder()
                     .addEqual('groupClass', null)
                     .addILike('name', dataExplorer.searchValue)
@@ -39,6 +54,7 @@ export class GroupsPanelMiddlewareService extends DataExplorerMiddlewareService
                     .list({
                         ...dataExplorerToListParams(dataExplorer),
                         filters,
+                        order: order.getOrder(),
                     });
 
                 api.dispatch(updateResources(response.items));
@@ -68,3 +84,4 @@ const couldNotFetchFavoritesContents = () =>
         message: 'Could not fetch groups.',
         kind: SnackbarKind.ERROR
     });
+

commit 3e05c931b42b1b690f43e179aaa9b45c84475ba0
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Mon Dec 10 18:14:21 2018 +0100

    Apply correct GroupsPanelColumnNames enum name
    
    Feature #14505
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/views/groups-panel/groups-panel.tsx b/src/views/groups-panel/groups-panel.tsx
index c404f1e..ed865d9 100644
--- a/src/views/groups-panel/groups-panel.tsx
+++ b/src/views/groups-panel/groups-panel.tsx
@@ -33,7 +33,7 @@ import { GROUPS_PANEL_ID } from '~/store/groups-panel/groups-panel-actions';
 import { noop } from 'lodash/fp';
 import { GroupResource } from '~/models/group';
 
-export enum ProjectPanelColumnNames {
+export enum GroupsPanelColumnNames {
     GROUP = "Name",
     OWNER = "Owner",
     MEMBERS = "Members",
@@ -41,7 +41,7 @@ export enum ProjectPanelColumnNames {
 
 export const groupsPanelColumns: DataColumns<string> = [
     {
-        name: ProjectPanelColumnNames.GROUP,
+        name: GroupsPanelColumnNames.GROUP,
         selected: true,
         configurable: true,
         sortDirection: SortDirection.ASC,
@@ -49,14 +49,14 @@ export const groupsPanelColumns: DataColumns<string> = [
         render: uuid => <ResourceName uuid={uuid} />
     },
     {
-        name: ProjectPanelColumnNames.OWNER,
+        name: GroupsPanelColumnNames.OWNER,
         selected: true,
         configurable: true,
         filters: createTree(),
         render: uuid => <ResourceOwner uuid={uuid} />,
     },
     {
-        name: ProjectPanelColumnNames.MEMBERS,
+        name: GroupsPanelColumnNames.MEMBERS,
         selected: true,
         configurable: true,
         filters: createTree(),

commit 74d27e4a497bd9bf66d31e1f4578f63d71fb4d87
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Mon Dec 10 18:00:05 2018 +0100

    Filter groups by name
    
    Feature #14505
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --git a/src/store/groups-panel/groups-panel-middleware-service.ts b/src/store/groups-panel/groups-panel-middleware-service.ts
index 9d43b11..3cfdf33 100644
--- a/src/store/groups-panel/groups-panel-middleware-service.ts
+++ b/src/store/groups-panel/groups-panel-middleware-service.ts
@@ -32,6 +32,7 @@ export class GroupsPanelMiddlewareService extends DataExplorerMiddlewareService
 
                 const filters = new FilterBuilder()
                     .addEqual('groupClass', null)
+                    .addILike('name', dataExplorer.searchValue)
                     .getFilters();
 
                 const response = await this.services.groupsService

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list