Skip to content

Commit c368711

Browse files
committed
4905: move regions length check outside of jsx, to only render if necessary
1 parent ecebca6 commit c368711

1 file changed

Lines changed: 37 additions & 37 deletions

File tree

assets/admin/components/screen/util/grid-generation-and-select.jsx

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,8 @@ function GridGenerationAndSelect({
158158
setSelectedPlaylists(selectedPlaylistsCopy);
159159
};
160160

161+
if (regions?.length === 0) return null;
162+
161163
return (
162164
<>
163165
<div className="col-md-4 my-3 my-md-0">
@@ -171,44 +173,42 @@ function GridGenerationAndSelect({
171173
</div>
172174
</div>
173175
<div className="col-md-12">
174-
{regions.length > 0 && (
175-
<>
176-
<h3 className="h5">{t("screen-form.screen-region-playlists")}</h3>
177-
<Tabs
178-
defaultActiveKey={regions[0]["@id"]}
179-
id="tabs"
180-
onSelect={setSelectedRegion}
181-
className="mb-3"
182-
>
183-
{regions &&
184-
regions.map((data) => (
185-
<Tab
186-
eventKey={data["@id"]}
187-
key={data["@id"]}
188-
title={data.title}
189-
>
190-
<PlaylistDragAndDrop
191-
id="playlist_drag_and_drop"
192-
handleChange={handleChange}
193-
removeFromList={removeFromList}
194-
name={data["@id"]}
195-
regionIdForInitializeCallback={data["@id"]}
196-
screenId={screenId}
197-
regionId={idFromUrl(data["@id"])}
198-
selectedPlaylists={selectedPlaylists.filter(
199-
({ region }) => region === idFromUrl(data["@id"]),
200-
)}
201-
/>
202-
{data?.type === "touch-buttons" && (
203-
<Alert key="screen-form-touch-buttons" variant="info">
204-
{t("screen-form.touch-region-helptext")}
205-
</Alert>
176+
<>
177+
<h3 className="h5">{t("screen-form.screen-region-playlists")}</h3>
178+
<Tabs
179+
defaultActiveKey={regions[0]["@id"]}
180+
id="tabs"
181+
onSelect={setSelectedRegion}
182+
className="mb-3"
183+
>
184+
{regions &&
185+
regions.map((data) => (
186+
<Tab
187+
eventKey={data["@id"]}
188+
key={data["@id"]}
189+
title={data.title}
190+
>
191+
<PlaylistDragAndDrop
192+
id="playlist_drag_and_drop"
193+
handleChange={handleChange}
194+
removeFromList={removeFromList}
195+
name={data["@id"]}
196+
regionIdForInitializeCallback={data["@id"]}
197+
screenId={screenId}
198+
regionId={idFromUrl(data["@id"])}
199+
selectedPlaylists={selectedPlaylists.filter(
200+
({ region }) => region === idFromUrl(data["@id"]),
206201
)}
207-
</Tab>
208-
))}
209-
</Tabs>
210-
</>
211-
)}
202+
/>
203+
{data?.type === "touch-buttons" && (
204+
<Alert key="screen-form-touch-buttons" variant="info">
205+
{t("screen-form.touch-region-helptext")}
206+
</Alert>
207+
)}
208+
</Tab>
209+
))}
210+
</Tabs>
211+
</>
212212
</div>
213213
</>
214214
);

0 commit comments

Comments
 (0)