Merge remote-tracking branch 'origin/master' into ZNTA-2379

zanata · Feb 8, 2018 · 14c14ab · 14c14ab
2 parents 9aaade6 + 6491d3a
commit 14c14ab
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 13 deletions.
diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -1,3 +1,9 @@
+## 4.4.3
+##### Bug Fixes
+ * [ZNTA-2371](https://zanata.atlassian.net/browse/ZNTA-2371) - Few version setting options are getting hide if we have more than 2 versions
+
+-----------------------
+
 ## 4.4.2
 ##### Bug Fixes
  * [ZNTA-2375](https://zanata.atlassian.net/browse/ZNTA-2375) - Single project is shown multiple times on explore page.

diff --git a/server/zanata-frontend/src/.storybook-editor/preview-head.html b/server/zanata-frontend/src/.storybook-editor/preview-head.html
@@ -0,0 +1,6 @@
+<script>
+  // TypeScript 2.2 requires 'exports' global variable in some cases
+  // https://github.com/Microsoft/TypeScript/issues/14351
+  // see also https://github.com/Microsoft/TypeScript/issues/14351#issuecomment-283218698
+  var exports = {};
+</script>
diff --git a/server/zanata-frontend/src/app/editor/api/index.js b/server/zanata-frontend/src/app/editor/api/index.js
@@ -14,6 +14,7 @@ import {
   STATUS_APPROVED
 } from '../utils/status-util'
 import { apiUrl, serverUrl } from '../../config'
+import { stableStringify } from 'faster-stable-stringify'
 
 export const dashboardUrl = serverUrl + '/dashboard'
 
@@ -117,7 +118,7 @@ export function savePhrase ({ id, revision, plural },
       'Content-Type': 'application/json'
     },
     mode: 'cors',
-    body: JSON.stringify({
+    body: stableStringify({
       id,
       revision,
       plural,

diff --git a/server/zanata-frontend/src/app/editor/components/ActivityFeedItem/ActivityFeedItem.story.js b/server/zanata-frontend/src/app/editor/components/ActivityFeedItem/ActivityFeedItem.story.js
@@ -20,9 +20,9 @@
  */
 
 import React from 'react'
-import {storiesOf} from '@storybook/react'
+import { storiesOf } from '@storybook/react'
 import ActivityFeedItem from '.'
-import {MINOR, MAJOR, CRITICAL} from "./index";
+import { MINOR, MAJOR, CRITICAL } from "./index";
 
 /*
  * See .storybook/README.md for info on the component storybook.

diff --git a/server/zanata-frontend/src/app/editor/components/ActivityFeedItem/index.js b/server/zanata-frontend/src/app/editor/components/ActivityFeedItem/index.js
@@ -22,12 +22,12 @@
 import React from 'react'
 import { Component } from 'react'
 import * as PropTypes from 'prop-types'
-import {FormattedMessage} from 'react-intl'
-import Icon from '../../../components/Icon'
-import Link from '../../../components/Link'
+import { FormattedMessage } from 'react-intl'
+import { Icon } from '../../../components'
+import { Link } from '../../../components'
 import DateAndTimeDisplay from '../DateAndTimeDisplay'
-import {Well} from 'react-bootstrap'
-import {profileUrl} from '../../api'
+import { Well } from 'react-bootstrap'
+import { profileUrl } from '../../api'
 
 export const MINOR = 'Minor'
 export const MAJOR = 'Major'

diff --git a/server/zanata-frontend/src/app/editor/components/DateAndTimeDisplay/index.js b/server/zanata-frontend/src/app/editor/components/DateAndTimeDisplay/index.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import * as PropTypes from 'prop-types'
 import { FormattedDate, FormattedTime } from 'react-intl'
-import Icon from '../../../components/Icon'
+import { Icon } from '../../../components'
 
 /**
  * Display a date and time with an icon.

diff --git a/...er/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.story.js b/...er/zanata-frontend/src/app/editor/components/EditorSearchInput/EditorSearchInput.story.js
@@ -1,7 +1,6 @@
 import React from 'react'
 import * as PropTypes from 'prop-types'
-import { storiesOf } from '@storybook/react'
-import { action } from '@storybook/addon-actions'
+import { storiesOf, action } from '@storybook/react'
 import { EditorSearchInput as RealEditorSearchInput } from '.'
 
 // Simple wrapper component to handle text updates for the story

diff --git a/...frontend/src/app/editor/components/RejectTranslationModal/RejectTranslationModal.story.js b/...frontend/src/app/editor/components/RejectTranslationModal/RejectTranslationModal.story.js
@@ -1,8 +1,8 @@
 import React from 'react'
-import { storiesOf, action } from '@storybook/react'
+import { storiesOf } from '@storybook/react'
 import RejectTranslationModal from '.'
 import Lorem from 'react-lorem-component'
-import { MINOR, MAJOR, CRITICAL } from './index.js'
+import { MINOR, MAJOR, CRITICAL } from './index'
 
 /*
  * TODO add stories showing the range of states

diff --git a/server/zanata-frontend/src/package.json b/server/zanata-frontend/src/package.json
@@ -148,6 +148,7 @@
     "combokeys": "2.4.6",
     "defined": "1.0.0",
     "enzyme": "2.9.1",
+    "faster-stable-stringify": "1.0.0",
     "file-saver": "1.3.3",
     "fs-extra": "3.0.1",
     "grommet": "^1.10.1",

diff --git a/server/zanata-frontend/src/yarn.lock b/server/zanata-frontend/src/yarn.lock
@@ -4034,6 +4034,10 @@ fast-memoize@^2.2.7:
   version "2.2.8"
   resolved "https://registry.yarnpkg.com/fast-memoize/-/fast-memoize-2.2.8.tgz#d7f899f31d037b12d9db4281912f9018575720b1"
 
+faster-stable-stringify@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/faster-stable-stringify/-/faster-stable-stringify-1.0.0.tgz#5dad92bffcadff8405a42b0965b033fe957d919c"
+
 fastparse@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"