Skip to content

Commit b3d07e4

Browse files
ArneiArnei
committed
Merge remote-tracking branch 'upstream/r/17.x' into r/18.x
2 parents 6ca5dd7 + f34aee0 commit b3d07e4

39 files changed

Lines changed: 218 additions & 120 deletions

‎src/components/configuration/partials/ThemesActionsCell.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ const ThemesActionsCell = ({
4848
onClick={() => showThemeDetails()}
4949
className={"more"}
5050
editAccessRole={"ROLE_UI_THEMES_EDIT"}
51-
tooltipText={"CONFIGURATION.THEMES.TABLE.TOOLTIP.DETAILS"}
51+
// tooltipText={"CONFIGURATION.THEMES.TABLE.TOOLTIP.DETAILS"} // Disabled due to performance concerns
5252
/>
5353

5454
{/* themes details modal */}
@@ -64,7 +64,7 @@ const ThemesActionsCell = ({
6464
{/* delete themes */}
6565
<ActionCellDelete
6666
editAccessRole={"ROLE_UI_THEMES_DELETE"}
67-
tooltipText={"CONFIGURATION.THEMES.TABLE.TOOLTIP.DELETE"}
67+
// tooltipText={"CONFIGURATION.THEMES.TABLE.TOOLTIP.DELETE"} // Disabled due to performance concerns
6868
resourceId={row.id}
6969
resourceName={row.name}
7070
resourceType={"THEME"}

‎src/components/events/Events.tsx‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ import {
2626
setShowActions,
2727
} from "../../slices/eventSlice";
2828
import EventDetailsModal from "./partials/modals/EventDetailsModal";
29-
import { showModal } from "../../selectors/eventDetailsSelectors";
3029
import { eventsLinks } from "./partials/EventsNavigation";
3130
import { Modal, ModalHandle } from "../shared/modals/Modal";
3231
import TableActionDropdown from "../shared/TableActionDropdown";
3332
import TablePage from "../shared/TablePage";
33+
import SeriesDetailsModal from "./partials/modals/SeriesDetailsModal";
3434

3535
/**
3636
* This component renders the table view of events
@@ -39,8 +39,6 @@ const Events = () => {
3939
const { t } = useTranslation();
4040
const dispatch = useAppDispatch();
4141

42-
const displayEventDetailsModal = useAppSelector(state => showModal(state));
43-
4442
const newEventModalRef = useRef<ModalHandle>(null);
4543
const startTaskModalRef = useRef<ModalHandle>(null);
4644
const deleteModalRef = useRef<ModalHandle>(null);
@@ -156,9 +154,8 @@ const Events = () => {
156154
</Modal>
157155

158156
{/* Include table modal */}
159-
{displayEventDetailsModal &&
160-
<EventDetailsModal />
161-
}
157+
<EventDetailsModal />
158+
<SeriesDetailsModal />
162159
</>
163160
);
164161
};

‎src/components/events/Series.tsx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,15 @@ import { Modal, ModalHandle } from "../shared/modals/Modal";
2020
import { availableHotkeys } from "../../configs/hotkeysConfig";
2121
import TableActionDropdown from "../shared/TableActionDropdown";
2222
import TablePage from "../shared/TablePage";
23+
import SeriesDetailsModal from "./partials/modals/SeriesDetailsModal";
2324

2425
/**
2526
* This component renders the table view of series
2627
*/
2728
const Series = () => {
2829
const { t } = useTranslation();
2930
const dispatch = useAppDispatch();
31+
3032
const newSeriesModalRef = useRef<ModalHandle>(null);
3133
const deleteModalRef = useRef<ModalHandle>(null);
3234

@@ -90,6 +92,9 @@ const Series = () => {
9092
>
9193
<DeleteSeriesModal close={() => deleteModalRef.current?.close?.()} />
9294
</Modal>
95+
96+
{/* Include table modal */}
97+
<SeriesDetailsModal />
9398
</>
9499
);
95100
};

‎src/components/events/partials/EventActionCell.tsx‎

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,22 @@ import { useTranslation } from "react-i18next";
33
import EmbeddingCodeModal from "./modals/EmbeddingCodeModal";
44
import { getUserInformation } from "../../../selectors/userInfoSelectors";
55
import { hasAccess } from "../../../utils/utils";
6-
import SeriesDetailsModal from "./modals/SeriesDetailsModal";
76
import { EventDetailsPage } from "./modals/EventDetails";
87
import { useAppDispatch, useAppSelector } from "../../../store";
98
import {
109
fetchSeriesDetailsAcls,
1110
fetchSeriesDetailsMetadata,
1211
fetchSeriesDetailsTheme,
1312
fetchSeriesDetailsThemeNames,
13+
openModal as openSeriesModal,
1414
} from "../../../slices/seriesDetailsSlice";
1515
import { Event, deleteEvent } from "../../../slices/eventSlice";
1616
import { Tooltip } from "../../shared/Tooltip";
1717
import { openModal } from "../../../slices/eventDetailsSlice";
1818
import { ActionCellDelete } from "../../shared/ActionCellDelete";
1919
import { Modal, ModalHandle } from "../../shared/modals/Modal";
2020
import ButtonLikeAnchor from "../../shared/ButtonLikeAnchor";
21+
import { SeriesDetailsPage } from "./modals/SeriesDetails";
2122

2223
/**
2324
* This component renders the action cells of events in the table view
@@ -30,7 +31,6 @@ const EventActionCell = ({
3031
const { t } = useTranslation();
3132
const dispatch = useAppDispatch();
3233

33-
const seriesDetailsModalRef = useRef<ModalHandle>(null);
3434
const embeddingCodeModalRef = useRef<ModalHandle>(null);
3535

3636
const user = useAppSelector(state => getUserInformation(state));
@@ -44,7 +44,7 @@ const EventActionCell = ({
4444
};
4545

4646
const showSeriesDetailsModal = () => {
47-
seriesDetailsModalRef.current?.open();
47+
dispatch(openSeriesModal(SeriesDetailsPage.Metadata, row.series ? row.series : null));
4848
};
4949

5050
const onClickSeriesDetails = async () => {
@@ -78,20 +78,12 @@ const EventActionCell = ({
7878

7979
return (
8080
<>
81-
{!!row.series && (
82-
<SeriesDetailsModal
83-
seriesId={row.series.id}
84-
seriesTitle={row.series.title}
85-
modalRef={seriesDetailsModalRef}
86-
/>
87-
)}
88-
8981
{/* Open event details */}
9082
<ButtonLikeAnchor
9183
onClick={onClickEventDetails}
9284
className={"more"}
9385
editAccessRole={"ROLE_UI_EVENTS_DETAILS_VIEW"}
94-
tooltipText={"EVENTS.EVENTS.TABLE.TOOLTIP.DETAILS"}
86+
// tooltipText={"EVENTS.EVENTS.TABLE.TOOLTIP.DETAILS"} // Disabled due to performance concerns
9587
/>
9688

9789
{/* If event belongs to a series then the corresponding series details can be opened */}
@@ -100,14 +92,14 @@ const EventActionCell = ({
10092
onClick={onClickSeriesDetails}
10193
className={"more-series"}
10294
editAccessRole={"ROLE_UI_SERIES_DETAILS_VIEW"}
103-
tooltipText={"EVENTS.SERIES.TABLE.TOOLTIP.DETAILS"}
95+
// tooltipText={"EVENTS.SERIES.TABLE.TOOLTIP.DETAILS"} // Disabled due to performance concerns
10496
/>
10597
)}
10698

10799
{/* Delete an event */}
108100
<ActionCellDelete
109101
editAccessRole={"ROLE_UI_EVENTS_DELETE"}
110-
tooltipText={"EVENTS.EVENTS.TABLE.TOOLTIP.DELETE"}
102+
// tooltipText={"EVENTS.EVENTS.TABLE.TOOLTIP.DELETE"} // Disabled due to performance concerns
111103
resourceId={row.id}
112104
resourceName={row.title}
113105
resourceType={"EVENT"}
@@ -116,29 +108,29 @@ const EventActionCell = ({
116108

117109
{/* If the event has an preview then the editor can be opened and status if it needs to be cut is shown */}
118110
{!!row.has_preview && hasAccess("ROLE_UI_EVENTS_EDITOR_VIEW", user) && (
119-
<Tooltip
120-
title={
121-
row.needs_cutting
122-
? t("EVENTS.EVENTS.TABLE.TOOLTIP.EDITOR_NEEDS_CUTTING")
123-
: t("EVENTS.EVENTS.TABLE.TOOLTIP.EDITOR")
124-
}
125-
>
111+
// <Tooltip // Disabled due to performance concerns
112+
// title={
113+
// row.needs_cutting
114+
// ? t("EVENTS.EVENTS.TABLE.TOOLTIP.EDITOR_NEEDS_CUTTING")
115+
// : t("EVENTS.EVENTS.TABLE.TOOLTIP.EDITOR")
116+
// }
117+
// >
126118
<a
127119
href={`/editor-ui/index.html?id=${row.id}`}
128120
className="cut"
129121
target="_blank" rel="noreferrer"
130122
>
131123
{row.needs_cutting && <span id="badge" className="badge" />}
132124
</a>
133-
</Tooltip>
125+
// </Tooltip>
134126
)}
135127

136128
{/* If the event has comments and no open comments then the comment tab of event details can be opened directly */}
137129
{row.has_comments && !row.has_open_comments && (
138130
<ButtonLikeAnchor
139131
onClick={() => onClickComments()}
140132
className={"comments"}
141-
tooltipText={"EVENTS.EVENTS.TABLE.TOOLTIP.COMMENTS"}
133+
// tooltipText={"EVENTS.EVENTS.TABLE.TOOLTIP.COMMENTS"} // Disabled due to performance concerns
142134
/>
143135
)}
144136

@@ -147,7 +139,7 @@ const EventActionCell = ({
147139
<ButtonLikeAnchor
148140
onClick={() => onClickComments()}
149141
className={"comments-open"}
150-
tooltipText={"EVENTS.EVENTS.TABLE.TOOLTIP.COMMENTS"}
142+
// tooltipText={"EVENTS.EVENTS.TABLE.TOOLTIP.COMMENTS"} // Disabled due to performance concerns
151143
/>
152144
)}
153145

@@ -158,7 +150,7 @@ const EventActionCell = ({
158150
onClick={() => onClickWorkflow()}
159151
className={"fa fa-warning"}
160152
editAccessRole={"ROLE_UI_EVENTS_DETAILS_WORKFLOWS_EDIT"}
161-
tooltipText={"EVENTS.EVENTS.TABLE.TOOLTIP.PAUSED_WORKFLOW"}
153+
// tooltipText={"EVENTS.EVENTS.TABLE.TOOLTIP.PAUSED_WORKFLOW"} // Disabled due to performance concerns
162154
/>
163155
}
164156

@@ -167,15 +159,15 @@ const EventActionCell = ({
167159
onClick={() => onClickAssets()}
168160
className={"fa fa-folder-open"}
169161
editAccessRole={"ROLE_UI_EVENTS_DETAILS_ASSETS_VIEW"}
170-
tooltipText={"EVENTS.EVENTS.TABLE.TOOLTIP.ASSETS"}
162+
// tooltipText={"EVENTS.EVENTS.TABLE.TOOLTIP.ASSETS"} // Disabled due to performance concerns
171163
/>
172164

173165
{/* Open dialog for embedded code*/}
174166
<ButtonLikeAnchor
175167
onClick={() => showEmbeddingCodeModal()}
176168
className={"fa fa-link"}
177169
editAccessRole={"ROLE_UI_EVENTS_EMBEDDING_CODE_VIEW"}
178-
tooltipText={"EVENTS.EVENTS.TABLE.TOOLTIP.EMBEDDING_CODE"}
170+
// tooltipText={"EVENTS.EVENTS.TABLE.TOOLTIP.EMBEDDING_CODE"} // Disabled due to performance concerns
179171
/>
180172

181173
{/* Embedding Code Modal */}

‎src/components/events/partials/EventsDateCell.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const EventsDateCell = ({
2121
filterName="startDate"
2222
fetchResource={fetchEvents}
2323
loadResourceIntoTable={loadEventsIntoTable}
24-
tooltipText="EVENTS.EVENTS.TABLE.TOOLTIP.START"
24+
// tooltipText="EVENTS.EVENTS.TABLE.TOOLTIP.START" // Disabled due to performance concerns
2525
/>
2626
);
2727
};

‎src/components/events/partials/EventsLocationCell.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const EventsLocationCell = ({
3333
<ButtonLikeAnchor
3434
onClick={() => addFilter(row.location)}
3535
className={"crosslink"}
36-
tooltipText={"EVENTS.EVENTS.TABLE.TOOLTIP.LOCATION"}
36+
// tooltipText={"EVENTS.EVENTS.TABLE.TOOLTIP.LOCATION"} // Disabled due to performance concerns
3737
>
3838
{row.location}
3939
</ButtonLikeAnchor>

‎src/components/events/partials/EventsPresentersCell.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const EventsPresentersCell = ({
1818
filterName="presentersBibliographic"
1919
fetchResource={fetchEvents}
2020
loadResourceIntoTable={loadEventsIntoTable}
21-
tooltipText="EVENTS.EVENTS.TABLE.TOOLTIP.PRESENTER"
21+
// tooltipText="EVENTS.EVENTS.TABLE.TOOLTIP.PRESENTER" // Disabled due to performance concerns
2222
/>
2323
);
2424
};

‎src/components/events/partials/EventsSeriesCell.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const EventsSeriesCell = ({
3737
: console.error("Tried to sort by a series, but the series did not exist.")
3838
}
3939
className={"crosslink"}
40-
tooltipText={"EVENTS.EVENTS.TABLE.TOOLTIP.SERIES"}
40+
// tooltipText={"EVENTS.EVENTS.TABLE.TOOLTIP.SERIES"} // Disabled due to performance concerns
4141
>
4242
{row.series.title}
4343
</ButtonLikeAnchor>

‎src/components/events/partials/EventsStatusCell.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const EventsStatusCell = ({
4444
<ButtonLikeAnchor
4545
onClick={() => openStatusModal()}
4646
className={"crosslink"}
47-
tooltipText={"EVENTS.EVENTS.TABLE.TOOLTIP.STATUS"}
47+
// tooltipText={"EVENTS.EVENTS.TABLE.TOOLTIP.STATUS"} // Disabled due to performance concerns
4848
>
4949
{t(row.displayable_status as ParseKeys)}
5050
</ButtonLikeAnchor>

‎src/components/events/partials/EventsTechnicalDateCell.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const EventsTechnicalDateCell = ({
3636
<ButtonLikeAnchor
3737
onClick={() => addFilter(row.date)}
3838
className={"crosslink"}
39-
tooltipText={"EVENTS.EVENTS.TABLE.TOOLTIP.START"}
39+
// tooltipText={"EVENTS.EVENTS.TABLE.TOOLTIP.START"} // Disabled due to performance concerns
4040
>
4141
{t("dateFormats.date.short", { date: renderValidDate(row.technical_start) })}
4242
</ButtonLikeAnchor>

0 commit comments

Comments
 (0)