@ossy/timesheets 3.10.0 → 3.11.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ossy/timesheets",
   "description": "Timesheets — generate, review, save, and export monthly work hours",
-  "version": "3.10.0",
+  "version": "3.11.0",
   "type": "module",
   "main": "./src/index.js",
   "module": "./src/index.js",
@@ -17,8 +17,8 @@
     "src": "./src"
   },
   "dependencies": {
-    "@ossy/email": "^3.0.9",
-    "@ossy/resources": "^3.10.0",
+    "@ossy/email": "^3.11.0",
+    "@ossy/resources": "^3.11.0",
     "@ossy/schema": "^3.8.0",
     "html-to-image": "^1.11.13",
     "nanoid": "^5.1.11",
@@ -43,5 +43,5 @@
     "/src",
     "README.md"
   ],
-  "gitHead": "198084eb98871876396ae625d043dd0f03aa0325"
+  "gitHead": "53ff8456920e09151c9d88df4a6c3ee958d811eb"
 }

package/src/TimesheetCard.jsx

@@ -33,6 +33,8 @@ export function TimesheetCard ({ timesheet, onClick, selected = false, actions }
       selected={selected}
       onClick={onClick}
       onContextMenu={handleContextMenu}
+      data-timesheet-id={timesheet?.id}
+      data-timesheet-status={status}
       leading={(
         <Icon size="s" name="calendar" style={{ fill: 'hsl(0, 0%, 80%)' }} />
       )}

package/src/TimesheetPanel.jsx

@@ -11,11 +11,16 @@ import { useTimesheetParties } from './TimesheetPartyFields.jsx'
 import { contractBillingMeta, labelForContract, labelForEmployee } from './timesheet-parties.js'
 import { metadata as GetTimesheet } from './get.action.js'
 import { metadata as SaveTimesheet } from './save.action.js'
+import { metadata as OpenDelete } from './open-delete.action.js'
+import { metadata as OpenExport } from './open-export.action.js'
+import { metadata as ExportCsv } from './export-csv.action.js'
+import { metadata as ExportPng } from './export-png.action.js'
+import { metadata as ExportPdf } from './export-pdf.action.js'
 
 /**
  * Storage-style side panel for reviewing and saving a timesheet.
  */
-export function TimesheetPanel ({ timesheetId, onClose, onSaved, width = '50%' }) {
+export function TimesheetPanel ({ timesheetId, onClose, onSaved, onRequestDelete, width = '50%' }) {
   const { t } = useLocale()
   const sdk = useSdk()
   const captureRef = useRef(null)
@@ -130,6 +135,8 @@ export function TimesheetPanel ({ timesheetId, onClose, onSaved, width = '50%' }
       surface="primary"
       bordered
       roundness="xs"
+      data-timesheet-panel={timesheetId || undefined}
+      data-timesheet-panel-status={timesheet?.status || (loading ? 'loading' : undefined)}
       style={{ height: '100%', width, minHeight: 0, minWidth: 0, flexShrink: 0 }}
     >
       <View.Item>
@@ -151,6 +158,8 @@ export function TimesheetPanel ({ timesheetId, onClose, onSaved, width = '50%' }
           <Dropdown
             trigger={(
               <Button
+                {...OpenExport}
+                label={undefined}
                 variant="command"
                 prefix="software-download"
                 disabled={exportDisabled}
@@ -160,25 +169,26 @@ export function TimesheetPanel ({ timesheetId, onClose, onSaved, width = '50%' }
           >
             <ContextMenu roundness="s" surface="primary">
               <ContextMenu.Item
+                {...ExportCsv}
                 prefix="list"
-                label="timesheets.exportCsv"
                 onClick={() => runExport('csv')}
               />
               <ContextMenu.Item
+                {...ExportPng}
                 prefix="image"
-                label="timesheets.exportPng"
                 onClick={() => runExport('png')}
               />
               <ContextMenu.Item
+                {...ExportPdf}
                 prefix="file-document"
-                label="timesheets.exportPdf"
                 onClick={() => runExport('pdf')}
               />
             </ContextMenu>
           </Dropdown>
 
           <Button
-            id={SaveTimesheet.id}
+            {...SaveTimesheet}
+            label={undefined}
             variant="command"
             prefix="check"
             disabled={!timesheet?.id || saving || loading}
@@ -186,6 +196,18 @@ export function TimesheetPanel ({ timesheetId, onClose, onSaved, width = '50%' }
             onClick={handleSave}
           />
 
+          {onRequestDelete && (
+            <Button
+              {...OpenDelete}
+              label={undefined}
+              variant="command-danger"
+              prefix="trash-empty"
+              disabled={!timesheet?.id || loading}
+              aria-label={t('timesheets.delete')}
+              onClick={() => onRequestDelete(timesheet)}
+            />
+          )}
+
           {onClose && (
             <Button
               prefix="close"

package/src/TimesheetsFreeTool.jsx

@@ -17,6 +17,10 @@ import { downloadTimesheetPdf } from './download-timesheet-pdf.js'
 import { invokeErrorMessage } from './invoke-error-message.js'
 import { sampleShowcaseTimesheet } from './sample-showcase-timesheet.js'
 import { timesheetsAuthHref } from './timesheets-auth-return.js'
+import { metadata as OpenExport } from './open-export.action.js'
+import { metadata as ExportCsv } from './export-csv.action.js'
+import { metadata as ExportPng } from './export-png.action.js'
+import { metadata as ExportPdf } from './export-pdf.action.js'
 
 /**
  * Client-only timesheet for the sales page — prefilled, editable, exportable.
@@ -230,29 +234,29 @@ export function TimesheetsFreeTool ({
             <Dropdown
               trigger={(
                 <Button
+                  {...OpenExport}
                   variant="secondary"
                   prefix="software-download"
                   suffix="chevron-down"
                   disabled={exportDisabled}
-                >
-                  {exporting ? t('timesheets.exporting') : t('timesheets.export')}
-                </Button>
+                  label={exporting ? 'timesheets.exporting' : OpenExport.label}
+                />
               )}
             >
               <ContextMenu roundness="s" surface="primary">
                 <ContextMenu.Item
+                  {...ExportCsv}
                   prefix="list"
-                  label="timesheets.exportCsv"
                   onClick={() => runExport('csv')}
                 />
                 <ContextMenu.Item
+                  {...ExportPng}
                   prefix="image"
-                  label="timesheets.exportPng"
                   onClick={() => runExport('png')}
                 />
                 <ContextMenu.Item
+                  {...ExportPdf}
                   prefix="file-document"
-                  label="timesheets.exportPdf"
                   onClick={() => runExport('pdf')}
                 />
               </ContextMenu>

package/src/TimesheetsProductHome.jsx

@@ -16,6 +16,10 @@ import { metadata as ListTimesheets } from './list.action.js'
 import { metadata as GenerateTimesheet } from './generate.action.js'
 import { metadata as OpenNewTimesheet } from './open-new.action.js'
 import { metadata as DeleteTimesheet } from './delete.action.js'
+import { metadata as OpenDelete } from './open-delete.action.js'
+import { metadata as ExportCsv } from './export-csv.action.js'
+import { metadata as ExportPng } from './export-png.action.js'
+import { metadata as ExportPdf } from './export-pdf.action.js'
 import { HolidayLocaleSelect } from './HolidayLocaleSelect.jsx'
 import { resolveHolidayLocale } from './holiday-locale.js'
 
@@ -212,6 +216,7 @@ export default function TimesheetsProductHome () {
     <>
       <Page
         scroll
+        data-timesheets-status="on"
         title="timesheets.home.title"
         near={statusTags.length > 0 ? <Tags tags={statusTags} size="s" /> : undefined}
         description="timesheets.home.description"
@@ -232,7 +237,8 @@ export default function TimesheetsProductHome () {
                     <Text as="h2" variant="small" weight="medium" text="timesheets.listTitle" />
                   </View.Item>
                   <Button
-                    id={OpenNewTimesheet.id}
+                    {...OpenNewTimesheet}
+                    label={undefined}
                     variant="command"
                     prefix="add"
                     aria-label={t('timesheets.new')}
@@ -272,25 +278,26 @@ export default function TimesheetsProductHome () {
                           />,
                           <ContextMenu.Item
                             key="csv"
+                            {...ExportCsv}
                             prefix="list"
-                            label="timesheets.exportCsv"
                             onClick={() => requestExport(sheet, 'csv')}
                           />,
                           <ContextMenu.Item
                             key="png"
+                            {...ExportPng}
                             prefix="image"
-                            label="timesheets.exportPng"
                             onClick={() => requestExport(sheet, 'png')}
                           />,
                           <ContextMenu.Item
                             key="pdf"
+                            {...ExportPdf}
                             prefix="file-document"
-                            label="timesheets.exportPdf"
                             onClick={() => requestExport(sheet, 'pdf')}
                           />,
                           <ContextMenu.Separator key="separator" />,
                           <ContextMenu.Item
                             key="delete"
+                            {...OpenDelete}
                             variant="command-danger"
                             prefix="trash-empty"
                             label="timesheets.delete"
@@ -309,6 +316,7 @@ export default function TimesheetsProductHome () {
             timesheetId={selectedResourceId}
             onClose={clearSelectedResourceId}
             onSaved={refreshList}
+            onRequestDelete={setSheetToDelete}
           />
         </View>
       </Page>
@@ -328,7 +336,7 @@ export default function TimesheetsProductHome () {
                     onClick: () => setSheetToDelete(null),
                   },
                   {
-                    label: 'timesheets.delete',
+                    ...DeleteTimesheet,
                     variant: 'command-danger',
                     disabled: deleting,
                     onClick: confirmDelete,
@@ -410,13 +418,12 @@ export default function TimesheetsProductHome () {
                   onClick={closeCreateModal}
                 />
                 <Button
-                  id={GenerateTimesheet.id}
+                  {...GenerateTimesheet}
+                  label={generating ? 'timesheets.loading' : GenerateTimesheet.label}
                   variant="cta"
                   disabled={generating || !selected}
                   onClick={handleGenerate}
-                >
-                  {generating ? t('timesheets.loading') : t('timesheets.generate')}
-                </Button>
+                />
               </View>
             </View>
           </View>

package/src/create-and-save-timesheet.flow.js

@@ -0,0 +1,34 @@
+import enableTimesheetsFlow from './enable-timesheets.flow.js'
+import { metadata as OpenNewTimesheet } from './open-new.action.js'
+import { metadata as GenerateTimesheet } from './generate.action.js'
+import { metadata as SaveTimesheet } from './save.action.js'
+
+export const metadata = {
+  id: '@ossy/timesheets/flows/create-and-save-timesheet',
+  feature: 'timesheets',
+  requires: ['server', 'database'],
+  timeout: 150_000,
+}
+
+/**
+ * After enabling timesheets, open the create modal, generate a draft for the
+ * current month, and save it from the side panel.
+ */
+export default {
+  title: 'Create and save timesheet',
+  description:
+    'Signed-in user enables timesheets, generates a draft timesheet, saves it, and sees saved status in the panel and list',
+  steps: [
+    ...enableTimesheetsFlow.steps,
+    { result: { action: OpenNewTimesheet, timeout: 10000 } },
+    { action: OpenNewTimesheet },
+    { result: { action: GenerateTimesheet, timeout: 10000 } },
+    { action: GenerateTimesheet },
+    { result: { action: SaveTimesheet, timeout: 20000 } },
+    { result: { selector: '[data-timesheet-panel-status="draft"]', timeout: 20000 } },
+    { result: { selector: '[data-timesheet-status="draft"]', timeout: 20000 } },
+    { action: SaveTimesheet },
+    { result: { selector: '[data-timesheet-panel-status="saved"]', timeout: 20000 } },
+    { result: { selector: '[data-timesheet-status="saved"]', timeout: 20000 } },
+  ],
+}

package/src/delete-timesheet.flow.js

@@ -0,0 +1,41 @@
+import createAndSaveTimesheetFlow from './create-and-save-timesheet.flow.js'
+import { metadata as OpenDelete } from './open-delete.action.js'
+import { metadata as DeleteTimesheet } from './delete.action.js'
+
+export const metadata = {
+  id: '@ossy/timesheets/flows/delete-timesheet',
+  feature: 'timesheets',
+  requires: ['server', 'database'],
+  timeout: 150_000,
+}
+
+/**
+ * After creating and saving a timesheet, open delete from the panel, confirm,
+ * and assert the saved row leaves the list.
+ */
+export default {
+  title: 'Delete timesheet',
+  description:
+    'Signed-in user creates and saves a timesheet, deletes it from the panel confirm dialog, and sees it leave the list',
+  steps: [
+    ...createAndSaveTimesheetFlow.steps,
+    { result: { action: OpenDelete, timeout: 10000 } },
+    { action: OpenDelete },
+    { result: { action: DeleteTimesheet, timeout: 10000 } },
+    { action: DeleteTimesheet },
+    {
+      result: {
+        selector: '[data-timesheet-status="saved"]',
+        hidden: true,
+        timeout: 20000,
+      },
+    },
+    {
+      result: {
+        selector: '[data-timesheet-panel]',
+        hidden: true,
+        timeout: 10000,
+      },
+    },
+  ],
+}

package/src/disable-timesheets.flow.js

@@ -0,0 +1,58 @@
+import enableTimesheetsFlow from './enable-timesheets.flow.js'
+import { DisableService, EnableService } from '@ossy/workspaces'
+
+const TIMESHEETS = '@ossy/timesheets'
+
+export const metadata = {
+  id: '@ossy/timesheets/flows/disable-timesheets',
+  feature: 'timesheets',
+  requires: ['server', 'database'],
+  timeout: 120_000,
+}
+
+/**
+ * After enabling timesheets, disable the package from the catalog detail
+ * toggle and confirm the timesheets home returns to the sales (off) state.
+ */
+export default {
+  title: 'Disable timesheets',
+  description:
+    'Signed-in user enables timesheets, disables it from the package catalog, and sees the sales home again',
+  steps: [
+    ...enableTimesheetsFlow.steps,
+    { page: '@packages/detail', params: { packageSlug: 'timesheets' } },
+    {
+      result: {
+        action: { ...DisableService, service: TIMESHEETS },
+        timeout: 15000,
+      },
+    },
+    {
+      result: {
+        selector: `[data-package-service="${TIMESHEETS}"][data-service-enabled="true"]`,
+        timeout: 10000,
+      },
+    },
+    { action: { ...DisableService, service: TIMESHEETS } },
+    {
+      result: {
+        action: { ...EnableService, service: TIMESHEETS },
+        timeout: 20000,
+      },
+    },
+    {
+      result: {
+        selector: `[data-package-service="${TIMESHEETS}"][data-service-enabled="false"]`,
+        timeout: 10000,
+      },
+    },
+    { page: '@timesheets/home' },
+    { result: { selector: '[data-timesheets-status="off"]', timeout: 20000 } },
+    {
+      result: {
+        action: { ...EnableService, service: TIMESHEETS },
+        timeout: 10000,
+      },
+    },
+  ],
+}

package/src/enable-timesheets.flow.js

@@ -0,0 +1,24 @@
+import signUpFlow from '@ossy/authentication/sign-up.flow.js'
+import { EnableService } from '@ossy/workspaces'
+
+export const metadata = {
+  id: '@ossy/timesheets/flows/enable-timesheets',
+  feature: 'timesheets',
+  requires: ['server', 'database'],
+}
+
+/**
+ * New workspace owner signs up and enables timesheets from the sales home.
+ */
+export default {
+  title: 'Enable timesheets',
+  description:
+    'New user registers, verifies email, and activates timesheets from the timesheets home sales page',
+  steps: [
+    ...signUpFlow.steps,
+    { page: '@timesheets/home' },
+    { result: { action: { ...EnableService, service: '@ossy/timesheets' }, timeout: 15000 } },
+    { action: { ...EnableService, service: '@ossy/timesheets' } },
+    { result: { selector: '[data-timesheets-status="on"]', timeout: 20000 } },
+  ],
+}

package/src/export-csv.action.js

@@ -0,0 +1,7 @@
+/** Client-only — downloads the open timesheet as CSV. */
+export const metadata = {
+  id: '@ossy/timesheets/actions/export-csv',
+  access: 'workspace',
+  label: 'timesheets.exportCsv',
+  icon: 'list',
+}

package/src/export-pdf.action.js

@@ -0,0 +1,7 @@
+/** Client-only — downloads the open timesheet as PDF. */
+export const metadata = {
+  id: '@ossy/timesheets/actions/export-pdf',
+  access: 'workspace',
+  label: 'timesheets.exportPdf',
+  icon: 'file-document',
+}

package/src/export-png.action.js

@@ -0,0 +1,7 @@
+/** Client-only — downloads the open timesheet as a PNG image. */
+export const metadata = {
+  id: '@ossy/timesheets/actions/export-png',
+  access: 'workspace',
+  label: 'timesheets.exportPng',
+  icon: 'image',
+}

package/src/export-timesheet-csv.flow.js

@@ -0,0 +1,39 @@
+import createAndSaveTimesheetFlow from './create-and-save-timesheet.flow.js'
+import { monthPeriodBounds } from './billing-period.js'
+import { formatDateKey } from './build-prefilled-lines.js'
+import { metadata as OpenExport } from './open-export.action.js'
+import { metadata as ExportCsv } from './export-csv.action.js'
+
+const now = new Date()
+const { periodStart } = monthPeriodBounds(now.getFullYear(), now.getMonth())
+const csvFilename = `timesheet-${formatDateKey(periodStart)}.csv`
+
+export const metadata = {
+  id: '@ossy/timesheets/flows/export-timesheet-csv',
+  feature: 'timesheets',
+  requires: ['server', 'database'],
+  timeout: 150_000,
+}
+
+/**
+ * After creating and saving a timesheet, open the panel export menu and
+ * download CSV (browser download event).
+ */
+export default {
+  title: 'Export timesheet CSV',
+  description:
+    'Signed-in user creates and saves a timesheet, opens export from the panel, and downloads CSV',
+  steps: [
+    ...createAndSaveTimesheetFlow.steps,
+    { result: { action: OpenExport, timeout: 10000 } },
+    { action: OpenExport },
+    { result: { action: ExportCsv, timeout: 10000 } },
+    {
+      download: {
+        action: ExportCsv,
+        filename: csvFilename,
+        timeout: 30000,
+      },
+    },
+  ],
+}

package/src/export-timesheet-pdf.flow.js

@@ -0,0 +1,39 @@
+import createAndSaveTimesheetFlow from './create-and-save-timesheet.flow.js'
+import { monthPeriodBounds } from './billing-period.js'
+import { timesheetExportFilename } from './export-capture.js'
+import { metadata as OpenExport } from './open-export.action.js'
+import { metadata as ExportPdf } from './export-pdf.action.js'
+
+const now = new Date()
+const { periodStart } = monthPeriodBounds(now.getFullYear(), now.getMonth())
+const pdfFilename = timesheetExportFilename(periodStart, 'pdf')
+
+export const metadata = {
+  id: '@ossy/timesheets/flows/export-timesheet-pdf',
+  feature: 'timesheets',
+  requires: ['server', 'database'],
+  timeout: 150_000,
+}
+
+/**
+ * After creating and saving a timesheet, open the panel export menu and
+ * download PDF (browser download event from html-to-image + pdf-lib).
+ */
+export default {
+  title: 'Export timesheet PDF',
+  description:
+    'Signed-in user creates and saves a timesheet, opens export from the panel, and downloads PDF',
+  steps: [
+    ...createAndSaveTimesheetFlow.steps,
+    { result: { action: OpenExport, timeout: 10000 } },
+    { action: OpenExport },
+    { result: { action: ExportPdf, timeout: 10000 } },
+    {
+      download: {
+        action: ExportPdf,
+        filename: pdfFilename,
+        timeout: 60000,
+      },
+    },
+  ],
+}

package/src/export-timesheet-png.flow.js

@@ -0,0 +1,39 @@
+import createAndSaveTimesheetFlow from './create-and-save-timesheet.flow.js'
+import { monthPeriodBounds } from './billing-period.js'
+import { timesheetExportFilename } from './export-capture.js'
+import { metadata as OpenExport } from './open-export.action.js'
+import { metadata as ExportPng } from './export-png.action.js'
+
+const now = new Date()
+const { periodStart } = monthPeriodBounds(now.getFullYear(), now.getMonth())
+const pngFilename = timesheetExportFilename(periodStart, 'png')
+
+export const metadata = {
+  id: '@ossy/timesheets/flows/export-timesheet-png',
+  feature: 'timesheets',
+  requires: ['server', 'database'],
+  timeout: 150_000,
+}
+
+/**
+ * After creating and saving a timesheet, open the panel export menu and
+ * download PNG (browser download event from html-to-image capture).
+ */
+export default {
+  title: 'Export timesheet PNG',
+  description:
+    'Signed-in user creates and saves a timesheet, opens export from the panel, and downloads PNG',
+  steps: [
+    ...createAndSaveTimesheetFlow.steps,
+    { result: { action: OpenExport, timeout: 10000 } },
+    { action: OpenExport },
+    { result: { action: ExportPng, timeout: 10000 } },
+    {
+      download: {
+        action: ExportPng,
+        filename: pngFilename,
+        timeout: 60000,
+      },
+    },
+  ],
+}

package/src/index.js

@@ -11,6 +11,11 @@ export { metadata as ListTimesheets } from './list.action.js'
 export { metadata as GetTimesheet } from './get.action.js'
 export { metadata as DeleteTimesheet } from './delete.action.js'
 export { metadata as OpenNewTimesheet } from './open-new.action.js'
+export { metadata as OpenDeleteTimesheet } from './open-delete.action.js'
+export { metadata as OpenExportTimesheet } from './open-export.action.js'
+export { metadata as ExportTimesheetCsv } from './export-csv.action.js'
+export { metadata as ExportTimesheetPng } from './export-png.action.js'
+export { metadata as ExportTimesheetPdf } from './export-pdf.action.js'
 export { invokeErrorMessage } from './invoke-error-message.js'
 export { downloadTimesheetCsv } from './download-timesheet-csv.js'
 export { downloadTimesheetImage } from './download-timesheet-image.js'

package/src/open-delete.action.js

@@ -0,0 +1,7 @@
+/** Client-only — opens the timesheet delete confirmation dialog. */
+export const metadata = {
+  id: '@ossy/timesheets/actions/open-delete',
+  access: 'workspace',
+  label: 'timesheets.delete',
+  icon: 'trash-empty',
+}

package/src/open-export.action.js

@@ -0,0 +1,7 @@
+/** Client-only — opens the timesheet export menu. */
+export const metadata = {
+  id: '@ossy/timesheets/actions/open-export',
+  access: 'workspace',
+  label: 'timesheets.export',
+  icon: 'software-download',
+}

package/src/timesheets.page.jsx

@@ -20,11 +20,12 @@ export default function TimesheetsHomePage () {
   const app = useApp()
   const router = useRouter()
   const { workspace: shellWorkspace } = useShellWorkspace()
-  const { read, invoke, invalidate } = useSdk()
+  const { read, invoke } = useSdk()
   const isAuthenticated = !!app?.isAuthenticated
   const {
     data: workspaceFromSdk,
     status: workspaceStatus,
+    refetch: refetchWorkspace,
   } = read(GetWorkspace, undefined, { enabled: isAuthenticated })
   const autoEnableStarted = useRef(false)
 
@@ -52,10 +53,12 @@ export default function TimesheetsHomePage () {
     && workspaceStatus !== AsyncStatus.Error
     && app?.workspaceServices == null
 
+  // Shared GetWorkspace cache with useShellWorkspace — refetch (not bare invalidate)
+  // awaits the post-enable read so home can switch sales → product reliably.
   const enableService = useCallback(() => {
     return invoke(EnableService, { service: TIMESHEETS_SERVICE })
-      .then(() => invalidate(cacheKey(GetWorkspace)))
-  }, [invoke, invalidate])
+      .then(() => refetchWorkspace())
+  }, [invoke, refetchWorkspace])
 
   useEffect(() => {
     if (!isAuthenticated || !enableRequested || autoEnableStarted.current) return