Merge pull request #6318 from frappe/release/2026-W19

chore: Release release/2026-W19

Author: saurabh6790

.secrets.baseline

@@ -287,14 +287,14 @@
         "filename": "press/api/tests/test_marketplace.py",
         "hashed_secret": "1e2a4c3be8ec693658961500ff918de4c188b4f1",
         "is_verified": false,
-        "line_number": 61
+        "line_number": 71
       },
       {
         "type": "Hex High Entropy String",
         "filename": "press/api/tests/test_marketplace.py",
         "hashed_secret": "a6362a1031d1d2039364ea6b51694151bf388a40",
         "is_verified": false,
-        "line_number": 69
+        "line_number": 79
       }
     ],
     "press/auth.py": [
@@ -524,5 +524,5 @@
       }
     ]
   },
-  "generated_at": "2026-04-24T17:21:58Z"
+  "generated_at": "2026-04-28T10:45:30Z"
 }

dashboard/src/components/CustomAlerts.vue

@@ -4,18 +4,28 @@
 			v-for="banner in localBanners"
 			:key="banner.name"
 			:class="disableLastChildBottomMargin ? `mb-5 last:mb-0` : `mb-5`"
-			:title="`<b>${banner.title}:</b> ${banner.message}`"
+			:title="getAlertTitle(banner.title, banner.message)"
 			:type="banner.type.toLowerCase()"
 			:isDismissible="banner.is_dismissible"
 			@dismissBanner="closeBanner(banner.name)"
 		>
-			<template v-if="!!banner.help_url">
+			<template
+				v-if="
+					!!banner.help_url ||
+					(banner.has_action && banner.action_label && banner.action_script)
+				"
+			>
 				<Button
-					class="ml-auto flex flex-row items-center gap-1"
-					@click="openHelp(banner.help_url)"
+					size="sm"
+					class="ml-auto flex flex-row items-center gap-x-1"
+					@click="
+						banner.has_action
+							? exec(banner.action_script)
+							: openHelp(banner.help_url)
+					"
 					variant="outline"
 				>
-					Open help
+					{{ banner.has_action ? banner.action_label : 'Open help' }}
 					<lucide-external-link class="inline h-4 w-3 pb-0.5" />
 				</Button>
 			</template>
@@ -36,10 +46,13 @@ export default {
 			validator: (value) => !value || ['Site', 'Server'].includes(value),
 		},
 		ctx_name: {
-			type: String,
 			required: false,
 			validator: (value) =>
-				!value || (typeof value === 'string' && value.length > 0),
+				!value ||
+				(typeof value === 'string' && value.length > 0) ||
+				(Array.isArray(value) &&
+					value.every((el) => typeof el === 'string') &&
+					value.length > 0),
 		},
 		containerClass: {
 			type: String,
@@ -58,7 +71,23 @@ export default {
 			localDismissedBanners: {},
 		};
 	},
+	computed: {
+		ctxNames() {
+			return Array.isArray(this.ctx_name)
+				? this.ctx_name
+				: this.ctx_name
+					? [this.ctx_name]
+					: [];
+		},
+	},
 	methods: {
+		getAlertTitle(bannerTitle, bannerMessage) {
+			let str = '';
+			if (bannerTitle) str = str.concat(`<b>${bannerTitle}</b>`);
+			if (!!bannerTitle && !!bannerMessage) str = str.concat(': ');
+			if (bannerMessage) str = str.concat(bannerMessage);
+			return str;
+		},
 		closeBanner(bannerName) {
 			const banner = this.localBanners.find((b) => b.name === bannerName);
 			if (!banner) return;
@@ -67,7 +96,7 @@ export default {
 				(b) => b.name !== bannerName,
 			);
 
-			if (banner.is_global) {
+			if (banner.is_global || banner.type_of_scope == 'Cluster') {
 				// Persist dismissal to local storage
 				this.localDismissedBanners[bannerName] = Date.now();
 				localStorage.setItem(
@@ -82,16 +111,23 @@ export default {
 		openHelp(url) {
 			window.open(url, '_blank');
 		},
+		exec(action_script) {
+			const actionFn = new Function(
+				'_this',
+				action_script + '\nonClickAction(_this)',
+			);
+			actionFn(this);
+		},
 		trimOldDismissedBanners() {
-			// Remove dismissed banners older than 30 days from local storage
-			const THIRTY_DAYS = 30 * 24 * 60 * 60 * 1000;
+			// Remove dismissed banners older than 60 days from local storage
+			const SIXTY_DAYS_IN_MS = 60 * 24 * 60 * 60 * 1000;
 			const now = Date.now();
 			let diff = false;
 
 			for (const [bannerName, timestamp] of Object.entries(
 				this.localDismissedBanners,
 			)) {
-				if (now - timestamp > THIRTY_DAYS) {
+				if (now - timestamp > SIXTY_DAYS_IN_MS) {
 					delete this.localDismissedBanners[bannerName];
 					diff = true;
 				}
@@ -104,6 +140,34 @@ export default {
 				);
 			}
 		},
+		isRelevantBanner(banner) {
+			if (banner.is_global) return true;
+
+			const ctxMatches = (list) =>
+				Array.isArray(list) &&
+				list.some((item) => this.ctxNames.includes(item));
+
+			switch (this.ctx_type) {
+				case 'Server':
+					return (
+						(banner.type_of_scope === 'Server' && ctxMatches(banner.server)) ||
+						(banner.type_of_scope === 'Cluster' && ctxMatches(banner.cluster))
+					);
+
+				case 'Site':
+					return (
+						(banner.type_of_scope === 'Site' && ctxMatches(banner.site)) ||
+						(banner.type_of_scope === 'Server' && ctxMatches(banner.server)) ||
+						(banner.type_of_scope === 'Cluster' && ctxMatches(banner.cluster))
+					);
+
+				case 'List Page':
+					return ['Team', 'Cluster', 'Server'].includes(banner.type_of_scope);
+
+				default:
+					return true;
+			}
+		},
 	},
 	resources: {
 		banners() {
@@ -126,24 +190,10 @@ export default {
 
 					this.trimOldDismissedBanners();
 
-					this.localBanners = (
-						this.ctx_type === 'Server'
-							? data.filter(
-									(banner) =>
-										banner.server === this.ctx_name || banner.is_global,
-								)
-							: this.ctx_type === 'Site'
-								? data.filter(
-										(banner) =>
-											banner.site === this.ctx_name || banner.is_global,
-									)
-								: this.ctx_type === 'List Page'
-									? data.filter(
-											(banner) =>
-												banner.type_of_scope === 'Team' || banner.is_global,
-										)
-									: data
-					).filter((banner) => !(banner.name in this.localDismissedBanners));
+					this.localBanners = data
+						.filter(this.isRelevantBanner)
+						.filter((banner) => banner.title || banner.message)
+						.filter((banner) => !(banner.name in this.localDismissedBanners));
 				},
 			};
 		},

dashboard/src/components/SiteOverview.vue

@@ -7,7 +7,7 @@
 			:disable-last-child-bottom-margin="true"
 			container-class="col-span-1 lg:col-span-2"
 			ctx_type="Site"
-			:ctx_name="$site?.doc?.name"
+			:ctx_name="[$site?.doc?.name, $site?.doc.server, $site?.doc?.cluster]"
 		/>
 		<AlertBanner
 			v-if="$site?.doc?.creation_failed"

dashboard/src/components/billing/PaymentDetails.vue

@@ -401,7 +401,11 @@ function updatePaymentMode(mode) {
 		return;
 	}
 	if (mode === 'UPI Autopay') {
-		router.push({ name: 'BillingUPIAutopay' });
+		if (team.doc.default_razorpay_mandate) {
+			if (!changePaymentMode.loading) changePaymentMode.submit({ mode });
+		} else {
+			router.push({ name: 'BillingUPIAutopay' });
+		}
 		return;
 	}
 	if (!changePaymentMode.loading) changePaymentMode.submit({ mode });