feat(updater): hide overwrites from disabled apps list on upgrade #29988

MichaIng · 2021-11-30T15:46:52Z

If an incompatible app is enabled manually, it is added to the app_install_overwrite array in config.php. Nextcloud upgrades won't disable any app in this array, but they were still shown on the upgrade page as being disabled.

This commit assures that only apps are shown as "These incompatible apps will be disabled:" which are really disabled, i.e. which are not in the app_install_overwrite array.

szaimen · 2022-01-27T00:34:46Z

Hiding app overwrite on minor updates is fine, imo.
For major updates, app overwrites should be deleted, though, ihmo.

MichaIng · 2022-01-27T00:50:19Z

For major updates, app overwrites should be deleted, though, ihmo.

This actually makes sense. Hmm, this would need to be done as an additional migration step, I guess? The array would then not be updated yet when this code runs, so we'd need to additionally check for a major upgrade and then change this code like:

if ($isMajorUpgrade || !in_array($appInfo['name'], $incompatibleOverwrites)) {

with $isMajorUpgrade being a boolean depending on whether $installedVersion and $currentVersion differ in major version number or not. I can do that once the overwrite deletion step is added.

skjnldsv · 2022-04-12T06:15:37Z

Hiding app overwrite on minor updates is fine, imo. For major updates, app overwrites should be deleted, though, ihmo.

This is very important, can you raise that today at the server call @szaimen ? :)

szaimen · 2022-04-12T07:07:28Z

This is very important, can you raise that today at the server call @szaimen ? :)

I can try :)

core/Command/Upgrade.php

@@ -188,8 +189,10 @@
 			$updater->listen('\OC\Updater', 'dbUpgrade', function () use ($output) {
 				$output->writeln('<info>Updated database</info>');
 			});
-			$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use ($output) {
-				$output->writeln('<comment>Disabled incompatible app: ' . $app . '</comment>');
+			$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use ($output, &$incompatibleOverwrites) {


core/Command/Upgrade.php

@@ -188,8 +189,10 @@
 			$updater->listen('\OC\Updater', 'dbUpgrade', function () use ($output) {
 				$output->writeln('<info>Updated database</info>');
 			});
-			$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use ($output) {
-				$output->writeln('<comment>Disabled incompatible app: ' . $app . '</comment>');
+			$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use ($output, &$incompatibleOverwrites) {


core/ajax/update.php

@@ -162,8 +163,10 @@
 	$updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($eventSource, $l) {
 		$eventSource->send('success', $l->t('Updated "%1$s" to %2$s', [$app, $version]));
 	});
-	$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use (&$incompatibleApps) {
-		$incompatibleApps[] = $app;
+	$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use (&$incompatibleApps, &$incompatibleOverwrites) {


core/ajax/update.php

@@ -162,8 +163,10 @@
 	$updater->listen('\OC\Updater', 'appUpgrade', function ($app, $version) use ($eventSource, $l) {
 		$eventSource->send('success', $l->t('Updated "%1$s" to %2$s', [$app, $version]));
 	});
-	$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use (&$incompatibleApps) {
-		$incompatibleApps[] = $app;
+	$updater->listen('\OC\Updater', 'incompatibleAppDisabled', function ($app) use (&$incompatibleApps, &$incompatibleOverwrites) {


MichaIng · 2024-02-27T18:39:52Z

Any idea what "Conventional Commits" does not like about the commits text? I added type and scope, so that should be fine: https://www.conventionalcommits.org/en/v1.0.0/

Probably something for the dev documentation, and probably the action can be configured to show the actual tests/rules which have been failed, to give any hint.

skjnldsv · 2024-02-27T19:14:59Z

Any idea what "Conventional Commits" does not like about the commits text? I added type and scope, so that should be fine: https://www.conventionalcommits.org/en/v1.0.0/

Enh is not valid. Feat is :)

MichaIng · 2024-02-27T19:19:21Z

Ah, it says "types other than fix: and feat: are allowed", so I thought any type is valid. But it seams that it is one of this array by default: https://github.com/conventional-changelog/commitlint/tree/master/%40commitlint/config-conventional#type-enum

This PR is not really a (new) feature, I'd say, but there is no better matching type indeed 🙂.
EDIT: Jep, that was it, thanks!

If an incompatible app is enabled manually, it is added to the "app_install_overwrite" array in config.php. Nextcloud upgrades won't disable any app in this array, but they were still shown on the upgrade page and logs as being disabled. This commit assures that only apps which are really disabled, i.e. which are not in the "app_install_overwrite" array, are shown and logged as disabled during upgrades. Signed-off-by: MichaIng <[email protected]>

MichaIng added enhancement 3. to review Waiting for reviews php Pull requests that update Php code labels Nov 30, 2021

MichaIng added this to the Nextcloud 24 milestone Nov 30, 2021

MichaIng force-pushed the enh/hide-overwrites-from-disabled-apps-list branch from 6867b9e to 9a86907 Compare December 20, 2021 02:41

MichaIng force-pushed the enh/hide-overwrites-from-disabled-apps-list branch from 9a86907 to 9dc53c3 Compare January 3, 2022 23:38

MichaIng force-pushed the enh/hide-overwrites-from-disabled-apps-list branch from 9dc53c3 to 4d909a3 Compare January 20, 2022 15:32

MichaIng requested review from nickvergessen and skjnldsv January 26, 2022 23:14

MichaIng force-pushed the enh/hide-overwrites-from-disabled-apps-list branch from 4d909a3 to 4744ce8 Compare February 4, 2022 14:36

skjnldsv mentioned this pull request Mar 24, 2022

24.0.0 beta 1 #31693

Merged

blizzz mentioned this pull request Mar 31, 2022

24.0.0 beta 2 #31769

Merged

blizzz mentioned this pull request Apr 7, 2022

24.0.0 beta 3 #31871

Merged

MichaIng force-pushed the enh/hide-overwrites-from-disabled-apps-list branch from 4744ce8 to a5e8fb3 Compare April 12, 2022 00:05

blizzz mentioned this pull request Apr 13, 2022

24.0.0 RC1 #31962

Merged

MichaIng force-pushed the enh/hide-overwrites-from-disabled-apps-list branch from a5e8fb3 to d9c5524 Compare April 18, 2022 21:01

blizzz modified the milestones: Nextcloud 24, Nextcloud 25 Apr 21, 2022

MichaIng force-pushed the enh/hide-overwrites-from-disabled-apps-list branch from d9c5524 to cf76077 Compare June 1, 2022 20:30

This was referenced Aug 12, 2022

25.0.0 beta 1 #33505

Merged

25.0.0 beta 2 #33592

Merged

This was referenced Aug 24, 2022

25.0.0 beta 3 #33674

Merged

25.0.0 beta 4 #33762

Merged

This was referenced Sep 6, 2022

25.0.0 beta 5 #33913

Merged

25.0.0 beta 6 #34002

Merged

skjnldsv mentioned this pull request Sep 15, 2022

25.0.0 beta 7 #34095

Merged

blizzz added this to the Nextcloud 28 milestone May 23, 2023

joshtrichards added feature: install and update feature: apps management labels Sep 11, 2023

MichaIng force-pushed the enh/hide-overwrites-from-disabled-apps-list branch from ec05b2a to 4ecc956 Compare October 27, 2023 13:40

github-advanced-security bot found potential problems Oct 27, 2023

View reviewed changes

skjnldsv mentioned this pull request Nov 1, 2023

chore: 28.0.0 beta 1 #41228

Merged

This was referenced Nov 6, 2023

28.0.0 beta 2 #41314

Merged

28.0.0 beta 3 #41379

Merged

This was referenced Nov 14, 2023

28.0.0 beta 4 #41477

Merged

28.0.0 RC1 #41621

Merged

blizzz modified the milestones: Nextcloud 28, Nextcloud 29 Nov 23, 2023

MichaIng force-pushed the enh/hide-overwrites-from-disabled-apps-list branch from 4ecc956 to d98e29a Compare January 26, 2024 15:45

skjnldsv force-pushed the enh/hide-overwrites-from-disabled-apps-list branch from d98e29a to 2d5a6cf Compare February 27, 2024 16:34

skjnldsv approved these changes Feb 27, 2024

View reviewed changes

skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Feb 27, 2024

MichaIng changed the title ~~Hide overwrites from disabled apps list on upgrade~~ enh(updater): hide overwrites from disabled apps list on upgrade Feb 27, 2024

MichaIng force-pushed the enh/hide-overwrites-from-disabled-apps-list branch from 2d5a6cf to ab6c32e Compare February 27, 2024 17:47

MichaIng changed the title ~~enh(updater): hide overwrites from disabled apps list on upgrade~~ feat(updater): hide overwrites from disabled apps list on upgrade Feb 27, 2024

MichaIng force-pushed the enh/hide-overwrites-from-disabled-apps-list branch from ab6c32e to 7b137dd Compare February 27, 2024 19:20

skjnldsv disabled auto-merge February 29, 2024 10:47

skjnldsv merged commit 8df55ef into master Feb 29, 2024
159 of 160 checks passed

skjnldsv deleted the enh/hide-overwrites-from-disabled-apps-list branch February 29, 2024 10:47

blizzz mentioned this pull request Mar 5, 2024

29.0.0 beta 1 #43991

Merged

joshtrichards mentioned this pull request Sep 14, 2024

Consider clearing app_install_overwrite (or warning about it when detected) for major version upgrades #43026

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(updater): hide overwrites from disabled apps list on upgrade #29988

feat(updater): hide overwrites from disabled apps list on upgrade #29988

MichaIng commented Nov 30, 2021 •

edited

Loading

szaimen commented Jan 27, 2022

MichaIng commented Jan 27, 2022 •

edited

Loading

skjnldsv commented Apr 12, 2022

szaimen commented Apr 12, 2022

MichaIng commented Feb 27, 2024

skjnldsv commented Feb 27, 2024

MichaIng commented Feb 27, 2024 •

edited

Loading

feat(updater): hide overwrites from disabled apps list on upgrade #29988

feat(updater): hide overwrites from disabled apps list on upgrade #29988

Conversation

MichaIng commented Nov 30, 2021 • edited Loading

szaimen commented Jan 27, 2022

MichaIng commented Jan 27, 2022 • edited Loading

skjnldsv commented Apr 12, 2022

szaimen commented Apr 12, 2022

MichaIng commented Feb 27, 2024

skjnldsv commented Feb 27, 2024

MichaIng commented Feb 27, 2024 • edited Loading

MichaIng commented Nov 30, 2021 •

edited

Loading

MichaIng commented Jan 27, 2022 •

edited

Loading

MichaIng commented Feb 27, 2024 •

edited

Loading