actions cleanup

newxiaofeng · May 5, 2016 · 8ba501e · 8ba501e
1 parent b64c1a6
commit 8ba501e
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 244 deletions.
diff --git a/lib/shared/actions/draft.js b/lib/shared/actions/draft.js
@@ -1,7 +1,4 @@
-import actionTypes from 'actions';
-import request from 'helpers/request';
 import {mutation} from 'relate-js';
-import {fragmentToQL} from 'relax-fragments';
 
 export function saveDraft () {
   return (dispatch, getState) => {
@@ -36,21 +33,21 @@ export function saveDraft () {
   };
 }
 
-export function dropDraft (fragments, id) {
-  return (dispatch) => (
-    request({
-      dispatch,
-      type: actionTypes.dropDraft,
-      query: `
-        mutation dropDraft ($id: String!) {
-          dropDraft (id: $id) {
-            ${fragmentToQL(fragments.draft)}
-          }
+export function dropDraft (id) {
+  return mutation({
+    fragments: {
+      dropDraft: {
+        _id: 1
+      }
+    },
+    variables: {
+      dropDraft: {
+        id: {
+          type: 'ID!',
+          value: id
         }
-      `,
-      variables: {
-        id
       }
-    })
-  );
+    },
+    type: 'REMOVE'
+  });
 }
diff --git a/lib/shared/actions/elements.js b/lib/shared/actions/elements.js
diff --git a/lib/shared/actions/graphql.js b/lib/shared/actions/graphql.js
diff --git a/lib/shared/actions/index.js b/lib/shared/actions/index.js
@@ -1,15 +1,14 @@
 export default {
-  // Session
-  authenticate: 'AUTHENTICATE',
   // Admin menu
   openAdminMenu: 'OPEN_ADMIN_MENU',
   closeAdminMenu: 'CLOSE_ADMIN_MENU',
-  // Colors
-  updateColor: 'UPDATE_COLOR',
-  addColor: 'ADD_COLOR',
-  removeColor: 'REMOVE_COLOR',
   // Display
   changeDisplay: 'CHANGE_DISPLAY',
+  // DND
+  startDragging: 'START_DRAGGING',
+  onDroppable: 'ON_DROPPABLE',
+  outDroppable: 'OUT_DROPPABLE',
+  stopDragging: 'STOP_DRAGGING',
   // Fonts
   changeFontsPreviewText: 'CHANGE_FONTS_PREVIEW_TEXT',
   changeFontsPreviewLayout: 'CHANGE_FONTS_PREVIEW_LAYOUT',
@@ -25,14 +24,9 @@ export default {
   uploadingMedia: 'UPLOADING_MEDIA',
   mediaUploadSuccess: 'UPLOAD_MEDIA_SUCCESS',
   mediaUploadError: 'UPLOAD_MEDIA_ERROR',
-  addMedia: 'ADD_MEDIA',
-  removeMedia: 'REMOVE_MEDIA',
-  removeMediaItem: 'REMOVE_MEDIA_ITEM',
   // Menu
-  addMenu: 'ADD_MENU',
   addMenuItem: 'ADD_MENU_ITEM',
   moveMenuItem: 'MOVE_MENU_ITEM',
-  removeMenu: 'REMOVE_MENU',
   // Page
   getPage: 'GET_PAGE',
   updatePage: 'UPDATE_PAGE',
@@ -42,9 +36,6 @@ export default {
   validatePageSlug: 'VALIDATE_PAGE_SLUG',
   restorePage: 'RESTORE_PAGE',
   savePageFromDraft: 'SAVE_PAGE_FROM_DRAFT',
-  // Pages
-  removePage: 'REMOVE_PAGE',
-  duplicatePage: 'DUPLICATE_PAGE',
   // Schema
   changeSchemaType: 'CHANGE_SCHEMA_TYPE',
   changeSchemaTitle: 'CHANGE_SCHEMA_TITLE',
@@ -73,14 +64,6 @@ export default {
   // Settings
   changeSettingValue: 'CHANGE_SETTING_VALUE',
   saveSettings: 'SAVE_SETTINGS',
-  // Users
-  removeUser: 'REMOVE_USER',
-  addUser: 'ADD_USER',
-  // DND
-  startDragging: 'START_DRAGGING',
-  onDroppable: 'ON_DROPPABLE',
-  outDroppable: 'OUT_DROPPABLE',
-  stopDragging: 'STOP_DRAGGING',
   // Page builder
   pbToggleEditing: 'PB_TOGGLE_EDITING',
   pbSetMenuOpened: 'PB_SET_MENU_OPENED',
@@ -102,18 +85,7 @@ export default {
   pbCloseLinkDataMode: 'PB_CLOSE_LINK_DATA_MODE',
   pbLinkFormDataMode: 'PB_LINK_FORM_DATA_MODE',
   pbCloseLinkFormDataMode: 'PB_CLOSE_LINK_FORM_DATA_MODE',
-  // Symbols
   makeElementSymbol: 'MAKE_ELEMENT_SYMBOL',
-  getSymbol: 'GET_SYMBOL',
-  // Elements
-  getElementData: 'GET_ELEMENT_DATA',
-  // Revisions
-  getRevisions: 'GET_REVISIONS',
-  // Draft
-  saveDraft: 'SAVE_DRAFT',
-  dropDraft: 'DROP_DRAFT',
-  // Tabs
-  removeTab: 'REMOVE_TAB',
   // styles
   saveStyle: 'SAVE_STYLE',
   updateStyle: 'UPDATE_STYLE',

diff --git a/lib/shared/actions/media.js b/lib/shared/actions/media.js
@@ -1,7 +1,5 @@
 import actionTypes from 'actions';
-import request from 'helpers/request';
 import {mutation} from 'relate-js';
-import {fragmentToQL} from 'relax-fragments';
 
 export function changeMediaDisplay (display) {
   return {
@@ -10,68 +8,6 @@ export function changeMediaDisplay (display) {
   };
 }
 
-export function getMediaItem (fragments, id) {
-  return (dispatch) => (
-    request({
-      dispatch,
-      type: actionTypes.getMediaItem,
-      query: `
-        query mediaItem ($id: ID!) {
-          mediaItem (id: $id) {
-            ${fragmentToQL(fragments.media)}
-          }
-        }
-      `,
-      variables: {
-        id
-      }
-    })
-  );
-}
-
-export function uploadMedia (fragments, file) {
-  const data = {
-    file
-  };
-
-  return (dispatch) => (
-    request({
-      dispatch,
-      type: actionTypes.addMedia,
-      query: `
-        mutation addMedia ($data: MediaInput!) {
-          addMedia (data: $data) {
-            ${fragmentToQL(fragments.media)}
-          }
-        }
-      `,
-      files: [file],
-      variables: {
-        data
-      }
-    })
-  );
-}
-
-export function addingMedia (fileInfo) {
-  return {
-    type: actionTypes.addingMedia,
-    fileInfo
-  };
-}
-
-export function addMedia (fragments, file, fileInfo) {
-  return {
-    types: [
-      'ADD_MEDIA_START',
-      'ADD_MEDIA_SUCCESS',
-      'ADD_MEDIA_ERROR'
-    ],
-    payload: [addingMedia.bind(null, fileInfo), uploadMedia.bind(null, fragments, file)],
-    sequence: true
-  };
-}
-
 const uploadsAtTime = 3;
 let uploadsID = 0;
 let uploadingNumber = 0;

diff --git a/lib/shared/actions/revisions.js b/lib/shared/actions/revisions.js
diff --git a/lib/shared/actions/session.js b/lib/shared/actions/session.js
diff --git a/lib/shared/actions/symbols.js b/lib/shared/actions/symbols.js
diff --git a/lib/shared/elements/dynamic-list/container.jsx b/lib/shared/elements/dynamic-list/container.jsx
@@ -1,9 +1,6 @@
-import * as elementsActions from 'actions/elements';
-
 import utils from 'helpers/utils';
 import React, {PropTypes} from 'react';
 import {connect} from 'react-redux';
-import {bindActionCreators} from 'redux';
 import {buildQueryAndVariables} from 'relax-fragments';
 
 import settings from './settings';
@@ -16,8 +13,7 @@ import List from './list';
     elements: state.elements,
     linkingData: state.pageBuilder.linkingData,
     linkingDataElementId: state.pageBuilder.linkingDataElementId
-  }),
-  (dispatch) => bindActionCreators(elementsActions, dispatch)
+  })
 )
 export default class DynamicListContainer extends Component {
   static fragments = {

diff --git a/lib/shared/elements/symbol/container.jsx b/lib/shared/elements/symbol/container.jsx
@@ -1,8 +1,5 @@
-import * as symbolsActions from 'actions/symbols';
-
 import React, {PropTypes} from 'react';
 import {connect} from 'react-redux';
-import {bindActionCreators} from 'redux';
 
 import settings from './settings';
 import Component from '../component';
@@ -11,8 +8,7 @@ import Element from '../element';
 @connect(
   (state) => ({
     symbols: state.symbols
-  }),
-  (dispatch) => bindActionCreators(symbolsActions, dispatch)
+  })
 )
 export default class DynamicListContainer extends Component {
   static fragments = {

diff --git a/lib/shared/screens/admin/screens/menus/screens/menu/components/menu-builder/menu/index.js b/lib/shared/screens/admin/screens/menus/screens/menu/components/menu-builder/menu/index.js
@@ -18,12 +18,12 @@ import Menu from './menu';
     fragments: Menu.fragments,
     variablesTypes: {
       menu: {
-        _id: 'ID!'
+        id: 'ID!'
       }
     },
     initialVariables: {
       menu: {
-        _id: props.menuId
+        id: props.menuId
       }
     }
   })
@@ -37,7 +37,7 @@ export default class MenuContainer extends Component {
     if (this.props.menuId !== nextProps.menuId) {
       this.props.relate.setVariables({
         menu: {
-          _id: nextProps.menuId
+          id: nextProps.menuId
         }
       });
     }

diff --git a/lib/shared/screens/admin/shared/components/input-options/filters/index.js b/lib/shared/screens/admin/shared/components/input-options/filters/index.js
@@ -1,12 +1,9 @@
-import * as elementsActions from 'actions/elements';
-
 import cloneDeep from 'lodash.clonedeep';
 import forEach from 'lodash.foreach';
 import staticProperties from 'helpers/schema-static-properties';
 import Component from 'components/component';
 import React, {PropTypes} from 'react';
 import {connect} from 'react-redux';
-import {bindActionCreators} from 'redux';
 import {buildQueryAndVariables} from 'relax-fragments';
 
 import Filters from './filters';
@@ -16,8 +13,7 @@ import Filters from './filters';
     elements: state.elements,
     selectedId: state.pageBuilder.selectedId,
     selectedElement: state.pageBuilder.selectedElement
-  }),
-  (dispatch) => bindActionCreators(elementsActions, dispatch)
+  })
 )
 export default class FiltersContainer extends Component {
   static fragments = Filters.fragments;