Skip to content

Commit

Permalink
Merge pull request #8031 from ever-co/develop
Browse files Browse the repository at this point in the history
* fix: job search/browse dynamically route registered self module

* fix: lib:watch scripts command

* fix: rename search module to job search module

* feat: job matching ui plugin basic structure

* fix(deepscan): removed unused import

* fix: job matching configuration for employees

* fix: added missing project.json

* fix: docker build command

* fix: updated job matching retrieval

* fix(cspell): typo spelling :-)

* Feat/#8004 extend timer app with reporting features improvements (#8022)

* fix: added missing PipeModule to imports

* feat: add auto refresh delay to 10 minutes

* feat: create auto refresh service and store

* fix: event order in life cycle

* perf: improve gauzy filter performance

* feat: create auto refresh component

* refactor: recap module:: update component imports, add AutoRefreshService, and modify adapters

* feat: add new translation

* update: translation key in time-tracker component from 'TIMESHEET.THIS_WEEK' to 'TIMESHEET.WEEK'"

* feat: translated 'Wakatime Integration' string in time-tracker component and added it to i18n assets for multiple languages.

* fix: translations

* updated:  app.component.ts, and app.module.ts files in desktop-timer, server-api, and server apps to include new imports, modules, and services

* feat: add missing translations

* feat: add 'DAILY_RECAP' translation key to multiple language files and updated 'TrayIcon' to use translated label

* feat: update accelerator for 'Start Tracking' menu item from 'CmdOrCtrl+Space' to 'CmdOrCtrl+Shift+Space'

* feat: updated angular.json, added/modified files in packages/desktop-ui-lib, including components, modules, and styles.

* feat: load data on first launch

* feat: use translations

* feat:  conditional frame and titleBarStyle options for RecapWindow on Windows platform

* fix: cspell spelling

* chore(deps): updated packages version

* fix: missing ckeditor4 package

* fix: job matching ui permission and languages & locale

* fix: translation for root for core module

* fix: hide team selector for job proposal template

* fix: enabled logging for language interceptor

* fix: add `user` and `employeeIds` to various API requests in `RecapService`.

* fix: desktop apps build

* fix: added more logging for language interceptor

* update time tracker status

* fix: revert tsconfig paths

* fix: revert changes

* fix: we used dist version inside jobs plugins

* Fix/#8023 Timer sync issue (#8025)

* fix: assign default value to isDeleted

* fix: change timeout from 30 sec to 3sec

* feat: remove setTimeout before to stop timer

* refactor:  logger service

* fix: add missing server connection status

* refactor: TimeTrackerComponent::updated logger service calls, removed/added code blocks

* feat: update logger service to use spread operator for message arguments and added JSON.stringify for object logging in time-tracker component

* fix: remove unnecessary lines of code in TimeTrackerComponent

* fix: auto synchronization

* feat: added two new lines to TimeTrackerComponent: setting start$ to false and loading to false after stopping the timer.

* feat: added conditional check for Observable in setItem method

* feat: added processing status indicator to time-tracker component with spinner and message, and updated component logic to handle processing state

* Revert "feat: remove setTimeout before to stop timer"

This reverts commit dcc64cf.

* Revert "fix: change timeout from 30 sec to 3sec"

This reverts commit 91cd05f.

* fix: remove conditional block that checks `isProcessingEnabled` and updates toaster and logger service.

* feat: add warning notification and logging when timer is processing

* Fix/#8023 timer sync reverts (#8030)

* Revert "feat: remove setTimeout before to stop timer"

This reverts commit dcc64cf.

* Revert "fix: change timeout from 30 sec to 3sec"

This reverts commit 91cd05f.

* fix: remove conditional block that checks `isProcessingEnabled` and updates toaster and logger service.

* feat: add warning notification and logging when timer is processing

* fix: moved screen capture and sending activities to async scheduler with 1s delay

---------

Co-authored-by: Rahul R. <[email protected]>
Co-authored-by: Kifungo A <[email protected]>
  • Loading branch information
3 people authored Aug 4, 2024
2 parents 6143b16 + 3610051 commit e9df079
Show file tree
Hide file tree
Showing 158 changed files with 3,460 additions and 2,204 deletions.
3 changes: 2 additions & 1 deletion .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,8 @@
"APPDATA",
"COMMONPROGRAMFILES",
"serverapi",
"serializables"
"serializables",
"drppicker"
],
"useGitignore": true,
"ignorePaths": [
Expand Down
2 changes: 2 additions & 0 deletions .deploy/api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ COPY --chown=node:node packages/plugins/changelog/package.json ./packages/plugin
COPY --chown=node:node packages/plugins/job-search/package.json ./packages/plugins/job-search/
COPY --chown=node:node packages/plugins/job-proposal/package.json ./packages/plugins/job-proposal/
COPY --chown=node:node packages/plugins/job-search-ui/package.json ./packages/plugins/job-search-ui/
COPY --chown=node:node packages/plugins/job-matching-ui/package.json ./packages/plugins/job-matching-ui/
COPY --chown=node:node packages/ui-core/package.json ./packages/ui-core/
COPY --chown=node:node packages/ui-config/package.json ./packages/ui-config/
COPY --chown=node:node packages/ui-auth/package.json ./packages/ui-auth/
Expand Down Expand Up @@ -224,6 +225,7 @@ COPY --chown=node:node packages/plugins/changelog/package.json ./packages/plugin
COPY --chown=node:node packages/plugins/job-search/package.json ./packages/plugins/job-search/
COPY --chown=node:node packages/plugins/job-proposal/package.json ./packages/plugins/job-proposal/
COPY --chown=node:node packages/plugins/job-search-ui/package.json ./packages/plugins/job-search-ui/
COPY --chown=node:node packages/plugins/job-matching-ui/package.json ./packages/plugins/job-matching-ui/
COPY --chown=node:node packages/ui-core/package.json ./packages/ui-core/
COPY --chown=node:node packages/ui-config/package.json ./packages/ui-config/
COPY --chown=node:node packages/ui-auth/package.json ./packages/ui-auth/
Expand Down
1 change: 1 addition & 0 deletions .deploy/webapp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ COPY --chown=node:node packages/plugins/knowledge-base/package.json ./packages/p
COPY --chown=node:node packages/plugins/changelog/package.json ./packages/plugins/changelog/
COPY --chown=node:node packages/plugins/job-proposal/package.json ./packages/plugins/job-proposal/
COPY --chown=node:node packages/plugins/job-search-ui/package.json ./packages/plugins/job-search-ui/
COPY --chown=node:node packages/plugins/job-matching-ui/package.json ./packages/plugins/job-matching-ui/
COPY --chown=node:node packages/ui-core/package.json ./packages/ui-core/
COPY --chown=node:node packages/ui-config/package.json ./packages/ui-config/
COPY --chown=node:node packages/ui-auth/package.json ./packages/ui-auth/
Expand Down
Loading

0 comments on commit e9df079

Please sign in to comment.