SONAR-21481 Migrate "DevOps Platform Integrations" page to MIUI

diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmBindingDefinitionBox.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmBindingDefinitionBox.tsx
index 96677baa3545936a6d847d083816aba5046919e1..dca6a27b378b3c5702dec70a4d3b9b776fe3c81a 100644 (file)
--- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmBindingDefinitionBox.tsx
+++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmBindingDefinitionBox.tsx
@@ -17,17 +17,21 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
+import {
+  BasicSeparator,
+  ButtonSecondary,
+  DangerButtonSecondary,
+  FlagErrorIcon,
+  FlagMessage,
+  FlagSuccessIcon,
+  HelperHintIcon,
+  Spinner,
+} from 'design-system';
 import * as React from 'react';
 import { FormattedMessage } from 'react-intl';
-import DocLink from '../../../../components/common/DocLink';
-import { Button } from '../../../../components/controls/buttons';
+import DocumentationLink from '../../../../components/common/DocumentationLink';
 import HelpTooltip from '../../../../components/controls/HelpTooltip';
 import Tooltip from '../../../../components/controls/Tooltip';
-import AlertErrorIcon from '../../../../components/icons/AlertErrorIcon';
-import AlertSuccessIcon from '../../../../components/icons/AlertSuccessIcon';
-import DeleteIcon from '../../../../components/icons/DeleteIcon';
-import EditIcon from '../../../../components/icons/EditIcon';
-import { Alert } from '../../../../components/ui/Alert';
 import { ALM_DOCUMENTATION_PATHS, IMPORT_COMPATIBLE_ALMS } from '../../../../helpers/constants';
 import { getEdition, getEditionUrl } from '../../../../helpers/editions';
 import { translate, translateWithParameters } from '../../../../helpers/l10n';
@@ -56,25 +60,23 @@ const DEFAULT_STATUS: AlmSettingsBindingStatus = {
 };
 
 const STATUS_ICON = {
-  [AlmSettingsBindingStatusType.Failure]: <AlertErrorIcon className="spacer-left" />,
-  [AlmSettingsBindingStatusType.Success]: <AlertSuccessIcon className="spacer-left" />,
+  [AlmSettingsBindingStatusType.Failure]: <FlagErrorIcon className="sw-ml-1" />,
+  [AlmSettingsBindingStatusType.Success]: <FlagSuccessIcon className="sw-ml-1" />,
+  [AlmSettingsBindingStatusType.Validating]: <div className="sw-ml-1 sw-inline-block sw-w-4" />,
 };
 
-function getPRDecorationFeatureStatus(
-  branchesEnabled: boolean,
-  type: AlmSettingsBindingStatusType.Success | AlmSettingsBindingStatusType.Failure,
-) {
+function getPRDecorationFeatureStatus(branchesEnabled: boolean, type: keyof typeof STATUS_ICON) {
   if (branchesEnabled) {
     return STATUS_ICON[type];
   }
 
   return (
-    <div className="display-inline-flex-center">
-      <strong className="spacer-left">
+    <div className="sw-inline-flex sw-items-center">
+      <strong className="sw-ml-2">
         {translate('settings.almintegration.feature.pr_decoration.disabled')}
       </strong>
       <HelpTooltip
-        className="little-spacer-left"
+        className="sw-ml-1"
         overlay={
           <FormattedMessage
             id="settings.almintegration.feature.pr_decoration.disabled.no_branches"
@@ -98,7 +100,9 @@ function getPRDecorationFeatureStatus(
             }}
           />
         }
-      />
+      >
+        <HelperHintIcon />
+      </HelpTooltip>
     </div>
   );
 }
@@ -106,23 +110,23 @@ function getPRDecorationFeatureStatus(
 function getImportFeatureStatus(
   alm: AlmKeys,
   definition: AlmBindingDefinitionBase,
-  type: AlmSettingsBindingStatusType.Success | AlmSettingsBindingStatusType.Failure,
+  type: keyof typeof STATUS_ICON,
 ) {
-  if (!definition.url && alm !== AlmKeys.BitbucketCloud) {
-    return (
-      <div className="display-inline-flex-center">
-        <strong className="spacer-left">
-          {translate('settings.almintegration.feature.alm_repo_import.disabled')}
-        </strong>
-        <HelpTooltip
-          className="little-spacer-left"
-          overlay={translate('settings.almintegration.feature.alm_repo_import.disabled.no_url')}
-        />
-      </div>
-    );
+  if (definition.url !== undefined || alm === AlmKeys.BitbucketCloud) {
+    return STATUS_ICON[type];
   }
 
-  return STATUS_ICON[type];
+  return (
+    <div className="sw-inline-flex sw-items-center">
+      <strong className="sw-ml-2">
+        {translate('settings.almintegration.feature.alm_repo_import.disabled')}
+      </strong>
+      <HelpTooltip
+        className="sw-ml-1"
+        overlay={translate('settings.almintegration.feature.alm_repo_import.disabled.no_url')}
+      />
+    </div>
+  );
 }
 
 function getPrDecoFeatureDescription(alm: AlmKeys) {
@@ -142,9 +146,10 @@ export default function AlmBindingDefinitionBox(props: AlmBindingDefinitionBoxPr
   const { alm, branchesEnabled, definition, status = DEFAULT_STATUS } = props;
 
   return (
-    <div className="boxed-group-inner bordered spacer-top spacer-bottom it__alm-binding-definition">
-      <div className="actions pull-right">
-        <Button
+    <div className="it__alm-binding-definition sw-pb-10">
+      <BasicSeparator className="sw-mb-6" />
+      <div className="sw-float-right">
+        <ButtonSecondary
           aria-label={translateWithParameters(
             'settings.almintegration.edit_configuration',
             definition.key,
@@ -153,110 +158,114 @@ export default function AlmBindingDefinitionBox(props: AlmBindingDefinitionBoxPr
             props.onEdit(definition.key);
           }}
         >
-          <EditIcon className="spacer-right" />
           {translate('edit')}
-        </Button>
-        <Button
+        </ButtonSecondary>
+        <DangerButtonSecondary
           aria-label={translateWithParameters(
             'settings.almintegration.delete_configuration',
             definition.key,
           )}
-          className="button-red spacer-left"
+          className="sw-ml-2"
           onClick={() => {
             props.onDelete(definition.key);
           }}
         >
-          <DeleteIcon className="spacer-right" />
           {translate('delete')}
-        </Button>
+        </DangerButtonSecondary>
       </div>
 
-      <div className="big-spacer-bottom">
+      <div className="sw-mb-4">
         <h3>{definition.key}</h3>
         {definition.url && <span>{definition.url}</span>}
       </div>
 
-      {status.type === AlmSettingsBindingStatusType.Validating ? (
-        <>
-          <i className="spinner spacer-right" />
-          {translate('settings.almintegration.checking_configuration')}
-        </>
-      ) : (
-        <>
-          {status.type !== AlmSettingsBindingStatusType.Warning && (
-            <div className="display-flex-row spacer-bottom">
-              <div className="huge-spacer-right">
-                <Tooltip overlay={getPrDecoFeatureDescription(alm)}>
-                  <span>{translate('settings.almintegration.feature.status_reporting.title')}</span>
-                </Tooltip>
-                {getPRDecorationFeatureStatus(branchesEnabled, status.type)}
-              </div>
-              {IMPORT_COMPATIBLE_ALMS.includes(alm) && (
-                <div>
-                  <Tooltip
-                    overlay={translate(
-                      'settings.almintegration.feature.alm_repo_import.description',
-                    )}
-                  >
-                    <span>
-                      {translate('settings.almintegration.feature.alm_repo_import.title')}
-                    </span>
-                  </Tooltip>
-                  {getImportFeatureStatus(alm, definition, status.type)}
-                </div>
-              )}
+      {status.type !== AlmSettingsBindingStatusType.Warning && (
+        <div className="sw-flex sw-mb-3">
+          <div className="sw-mr-10">
+            <Tooltip overlay={getPrDecoFeatureDescription(alm)}>
+              <span>{translate('settings.almintegration.feature.status_reporting.title')}</span>
+            </Tooltip>
+            {getPRDecorationFeatureStatus(branchesEnabled, status.type)}
+          </div>
+          {IMPORT_COMPATIBLE_ALMS.includes(alm) && (
+            <div>
+              <Tooltip
+                overlay={translate('settings.almintegration.feature.alm_repo_import.description')}
+              >
+                <span>{translate('settings.almintegration.feature.alm_repo_import.title')}</span>
+              </Tooltip>
+              {getImportFeatureStatus(alm, definition, status.type)}
             </div>
           )}
+        </div>
+      )}
 
-          <div className="width-50">
-            {status.type === AlmSettingsBindingStatusType.Warning && (
-              <Alert variant="warning">
-                {translate('settings.almintegration.could_not_validate')}
-              </Alert>
-            )}
+      {status.type === AlmSettingsBindingStatusType.Warning && (
+        <div className="sw-mb-3">
+          <FlagMessage variant="warning">
+            {translate('settings.almintegration.could_not_validate')}
+          </FlagMessage>
+        </div>
+      )}
 
-            {status.type === AlmSettingsBindingStatusType.Failure && (
-              <Alert variant="error">{status.failureMessage}</Alert>
-            )}
+      {status.type === AlmSettingsBindingStatusType.Failure && (
+        <div className="sw-mb-3">
+          <FlagMessage variant="error">{status.failureMessage}</FlagMessage>
+        </div>
+      )}
 
-            {status.type === AlmSettingsBindingStatusType.Success && status.alertSuccess && (
-              <>
-                <Alert variant="success">
-                  {translate('settings.almintegration.configuration_valid')}
-                </Alert>
-                {alm === AlmKeys.GitHub && (
-                  <Alert variant="warning">
-                    <FormattedMessage
-                      id="settings.almintegration.github.additional_permission"
-                      defaultMessage={translate(
-                        'settings.almintegration.github.additional_permission',
-                      )}
-                      values={{
-                        link: (
-                          <DocLink to={ALM_DOCUMENTATION_PATHS[AlmKeys.GitHub]}>
-                            {translate('learn_more')}
-                          </DocLink>
-                        ),
-                      }}
-                    />
-                  </Alert>
-                )}
-              </>
-            )}
+      {status.type === AlmSettingsBindingStatusType.Success && status.alertSuccess && (
+        <>
+          <div className="sw-mb-3">
+            <FlagMessage variant="success">
+              {translate('settings.almintegration.configuration_valid')}
+            </FlagMessage>
           </div>
-
-          <Button
-            aria-label={translateWithParameters(
-              'settings.almintegration.check_configuration_x',
-              definition.key,
-            )}
-            className="big-spacer-top"
-            onClick={() => props.onCheck(definition.key)}
-          >
-            {translate('settings.almintegration.check_configuration')}
-          </Button>
+          {alm === AlmKeys.GitHub && (
+            <div className="sw-mb-3">
+              <FlagMessage variant="warning">
+                <p>
+                  <FormattedMessage
+                    id="settings.almintegration.github.additional_permission"
+                    defaultMessage={translate(
+                      'settings.almintegration.github.additional_permission',
+                    )}
+                    values={{
+                      link: (
+                        <DocumentationLink to={ALM_DOCUMENTATION_PATHS[AlmKeys.GitHub]}>
+                          {translate('learn_more')}
+                        </DocumentationLink>
+                      ),
+                    }}
+                  />
+                </p>
+              </FlagMessage>
+            </div>
+          )}
         </>
       )}
+
+      <div className="sw-flex sw-items-center">
+        <ButtonSecondary
+          aria-label={translateWithParameters(
+            'settings.almintegration.check_configuration_x',
+            definition.key,
+          )}
+          onClick={() => props.onCheck(definition.key)}
+        >
+          {translate('settings.almintegration.check_configuration')}
+        </ButtonSecondary>
+        <Spinner
+          ariaLabel={translate('settings.almintegration.checking_configuration')}
+          className="sw-ml-3"
+          loading={status.type === AlmSettingsBindingStatusType.Validating}
+        />
+        {status.type === AlmSettingsBindingStatusType.Validating && (
+          <span className="sw-ml-2">
+            {translate('settings.almintegration.checking_configuration')}
+          </span>
+        )}
+      </div>
     </div>
   );
 }

diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmIntegrationRenderer.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmIntegrationRenderer.tsx
index 15d47b2a65463c17c026ec3b76d6e4e9bf5214b7..a0b21bed4f459796df00948d3515323aee902842 100644 (file)
--- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmIntegrationRenderer.tsx
+++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmIntegrationRenderer.tsx
@@ -17,11 +17,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
+import { FlagMessage, Link, SubTitle, ToggleButton } from 'design-system';
 import * as React from 'react';
 import { FormattedMessage } from 'react-intl';
-import Link from '../../../../components/common/Link';
-import BoxedTabs from '../../../../components/controls/BoxedTabs';
-import { Alert } from '../../../../components/ui/Alert';
 import { translate } from '../../../../helpers/l10n';
 import { getBaseUrl } from '../../../../helpers/system';
 import { useGetValuesQuery } from '../../../../queries/settings';
@@ -56,60 +54,60 @@ export interface AlmIntegrationRendererProps {
 
 const tabs = [
   {
-    key: AlmKeys.GitHub,
     label: (
       <>
         <img
           alt="github"
-          className="spacer-right"
+          className="sw-mr-2"
           height={16}
           src={`${getBaseUrl()}/images/alm/github.svg`}
         />
         {translate('settings.almintegration.tab.github')}
       </>
     ),
+    value: AlmKeys.GitHub,
   },
   {
-    key: AlmKeys.BitbucketServer,
     label: (
       <>
         <img
           alt="bitbucket"
-          className="spacer-right"
+          className="sw-mr-2"
           height={16}
           src={`${getBaseUrl()}/images/alm/bitbucket.svg`}
         />
         {translate('settings.almintegration.tab.bitbucket')}
       </>
     ),
+    value: AlmKeys.BitbucketServer,
   },
   {
-    key: AlmKeys.Azure,
     label: (
       <>
         <img
           alt="azure"
-          className="spacer-right"
+          className="sw-mr-2"
           height={16}
           src={`${getBaseUrl()}/images/alm/azure.svg`}
         />
         {translate('settings.almintegration.tab.azure')}
       </>
     ),
+    value: AlmKeys.Azure,
   },
   {
-    key: AlmKeys.GitLab,
     label: (
       <>
         <img
           alt="gitlab"
-          className="spacer-right"
+          className="sw-mr-2"
           height={16}
           src={`${getBaseUrl()}/images/alm/gitlab.svg`}
         />
         {translate('settings.almintegration.tab.gitlab')}
       </>
     ),
+    value: AlmKeys.GitLab,
   },
 ];
 
@@ -138,31 +136,38 @@ export default function AlmIntegrationRenderer(props: AlmIntegrationRendererProp
 
   return (
     <>
-      <header className="page-header">
-        <h1 className="page-title">{translate('settings.almintegration.title')}</h1>
+      <header className="sw-mb-5">
+        <SubTitle>{translate('settings.almintegration.title')}</SubTitle>
       </header>
 
       {!hasServerBaseUrl && !isLoading && branchesEnabled && (
-        <Alert variant="warning">
-          <FormattedMessage
-            id="settings.almintegration.empty.server_base_url"
-            defaultMessage={translate('settings.almintegration.empty.server_base_url')}
-            values={{
-              serverBaseUrl: (
-                <Link to="/admin/settings?category=general#sonar.core.serverBaseURL">
-                  {translate('settings.almintegration.empty.server_base_url.setting_link')}
-                </Link>
-              ),
-            }}
-          />
-        </Alert>
+        <FlagMessage variant="warning">
+          <p>
+            <FormattedMessage
+              id="settings.almintegration.empty.server_base_url"
+              defaultMessage={translate('settings.almintegration.empty.server_base_url')}
+              values={{
+                serverBaseUrl: (
+                  <Link to="/admin/settings?category=general#sonar.core.serverBaseURL">
+                    {translate('settings.almintegration.empty.server_base_url.setting_link')}
+                  </Link>
+                ),
+              }}
+            />
+          </p>
+        </FlagMessage>
       )}
 
-      <div className="markdown small big-spacer-top big-spacer-bottom">
-        {translate('settings.almintegration.description')}
-      </div>
+      <div className="sw-my-4">{translate('settings.almintegration.description')}</div>
 
-      <BoxedTabs onSelect={props.onSelectAlmTab} selected={currentAlmTab} tabs={tabs} />
+      <div className="sw-mb-6">
+        <ToggleButton
+          onChange={props.onSelectAlmTab}
+          options={tabs}
+          role="tablist"
+          value={currentAlmTab}
+        />
+      </div>
 
       <AlmTab
         almTab={currentAlmTab}

diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmTabRenderer.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmTabRenderer.tsx
index 6fb1ffbd903d746997ccb1fb7d8259177a5c26fd..151e080a27ce657eaefe8409c314d364d55ba379 100644 (file)
--- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmTabRenderer.tsx
+++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmTabRenderer.tsx
@@ -17,13 +17,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
+import { ButtonPrimary, FlagMessage, Link, Spinner, getTabId, getTabPanelId } from 'design-system';
 import * as React from 'react';
 import { FormattedMessage } from 'react-intl';
-import Link from '../../../../components/common/Link';
-import { getTabId, getTabPanelId } from '../../../../components/controls/BoxedTabs';
-import { Button } from '../../../../components/controls/buttons';
-import { Alert } from '../../../../components/ui/Alert';
-import Spinner from '../../../../components/ui/Spinner';
 import { translate } from '../../../../helpers/l10n';
 import {
   AlmBindingDefinition,
@@ -78,27 +74,22 @@ export default function AlmTabRenderer(props: Readonly<AlmTabRendererProps>) {
   const preventCreation = loadingProjectCount || (!multipleAlmEnabled && definitions.length > 0);
 
   return (
-    <div
-      className="bordered"
-      role="tabpanel"
-      id={getTabPanelId(almTab)}
-      aria-labelledby={getTabId(almTab)}
-    >
-      <div className="big-padded">
+    <div role="tabpanel" id={getTabPanelId(almTab)} aria-labelledby={getTabId(almTab)}>
+      <div>
         <Spinner loading={loadingAlmDefinitions}>
           {definitions.length === 0 && (
-            <p className="spacer-top">{translate('settings.almintegration.empty', almTab)}</p>
+            <p className="sw-mt-2">{translate('settings.almintegration.empty', almTab)}</p>
           )}
 
-          <div className={definitions.length > 0 ? 'spacer-bottom text-right' : 'big-spacer-top'}>
+          <div className={definitions.length > 0 ? 'sw-mb-5' : 'sw-my-3'}>
             <CreationTooltip alm={almTab} preventCreation={preventCreation}>
-              <Button
+              <ButtonPrimary
                 data-test="settings__alm-create"
                 disabled={preventCreation}
                 onClick={props.onCreate}
               >
                 {translate('settings.almintegration.create')}
-              </Button>
+              </ButtonPrimary>
             </CreationTooltip>
           </div>
           {definitions.map((def) => (
@@ -125,24 +116,26 @@ export default function AlmTabRenderer(props: Readonly<AlmTabRendererProps>) {
         </Spinner>
       </div>
       {AUTHENTICATION_AVAILABLE_PLATFORMS.includes(almTab) && (
-        <Alert variant="info" className="spacer">
-          <FormattedMessage
-            id="settings.almintegration.tabs.authentication-moved"
-            defaultMessage={translate('settings.almintegration.tabs.authentication_moved')}
-            values={{
-              link: (
-                <Link
-                  to={{
-                    pathname: '/admin/settings',
-                    search: `category=authentication&tab=${almTab}`,
-                  }}
-                >
-                  {translate('property.category.authentication')}
-                </Link>
-              ),
-            }}
-          />
-        </Alert>
+        <FlagMessage className="sw-mt-2" variant="info">
+          <p>
+            <FormattedMessage
+              id="settings.almintegration.tabs.authentication-moved"
+              defaultMessage={translate('settings.almintegration.tabs.authentication_moved')}
+              values={{
+                link: (
+                  <Link
+                    to={{
+                      pathname: '/admin/settings',
+                      search: `category=authentication&tab=${almTab}`,
+                    }}
+                  >
+                    {translate('property.category.authentication')}
+                  </Link>
+                ),
+              }}
+            />
+          </p>
+        </FlagMessage>
       )}
     </div>
   );