review fixes

huridocs · Mar 4, 2021 · d2fc5a9 · d2fc5a9
1 parent a9f8a39
commit d2fc5a9
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 41 deletions.
diff --git a/app/api/entities/entities.js b/app/api/entities/entities.js
@@ -164,7 +164,7 @@ async function updateEntity(entity, _template) {
         d.template = entity.template;
       }
 
-      if (typeof entity.template !== 'undefined') {
+      if (typeof entity.generatedToc !== 'undefined') {
         d.generatedToc = entity.generatedToc;
       }
       return model.save(d);

diff --git a/app/api/entities/specs/entities.spec.js b/app/api/entities/specs/entities.spec.js
@@ -376,6 +376,21 @@ describe('entities', () => {
       });
     });
 
+    describe('when generatedToc is undefined', () => {
+      it('should not replicate the value to all languages', async () => {
+        const doc = { _id: batmanFinishesId, sharedId: 'shared', generatedToc: true };
+        await entities.save(doc, { language: 'en' });
+        await entities.save({ _id: batmanFinishesId, sharedId: 'shared' }, { language: 'en' });
+        const [docES, docEN] = await Promise.all([
+          entities.getById('shared', 'es'),
+          entities.getById('shared', 'en'),
+        ]);
+
+        expect(docES.generatedToc).toBe(true);
+        expect(docEN.generatedToc).toBe(true);
+      });
+    });
+
     it('should sync select/multiselect/dates/multidate/multidaterange/numeric', done => {
       const doc = {
         _id: syncPropertiesEntityId,

diff --git a/app/api/search/elasticTypes.ts b/app/api/search/elasticTypes.ts
@@ -1,6 +1,6 @@
 import { RequestParams } from '@elastic/elasticsearch';
 import { RequestBody } from '@elastic/elasticsearch/lib/Transport';
-import { Aggregations } from 'shared/types/Aggregations.d.ts';
+import { Aggregations } from 'shared/types/Aggregations';
 
 interface ShardsResponse {
   total: number;

diff --git a/app/react/App/scss/modules/_search.scss b/app/react/App/scss/modules/_search.scss
@@ -249,7 +249,6 @@
   padding: 15px;
   color: $c-grey-dark;
 
-
   &:not(:last-child),
   .form-group:not(:last-child) & {
     border-bottom: 1px solid $c-grey-light;

diff --git a/app/react/Documents/components/DocumentSidePanel.js b/app/react/Documents/components/DocumentSidePanel.js
@@ -1,4 +1,3 @@
-/* eslint-disable max-lines */
 import { Tabs, TabLink, TabContent } from 'react-tabs-redux';
 import { browserHistory } from 'react-router';
 import { connect } from 'react-redux';

diff --git a/app/react/Documents/components/scss/showToc.scss b/app/react/Documents/components/scss/showToc.scss
@@ -49,4 +49,5 @@
   float: right;
   font-weight: normal;
   padding-right: 4px;
-}
+}
+
diff --git a/app/react/Documents/components/scss/toc.scss b/app/react/Documents/components/scss/toc.scss
@@ -1,5 +1,3 @@
-@import '../../../App/scss/config/_colors.scss';
-
 .tocHeader {
   h1 {
     display: inline-block;

diff --git a/app/react/ToggledFeatures/tocGeneration/TocGeneratedLabel.tsx b/app/react/ToggledFeatures/tocGeneration/TocGeneratedLabel.tsx
@@ -4,11 +4,11 @@ import { FileType } from 'shared/types/fileType';
 
 export interface TocGeneratedLabelProps {
   file: FileType;
-  children: JSX.Element | string;
+  children: React.ReactChild;
 }
 
 export const TocGeneratedLabel = ({ file, children }: TocGeneratedLabelProps) => (
   <FeatureToggle feature="tocGeneration">
-    {file.generatedToc && <span className="badge">{children}</span>}
+    {file.generatedToc && <div className="badge">{children}</div>}
   </FeatureToggle>
 );
diff --git a/app/react/ToggledFeatures/tocGeneration/specs/actions.spec.ts b/app/react/ToggledFeatures/tocGeneration/specs/actions.spec.ts
@@ -13,6 +13,14 @@ import { tocGenerationActions } from '../actions';
 const middlewares = [thunk];
 const mockStore = configureMockStore(middlewares);
 
+const createDoc = (generatedToc: boolean, fileId: string): ClientEntitySchema => ({
+  name: 'doc',
+  _id: 'id',
+  sharedId: 'sharedId',
+  defaultDoc: { _id: fileId, generatedToc },
+  documents: [{ _id: fileId, generatedToc }],
+});
+
 describe('reviewToc', () => {
   it('should store the document with the response of reviewToc', done => {
     mockID();
@@ -26,37 +34,8 @@ describe('reviewToc', () => {
       type: 'reloadRelationships',
     });
 
-    const doc: ClientEntitySchema = {
-      name: 'doc',
-      _id: 'id',
-      sharedId: 'sharedId',
-      defaultDoc: {
-        _id: fileId,
-        generatedToc: true,
-      },
-      documents: [
-        {
-          _id: fileId,
-          generatedToc: true,
-        },
-      ],
-    };
-
-    const updatedEntity = {
-      name: 'doc',
-      _id: 'id',
-      sharedId: 'sharedId',
-      defaultDoc: {
-        _id: fileId,
-        generatedToc: false,
-      },
-      documents: [
-        {
-          _id: fileId,
-          generatedToc: false,
-        },
-      ],
-    };
+    const doc = createDoc(true, fileId);
+    const updatedEntity = createDoc(false, fileId);
 
     const expectedActions = [
       { type: 'rrf/reset', model: 'documentViewer.sidepanel.metadata' },

diff --git a/app/shared/types/settingsSchema.ts b/app/shared/types/settingsSchema.ts
@@ -135,7 +135,7 @@ export const settingsSchema = {
         _id: { type: 'string' },
         tocGeneration: {
           type: 'object',
-          required: ['active', 'url'],
+          required: ['url'],
           additionalProperties: false,
           properties: {
             url: { type: 'string' },