redirect icons to detail page

brucean52 · Nov 20, 2019 · 9c4ba0a · 9c4ba0a
1 parent 911cfc4
commit 9c4ba0a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/src/components/search-result/search-result.module.scss b/src/components/search-result/search-result.module.scss
@@ -44,10 +44,17 @@
   }
 }
 
+.expandableIcon {
+	font-size: 15px;
+	margin-right: 5px;
+	cursor: pointer
+}
+
 .redirectIcons {
-	 float: right;
- }
+	float: right;
+}
 
 .redirectIcons a {
 	padding: 8px;
+	color: #666;
 }
diff --git a/src/components/search-result/search-result.tsx b/src/components/search-result/search-result.tsx
@@ -106,12 +106,12 @@ const SearchResult: React.FC<Props> = (props) => {
   return (
       <div style={{width: '100%'}}>
         <div className={styles.title} onClick={() => showTableEntityProperties()}>
-          <Icon style={{fontSize: '15px', marginRight: '5px'}} type='right' rotate={show ? 90 : undefined}/>
+          <Icon className={styles.expandableIcon} type='right' rotate={show ? 90 : undefined}/>
           <div className={styles.redirectIcons}>
-            <Link to={{pathname: `/detail/${primaryKeyValue}/${uri}`}} data-cy='primary-key'>
+            <Link to={{pathname: `/detail/${primaryKeyValue}/${uri}`,state: {selectedValue:'instance'}}} data-cy='primary-key'>
               <FontAwesomeIcon  icon={faExternalLinkAlt} size="sm" />
             </Link>
-            <Link to={{pathname: `/detail/${primaryKeyValue}/${uri}`}} data-cy='primary-key'>
+            <Link to={{pathname: `/detail/${primaryKeyValue}/${uri}`,state: {selectedValue:'source'}}} data-cy='primary-key'>
               <FontAwesomeIcon  icon={faCode} size="sm" />
             </Link>
           </div>

diff --git a/src/pages/Browse.tsx b/src/pages/Browse.tsx
@@ -20,6 +20,7 @@ interface Props extends RouteComponentProps<any> {
 }
 
 const Browse: React.FC<Props> = ({ location }) => {
+
   const { Content, Sider } = Layout;
   const componentIsMounted = useRef(true);
   const { user, handleError } = useContext(AuthContext);

diff --git a/src/pages/Detail.tsx b/src/pages/Detail.tsx
@@ -16,13 +16,13 @@ interface Props extends RouteComponentProps<any> { }
 const { Content } = Layout;
 
 const Detail: React.FC<Props> = ({ history, location }) => {
-  //console.log(history)
+
   const { user, handleError } = useContext(AuthContext);
   const uriSplit = location.pathname.replace('/detail/', '');
   const pkValue = uriSplit.split('/')[0] === '-' ? '' : decodeURIComponent(uriSplit.split('/')[0]);
   const uri = decodeURIComponent(uriSplit.split('/')[1]).replace(/ /g, "%2520");
   const docUri = uri.replace(/%25/g, "%");
-  const [selected, setSelected] = useState('instance');
+  const [selected, setSelected] = useState();
   const [data, setData] = useState();
   const [isLoading, setIsLoading] = useState(false);
   const [contentType, setContentType] = useState();
@@ -53,7 +53,12 @@ const Detail: React.FC<Props> = ({ history, location }) => {
             setData(xmlParser(decodedXml).Document);
             setXml(xmlDecoder(decodedXml));
           }
-
+          if(location.state.selectedValue === 'instance') {
+            setSelected('instance')
+          }
+          else{
+            setSelected('full')
+          }
           setIsLoading(false);
         }
 
@@ -72,6 +77,7 @@ const Detail: React.FC<Props> = ({ history, location }) => {
 
   }, []);
 
+
   const handleClick = (event) => {
     setSelected(event.key);
   }
@@ -99,11 +105,11 @@ const Detail: React.FC<Props> = ({ history, location }) => {
         </div>
         <div>
           {
-            isLoading || user.error.type === 'ALERT' ? <div style={{ marginTop: '40px' }}>
+          isLoading || user.error.type === 'ALERT' ? <div style={{ marginTop: '40px' }}>
               <AsyncLoader />
             </div>
               :
-              contentType === 'json' ?
+                contentType === 'json'  ?
                 selected === 'instance' ? (data && <TableView document={data} contentType={contentType} />) : (data && <JsonView document={data} />)
                 :
                 selected === 'instance' ? (data && <TableView document={data} contentType={contentType} />) : (data && <XmlView document={xml} />)