getDocument returns relations.

huridocs · Mar 30, 2021 · 213afc6 · 213afc6
1 parent 953b4c8
commit 213afc6
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 32 deletions.
diff --git a/app/react/Documents/components/DocumentSidePanel.js b/app/react/Documents/components/DocumentSidePanel.js
@@ -271,7 +271,8 @@ export class DocumentSidePanel extends Component {
 
     const TocForm = this.props.tocFormComponent;
 
-    const { attachments, documents, language, defaultDoc } = doc.toJS();
+    const jsDoc = doc.delete('relations').toJS();
+    const { attachments, documents, language, defaultDoc } = jsDoc;
 
     const isEntity = !documents || !documents.length;
     const defaultDocumentToC =
@@ -404,16 +405,12 @@ export class DocumentSidePanel extends Component {
                     <div>
                       <ShowMetadata
                         relationships={relationships}
-                        entity={this.props.doc.toJS()}
+                        entity={jsDoc}
                         showTitle
                         showType
                         groupGeolocations
                       />
-                      <FileList
-                        files={documents}
-                        storeKey={this.props.storeKey}
-                        entity={doc.toJS()}
-                      />
+                      <FileList files={documents} storeKey={this.props.storeKey} entity={jsDoc} />
                       <AttachmentsList
                         attachments={attachments}
                         isTargetDoc={isTargetDoc}
@@ -437,7 +434,7 @@ export class DocumentSidePanel extends Component {
                 <ConnectionsGroups />
               </TabContent>
               <TabContent for="semantic-search-results">
-                <DocumentSemanticSearchResults doc={this.props.doc.toJS()} />
+                <DocumentSemanticSearchResults doc={jsDoc} />
               </TabContent>
             </Tabs>
           </div>

diff --git a/app/react/Layout/Item.js b/app/react/Layout/Item.js
@@ -36,7 +36,7 @@ export class Item extends Component {
       buttons,
     } = this.props;
 
-    const doc = this.props.doc.toJS();
+    const doc = this.props.doc.delete('relations').toJS();
     const Snippet = additionalText ? (
       <div className="item-snippet-wrapper">
         <div className="item-snippet">{additionalText}</div>

diff --git a/app/react/Library/components/Doc.js b/app/react/Library/components/Doc.js
@@ -67,7 +67,7 @@ export class Doc extends Component {
 
   render() {
     const { className, additionalText, targetReference } = this.props;
-    const doc = this.props.doc.toJS();
+    const doc = this.props.doc.delete('relations').toJS();
     const { sharedId, file, processed } = doc;
 
     let itemConnections = null;

diff --git a/app/react/Viewer/PDFView.js b/app/react/Viewer/PDFView.js
@@ -64,15 +64,7 @@ class PDFView extends Component {
     const { ref } = this.props.location.query;
     if (ref) {
       const reference = doc.get('relations').find(r => r.get('_id') === ref);
-      this.context.store.dispatch(
-        activateReference(
-          reference.toJS(),
-          doc
-            .get('defaultDoc')
-            .get('pdfInfo')
-            .toJS()
-        )
-      );
+      this.context.store.dispatch(activateReference(reference.toJS()));
     }
   }
 

diff --git a/app/react/Viewer/actions/documentActions.js b/app/react/Viewer/actions/documentActions.js
@@ -99,9 +99,7 @@ function getEntityDoc(entity, filename, defaultLanguage) {
 }
 
 export async function getDocument(requestParams, defaultLanguage, filename) {
-  const [entity] = (
-    await api.get('entities', requestParams.add({ omitRelationships: true }))
-  ).json.rows;
+  const [entity] = (await api.get('entities', requestParams)).json.rows;
 
   entity.defaultDoc = getEntityDoc(entity, filename, defaultLanguage);
   return entity;

diff --git a/app/react/Viewer/actions/specs/documentActions.spec.js b/app/react/Viewer/actions/specs/documentActions.spec.js
@@ -206,12 +206,12 @@ describe('documentActions', () => {
         .get(`${APIURL}documents/search?searchTerm=term&fields=%5B%22field%22%5D`, {
           body: JSON.stringify('documents'),
         })
-        .get(`${APIURL}entities?sharedId=targetId&omitRelationships=true`, {
+        .get(`${APIURL}entities?sharedId=targetId`, {
           body: JSON.stringify({
             rows: [{ documents: [{ pdfInfo: 'test' }] }],
           }),
         })
-        .get(`${APIURL}entities?sharedId=docCalledWithWrongPDFFilename&omitRelationships=true`, {
+        .get(`${APIURL}entities?sharedId=docCalledWithWrongPDFFilename`, {
           body: JSON.stringify({
             rows: [
               {
@@ -228,12 +228,12 @@ describe('documentActions', () => {
             ],
           }),
         })
-        .get(`${APIURL}entities?sharedId=docWithPDFRdy&omitRelationships=true`, {
+        .get(`${APIURL}entities?sharedId=docWithPDFRdy`, {
           body: JSON.stringify({
             rows: [{ documents: [{ pdfInfo: 'processed pdf', _id: 'pdfReady' }] }],
           }),
         })
-        .get(`${APIURL}entities?sharedId=docWithPDFNotRdy&omitRelationships=true`, {
+        .get(`${APIURL}entities?sharedId=docWithPDFNotRdy`, {
           body: JSON.stringify({
             rows: [
               {

diff --git a/app/react/Viewer/components/Connection.js b/app/react/Viewer/components/Connection.js
@@ -20,7 +20,8 @@ import { createSelector } from 'reselect';
 const selectDoc = createSelector(
   s => s.documentViewer.targetDoc,
   s => s.documentViewer.doc,
-  (targetDoc, doc) => (targetDoc.get('_id') ? targetDoc.toJS() : doc.toJS())
+  (targetDoc, doc) =>
+    targetDoc.get('_id') ? targetDoc.delete('relations').toJS() : doc.delete('relations').toJS()
 );
 
 export class Connection extends Component {

diff --git a/app/react/Viewer/components/Document.js b/app/react/Viewer/components/Document.js
@@ -104,13 +104,16 @@ export class Document extends Component {
   }
 
   render() {
-    const doc = this.props.doc.toJS();
     const { file } = this.props;
 
     const Header = this.props.header;
     return (
       <div>
-        <div className={`_${doc._id} document ${this.props.className} ${determineDirection(file)}`}>
+        <div
+          className={`_${this.props.doc.get('_id')} document ${
+            this.props.className
+          } ${determineDirection(file)}`}
+        >
           <Header />
           <div
             className="pages"

diff --git a/app/react/Viewer/specs/PDFView.spec.js b/app/react/Viewer/specs/PDFView.spec.js
@@ -137,15 +137,14 @@ describe('PDFView', () => {
     it('should activate text reference if query parameters have reference id', () => {
       spyOn(uiActions, 'activateReference');
       props.location = { query: { raw: 'false', ref: 'refId' }, pathname: 'pathname' };
-      const pdfInfo = { 1: { chars: 100 } };
       const reference = { _id: 'refId', range: { start: 200, end: 300 }, text: 'test' };
       const doc = fromJS({
-        defaultDoc: { pdfInfo },
+        defaultDoc: {},
         relations: [{ _id: 'otherRef' }, reference],
       });
       render();
       instance.onDocumentReady(doc);
-      expect(uiActions.activateReference).toHaveBeenCalledWith(reference, pdfInfo);
+      expect(uiActions.activateReference).toHaveBeenCalledWith(reference);
     });
 
     it('should emit documentLoaded event', () => {