Merge branch 'master' of github.com:spotify/backstage into ndudnik/use-catalog-backend

# Conflicts:
#	plugins/catalog/src/components/CatalogPage/CatalogPage.test.tsx
#	plugins/catalog/src/components/CatalogPage/CatalogPage.tsx
#	plugins/catalog/src/components/ComponentPage/ComponentPage.tsx
#	plugins/catalog/src/data/mock-factory.ts
#	plugins/catalog/src/plugin.ts

plugins/circleci/src/components/PluginHeader/PluginHeader.tsx

@@ -22,7 +22,7 @@ import SettingsIcon from '@material-ui/icons/Settings';
 import { useSettings } from '../../state';
 
 export type Props = { title?: string };
-export const PluginHeader: FC<Props> = ({ title = 'Circle CI' }) => {
+export const PluginHeader: FC<Props> = ({ title = 'CircleCI' }) => {
   const [, { showSettings }] = useSettings();
   const location = useLocation();
   const notRoot = !location.pathname.match(/\/circleci\/?$/);

plugins/circleci/src/components/Settings/Settings.tsx

@@ -80,7 +80,7 @@ const Settings = () => {
                 value={token}
                 fullWidth
                 variant="outlined"
-                onChange={(e) => setToken(e.target.value)}
+                onChange={e => setToken(e.target.value)}
               />
             </ListItem>
             <ListItem>
@@ -90,7 +90,7 @@ const Settings = () => {
                 label="Owner"
                 variant="outlined"
                 value={owner}
-                onChange={(e) => setOwner(e.target.value)}
+                onChange={e => setOwner(e.target.value)}
               />
             </ListItem>
             <ListItem>
@@ -100,7 +100,7 @@ const Settings = () => {
                 fullWidth
                 variant="outlined"
                 value={repo}
-                onChange={(e) => setRepo(e.target.value)}
+                onChange={e => setRepo(e.target.value)}
               />
             </ListItem>
             <ListItem>

plugins/circleci/src/pages/BuildWithStepsPage/BuildWithStepsPage.tsx

@@ -35,7 +35,7 @@ const BuildName: FC<{ build?: BuildWithSteps }> = ({ build }) => (
     </IconLink>
   </Box>
 );
-const useStyles = makeStyles((theme) => ({
+const useStyles = makeStyles(theme => ({
   neutral: {},
   failed: {
     position: 'relative',

plugins/circleci/src/pages/BuildWithStepsPage/lib/ActionOutput/ActionOutput.tsx

@@ -50,8 +50,8 @@ export const ActionOutput: FC<{
   const [messages, setMessages] = useState([]);
   useEffect(() => {
     fetch(url)
-      .then((res) => res.json())
-      .then((actionOutput) => {
+      .then(res => res.json())
+      .then(actionOutput => {
         if (typeof actionOutput !== 'undefined') {
           setMessages(
             actionOutput.map(({ message }: { message: string }) => message),

plugins/circleci/src/state/useAsyncPolling.ts

@@ -26,7 +26,7 @@ export const useAsyncPolling = (
 
     while (isPolling.current === true) {
       await pollingFn();
-      await new Promise((resolve) => setTimeout(resolve, interval));
+      await new Promise(resolve => setTimeout(resolve, interval));
     }
   };
 

plugins/circleci/src/state/useSettings.ts

@@ -29,7 +29,7 @@ export function useSettings() {
       if (
         stateFromStorage &&
         Object.keys(stateFromStorage).some(
-          (k) => (settings as any)[k] !== stateFromStorage[k],
+          k => (settings as any)[k] !== stateFromStorage[k],
         )
       )
         dispatch({