From 85b99fb59404f7fd73ee76b00fe195ce2665f2f7 Mon Sep 17 00:00:00 2001 From: narendra-drupal <87118318+narendra-drupal@users.noreply.github.com> Date: Thu, 8 Aug 2024 14:49:15 +0530 Subject: [PATCH 1/2] Initial commit --- composer.json | 7 ++ installer/starshot_installer.profile | 14 +++ patches/project_browser/pb.patch | 114 ++++++++++++++++++ patches/project_browser/project_browser.patch | 36 ++++++ recipes/starshot_maintenance/composer.json | 2 +- 5 files changed, 172 insertions(+), 1 deletion(-) create mode 100644 patches/project_browser/pb.patch create mode 100644 patches/project_browser/project_browser.patch diff --git a/composer.json b/composer.json index 2f3b76a..cbb1ba8 100644 --- a/composer.json +++ b/composer.json @@ -131,6 +131,10 @@ "options": { "symlink": false } + }, + "project_browser": { + "type": "vcs", + "url": "https://git.drupalcode.org/issue/project_browser-3450629.git" } }, "require": { @@ -205,6 +209,9 @@ "#3303127: Determine which core config entity methods should be config actions": "./patches/core/7940.patch", "Ensure core recipes that affect user roles also install the User module": "./patches/core/core-recipes-user-import.patch", "#3416357: Convert QueueFactory to use a service locator": "./patches/core/3416357-10.3.x-only.patch" + }, + "drupal/project_browser": { + "Use absolute urls": "./patches/project_browser/pb.patch" } } }, diff --git a/installer/starshot_installer.profile b/installer/starshot_installer.profile index 400f71a..197a8af 100644 --- a/installer/starshot_installer.profile +++ b/installer/starshot_installer.profile @@ -44,12 +44,26 @@ function starshot_installer_install_tasks_alter(array &$tasks, array $install_st 'function' => RecipesForm::class, ], ]); + $insert_before('install_configure_form', [ + 'starshot_installer_choose_recipes_block' => [ + 'display_name' => t('Recipe browser'), + ], + ]); // Wrap the install_profile_modules() function, which returns a batch job, and // add all the necessary operations to apply the chosen template recipe. $tasks['install_profile_modules']['function'] = 'starshot_installer_apply_recipes'; } +/** + * Runs the custom block installation task. + */ +function starshot_installer_choose_recipes_block(&$install_state) { + $block_manager = \Drupal::service('plugin.manager.block'); + $block_plugin = $block_manager->createInstance('custom_block'); + return $block_plugin->build(); +} + /** * Implements hook_form_alter() for install_settings_form. * diff --git a/patches/project_browser/pb.patch b/patches/project_browser/pb.patch new file mode 100644 index 0000000..f5d432c --- /dev/null +++ b/patches/project_browser/pb.patch @@ -0,0 +1,114 @@ +diff --git a/project_browser.routing.yml b/project_browser.routing.yml +index b7ad176..9056bf8 100644 +--- a/project_browser.routing.yml ++++ b/project_browser.routing.yml +@@ -15,7 +15,7 @@ project_browser.api_project_get_all: + _controller: '\Drupal\project_browser\Controller\ProjectBrowserEndpointController::getAllProjects' + _title: 'Get all projects' + requirements: +- _permission: 'administer modules' ++ _access: 'TRUE' + #options: + # no_cache: 'TRUE' + project_browser.browse: +diff --git a/sveltejs/public/build/bundle.js b/sveltejs/public/build/bundle.js +index 77726f38845aab0952ba9f3b9f7640a3e39b1a8f..638c3052d89ff0f256e35379fcc7e20758ee2fe9 100644 +GIT binary patch +delta 1408 +zcmZvce@t6d6vuP!ZGje~Ex(3YH*U&+cB{0nKY%j3h!c?v7!LWvkqKQ}ph?%q+9Kiv +z8Cj-b1D(Yk9W#@-Y(U)5_{Yt3ptwZEXcnU`Q|6B?`)5XQ@edQCPH*RiE&Bd>FZX=U +zIiGXxIq!v;tf`N)-kKQ9XX5e7p-7a~Hnl$7Tvyjxzx|JM)9rhu1h=l~xnmR~Tqd^25EePyoBR!33`mYTw}CGn=3w4L_&_4Srrm +zwfMUomT|!j>HJRzT*!%QPy&+A7i!^3N?f=Ww|xP6zSIbpAgTZom1~?U0Kt1{jNj +zrs2<8k?QbXx;CCU#7`E&4FDI86v4GPxe9L?;1pk10(k@*KO{OF_>3s=$8NkC2&ZIa+H#k(qcmCWdowkoB=QXVmz>N%Bohd##UuyA$dS +zigJ6U15Z3fjM&r%-S|fyc|s}KcA168OEjNv?T0p^a7b1M{xt?0aiM`^;Kc?~MruAshvUdOax-XMAoyTq4SHsnYJkxqMiIug?<|KYsvji8A?n2VsX8rfp2LadrqYF>?gc@yamhg?)J# +zT7lRad;9W{=+yNS0X${ +z?!#Z&Xf-aLhU*HO(`Cb(ry)N_vYOc)55I4R+!GOlfJXw5jk-x_z)cfSP?KceXkn7o +z<`5gFjxVfArLtI9RaaNAm$e6iQGYlP>R`J)5xR6b1#hZp8uo7`srbw!jNk3%bDAmOnkn+-yOxTT-;K``^;Ct! +zo?bC%p^j)L+u~+6R$QD^H3vU^JPn+@We+_AP{CC)oy^WiEEdJGWlDIMj#``9UPoj^wV@nFgLxWQwh}0# +zMz#UoQrKqm}-_O6OLS8Kc!7jp(^njOefDc|Ol;@4fea +ze}-?Y>>FP>dis6Dvn5qn=bc^mdW5ftcV2{-_qQUOeJRFcpHxhx#qHT24mUS(_Bzt} +z+!)GuWtH(f&t8-%9L3*Ix4q^6SKw8ylZY@9>_7fj6azz#UoqpL8U +z%&R__9M3i~mEpm7T#PhXS#Kor@Pe?bUwycZ81GQu`|-yk+$@EIiFt-Yd3T{=jZxzD +z7c*Wsxu*wd_QZDeKyY20v7 +zC)5?uJ-XFs1UB0e*LVA|<-e{io+7gK>?U!2k?dFwwGYG~b#egT$wexUr;q<%FEseK +zUf&>YEFq5#VFmk!@al5qS56>DE4QA&UV{%#p$3H<{#j(?1V~bxwxcTjJx` +zd6CA==ip*^1VJW5G0{C8g_@3v$qSjK{(tt*+7}E5UubI!zFp8z(^MC(x1KGtJpAEn +zk;z?$WE|i5T_h;ub(w2Nv3jaap3^(2?z}0_B=P8^POs{aE^VY+7J{?MvQ_E#Oo;JO +Zkw8zo@i+(Oq{)dP<0bXmoc!{OzX03eDrEow + +diff --git a/sveltejs/public/build/bundle.js.map b/sveltejs/public/build/bundle.js.map +index b8b9abd3aeb50472487df518895306cb44580c54..e1d841c73fb364da88d76c8cf5b486c3e4a9d010 100644 +GIT binary patch +delta 1379 +zcma)4UrbwN6wi0hEd$DAV}KB$`#@y3a;4OXlU>XBdfTzfU@(YTP%P_8TW(rMBbCijZDjo56aD?;1A~De_2Kh=LM!y_cx)z_ +z9G@~KqWorn^ea_#OQAfLqPUPHji^)#4fu11P|6GQtQCAqNP)B?;vfn}PA=AgRZ$N}(AqFA*nSeU~hdvUE7Er^31D1ZFRgvD1`#Jd~x= +z$x}3@Cv(w^o{G~G;cRq*8mTRqCOg`)pXT+fej*tiHfFQbM(27^#aLb;wkbU>Rq;zXgc`-uWuBth&yO&>lS7FhbG~6ZQyuIVOCE~n1D$m +z63*#Hsy&@Caz?~R&Urj7|7fK2-$j!~HdoX?=fRtg36Jo$F5w$S_Tq2P2nV=U5ZtGo +zvdWmMXiUuqarJjW+NLO)n)B!RsXv7m4&b*>!@Z6fRh{m`!AGH%uk^rK0YB}528^rl +z1v)m&zaa@6d?WyWlsYt)2?mkuha1@SBe-~-0#l9(!_U0hq+cFoY!oj_Vw+P@jxqLR +z@gZC#R^!6g;J~#6h`1udHeBw69XS6s>^3JRwIRIrKD1){FVKeProhdw48Y^}kZJB5 +zgY5#GJmSS$UqLOd_(caE4}lYxL+~I^gy3Vb#1xkd9>(@n=;i4MED<5@=S@+F5Yg+; +z`_Wq_?!sqZgbEB@2N|!%KyC~&#$+=D3Bv +z$E+e|xyj@KGbp1>9kzR{IZTQBnL1RQX4NQ)5@o@d{eZ9jB-E5?jA=Fyj(-64_o`5Y_) +z3GkjX@Ylnnm-k$P?@GmkvhK%g0chcUm*HwX(a^OHQ^hfh>kz`T=4@=*fMIgTO1b!J +z8xX1>9sJgHNR;i?*hDf=RBDoD@=+`3rV-5IKY~l2Kuw+L!GLUQvJR~HcX$1@rjIP6 +z7A;Hs-%hV6x=J+WRVP*Z9=LfA%Odgc8@Hjfjtn4KGd-$S#i~wwc~($O6q}08!en~X +zKKMJ#)Iqt!hPQTvUpAY@_X(oYG0K9SDjEUt2*>T>pxg4)h2lQ3jU3_~`@}Pqe*-$E +Buh9Si + +delta 667 +zcmYk2T}YF06vp|#=l{+*%}va&T(X%V#%riS=4Oun-sv_?okoZ$I-OceQ4Fot!~cs*>9Aiq2ZFAr-4_x%v&vRCYJmEwWt;J)1oGmIUixg!u@ +zQil^q-a{hp4nh;2kLLRLBBff0YQ-&tTd5JE#_knrKTZds5bKJ$6-~RqsLOV$ja@GE +zWkEdp=10.3", "drupal/automatic_updates": "^3.1.6", - "drupal/project_browser": "2.0.x-dev", + "drupal/project_browser": "dev-3450629-mini-browser", "drupal/upgrade_status": "^4.3" } } From 8c7b011f1297ba451589bf90a61ddf033a97ee9d Mon Sep 17 00:00:00 2001 From: narendra-drupal <87118318+narendra-drupal@users.noreply.github.com> Date: Wed, 14 Aug 2024 21:06:20 +0530 Subject: [PATCH 2/2] RouteSubscriber used --- installer/src/Routing/RouteSubscriber.php | 36 +++++++++++++++++++ installer/starshot_installer.services.yml | 5 +++ patches/project_browser/pb.patch | 13 ------- patches/project_browser/project_browser.patch | 36 ------------------- 4 files changed, 41 insertions(+), 49 deletions(-) create mode 100644 installer/src/Routing/RouteSubscriber.php create mode 100644 installer/starshot_installer.services.yml delete mode 100644 patches/project_browser/project_browser.patch diff --git a/installer/src/Routing/RouteSubscriber.php b/installer/src/Routing/RouteSubscriber.php new file mode 100644 index 0000000..4a27061 --- /dev/null +++ b/installer/src/Routing/RouteSubscriber.php @@ -0,0 +1,36 @@ +get($route); + if ($route) { + $route->setRequirements([ + '_access' => 'TRUE', + ]); + } + } + } + } + +} diff --git a/installer/starshot_installer.services.yml b/installer/starshot_installer.services.yml new file mode 100644 index 0000000..3636e9e --- /dev/null +++ b/installer/starshot_installer.services.yml @@ -0,0 +1,5 @@ +services: + starshot_installer.route_subscriber: + class: Drupal\starshot_installer\Routing\RouteSubscriber + tags: + - { name: event_subscriber } diff --git a/patches/project_browser/pb.patch b/patches/project_browser/pb.patch index f5d432c..1884cfd 100644 --- a/patches/project_browser/pb.patch +++ b/patches/project_browser/pb.patch @@ -1,16 +1,3 @@ -diff --git a/project_browser.routing.yml b/project_browser.routing.yml -index b7ad176..9056bf8 100644 ---- a/project_browser.routing.yml -+++ b/project_browser.routing.yml -@@ -15,7 +15,7 @@ project_browser.api_project_get_all: - _controller: '\Drupal\project_browser\Controller\ProjectBrowserEndpointController::getAllProjects' - _title: 'Get all projects' - requirements: -- _permission: 'administer modules' -+ _access: 'TRUE' - #options: - # no_cache: 'TRUE' - project_browser.browse: diff --git a/sveltejs/public/build/bundle.js b/sveltejs/public/build/bundle.js index 77726f38845aab0952ba9f3b9f7640a3e39b1a8f..638c3052d89ff0f256e35379fcc7e20758ee2fe9 100644 GIT binary patch diff --git a/patches/project_browser/project_browser.patch b/patches/project_browser/project_browser.patch deleted file mode 100644 index 5117be8..0000000 --- a/patches/project_browser/project_browser.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/project_browser.routing.yml b/project_browser.routing.yml -index b7ad176..9056bf8 100644 ---- a/project_browser.routing.yml -+++ b/project_browser.routing.yml -@@ -15,7 +15,7 @@ project_browser.api_project_get_all: - _controller: '\Drupal\project_browser\Controller\ProjectBrowserEndpointController::getAllProjects' - _title: 'Get all projects' - requirements: -- _permission: 'administer modules' -+ _access: 'TRUE' - #options: - # no_cache: 'TRUE' - project_browser.browse: -diff --git a/sveltejs/public/build/bundle.js b/sveltejs/public/build/bundle.js -index 77726f3..638c305 100644 -Binary files a/sveltejs/public/build/bundle.js and b/sveltejs/public/build/bundle.js differ -diff --git a/sveltejs/public/build/bundle.js.map b/sveltejs/public/build/bundle.js.map -index b8b9abd..e1d841c 100644 -Binary files a/sveltejs/public/build/bundle.js.map and b/sveltejs/public/build/bundle.js.map differ -diff --git a/sveltejs/src/ProjectBrowser.svelte b/sveltejs/src/ProjectBrowser.svelte -index 8bf58aa..0ea1d82 100644 ---- a/sveltejs/src/ProjectBrowser.svelte -+++ b/sveltejs/src/ProjectBrowser.svelte -@@ -102,9 +102,9 @@ - ); - } - -- const url = Drupal.url( -- `drupal-org-proxy/project?${searchParams.toString()}`, -- ); -+ const url = `${window.location.protocol}//${ -+ window.location.host -+ }/drupal-org-proxy/project?${searchParams.toString()}`; - - const res = await fetch(url); - if (res.ok) {