Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const meta: Meta<typeof ApplicationIcon> = {
'premo',
'sam',
'subsurface portal',
'jscalendar',
'atwork',
],
},
size: { control: 'radio', options: [16, 24, 32, 40, 48, 96] },
Expand Down
6 changes: 3 additions & 3 deletions src/molecules/ApplicationIcon/ApplicationIcon.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ import { ApplicationIcon, ApplicationIconProps } from './ApplicationIcon';
import {
acquire,
adca,
atwork,
bravos,
dasha,
fluxMaps,
forecastFormatter,
fourDInsight,
IconDataWithColor,
inPress,
jscalendar,
jsembark,
loggingQualification,
orca,
Expand Down Expand Up @@ -42,7 +42,7 @@ const nameOptions: ApplicationIconProps['name'][] = [
'premo',
'sam',
'subsurface portal',
'jscalendar',
'atwork',
];
const sizeOptions: ApplicationIconProps['size'][] = [16, 24, 32, 40, 48];

Expand All @@ -68,7 +68,7 @@ const icons: IconsDict = {
premo: premo,
sam: sam,
'subsurface portal': subsurfacePortal,
jscalendar: jscalendar,
atwork: atwork,
};

test('Render correctly with corresponding props', () => {
Expand Down
6 changes: 3 additions & 3 deletions src/molecules/ApplicationIcon/ApplicationIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import { forwardRef, ForwardRefExoticComponent, RefAttributes } from 'react';

import { Acquire } from './Icons/Acquire';
import { Adca } from './Icons/Adca';
import { AtWork } from './Icons/Atwork';
import { Bravos } from './Icons/Bravos';
import { Dasha } from './Icons/Dasha';
import { FluxMaps } from './Icons/FluxMaps';
import { ForecastFormatter } from './Icons/ForecastFormatter';
import { FourDInsight } from './Icons/FourDInsight';
import { InPress } from './Icons/InPress';
import { JsCalendar } from './Icons/JsCalendar';
import { JsEmbark } from './Icons/JsEmbark';
import { LoggingQualification } from './Icons/LoggingQualification';
import { Orca } from './Icons/Orca';
Expand All @@ -30,7 +30,7 @@ export type ApplicationName =
| 'orca'
| 'portal'
| 'jsembark'
| 'jscalendar'
| 'atwork'
| 'logging-qualification'
| 'pwex'
| 'inpress'
Expand Down Expand Up @@ -76,7 +76,7 @@ const apps: ApplicationIconData[] = [
{ appName: ['premo'], component: Premo },
{ appName: ['sam'], component: Sam },
{ appName: ['subsurface portal'], component: SubsurfacePortal },
{ appName: ['jscalendar', 'js calendar'], component: JsCalendar },
{ appName: ['atwork'], component: AtWork },
];

export interface ApplicationIconProps extends Partial<AppIconProps> {
Expand Down
4 changes: 2 additions & 2 deletions src/molecules/ApplicationIcon/ApplicationIconCollection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,8 @@ export const fluxMaps: IconDataWithColor[] = [
},
];

export const jscalendar: IconData = {
name: 'jscalendar',
export const atwork: IconData = {
name: 'atwork',
prefix: 'amplify',
height: '24',
width: '24',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { forwardRef } from 'react';

import { jscalendar } from '../ApplicationIconCollection';
import { atwork } from '../ApplicationIconCollection';
import { AppIconProps } from 'src/molecules/ApplicationIcon/ApplicationIcon.types';
import ApplicationIconBase, {
ShapeProps,
Expand All @@ -19,15 +19,8 @@ const shapes: ShapeProps[] = [
},
];

export const JsCalendar = forwardRef<HTMLDivElement, AppIconProps>(
(props, ref) => (
<ApplicationIconBase
ref={ref}
iconData={jscalendar}
shapes={shapes}
{...props}
/>
)
);
export const AtWork = forwardRef<HTMLDivElement, AppIconProps>((props, ref) => (
<ApplicationIconBase ref={ref} iconData={atwork} shapes={shapes} {...props} />
));

JsCalendar.displayName = 'JsCalendar';
AtWork.displayName = 'atWork';
Loading