Move GiveFeedbackAddon out of initial branch merge

Co-authored-by: Eric Peterson <iamEAP@users.noreply.github.com>
Co-authored-by: Anders Näsman <realandersn@users.noreply.github.com>
Signed-off-by: Otto Sichert <git@ottosichert.de>

packages/app/package.json

@@ -52,7 +52,6 @@
     "@backstage/plugin-shortcuts": "^0.2.5-next.0",
     "@backstage/plugin-tech-radar": "^0.5.11-next.1",
     "@backstage/plugin-techdocs": "^1.0.1-next.1",
-    "@backstage/techdocs-addons": "^0.0.0",
     "@backstage/plugin-todo": "^0.2.6-next.0",
     "@backstage/plugin-user-settings": "^0.4.3-next.0",
     "@backstage/plugin-tech-insights": "^0.1.14-next.0",

packages/app/src/App.tsx

@@ -68,14 +68,12 @@ import {
   TechDocsIndexPage,
   TechDocsReaderPage,
   techdocsPlugin,
-  GiveFeedbackAddon,
 } from '@backstage/plugin-techdocs';
 import {
   UserSettingsPage,
   UserSettingsTab,
 } from '@backstage/plugin-user-settings';
 import { AdvancedSettings } from './components/advancedSettings';
-import { TechDocsAddons } from '@backstage/techdocs-addons';
 import AlarmIcon from '@material-ui/icons/Alarm';
 import React from 'react';
 import { hot } from 'react-hot-loader/root';
@@ -181,9 +179,6 @@ const routes = (
       element={<TechDocsReaderPage />}
     >
       {techDocsPage}
-      <TechDocsAddons>
-        <GiveFeedbackAddon />
-      </TechDocsAddons>
     </Route>
     <Route
       path="/create"

packages/app/src/components/catalog/EntityPage.tsx

@@ -104,10 +104,7 @@ import {
   isRollbarAvailable,
 } from '@backstage/plugin-rollbar';
 import { EntitySentryContent } from '@backstage/plugin-sentry';
-import {
-  EntityTechdocsContent,
-  GiveFeedbackAddon,
-} from '@backstage/plugin-techdocs';
+import { EntityTechdocsContent } from '@backstage/plugin-techdocs';
 import { EntityTodoContent } from '@backstage/plugin-todo';
 import { Button, Grid } from '@material-ui/core';
 import BadgeIcon from '@material-ui/icons/CallToAction';
@@ -141,7 +138,6 @@ import {
 import { EntityGoCdContent, isGoCdAvailable } from '@backstage/plugin-gocd';
 
 import React, { ReactNode, useMemo, useState } from 'react';
-import { TechDocsAddons } from '@backstage/techdocs-addons';
 
 const customEntityFilterKind = ['Component', 'API', 'System'];
 
@@ -401,11 +397,7 @@ const serviceEntityPage = (
     </EntityLayout.Route>
 
     <EntityLayout.Route path="/docs" title="Docs">
-      <EntityTechdocsContent>
-        <TechDocsAddons>
-          <GiveFeedbackAddon />
-        </TechDocsAddons>
-      </EntityTechdocsContent>
+      <EntityTechdocsContent />
     </EntityLayout.Route>
 
     <EntityLayout.Route
@@ -472,11 +464,7 @@ const websiteEntityPage = (
     </EntityLayout.Route>
 
     <EntityLayout.Route path="/docs" title="Docs">
-      <EntityTechdocsContent>
-        <TechDocsAddons>
-          <GiveFeedbackAddon />
-        </TechDocsAddons>
-      </EntityTechdocsContent>
+      <EntityTechdocsContent />
     </EntityLayout.Route>
     <EntityLayout.Route
       if={isNewRelicDashboardAvailable}
@@ -515,11 +503,7 @@ const defaultEntityPage = (
     </EntityLayout.Route>
 
     <EntityLayout.Route path="/docs" title="Docs">
-      <EntityTechdocsContent>
-        <TechDocsAddons>
-          <GiveFeedbackAddon />
-        </TechDocsAddons>
-      </EntityTechdocsContent>
+      <EntityTechdocsContent />
     </EntityLayout.Route>
 
     <EntityLayout.Route path="/todos" title="TODOs">