passed entriesIds and some cleanup

Author: vmonakhov

src/components/LexicalEntryByIds/PerspectiveView/index.js

@@ -49,11 +49,11 @@ export const queryPerspective = gql`
 `;
 
 export const queryLexicalEntries = gql`
-  query queryPerspective2($id: LingvodocID!, $entitiesMode: String!) {
+  query queryPerspective2($id: LingvodocID!, $entitiesMode: String!, $entriesIds: [LingvodocID]!) {
     perspective(id: $id) {
       id
       translations
-      lexical_entries(mode: $entitiesMode) {
+      lexical_entries(mode: $entitiesMode, ids: $entriesIds) {
         id
         parent_id
         created_at
@@ -186,7 +186,7 @@ const P = ({
   columns,
   setSortByField: setSort,
   changePage,
-  entriesIds,
+  //entriesIds,
   createLexicalEntry,
   // mergeLexicalEntries,
   removeLexicalEntries,
@@ -340,7 +340,7 @@ const P = ({
   ]);
 
   const newEntries = processEntries(lexicalEntries.filter(e => !!createdEntries.find(c => isEqual(e.id, c.id))));
-  const entries = processEntries(lexicalEntries.filter(e => !!entriesIds.find(entryId => isEqual(e.id, entryId))));
+  const entries = processEntries(lexicalEntries);
 
   const pageEntries =
     entries.length > ROWS_PER_PAGE ? take(drop(entries, ROWS_PER_PAGE * (page - 1)), ROWS_PER_PAGE) : entries;
@@ -446,6 +446,7 @@ P.propTypes = {
   className: PropTypes.string.isRequired,
   page: PropTypes.number.isRequired,
   mode: PropTypes.string.isRequired,
+  entriesIds: PropTypes.array.isRequired,
   entitiesMode: PropTypes.string.isRequired,
   filter: PropTypes.string,
   data: PropTypes.object.isRequired,
@@ -576,6 +577,7 @@ PerspectiveViewWrapper.propTypes = {
   className: PropTypes.string.isRequired,
   page: PropTypes.number.isRequired,
   mode: PropTypes.string.isRequired,
+  entriesIds: PropTypes.array.isRequired,
   entitiesMode: PropTypes.string.isRequired,
   filter: PropTypes.string,
   data: PropTypes.object.isRequired,

src/components/PerspectiveView/index.js

@@ -473,12 +473,10 @@ class P extends React.Component {
               (data) => {
                 if (!loading && !error) {
                   const result = cloneDeep(data);
-                  const current_entries = result.perspective.perspective_page.lexical_entries;
-                  const selectedEntriesStr = selectedEntries.map(id => id.toString());
+                  const perspective_page = result.perspective.perspective_page;
+                  perspective_page.lexical_entries = (
+                    perspective_page.lexical_entries.filter(c => !selectedEntries.find(s_id => isEqual(c.id, s_id))));
 
-                  result.perspective.perspective_page.lexical_entries = (
-                    current_entries.filter(({id}) => !selectedEntriesStr.includes(id.toString())));
-                          
                   return result;
                 }
                 return undefined;

src/ducks/perspective.js

@@ -61,8 +61,7 @@ function createdEntries(state = [], { type, payload }) {
     case ADD_LEXICAL_ENTRY:
       return [payload, ...state];
     case REMOVE_ADDED_LEXES:
-      const selected = payload.map(id => id.toString());
-      return state.filter(({id}) => !selected.includes(id.toString()));
+      return state.filter(s => !payload.find(p_id => isEqual(s.id, p_id)));
     case RESET_ADDED_LEXES:
       return [];
     default: