From 2f8a074dd2741a8079ae28ccaec8b63424724b61 Mon Sep 17 00:00:00 2001 From: Ryan Vazquez Date: Mon, 16 Nov 2020 09:41:01 -0500 Subject: [PATCH 1/7] remove excessive header margin from cost overview banner --- .../src/components/CostInsightsPage/CostInsightsPage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/cost-insights/src/components/CostInsightsPage/CostInsightsPage.tsx b/plugins/cost-insights/src/components/CostInsightsPage/CostInsightsPage.tsx index 3234d1aa7f..50429e8f13 100644 --- a/plugins/cost-insights/src/components/CostInsightsPage/CostInsightsPage.tsx +++ b/plugins/cost-insights/src/components/CostInsightsPage/CostInsightsPage.tsx @@ -191,7 +191,7 @@ export const CostInsightsPage = () => { const CostOverviewBanner = () => ( Date: Mon, 16 Nov 2020 09:45:59 -0500 Subject: [PATCH 2/7] changeset --- .changeset/cost-insights-strange-rings-smile.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/cost-insights-strange-rings-smile.md diff --git a/.changeset/cost-insights-strange-rings-smile.md b/.changeset/cost-insights-strange-rings-smile.md new file mode 100644 index 0000000000..c5f4ff9b73 --- /dev/null +++ b/.changeset/cost-insights-strange-rings-smile.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-cost-insights': patch +--- + +remove excessive margin from cost overview banner From 746e861d0bc5b2e47e1a2a6ef3eeeaf83adebd9a Mon Sep 17 00:00:00 2001 From: Brenda Sukh Date: Mon, 16 Nov 2020 09:56:21 -0500 Subject: [PATCH 3/7] Remove currency feature flag --- .../CostInsightsPage/CostInsightsPage.tsx | 17 ++++++----------- .../CurrencySelect/CurrencySelect.tsx | 1 + 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/plugins/cost-insights/src/components/CostInsightsPage/CostInsightsPage.tsx b/plugins/cost-insights/src/components/CostInsightsPage/CostInsightsPage.tsx index 3234d1aa7f..80464a56cb 100644 --- a/plugins/cost-insights/src/components/CostInsightsPage/CostInsightsPage.tsx +++ b/plugins/cost-insights/src/components/CostInsightsPage/CostInsightsPage.tsx @@ -16,7 +16,7 @@ import React, { useCallback, useEffect, useState } from 'react'; import { Box, Container, Divider, Grid, Typography } from '@material-ui/core'; -import { featureFlagsApiRef, Progress, useApi } from '@backstage/core'; +import { Progress, useApi } from '@backstage/core'; import { default as MaterialAlert } from '@material-ui/lab/Alert'; import { costInsightsApiRef } from '../../api'; import { AlertActionCardList } from '../AlertActionCardList'; @@ -49,7 +49,6 @@ import { useSubtleTypographyStyles } from '../../utils/styles'; export const CostInsightsPage = () => { const classes = useSubtleTypographyStyles(); - const featureFlags = useApi(featureFlagsApiRef); const client = useApi(costInsightsApiRef); const config = useConfig(); const groups = useGroups(); @@ -203,15 +202,11 @@ export const CostInsightsPage = () => { - {featureFlags.isActive('cost-insights-currencies') && ( - - - - )} + {currencies.map((c: Currency) => ( Date: Mon, 16 Nov 2020 10:07:56 -0500 Subject: [PATCH 4/7] Add changeset --- .changeset/cost-insights-ten-carpets-return.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/cost-insights-ten-carpets-return.md diff --git a/.changeset/cost-insights-ten-carpets-return.md b/.changeset/cost-insights-ten-carpets-return.md new file mode 100644 index 0000000000..f378a20eab --- /dev/null +++ b/.changeset/cost-insights-ten-carpets-return.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-cost-insights': minor +--- + +remove cost insights currency feature flag From 885526474eb7d62599c38e5f5a11d653a4c17175 Mon Sep 17 00:00:00 2001 From: Brenda Sukh Date: Mon, 16 Nov 2020 16:14:19 -0500 Subject: [PATCH 5/7] Fix styling on dropdowns --- .../CostInsightsPage/CostInsightsPage.tsx | 19 +++++++++++-------- .../CurrencySelect/CurrencySelect.tsx | 1 - 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/plugins/cost-insights/src/components/CostInsightsPage/CostInsightsPage.tsx b/plugins/cost-insights/src/components/CostInsightsPage/CostInsightsPage.tsx index 80464a56cb..8a9400d97a 100644 --- a/plugins/cost-insights/src/components/CostInsightsPage/CostInsightsPage.tsx +++ b/plugins/cost-insights/src/components/CostInsightsPage/CostInsightsPage.tsx @@ -192,21 +192,24 @@ export const CostInsightsPage = () => { px={3} marginTop={10} display="flex" - flexDirection="row" justifyContent="space-between" + alignItems="center" + minHeight={40} > - + Cost Overview Billing data as of {lastCompleteBillingDate} - - + + + + {currencies.map((c: Currency) => ( Date: Mon, 16 Nov 2020 17:34:35 -0500 Subject: [PATCH 6/7] Add label to currency select --- .../CurrencySelect/CurrencySelect.tsx | 50 +++++++++++-------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/plugins/cost-insights/src/components/CurrencySelect/CurrencySelect.tsx b/plugins/cost-insights/src/components/CurrencySelect/CurrencySelect.tsx index 1b5920ffcb..2db1b8ee38 100644 --- a/plugins/cost-insights/src/components/CurrencySelect/CurrencySelect.tsx +++ b/plugins/cost-insights/src/components/CurrencySelect/CurrencySelect.tsx @@ -15,7 +15,13 @@ */ import React from 'react'; -import { MenuItem, Select, SelectProps } from '@material-ui/core'; +import { + InputLabel, + FormControl, + MenuItem, + Select, + SelectProps, +} from '@material-ui/core'; import { Currency, CurrencyType } from '../../types'; import { findAlways } from '../../utils/assert'; import { useSelectStyles as useStyles } from '../../utils/styles'; @@ -51,24 +57,28 @@ export const CurrencySelect = ({ }; return ( - + + Convert to: + + ); }; From 22f7755d298833639046711a5ecb770adaea3e01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Tue, 17 Nov 2020 13:26:24 +0100 Subject: [PATCH 7/7] docs: skip prettier for long metadata lines (#3311) --- docs/features/software-catalog/descriptor-format.md | 4 ++-- docs/features/software-catalog/external-integrations.md | 4 ++-- docs/features/software-catalog/index.md | 4 ++-- docs/features/software-catalog/well-known-annotations.md | 5 ++--- docs/features/software-catalog/well-known-relations.md | 5 ++--- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/docs/features/software-catalog/descriptor-format.md b/docs/features/software-catalog/descriptor-format.md index 9081009385..5d7a5b9af0 100644 --- a/docs/features/software-catalog/descriptor-format.md +++ b/docs/features/software-catalog/descriptor-format.md @@ -2,8 +2,8 @@ id: descriptor-format title: Descriptor Format of Catalog Entities sidebar_label: YAML File Format -description: Documentation on Descriptor Format of Catalog Entities which -describes the default data shape and semantics of catalog entities +# prettier-ignore +description: Documentation on Descriptor Format of Catalog Entities which describes the default data shape and semantics of catalog entities --- This section describes the default data shape and semantics of catalog entities. diff --git a/docs/features/software-catalog/external-integrations.md b/docs/features/software-catalog/external-integrations.md index 325bed5e4a..e7d253f11e 100644 --- a/docs/features/software-catalog/external-integrations.md +++ b/docs/features/software-catalog/external-integrations.md @@ -1,8 +1,8 @@ --- id: external-integrations title: External integrations -description: Documentation on External integrations to integrate systems -with Backstage +# prettier-ignore +description: Documentation on External integrations to integrate systems with Backstage --- Backstage natively supports importing catalog data through the use of diff --git a/docs/features/software-catalog/index.md b/docs/features/software-catalog/index.md index 08e6260e80..70541b85db 100644 --- a/docs/features/software-catalog/index.md +++ b/docs/features/software-catalog/index.md @@ -2,8 +2,8 @@ id: software-catalog-overview title: Backstage Service Catalog (alpha) sidebar_label: Overview -description: The Backstage Service Catalog — actually, a software catalog, since -it includes more than just services +# prettier-ignore +description: The Backstage Service Catalog — actually, a software catalog, since it includes more than just services --- ## What is a Service Catalog? diff --git a/docs/features/software-catalog/well-known-annotations.md b/docs/features/software-catalog/well-known-annotations.md index 1f5e851064..4d227ea568 100644 --- a/docs/features/software-catalog/well-known-annotations.md +++ b/docs/features/software-catalog/well-known-annotations.md @@ -2,9 +2,8 @@ id: well-known-annotations title: Well-known Annotations on Catalog Entities sidebar_label: Well-known Annotations -description: Documentation that lists a number of well known Annotations, that -have defined semantics. They can be attached to catalog entities and consumed -by plugins as needed. +# prettier-ignore +description: Documentation that lists a number of well known Annotations, that have defined semantics. They can be attached to catalog entities and consumed by plugins as needed. --- This section lists a number of well known diff --git a/docs/features/software-catalog/well-known-relations.md b/docs/features/software-catalog/well-known-relations.md index fe1c32b02f..07a4fc0a5c 100644 --- a/docs/features/software-catalog/well-known-relations.md +++ b/docs/features/software-catalog/well-known-relations.md @@ -2,9 +2,8 @@ id: well-known-relations title: Well-known Relations between Catalog Entities sidebar_label: Well-known Relations -description: Documentation that lists a number of well known Relations, that -have defined semantics. They can be attached to catalog entities and consumed -by plugins as needed. +# prettier-ignore +description: Documentation that lists a number of well known Relations, that have defined semantics. They can be attached to catalog entities and consumed by plugins as needed. --- This section lists a number of well known