Release 3.0.0 - audit fixes

assets/admin/components/playlist/playlist-campaign-manager.jsx

@@ -1,7 +1,6 @@
 import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useNavigate, useLocation } from "react-router-dom";
-import set from "lodash.set";
 import dayjs from "dayjs";
 import { useDispatch } from "react-redux";
 import idFromUrl from "../util/helpers/id-from-url";
@@ -281,7 +280,7 @@ function PlaylistCampaignManager({
    */
   const handleInput = ({ target }) => {
     const localFormStateObject = { ...formStateObject };
-    set(localFormStateObject, target.id, target.value);
+    localFormStateObject[target.id] = target.value;
     setFormStateObject(localFormStateObject);
   };
 

assets/admin/components/screen/screen-manager.jsx

@@ -1,6 +1,5 @@
 import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
-import set from "lodash.set";
 import { useNavigate } from "react-router-dom";
 import {
   usePostV2ScreensMutation,
@@ -96,7 +95,7 @@ function ScreenManager({
   const handleInput = ({ target }) => {
     let localFormStateObject = { ...formStateObject };
     localFormStateObject = JSON.parse(JSON.stringify(localFormStateObject));
-    set(localFormStateObject, target.id, target.value);
+    localFormStateObject[target.id] = target.value;
     setFormStateObject(localFormStateObject);
   };
 

assets/admin/components/slide/content/contacts/contact-form.jsx

@@ -1,4 +1,3 @@
-import set from "lodash.set";
 import { Col, Row } from "react-bootstrap";
 import { useTranslation } from "react-i18next";
 import FileSelector from "../file-selector";
@@ -28,7 +27,7 @@ function ContactForm({
    */
   const onInput = ({ target }) => {
     const localContact = { ...contact };
-    set(localContact, target.name, target.value);
+    localContact[target.name] = target.value;
     onChange(localContact);
   };
 

assets/admin/components/slide/content/feed-selector.jsx

@@ -2,7 +2,6 @@ import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Spinner } from "react-bootstrap";
 import { useDispatch } from "react-redux";
-import set from "lodash.set";
 import {
   enhancedApi,
   useGetV2FeedSourcesQuery,
@@ -100,12 +99,12 @@ function FeedSelector({
     const configuration = { ...value.configuration };
 
     if (target !== null) {
-      set(configuration, target.id, target.value);
+      configuration[target.id] = target.value;
     }
 
     if (targets !== null) {
       targets.forEach(({ id, value: targetValue }) => {
-        set(configuration, id, targetValue);
+        configuration[id] = targetValue;
       });
     }
 

assets/admin/components/slide/slide-manager.jsx

@@ -1,7 +1,5 @@
 import { useEffect, useState, useContext } from "react";
 import { useTranslation } from "react-i18next";
-import get from "lodash.get";
-import set from "lodash.set";
 import { ulid } from "ulid";
 import { useDispatch } from "react-redux";
 import dayjs from "dayjs";
@@ -155,7 +153,7 @@ function SlideManager({
    */
   const handleInput = ({ target }) => {
     const localFormStateObject = { ...formStateObject };
-    set(localFormStateObject, target.id, target.value);
+    localFormStateObject[target.id] = target.value;
     setFormStateObject(localFormStateObject);
   };
 
@@ -208,7 +206,7 @@ function SlideManager({
     const value =
       target.type === "number" ? target.valueAsNumber : target.value;
     const localFormStateObject = { ...formStateObject };
-    set(localFormStateObject.content, target.id, value);
+    localFormStateObject.content[target.id] = value;
     setFormStateObject(localFormStateObject);
   };
 
@@ -353,12 +351,12 @@ function SlideManager({
           // It is an already added temp file.
           if (entry.tempId) {
             newField.push(entry.tempId);
-            set(localMediaData, entry.tempId, entry);
+            localMediaData[entry.tempId] = entry;
           }
           // It is a new temp file.
           else {
             if (!Array.isArray(localFormStateObject.content[fieldId])) {
-              set(localFormStateObject.content, fieldId, []);
+              localFormStateObject.content[fieldId] = [];
             }
 
             // Create a tempId for the media.
@@ -369,7 +367,7 @@ function SlideManager({
 
             const newEntry = { ...entry };
             newEntry.tempId = tempId;
-            set(localMediaData, tempId, newEntry);
+            localMediaData[tempId] = newEntry;
           }
         }
         // Previously selected file.
@@ -383,18 +381,16 @@ function SlideManager({
           if (
             !Object.prototype.hasOwnProperty.call(localMediaData, entry["@id"])
           ) {
-            set(localMediaData, entry["@id"], entry);
+            localMediaData[entry["@id"]] = entry;
 
             localFormStateObject.media.push(entry["@id"]);
           }
         }
       });
     }
 
-    set(localFormStateObject.content, fieldId, newField);
-    set(localFormStateObject, "media", [
-      ...new Set([...localFormStateObject.media]),
-    ]);
+    localFormStateObject.content[fieldId] = newField;
+    localFormStateObject.media = [...new Set([...localFormStateObject.media])];
 
     setFormStateObject(localFormStateObject);
     setMediaData(localMediaData);
@@ -406,7 +402,7 @@ function SlideManager({
 
     // Setup submittingMedia list.
     mediaFields.forEach((fieldName) => {
-      const fieldData = get(formStateObject.content, fieldName);
+      const fieldData = formStateObject.content[fieldName];
 
       if (fieldData) {
         if (Array.isArray(fieldData)) {
@@ -548,33 +544,25 @@ function SlideManager({
 
   /** Submitted media is successful. */
   useEffect(() => {
-    if (submitting) {
-      if (isSaveMediaSuccess) {
-        const newSubmittingMedia = [...submittingMedia];
-        const submittedMedia = newSubmittingMedia.shift();
-
-        const newFormStateObject = { ...formStateObject };
-        newFormStateObject.media.push(savedMediaData["@id"]);
-
-        // Replace TEMP-- id with real id.
-        set(
-          newFormStateObject.content,
-          submittedMedia.fieldName,
-          get(newFormStateObject.content, submittedMedia.fieldName).map(
-            (mediaId) =>
-              mediaId === submittedMedia.tempId
-                ? savedMediaData["@id"]
-                : mediaId,
-          ),
+    if (submitting && isSaveMediaSuccess) {
+      const newSubmittingMedia = [...submittingMedia];
+      const submittedMedia = newSubmittingMedia.shift();
+
+      const newFormStateObject = { ...formStateObject };
+      newFormStateObject.media.push(savedMediaData["@id"]);
+
+      // Replace TEMP-- id with real id.
+      newFormStateObject.content[submittedMedia.fieldName] =
+        newFormStateObject.content[submittedMedia.fieldName].map((mediaId) =>
+          mediaId === submittedMedia.tempId ? savedMediaData["@id"] : mediaId,
         );
 
-        const newMediaData = { ...mediaData };
-        newMediaData[savedMediaData["@id"]] = savedMediaData;
-        setMediaData(newMediaData);
+      const newMediaData = { ...mediaData };
+      newMediaData[savedMediaData["@id"]] = savedMediaData;
+      setMediaData(newMediaData);
 
-        // Save new list.
-        setSubmittingMedia(newSubmittingMedia);
-      }
+      // Save the new list.
+      setSubmittingMedia(newSubmittingMedia);
     }
   }, [isSaveMediaSuccess]);
 

assets/admin/components/util/table/table-body.jsx

@@ -1,5 +1,4 @@
 import { Fragment } from "react";
-import get from "lodash.get";
 import useModal from "../../../context/modal-context/modal-context-hook";
 
 /**
@@ -23,7 +22,7 @@ function TableBody({ columns, data }) {
       return column.content(item);
     }
 
-    let cellData = get(item, column.path);
+    let cellData = item[column.path];
 
     if (column.dataFunction) {
       cellData = column.dataFunction(cellData);

assets/client/data-sync/pull-strategy.js

@@ -1,4 +1,3 @@
-import cloneDeep from "lodash.clonedeep";
 import isPublished from "../util/isPublished";
 import logger from "../logger/logger";
 import ApiHelper from "./api-helper";
@@ -136,7 +135,7 @@ class PullStrategy {
   async getSlidesForRegions(regions) {
     return new Promise((resolve, reject) => {
       const promises = [];
-      const regionData = cloneDeep(regions);
+      const regionData = structuredClone(regions);
 
       // @TODO: Fix eslint-raised issues.
       // eslint-disable-next-line guard-for-in,no-restricted-syntax
@@ -200,7 +199,7 @@ class PullStrategy {
       return;
     }
 
-    const newScreen = cloneDeep(screen);
+    const newScreen = structuredClone(screen);
 
     newScreen.hasActiveCampaign = false;
 
@@ -304,7 +303,7 @@ class PullStrategy {
         const dataEntrySlidesData = dataEntryPlaylist.slidesData;
 
         for (const slideKey of Object.keys(dataEntrySlidesData)) {
-          const slide = cloneDeep(dataEntrySlidesData[slideKey]);
+          const slide = structuredClone(dataEntrySlidesData[slideKey]);
 
           let previousSlide = null;
 
@@ -315,7 +314,7 @@ class PullStrategy {
             this.lastestScreenData.regionData[regionKey][playlistKey]
               .slidesData[slideKey]
           ) {
-            previousSlide = cloneDeep(
+            previousSlide = structuredClone(
               this.lastestScreenData.regionData[regionKey][playlistKey]
                 .slidesData[slideKey],
             );

assets/client/service/schedule-service.js

@@ -1,4 +1,3 @@
-import cloneDeep from "lodash.clonedeep";
 import sha256 from "crypto-js/sha256";
 import Md5 from "crypto-js/md5";
 import Base64 from "crypto-js/enc-base64";
@@ -214,7 +213,7 @@ class ScheduleService {
             return;
           }
 
-          const newSlide = cloneDeep(slide);
+          const newSlide = structuredClone(slide);
 
           // Execution id is the product of region, playlist and slide id, to ensure uniqueness in the client.
           const executionId = Md5(regionId + playlist["@id"] + slide["@id"]);

assets/tests/template/template-calendar.spec.js

@@ -1,8 +1,10 @@
 import { test, expect } from "@playwright/test";
 
-// Fixed time since calendar template filters events older than now.
+// Fixed time since the calendar template filters events older than now.
 const fixTime = async (page) => {
   const newDate = new Date();
+  newDate.setMonth(8);
+  newDate.setDate(15);
   newDate.setHours(6);
   newDate.setMinutes(0);
   await page.clock.install({ time: newDate });

docker-compose.override.yml

@@ -36,7 +36,7 @@ services:
   playwright:
     # https://playwright.dev/docs/docker
     # This Playwright version should match the one in `package.json`.
-    image: mcr.microsoft.com/playwright:v1.53.2
+    image: mcr.microsoft.com/playwright:v1.57.0
     networks:
       - app
     depends_on: