From 596c54b0027ac6570f71036993e480c3e8040e18 Mon Sep 17 00:00:00 2001
From: kurpfish <ph4z3r_f@mail.ru>
Date: Mon, 9 Aug 2021 18:40:06 +0300
Subject: [PATCH] sort fixes

---
 src/components/Description/Description.js | 103 ++++++++++++----------
 src/redux/outstaffingSlice.js             |   2 +-
 2 files changed, 58 insertions(+), 47 deletions(-)

diff --git a/src/components/Description/Description.js b/src/components/Description/Description.js
index 17e298b7..313fa3b6 100644
--- a/src/components/Description/Description.js
+++ b/src/components/Description/Description.js
@@ -4,12 +4,13 @@ import male from '../../images/medium_male.png';
 import rectangle from '../../images/rectangle_secondPage.png';
 import { Link } from 'react-router-dom';
 import { LEVELS, SKILLS } from '../constants/constants';
-import { selectProfiles, selectFilteredCandidates } from '../../redux/outstaffingSlice';
+import { selectProfiles, selectFilteredCandidates, selectItems } from '../../redux/outstaffingSlice';
 import { useSelector } from 'react-redux';
 import { fetchProfile } from '../../server/server';
 
 const Description = ({ onLoadMore }) => {
   const candidatesListArr = useSelector(selectProfiles);
+  const itemsArr = useSelector(selectItems);
   const filteredListArr = useSelector(selectFilteredCandidates);
   const [allCandidates, getAllCandidates] = useState([]);
 
@@ -17,60 +18,69 @@ const Description = ({ onLoadMore }) => {
     fetchProfile(`${process.env.REACT_APP_API_URL}/api/profile?limit=`, 1000).then((p) => getAllCandidates(p));
   }, []);
 
+  console.log('render',filteredListArr, itemsArr)
+
+  if(!filteredListArr) {
+    return (
+      <section className={style.description}>
+        <div className="container">
+          <div className={style.description__wrapper}>
+          {
+            candidatesListArr.map((el) => (
+              <div className="row" key={el.id}>
+                <div className="col-2">
+                  <img className={style.description__img} src={male} alt="" />
+                </div>
+                <div className="col-12 col-xl-6">
+                  <h3 className={style.description__title}>
+                    {SKILLS[el.position_id]}, {LEVELS[el.level]}
+                  </h3>
+
+                  {el.vc_text_short ? (
+                    <div className={style.description__text}>{el.vc_text_short}</div>
+                  ) : (
+                    <p className={style.description__textSecondary}>Описание отсутствует...</p>
+                  )}
+                </div>
+                <div className="col-12 col-xl-4">
+                  <Link to={`/candidate/${el.id}`}>
+                    <button className={style.description__button}>Подробное резюме</button>
+                  </Link>
+                </div>
+                <div className="col-xl-2"></div>
+                <div className="col-12 col-xl-6">
+                  <ul className={style.description__list}>
+                    {el.skillValues.map((e) => (
+                      <li key={e.id} className={style.description__list__item}>
+                        {e.skill.name}
+                      </li>
+                    ))}
+                  </ul>
+                  <img className={style.description__rectangle} src={rectangle} alt="" />
+                </div>
+                <div className="col-xl-4"></div>
+              </div>
+            ))}
+          </div>
+  
+        </div>
+      </section>
+    );
+  }
+
   return (
     <section className={style.description}>
       <div className="container">
         <div className={style.description__wrapper}>
           {filteredListArr
-            ? (filteredListArr.length > 0 
-              ? <></> 
-              : filteredListArr.map((el) => (
-                  <div className="row" key={el.id}>
-                    <div className="col-2">
-                      <img className={style.description__img} src={male} alt="" />
-                    </div>
-                    <div className="col-12 col-xl-6">
-                      <h3 className={style.description__title}>
-                        <Link to={`/candidate/${el.id}`}>
-                          {SKILLS[el.position_id]}, {LEVELS[el.level]}
-                        </Link>
-                      </h3>
-
-                      {el.vc_text_short ? (
-                        <div className={style.description__text}>{el.vc_text_short}</div>
-                      ) : (
-                        <p className={style.description__textSecondary}>Описание отсутствует...</p>
-                      )}
-                    </div>
-                    <div className="col-12 col-xl-4">
-                      <Link to={`/candidate/${el.id}`}>
-                        <button className={style.description__button}>Подробное резюме</button>
-                      </Link>
-                    </div>
-                    <div className="col-xl-2"></div>
-                    <div className="col-12 col-xl-6">
-                      <ul className={style.description__list}>
-                        {el.skillValues.map((e) => (
-                          <li key={e.id} className={style.description__list__item}>
-                            {e.skill.name}
-                          </li>
-                        ))}
-                      </ul>
-                      <img className={style.description__rectangle} src={rectangle} alt="" />
-                    </div>
-                    <div className="col-xl-4"></div>
-                  </div>
-                )))
-            : candidatesListArr.map((el) => (
+            ? filteredListArr.map((el) => (
                 <div className="row" key={el.id}>
                   <div className="col-2">
                     <img className={style.description__img} src={male} alt="" />
                   </div>
                   <div className="col-12 col-xl-6">
                     <h3 className={style.description__title}>
-                      <Link to={`/candidate/${el.id}`}>
-                        {SKILLS[el.position_id]}, {LEVELS[el.level]}
-                      </Link>
+                      {SKILLS[el.position_id]}, {LEVELS[el.level]}
                     </h3>
 
                     {el.vc_text_short ? (
@@ -97,14 +107,15 @@ const Description = ({ onLoadMore }) => {
                   </div>
                   <div className="col-xl-4"></div>
                 </div>
-              ))}
+              ))
+            : filteredListArr.length && filteredListArr.length === 0 && <></> }
         </div>
 
         <div className="row">
           <div className="col-12">
             <div className={style.description__footer}>
               <div className={style.description__footer__btn}>
-                {candidatesListArr.length !== allCandidates.length && filteredListArr.length === 0 ? (
+                {(candidatesListArr.length !== allCandidates.length && filteredListArr.length > 0) || filteredListArr===null ? (
                   <button onClick={() => onLoadMore(2)}>Загрузить еще</button>
                 ) : null}
               </div>
diff --git a/src/redux/outstaffingSlice.js b/src/redux/outstaffingSlice.js
index a2e893f9..44f9fdaf 100644
--- a/src/redux/outstaffingSlice.js
+++ b/src/redux/outstaffingSlice.js
@@ -3,7 +3,7 @@ import { createSlice } from '@reduxjs/toolkit';
 const initialState = {
   tags: [],
   profiles: [],
-  filteredCandidates: [],
+  filteredCandidates:null,
   selectedItems: [],
   currentCandidate: {},
   auth: false,