Merge branch 'xal_proxy' into staging

Author: nataliauvarova

src/components/BanModal/index.js

@@ -20,6 +20,9 @@ export const queryUsers = gql`
       intl_name
       email
       is_active
+      additional_metadata {
+        allowed_sync
+      }
     }
   }
 `;
@@ -32,11 +35,20 @@ const activateDeactivateUserMutation = gql`
   }
 `;
 
+const allowSyncDictsMutation = gql`
+  mutation allowSyncDicts($userId: Int!, $allowedSync: Boolean!) {
+    allow_sync_dicts(user_id: $userId, allowed_sync: $allowedSync) {
+      triumph
+    }
+  }
+`;
+
 class BanModal extends React.Component {
   constructor(props) {
     super(props);
     this.state = { selected_user: null };
     this.handleActivateDeactivate = this.handleActivateDeactivate.bind(this);
+    this.handleAllowSync = this.handleAllowSync.bind(this);
   }
 
   handleActivateDeactivate() {
@@ -71,6 +83,39 @@ class BanModal extends React.Component {
       );
   }
 
+  handleAllowSync() {
+    const user = this.state.selected_user;
+    if (user === null) {
+      return;
+    }
+
+    const allowed_sync = user.additional_metadata.allowed_sync;
+    const success_str = allowed_sync ? "Successfully denied synchronization" : "Successfully allowed synchronization";
+    const error_str = allowed_sync ? "Failed to deny synchronization" : "Failed to allow synchronization";
+
+    const user_str = `'${user.login}' (${user.name}${user.intl_name !== user.login ? `, ${user.intl_name}` : ""})`;
+
+    const { refetch } = this.props.data;
+
+    this.props
+      .allowSyncDicts({
+        variables: {
+          userId: user.id,
+          allowedSync: !allowed_sync
+        }
+      })
+      .then(
+        () => {
+          window.logger.suc(`${this.context(success_str)} ${user_str}.`);
+          this.props.closeModal();
+          refetch();
+        },
+        () => {
+          window.logger.err(`${this.context(error_str)} ${user_str}!`);
+        }
+      );
+  }
+
   render() {
     const { visible, data } = this.props;
     if (!visible || data.loading || data.error) {
@@ -110,6 +155,18 @@ class BanModal extends React.Component {
             </div>
           </Modal.Content>
           <Modal.Actions>
+            <Button
+              disabled={this.state.selected_user === null}
+              content={
+                this.state.selected_user === null
+                  ? this.context("Allow sync / Deny sync")
+                  : this.state.selected_user.additional_metadata.allowed_sync
+                  ? this.context("Deny sync")
+                  : this.context("Allow sync")
+              }
+              onClick={this.handleAllowSync}
+              className="lingvo-button-violet"
+            />
             <Button
               disabled={this.state.selected_user === null}
               content={
@@ -151,5 +208,6 @@ export default compose(
     dispatch => bindActionCreators({ closeModal }, dispatch)
   ),
   graphql(queryUsers, { skip: props => !props.visible }),
-  graphql(activateDeactivateUserMutation, { name: "activateDeactivateUser" })
+  graphql(activateDeactivateUserMutation, { name: "activateDeactivateUser" }),
+  graphql(allowSyncDictsMutation, { name: "allowSyncDicts" })
 )(BanModal);

src/components/PerspectiveView/index.js

@@ -35,6 +35,27 @@ const ModalContentWrapper = styled("div")`
   min-height: 15vh;
 `;
 
+export const queryListChanges = gql `
+  query listChanges(
+    $proxy: String,
+    $stamps: ObjectVal!
+  ) {
+    list_changes(
+      proxy: $proxy,
+      stamps: $stamps
+    ) {
+      language
+      dictionary
+      perspective {
+        lexical_entries {
+          entities
+        }
+      }
+    }
+
+  }
+`;
+
 export const queryPerspective = gql`
   query queryPerspective1($id: LingvodocID!) {
     perspective(id: $id) {
@@ -558,6 +579,30 @@ class P extends React.Component {
       });
     };
 
+    const doSync = () => {
+      // 1. Get changes from Core,
+      // 2. Get changes from Satellite,
+      // 3. Display changes,
+      // 4. Apply/Deny changes
+
+      const groupList = [selectedEntries];
+
+      mergeLexicalEntries({
+        variables: { groupList },
+
+        refetchQueries: [
+          {
+            query: queryLexicalEntries,
+            variables: query_args
+          }
+        ]
+
+      }).then(() => {
+        resetSelection();
+        this.setState({ entriesTotal: entriesTotal - selectedEntries.length + 1 });
+      });
+    };
+
     const mergeEntries = () => {
       const groupList = [selectedEntries];
 
@@ -607,7 +652,8 @@ class P extends React.Component {
       );
     }
     /* eslint-enable no-shadow */
-    const isAuthenticated = user && user.user.id;
+    const isAuthenticated = user?.user?.id;
+    const allowedSync = user?.user?.allowed_sync;
 
     const isTableLanguages = JSON.stringify(id) === JSON.stringify([4839, 2]);
 
@@ -713,6 +759,14 @@ class P extends React.Component {
           (mode === "publish" && isAuthenticated) ||
           (mode === "contributions" && isAuthenticated)) && (
             <div className="lingvo-perspective-buttons">
+              {mode === "edit" && allowedSync && (
+                <Button
+                  icon={<i className="lingvo-icon lingvo-icon_refresh" />}
+                  content={this.context("Synchronize")}
+                  onClick={doSync}
+                  className="lingvo-button-green lingvo-perspective-button"
+                />
+              )}
               {mode === "edit" && (
                 <Button
                   icon={<i className="lingvo-icon lingvo-icon_add" />}
@@ -1219,5 +1273,6 @@ export default compose(
   graphql(queryPerspective, {
     options: { notifyOnNetworkStatusChange: true }
   }),
+  graphql(queryListChanges, { name: "listChanges" }),
   branch(({ data: { loading } }) => loading, renderComponent(Placeholder))
 )(PerspectiveViewWrapper);