Fix linting and tsc

2020-06-02 13:55:17 +02:00
parent f80c6304c2
commit dfe817cb74
8 changed files with 48 additions and 23 deletions
@@ -12,15 +12,16 @@
    "@backstage/plugin-lighthouse": "^0.1.1-alpha.6",
    "@backstage/plugin-register-component": "^0.1.1-alpha.6",
    "@backstage/plugin-scaffolder": "^0.1.1-alpha.6",
+    "@backstage/plugin-sentry": "^0.1.1-alpha.6",
    "@backstage/plugin-tech-radar": "^0.1.1-alpha.6",
    "@backstage/plugin-welcome": "^0.1.1-alpha.6",
    "@backstage/theme": "^0.1.1-alpha.6",
-    "@backstage/plugin-sentry": "^0.1.1-alpha.6",
    "@material-ui/core": "^4.9.1",
    "@material-ui/icons": "^4.9.1",
    "prop-types": "^15.7.2",
    "react": "^16.12.0",
    "react-dom": "^16.12.0",
+    "react-hot-loader": "^4.12.21",
    "react-router-dom": "^5.2.0",
    "react-use": "^14.2.0",
    "zen-observable": "^0.8.15"
@@ -70,12 +70,12 @@ async function main() {
  app.use(requestLoggingHandler());
  app.use('/catalog', await catalog(createEnv('catalog')));
  app.use('/scaffolder', await scaffolder(createEnv('scaffolder')));
-  // app.use(
-  //   '/sentry',
-  //   await sentry(getRootLogger().child({ type: 'plugin', plugin: 'sentry' })),
-  // );
-  // app.use('/auth', await auth(createEnv('auth')));
-  // app.use('/identity', await identity(createEnv('identity')));
+  app.use(
+    '/sentry',
+    await sentry(getRootLogger().child({ type: 'plugin', plugin: 'sentry' })),
+  );
+  app.use('/auth', await auth(createEnv('auth')));
+  app.use('/identity', await identity(createEnv('identity')));
  app.use(notFoundHandler());
  app.use(errorHandler());

@@ -17,15 +17,18 @@
    "clean": "backstage-cli clean"
  },
  "dependencies": {
-    "@backstage/core": "^0.1.1-alpha.6",
-    "@backstage/theme": "^0.1.1-alpha.6",
    "@backstage/catalog-model": "^0.1.1-alpha.6",
+    "@backstage/core": "^0.1.1-alpha.6",
+    "@backstage/plugin-scaffolder": "^0.1.1-alpha.6",
+    "@backstage/plugin-sentry": "^0.1.1-alpha.6",
+    "@backstage/theme": "^0.1.1-alpha.6",
    "@material-ui/core": "^4.9.1",
    "@material-ui/icons": "^4.9.1",
    "@material-ui/lab": "4.0.0-alpha.45",
-    "@backstage/plugin-sentry": "^0.1.1-alpha.6",
    "react": "^16.13.1",
    "react-dom": "^16.13.1",
+    "react-router": "^5.2.0",
+    "react-router-dom": "^5.2.0",
    "react-use": "^14.2.0"
  },
  "devDependencies": {
@@ -1,4 +1,28 @@
-import { createRouteRef } from '@backstage/core';
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Hi!
+ *
+ * Note that this is an EXAMPLE Backstage backend. Please check the README.
+ *
+ * Happy hacking!
+ */
+
+ import { createRouteRef } from '@backstage/core';

 const NoIcon = () => null;

@@ -18,6 +18,7 @@
  },
  "dependencies": {
    "@backstage/core": "^0.1.1-alpha.6",
+    "@backstage/plugin-catalog": "^0.1.1-alpha.6",
    "@backstage/theme": "^0.1.1-alpha.6",
    "@material-ui/core": "^4.9.1",
    "@material-ui/icons": "^4.9.1",
@@ -25,6 +26,8 @@
    "react": "^16.13.1",
    "react-dom": "^16.13.1",
    "react-hook-form": "^5.7.2",
+    "react-router": "^5.2.0",
+    "react-router-dom": "^5.2.0",
    "react-use": "^14.2.0"
  },
  "devDependencies": {
@@ -18,11 +18,10 @@ import React from 'react';
 import { render, fireEvent } from '@testing-library/react';
 import RegisterComponentForm from './RegisterComponentForm';

+// TODO(ishmidt): rewrite tests
 describe('RegisterComponentForm', () => {
  it('should initially render a disabled button', async () => {
-    const rendered = render(
-      <RegisterComponentForm onSubmit={jest.fn()} submitting={false} />,
-    );
+    const rendered = render(<RegisterComponentForm onSubmit={jest.fn()} />);
    expect(
      await rendered.findByText(
        'Enter the full path to the service-info.yaml file in GHE to start tracking your component. It must be in a public repo, on the master branch.',
@@ -34,9 +33,7 @@ describe('RegisterComponentForm', () => {
  });

  it('should enable a submit form when data when component url is set ', async () => {
-    const rendered = render(
-      <RegisterComponentForm onSubmit={jest.fn()} submitting={false} />,
-    );
+    const rendered = render(<RegisterComponentForm onSubmit={jest.fn()} />);
    const input = (await rendered.getByRole('textbox')) as HTMLInputElement;
    fireEvent.change(input, {
      target: { value: 'https://example.com/blob/master/service.yaml' },
@@ -47,9 +44,7 @@ describe('RegisterComponentForm', () => {
  });

  it('should hide input on submission ', async () => {
-    const rendered = render(
-      <RegisterComponentForm onSubmit={jest.fn()} submitting />,
-    );
+    const rendered = render(<RegisterComponentForm onSubmit={jest.fn()} />);

    expect(
      await rendered.findByText(
@@ -36,18 +36,16 @@ import {
  Page,
  pageTheme,
  Content,
-  ContentHeader,
-  SupportButton,
  useApi,
  errorApiRef,
  StructuredMetadataTable,
  Header,
 } from '@backstage/core';
 import RegisterComponentForm from '../RegisterComponentForm';
-import { catalogApiRef } from '@backstage/plugin-catalog';
 import {
  entityRoute,
  rootRoute as catalogRootRoute,
+  catalogApiRef
 } from '@backstage/plugin-catalog';
 import { generatePath } from 'react-router';

@@ -24,6 +24,7 @@
    "@material-ui/lab": "4.0.0-alpha.45",
    "react": "^16.13.1",
    "react-dom": "^16.13.1",
+    "react-router-dom": "^5.2.0",
    "react-use": "^14.2.0"
  },
  "devDependencies": {