Skip to content

Commit 4c06096

Browse files
authored
Merge pull request #1171 from owi92/tobira-tab
Fix visual errors and path validation in Tobira tab
2 parents 249e194 + 8d5b56a commit 4c06096

File tree

2 files changed

+13
-16
lines changed

2 files changed

+13
-16
lines changed

src/components/events/partials/ModalTabsAndPages/DetailsTobiraTab.tsx

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import NewTobiraPage, { TobiraFormProps } from "./NewTobiraPage";
1212
import { fetchSeriesDetailsTobira, removeSeriesTobiraPath, setTobiraTabHierarchy, TobiraData, updateSeriesTobiraPath } from "../../../../slices/seriesDetailsSlice";
1313
import { fetchSeriesDetailsTobiraNew, TobiraPage } from "../../../../slices/seriesSlice";
1414
import ConfirmModal from "../../../shared/ConfirmModal";
15-
import { Tooltip } from "../../../shared/Tooltip";
1615
import ButtonLikeAnchor from "../../../shared/ButtonLikeAnchor";
1716
import { ModalHandle } from "../../../shared/modals/Modal";
1817
import { fetchEventDetailsTobira } from "../../../../slices/eventDetailsSlice";
@@ -213,13 +212,12 @@ const TobiraTable = ({ tobiraData, i18nKey, openSubTab, handleDelete }: TobiraTa
213212
{tobiraData.hostPages.length === 0 && <tr>
214213
<td className="tobira-not-mounted">
215214
{t(`EVENTS.${i18nKey}.DETAILS.TOBIRA.NOT_MOUNTED`)}
216-
{i18nKey === "SERIES" && <Tooltip title={t("EVENTS.SERIES.DETAILS.TOBIRA.MOUNT_SERIES")}>
217-
<ButtonLikeAnchor
218-
style={{ margin: 5 }}
219-
extraClassName="edit fa fa-pencil-square pull-right"
220-
onClick={() => openSubTab("edit-path")}
221-
/>
222-
</Tooltip>}
215+
{i18nKey === "SERIES" && <ButtonLikeAnchor
216+
style={{ margin: 5 }}
217+
extraClassName="edit fa fa-pencil-square pull-right"
218+
onClick={() => openSubTab("edit-path")}
219+
tooltipText="EVENTS.SERIES.DETAILS.TOBIRA.MOUNT_SERIES"
220+
/>}
223221
</td>
224222
</tr>}
225223
{tobiraData.hostPages.map(hostPage => <tr key={hostPage.path}>

src/components/events/partials/ModalTabsAndPages/NewTobiraPage.tsx

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ const NewTobiraPage = <T extends TobiraFormProps>({
174174
segment: "",
175175
};
176176
dispatch(setTobiraPage({ ...currentPage, children: [...currentPage.children, newPage]}));
177-
select(newPage);
178177
};
179178

180179
const setPage = (
@@ -364,14 +363,14 @@ const NewTobiraPage = <T extends TobiraFormProps>({
364363
</p>
365364
{!mode.edit && <p style={{ fontSize: 12 }}>{t("EVENTS.SERIES.NEW.TOBIRA.DIRECT_LINK")}</p>}
366365
</>}
367-
{/* Render buttons for saving or resetting updated path */}
368-
{mode.edit && <SaveEditFooter
369-
active={formik.values.selectedPage !== undefined}
370-
reset={() => formik.setFieldValue("selectedPage", undefined)}
371-
submit={() => formik.handleSubmit()}
372-
{...{ isValid }}
373-
/>}
374366
</ModalContent>
367+
{/* Render buttons for saving or resetting updated path */}
368+
{mode.edit && <SaveEditFooter
369+
active={formik.values.selectedPage !== undefined}
370+
reset={() => formik.setFieldValue("selectedPage", undefined)}
371+
submit={() => formik.handleSubmit()}
372+
{...{ isValid }}
373+
/>}
375374

376375
{/* Button for navigation to next page and previous page */}
377376
{!mode.edit && <WizardNavigationButtons

0 commit comments

Comments
 (0)