[ARVADOS-WORKBENCH2] updated: 1.2.0-825-g1b99184
Git user
git at public.curoverse.com
Tue Nov 13 08:19:49 EST 2018
Summary of changes:
src/store/data-explorer/data-explorer-reducer.ts | 2 +-
src/store/favorite-panel/favorite-panel-middleware-service.ts | 4 ++--
src/store/project-panel/project-panel-middleware-service.ts | 4 ++--
src/store/search-results-panel/search-results-middleware-service.ts | 4 ++--
src/store/shared-with-me-panel/shared-with-me-middleware-service.ts | 4 ++--
src/store/trash-panel/trash-panel-middleware-service.ts | 4 ++--
src/store/workflow-panel/workflow-middleware-service.ts | 4 ++--
7 files changed, 13 insertions(+), 13 deletions(-)
via 1b99184996d54eb68c7a7be6bdc14e2bcdc06e5c (commit)
from 60df7056b536f7a333299638ca19bc12aee94d47 (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 1b99184996d54eb68c7a7be6bdc14e2bcdc06e5c
Author: Pawel Kromplewski <pawel.kromplewski at contractors.roche.com>
Date: Tue Nov 13 14:19:39 2018 +0100
Fix typo
Feature #14421
Arvados-DCO-1.1-Signed-off-by: Pawel Kromplewski <pawel.kromplewski at contractors.roche.com>
diff --git a/src/store/data-explorer/data-explorer-reducer.ts b/src/store/data-explorer/data-explorer-reducer.ts
index d3a4389..1657ab7 100644
--- a/src/store/data-explorer/data-explorer-reducer.ts
+++ b/src/store/data-explorer/data-explorer-reducer.ts
@@ -65,7 +65,7 @@ export const dataExplorerReducer = (state: DataExplorerState = {}, action: DataE
export const getDataExplorer = (state: DataExplorerState, id: string) =>
state[id] || initialDataExplorer;
-export const getSortColumns = (dataExplorer: DataExplorer) => dataExplorer.columns.find((c: any) =>
+export const getSortColumn = (dataExplorer: DataExplorer) => dataExplorer.columns.find((c: any) =>
!!c.sortDirection && c.sortDirection !== SortDirection.NONE);
const update = (state: DataExplorerState, id: string, updateFn: (dataExplorer: DataExplorer) => DataExplorer) =>
diff --git a/src/store/favorite-panel/favorite-panel-middleware-service.ts b/src/store/favorite-panel/favorite-panel-middleware-service.ts
index 6a83a20..d7d54de 100644
--- a/src/store/favorite-panel/favorite-panel-middleware-service.ts
+++ b/src/store/favorite-panel/favorite-panel-middleware-service.ts
@@ -20,7 +20,7 @@ import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions
import { progressIndicatorActions } from '~/store/progress-indicator/progress-indicator-actions.ts';
import { getDataExplorer } from "~/store/data-explorer/data-explorer-reducer";
import { loadMissingProcessesInformation } from "~/store/project-panel/project-panel-middleware-service";
-import { getSortColumns } from "~/store/data-explorer/data-explorer-reducer";
+import { getSortColumn } from "~/store/data-explorer/data-explorer-reducer";
export class FavoritePanelMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
@@ -33,7 +33,7 @@ export class FavoritePanelMiddlewareService extends DataExplorerMiddlewareServic
api.dispatch(favoritesPanelDataExplorerIsNotSet());
} else {
const columns = dataExplorer.columns as DataColumns<string, FavoritePanelFilter>;
- const sortColumn = getSortColumns(dataExplorer);
+ const sortColumn = getSortColumn(dataExplorer);
const typeFilters = this.getColumnFilters(columns, FavoritePanelColumnNames.TYPE);
const linkOrder = new OrderBuilder<LinkResource>();
diff --git a/src/store/project-panel/project-panel-middleware-service.ts b/src/store/project-panel/project-panel-middleware-service.ts
index 14e7f80..458444f 100644
--- a/src/store/project-panel/project-panel-middleware-service.ts
+++ b/src/store/project-panel/project-panel-middleware-service.ts
@@ -31,7 +31,7 @@ import { ResourceKind } from '~/models/resource';
import { getResource } from "~/store/resources/resources";
import { CollectionResource } from "~/models/collection";
import { resourcesDataActions } from "~/store/resources-data/resources-data-actions";
-import { getSortColumns } from "~/store/data-explorer/data-explorer-reducer";
+import { getSortColumn } from "~/store/data-explorer/data-explorer-reducer";
export class ProjectPanelMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
@@ -127,7 +127,7 @@ export const getFilters = (dataExplorer: DataExplorer) => {
};
export const getOrder = (dataExplorer: DataExplorer) => {
- const sortColumn = getSortColumns(dataExplorer);
+ const sortColumn = getSortColumn(dataExplorer);
const order = new OrderBuilder<ProjectResource>();
if (sortColumn) {
const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
diff --git a/src/store/search-results-panel/search-results-middleware-service.ts b/src/store/search-results-panel/search-results-middleware-service.ts
index 1300ffb..b7607e3 100644
--- a/src/store/search-results-panel/search-results-middleware-service.ts
+++ b/src/store/search-results-panel/search-results-middleware-service.ts
@@ -16,7 +16,7 @@ import { GroupContentsResource, GroupContentsResourcePrefix } from "~/services/g
import { ListResults } from '~/services/common-service/common-resource-service';
import { searchResultsPanelActions } from '~/store/search-results-panel/search-results-panel-actions';
import { getFilters } from '~/store/search-bar/search-bar-actions';
-import { getSortColumns } from "~/store/data-explorer/data-explorer-reducer";
+import { getSortColumn } from "~/store/data-explorer/data-explorer-reducer";
export class SearchResultsMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
@@ -45,7 +45,7 @@ export const getParams = (dataExplorer: DataExplorer, searchValue: string) => ({
});
const getOrder = (dataExplorer: DataExplorer) => {
- const sortColumn = getSortColumns(dataExplorer);
+ const sortColumn = getSortColumn(dataExplorer);
const order = new OrderBuilder<GroupContentsResource>();
if (sortColumn) {
const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
diff --git a/src/store/shared-with-me-panel/shared-with-me-middleware-service.ts b/src/store/shared-with-me-panel/shared-with-me-middleware-service.ts
index 1ad1a4d..7e30ff5 100644
--- a/src/store/shared-with-me-panel/shared-with-me-middleware-service.ts
+++ b/src/store/shared-with-me-panel/shared-with-me-middleware-service.ts
@@ -19,7 +19,7 @@ import { OrderBuilder, OrderDirection } from '~/services/api/order-builder';
import { ProjectResource } from '~/models/project';
import { ProjectPanelColumnNames } from '~/views/project-panel/project-panel';
import { FilterBuilder } from '~/services/api/filter-builder';
-import { getSortColumns } from "~/store/data-explorer/data-explorer-reducer";
+import { getSortColumn } from "~/store/data-explorer/data-explorer-reducer";
export class SharedWithMeMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
@@ -60,7 +60,7 @@ export const getFilters = (dataExplorer: DataExplorer) => {
};
export const getOrder = (dataExplorer: DataExplorer) => {
- const sortColumn = getSortColumns(dataExplorer);
+ const sortColumn = getSortColumn(dataExplorer);
const order = new OrderBuilder<ProjectResource>();
if (sortColumn) {
const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
diff --git a/src/store/trash-panel/trash-panel-middleware-service.ts b/src/store/trash-panel/trash-panel-middleware-service.ts
index fba4adf..9afc57b 100644
--- a/src/store/trash-panel/trash-panel-middleware-service.ts
+++ b/src/store/trash-panel/trash-panel-middleware-service.ts
@@ -22,7 +22,7 @@ import { updateFavorites } from "~/store/favorites/favorites-actions";
import { snackbarActions, SnackbarKind } from "~/store/snackbar/snackbar-actions";
import { updateResources } from "~/store/resources/resources-actions";
import { progressIndicatorActions } from "~/store/progress-indicator/progress-indicator-actions";
-import { getSortColumns } from "~/store/data-explorer/data-explorer-reducer";
+import { getSortColumn } from "~/store/data-explorer/data-explorer-reducer";
export class TrashPanelMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
@@ -32,7 +32,7 @@ export class TrashPanelMiddlewareService extends DataExplorerMiddlewareService {
async requestItems(api: MiddlewareAPI<Dispatch, RootState>) {
const dataExplorer = api.getState().dataExplorer[this.getId()];
const columns = dataExplorer.columns as DataColumns<string, TrashPanelFilter>;
- const sortColumn = getSortColumns(dataExplorer);
+ const sortColumn = getSortColumn(dataExplorer);
const typeFilters = this.getColumnFilters(columns, TrashPanelColumnNames.TYPE);
const order = new OrderBuilder<ProjectResource>();
diff --git a/src/store/workflow-panel/workflow-middleware-service.ts b/src/store/workflow-panel/workflow-middleware-service.ts
index 687700f..fefcb32 100644
--- a/src/store/workflow-panel/workflow-middleware-service.ts
+++ b/src/store/workflow-panel/workflow-middleware-service.ts
@@ -16,7 +16,7 @@ import { OrderDirection, OrderBuilder } from '~/services/api/order-builder';
import { WorkflowResource } from '~/models/workflow';
import { ListResults } from '~/services/common-service/common-resource-service';
import { workflowPanelActions } from './workflow-panel-actions';
-import { getSortColumns } from "~/store/data-explorer/data-explorer-reducer";
+import { getSortColumn } from "~/store/data-explorer/data-explorer-reducer";
export class WorkflowMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
@@ -50,7 +50,7 @@ export const getFilters = (dataExplorer: DataExplorer) => {
};
export const getOrder = (dataExplorer: DataExplorer) => {
- const sortColumn = getSortColumns(dataExplorer);
+ const sortColumn = getSortColumn(dataExplorer);
const order = new OrderBuilder<WorkflowResource>();
if (sortColumn) {
const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list