From: Grégoire Aubert <gregoire.aubert@sonarsource.com>
Date: Mon, 6 Nov 2017 15:31:09 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/branch-6.7'
X-Git-Tag: 7.0-RC1~373
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2a2dc6f30e574058065019aeb637b71b30661568;p=sonarqube.git

Merge remote-tracking branch 'origin/branch-6.7'
---

2a2dc6f30e574058065019aeb637b71b30661568
diff --cc server/sonar-web/src/main/js/apps/marketplace/components/LicenseEditionForm.tsx
index 414a768e485,778c63fb457..f94c85cd727
--- a/server/sonar-web/src/main/js/apps/marketplace/components/LicenseEditionForm.tsx
+++ b/server/sonar-web/src/main/js/apps/marketplace/components/LicenseEditionForm.tsx
@@@ -102,10 -107,15 +102,13 @@@ export default class LicenseEditionFor
          <footer className="modal-foot">
            {submitting && <i className="spinner spacer-right" />}
            {status && (
-             <button className="js-confirm" onClick={this.handleConfirmClick} disabled={submitting}>
+             <button
+               className="js-confirm"
+               onClick={this.handleConfirmClick}
+               disabled={!license || submitting}>
 -              {status === 'AUTOMATIC_INSTALL' ? (
 -                translate('marketplace.install')
 -              ) : (
 -                translate('save')
 -              )}
 +              {status === 'AUTOMATIC_INSTALL'
 +                ? translate('marketplace.install')
 +                : translate('save')}
              </button>
            )}
            <a className="js-modal-close" href="#" onClick={this.handleCancelClick}>
diff --cc server/sonar-web/src/main/js/apps/marketplace/components/LicenseEditionSet.tsx
index f33cb6a3911,2053ea87e50..919a6aac0c1
--- a/server/sonar-web/src/main/js/apps/marketplace/components/LicenseEditionSet.tsx
+++ b/server/sonar-web/src/main/js/apps/marketplace/components/LicenseEditionSet.tsx
@@@ -20,8 -20,9 +20,9 @@@
  import { stringify } from 'querystring';
  import * as React from 'react';
  import * as classNames from 'classnames';
 -import Checkbox from '../../../components/controls/Checkbox';
  import { FormattedMessage } from 'react-intl';
  import { debounce } from 'lodash';
++import Checkbox from '../../../components/controls/Checkbox';
  import DeferredSpinner from '../../../components/common/DeferredSpinner';
  import { omitNil } from '../../../helpers/request';
  import { Edition, getFormData, getLicensePreview } from '../../../api/marketplace';
@@@ -125,48 -135,76 +135,76 @@@ export default class LicenseEditionSet 
      const { licenseEdition, previewStatus } = this.state;
      if (!previewStatus) {
        const { edition } = this.props;
-       if (edition && licenseEdition && edition.key !== licenseEdition.key) {
-         return (
-           <p className="alert alert-danger spacer-top">
-             {translateWithParameters('marketplace.wrong_license_type_x', edition.name)}
-           </p>
-         );
+       if (!edition) {
+         return undefined;
        }
  
-       return undefined;
+       return (
+         <div className="spacer-top">
+           {licenseEdition !== undefined &&
 -          edition.key !== licenseEdition.key && (
 -            <p className="alert alert-danger">
 -              {translateWithParameters('marketplace.wrong_license_type_x', edition.name)}
 -            </p>
 -          )}
++            edition.key !== licenseEdition.key && (
++              <p className="alert alert-danger">
++                {translateWithParameters('marketplace.wrong_license_type_x', edition.name)}
++              </p>
++            )}
+           <a href={this.getLicenseFormUrl(edition)} target="_blank">
+             {translate('marketplace.i_need_a_license')}
+           </a>
+         </div>
+       );
      }
  
      return (
-       <p
-         className={classNames('alert spacer-top', {
-           'alert-warning': previewStatus === 'AUTOMATIC_INSTALL',
-           'alert-success': previewStatus === 'NO_INSTALL',
-           'alert-danger': previewStatus === 'MANUAL_INSTALL'
-         })}>
-         {translateWithParameters(
-           'marketplace.license_preview_status.' + previewStatus,
-           licenseEdition ? licenseEdition.name : translate('marketplace.commercial_edition')
-         )}
-         {licenseEdition &&
-           licenseEdition.key === 'datacenter' &&
-           previewStatus !== 'NO_INSTALL' && (
-             <span className="little-spacer-left">
-               <FormattedMessage
-                 defaultMessage={translate('marketplace.how_to_setup_cluster_url')}
-                 id="marketplace.how_to_setup_cluster_url"
-                 values={{
-                   url: (
-                     <a
-                       href="https://redirect.sonarsource.com/doc/data-center-edition.html"
-                       target="_blank">
-                       {licenseEdition.name}
-                     </a>
-                   )
-                 }}
-               />
-             </span>
+       <div className="spacer-top">
+         <p
+           className={classNames('alert', {
+             'alert-warning': previewStatus === 'AUTOMATIC_INSTALL',
+             'alert-success': previewStatus === 'NO_INSTALL',
+             'alert-danger': previewStatus === 'MANUAL_INSTALL'
+           })}>
+           {translateWithParameters(
+             'marketplace.license_preview_status.' + previewStatus,
+             licenseEdition ? licenseEdition.name : translate('marketplace.commercial_edition')
            )}
-       </p>
+           {licenseEdition &&
 -          licenseEdition.key === 'datacenter' &&
 -          previewStatus !== 'NO_INSTALL' && (
 -            <span className="little-spacer-left">
 -              <FormattedMessage
 -                defaultMessage={translate('marketplace.how_to_setup_cluster_url')}
 -                id="marketplace.how_to_setup_cluster_url"
 -                values={{
 -                  url: (
 -                    <a
 -                      href="https://redirect.sonarsource.com/doc/data-center-edition.html"
 -                      target="_blank">
 -                      {licenseEdition.name}
 -                    </a>
 -                  )
 -                }}
 -              />
 -            </span>
 -          )}
++            licenseEdition.key === 'datacenter' &&
++            previewStatus !== 'NO_INSTALL' && (
++              <span className="little-spacer-left">
++                <FormattedMessage
++                  defaultMessage={translate('marketplace.how_to_setup_cluster_url')}
++                  id="marketplace.how_to_setup_cluster_url"
++                  values={{
++                    url: (
++                      <a
++                        href="https://redirect.sonarsource.com/doc/data-center-edition.html"
++                        target="_blank">
++                        {licenseEdition.name}
++                      </a>
++                    )
++                  }}
++                />
++              </span>
++            )}
+         </p>
+         {previewStatus !== 'NO_INSTALL' && (
+           <span className="js-edition-tos">
+             <Checkbox
+               checked={this.state.acceptTerms}
+               id="edition-terms"
+               onCheck={this.handleTermsCheck}>
+               <label className="little-spacer-left" htmlFor="edition-terms">
+                 {translate('marketplace.i_accept_the')}
+               </label>
+             </Checkbox>
+             <a
+               className="nowrap little-spacer-left"
+               href="http://dist.sonarsource.com/SonarSource_Terms_And_Conditions.pdf"
+               target="_blank">
+               {translate('marketplace.terms_and_conditions')}
+             </a>
+           </span>
+         )}
+       </div>
      );
    }
  
diff --cc server/sonar-web/src/main/js/apps/marketplace/components/__tests__/LicenseEditionSet-test.tsx
index 5efe571d861,b0be56873fd..846f65e191d
--- a/server/sonar-web/src/main/js/apps/marketplace/components/__tests__/LicenseEditionSet-test.tsx
+++ b/server/sonar-web/src/main/js/apps/marketplace/components/__tests__/LicenseEditionSet-test.tsx
@@@ -57,17 -55,33 +57,40 @@@ it('should display correctly', () => 
    expect(getWrapper()).toMatchSnapshot();
  });
  
 +it('should display the get license link with parameters', async () => {
 +  const wrapper = getWrapper();
 +  await new Promise(setImmediate);
 +  wrapper.update();
 +  expect(wrapper.find('a')).toMatchSnapshot();
 +});
 +
  it('should correctly display status message after checking license', async () => {
-   await testLicenseStatus('NO_INSTALL');
-   await testLicenseStatus('AUTOMATIC_INSTALL');
-   await testLicenseStatus('MANUAL_INSTALL');
+   let wrapper = await testLicenseStatus('NO_INSTALL', jest.fn());
+   expect(wrapper.find('p.alert')).toMatchSnapshot();
+   wrapper = await testLicenseStatus('AUTOMATIC_INSTALL', jest.fn());
+   expect(wrapper.find('p.alert')).toMatchSnapshot();
+   wrapper = await testLicenseStatus('MANUAL_INSTALL', jest.fn());
+   expect(wrapper.find('p.alert')).toMatchSnapshot();
+ });
+ 
+ it('should display terms of license checkbox', async () => {
+   let updateLicense = jest.fn();
+   let wrapper = await testLicenseStatus('NO_INSTALL', updateLicense);
+   expect(wrapper.find('.js-edition-tos').exists()).toBeFalsy();
+   expect(updateLicense).toHaveBeenCalledWith('mylicense', 'NO_INSTALL');
+ 
+   updateLicense = jest.fn();
+   wrapper = await testLicenseStatus('AUTOMATIC_INSTALL', updateLicense);
 -  let tosCheckbox = wrapper.find('.js-edition-tos');
++  const tosCheckbox = wrapper.find('.js-edition-tos');
+   expect(tosCheckbox.find('a').exists()).toBeTruthy();
+   expect(updateLicense).toHaveBeenLastCalledWith(undefined, 'AUTOMATIC_INSTALL');
+   (tosCheckbox.find('Checkbox').prop('onCheck') as Function)(true);
+   expect(updateLicense).toHaveBeenLastCalledWith('mylicense', 'AUTOMATIC_INSTALL');
+ 
+   updateLicense = jest.fn();
+   wrapper = await testLicenseStatus('MANUAL_INSTALL', updateLicense);
+   expect(wrapper.find('.js-edition-tos').exists()).toBeTruthy();
+   expect(updateLicense).toHaveBeenLastCalledWith(undefined, 'MANUAL_INSTALL');
  });
  
  function getWrapper(props = {}) {
@@@ -85,12 -99,11 +108,11 @@@ async function testLicenseStatus(status
    getLicensePreview.mockImplementation(() =>
      Promise.resolve({ nextEditionKey: 'foo', previewStatus: status })
    );
-   const updateLicense = jest.fn();
    const wrapper = getWrapper({ updateLicense });
 -  (wrapper.instance() as LicenseEditionSet).mounted = true;
    change(wrapper.find('textarea'), 'mylicense');
    expect(getLicensePreview).toHaveBeenCalled();
    await new Promise(setImmediate);
    expect(updateLicense).toHaveBeenCalled();
 +  wrapper.update();
-   expect(wrapper.find('p.alert')).toMatchSnapshot();
+   return wrapper;
  }
diff --cc server/sonar-web/src/main/js/apps/marketplace/components/__tests__/__snapshots__/LicenseEditionForm-test.tsx.snap
index 6e1defbecd0,49d105b88f5..c70a6a6abb0
--- a/server/sonar-web/src/main/js/apps/marketplace/components/__tests__/__snapshots__/LicenseEditionForm-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/marketplace/components/__tests__/__snapshots__/LicenseEditionForm-test.tsx.snap
@@@ -1,39 -1,18 +1,9 @@@
  // Jest Snapshot v1, https://goo.gl/fbAQLP
  
- exports[`should correctly change the button based on the status 1`] = `
- <button
-   className="js-confirm"
-   disabled={false}
-   onClick={[Function]}
- >
-   save
- </button>
- `;
- 
- exports[`should correctly change the button based on the status 2`] = `
- <button
-   className="js-confirm"
-   disabled={false}
-   onClick={[Function]}
- >
-   marketplace.install
- </button>
- `;
- 
- exports[`should correctly change the button based on the status 3`] = `
- <button
-   className="js-confirm"
-   disabled={false}
-   onClick={[Function]}
- >
-   save
- </button>
- `;
- 
  exports[`should display correctly 1`] = `
  <Modal
 -  ariaHideApp={true}
 -  bodyOpenClassName="ReactModal__Body--open"
 -  className="modal"
 -  closeTimeoutMS={0}
    contentLabel="marketplace.upgrade_to_x.Foo"
 -  isOpen={true}
    onRequestClose={[Function]}
 -  overlayClassName="modal-overlay"
 -  parentSelector={[Function]}
 -  portalClassName="ReactModalPortal"
 -  shouldCloseOnOverlayClick={true}
  >
    <header
      className="modal-head"
diff --cc server/sonar-web/src/main/js/apps/marketplace/components/__tests__/__snapshots__/LicenseEditionSet-test.tsx.snap
index 6026ff03d97,19750aefb8b..8631ff5d7d4
--- a/server/sonar-web/src/main/js/apps/marketplace/components/__tests__/__snapshots__/LicenseEditionSet-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/marketplace/components/__tests__/__snapshots__/LicenseEditionSet-test.tsx.snap
@@@ -65,23 -64,17 +64,26 @@@ exports[`should display correctly 1`] 
      }
      loading={false}
      timeout={100}
-   />
-   <a
-     className="display-inline-block spacer-top"
-     href="license_url"
-     target="_blank"
    >
-     marketplace.i_need_a_license
-   </a>
+     <div
+       className="spacer-top"
+     >
+       <a
+         href="license_url"
+         target="_blank"
+       >
+         marketplace.i_need_a_license
+       </a>
+     </div>
+   </DeferredSpinner>
  </div>
  `;
 +
 +exports[`should display the get license link with parameters 1`] = `
 +<a
-   className="display-inline-block spacer-top"
 +  href="license_url?serverId=foo&ncloc=1000"
 +  target="_blank"
 +>
 +  marketplace.i_need_a_license
 +</a>
 +`;