From f79eab3bc4caecb4ddc6c91537312ecff01c4552 Mon Sep 17 00:00:00 2001
From: sergesoroka <sergesoroka@gmail.com>
Date: Thu, 10 Apr 2025 12:51:56 +0300
Subject: [PATCH 1/2] Fixed: default page number when one goes back to
 Finalized

---
 src/DataTable/TemplateTable.tsx         | 6 +++++-
 src/StartScreenComp/StartScreenComp.tsx | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/DataTable/TemplateTable.tsx b/src/DataTable/TemplateTable.tsx
index b19316b..bfaed2b 100644
--- a/src/DataTable/TemplateTable.tsx
+++ b/src/DataTable/TemplateTable.tsx
@@ -59,7 +59,7 @@ const columns = [
   },
 ];
 
-export default function TemplateTable({ data }) {
+export default function TemplateTable({ data, tabsMode }) {
   const [rowSelection, setRowSelection] = useState({});
   const [pagination, setPagination] = useState({
     pageIndex: 0,
@@ -110,6 +110,10 @@ export default function TemplateTable({ data }) {
     setIdShosen(data && rowSelection ? data[rowSelection]?.uuid : null);
   }, [rowSelection, pagination]);
 
+  useEffect(() => {
+    table.setPageIndex(0);
+  }, [tabsMode]);
+
   return (
     <div>
       <div>
diff --git a/src/StartScreenComp/StartScreenComp.tsx b/src/StartScreenComp/StartScreenComp.tsx
index ace189c..06d9a26 100644
--- a/src/StartScreenComp/StartScreenComp.tsx
+++ b/src/StartScreenComp/StartScreenComp.tsx
@@ -116,7 +116,10 @@ export default function StartScreenComp({}) {
       <Tabs setMode={setMode} tabsMode={tabsMode} />
       <div className="tableViewWrap">
         <div className="inputWrap">
-          <TemplateTable data={!isLoading && templateData} />
+          <TemplateTable
+            data={!isLoading && templateData}
+            tabsMode={tabsMode}
+          />
           <div className="buttonsWrap">
             {tabsMode == "Draft" && (
               <div

From 2e09186ae1b6c0f0b64503c7c04fcc450e2c38b3 Mon Sep 17 00:00:00 2001
From: sergesoroka <sergesoroka@gmail.com>
Date: Tue, 15 Apr 2025 12:29:52 +0300
Subject: [PATCH 2/2] Test for default page number

---
 cypress/e2e/routing.cy.js          |  8 ++++++++
 src/DialogComp/CreateNewDialog.tsx | 19 +++++++++----------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/cypress/e2e/routing.cy.js b/cypress/e2e/routing.cy.js
index 4dde687..7ed4351 100644
--- a/cypress/e2e/routing.cy.js
+++ b/cypress/e2e/routing.cy.js
@@ -51,4 +51,12 @@ describe("Routing-related navigation", () => {
     cy.get(".logoWrap").click();
     cy.get('[data-cy="draft"]').should("have.class", "tabActive");
   });
+
+  it("can set to default page number when go back on finalized", () => {
+    cy.get('[data-cy="draft"]').click();
+    cy.get('[data-cy="next-page"]').click();
+    cy.get('[data-cy="finalized"]').click();
+    // cy.get("tbody>tr>td").not(".nonSelected");
+    cy.get("table").find("tr").should("have.length.greaterThan", 1);
+  });
 });
diff --git a/src/DialogComp/CreateNewDialog.tsx b/src/DialogComp/CreateNewDialog.tsx
index 1a2573e..6623d83 100644
--- a/src/DialogComp/CreateNewDialog.tsx
+++ b/src/DialogComp/CreateNewDialog.tsx
@@ -1,23 +1,22 @@
 import * as Dialog from "@radix-ui/react-dialog";
-import React, { useEffect, useState } from "react";
-import config from "../utils/config";
+import React from "react";
 import { Model } from "survey-core";
 import { json } from "../SurveyComp/json";
-import Button from "@/ui/Button";
+import config from "../utils/config";
 
+import { Navigate } from "react-router-dom";
 import {
-  useSetUuid,
-  useUuid,
-  useName,
-  useSetName,
-  useAuthor,
-  useSetAuthor,
   useAcknowledgment,
+  useAuthor,
+  useName,
   useSetAcknowledgment,
+  useSetAuthor,
   useSetIsShosen,
+  useSetName,
+  useSetUuid,
+  useUuid,
 } from "../store/store";
 import "./styles.css";
-import { Navigate } from "react-router-dom";
 
 const CreateNewDialog = () => {
   const setUUID = useSetUuid();