From 21bd67c7b8d1699b18c30f287598967b5e3a0556 Mon Sep 17 00:00:00 2001 From: Even Mauland-Hus Date: Tue, 6 Jan 2026 15:01:30 +0100 Subject: [PATCH 1/2] Rename JsCalendar component to AtWork and update references --- .../ApplicationIcon/ApplicationIcon.tsx | 4 ++-- .../ApplicationIcon/Icons/JsCalendar.tsx | 20 +++++++++---------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/molecules/ApplicationIcon/ApplicationIcon.tsx b/src/molecules/ApplicationIcon/ApplicationIcon.tsx index 1dc1bbb35..35b5735ec 100644 --- a/src/molecules/ApplicationIcon/ApplicationIcon.tsx +++ b/src/molecules/ApplicationIcon/ApplicationIcon.tsx @@ -8,7 +8,7 @@ import { Fallback } from './Icons/Fallback'; import { ForecastFormatter } from './Icons/ForecastFormatter'; import { FourDInsight } from './Icons/FourDInsight'; import { InPress } from './Icons/InPress'; -import { JsCalendar } from './Icons/JsCalendar'; +import { AtWork } from './Icons/JsCalendar'; import { JsEmbark } from './Icons/JsEmbark'; import { LoggingQualification } from './Icons/LoggingQualification'; import { Orca } from './Icons/Orca'; @@ -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 { diff --git a/src/molecules/ApplicationIcon/Icons/JsCalendar.tsx b/src/molecules/ApplicationIcon/Icons/JsCalendar.tsx index 9e9360670..c497cbf6f 100644 --- a/src/molecules/ApplicationIcon/Icons/JsCalendar.tsx +++ b/src/molecules/ApplicationIcon/Icons/JsCalendar.tsx @@ -19,15 +19,13 @@ const shapes: ShapeProps[] = [ }, ]; -export const JsCalendar = forwardRef( - (props, ref) => ( - - ) -); +export const AtWork = forwardRef((props, ref) => ( + +)); -JsCalendar.displayName = 'JsCalendar'; +AtWork.displayName = 'atWork'; From f4a7d5f405f555ab380221550bc84dc6e094ba9c Mon Sep 17 00:00:00 2001 From: Even Mauland-Hus Date: Tue, 6 Jan 2026 15:07:21 +0100 Subject: [PATCH 2/2] Rename JsCalendar component to AtWork and update all references --- .../ApplicationIcon/ApplicationIcon.stories.tsx | 2 +- src/molecules/ApplicationIcon/ApplicationIcon.test.tsx | 6 +++--- src/molecules/ApplicationIcon/ApplicationIcon.tsx | 4 ++-- .../ApplicationIcon/ApplicationIconCollection.tsx | 4 ++-- .../ApplicationIcon/Icons/{JsCalendar.tsx => Atwork.tsx} | 9 ++------- 5 files changed, 10 insertions(+), 15 deletions(-) rename src/molecules/ApplicationIcon/Icons/{JsCalendar.tsx => Atwork.tsx} (75%) diff --git a/src/molecules/ApplicationIcon/ApplicationIcon.stories.tsx b/src/molecules/ApplicationIcon/ApplicationIcon.stories.tsx index cd1e1e079..c924dc3af 100644 --- a/src/molecules/ApplicationIcon/ApplicationIcon.stories.tsx +++ b/src/molecules/ApplicationIcon/ApplicationIcon.stories.tsx @@ -26,7 +26,7 @@ const meta: Meta = { 'premo', 'sam', 'subsurface portal', - 'jscalendar', + 'atwork', ], }, size: { control: 'radio', options: [16, 24, 32, 40, 48, 96] }, diff --git a/src/molecules/ApplicationIcon/ApplicationIcon.test.tsx b/src/molecules/ApplicationIcon/ApplicationIcon.test.tsx index 3562b0e98..1b01581aa 100644 --- a/src/molecules/ApplicationIcon/ApplicationIcon.test.tsx +++ b/src/molecules/ApplicationIcon/ApplicationIcon.test.tsx @@ -4,6 +4,7 @@ import { ApplicationIcon, ApplicationIconProps } from './ApplicationIcon'; import { acquire, adca, + atwork, bravos, dasha, fallback, @@ -12,7 +13,6 @@ import { fourDInsight, IconDataWithColor, inPress, - jscalendar, jsembark, loggingQualification, orca, @@ -43,7 +43,7 @@ const nameOptions: ApplicationIconProps['name'][] = [ 'premo', 'sam', 'subsurface portal', - 'jscalendar', + 'atwork', ]; const sizeOptions: ApplicationIconProps['size'][] = [16, 24, 32, 40, 48]; @@ -69,7 +69,7 @@ const icons: IconsDict = { premo: premo, sam: sam, 'subsurface portal': subsurfacePortal, - jscalendar: jscalendar, + atwork: atwork, }; test('Render correctly with corresponding props', () => { diff --git a/src/molecules/ApplicationIcon/ApplicationIcon.tsx b/src/molecules/ApplicationIcon/ApplicationIcon.tsx index 35b5735ec..fba14ac4a 100644 --- a/src/molecules/ApplicationIcon/ApplicationIcon.tsx +++ b/src/molecules/ApplicationIcon/ApplicationIcon.tsx @@ -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 { Fallback } from './Icons/Fallback'; import { ForecastFormatter } from './Icons/ForecastFormatter'; import { FourDInsight } from './Icons/FourDInsight'; import { InPress } from './Icons/InPress'; -import { AtWork } from './Icons/JsCalendar'; import { JsEmbark } from './Icons/JsEmbark'; import { LoggingQualification } from './Icons/LoggingQualification'; import { Orca } from './Icons/Orca'; @@ -30,7 +30,7 @@ export type ApplicationName = | 'orca' | 'portal' | 'jsembark' - | 'jscalendar' + | 'atwork' | 'logging-qualification' | 'pwex' | 'inpress' diff --git a/src/molecules/ApplicationIcon/ApplicationIconCollection.tsx b/src/molecules/ApplicationIcon/ApplicationIconCollection.tsx index cb37d6774..3c2b9e894 100644 --- a/src/molecules/ApplicationIcon/ApplicationIconCollection.tsx +++ b/src/molecules/ApplicationIcon/ApplicationIconCollection.tsx @@ -247,8 +247,8 @@ export const fluxMaps: IconDataWithColor[] = [ }, ]; -export const jscalendar: IconData = { - name: 'jscalendar', +export const atwork: IconData = { + name: 'atwork', prefix: 'amplify', height: '24', width: '24', diff --git a/src/molecules/ApplicationIcon/Icons/JsCalendar.tsx b/src/molecules/ApplicationIcon/Icons/Atwork.tsx similarity index 75% rename from src/molecules/ApplicationIcon/Icons/JsCalendar.tsx rename to src/molecules/ApplicationIcon/Icons/Atwork.tsx index c497cbf6f..9eba8717f 100644 --- a/src/molecules/ApplicationIcon/Icons/JsCalendar.tsx +++ b/src/molecules/ApplicationIcon/Icons/Atwork.tsx @@ -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, @@ -20,12 +20,7 @@ const shapes: ShapeProps[] = [ ]; export const AtWork = forwardRef((props, ref) => ( - + )); AtWork.displayName = 'atWork';