Merge branch 'master' of https://github.com/zanata/zanata-platform

Jenkinsfile

@@ -164,7 +164,6 @@ timestamps {
             -Dbuildtime.output.log \
             clean install jxr:aggregate \
             --batch-mode \
-            --settings .travis-settings.xml \
             --update-snapshots \
             -DstaticAnalysis \
             $gwtOpts \
@@ -380,7 +379,6 @@ void integrationTests(String appserver) {
             -Dbuildtime.output.log \
             install \
             --batch-mode \
-            --settings .travis-settings.xml \
             --update-snapshots \
             -Dappserver=$appserver \
             -Dwebdriver.display=${env.DISPLAY} \

server/zanata-frontend/src/frontend/.storybook-editor/config.js

@@ -40,7 +40,7 @@ addDecorator((story) => (
 ))
 
 function loadStories () {
-  require('../app/editor/components/stories.js')
+  require('../app/editor/components/components.story.js')
 }
 
 configure(loadStories, module)

server/zanata-frontend/src/frontend/.storybook-frontend/config.js

@@ -44,7 +44,7 @@ addDecorator((story) => (
 ))
 
 function loadStories () {
-  require('../app/components/stories.js')
+  require('../app/components/components.story.js')
 }
 
 configure(loadStories, module)

server/zanata-frontend/src/frontend/app/components/components.story.js

@@ -0,0 +1,30 @@
+/**
+ * Collection of component stories for React Storybook.
+ *
+ * See .storybook-frontend for main config
+ */
+
+require('./foundation.story.js')
+
+require('./Alert/Alert.story.js')
+require('./Badge/Badge.story.js')
+require('./Breadcrumbs/Breadcrumbs.story.js')
+require('./Button/Button.story.js')
+require('./Dropdown/Dropdown.story.js')
+require('./EditableText/EditableText.story.js')
+require('./Form/Form.story.js')
+require('./Icon/Icon.story.js')
+require('./Label/Label.story.js')
+require('./Link/Link.story.js')
+require('./List/List.story.js')
+require('./LoaderText/LoaderText.story.js')
+require('./Modal/Modal.story.js')
+require('./Notification/Notification.story.js')
+require('./Pagination/Pagination.story.js')
+require('./Panel/Panel.story.js')
+require('./ProgressBar/ProgressBar.story.js')
+require('./Table/Table.story.js')
+require('./Tabs/Tabs.story.js')
+require('./TextInput/TextInput.story.js')
+require('./Tooltip/Tooltip.story.js')
+require('./Well/Well.story.js')

server/zanata-frontend/src/frontend/app/components/Foundation/story.js → server/zanata-frontend/src/frontend/app/components/foundation.story.js

@@ -1,3 +1,7 @@
+/**
+ * Foundational stories, not demonstrating any component in particular.
+ */
+
 import React from 'react'
 import { storiesOf } from '@kadira/storybook'
 import { Grid, Row, Col } from 'react-bootstrap'

server/zanata-frontend/src/frontend/__tests__/components/ButtonTest.js → server/zanata-frontend/src/frontend/app/editor/components/Button/Button.test.js

@@ -4,7 +4,7 @@ import React from 'react'
 import ReactDOM from 'react-dom'
 import ReactDOMServer from 'react-dom/server'
 import TestUtils from 'react-addons-test-utils'
-import Button from '../../app/editor/components/Button'
+import Button from '.'
 
 describe('ButtonTest', () => {
   it('Button markup', () => {

server/zanata-frontend/src/frontend/__tests__/components/DashboardLinkTest.js → server/zanata-frontend/src/frontend/app/editor/components/DashboardLink/DashboardLink.test.js

@@ -2,7 +2,7 @@ jest.disableAutomock()
 
 import React from 'react'
 import ReactDOMServer from 'react-dom/server'
-import DashboardLink from '../../app/editor/components/DashboardLink'
+import DashboardLink from '.'
 
 describe('DashboardLinkTest', () => {
   it('DashboardLink markup', () => {

server/zanata-frontend/src/frontend/__tests__/components/DocsDropdownTest.js → server/zanata-frontend/src/frontend/app/editor/components/DocsDropdown/DocsDropdown.test.js

@@ -2,8 +2,8 @@ jest.disableAutomock()
 
 import React from 'react'
 import ReactDOMServer from 'react-dom/server'
-import DocsDropdown from '../../app/editor/components/DocsDropdown'
-import Dropdown from '../../app/editor/components/Dropdown'
+import DocsDropdown from '.'
+import Dropdown from '../Dropdown'
 import { Icon, Row } from 'zanata-ui'
 
 describe('DocsDropdownTest', () => {

server/zanata-frontend/src/frontend/app/editor/components/DocsDropdown.js → server/zanata-frontend/src/frontend/app/editor/components/DocsDropdown/index.js

@@ -1,4 +1,4 @@
-import Dropdown from './Dropdown'
+import Dropdown from '../Dropdown'
 import { Icon, Row } from 'zanata-ui'
 import React, { PropTypes } from 'react'
 

server/zanata-frontend/src/frontend/__tests__/components/DropdownTest.js → server/zanata-frontend/src/frontend/app/editor/components/Dropdown/Dropdown.test.js

@@ -3,7 +3,7 @@ jest.disableAutomock()
 import React from 'react'
 import ReactDOMServer from 'react-dom/server'
 import TestUtils from 'react-addons-test-utils'
-import Dropdown from '../../app/editor/components/Dropdown'
+import Dropdown from '.'
 
 describe('DropdownTest', () => {
   it('Dropdown markup (closed)', () => {

server/zanata-frontend/src/frontend/__tests__/editor/components/EditorSearchInputTest.js → server/zanata-frontend/src/frontend/app/editor/components/EditorSearchInput/EditorSearchInput.test.js

@@ -3,9 +3,9 @@ jest.disableAutomock()
 import React from 'react'
 import ReactDOMServer from 'react-dom/server'
 import TestUtils from 'react-addons-test-utils'
-import EditorSearchInput from '../../../app/editor/components/EditorSearchInput'
+import EditorSearchInput from '.'
 import { Icon, Row } from 'zanata-ui'
-import IconButton from '../../../app/editor/components/IconButton'
+import IconButton from '../IconButton'
 import { Panel, Button } from 'react-bootstrap'
 
 describe('EditorSearchInputTest', () => {

server/zanata-frontend/src/frontend/__tests__/components/IconButtonTest.js → server/zanata-frontend/src/frontend/app/editor/components/IconButton/IconButton.test.js

@@ -5,7 +5,7 @@ import ReactDOM from 'react-dom'
 import ReactDOMServer from 'react-dom/server'
 import TestUtils from 'react-addons-test-utils'
 import { Icon } from 'zanata-ui'
-import IconButton from '../../app/editor/components/IconButton'
+import IconButton from '.'
 
 describe('IconButtonTest', () => {
   it('IconButton markup', () => {

server/zanata-frontend/src/frontend/app/editor/components/IconButton.js → server/zanata-frontend/src/frontend/app/editor/components/IconButton/index.js

@@ -1,4 +1,4 @@
-import Button from './Button'
+import Button from '../Button'
 import { Icon } from 'zanata-ui'
 import React, { PropTypes } from 'react'
 

server/zanata-frontend/src/frontend/__tests__/components/IconButtonToggleTest.js → server/zanata-frontend/src/frontend/app/editor/components/IconButtonToggle/IconButtonToggle.test.js

@@ -2,8 +2,8 @@ jest.disableAutomock()
 
 import React from 'react'
 import ReactDOMServer from 'react-dom/server'
-import IconButton from '../../app/editor/components/IconButton'
-import IconButtonToggle from '../../app/editor/components/IconButtonToggle'
+import IconButton from '../IconButton'
+import IconButtonToggle from '.'
 
 describe('IconButtonToggleTest', () => {
   it('IconButtonToggle markup', () => {

server/zanata-frontend/src/frontend/app/editor/components/IconButtonToggle.js → server/zanata-frontend/src/frontend/app/editor/components/IconButtonToggle/index.js

@@ -20,7 +20,7 @@
  */
 
 import cx from 'classnames'
-import IconButton from './IconButton'
+import IconButton from '../IconButton'
 import React, { PropTypes } from 'react'
 
 /**

server/zanata-frontend/src/frontend/__tests__/components/LanguageDropdownTest.js → server/zanata-frontend/src/frontend/app/editor/components/LanguagesDropdown/LanguageDropdown.test.js

@@ -2,8 +2,8 @@ jest.disableAutomock()
 
 import React from 'react'
 import ReactDOMServer from 'react-dom/server'
-import LanguagesDropdown from '../../app/editor/components/LanguagesDropdown'
-import Dropdown from '../../app/editor/components/Dropdown'
+import LanguagesDropdown from '.'
+import Dropdown from '../Dropdown'
 import { Icon, Row } from 'zanata-ui'
 
 describe('LanguageDropdownTest', () => {

server/zanata-frontend/src/frontend/app/editor/components/LanguagesDropdown.js → server/zanata-frontend/src/frontend/app/editor/components/LanguagesDropdown/index.js

@@ -1,6 +1,6 @@
 import { values } from 'lodash'
-import { encode } from '../utils/doc-id-util'
-import Dropdown from './Dropdown'
+import { encode } from '../../utils/doc-id-util'
+import Dropdown from '../Dropdown'
 import { Icon, Row } from 'zanata-ui'
 import React, { PropTypes } from 'react'
 

server/zanata-frontend/src/frontend/__tests__/components/NoSuggestionPanelTest.js → server/zanata-frontend/src/frontend/app/editor/components/NoSuggestionsPanel/NoSuggestionsPanel.test.js

@@ -3,7 +3,7 @@ jest.disableAutomock()
 import React from 'react'
 import ReactDOMServer from 'react-dom/server'
 import { Icon }  from 'zanata-ui'
-import NoSuggestionsPanel from '../../app/editor/components/NoSuggestionsPanel'
+import NoSuggestionsPanel from '.'
 
 describe('NoSuggestionsPanelTest', () => {
   it('NoSuggestionsPanel markup', () => {

server/zanata-frontend/src/frontend/__tests__/components/PagerTest.js → server/zanata-frontend/src/frontend/app/editor/components/Pager/Pager.test.js

@@ -3,9 +3,9 @@ jest.disableAutomock()
 import React from 'react'
 import ReactDOMServer from 'react-dom/server'
 import TestUtils from 'react-addons-test-utils'
-import Pager from '../../app/editor/components/Pager'
+import Pager from '.'
 import { Icon } from 'zanata-ui'
-import mockGettextCatalog from '../mock/mockAngularGettext'
+import mockGettextCatalog from '../../../../__tests__/mock/mockAngularGettext'
 
 describe('PagerTest', () => {
   it('Pager markup', () => {

server/zanata-frontend/src/frontend/__tests__/components/ProgressBarTest.js → server/zanata-frontend/src/frontend/app/editor/components/ProgressBar/ProgressBar.test.js

@@ -2,7 +2,7 @@ jest.disableAutomock()
 
 import React from 'react'
 import ReactDOMServer from 'react-dom/server'
-import ProgressBar from '../../app/editor/components/ProgressBar'
+import ProgressBar from '.'
 
 describe('ProgressBarTest', () => {
   it('ProgressBar markup', () => {

server/zanata-frontend/src/frontend/__tests__/components/ProjectVersionLinkTest.js → server/zanata-frontend/src/frontend/app/editor/components/ProjectVersionLink/ProjectVersionLink.test.js

@@ -2,7 +2,7 @@ jest.disableAutomock()
 
 import React from 'react'
 import ReactDOMServer from 'react-dom/server'
-import ProjectVersionLink from '../../app/editor/components/ProjectVersionLink'
+import ProjectVersionLink from '.'
 
 describe('ProjectVersionLinkTest', () => {
   it('ProjectVersionLink markup', () => {

server/zanata-frontend/src/frontend/__tests__/components/SuggestionContentsTest.js → server/zanata-frontend/src/frontend/app/editor/components/SuggestionContents/SuggestionContents.test.js

@@ -2,8 +2,8 @@ jest.disableAutomock()
 
 import React from 'react'
 import ReactDOMServer from 'react-dom/server'
-import SuggestionContents from '../../app/editor/components/SuggestionContents'
-import TextDiff from '../../app/editor/components/TextDiff'
+import SuggestionContents from '.'
+import TextDiff from '../TextDiff'
 
 describe('SuggestionContentTest', () => {
   it('SuggestionContent markup (singular)', () => {

server/zanata-frontend/src/frontend/app/editor/components/SuggestionContents.js → server/zanata-frontend/src/frontend/app/editor/components/SuggestionContents/index.js

@@ -1,4 +1,4 @@
-import TextDiff from './TextDiff'
+import TextDiff from '../TextDiff'
 import React, { PropTypes } from 'react'
 import cx from 'classnames'
 

server/zanata-frontend/src/frontend/__tests__/components/SuggestionSourceDetailsTest.js → server/zanata-frontend/src/frontend/app/editor/components/SuggestionDetailsSummary/SuggestionDetailsSummary.test.js

@@ -3,7 +3,7 @@ jest.disableAutomock()
 import React from 'react'
 import ReactDOMServer from 'react-dom/server'
 import { Icon, Row } from 'zanata-ui'
-import SuggestionDetailsSummary from '../../app/editor/components/SuggestionDetailsSummary'
+import SuggestionDetailsSummary from '.'
 
 describe('SuggestionDetailsSummaryTest', () => {
   it('SuggestionDetailsSummary markup (imported)', () => {

server/zanata-frontend/src/frontend/__tests__/components/SuggestionMatchPercentTest.js → server/zanata-frontend/src/frontend/app/editor/components/SuggestionMatchPercent/SuggestionMatchPercent.test.js

@@ -2,7 +2,7 @@ jest.disableAutomock()
 
 import React from 'react'
 import ReactDOMServer from 'react-dom/server'
-import SuggestionMatchPercent from '../../app/editor/components/SuggestionMatchPercent'
+import SuggestionMatchPercent from '.'
 
 describe('SuggestionMatchPercentTest', () => {
   it('SuggestionMatchPercent markup (imported)', () => {

server/zanata-frontend/src/frontend/__tests__/components/SuggestionSourcesTest.js → server/zanata-frontend/src/frontend/app/editor/components/SuggestionSources/SuggestionSources.test.js

@@ -2,9 +2,9 @@ jest.disableAutomock()
 
 import React from 'react'
 import ReactDOMServer from 'react-dom/server'
-import SuggestionSources from '../../app/editor/components/SuggestionSources'
-import SuggestionContents from '../../app/editor/components/SuggestionContents'
-import SuggestionDetailsSummary from '../../app/editor/components/SuggestionDetailsSummary'
+import SuggestionSources from '../SuggestionSources'
+import SuggestionContents from '../SuggestionContents'
+import SuggestionDetailsSummary from '../SuggestionDetailsSummary'
 
 describe('SuggestionSourcesTest', () => {
   it('SuggestionSources markup', () => {

server/zanata-frontend/src/frontend/app/editor/components/SuggestionSources.js → server/zanata-frontend/src/frontend/app/editor/components/SuggestionSources/index.js

@@ -1,6 +1,6 @@
 import React, { PropTypes } from 'react'
-import SuggestionContents from './SuggestionContents'
-import SuggestionDetailsSummary from './SuggestionDetailsSummary'
+import SuggestionContents from '../SuggestionContents'
+import SuggestionDetailsSummary from '../SuggestionDetailsSummary'
 
 /**
  * Display all the source strings for a suggestion, with

server/zanata-frontend/src/frontend/__tests__/components/TextDiffTest.js → server/zanata-frontend/src/frontend/app/editor/components/TextDiff/TextDiff.test.js

@@ -2,7 +2,7 @@ jest.disableAutomock()
 
 import React from 'react'
 import ReactDOMServer from 'react-dom/server'
-import TextDiff from '../../app/editor/components/TextDiff'
+import TextDiff from '.'
 
 describe('TextDiffTest', () => {
   it('TextDiff markup', () => {

server/zanata-frontend/src/frontend/__tests__/components/ToggleSwitchTest.js → server/zanata-frontend/src/frontend/app/editor/components/ToggleSwitch/ToggleSwitch.test.js

@@ -3,7 +3,7 @@ jest.disableAutomock()
 import React from 'react'
 import ReactDOMServer from 'react-dom/server'
 import TestUtils from 'react-addons-test-utils'
-import ToggleSwitch from '../../app/editor/components/ToggleSwitch'
+import ToggleSwitch from '.'
 
 describe('ToggleSwitchTest', () => {
   it('ToggleSwitch markup', () => {

server/zanata-frontend/src/frontend/__tests__/components/TransUnitFilterTest.js → server/zanata-frontend/src/frontend/app/editor/components/TransUnitFilter/TransUnitFilter.test.js

@@ -3,10 +3,10 @@ jest.disableAutomock()
 import React from 'react'
 import ReactDOMServer from 'react-dom/server'
 import TestUtils from 'react-addons-test-utils'
-import TransUnitFilter from '../../app/editor/components/TransUnitFilter'
-import FilterToggle from '../../app/editor/components/FilterToggle'
+import TransUnitFilter from '.'
+import FilterToggle from '../FilterToggle'
 import { Icon, Row } from 'zanata-ui'
-import mockGettextCatalog from '../mock/mockAngularGettext'
+import mockGettextCatalog from '../../../../__tests__/mock/mockAngularGettext'
 
 describe('TransUnitFilterTest', () => {
   it('FilterToggle markup', () => {

server/zanata-frontend/src/frontend/app/editor/components/TransUnitFilter.js → server/zanata-frontend/src/frontend/app/editor/components/TransUnitFilter/index.js

@@ -1,12 +1,12 @@
-import FilterToggle from './FilterToggle'
+import FilterToggle from '../FilterToggle'
 import React, { PropTypes } from 'react'
 import {
   STATUS_UNTRANSLATED,
   STATUS_NEEDS_WORK,
   STATUS_TRANSLATED,
   STATUS_APPROVED,
   STATUS_REJECTED
-} from '../utils/status-util'
+} from '../../utils/status-util'
 
 /**
  * Panel with controls to filter the list of trans units

server/zanata-frontend/src/frontend/__tests__/components/TranslatingIndicatorTest.js → server/zanata-frontend/src/frontend/app/editor/components/TranslatingIndicator/TranslatingIndicator.test.js

@@ -2,7 +2,7 @@ jest.disableAutomock()
 
 import React from 'react'
 import ReactDOMServer from 'react-dom/server'
-import TranslatingIndicator from '../../app/editor/components/TranslatingIndicator'
+import TranslatingIndicator from '.'
 import { Icon, Row } from 'zanata-ui'
 
 describe('TranslatingIndicatorTest', () => {

server/zanata-frontend/src/frontend/__tests__/components/UiLanguageDropdownTest.js → server/zanata-frontend/src/frontend/app/editor/components/UiLanguageDropdown/UiLanguageDropdown.test.js

@@ -3,8 +3,8 @@ jest.disableAutomock()
 import React from 'react'
 import ReactDOMServer from 'react-dom/server'
 import TestUtils from 'react-addons-test-utils'
-import UiLanguageDropdown from '../../app/editor/components/UiLanguageDropdown'
-import Dropdown from '../../app/editor/components/Dropdown'
+import UiLanguageDropdown from '.'
+import Dropdown from '../Dropdown'
 
 describe('UiLanguageDropdownTest', () => {
   it('UiLanguageDropdown markup', () => {

server/zanata-frontend/src/frontend/app/editor/components/UiLanguageDropdown.js → server/zanata-frontend/src/frontend/app/editor/components/UiLanguageDropdown/index.js

@@ -1,5 +1,5 @@
 import { values } from 'lodash'
-import Dropdown from './Dropdown'
+import Dropdown from '../Dropdown'
 import React, { PropTypes } from 'react'
 
 /**

server/zanata-frontend/src/frontend/app/editor/components/components.story.js

@@ -0,0 +1,13 @@
+/**
+ * Collection of component stories for React Storybook.
+ *
+ * See .storybook-editor for main config
+ */
+
+require('./Button/Button.story.js')
+require('./TextDiff/TextDiff.story.js')
+require('./EditorSearchInput/EditorSearchInput.story.js')
+require('./ProgressBar/ProgressBar.story.js')
+require('./GlossarySearchInput/GlossarySearchInput.story.js')
+require('./GlossaryTerm/GlossaryTerm.story.js')
+require('./GlossaryTermModal/GlossaryTermModal.story.js')