From a3755b75051439fa988f6036a309c6d3cc8e2252 Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Wed, 24 May 2017 22:24:01 +0700 Subject: [PATCH] Use unique names --- client/coral-admin/src/graphql/mutations/index.js | 10 +++++----- .../src/routes/Community/containers/Community.js | 2 +- .../src/routes/Dashboard/containers/Dashboard.js | 8 ++++---- .../src/routes/Moderation/containers/Comment.js | 4 ++-- .../src/routes/Moderation/containers/Moderation.js | 6 +++--- .../src/routes/Moderation/containers/UserDetail.js | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/client/coral-admin/src/graphql/mutations/index.js b/client/coral-admin/src/graphql/mutations/index.js index 3aef68ebc..5c530d159 100644 --- a/client/coral-admin/src/graphql/mutations/index.js +++ b/client/coral-admin/src/graphql/mutations/index.js @@ -12,7 +12,7 @@ export const banUser = graphql(SET_USER_STATUS, { userId, status: 'BANNED' }, - refetchQueries: ['Users'] + refetchQueries: ['Admin_Community'] }); }}), }); @@ -25,7 +25,7 @@ export const setUserStatus = graphql(SET_USER_STATUS, { userId, status: 'APPROVED' }, - refetchQueries: ['Users'] + refetchQueries: ['Admin_Community'] }); } }) @@ -50,7 +50,7 @@ export const rejectUsername = graphql(REJECT_USERNAME, { variables: { input, }, - refetchQueries: ['Users'] + refetchQueries: ['Admin_Community'] }); } }) @@ -66,7 +66,7 @@ export const setCommentStatus = graphql(SET_COMMENT_STATUS, { status: 'ACCEPTED' }, updateQueries: { - ModQueue: (oldData) => { + Admin_Moderation: (oldData) => { const comment = views.reduce((comment, view) => { return comment ? comment : oldData[view].find((c) => c.id === commentId); }, null); @@ -111,7 +111,7 @@ export const setCommentStatus = graphql(SET_COMMENT_STATUS, { status: 'REJECTED' }, updateQueries: { - ModQueue: (oldData) => { + Admin_Moderation: (oldData) => { const comment = views.reduce((comment, view) => { return comment ? comment : oldData[view].find((c) => c.id === commentId); }, null); diff --git a/client/coral-admin/src/routes/Community/containers/Community.js b/client/coral-admin/src/routes/Community/containers/Community.js index 9ad808716..f9468c0aa 100644 --- a/client/coral-admin/src/routes/Community/containers/Community.js +++ b/client/coral-admin/src/routes/Community/containers/Community.js @@ -40,7 +40,7 @@ class CommunityContainer extends Component { } export const withCommunityQuery = withQuery(gql` - query Users($action_type: ACTION_TYPE) { + query Admin_Community($action_type: ACTION_TYPE) { users(query:{action_type: $action_type}){ id username diff --git a/client/coral-admin/src/routes/Dashboard/containers/Dashboard.js b/client/coral-admin/src/routes/Dashboard/containers/Dashboard.js index 4f412efef..60925e09e 100644 --- a/client/coral-admin/src/routes/Dashboard/containers/Dashboard.js +++ b/client/coral-admin/src/routes/Dashboard/containers/Dashboard.js @@ -21,15 +21,15 @@ class DashboardContainer extends React.Component { } export const witDashboardQuery = withQuery(gql` - query CoralAdmin_Metrics($from: Date!, $to: Date!) { + query Admin_Dashboard($from: Date!, $to: Date!) { assetsByFlag: assetMetrics(from: $from, to: $to, sort: FLAG) { - ...CoralAdmin_Metrics + ...Admin_Metrics } assetsByActivity: assetMetrics(from: $from, to: $to, sort: ACTIVITY) { - ...CoralAdmin_Metrics + ...Admin_Metrics } } - fragment CoralAdmin_Metrics on Asset { + fragment Admin_Metrics on Asset { id title url diff --git a/client/coral-admin/src/routes/Moderation/containers/Comment.js b/client/coral-admin/src/routes/Moderation/containers/Comment.js index d85b90253..a0a209865 100644 --- a/client/coral-admin/src/routes/Moderation/containers/Comment.js +++ b/client/coral-admin/src/routes/Moderation/containers/Comment.js @@ -12,14 +12,14 @@ const pluginFragments = getSlotsFragments([ export default withFragments({ root: gql` - fragment Comment_root on RootQuery { + fragment Admin_Moderation_Comment_root on RootQuery { __typename ${pluginFragments.spreads('root')} } ${pluginFragments.definitions('root')} `, comment: gql` - fragment Comment_comment on Comment { + fragment Admin_Moderation_Comment_comment on Comment { id body created_at diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js index e0e8f7694..ff0223ff1 100644 --- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js +++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js @@ -95,7 +95,7 @@ class ModerationContainer extends Component { } const LOAD_MORE_QUERY = gql` - query LoadMoreModQueue($limit: Int = 10, $cursor: Date, $sort: SORT_ORDER, $asset_id: ID, $statuses:[COMMENT_STATUS!], $action_type: ACTION_TYPE) { + query Admin_Moderation_LoadMore($limit: Int = 10, $cursor: Date, $sort: SORT_ORDER, $asset_id: ID, $statuses:[COMMENT_STATUS!], $action_type: ACTION_TYPE) { comments(query: {limit: $limit, cursor: $cursor, asset_id: $asset_id, statuses: $statuses, sort: $sort, action_type: $action_type}) { ...${getDefinitionName(Comment.fragments.comment)} action_summaries { @@ -110,7 +110,7 @@ const LOAD_MORE_QUERY = gql` `; const withModQueueQuery = withQuery(gql` - query ModQueue($asset_id: ID, $sort: SORT_ORDER) { + query Admin_Moderation($asset_id: ID, $sort: SORT_ORDER) { all: comments(query: { statuses: [NONE, PREMOD, ACCEPTED, REJECTED], asset_id: $asset_id, @@ -189,7 +189,7 @@ const withModQueueQuery = withQuery(gql` }); const withQueueCountPolling = withQuery(gql` - query Counts($asset_id: ID) { + query Admin_Moderation_CountPoll($asset_id: ID) { allCount: commentCount(query: { asset_id: $asset_id }) diff --git a/client/coral-admin/src/routes/Moderation/containers/UserDetail.js b/client/coral-admin/src/routes/Moderation/containers/UserDetail.js index acc129074..24b17e928 100644 --- a/client/coral-admin/src/routes/Moderation/containers/UserDetail.js +++ b/client/coral-admin/src/routes/Moderation/containers/UserDetail.js @@ -24,7 +24,7 @@ class UserDetailContainer extends React.Component { } export const withUserDetailQuery = withQuery(gql` - query UserDetail($author_id: ID!) { + query Admin_UserDetail($author_id: ID!) { user(id: $author_id) { id username