#224 move server author over to use the view service

cra-client/src/Frame.js

@@ -15,7 +15,7 @@ import TypeExplorer from "./components/TypeExplorer/TypeExplorer";
 import Dino from "./components/Dino/Dino";
 import ServerAuthor from "./components/ServerAuthor/ServerAuthor";
 import { IdentificationContext } from "./contexts/IdentificationContext";
-import ServerAuthorContext from "./contexts/ServerAuthorContext";
+
 
 import {
   Header,
@@ -106,6 +106,9 @@ export default function Frame() {
                 expanded={userOpen}
               >
                 <Switcher aria-label="">
+                  <SwitcherItem    style={{ textAlign: 'left' }}>
+                    Logged in User: {userId}
+                  </SwitcherItem>
                   <SwitcherItem
                     aria-label=""
                     style={{ textAlign: 'left' }}
@@ -180,9 +183,7 @@ export default function Frame() {
                     <TypeExplorer />
                   </Route>
                   <Route path={serverUrl}>
-                    <ServerAuthorContext>
                       <ServerAuthor />
-                    </ServerAuthorContext>
                   </Route>
                   <Route path={dinoUrl}>
                     <Dino />

cra-client/src/components/GlossaryAuthor/components/GlossaryAuthorBreadCrumb.js

@@ -2,7 +2,7 @@
 /* Copyright Contributors to the ODPi Egeria project. */
 import React, { useState, useEffect } from "react";
 import { Breadcrumb, BreadcrumbItem } from "carbon-components-react";
-import { useLocation, withRouter, useHistory, Link } from "react-router-dom";
+import { useLocation, withRouter, Link } from "react-router-dom";
 
 function GlossaryAuthorBreadCrumb(props) {
   console.log("GlossaryAuthorBreadCrumb ");

cra-client/src/components/GlossaryAuthor/components/GlossaryQuickTerms.js

@@ -8,7 +8,7 @@ import Add32 from "../../../images/carbon/Egeria_add_32";
 import getNodeType from "./properties/NodeTypes.js";
 import { Button, Form, FormGroup, TextInput, Loading } from "carbon-components-react";
 
-import { issueRestCreate } from "./RestCaller";
+import { issueRestCreate } from "../../common/RestCaller";
 import { useHistory, withRouter } from "react-router-dom";
 
 function GlossaryQuickTerms(props) {

cra-client/src/components/GlossaryAuthor/components/authoringforms/NodeReadOnly.js

@@ -15,9 +15,9 @@ import {
   TableHeader,
   TableBody,
 } from "carbon-components-react";
-import { issueRestCreate } from "../RestCaller";
-import { issueRestUpdate } from "../RestCaller";
-import { issueRestDelete } from "../RestCaller";
+import { issueRestCreate } from "../../../common/RestCaller";
+import { issueRestUpdate } from "../../../common/RestCaller";
+import { issueRestDelete } from "../../../common/RestCaller";
 
 /**
  * Component to show the input page for a node that is about to be created or updated

cra-client/src/components/GlossaryAuthor/components/authoringforms/RelationshipReadOnly.js

@@ -15,9 +15,9 @@ import {
   TableHeader,
   TableBody,
 } from "carbon-components-react";
-import { issueRestCreate } from "../RestCaller";
-import { issueRestUpdate } from "../RestCaller";
-import { issueRestDelete } from "../RestCaller";
+import { issueRestCreate } from "../../../common/RestCaller";
+import { issueRestUpdate } from "../../../common/RestCaller";
+import { issueRestDelete } from "../../../common/RestCaller";
 
 /**
  * Component to show the page for a relationship that is about to be created or updated

cra-client/src/components/GlossaryAuthor/components/create/CreateGlossaryWizard.js

@@ -21,7 +21,7 @@ import { parse } from "date-fns";
  *  where the user can confirm the values that will be used to create the glossary.
  *
  * This component drives the NodeInput component, which displays the node. There are callbacks to the wizard
- * when the user has finsished with entering creation content.
+ * when the user has finished with entering creation content.
  * This component then drives NodeReadOnly which displays the confirmation screen, issues the create and then shows the results
  * of the create.
  *

cra-client/src/components/GlossaryAuthor/components/navigations/GlossaryAuthorCategoriesNavigation.js

@@ -17,7 +17,7 @@ import { Pagination, Toggle } from "carbon-components-react";
 import NodeTableView from "../views/NodeTableView";
 
 import getNodeType from "../properties/NodeTypes.js";
-import { issueRestGet, issueRestDelete } from "../RestCaller";
+import { issueRestGet, issueRestDelete } from "../../../common/RestCaller";
 
 import { Link } from "react-router-dom";
 

cra-client/src/components/GlossaryAuthor/components/navigations/GlossaryAuthorChildCategoriesNavigation.js

@@ -19,7 +19,7 @@ import NodeTableView from "../views/NodeTableView";
 //import GlossaryImage from "../../../images/Egeria_glossary_32";
 import getNodeType from "../properties/NodeTypes.js";
 import getPathTypesAndGuids from "../properties/PathAnalyser";
-import { issueRestGet, issueRestDelete } from "../RestCaller";
+import { issueRestGet, issueRestDelete } from "../../../common/RestCaller";
 
 import { Link } from "react-router-dom";
 

cra-client/src/components/GlossaryAuthor/components/navigations/GlossaryAuthorTermsNavigation.js

@@ -11,7 +11,7 @@ import Term32 from "../../../../images/odpi/Egeria_term_32";
 import { LocalNodeCard, NodeCardSection } from "../NodeCard/NodeCard";
 import { withRouter } from "react-router-dom";
 import getNodeType from "../properties/NodeTypes.js";
-import { issueRestGet, issueRestDelete } from "../RestCaller";
+import { issueRestGet, issueRestDelete } from "../../../common/RestCaller";
 import { Pagination, Toggle } from "carbon-components-react";
 import NodeTableView from "../views/NodeTableView";
 

cra-client/src/components/GlossaryAuthor/components/navigations/StartingNodeNavigation.js

@@ -14,7 +14,7 @@ import ParentChild32 from "../../../../images/carbon/Egeria_parent_child_32";
 import GlossaryImage from "../../../../images/odpi/Egeria_glossary_32";
 
 import { LocalNodeCard, NodeCardSection } from "../NodeCard/NodeCard";
-import { issueRestGet, issueRestDelete } from "../RestCaller";
+import { issueRestGet, issueRestDelete } from "../../../common/RestCaller";
 import useDebounce from "../useDebounce";
 import NodeTableView from "../views/NodeTableView";
 import getNodeType from "../properties/NodeTypes.js";

cra-client/src/components/GlossaryAuthor/components/update/UpdateNode.js

@@ -18,7 +18,7 @@ import {
   TableBody,
 } from "carbon-components-react";
 import Info16 from "@carbon/icons-react/lib/information/16";
-import { issueRestUpdate, issueRestGet } from "../RestCaller";
+import { issueRestUpdate, issueRestGet } from "../../../common/RestCaller";
 import { useHistory } from "react-router-dom";
 
 export default function UpdateNode(props) {

cra-client/src/components/GlossaryAuthor/components/update/UpdateRelationshipInline.js

@@ -17,7 +17,7 @@ import {
   TableBody,
 } from "carbon-components-react";
 import Info16 from "@carbon/icons-react/lib/information/16";
-import { issueRestUpdate } from "../RestCaller";
+import { issueRestUpdate } from "../../../common/RestCaller";
 
 export default function UpdateRelationshipInline(props) {
   const [updateBody, setUpdateBody] = useState({});

cra-client/src/components/GlossaryAuthor/components/visualisation/components/graph-controls/GraphControls.js

@@ -19,7 +19,7 @@ import SearchNodeButtonWidget                    from "./SearchNodeButtonWidget"
 
 import "../../glove.scss";
 
-import { issueRestGet } from "../../../RestCaller";
+import { issueRestGet } from "../../../../../common/RestCaller";
 
 
 export default function GraphControls(props) {

cra-client/src/components/GlossaryAuthor/components/visualisation/contexts/InstancesContext.js

@@ -4,7 +4,7 @@
 import React, { createContext, useContext, useState, useCallback } from "react";
 
 import PropTypes from "prop-types";
-import { issueRestGet } from "../../RestCaller";
+import { issueRestGet } from "../../../../common/RestCaller";
 import getNodeType from "../../properties/NodeTypes";
 import getRelationshipType from "../../properties/RelationshipTypes";
 import { useHistory } from "react-router";