This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git
The following commit(s) were added to refs/heads/master by this push:
new 64e4cdc1 remove redundant call to get activities
64e4cdc1 is described below
commit 64e4cdc11638030452f34c63204ae3b78016c203
Author: Alex Heneveld <[email protected]>
AuthorDate: Wed May 24 11:56:05 2023 +0100
remove redundant call to get activities
---
.../inspect/activities/activities.controller.js | 28 ++++++++++++----------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git
a/ui-modules/app-inspector/app/views/main/inspect/activities/activities.controller.js
b/ui-modules/app-inspector/app/views/main/inspect/activities/activities.controller.js
index eb00c68b..edf28ff6 100644
---
a/ui-modules/app-inspector/app/views/main/inspect/activities/activities.controller.js
+++
b/ui-modules/app-inspector/app/views/main/inspect/activities/activities.controller.js
@@ -133,11 +133,11 @@ function ActivitiesController($scope, $state,
$stateParams, $log, $timeout, enti
const checkTasksLoadAttemptsFinished = () => {
$scope.activitiesLoaded = activitiesRawLoadAttemptFinished &&
workflowLoadAttemptFinished;
}
- entityApi.entityActivities(applicationId, entityId).then((response) =>
{
- vm.activitiesRaw = response.data;
+ entityApi.entityActivitiesDeep(applicationId,
entityId).then((response) => {
+ vm.activitiesDeep = vm.activitiesRaw = response.data;
mergeActivities();
observers.push(response.subscribe((response) => {
- vm.activitiesRaw = response.data;
+ vm.activitiesDeep = vm.activitiesRaw = response.data;
mergeActivities();
vm.error = undefined;
}));
@@ -165,16 +165,18 @@ function ActivitiesController($scope, $state,
$stateParams, $log, $timeout, enti
checkTasksLoadAttemptsFinished();
});
- entityApi.entityActivitiesDeep(applicationId,
entityId).then((response) => {
- vm.activitiesDeep = response.data;
- observers.push(response.subscribe((response) => {
- vm.activitiesDeep = response.data;
- vm.error = undefined;
- }));
- }).catch((error) => {
- $log.warn('Error loading activity children deep for entity ' +
entityId, error);
- vm.error = 'Cannot load activities (deep) for entity with ID: ' +
entityId;
- });
+ // previously we loaded these separately, and the (now Deep) call
above was previously entityActivities
+ // but the only difference is for cross-entitiy activities, and
calling just Deep and using for both is more efficient
+// entityApi.entityActivitiesDeep(applicationId,
entityId).then((response) => {
+// vm.activitiesDeep = response.data;
+// observers.push(response.subscribe((response) => {
+// vm.activitiesDeep = response.data;
+// vm.error = undefined;
+// }));
+// }).catch((error) => {
+// $log.warn('Error loading activity children deep for entity ' +
entityId, error);
+// vm.error = 'Cannot load activities (deep) for entity with ID: '
+ entityId;
+// });
$scope.$on('$destroy', () => {
observers.forEach((observer) => {
