Merge branch 'master' into remember-sort

Conflicts: .eslintignore .gitignore
2026-08-18 12:30:39 +08:00 · 2017-09-08 17:56:18 +07:00
parent c8d1da5715 5e295fc337
commit 0cfd8afce7
45 changed files with 592 additions and 240 deletions
@@ -128,18 +128,18 @@ const checkInstallRequest = () => ({type: actions.CHECK_INSTALL_REQUEST});
 const checkInstallSuccess = (installed) => ({type: actions.CHECK_INSTALL_SUCCESS, installed});
 const checkInstallFailure = (error) => ({type: actions.CHECK_INSTALL_FAILURE, error});

-export const checkInstall = (next) => (dispatch, _, {rest}) => {
+export const checkInstall = (next) => async (dispatch, _, {rest}) => {
  dispatch(checkInstallRequest());
-  rest('/setup')
-    .then(({installed}) => {
-      dispatch(checkInstallSuccess(installed));
-      if (installed) {
-        next();
-      }
-    })
-    .catch((error) => {
-      console.error(error);
-      const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString();
-      dispatch(checkInstallFailure(errorMessage));
-    });
+
+  try {
+    const {installed} = await rest('/setup');
+    dispatch(checkInstallSuccess(installed));
+    if (installed) {
+      next();
+    }
+  } catch (error) {
+    console.error(error);
+    const errorMessage = error.translation_key ? t(`error.${error.translation_key}`) : error.toString();
+    dispatch(checkInstallFailure(errorMessage));
+  }
 };
@@ -28,16 +28,26 @@ export default class UserDetail extends React.Component {
    bulkReject: PropTypes.func.isRequired,
  }

-  rejectThenReload = (info) => {
-    this.props.rejectComment(info).then(() => {
+  rejectThenReload = async (info) => {
+    try {
+      await this.props.rejectComment(info);
      this.props.data.refetch();
-    });
+    } catch (err) {
+
+      // TODO: handle error.
+      console.error(err);
+    }
  }

-  acceptThenReload = (info) => {
-    this.props.acceptComment(info).then(() => {
+  acceptThenReload = async (info) => {
+    try {
+      await this.props.acceptComment(info);
      this.props.data.refetch();
-    });
+    } catch (err) {
+
+      // TODO: handle error.
+      console.error(err);
+    }
  }

  showAll = () => {
@@ -133,7 +143,7 @@ export default class UserDetail extends React.Component {
          <Slot
            fill="userProfile"
            data={this.props.data}
-            queryData={root, user}
+            queryData={{root, user}}
          />

          <hr/>
@@ -36,14 +36,19 @@ class UserDetailContainer extends React.Component {
  isLoadingMore = false;

  // status can be 'ACCEPTED' or 'REJECTED'
-  bulkSetCommentStatus = (status) => {
+  bulkSetCommentStatus = async (status) => {
    const changes = this.props.selectedCommentIds.map((commentId) => {
      return this.props.setCommentStatus({commentId, status});
    });

-    Promise.all(changes).then(() => {
+    try {
+      await Promise.all(changes);
      this.props.clearUserDetailSelections(); // un-select everything
-    });
+    } catch (err) {
+
+      // TODO: handle error.
+      console.error(err);
+    }
  }

  bulkReject = () => {
@@ -85,7 +85,7 @@ class User extends React.Component {
                <span className={styles.flaggedByLabel}>
                  {t('community.flags')}({ user.actions.length })
                </span>:
-                  { user.action_summaries.map(
+                { user.action_summaries.map(
                  (action, i) => {
                    return <span className={styles.flaggedBy} key={i}>
                      {shortReasons[action.reason]} ({action.count})
@@ -48,11 +48,15 @@ class RejectUsernameDialog extends Component  {

    const cancel = this.props.handleClose;
    const next = () => this.setState({stage: stage + 1});
-    const suspend = () => {
-      rejectUsername({id: user.user.id, message: this.state.email})
-        .then(() => {
-          this.props.handleClose();
-        });
+    const suspend = async () => {
+      try {
+        await rejectUsername({id: user.user.id, message: this.state.email});
+        this.props.handleClose();
+      } catch (err) {
+
+        // TODO: handle error.
+        console.error(err);
+      }
    };

    const suspendModalActions = [
@@ -50,17 +50,22 @@ export default class Stories extends Component {
    return `${d.getMonth() + 1}/${d.getDate()}/${d.getFullYear()}`;
  }

-  onStatusClick = (closeStream, id, statusMenuOpen) => () => {
+  onStatusClick = (closeStream, id, statusMenuOpen) => async () => {
    if (statusMenuOpen) {
      this.setState((prev) => {
        prev.statusMenus[id] = false;
        return prev;
      });
-      this.props.updateAssetState(id, closeStream ? Date.now() : null)
-        .then(() => {
-          const {search, sort, filter, page} = this.state;
-          this.props.fetchAssets(page, limit, search, sort, filter);
-        });
+
+      try {
+        await this.props.updateAssetState(id, closeStream ? Date.now() : null);
+        const {search, sort, filter, page} = this.state;
+        this.props.fetchAssets(page, limit, search, sort, filter);
+      } catch (err) {
+
+        // TODO: handle error.
+        console.error(err);
+      }
    } else {
      this.setState((prev) => {
        prev.statusMenus[id] = true;
@@ -15,8 +15,8 @@ class StreamTabPanel extends React.Component {
        {loading
          ? <div className={styles.spinnerContainer}><Spinner /></div>
          : <TabContent activeTab={activeTab} sub={sub}>
-              {tabPanes}
-            </TabContent>
+            {tabPanes}
+          </TabContent>
        }
      </div>
    );
@@ -109,7 +109,7 @@ export default {
  },
  mutations: {
    PostComment: ({
-      variables: {comment: {asset_id, body, parent_id, tags = []}},
+      variables: {input: {asset_id, body, parent_id, tags = []}},
      state: {auth},
    }) => ({
      optimisticResponse: {
@@ -6,6 +6,7 @@ export default {
    'SetCommentStatusResponse',
    'SuspendUserResponse',
    'RejectUsernameResponse',
+    'CreateCommentResponse',
    'SetUserStatusResponse',
    'CreateFlagResponse',
    'EditCommentResponse',
@@ -192,17 +192,17 @@ export const withSetUserStatus = withMutation(

 export const withPostComment = withMutation(
  gql`
-    mutation PostComment($comment: CreateCommentInput!) {
-      createComment(comment: $comment) {
+    mutation PostComment($input: CreateCommentInput!) {
+      createComment(input: $input) {
        ...CreateCommentResponse
      }
    }
  `, {
    props: ({mutate}) => ({
-      postComment: (comment) => {
+      postComment: (input) => {
        return mutate({
          variables: {
-            comment
+            input
          },
        });
      }
@@ -109,7 +109,7 @@ export function mergeDocuments(documents) {
 export function getResponseErrors(mutationResult) {
  const result = [];
  Object.keys(mutationResult.data).forEach((response) => {
-    const errors = mutationResult.data[response].errors;
+    const errors = mutationResult.data[response] && mutationResult.data[response].errors;
    if (errors && errors.length) {
      result.push(...errors);
    }
@@ -54,7 +54,7 @@ class CommentBox extends React.Component {
      return;
    }

-    let comment = {
+    let input = {
      asset_id: assetId,
      parent_id: parentId,
      body: this.state.body,
@@ -62,10 +62,10 @@ class CommentBox extends React.Component {
    };

    // Execute preSubmit Hooks
-    this.state.hooks.preSubmit.forEach((hook) => hook());
+    this.state.hooks.preSubmit.forEach((hook) => hook(input));
    this.setState({loadingState: 'loading'});

-    postComment(comment, 'comments')
+    postComment(input, 'comments')
      .then(({data}) => {
        this.setState({loadingState: 'success', body: ''});
        const postedComment = data.createComment.comment;