OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
Add timer options to more menu
Mir Bhatia2709b51f2456
diff --git a/config/locales/js-en.yml b/config/locales/js-en.ymlindex 9044893f123..aaf99313b9e 100644--- a/config/locales/js-en.yml+++ b/config/locales/js-en.yml@@ -104,6 +104,8 @@ en:button_list_view: "List view"button_show_view: "Fullscreen view"button_log_time: "Log time"+ button_start_timer: "Start timer"+ button_stop_timer: "Stop timer"button_more: "More"button_open_details: "Open details view"button_close_details: "Close details view"diff --git a/frontend/src/app/shared/components/op-context-menu/wp-context-menu/wp-single-context-menu.ts b/frontend/src/app/shared/components/op-context-menu/wp-context-menu/wp-single-context-menu.tsindex f7326b0745f..1d86478ec52 100644--- a/frontend/src/app/shared/components/op-context-menu/wp-context-menu/wp-single-context-menu.ts+++ b/frontend/src/app/shared/components/op-context-menu/wp-context-menu/wp-single-context-menu.ts@@ -16,6 +16,8 @@ import { WpDestroyModalComponent } from 'core-app/shared/components/modals/wp-deimport { WorkPackageAuthorization } from 'core-app/features/work-packages/services/work-package-authorization.service';import { TurboRequestsService } from 'core-app/core/turbo/turbo-requests.service';import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';+import { TimeEntryTimerService } from 'core-app/shared/components/time_entries/services/time-entry-timer.service';+import { TimeEntryResource } from 'core-app/features/hal/resources/time-entry-resource';@Directive({selector: '[wpSingleContextMenu]',@@ -24,6 +26,8 @@ import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';export class WorkPackageSingleContextMenuDirective extends OpContextMenuTrigger implements AfterViewInit, OnDestroy {@Input('wpSingleContextMenu-workPackage') public workPackage:WorkPackageResource;+ private currentTimer:TimeEntryResource|null = null;+constructor(readonly HookService:HookService,readonly $state:StateService,@@ -35,6 +39,7 @@ export class WorkPackageSingleContextMenuDirective extends OpContextMenuTriggerreadonly apiV3Service:ApiV3Service,readonly opContextMenuService:OPContextMenuService,readonly authorisationService:AuthorisationService,+ readonly timeEntryService:TimeEntryTimerService,protected copyToClipboardService:CopyToClipboardService,) {super(elementRef, opContextMenuService);@@ -45,6 +50,10 @@ export class WorkPackageSingleContextMenuDirective extends OpContextMenuTriggerngAfterViewInit():void {super.ngAfterViewInit();document.addEventListener('dialog:close', this.closeDialogHandler);++ this.timeEntryService.activeTimer$.subscribe((timer) => {+ this.currentTimer = timer;+ });}ngOnDestroy():void {@@ -70,7 +79,12 @@ export class WorkPackageSingleContextMenuDirective extends OpContextMenuTriggercase 'copy_to_other_project':window.location.href = `${this.PathHelper.staticBase}/work_packages/move/new?copy=true&ids[]=${this.workPackage.id as string}`;break;-+ case 'start_timer':+ // do stuff+ break;+ case 'stop_timer':+ // do stuff+ break;case 'copy':this.$state.go('work-packages.copy', { copiedFromWorkPackageId: this.workPackage.id });break;@@ -111,8 +125,47 @@ export class WorkPackageSingleContextMenuDirective extends OpContextMenuTriggerreturn position;}+ private activeForWorkPackage(entry:TimeEntryResource | null):boolean {+ return !!entry && entry.entity.href === this.workPackage.href;+ }++ private hasTimerPermission():boolean {+ return Object.prototype.hasOwnProperty.call(this.workPackage, 'logTime');+ }++ private getTimerAction():string | null {+ if (this.activeForWorkPackage(this.currentTimer)) {+ return 'stop_timer';+ } else {+ return 'start_timer';+ }+ }++ private removeTimerActions(actions:WorkPackageAction[]):WorkPackageAction[] {+ return actions.filter((action) => action.key !== 'start_timer' && action.key !== 'stop_timer');+ }+private getPermittedActions(authorization:WorkPackageAuthorization) {- const actions:WorkPackageAction[] = authorization.permittedActionsWithLinks(PERMITTED_CONTEXT_MENU_ACTIONS);+ let actions:WorkPackageAction[] = authorization.permittedActionsWithLinks(PERMITTED_CONTEXT_MENU_ACTIONS);++ if (this.hasTimerPermission()) {+ const requiredTimerAction = this.getTimerAction();+ actions = actions.filter((action) => {+ // Show one action+ if (action.key === requiredTimerAction) {+ return true;+ }++ // Hide the other+ if (action.key === 'start_timer' || action.key === 'stop_timer') {+ return false;+ }++ return true;+ });+ } else {+ actions = this.removeTimerActions(actions);+ }// Splice plugin actions onto the core actions_.each(this.getPermittedPluginActions(authorization), (action:WorkPackageAction) => {diff --git a/frontend/src/app/shared/components/op-context-menu/wp-context-menu/wp-static-context-menu-actions.ts b/frontend/src/app/shared/components/op-context-menu/wp-context-menu/wp-static-context-menu-actions.tsindex 7fac1519492..0f13427b71c 100644--- a/frontend/src/app/shared/components/op-context-menu/wp-context-menu/wp-static-context-menu-actions.ts+++ b/frontend/src/app/shared/components/op-context-menu/wp-context-menu/wp-static-context-menu-actions.ts@@ -12,6 +12,16 @@ export const PERMITTED_CONTEXT_MENU_ACTIONS:WorkPackageAction[] = [key: 'log_time',link: 'logTime',},+ {+ key: 'start_timer',+ icon: 'icon-time-tracking-start',+ link: 'logTime'+ },+ {+ key: 'stop_timer',+ icon: 'icon-time-tracking-stop',+ link: 'logTime'+ },{key: 'change_project',icon: 'icon-move',