You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dg...@apache.org on 2020/04/10 09:55:23 UTC
[incubator-dlab] branch DLAB-1571 updated: Fixed billing on
resources page
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1571
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1571 by this push:
new ce7d7ae Fixed billing on resources page
ce7d7ae is described below
commit ce7d7aefe5d4eb90c6abdd86f5304eaabeb66f04
Author: Dmytro Gnatyshyn <di...@ukr.net>
AuthorDate: Fri Apr 10 12:55:04 2020 +0300
Fixed billing on resources page
---
.../resources-grid/resources-grid.model.ts | 64 +++++++++++-----------
1 file changed, 33 insertions(+), 31 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.model.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.model.ts
index b370a15..1e8ceae 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.model.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.model.ts
@@ -60,38 +60,40 @@ export class ExploratoryModel {
project: value.project,
exploratory: value.exploratory.map(el => {
const provider = el.cloud_provider.toLowerCase();
- const billing = value.exploratoryBilling.filter(res => res.tag === el.exploratory_id)[0];
+ const billing = value.exploratoryBilling.filter(res => res.dlabId === el.exploratory_id)[0];
+
return new ExploratoryModel(
- provider,
- el.exploratory_name,
- el.template_name,
- el.image,
- el.status,
- el.shape,
- el.computational_resources,
- el.up_time,
- el.exploratory_url,
- value.shared[el.endpoint].edge_node_ip,
- el.private_ip,
- el.exploratory_user,
- el.exploratory_pass,
- value.shared[el.endpoint][DICTIONARY[provider].bucket_name],
- value.shared[el.endpoint][DICTIONARY[provider].shared_bucket_name],
- el.error_message,
- billing ? billing.cost : '',
- billing ? billing.currency : '',
- el.billing,
- el.libs,
- value.shared[el.endpoint][DICTIONARY[provider].user_storage_account_name],
- value.shared[el.endpoint][DICTIONARY[provider].shared_storage_account_name],
- value.shared[el.endpoint][DICTIONARY[provider].datalake_name],
- value.shared[el.endpoint][DICTIONARY[provider].datalake_user_directory_name],
- value.shared[el.endpoint][DICTIONARY[provider].datalake_shared_directory_name],
- el.project,
- el.endpoint,
- el.tags,
- value.shared[el.endpoint].status
- )})
+ provider,
+ el.exploratory_name,
+ el.template_name,
+ el.image,
+ el.status,
+ el.shape,
+ el.computational_resources,
+ el.up_time,
+ el.exploratory_url,
+ value.shared[el.endpoint].edge_node_ip,
+ el.private_ip,
+ el.exploratory_user,
+ el.exploratory_pass,
+ value.shared[el.endpoint][DICTIONARY[provider].bucket_name],
+ value.shared[el.endpoint][DICTIONARY[provider].shared_bucket_name],
+ el.error_message,
+ billing ? billing.cost : '',
+ billing ? billing.currency : '',
+ el.billing,
+ el.libs,
+ value.shared[el.endpoint][DICTIONARY[provider].user_storage_account_name],
+ value.shared[el.endpoint][DICTIONARY[provider].shared_storage_account_name],
+ value.shared[el.endpoint][DICTIONARY[provider].datalake_name],
+ value.shared[el.endpoint][DICTIONARY[provider].datalake_user_directory_name],
+ value.shared[el.endpoint][DICTIONARY[provider].datalake_shared_directory_name],
+ el.project,
+ el.endpoint,
+ el.tags,
+ value.shared[el.endpoint].status
+ );
+ })
};
});
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org