Merge branch 'develop' into ari/audit-2025-10

Author: aristath

.github/ISSUE_TEMPLATE/new-task-recommendation.yml

@@ -28,28 +28,6 @@ body:
     validations:
       required: true
 
-  - type: dropdown
-    id: category
-    attributes:
-      label: Recommendation category
-      description: Select the most appropriate category for this recommendation
-      options:
-        - content-update
-        - configuration
-        - user
-        - other
-    validations:
-      required: true
-
-  - type: input
-    id: other_category
-    attributes:
-      label: Other category
-      description: If you selected "other", please specify the category
-      placeholder: "Specify the category"
-    validations:
-      required: false
-
   - type: input
     id: capability
     attributes:

assets/css/page-widgets/suggested-tasks.css

@@ -28,6 +28,26 @@
 
 	.prpl-show-all-tasks {
 		display: none;
+
+		.prpl-toggle-all-recommendations-button {
+			background: none;
+			border: none;
+			padding: 0;
+			color: var(--wp-admin-theme-color, #2271b1);
+			text-decoration: underline;
+			cursor: pointer;
+			font-size: inherit;
+			font-family: inherit;
+
+			&:hover {
+				color: var(--wp-admin-theme-color-darker-10, #135e96);
+			}
+
+			&:disabled {
+				opacity: 0.6;
+				cursor: not-allowed;
+			}
+		}
 	}
 
 	&:has(.prpl-suggested-tasks-list li) {
@@ -220,13 +240,16 @@
 			border: 1px solid var(--prpl-color-border);
 		}
 
-		.prpl-button-step {
+		.prpl-button-step,
+		.prpl-button {
 			padding: 0.75rem 1.25rem;
+			margin: 1rem 0;
 			border: none;
 			color: var(--prpl-color-text);
 			font-weight: 600;
 			border-radius: var(--prpl-border-radius);
 			background-color: var(--prpl-background-banner);
+			cursor: pointer;
 
 			/* WIP: pick exact color */
 			transition: all 0.25s ease-in-out;
@@ -237,7 +260,7 @@
 				display: block;
 				width: 100%;
 				height: 100%;
-				background: var(--prpl-background-banner);
+				background: var(--prpl-background-banner) !important;
 
 				/* WIP: pick exact color */
 				position: absolute;
@@ -424,6 +447,7 @@
 
 			.prpl-button {
 				cursor: pointer;
+				margin: 0;
 
 				/* If the button has empty data-action attribute disable it. */
 				&[data-action=""] {

assets/js/suggested-task-terms.js

@@ -8,7 +8,6 @@
 const prplSuggestedTasksTerms = {};
 
 const prplTerms = {
-	category: 'prpl_recommendations_category',
 	provider: 'prpl_recommendations_provider',
 
 	/**
@@ -19,9 +18,7 @@ const prplTerms = {
 	 */
 	// eslint-disable-next-line no-unused-vars
 	get: ( taxonomy ) => {
-		if ( 'category' === taxonomy ) {
-			taxonomy = prplTerms.category;
-		} else if ( 'provider' === taxonomy ) {
+		if ( 'provider' === taxonomy ) {
 			taxonomy = prplTerms.provider;
 		}
 		return prplSuggestedTasksTerms[ taxonomy ] || {};
@@ -109,7 +106,6 @@ const prplTerms = {
 		return new Promise( ( resolve ) => {
 			prplDocumentReady( () => {
 				Promise.all( [
-					prplTerms.getCollectionPromise( prplTerms.category ),
 					prplTerms.getCollectionPromise( prplTerms.provider ),
 				] ).then( () => resolve( prplSuggestedTasksTerms ) );
 			} );

assets/js/suggested-task.js

@@ -1,4 +1,4 @@
-/* global HTMLElement, prplSuggestedTask, prplL10n, prplUpdateRaviGauge, prplTerms, prplSuggestedTasksWidget */
+/* global HTMLElement, prplSuggestedTask, prplL10n, prplUpdateRaviGauge, prplTerms */
 /*
  * Suggested Task scripts & helpers.
  *
@@ -34,66 +34,28 @@ prplSuggestedTask = {
 
 		const fetchData = {
 			status: args.status,
-			per_page: args.per_page || 1,
+			per_page: args.per_page || 100,
 			_embed: true,
 			exclude: prplSuggestedTask.injectedItemIds,
 			filter: {
 				orderby: 'menu_order',
 				order: 'ASC',
 			},
 		};
-		if ( args.category ) {
-			fetchData[ prplTerms.category ] =
-				prplTerms.get( 'category' )[ args.category ].id;
+
+		// Pass through provider and exclude_provider if provided.
+		if ( args.provider ) {
+			fetchData.provider = args.provider;
+		}
+		if ( args.exclude_provider ) {
+			fetchData.exclude_provider = args.exclude_provider;
 		}
 
 		return prplSuggestedTask
 			.getPostsCollectionPromise( { data: fetchData } )
 			.then( ( response ) => response.data );
 	},
 
-	/**
-	 * Inject items from a category.
-	 *
-	 * @param {string}   taskCategorySlug The task category slug.
-	 * @param {string[]} taskStatus       The task status.
-	 */
-	injectItemsFromCategory: ( args ) =>
-		prplSuggestedTask
-			.fetchItems( {
-				category: args.category,
-				status: args.status || [ 'publish' ],
-				per_page: args.per_page || 1,
-			} )
-			.then( ( data ) => {
-				if ( data.length ) {
-					// Inject the items into the DOM.
-					data.forEach( ( item ) => {
-						document.dispatchEvent(
-							new CustomEvent( 'prpl/suggestedTask/injectItem', {
-								detail: {
-									item,
-									listId: 'prpl-suggested-tasks-list',
-									insertPosition: 'beforeend',
-								},
-							} )
-						);
-						prplSuggestedTask.injectedItemIds.push( item.id );
-					} );
-				}
-
-				return data;
-			} )
-			.then( ( data ) => {
-				// Toggle the "Loading..." text.
-				prplSuggestedTasksWidget.removeLoadingItems();
-
-				// Trigger the grid resize event.
-				window.dispatchEvent( new CustomEvent( 'prpl/grid/resize' ) );
-
-				return data;
-			} ),
-
 	/**
 	 * Inject items.
 	 *
@@ -145,27 +107,15 @@ prplSuggestedTask = {
 	 */
 	getNewItemTemplatePromise: ( { post = {}, listId = '' } ) =>
 		new Promise( ( resolve ) => {
-			const {
-				prpl_recommendations_provider,
-				prpl_recommendations_category,
-			} = post;
-			const terms = {
-				prpl_recommendations_provider,
-				prpl_recommendations_category,
-			};
+			const { prpl_recommendations_provider } = post;
+			const terms = { prpl_recommendations_provider };
 
 			Object.values( prplTerms.get( 'provider' ) ).forEach( ( term ) => {
 				if ( term.id === terms[ prplTerms.provider ][ 0 ] ) {
 					terms[ prplTerms.provider ] = term;
 				}
 			} );
 
-			Object.values( prplTerms.get( 'category' ) ).forEach( ( term ) => {
-				if ( term.id === terms[ prplTerms.category ][ 0 ] ) {
-					terms[ prplTerms.category ] = term;
-				}
-			} );
-
 			const template = wp.template( 'prpl-suggested-task' );
 			const data = {
 				post,
@@ -212,6 +162,10 @@ prplSuggestedTask = {
 			post.destroy( { url } ).then( () => {
 				// Remove the task from the todo list.
 				prplSuggestedTask.removeTaskElement( postId );
+
+				// Fetch and inject a replacement task
+				prplSuggestedTask.fetchAndInjectReplacementTask();
+
 				setTimeout(
 					() =>
 						window.dispatchEvent(
@@ -243,10 +197,6 @@ prplSuggestedTask = {
 						postData?.[ prplTerms.provider ],
 						prplTerms.provider
 					).slug;
-					const taskCategorySlug = prplTerms.getTerm(
-						postData?.[ prplTerms.category ],
-						prplTerms.category
-					).slug;
 
 					const el = prplSuggestedTask.getTaskElement( postId );
 
@@ -334,11 +284,8 @@ prplSuggestedTask = {
 										)
 									);
 
-									// Inject more tasks from the same category.
-									prplSuggestedTask.injectItemsFromCategory( {
-										category: taskCategorySlug,
-										status: [ 'publish' ],
-									} );
+									// Fetch and inject a replacement task for non-user tasks
+									prplSuggestedTask.fetchAndInjectReplacementTask();
 
 									// Resolve immediately for non-user tasks
 									resolve( {
@@ -434,14 +381,11 @@ prplSuggestedTask = {
 			date,
 			date_gmt: date,
 		} );
-		postModelToSave.save().then( ( postData ) => {
+		postModelToSave.save().then( () => {
 			prplSuggestedTask.removeTaskElement( postId );
 
-			// Inject more tasks from the same category.
-			prplSuggestedTask.injectItemsFromCategory( {
-				category: postData?.prpl_category?.slug,
-				status: [ 'publish' ],
-			} );
+			// Fetch and inject a replacement task
+			prplSuggestedTask.fetchAndInjectReplacementTask();
 		} );
 	},
 
@@ -568,6 +512,42 @@ prplSuggestedTask = {
 	 */
 	removeTaskElement: ( postId ) =>
 		prplSuggestedTask.getTaskElement( postId )?.remove(),
+
+	/**
+	 * Fetch and inject a replacement task after one is removed.
+	 *
+	 * Replacement tasks are always fetched for the suggested-tasks-list,
+	 * which excludes user tasks (user tasks have their own todo list).
+	 */
+	fetchAndInjectReplacementTask: () => {
+		// Collect all currently visible task IDs from the DOM
+		const visibleTaskIds = Array.from(
+			document.querySelectorAll( '.prpl-suggested-task[data-post-id]' )
+		).map( ( el ) => parseInt( el.getAttribute( 'data-post-id' ) ) );
+
+		// Combine with injectedItemIds to ensure we have a complete exclusion list
+		const allTaskIds = [
+			...new Set( [
+				...prplSuggestedTask.injectedItemIds,
+				...visibleTaskIds,
+			] ),
+		];
+
+		// Update injectedItemIds to include any tasks that might have been missed
+		prplSuggestedTask.injectedItemIds = allTaskIds;
+
+		const fetchArgs = {
+			status: 'publish',
+			per_page: 1,
+			exclude_provider: 'user', // Always exclude user tasks from suggested-tasks-list
+		};
+
+		prplSuggestedTask.fetchItems( fetchArgs ).then( ( items ) => {
+			if ( items && items.length > 0 ) {
+				prplSuggestedTask.injectItems( items );
+			}
+		} );
+	},
 };
 
 /**