Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: Install plugin to existing organizations after approval (#9840)

Browse Source
This commit is contained in:
Nidhi 2021-12-17 12:35:19 +05:30 committed by GitHub
parent c58e60ee2c
commit ab4add4b83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/PluginServiceCEImpl.java
View File

@ -200,8 +200,13 @@ public class PluginServiceCEImpl extends BaseService<PluginRepository, Plugin, S
.collect(Collectors.toList());
return organizationService.getAll()
.flatMap(organization -> {
organization.getPlugins().addAll(newOrganizationPlugins);
return organizationService.save(organization);
// Only perform a DB op if plugins associated to this org have changed
if (organization.getPlugins().containsAll(newOrganizationPlugins)) {
return Mono.just(organization);
} else {
organization.getPlugins().addAll(newOrganizationPlugins);
return organizationService.save(organization);
}
});
}

13
app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/PluginScheduledTaskCEImpl.java
View File

@ -69,8 +69,17 @@ public class PluginScheduledTaskCEImpl implements PluginScheduledTaskCE {
}
});
final Mono<List<Plugin>> updatedPluginsFlux = pluginService.saveAll(updatablePlugins)
// Save new data for this plugin,
// then make sure to install to organizations in case the default installation flag changed
final Mono<List<Organization>> updatedPluginsOrganizationFlux = pluginService
.saveAll(updatablePlugins)
.filter(Plugin::getDefaultInstall)
.collectList()
.flatMapMany(pluginService::installDefaultPlugins)
.collectList();
// Create plugin,
// then install to all organizations if default installation is turned on
final Mono<List<Organization>> organizationFlux =
Flux.fromIterable(insertablePlugins)
.flatMap(pluginService::create)
@ -79,7 +88,7 @@ public class PluginScheduledTaskCEImpl implements PluginScheduledTaskCE {
.flatMapMany(pluginService::installDefaultPlugins)
.collectList();
return updatedPluginsFlux
return updatedPluginsOrganizationFlux
.zipWith(organizationFlux)
.then();
})