diff --git a/.github/workflows/desktop-exe-ext.yml b/.github/workflows/desktop-exe-ext.yml new file mode 100644 index 00000000..c306f8bc --- /dev/null +++ b/.github/workflows/desktop-exe-ext.yml @@ -0,0 +1,125 @@ +name: Therp Timer Desktop Builds + +on: + pull_request: + branches: [master] + paths: + - "dist/desktop/**" + - ".github/workflows/desktop.yml" + - "src/templates/**" + - "scripts/**" + push: + branches: [master] + tags: + - "v*" + paths: + - "dist/desktop/**" + - ".github/workflows/desktop.yml" + - "src/templates/**" + - "scripts/**" + workflow_dispatch: + +jobs: + build-desktop: + strategy: + fail-fast: false + matrix: + include: + - os: ubuntu-latest + name: linux + build_cmd: npm run build:linux + + - os: windows-latest + name: windows + build_cmd: npm run build:win + + - os: macos-latest + name: macos + build_cmd: npm run build:mac + + runs-on: ${{ matrix.os }} + + defaults: + run: + working-directory: dist/desktop + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Setup Node + uses: actions/setup-node@v4 + with: + node-version: 22 + cache: npm + cache-dependency-path: dist/desktop/package-lock.json + + - name: Install dependencies + run: npm ci + + - name: Build desktop app + run: ${{ matrix.build_cmd }} + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + CSC_IDENTITY_AUTO_DISCOVERY: "false" + + - name: Prepare Linux portable bundle + if: matrix.name == 'linux' + run: | + APPIMAGE="$(find release -maxdepth 1 -name '*.AppImage' | head -n 1)" + mkdir -p portable/Therp-Timer + cp "$APPIMAGE" portable/Therp-Timer/ + cp build/icon_512.png portable/Therp-Timer/icon.png + + cat > portable/Therp-Timer/therp-timer.desktop < https://github.com/odoo/owl.git) +# Browser targets: +bash scripts/setup_nodeenv.sh && . .nodeenv/bin/activate +bash scripts/compile_owl_templates.sh ``` -**NB:** -- **Make sure you have templates to be compile by the scrip in `src/template/*.xml*` otherwise script might fail.** -- **Please note you need to clone Odoo's OWL repo branch that is identical to your owl js library when compiling templates otherwise you will get templat errors when generating `template.js`. For instance: this current project is using OWL lib v2.8.2. So we need to clone owl repo branch owl-2.x (i.e https://github.com/odoo/owl/tree/owl-2.x) to compile template with.** +--- -### Register generated templates +## Architecture -The extension expects compiled templates to be made available through: - -```js -globalThis.__THERP_TIMER_TEMPLATES__ = { - ReadMore: /* compiled template */, - PopupApp: /* compiled template */, - OptionsApp: /* compiled template */, -}; -``` +| Layer | Technology | +|---|---| +| Timer / Options UI | OWL 2.8.2 reactive components | +| Messages UI | Vanilla JS (no framework needed) | +| Desktop shell | Electron 29 + electron-store | +| Odoo API | JSON-RPC (`fetch` + Electron Chromium session cookies) | +| Notifications | Electron `Notification` API | +| Screen capture | `desktopCapturer` + `MediaRecorder` (WebM/VP8) | +| Dialogs | `alert.js` custom modal library | -The distributed `dist/*/js/templates.js` files are safe placeholders. -Replace them during development with your generated template registration code, -or adapt the generated Owl output into that registry shape. +--- -### Current runtime layout - -Shared libraries now live under: - -- `dist/chrome/js/lib/` -- `dist/firefox/js/lib/` +## Troubleshooting -Application entry modules now live under: +**"Not connected" in Messages** +Log in via the Timer window first. Messages reads the session from storage. -- `dist/chrome/js/components/` -- `dist/firefox/js/components/` +**No tasks in Messages sidebar** +Check the data source in Options matches your Odoo setup (`project.task` vs `project.issue`). -This keeps library-style files such as `browser-polyfill.js`, `owl.iife.js`, -and `common.js` separated from the popup and options app modules. +**Screen recorder — no sources found** +On Wayland (Linux) add `--enable-features=WebRTCPipeWireCapturer` to the Electron launch flags. -## Summary +**"No active Odoo session found"** +Uncheck "Use Existing Session" and enter your credentials. -Therp Timer is a practical browser-based Odoo timer that helps users quickly record work against Odoo project items. +**Tasks show "No matching items"** +Tasks are filtered to active stages (not Done/Cancelled/Hold). Check your Odoo stages or tick "Show for everyone". -Use: +--- -- the **Chrome/Brave** build for Chromium-based browsers -- the **Firefox** build for Firefox-based browsers +## License -Keep a separate `manifest.json` in each browser build folder, and load that folder with the browser’s extension developer tools. \ No newline at end of file +LGPL-3.0 — see `LICENSE.md`. diff --git a/dist/chrome/.gitignore b/dist/chrome/.gitignore index 6311779b..c2658d7d 100644 --- a/dist/chrome/.gitignore +++ b/dist/chrome/.gitignore @@ -1 +1 @@ -web-ext-artifacts/ +node_modules/ diff --git a/dist/chrome/js/components/popup-app.js b/dist/chrome/js/components/popup-app.js index 04c47c10..393fcb65 100644 --- a/dist/chrome/js/components/popup-app.js +++ b/dist/chrome/js/components/popup-app.js @@ -483,6 +483,8 @@ class PopupApp extends Component { this.toggleAutoDownload = this.toggleAutoDownload.bind(this); this.toggleUseExistingSession = this.toggleUseExistingSession.bind(this); this.togglePassword = this.togglePassword.bind(this); + this.updateLimitPreference = this.updateLimitPreference.bind(this); + this.updateShowAllPreference = this.updateShowAllPreference.bind(this); onMounted(() => { const bootLoader = document.getElementById('boot-loader'); @@ -540,34 +542,38 @@ class PopupApp extends Component { await storage.set(STORAGE_KEYS.showAllItems, !!value); } - /** * Issues filtered by current UI settings. */ get filteredIssues() { const limit = this.state.limitTo ? Number(this.state.limitTo) : null; + const query = (this.state.searchQuery || '').trim(); let issues = [...this.state.issues]; issues.sort((a, b) => { - if (a.id === this.state.activeTimerId) return -1; - if (b.id === this.state.activeTimerId) return 1; - - const priorityDelta = Number(b.priority || 0) - Number(a.priority || 0); - if (priorityDelta !== 0) return priorityDelta; - - const stageDelta = Number(a.stage_sequence ?? 9999) - Number(b.stage_sequence ?? 9999); - if (stageDelta !== 0) return stageDelta; - - return a.id - b.id; + if (a.id === this.state.activeTimerId) return -1; + if (b.id === this.state.activeTimerId) return 1; + const priorityDelta = Number(b.priority || 0) - Number(a.priority || 0); + if (priorityDelta !== 0) return priorityDelta; + const stageDelta = Number(a.stage_sequence ?? 9999) - Number(b.stage_sequence ?? 9999); + if (stageDelta !== 0) return stageDelta; + return a.id - b.id; }); - if (!this.state.allIssues && this.state.user?.id) { - issues = issues.filter( - (issue) => issue.id === this.state.activeTimerId || issue.user_id?.[0] === this.state.user.id - ); + const matchesSearch = (issue) => matchesIssue(issue, query); + + if (this.state.allIssues) { + issues = issues.filter(matchesSearch); + } else if (this.state.user?.id) { + issues = issues.filter( + (issue) => + issue.id === this.state.activeTimerId || + (issue.user_id?.[0] === this.state.user.id && matchesSearch(issue)) + ); + } else { + issues = issues.filter(matchesSearch); } - issues = issues.filter((issue) => matchesIssue(issue, this.state.searchQuery)); return limit ? issues.slice(0, limit) : issues; } diff --git a/dist/chrome/js/templates.js b/dist/chrome/js/templates.js index a87b1cac..63b85ba8 100644 --- a/dist/chrome/js/templates.js +++ b/dist/chrome/js/templates.js @@ -1,5 +1,259 @@ export const templates = { - "PopupApp": function PopupApp(app, bdom, helpers + "MessagesApp": function MessagesApp(app, bdom, helpers +) { + let { text, createBlock, list, multi, html, toggler, comment } = bdom; + let { prepareList, safeOutput, withKey } = helpers; + + let block1 = createBlock(`
Inbox
unread recent messages · latest 10 per tracked item · checking every s
`); + let block3 = createBlock(`
`); + let block8 = createBlock(`
No matching tasks or issues.
`); + let block11 = createBlock(``); + let block20 = createBlock(``); + + return function template(ctx, node, key = "") { + let b2, b8, b9, b10, b11, b13, b14, b18, b19; + let prop1 = new String((ctx['state'].search) === 0 ? 0 : ((ctx['state'].search) || "")); + if (ctx['state'].tasks.length) { + ctx = Object.create(ctx); + const [k_block2, v_block2, l_block2, c_block2] = prepareList(ctx['state'].tasks);; + for (let i1 = 0; i1 < l_block2; i1++) { + ctx[`task`] = k_block2[i1]; + const key1 = ctx['task'].id; + let attr1 = ctx['task'].id===ctx['state'].selectedTaskId?'task-card active':'task-card'; + let attr2 = ctx['task'].id; + const b4 = safeOutput(ctx['issueLabel'](ctx['state'].dataSource,ctx['task'])); + const b5 = safeOutput(ctx['normalizeText'](ctx['task'].project_id)||'No project'); + const b6 = safeOutput(ctx['normalizeText'](ctx['task'].stage_id)||'No stage'); + const b7 = safeOutput(ctx['normalizeText'](ctx['task'].user_id)||'Unassigned'); + c_block2[i1] = withKey(block3([attr1, attr2], [b4, b5, b6, b7]), key1); + } + ctx = ctx.__proto__; + b2 = list(c_block2); + } else { + b8 = block8(); + } + b9 = safeOutput(ctx['state'].messageTotal); + b10 = safeOutput(ctx['state'].polling); + if (ctx['currentTask']()) { + const b12 = safeOutput(ctx['issueLabel'](ctx['state'].dataSource,ctx['currentTask']())); + b11 = block11([], [b12]); + } else { + b13 = text(`Select a task or issue`); + } + if (ctx['currentTask']()) { + const b15 = safeOutput(ctx['normalizeText'](ctx['currentTask']().project_id)||'No project'); + const b16 = text(` · `); + const b17 = safeOutput(ctx['normalizeText'](ctx['currentTask']().stage_id)||'No stage'); + b14 = multi([b15, b16, b17]); + } else { + b18 = text(`Choose a task from the left pane`); + } + ctx = Object.create(ctx); + const [k_block19, v_block19, l_block19, c_block19] = prepareList(Object.entries(ctx['TYPE_META']));; + for (let i1 = 0; i1 < l_block19; i1++) { + ctx[`entry`] = k_block19[i1]; + const key1 = ctx['entry'][0]; + let attr3 = ctx['state'].filter===ctx['entry'][0]?'filter-chip active':'filter-chip'; + let attr4 = ctx['entry'][0]; + let attr5 = 'background:'+ctx['entry'][1].color; + const b21 = safeOutput(ctx['entry'][1].label); + c_block19[i1] = withKey(block20([attr3, attr4, attr5], [b21]), key1); + } + ctx = ctx.__proto__; + b19 = list(c_block19); + return block1([prop1], [b2, b8, b9, b10, b11, b13, b14, b18, b19]); + } +}, + +"MessagesApp": function MessagesApp(app, bdom, helpers +) { + let { text, createBlock, list, multi, html, toggler, comment } = bdom; + let { prepareList, safeOutput, withKey } = helpers; + + let block1 = createBlock(`
`); + let block2 = createBlock(`