Skip to content

Commit ea39bb4

Browse files
pawan-adobe-securitypawan-adobe-security
authored
Merge pull request #424 from magento-cia/cia-pre-release-develop-sync-04282025
Cia pre release develop sync 04282025
2 parents 4ef25c1 + 0b8d6eb commit ea39bb4

File tree

2 files changed

+315
-5
lines changed

2 files changed

+315
-5
lines changed

‎.github/app-projects-boards-automation.config.yaml

Lines changed: 310 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,310 @@
1+
automations:
2+
3+
############################################################################################################
4+
# PR Automation for Community Dashboard - PageBuilder #
5+
############################################################################################################
6+
# 1. Whenever a pull request is labeled with the "Project: Community Picked" label:
7+
# a. it must be assigned to the "Community Dashboard" project
8+
# b. it must be removed from the "Pull Requests Dashboard" project
9+
- trigger: pull_request.labeled
10+
conditions:
11+
- ['modifiedLabel.name', 'eq', 'Project: Community Picked']
12+
- [ 'projects#number', 'in', 24 ]
13+
- ['projectsByNumber.24.column.name', 'eq', 'Ready for Review']
14+
actions:
15+
- addToProject: [17] #['Community Dashboard']
16+
- moveTo: [17, 'Pending Review']
17+
- removeFromProject: [24] #['Pull Requests Dashboard']
18+
19+
- trigger: pull_request.labeled
20+
conditions:
21+
- [ 'modifiedLabel.name', 'eq', 'Project: Community Picked' ]
22+
- [ 'projects#number', 'in', 24 ]
23+
- [ 'projectsByNumber.24.column.name', 'eq', 'Changes Requested' ]
24+
actions:
25+
- addToProject: [ 17 ] #['Community Dashboard']
26+
- moveTo: [ 17, 'Changes Requested' ]
27+
- removeFromProject: [ 24 ] #['Pull Requests Dashboard']
28+
29+
- trigger: pull_request.labeled
30+
conditions:
31+
- [ 'modifiedLabel.name', 'eq', 'Project: Community Picked' ]
32+
- [ 'projects#number', 'in', 24 ]
33+
- [ 'projectsByNumber.24.column.name', 'eq', 'Reviewer Approved' ]
34+
actions:
35+
- addToProject: [ 17 ] #['Community Dashboard']
36+
- moveTo: [ 17, 'Ready for Testing' ]
37+
- removeFromProject: [ 24 ] #['Pull Requests Dashboard']
38+
39+
- trigger: pull_request.labeled
40+
conditions:
41+
- [ 'modifiedLabel.name', 'eq', 'Project: Community Picked' ]
42+
- [ 'projects#number', 'in', 24 ]
43+
- [ 'projectsByNumber.24.column.name', 'eq', 'On Hold' ]
44+
actions:
45+
- addToProject: [ 17 ] #['Community Dashboard']
46+
- moveTo: [ 17, 'On Hold' ]
47+
- removeFromProject: [ 24 ] #['Pull Requests Dashboard']
48+
49+
- trigger: pull_request.labeled
50+
conditions:
51+
- [ 'modifiedLabel.name', 'eq', 'Project: Community Picked' ]
52+
- [ 'projects#number', 'in', 24 ]
53+
- [ 'projectsByNumber.24.column.name', 'eq', 'Acceptance Testing' ]
54+
actions:
55+
- addToProject: [ 17 ] #['Community Dashboard']
56+
- moveTo: [ 17, 'Testing in Progress' ]
57+
- removeFromProject: [ 24 ] #['Pull Requests Dashboard']
58+
59+
- trigger: pull_request.labeled
60+
conditions:
61+
- [ 'modifiedLabel.name', 'eq', 'Project: Community Picked' ]
62+
- [ 'projects#number', 'in', 24 ]
63+
- [ 'projectsByNumber.24.column.name', 'eq', 'Ready for Delivery' ]
64+
actions:
65+
- addToProject: [ 17 ] #['Community Dashboard']
66+
- moveTo: [ 17, 'Merge in Progress' ]
67+
- removeFromProject: [ 24 ] #['Pull Requests Dashboard']
68+
69+
- trigger: pull_request.labeled
70+
conditions:
71+
- [ 'modifiedLabel.name', 'eq', 'Project: Community Picked' ]
72+
- [ 'projects#number', 'in', 24 ]
73+
- [ 'projectsByNumber.24.column.name', 'eq', 'Done' ]
74+
actions:
75+
- addToProject: [ 17 ] #['Community Dashboard']
76+
- moveTo: [ 17, 'Recently Merged' ]
77+
- removeFromProject: [ 24 ] #['Pull Requests Dashboard']
78+
79+
- trigger: pull_request.labeled
80+
conditions:
81+
- [ 'modifiedLabel.name', 'eq', 'Project: Community Picked' ]
82+
- [ 'projects#number', 'in', 24 ]
83+
- [ 'projectsByNumber.24.column.name', 'eq', 'Review in Progress' ]
84+
actions:
85+
- addToProject: [ 17 ] #['Community Dashboard']
86+
- moveTo: [ 17, 'Review in Progress' ]
87+
- removeFromProject: [ 24 ] #['Pull Requests Dashboard']
88+
89+
# 2. Whenever a pull request is labeled with the "Priority: XX" label and has no "Project: Community Picked" label assigned:
90+
# a. it must be assigned to the "Pull Requests Dashboard" project
91+
# b. it must be removed from the "Community Dashboard" project (if assigned to it)
92+
# c. it must be labeled with the "Progress: pending review" label
93+
# d. it must be moved to the "Pending review" column on the "Pull Requests Dashboard" project
94+
- trigger: pull_request.labeled
95+
conditions:
96+
- ['modifiedLabel.name', 'includes', 'Priority:']
97+
- ['labels#name', 'ne', 'Project: Community Picked']
98+
actions:
99+
- addToProject: [24] #['Pull Requests Dashboard']
100+
- moveTo: [24, 'Ready for Review']
101+
- removeFromProject: [17] #['Community Dashboard']
102+
- addLabels: ['Progress: pending review']
103+
104+
# 3. Whenever a review was requested for a pull request and its not in Changes Requested
105+
# a. it must be labeled with the "Progress: review" label
106+
# b. it must remove the "Progress: needs update" label
107+
# c. it must be moved to the "Review in Progress" column
108+
- trigger: pull_request.review_requested
109+
conditions:
110+
actions:
111+
- addLabels: ['Progress: review']
112+
- removeLabels: ['Progress: needs update', 'Progress: pending review']
113+
- moveTo: [24, 'Review in Progress'] #['Pull Requests Dashboard', 'Review in Progress']
114+
- moveTo: [17, 'Review in Progress'] #['Community Dashboard', 'Review in Progress']
115+
116+
# 4. Whenever a pull request is labeled with the "Progress: needs update" label and the reviewer adds comment/s:
117+
# a. it must be moved to the "Changes Requested" column
118+
- trigger: pull_request.labeled
119+
conditions:
120+
- ['modifiedLabel.name', 'eq', 'Progress: needs update']
121+
actions:
122+
- removeLabels: [ 'Progress: review' ]
123+
- moveTo: [24, 'Changes Requested'] #['Pull Requests Dashboard', 'Changes Requested']
124+
- moveTo: [17, 'Changes Requested'] #['Community Dashboard', 'Changes Requested']
125+
126+
# 5. Whenever a label "Progress: needs update" is removed from a pull request:
127+
# a. it must be labeled with "Progress: review"
128+
# b. it must be moved to the "Review in Progress" column
129+
- trigger: pull_request.unlabeled
130+
conditions:
131+
- ['modifiedLabel.name', 'eq', 'Progress: needs update']
132+
actions:
133+
- removeLabels: ['Progress: review']
134+
- addLabels: ['Progress: pending review']
135+
- moveTo: [24, 'Ready for Review'] #['Pull Requests Dashboard', 'Review in Progress']
136+
- moveTo: [17, 'Pending Review'] #['Community Dashboard', 'Review in Progress']
137+
138+
# 6. Whenever a pull request is approved:
139+
# a. the below labels must be removed from a pull request: "Progress: review", "Progress: needs update"
140+
# b. it must be moved to the "Ready for Testing" column
141+
- trigger: pull_request_review.submitted
142+
conditions:
143+
- ['review', 'eq', 'approved']
144+
actions:
145+
- removeLabels: ['Progress: review']
146+
- moveTo: [24, 'Reviewer Approved'] #['Pull Requests Dashboard', 'Reviewer Approved']
147+
- moveTo: [17, 'Ready for Testing'] #['Community Dashboard', 'Ready for Testing']
148+
149+
# 7. Whenever a pull request belongs to the "Community Dashboard" or "Pull Requests Dashboard" and is moved to the "Pending review" column:
150+
# a. it must be labeled with the "Progress: pending review" label
151+
- trigger: projects_v2_item.edited
152+
conditions:
153+
- [
154+
['movedToColumn.name', 'eq', 'Pending Review'],
155+
['movedToColumn.name', 'eq', 'Ready for Review']
156+
]
157+
- [
158+
['projects#number', 'in', 17],
159+
['projects#number', 'in', 24]
160+
]
161+
actions:
162+
- addLabels: ['Progress: pending review']
163+
- removeLabels: ['Progress: needs update']
164+
165+
# 8. Whenever a pull request is in the "Ready for Testing" column and gets assigned to anyone:
166+
# a. it must be labeled with the "Progress: testing in progress" label
167+
# b. it must remove the "Progress: ready for testing" label
168+
# c. it must be moved to the "Testing in Progress" column
169+
- trigger: pull_request.assigned
170+
conditions:
171+
- [
172+
['projects#column.name', 'in', 'Ready for Testing'],
173+
['projects#column.name', 'in', 'Reviewer Approved']
174+
]
175+
actions:
176+
- addLabels: ['Progress: Testing in Progress']
177+
- removeLabels: ['Progress: ready for testing']
178+
- moveTo: [24, 'Acceptance Testing'] #['Pull Requests Dashboard', 'Acceptance Testing']
179+
- moveTo: [17, 'Testing in Progress'] #['Community Dashboard', 'Testing in Progress']
180+
181+
# 9. Whenever a pull request belongs to the "Community Dashboard" or "Pull Requests Dashboard" and is moved to the "Review in Progress" column:
182+
# a. it must be labeled with the "Progress: review" label
183+
- trigger: projects_v2_item.edited
184+
conditions:
185+
- ['movedToColumn.name', 'eq', 'Review in Progress']
186+
- [
187+
['projects#number', 'in', 17],
188+
['projects#number', 'in', 24]
189+
]
190+
actions:
191+
- addLabels: ['Progress: review']
192+
- removeLabels: ['Progress: needs update']
193+
194+
# 10. Whenever a pull request belongs to the "Community Dashboard" or "Pull Requests Dashboard" and is moved to the "Changes Requested" column:
195+
# a. it must be labeled with the "Progress: needs updates" label
196+
# b. it must remove the "Progress: review" label
197+
- trigger: projects_v2_item.edited
198+
conditions:
199+
- ['movedToColumn.name', 'eq', 'Changes Requested']
200+
- [
201+
['projects#number', 'in', 17],
202+
['projects#number', 'in', 24]
203+
]
204+
actions:
205+
- addLabels: ['Progress: needs update']
206+
- removeLabels: ['Progress: review']
207+
208+
# 11. Whenever a pull request belongs to the "Community Dashboard" or "Pull Requests Dashboard" and is moved to the "On Hold" column:
209+
# a. it must be labeled with the "Progress: On Hold" label
210+
# b. it must remove the "Progress: review", "Progress: needs update","Progress: testing in progress", "Progress: extended testing" label
211+
- trigger: projects_v2_item.edited
212+
conditions:
213+
- ['movedToColumn.name', 'eq', 'On Hold']
214+
- [
215+
['projects#number', 'in', 17],
216+
['projects#number', 'in', 14]
217+
]
218+
actions:
219+
- addLabels: ['Progress: On Hold']
220+
- removeLabels: ['Progress: review', 'Progress: needs update', 'Progress: testing in progress', 'Progress: extended testing' ]
221+
222+
# 12. Whenever a pull request belongs to the "Community Dashboard" or "Pull Requests Dashboard" and is moved to the "Ready for Testing" column:
223+
# a. it must be labeled with the "Progress: ready for testing" label
224+
# b. it must remove the "Progress: review" label
225+
- trigger: projects_v2_item.edited
226+
conditions:
227+
- [
228+
['movedToColumn.name', 'eq', 'Ready for Testing'],
229+
['movedToColumn.name', 'eq', 'Reviewer Approved']
230+
]
231+
- [
232+
['projects#number', 'in', 17],
233+
['projects#number', 'in', 24]
234+
]
235+
actions:
236+
- addLabels: ['Progress: ready for testing']
237+
- removeLabels: ['Progress: review', 'Progress: needs update']
238+
239+
# 13. Whenever a pull request belongs to the "Community Dashboard" or "Pull Requests Dashboard" and is moved to the "Extended Testing" column:
240+
# a. it must be labeled with the "Progress: extended testing" label
241+
# b. it must remove the "Progress: testing in progress" label
242+
- trigger: projects_v2_item.edited
243+
conditions:
244+
- ['movedToColumn.name', 'eq', 'Extended Testing (Optional)']
245+
- ['projects#number', 'in', 17]
246+
actions:
247+
- addLabels: ['Progress: extended testing']
248+
- removeLabels: ['Progress: testing in progress', 'Progress: pending approval']
249+
250+
# 14. Whenever a pull request belongs to the "Community Dashboard" or "Pull Requests Dashboard" and is moved to the "To Approve" column:
251+
# a. it must be labeled with the "Progress: to approve" label
252+
# b. it must remove the "Progress: extended testing" label
253+
- trigger: projects_v2_item.edited
254+
conditions:
255+
- ['movedToColumn.name', 'eq', 'To Approve']
256+
- ['projects#number', 'in', 17]
257+
actions:
258+
- addLabels: ['Progress: to approve']
259+
- removeLabels: ['Progress: extended testing']
260+
261+
# 15. Whenever a pull request belongs to the "Community Dashboard" or "Pull Requests Dashboard" and is moved to the "Pending Approval" column:
262+
# a. it must be labeled with the "Progress: pending approval" label
263+
# b. it must remove the "Progress: to approve" label
264+
- trigger: projects_v2_item.edited
265+
conditions:
266+
- ['movedToColumn.name', 'eq', 'Pending Approval']
267+
- ['projects#number', 'in', 17]
268+
actions:
269+
- addLabels: ['Progress: pending approval']
270+
- removeLabels: ['Progress: to approve']
271+
272+
# 16. Whenever a pull request belongs to the "Community Dashboard" or "Pull Requests Dashboard" and is moved to the "Merge in Progress" column:
273+
# a. it must remove the "Progress: extended testing" label
274+
- trigger: projects_v2_item.edited
275+
conditions:
276+
- [
277+
['movedToColumn.name', 'eq', 'Merge in Progress'],
278+
['movedToColumn.name', 'eq', 'Ready for Delivery']
279+
]
280+
- [
281+
['projects#number', 'in', 17],
282+
['projects#number', 'in', 24]
283+
]
284+
actions:
285+
- removeLabels: ['Progress: extended testing']
286+
- addLabels: ['Progress: accept']
287+
288+
# 17. Whenever a pull request is merged:
289+
# a. it must be moved to the "Recently Merged" column
290+
- trigger: pull_request.closed
291+
conditions:
292+
- ['merged', 'eq', true]
293+
actions:
294+
- moveTo: [17, 'Recently Merged']
295+
- moveTo: [24, 'Done']
296+
297+
# 18. Whenever a pull request is closed:
298+
# a. it must be removed from the "Pull Requests Dashboard" project
299+
# b. it must be removed from the "Community Dashboard" project
300+
- trigger: pull_request.closed
301+
conditions:
302+
- ['merged', 'ne', true]
303+
actions:
304+
- removeFromProject: [24] #['Pull Requests Dashboard']
305+
- removeFromProject: [17] #['Community Dashboard']
306+
307+
308+
############################################################################################################
309+
# Automation Rules related to issues goes here #
310+
############################################################################################################

‎app/code/Magento/PageBuilder/Controller/Adminhtml/Stage/Render.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?php
22
/**
3-
*
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
3+
* Copyright 2019 Adobe
4+
* All Rights Reserved.
65
*/
76

87
namespace Magento\PageBuilder\Controller\Adminhtml\Stage;
@@ -18,7 +17,7 @@
1817
*/
1918
class Render extends \Magento\Backend\App\Action implements HttpGetActionInterface
2019
{
21-
const ADMIN_RESOURCE = 'Magento_Backend::content';
20+
public const ADMIN_RESOURCE = 'Magento_Backend::content';
2221

2322
/**
2423
* @var \Magento\Framework\View\Result\PageFactory
@@ -36,7 +35,8 @@ public function __construct(
3635
PageFactory $pageFactory
3736
) {
3837
$this->pageFactory = $pageFactory;
39-
return parent::__construct($context);
38+
39+
parent::__construct($context);
4040
}
4141

4242
/**

0 commit comments

Comments
 (0)