Skip to content

Commit

Permalink
Billing release 002 (#637)
Browse files Browse the repository at this point in the history
* Billing api extra labels (#619)

* Added compute_category, cromwell_sub_workflow_name, cromwell_workflow_id, goog_pipelines_worker and wdl_task_name to extended view and created relevant filters and API points.

* Added labels to all BQ queries, refactoring billing layer.

* Added examples to billing-total-cost API regarding the new filters.

* Billing - fixing styling issues after the first Billing release (#624)

* Temporarily disable seqr and hail from /topics API.

* Autoselect 1st topic / 1st project value from the DDL.

* Merging Billing.css into index.css

* Small fix - reusing extRecords in FieldSelector component.

* Refactoring duplicated code in FieldSelector.

* Added Stages to the Group by DDL.

* Billing API IsBillingEnabled (#626)

* Added API point to check if billing is enabled.

* Added simple Total Cost By Batch Page. (#627)

* Added simple Total Cost By Batch Page.

* Billing cost by category (#629)

* Added simple Total Cost By Batch Page.

* Fixed autoselect day format.

* Fixing day format for autoselect (missing leading 0)

* Added first draft of billing page to show detail SKU per selected cost category over selected time periods (day, week, month or invoice month)

* Small fix for BillingCostByBatch page, disable search if searchBy is empty or < 6 chars.

* New: Billing API GET namespaces, added namespace to allowed fields for total cost.

* Implemented HorizontalStackedBarChart, updated Billing By Invoice Month page to enable toggle between chart and table view.

* Stacked Bars Chart with option to accumulate data. (#634)

* Implemented Stacked bars with option to accumulate data.

* Added budget bar to billing horizontal bar chart, added background color for the billing table to reflect the chart colours.

* Added simple prediction of billing stacked bar chart.

* Billing hail batch layout (#633)

* Added simple Total Cost By Batch Page.

* Removing debug prints.

* Fixed autoselect day format.

* Fixing day format for autoselect (missing leading 0)

* Added first draft of billing page to show detail SKU per selected cost category over selected time periods (day, week, month or invoice month)

* Small fix for BillingCostByBatch page, disable search if searchBy is empty or < 6 chars.

* New: Billing API GET namespaces, added namespace to allowed fields for total cost.

* Implemented HorizontalStackedBarChart, updated Billing By Invoice Month page to enable toggle between chart and table view.

* ADD: Cost by Analysis page

* ADD: add start of Analysis grid

* ADD: add start of Analysis grid

* FIX: table fixes for the HailBatchGrid

* API: api changes to enable query of the raw table

* API: fixed and working with updated get_total_cost endpoint

* API: fix typing of get_total_cost (default return is now a list[dict] and can be converted in the layer/route to a specific output type

* API: add endpoint to get costs by batch_id

* API: done

* IN PROGRESS: modifying Cost By Analysis to use new endpoints

* IN PROGRESS: changes to Cost By Analysis, linking with backend API.

* IN PROGRESS: changes to Cost By Analysis, grid grouping by ar/batch/job.

* NEW: finalising Cost By Analysis page

* ADD: durations to Cost By Analysis page

---------

Co-authored-by: Milo Hyben <[email protected]>

* FIX: Billing - fixing time_column condition.

* Removing draft billing page.

* Remove unused API point & cleanup, changes as per code review.

* Small Frontend refactoring, reflecting PR review.

* Updating billing style for dark mode.

* Optimised Frontend, replacing reduce with forEach where possible.

* Refactoring Billing DB structures.

* Cleaning up unused dependencies.

* FIX: replaced button 'color=red' with 'negative' property.

* FIX: replace HEX color for pattern with CSS var.

* FIX: replace async call with sync for a simple function.

* FIX: dark mode for Horizontal Stacked Bar.

* FIX: billing cost by analysis page, esp. search control resizing and functionality.

* FIX: duplicated keys in the grid on Billing Cost By Analysis page.

* FIX: refactoring BQ tables, small fixes for billing pages.

* FIX: BillingCostPageAnalysis, keeping the old record until loading of data finishes.

* FIX: Billing StackedChart various issues.

* FIX: missing filters checks, updating charts when loading.

* FIX: silenece linting no attribute msg for Middleware.

* Refactoring filters, implemented first Billing GraphQL integration.

* Removing temporary Billing GraphQL, will be properly implemented in the next PRs.

* Applied changes as suggested by review.

* Update db/python/tables/bq/generic_bq_filter_model.py

Co-authored-by: Michael Franklin <[email protected]>

---------

Co-authored-by: Sabrina Yan <[email protected]>
Co-authored-by: Michael Franklin <[email protected]>
  • Loading branch information
3 people authored Jan 25, 2024
1 parent fcf07f2 commit 11002af
Show file tree
Hide file tree
Showing 42 changed files with 4,661 additions and 1,441 deletions.
1 change: 0 additions & 1 deletion api/graphql/schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,6 @@ class GraphQLSequencingGroup:

@staticmethod
def from_internal(internal: SequencingGroupInternal) -> 'GraphQLSequencingGroup':
# print(internal)
return GraphQLSequencingGroup(
id=sequencing_group_id_format(internal.id),
type=internal.type,
Expand Down
Loading

0 comments on commit 11002af

Please sign in to comment.