[ARVADOS-WORKBENCH2] updated: 1.1.4-526-g5c53f8b
Git user
git at public.curoverse.com
Sun Aug 5 12:52:46 EDT 2018
Summary of changes:
src/store/collections/collections-reducer.ts | 4 ++--
.../collection-updater-action.ts} | 12 ++++++------
.../collection-updater-reducer.ts} | 8 ++++----
.../context-menu/action-sets/collection-action-set.ts | 6 +++---
.../dialog-update/dialog-collection-update.tsx | 4 ++--
.../update-collection-dialog/update-collection-dialog..tsx | 6 +++---
6 files changed, 20 insertions(+), 20 deletions(-)
rename src/store/collections/{updator/collection-updator-action.ts => updater/collection-updater-action.ts} (84%)
rename src/store/collections/{updator/collection-updator-reducer.ts => updater/collection-updater-reducer.ts} (72%)
via 5c53f8b627cc92bb9d642159c4d7e3ad1ddf494d (commit)
from 6fbcbe191d8356ad2029e79ad961c983b2284afd (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 5c53f8b627cc92bb9d642159c4d7e3ad1ddf494d
Author: Daniel Kos <unodgs at gmail.com>
Date: Sun Aug 5 18:33:28 2018 +0200
Rename updator -> updater
Feature #13856
Arvados-DCO-1.1-Signed-off-by: Daniel Kos <unodgs at gmail.com>
diff --git a/src/store/collections/collections-reducer.ts b/src/store/collections/collections-reducer.ts
index 966cf29..155498a 100644
--- a/src/store/collections/collections-reducer.ts
+++ b/src/store/collections/collections-reducer.ts
@@ -4,7 +4,7 @@
import { combineReducers } from 'redux';
import * as creator from "./creator/collection-creator-reducer";
-import * as updator from "./updator/collection-updator-reducer";
+import * as updator from "./updater/collection-updater-reducer";
export type CollectionsState = {
creator: creator.CollectionCreatorState;
@@ -14,4 +14,4 @@ export type CollectionsState = {
export const collectionsReducer = combineReducers({
creator: creator.collectionCreationReducer,
updator: updator.collectionCreationReducer
-});
\ No newline at end of file
+});
diff --git a/src/store/collections/updator/collection-updator-action.ts b/src/store/collections/updater/collection-updater-action.ts
similarity index 84%
rename from src/store/collections/updator/collection-updator-action.ts
rename to src/store/collections/updater/collection-updater-action.ts
index e12bfe5..fff8b71 100644
--- a/src/store/collections/updator/collection-updator-action.ts
+++ b/src/store/collections/updater/collection-updater-action.ts
@@ -12,8 +12,8 @@ import { initialize } from 'redux-form';
import { collectionPanelActions } from "../../collection-panel/collection-panel-action";
export const collectionUpdatorActions = unionize({
- OPEN_COLLECTION_UPDATOR: ofType<{ uuid: string }>(),
- CLOSE_COLLECTION_UPDATOR: ofType<{}>(),
+ OPEN_COLLECTION_UPDATER: ofType<{ uuid: string }>(),
+ CLOSE_COLLECTION_UPDATER: ofType<{}>(),
UPDATE_COLLECTION_SUCCESS: ofType<{}>(),
}, {
tag: 'type',
@@ -22,10 +22,10 @@ export const collectionUpdatorActions = unionize({
export const COLLECTION_FORM_NAME = 'collectionEditDialog';
-
-export const openUpdator = (uuid: string) =>
+
+export const openUpdater = (uuid: string) =>
(dispatch: Dispatch, getState: () => RootState) => {
- dispatch(collectionUpdatorActions.OPEN_COLLECTION_UPDATOR({ uuid }));
+ dispatch(collectionUpdatorActions.OPEN_COLLECTION_UPDATER({ uuid }));
const item = getState().collectionPanel.item;
if(item) {
dispatch(initialize(COLLECTION_FORM_NAME, { name: item.name, description: item.description }));
@@ -44,4 +44,4 @@ export const updateCollection = (collection: Partial<CollectionResource>) =>
);
};
-export type CollectionUpdatorAction = UnionOf<typeof collectionUpdatorActions>;
\ No newline at end of file
+export type CollectionUpdaterAction = UnionOf<typeof collectionUpdatorActions>;
diff --git a/src/store/collections/updator/collection-updator-reducer.ts b/src/store/collections/updater/collection-updater-reducer.ts
similarity index 72%
rename from src/store/collections/updator/collection-updator-reducer.ts
rename to src/store/collections/updater/collection-updater-reducer.ts
index b9d0250..e7d4e63 100644
--- a/src/store/collections/updator/collection-updator-reducer.ts
+++ b/src/store/collections/updater/collection-updater-reducer.ts
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import { collectionUpdatorActions, CollectionUpdatorAction } from './collection-updator-action';
+import { collectionUpdatorActions, CollectionUpdaterAction } from './collection-updater-action';
export type CollectionUpdatorState = CollectionUpdator;
@@ -21,10 +21,10 @@ const initialState: CollectionUpdatorState = {
uuid: ''
};
-export const collectionCreationReducer = (state: CollectionUpdatorState = initialState, action: CollectionUpdatorAction) => {
+export const collectionCreationReducer = (state: CollectionUpdatorState = initialState, action: CollectionUpdaterAction) => {
return collectionUpdatorActions.match(action, {
- OPEN_COLLECTION_UPDATOR: ({ uuid }) => updateCollection(state, { uuid, opened: true }),
- CLOSE_COLLECTION_UPDATOR: () => updateCollection(state, { opened: false }),
+ OPEN_COLLECTION_UPDATER: ({ uuid }) => updateCollection(state, { uuid, opened: true }),
+ CLOSE_COLLECTION_UPDATER: () => updateCollection(state, { opened: false }),
UPDATE_COLLECTION_SUCCESS: () => updateCollection(state, { opened: false, uuid: "" }),
default: () => state
});
diff --git a/src/views-components/context-menu/action-sets/collection-action-set.ts b/src/views-components/context-menu/action-sets/collection-action-set.ts
index 566f8f1..513cb5f 100644
--- a/src/views-components/context-menu/action-sets/collection-action-set.ts
+++ b/src/views-components/context-menu/action-sets/collection-action-set.ts
@@ -6,7 +6,7 @@ import { ContextMenuActionSet } from "../context-menu-action-set";
import { ToggleFavoriteAction } from "../actions/favorite-action";
import { toggleFavorite } from "../../../store/favorites/favorites-actions";
import { RenameIcon, ShareIcon, MoveToIcon, CopyIcon, DetailsIcon, ProvenanceGraphIcon, AdvancedIcon, RemoveIcon } from "../../../components/icon/icon";
-import { openUpdator } from "../../../store/collections/updator/collection-updator-action";
+import { openUpdater } from "../../../store/collections/updater/collection-updater-action";
import { favoritePanelActions } from "../../../store/favorite-panel/favorite-panel-action";
export const collectionActionSet: ContextMenuActionSet = [[
@@ -14,7 +14,7 @@ export const collectionActionSet: ContextMenuActionSet = [[
icon: RenameIcon,
name: "Edit collection",
execute: (dispatch, resource) => {
- dispatch<any>(openUpdator(resource.uuid));
+ dispatch<any>(openUpdater(resource.uuid));
}
},
{
@@ -35,7 +35,7 @@ export const collectionActionSet: ContextMenuActionSet = [[
component: ToggleFavoriteAction,
execute: (dispatch, resource) => {
dispatch<any>(toggleFavorite(resource)).then(() => {
- dispatch<any>(favoritePanelActions.REQUEST_ITEMS());
+ dispatch<any>(favoritePanelActions.REQUEST_ITEMS());
});
}
},
diff --git a/src/views-components/dialog-update/dialog-collection-update.tsx b/src/views-components/dialog-update/dialog-collection-update.tsx
index 80a82b2..dc27801 100644
--- a/src/views-components/dialog-update/dialog-collection-update.tsx
+++ b/src/views-components/dialog-update/dialog-collection-update.tsx
@@ -8,7 +8,7 @@ import { compose } from 'redux';
import { ArvadosTheme } from '../../common/custom-theme';
import { Dialog, DialogActions, DialogContent, DialogTitle, TextField, StyleRulesCallback, withStyles, WithStyles, Button, CircularProgress } from '../../../node_modules/@material-ui/core';
import { COLLECTION_NAME_VALIDATION, COLLECTION_DESCRIPTION_VALIDATION } from '../../validators/create-project/create-project-validator';
-import { COLLECTION_FORM_NAME } from '../../store/collections/updator/collection-updator-action';
+import { COLLECTION_FORM_NAME } from '../../store/collections/updater/collection-updater-action';
type CssRules = 'content' | 'actions' | 'textField' | 'buttonWrapper' | 'saveButton' | 'circularProgress';
@@ -128,4 +128,4 @@ export const DialogCollectionUpdate = compose(
/>
)
}
- );
\ No newline at end of file
+ );
diff --git a/src/views-components/update-collection-dialog/update-collection-dialog..tsx b/src/views-components/update-collection-dialog/update-collection-dialog..tsx
index a91277e..b067b13 100644
--- a/src/views-components/update-collection-dialog/update-collection-dialog..tsx
+++ b/src/views-components/update-collection-dialog/update-collection-dialog..tsx
@@ -7,7 +7,7 @@ import { Dispatch } from "redux";
import { SubmissionError } from "redux-form";
import { RootState } from "../../store/store";
import { snackbarActions } from "../../store/snackbar/snackbar-actions";
-import { collectionUpdatorActions, updateCollection } from "../../store/collections/updator/collection-updator-action";
+import { collectionUpdatorActions, updateCollection } from "../../store/collections/updater/collection-updater-action";
import { dataExplorerActions } from "../../store/data-explorer/data-explorer-action";
import { PROJECT_PANEL_ID } from "../../views/project-panel/project-panel";
import { DialogCollectionUpdate } from "../dialog-update/dialog-collection-update";
@@ -18,7 +18,7 @@ const mapStateToProps = (state: RootState) => ({
const mapDispatchToProps = (dispatch: Dispatch) => ({
handleClose: () => {
- dispatch(collectionUpdatorActions.CLOSE_COLLECTION_UPDATOR());
+ dispatch(collectionUpdatorActions.CLOSE_COLLECTION_UPDATER());
},
onSubmit: (data: { name: string, description: string }) => {
return dispatch<any>(editCollection(data))
@@ -41,4 +41,4 @@ const editCollection = (data: { name: string, description: string }) =>
});
};
-export const UpdateCollectionDialog = connect(mapStateToProps, mapDispatchToProps)(DialogCollectionUpdate);
\ No newline at end of file
+export const UpdateCollectionDialog = connect(mapStateToProps, mapDispatchToProps)(DialogCollectionUpdate);
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list