Merge branch 'apache:master' into docs/dev_install_fix2

apache · Jan 10, 2025 · 8a0ff54 · 8a0ff54
2 parents 23d69cc + 41ed37a
commit 8a0ff54
Show file tree

Hide file tree

Showing 25 changed files with 454 additions and 325 deletions.
diff --git a/...-frontend/packages/superset-ui-demo/storybook/stories/superset-ui-style/Theme.stories.tsx b/...-frontend/packages/superset-ui-demo/storybook/stories/superset-ui-style/Theme.stories.tsx
@@ -25,23 +25,96 @@ export default {
 
 export const ThemeColors = () => {
   const { colors } = supersetTheme;
-  return Object.keys(colors).map(collection => (
+
+  // Define tones to be displayed in columns
+  const tones = [
+    'dark2',
+    'dark1',
+    'base',
+    'light1',
+    'light2',
+    'light3',
+    'light4',
+    'light5',
+  ];
+  const colorTypes = [
+    'primary',
+    'secondary',
+    'grayscale',
+    'error',
+    'warning',
+    'alert',
+    'success',
+    'info',
+  ];
+  return (
     <div>
-      <h2>{collection}</h2>
-      <table style={{ width: '300px' }}>
-        {Object.keys(colors[collection]).map(k => {
-          const hex = colors[collection][k];
-          return (
-            <tr>
-              <td>{k}</td>
-              <td>
-                <code>{hex}</code>
+      <h1>Theme Colors</h1>
+      <table
+        style={{ borderCollapse: 'collapse', width: '100%', textAlign: 'left' }}
+      >
+        <thead>
+          <tr>
+            <th style={{ border: '1px solid #ddd', padding: '8px' }}>
+              Category
+            </th>
+            {tones.map(tone => (
+              <th
+                key={tone}
+                style={{ border: '1px solid #ddd', padding: '8px' }}
+              >
+                {tone}
+              </th>
+            ))}
+          </tr>
+        </thead>
+        <tbody>
+          {colorTypes.map(category => (
+            <tr key={category}>
+              <td style={{ border: '1px solid #ddd', padding: '8px' }}>
+                <strong>{category}</strong>
               </td>
-              <td style={{ width: '150px', backgroundColor: hex }} />
+              {tones.map(tone => {
+                const color = colors[category][tone];
+                return (
+                  <td
+                    key={tone}
+                    style={{
+                      border: '1px solid #ddd',
+                      padding: '8px',
+                      backgroundColor: color || '#fff',
+                    }}
+                  >
+                    {color ? <code>{color}</code> : '-'}
+                  </td>
+                );
+              })}
             </tr>
-          );
-        })}
+          ))}
+        </tbody>
       </table>
+      <h3>
+        text.label: <code>{colors.text.label}</code>
+      </h3>
+      <div style={{ color: `#${colors.text.label}` }}>
+        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod
+        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
+        veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
+        commodo consequat.
+      </div>
+      <h3>
+        text.help: <code>{colors.text.help}</code>
+      </h3>
+      <div style={{ color: `#${colors.text.help}` }}>
+        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod
+        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
+        veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
+        commodo consequat.
+      </div>
+      <h3>The supersetTheme object</h3>
+      <code>
+        <pre>{JSON.stringify(supersetTheme, null, 2)}</pre>
+      </code>
     </div>
-  ));
+  );
 };
diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetActionButton/index.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetActionButton/index.tsx
@@ -37,7 +37,7 @@ const SaveDatasetActionButton = ({
   const StyledDropdownButton = styled(
     DropdownButton as FC<DropdownButtonProps>,
   )`
-    &.ant-dropdown-button button.antd5-btn.antd5-btn-default {
+    &.ant-dropdown-button button.ant-btn.ant-btn-default {
       font-weight: ${theme.gridUnit * 150};
       background-color: ${theme.colors.primary.light4};
       color: ${theme.colors.primary.dark1};

diff --git a/superset-frontend/src/components/AlteredSliceTag/index.tsx b/superset-frontend/src/components/AlteredSliceTag/index.tsx
@@ -19,9 +19,11 @@
 import { useCallback, useEffect, useMemo, useState, FC } from 'react';
 
 import { isEqual, isEmpty } from 'lodash';
-import { QueryFormData, styled, t } from '@superset-ui/core';
+import { QueryFormData, t } from '@superset-ui/core';
 import { sanitizeFormData } from 'src/explore/exploreUtils/formData';
 import getControlsForVizType from 'src/utils/getControlsForVizType';
+import Label from 'src/components/Label';
+import Icons from 'src/components/Icons';
 import { safeStringify } from 'src/utils/safeStringify';
 import { Tooltip } from 'src/components/Tooltip';
 import ModalTrigger from '../ModalTrigger';
@@ -68,18 +70,6 @@ export type RowType = {
   control: string;
 };
 
-const StyledLabel = styled.span`
-  ${({ theme }) => `
-    font-size: ${theme.typography.sizes.s}px;
-    color: ${theme.colors.grayscale.dark1};
-    background-color: ${theme.colors.alert.base};
-
-    &:hover {
-      background-color: ${theme.colors.alert.dark1};
-    }
-  `}
-`;
-
 export const alterForComparison = (
   value?: string | null | [],
 ): string | null => {
@@ -228,7 +218,14 @@ const AlteredSliceTag: FC<AlteredSliceTagProps> = props => {
   const triggerNode = useMemo(
     () => (
       <Tooltip id="difference-tooltip" title={t('Click to see difference')}>
-        <StyledLabel className="label">{t('Altered')}</StyledLabel>
+        <Label
+          icon={<Icons.Warning iconSize="m" />}
+          className="label"
+          type="alert"
+          onClick={() => {}}
+        >
+          {t('Altered')}
+        </Label>
       </Tooltip>
     ),
     [],

diff --git a/superset-frontend/src/components/DropdownButton/index.tsx b/superset-frontend/src/components/DropdownButton/index.tsx
@@ -23,8 +23,8 @@ import { styled } from '@superset-ui/core';
 import { kebabCase } from 'lodash';
 
 const StyledDropdownButton = styled.div`
-  .antd5-btn-group {
-    button.antd5-btn {
+  .ant-btn-group {
+    button.ant-btn {
       background-color: ${({ theme }) => theme.colors.primary.dark1};
       border-color: transparent;
       color: ${({ theme }) => theme.colors.grayscale.light5};

diff --git a/superset-frontend/src/components/DropdownSelectableIcon/index.tsx b/superset-frontend/src/components/DropdownSelectableIcon/index.tsx
@@ -41,10 +41,10 @@ export interface DropDownSelectableProps extends Pick<MenuProps, 'onSelect'> {
 }
 
 const StyledDropdownButton = styled(DropdownButton as FC<DropdownButtonProps>)`
-  button.antd5-btn:first-of-type {
+  button.ant-btn:first-of-type {
     display: none;
   }
-  > button.antd5-btn:nth-of-type(2) {
+  > button.ant-btn:nth-of-type(2) {
     display: inline-flex;
     background-color: transparent !important;
     height: unset;

diff --git a/superset-frontend/src/components/Icons/Icon.tsx b/superset-frontend/src/components/Icons/Icon.tsx
@@ -36,6 +36,10 @@ const AntdIconComponent = ({
 
 export const StyledIcon = styled(AntdIconComponent)<IconType>`
   ${({ iconColor }) => iconColor && `color: ${iconColor};`};
+  span {
+    // Fixing alignement on some of the icons
+    line-height: 0px;
+  }
   font-size: ${({ iconSize, theme }) =>
     iconSize
       ? `${theme.typography.sizes[iconSize] || theme.typography.sizes.m}px`

diff --git a/superset-frontend/src/components/Label/Label.stories.tsx b/superset-frontend/src/components/Label/Label.stories.tsx
@@ -17,14 +17,17 @@
  * under the License.
  */
 import { action } from '@storybook/addon-actions';
-import Label, { Type } from './index';
+import { Meta, StoryFn } from '@storybook/react';
+import Label, { Type, DatasetTypeLabel, PublishedLabel } from './index';
 
+// Define the default export with Storybook configuration
 export default {
   title: 'Label',
   component: Label,
-  excludeStories: 'options',
-};
+  excludeStories: ['options'],
+} as Meta<typeof Label>;
 
+// Explicitly type the options array as an array of `Type`
 export const options: Type[] = [
   'default',
   'alert',
@@ -36,39 +39,60 @@ export const options: Type[] = [
   'secondary',
 ];
 
-export const LabelGallery = () => (
-  <>
-    <h4>Non-interactive</h4>
-    {Object.values(options).map((opt: Type) => (
-      <Label key={opt} type={opt}>
-        {`style: "${opt}"`}
-      </Label>
-    ))}
-    <br />
-    <h4>Interactive</h4>
-    {Object.values(options).map((opt: Type) => (
-      <Label key={opt} type={opt} onClick={action('clicked')}>
-        {`style: "${opt}"`}
-      </Label>
-    ))}
-  </>
-);
+// Define the props for the `LabelGallery` component
+interface LabelGalleryProps {
+  hasOnClick?: boolean;
+  monospace?: boolean;
+}
+
+// Use the `StoryFn` type for LabelGallery
+export const LabelGallery: StoryFn<LabelGalleryProps> = (
+  props: LabelGalleryProps,
+) => {
+  const onClick = props.hasOnClick ? action('clicked') : undefined;
 
-export const InteractiveLabel = (args: any) => {
-  const { hasOnClick, label, monospace, ...rest } = args;
   return (
-    <Label
-      onClick={hasOnClick ? action('clicked') : undefined}
-      monospace={monospace}
-      {...rest}
-    >
-      {label}
-    </Label>
+    <>
+      <h4>Non-interactive</h4>
+      {options.map((opt: Type) => (
+        <Label key={opt} type={opt}>
+          {`style: "${opt}"`}
+        </Label>
+      ))}
+      <br />
+      <h4>Interactive</h4>
+      {options.map((opt: Type) => (
+        <Label key={opt} type={opt} {...props} onClick={onClick}>
+          {`style: "${opt}"`}
+        </Label>
+      ))}
+      <h4>Reusable Labels</h4>
+      <h5>DatasetType</h5>
+      <div>
+        <DatasetTypeLabel datasetType="physical" />
+        <DatasetTypeLabel datasetType="virtual" />
+      </div>
+      <h5>PublishedLabel</h5>
+      <PublishedLabel isPublished />
+      <PublishedLabel isPublished={false} />
+    </>
   );
 };
 
-InteractiveLabel.args = {
+// Define default arguments for Storybook
+LabelGallery.args = {
   hasOnClick: true,
-  label: 'Example',
-  monospace: true,
+  monospace: false,
+};
+
+// Define argument types for Storybook controls
+LabelGallery.argTypes = {
+  monospace: {
+    name: 'monospace',
+    control: { type: 'boolean' },
+  },
+  hasOnClick: {
+    name: 'hasOnClick',
+    control: { type: 'boolean' },
+  },
 };
diff --git a/superset-frontend/src/components/Label/Label.test.tsx b/superset-frontend/src/components/Label/Label.test.tsx
@@ -37,7 +37,9 @@ test('works with an onClick handler', () => {
 // test stories from the storybook!
 test('renders all the storybook gallery variants', () => {
   const { container } = render(<LabelGallery />);
+  const nonInteractiveLabelCount = 4;
+  const renderedLabelCount = options.length * 2 + nonInteractiveLabelCount;
   expect(container.querySelectorAll('.ant-tag')).toHaveLength(
-    options.length * 2,
+    renderedLabelCount,
   );
 });