fix: изменена структура хранения статусов ui

Author: daria-z

src/js/model/feed.js

@@ -6,16 +6,17 @@ import { addNew } from "./post.js";
 import { handle } from "./error.js";
 
 export const fetchAndParse = (url) => {
-  state.ui.pending = true;
+  // state.ui.pending = true;
+  state.ui.status = 'pending';
   // state.ui.error = null;
   return fetchRssData(url)
     .then((xmlString) => {
-      state.ui.pending = false;
-      state.ui.success = true;
+      // state.ui.pending = false;
+      state.ui.status = 'success';
       return parseRss(xmlString);
     })
     .catch((error) => {
-      state.ui.pending = false;
+      // state.ui.pending = false;
       handle(error, error.message === "noRss" ? "parse" : "fetch");
       throw error;
     });

src/js/model/form.js

@@ -9,14 +9,16 @@ const schema = yup
   .test("no-duplicate", "exists", (value) => !state.feedsList.includes(value));
 
 export const validateInput = () => {
-  state.ui.success = false;
+  // state.ui.success = false;
   return schema
-    .validate(state.form.inputValue)
-    .then(() => {
-      state.ui.error = null;
+  .validate(state.form.inputValue)
+  .then(() => {
+    state.ui.status = "success";
+    state.ui.error = null;
       return state.form.inputValue;
     })
     .catch((error) => {
+      state.ui.status = "error";
       state.ui.error = error.errors.join();
       throw error;
     });

src/js/state.js

@@ -13,41 +13,41 @@ const createState = () => {
     posts: [],
     activeItem: null,
     ui: {
+      status: null, // 'error', 'success', 'pending'
       error: null,
-      pending: false,
-      success: false,
     },
   };
 
   return onChange(object, (path, value) => {
     console.log(`состояние изменено: ${path}`, value);
-    if (path === "feeds") {
-      view.feeds.renderFeeds(value);
-      model.update.checkFeeds();
-    }
-    if (path === "posts") {
-      view.posts.renderPosts(value);
-    }
-    if (path === "activeItem") {
-      if (state.activeItem !== null) {
-        view.modal.showModal(state.activeItem);
-        model.post.markAsRead(state.activeItem.id);
-        view.posts.renderViewedPost(state.activeItem.id);
-      } else {
-        view.modal.closeModal();
-      }
-    }
-    if (path === "form.inputValue") {
-      view.form.renderInputValue(value);
-    }
-    if (path === "ui.error") {
-      view.ui.renderUi("error", value);
-    }
-    if (path === "ui.success") {
-      view.ui.renderUi("success");
-    }
-    if (path === "ui.pending") {
-      view.ui.renderUi("pending");
+    switch (path) {
+      case "feeds":
+        view.feeds.renderFeeds(value);
+        model.update.checkFeeds();
+        break;
+      case "posts":
+        view.posts.renderPosts(value);
+        break;
+      case "activeItem":
+        if (state.activeItem !== null) {
+          view.modal.showModal(state.activeItem);
+          model.post.markAsRead(state.activeItem.id);
+          view.posts.renderViewedPost(state.activeItem.id);
+        } else {
+          view.modal.closeModal();
+        }
+        break;
+      case "form.inputValue":
+        view.form.renderInputValue(value);
+        break;
+      case "ui.status":
+        view.ui.renderUi(value, state.ui.error);
+        break;
+      case "ui.error":
+        if (state.ui.status === "error") {
+          view.ui.renderUi("error", value);
+        }
+        break;
     }
   });
 };