merge with default branch

scm-ui/ui-components/src/__snapshots__/storyshots.test.ts.snap

@@ -336,7 +336,7 @@ exports[`Storyshots DateFromNow Default 1`] = `
 
 exports[`Storyshots Forms|Checkbox Default 1`] = `
 <div
-  className="sc-caSCKo brLbbv"
+  className="sc-gisBJw jHakbY"
 >
   <div
     className="field"
@@ -381,7 +381,7 @@ exports[`Storyshots Forms|Checkbox Default 1`] = `
 
 exports[`Storyshots Forms|Checkbox Disabled 1`] = `
 <div
-  className="sc-caSCKo brLbbv"
+  className="sc-gisBJw jHakbY"
 >
   <div
     className="field"
@@ -409,10 +409,10 @@ exports[`Storyshots Forms|Checkbox Disabled 1`] = `
 
 exports[`Storyshots Forms|Radio Default 1`] = `
 <div
-  className="sc-gisBJw jHakbY"
+  className="sc-kjoXOD hVPZau"
 >
   <label
-    className="radio"
+    className="sc-cMljjf kOqpHe radio"
   >
     <input
       checked={false}
@@ -423,7 +423,7 @@ exports[`Storyshots Forms|Radio Default 1`] = `
     Not checked
   </label>
   <label
-    className="radio"
+    className="sc-cMljjf kOqpHe radio"
   >
     <input
       checked={true}
@@ -438,10 +438,10 @@ exports[`Storyshots Forms|Radio Default 1`] = `
 
 exports[`Storyshots Forms|Radio Disabled 1`] = `
 <div
-  className="sc-gisBJw jHakbY"
+  className="sc-kjoXOD hVPZau"
 >
   <label
-    className="radio"
+    className="sc-cMljjf kOqpHe radio"
     disabled={true}
   >
     <input
@@ -458,7 +458,7 @@ exports[`Storyshots Forms|Radio Disabled 1`] = `
 
 exports[`Storyshots Forms|Textarea OnCancel 1`] = `
 <div
-  className="sc-kjoXOD hVPZau"
+  className="sc-cHGsZl klfJMr"
 >
   <div
     className="field"
@@ -481,7 +481,7 @@ exports[`Storyshots Forms|Textarea OnCancel 1`] = `
 
 exports[`Storyshots Forms|Textarea OnChange 1`] = `
 <div
-  className="sc-kjoXOD hVPZau"
+  className="sc-cHGsZl klfJMr"
 >
   <div
     className="field"
@@ -508,7 +508,7 @@ exports[`Storyshots Forms|Textarea OnChange 1`] = `
 
 exports[`Storyshots Forms|Textarea OnSubmit 1`] = `
 <div
-  className="sc-kjoXOD hVPZau"
+  className="sc-cHGsZl klfJMr"
 >
   <div
     className="field"
@@ -2391,7 +2391,7 @@ PORT_NUMBER =
 
 exports[`Storyshots Table|Table Default 1`] = `
 <table
-  className="sc-jhAzac hmXDXQ table content is-hoverable"
+  className="sc-fBuWsC eeihxG table content is-hoverable"
 >
   <thead>
     <tr>
@@ -2409,7 +2409,7 @@ exports[`Storyshots Table|Table Default 1`] = `
       >
         Last Name
         <i
-          className="fas fa-sort-amount-down has-text-grey-light sc-hzDkRC escBde"
+          className="fas fa-sort-amount-down has-text-grey-light sc-jhAzac gDbcZp"
         />
       </th>
       <th
@@ -2482,7 +2482,7 @@ exports[`Storyshots Table|Table Empty 1`] = `
 
 exports[`Storyshots Table|Table TextColumn 1`] = `
 <table
-  className="sc-jhAzac hmXDXQ table content is-hoverable"
+  className="sc-fBuWsC eeihxG table content is-hoverable"
 >
   <thead>
     <tr>
@@ -2494,7 +2494,7 @@ exports[`Storyshots Table|Table TextColumn 1`] = `
       >
         Id
         <i
-          className="fas fa-sort-alpha-down has-text-grey-light sc-hzDkRC escBde"
+          className="fas fa-sort-alpha-down has-text-grey-light sc-jhAzac gDbcZp"
         />
       </th>
       <th
@@ -2505,7 +2505,7 @@ exports[`Storyshots Table|Table TextColumn 1`] = `
       >
         Name
         <i
-          className="fas fa-sort-alpha-down has-text-grey-light sc-hzDkRC escBde"
+          className="fas fa-sort-alpha-down has-text-grey-light sc-jhAzac gDbcZp"
         />
       </th>
       <th
@@ -2516,7 +2516,7 @@ exports[`Storyshots Table|Table TextColumn 1`] = `
       >
         Description
         <i
-          className="fas fa-sort-alpha-down has-text-grey-light sc-hzDkRC escBde"
+          className="fas fa-sort-alpha-down has-text-grey-light sc-jhAzac gDbcZp"
         />
       </th>
     </tr>

scm-ui/ui-components/src/forms/Radio.tsx

@@ -1,5 +1,11 @@
 import React, { ChangeEvent } from "react";
 import { Help } from "../index";
+import styled from "styled-components";
+
+
+const StyledRadio = styled.label`
+  margin-right: 0.5em;
+`;
 
 type Props = {
   label?: string;
@@ -33,7 +39,7 @@ class Radio extends React.Component<Props> {
         because jsx label does not the custom disabled attribute
         but bulma does.
         // @ts-ignore */}
-        <label className="radio" disabled={this.props.disabled}>
+        <StyledRadio className="radio" disabled={this.props.disabled}>
           <input
             type="radio"
             name={this.props.name}
@@ -44,7 +50,7 @@ class Radio extends React.Component<Props> {
           />{" "}
           {this.props.label}
           {this.renderHelp()}
-        </label>
+        </StyledRadio>
       </>
     );
   }

scm-ui/ui-components/src/repos/LoadingDiff.tsx

@@ -7,8 +7,11 @@ import parser from "gitdiff-parser";
 import Loading from "../Loading";
 import Diff from "./Diff";
 import { DiffObjectProps, File } from "./DiffTypes";
+import { NotFoundError } from "../errors";
+import { Notification } from "../index";
+import {withTranslation, WithTranslation} from "react-i18next";
 
-type Props = DiffObjectProps & {
+type Props = WithTranslation & DiffObjectProps & {
   url: string;
   defaultCollapse?: boolean;
 };
@@ -43,7 +46,7 @@ class LoadingDiff extends React.Component<Props, State> {
 
   fetchDiff = () => {
     const { url } = this.props;
-    this.setState({loading: true});
+    this.setState({ loading: true });
     apiClient
       .get(url)
       .then(response => response.text())
@@ -66,6 +69,9 @@ class LoadingDiff extends React.Component<Props, State> {
   render() {
     const { diff, loading, error } = this.state;
     if (error) {
+      if (error instanceof NotFoundError) {
+        return <Notification type="info">{this.props.t("changesets.noChangesets")}</Notification>;
+      }
       return <ErrorNotification error={error} />;
     } else if (loading) {
       return <Loading />;
@@ -77,4 +83,4 @@ class LoadingDiff extends React.Component<Props, State> {
   }
 }
 
-export default LoadingDiff;
+export default withTranslation("repos")(LoadingDiff);

scm-ui/ui-components/src/repos/changesets/ChangesetDiff.tsx

@@ -28,7 +28,7 @@ class ChangesetDiff extends React.Component<Props> {
       return <Notification type="danger">{t("changeset.diffNotSupported")}</Notification>;
     } else {
       const url = this.createUrl(changeset);
-      return <LoadingDiff url={url} defaultCollapse={defaultCollapse} />;
+      return <LoadingDiff url={url} defaultCollapse={defaultCollapse} sideBySide={false}/>;
     }
   }
 }