From cd7dd487d528804ad20e5221e8af8f856da0aa36 Mon Sep 17 00:00:00 2001
From: Oladayo Fagbemi <oladayo.fagbemi@axelspringer.com>
Date: Thu, 6 Oct 2022 11:01:07 +0200
Subject: [PATCH 1/3] add custom validation

---
 .../components/Action/ActionFooter/index.js   | 51 +++++++++++++++----
 admin/src/components/ActionLayout/index.js    | 23 ++++++---
 2 files changed, 58 insertions(+), 16 deletions(-)

diff --git a/admin/src/components/Action/ActionFooter/index.js b/admin/src/components/Action/ActionFooter/index.js
index 0889ee5..fba01a7 100644
--- a/admin/src/components/Action/ActionFooter/index.js
+++ b/admin/src/components/Action/ActionFooter/index.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
 import PropTypes from 'prop-types';
+import { useCMEditViewDataManager, getYupInnerErrors } from '@strapi/helper-plugin';
 import { useReactQuery } from '../../../hooks/useReactQuery';
 import { getTrad } from '../../../utils/getTrad';
 import { Button } from '@strapi/design-system/Button';
@@ -10,6 +11,8 @@ import Cross from '@strapi/icons/Cross';
 import Write from '@strapi/icons/Write';
 import Pencil from '@strapi/icons/Pencil';
 import Trash from '@strapi/icons/Trash';
+import get from 'lodash/get';
+import isEmpty from 'lodash/isEmpty';
 
 const ActionFooter = ({
 	mode,
@@ -23,19 +26,46 @@ const ActionFooter = ({
 }) => {
 	const { formatMessage } = useIntl();
 	const { actionMutations } = useReactQuery();
+	const { createYupSchema, allLayoutData, layout, isCreatingEntry, modifiedData, dispatch } =
+		useCMEditViewDataManager();
 
 	// action handlers
+	const validateCMData = async () => {
+		const schema = createYupSchema(
+			layout,
+			{
+				components: get(allLayoutData, 'components', {}),
+			},
+			{ isCreatingEntry, isDraft: false, isFromComponent: false }
+		);
+		let errors = {};
+
+		try {
+			await schema.validate(modifiedData, { abortEarly: false });
+		} catch (err) {
+			errors = getYupInnerErrors(err);
+		}
+		dispatch({
+			type: 'SET_FORM_ERRORS',
+			errors,
+		});
+		return errors;
+	};
+
 	const handleActionSave = async () => {
 		try {
 			if (action.id) {
 				await actionMutations.update.mutate(action);
 			} else {
-				await actionMutations.create.mutate({
-					mode,
-					entityId,
-					entitySlug,
-					...action,
-				});
+				const errors = await validateCMData();
+				if (isEmpty(errors)) {
+					await actionMutations.create.mutate({
+						mode,
+						entityId,
+						entitySlug,
+						...action,
+					});
+				}
 			}
 			setIsDisabled(true);
 		} catch (error) {
@@ -47,8 +77,11 @@ const ActionFooter = ({
 		setIsDisabled(false);
 	};
 
-	const handleActionAdd = () => {
-		setIsVisible(true);
+	const handleActionAdd = async () => {
+		const errors = await validateCMData();
+		if (isEmpty(errors)) {
+			setIsVisible(true);
+		}
 	};
 
 	const handleActionDelete = async () => {
@@ -63,7 +96,7 @@ const ActionFooter = ({
 
 	// add action
 	if (!isVisible) {
-		const addActionButtonColor = mode === 'publish' ? 'default' : 'secondary';
+		const addActionButtonColor = mode === 'publish' ? 'primary' : 'secondary';
 		const addActionButtonIcon = mode === 'publish' ? <Check /> : <Cross />;
 		return (
 			<Button
diff --git a/admin/src/components/ActionLayout/index.js b/admin/src/components/ActionLayout/index.js
index f7989b8..fe28598 100644
--- a/admin/src/components/ActionLayout/index.js
+++ b/admin/src/components/ActionLayout/index.js
@@ -6,26 +6,35 @@ import { Box } from '@strapi/design-system/Box';
 import { ActionLayoutHeader } from './ActionLayoutHeader';
 import { Action } from '../Action';
 
-const actionModes = ['publish', 'unpublish'];
-
 const ActionLayout = () => {
-	const { slug, hasDraftAndPublish, isCreatingEntry } = useCMEditViewDataManager();
+	const {
+		hasDraftAndPublish,
+		isCreatingEntry,
+		initialData: { slug, publishedAt },
+	} = useCMEditViewDataManager();
 	const params = useParams();
 	const id = _get(params, 'id', null);
 	const currentEntityId = Number(id);
+	const isMainOfferPage = slug === '/';
+	const pageAlreadyPublished = publishedAt !== null;
 
-	if (!hasDraftAndPublish || isCreatingEntry) {
+	if (!hasDraftAndPublish || isCreatingEntry || isMainOfferPage) {
 		return null;
 	}
-
+	const actionModes = () => {
+		let actionModes = ['publish', 'unpublish'];
+		if (pageAlreadyPublished) {
+			actionModes = ['unpublish'];
+		}
+		return actionModes;
+	};
 	return (
 		<Box marginTop={4}>
 			<ActionLayoutHeader />
-			{actionModes.map((m, index) => (
+			{actionModes().map((m, index) => (
 				<Action mode={m} key={index} entitySlug={slug} entityId={currentEntityId} />
 			))}
 		</Box>
 	);
 };
-
 export { ActionLayout };

From abd6d12286251c10afb2be82d72a3b0691ab4dbb Mon Sep 17 00:00:00 2001
From: Oladayo Fagbemi <oladayo.fagbemi@axelspringer.com>
Date: Tue, 25 Oct 2022 15:27:16 +0200
Subject: [PATCH 2/3] use correct slug for entity

---
 admin/src/components/ActionLayout/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/admin/src/components/ActionLayout/index.js b/admin/src/components/ActionLayout/index.js
index fe28598..728f355 100644
--- a/admin/src/components/ActionLayout/index.js
+++ b/admin/src/components/ActionLayout/index.js
@@ -8,6 +8,7 @@ import { Action } from '../Action';
 
 const ActionLayout = () => {
 	const {
+		slug: modelId,
 		hasDraftAndPublish,
 		isCreatingEntry,
 		initialData: { slug, publishedAt },
@@ -32,7 +33,7 @@ const ActionLayout = () => {
 		<Box marginTop={4}>
 			<ActionLayoutHeader />
 			{actionModes().map((m, index) => (
-				<Action mode={m} key={index} entitySlug={slug} entityId={currentEntityId} />
+				<Action mode={m} key={index} entitySlug={modelId} entityId={currentEntityId} />
 			))}
 		</Box>
 	);

From d54aeb104d87fa49441728b5531487dd9aa71356 Mon Sep 17 00:00:00 2001
From: laur <57439610+wo1f1ow@users.noreply.github.com>
Date: Fri, 15 Sep 2023 15:39:09 +0200
Subject: [PATCH 3/3] Add th-secret-scan.yml GitHub Action

---
 .github/workflows/th-secret-scan.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .github/workflows/th-secret-scan.yml

diff --git a/.github/workflows/th-secret-scan.yml b/.github/workflows/th-secret-scan.yml
new file mode 100644
index 0000000..d371087
--- /dev/null
+++ b/.github/workflows/th-secret-scan.yml
@@ -0,0 +1,5 @@
+name: Leaked Secrets Scan
+on: [pull_request, push]
+jobs:
+  security:
+    uses: spring-media/ccq-utils/.github/workflows/security.yml@main