Skip to content

Commit

Permalink
Merge pull request #104 from atlassian-labs/DATADISC-846
Browse files Browse the repository at this point in the history
Add glyphs for new data component types
  • Loading branch information
philipewingatlassian authored May 8, 2024
2 parents 6f5ac1d + cf20fd7 commit 8ffce3d
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 1 deletion.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Contributing to gitlab-for-compass

Thank you for considering a contribution to [Project name]! Pull requests, issues and comments are welcome. For pull requests, please:
Thank you for considering a contribution to gitlab-for-compass! Pull requests, issues and comments are welcome. For pull requests, please:

* Add tests for new features and bug fixes
* Follow the existing style
Expand Down
1 change: 1 addition & 0 deletions src/features.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export enum GitlabFeaturesEnum {
SEND_STAGING_EVENTS = 'isSendStagingEventsEnabled',
DATA_COMPONENT_TYPES = 'isDataComponentTypesEnabled',
}

export type FeaturesList = { [key in GitlabFeaturesEnum]: boolean };
4 changes: 4 additions & 0 deletions src/services/feature-flags.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@ export const isSendStagingEventsEnabled = (defaultValue = false): boolean => {
return process.env.FF_SEND_STAGING_EVENTS === 'true' || defaultValue;
};

const isDataComponentTypesEnabled = (defaultValue = false): boolean =>
process.env.FF_DATA_COMPONENT_TYPES === 'true' || defaultValue;

export const listFeatures = (): FeaturesList => {
return {
[GitlabFeaturesEnum.SEND_STAGING_EVENTS]: isSendStagingEventsEnabled(),
[GitlabFeaturesEnum.DATA_COMPONENT_TYPES]: isDataComponentTypesEnabled(),
};
};
60 changes: 60 additions & 0 deletions ui/src/components/assets/component-glyphs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -249,4 +249,64 @@ export const COMPONENT_TYPES: ComponentTypeData[] = [
),
fieldDefinitionIds: ['compass:lifecycle'],
},
{
id: 'DATASET',
label: 'Dataset',
color: token('color.icon.accent.magenta', '#CD519D'),
icon: (props: CustomGlyphProps) => (
<svg width='24' height='24' viewBox='0 0 24 24' fill='none' xmlns='http://www.w3.org/2000/svg' {...props}>
<path
d='M3 0H21C22.7 0 24 1.3 24 3V21C24 22.7 22.7 24 21 24H3C1.3 24 0 22.7 0 21V3C0 1.3 1.3 0 3 0Z'
fill='#CD519D'
/>
<path
fillRule='evenodd'
clipRule='evenodd'
d='M6.5 6.5V17.5H17.5V6.5H6.5ZM6 5C5.44772 5 5 5.44772 5 6V18C5 18.5523 5.44772 19 6 19H18C18.5523 19 19 18.5523 19 18V6C19 5.44772 18.5523 5 18 5H6Z'
fill='white'
/>
<path fillRule='evenodd' clipRule='evenodd' d='M18 10.75H5V9.25H18V10.75Z' fill='white' />
<path fillRule='evenodd' clipRule='evenodd' d='M18 14.75H5V13.25H18V14.75Z' fill='white' />
<path fillRule='evenodd' clipRule='evenodd' d='M12.75 5L12.75 18L11.25 18L11.25 5L12.75 5Z' fill='white' />
</svg>
),
fieldDefinitionIds: ['compass:lifecycle'],
},
{
id: 'DASHBOARD',
label: 'Dashboard',
color: token('color.icon.accent.purple', colors.P200),
icon: (props: CustomGlyphProps) => (
<svg width='24' height='24' viewBox='0 0 24 24' fill='none' xmlns='http://www.w3.org/2000/svg' {...props}>
<path d='M0 21V3c0-1.7 1.3-3 3-3h18c1.7 0 3 1.3 3 3v18c0 1.7-1.3 3-3 3H3c-1.7 0-3-1.3-3-3Z' fill='#8270DB' />
<path
fillRule='evenodd'
clipRule='evenodd'
d='M5.5 17.5h13v-11h-13v11ZM4 18a1 1 0 0 0 1 1h14a1 1 0 0 0 1-1V6a1 1 0 0 0-1-1H5a1 1 0 0 0-1 1v12Z'
fill='#fff'
/>
<path fillRule='evenodd' clipRule='evenodd' d='M4 9.25h8v1.5H4v-1.5ZM12 13.25h8v1.5h-8v-1.5Z' fill='#fff' />
<path fillRule='evenodd' clipRule='evenodd' d='M12.75 6v13h-1.5V6h1.5Z' fill='#fff' />
</svg>
),
fieldDefinitionIds: ['compass:lifecycle'],
},
{
id: 'DATA_PRODUCT',
label: 'Data Product',
color: token('color.icon.accent.green', colors.G300),
icon: (props: CustomGlyphProps) => (
<svg width='24' height='24' viewBox='0 0 24 24' fill='none' xmlns='http://www.w3.org/2000/svg' {...props}>
<path d='M0 21V3c0-1.7 1.3-3 3-3h18c1.7 0 3 1.3 3 3v18c0 1.7-1.3 3-3 3H3c-1.7 0-3-1.3-3-3Z' fill='#22A06B' />
<path
fillRule='evenodd'
clipRule='evenodd'
d='M4.1 5a.9.9 0 0 1 .9-.9h4v1.8H5.9V9H4.1V5ZM19 4.1a.9.9 0 0 1 .9.9v4h-1.8V5.9H15V4.1h4ZM19.9 19a.9.9 0 0 1-.9.9h-4v-1.8h3.1V15h1.8v4ZM5 19.9a.9.9 0 0 1-.9-.9v-4h1.8v3.1H9v1.8H5Z'
fill='#fff'
/>
<path d='M11 8h2v2h-2V8ZM8 11h2v2H8v-2ZM11 14h2v2h-2v-2ZM14 11h2v2h-2v-2Z' fill='#fff' />
</svg>
),
fieldDefinitionIds: ['compass:lifecycle'],
},
];
1 change: 1 addition & 0 deletions ui/src/hooks/useFeatures.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { DefaultErrorTypes, ErrorTypes } from '../resolverTypes';
export const useFeatures = (): [FeaturesList, boolean, ErrorTypes | undefined] => {
const [features, setFeatures] = useState<FeaturesList>({
[GitlabFeaturesEnum.SEND_STAGING_EVENTS]: false,
[GitlabFeaturesEnum.DATA_COMPONENT_TYPES]: false,
});
const [loading, setLoading] = useState<boolean>(false);
const [error, setError] = useState<ErrorTypes>();
Expand Down

0 comments on commit 8ffce3d

Please sign in to comment.