add more colors

apache · Apr 15, 2023 · c073c0b · c073c0b
1 parent 7b840ae
commit c073c0b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/superset-frontend/packages/superset-ui-chart-controls/test/utils/getColorFormatters.test.ts b/superset-frontend/packages/superset-ui-chart-controls/test/utils/getColorFormatters.test.ts
@@ -200,8 +200,11 @@ describe('getColorFunction()', () => {
       countValues,
       false,
     );
+    expect(colorFunction(25)).toBeUndefined();
     expect(colorFunction(50)).toEqual('#FF0000');
+    expect(colorFunction(75)).toEqual('#FF0000');
     expect(colorFunction(100)).toEqual('#FF0000');
+    expect(colorFunction(125)).toBeUndefined();
   });
 
   it('getColorFunction BETWEEN_OR_LEFT_EQUAL', () => {

diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/controlPanel.ts b/superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberTotal/controlPanel.ts
@@ -97,7 +97,7 @@ export default {
               type: 'ConditionalFormattingControl',
               renderTrigger: true,
               label: t('Conditional Formatting'),
-              description: t('Apply conditional color formatting to metrics'),
+              description: t('Apply conditional color formatting to metric'),
               shouldMapStateToProps() {
                 return true;
               },

diff --git a/...src/explore/components/controls/ConditionalFormattingControl/FormattingPopoverContent.tsx b/...src/explore/components/controls/ConditionalFormattingControl/FormattingPopoverContent.tsx
@@ -39,9 +39,12 @@ const JustifyEnd = styled.div`
 `;
 
 const colorSchemeOptions = (theme: SupersetTheme) => [
-  { value: theme.colors.success.light1, label: t('green') },
-  { value: theme.colors.alert.light1, label: t('yellow') },
-  { value: theme.colors.error.light1, label: t('red') },
+  { value: theme.colors.success.light1, label: t('success') },
+  { value: theme.colors.alert.light1, label: t('alert') },
+  { value: theme.colors.error.light1, label: t('error') },
+  { value: theme.colors.success.dark1, label: t('success dark') },
+  { value: theme.colors.alert.dark1, label: t('alert dark') },
+  { value: theme.colors.error.dark1, label: t('error dark') },
 ];
 
 const operatorOptions = [