Skip to content

Page default fix #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sergesoroka wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Page default fix #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f79eab3
Fixed: default page number when one goes back to Finalized
sergesoroka Apr 10, 2025
2e09186
Test for default page number
sergesoroka Apr 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions cypress/e2e/routing.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
});
6 changes: 5 additions & 1 deletion src/DataTable/TemplateTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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>
Expand Down
19 changes: 9 additions & 10 deletions src/DialogComp/CreateNewDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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();
Expand Down
5 changes: 4 additions & 1 deletion src/StartScreenComp/StartScreenComp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down