Merge pull request #7112 from opf/feature/29672-Show-work-package-in-full-view-when-double-clicking-on-a-card
[29672] [Boards] Show work package in full view when double-clicking on a cardpull/7123/head
Henriette Dinger
6 years ago
committed by
GitHub
commit
ba314e6f97
@ -0,0 +1,81 @@ |
||||
// -- copyright
|
||||
// OpenProject is a project management system.
|
||||
// Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU General Public License version 3.
|
||||
//
|
||||
// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
|
||||
// Copyright (C) 2006-2013 Jean-Philippe Lang
|
||||
// Copyright (C) 2010-2013 the ChiliProject Team
|
||||
//
|
||||
// This program is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU General Public License
|
||||
// as published by the Free Software Foundation; either version 2
|
||||
// of the License, or (at your option) any later version.
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program; if not, write to the Free Software
|
||||
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
//
|
||||
// See doc/COPYRIGHT.rdoc for more details.
|
||||
// ++
|
||||
|
||||
import {Injectable, Injector} from '@angular/core'; |
||||
import {StateService, Transition} from "@uirouter/core"; |
||||
import {KeepTabService} from "core-components/wp-single-view-tabs/keep-tab/keep-tab.service"; |
||||
|
||||
interface BackRouteOptions { |
||||
name:string; |
||||
params:{}; |
||||
parent:string; |
||||
} |
||||
|
||||
@Injectable() |
||||
export class BackRoutingService { |
||||
private _backRoute:BackRouteOptions; |
||||
private $state:StateService = this.injector.get(StateService); |
||||
private keepTab:KeepTabService = this.injector.get(KeepTabService); |
||||
|
||||
constructor(protected injector:Injector) { |
||||
} |
||||
|
||||
public goBack() { |
||||
if (!this.backRoute) { |
||||
this.$state.go('work-packages.list', this.$state.params); |
||||
} else { |
||||
if (this.keepTab.isDetailsState(this.backRoute.parent)) { |
||||
this.$state.go(this.keepTab.currentDetailsState, this.$state.params); |
||||
} else { |
||||
this.$state.go(this.backRoute.name, this.backRoute.params); |
||||
} |
||||
} |
||||
} |
||||
|
||||
public sync(transition:Transition) { |
||||
const fromState = transition.from(); |
||||
const toState = transition.to(); |
||||
|
||||
// Set backRoute to know where we came from
|
||||
if (fromState.name && |
||||
fromState.data && |
||||
toState.data && |
||||
fromState.data.parent !== toState.data.parent) { |
||||
const paramsFromCopy = { ...transition.params('from') }; |
||||
this.backRoute = { name: fromState.name, params: paramsFromCopy, parent: fromState.data.parent }; |
||||
} |
||||
} |
||||
|
||||
public set backRoute(route:BackRouteOptions) { |
||||
this._backRoute = route; |
||||
} |
||||
|
||||
public get backRoute():BackRouteOptions { |
||||
return this._backRoute; |
||||
} |
||||
} |
||||
@ -0,0 +1,76 @@ |
||||
#-- copyright |
||||
# OpenProject is a project management system. |
||||
# Copyright (C) 2012-2018 the OpenProject Foundation (OPF) |
||||
# |
||||
# This program is free software; you can redistribute it and/or |
||||
# modify it under the terms of the GNU General Public License version 3. |
||||
# |
||||
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: |
||||
# Copyright (C) 2006-2017 Jean-Philippe Lang |
||||
# Copyright (C) 2010-2013 the ChiliProject Team |
||||
# |
||||
# This program is free software; you can redistribute it and/or |
||||
# modify it under the terms of the GNU General Public License |
||||
# as published by the Free Software Foundation; either version 2 |
||||
# of the License, or (at your option) any later version. |
||||
# |
||||
# This program is distributed in the hope that it will be useful, |
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of |
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
||||
# GNU General Public License for more details. |
||||
# |
||||
# You should have received a copy of the GNU General Public License |
||||
# along with this program; if not, write to the Free Software |
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
||||
# |
||||
# See docs/COPYRIGHT.rdoc for more details. |
||||
#++ |
||||
|
||||
require 'spec_helper' |
||||
require_relative './support/board_index_page' |
||||
require_relative './support/board_page' |
||||
|
||||
describe 'Work Package boards spec', type: :feature, js: true do |
||||
let(:user) do |
||||
FactoryBot.create(:user, |
||||
member_in_project: project, |
||||
member_through_role: role) |
||||
end |
||||
let(:project) { FactoryBot.create(:project, enabled_module_names: %i[work_package_tracking board_view]) } |
||||
let(:permissions) { %i[show_board_views manage_board_views add_work_packages view_work_packages manage_public_queries] } |
||||
let(:role) { FactoryBot.create(:role, permissions: permissions) } |
||||
|
||||
let!(:priority) { FactoryBot.create :default_priority } |
||||
let!(:status) { FactoryBot.create :default_status } |
||||
|
||||
let(:board_index) { Pages::BoardIndex.new(project) } |
||||
let(:board_view) { FactoryBot.create :board_grid_with_query, project: project } |
||||
let(:project_html_title) { ::Components::HtmlTitle.new project } |
||||
|
||||
before do |
||||
project |
||||
login_as(user) |
||||
end |
||||
|
||||
it 'navigates from boards to the WP full view and back' do |
||||
board_view |
||||
board_index.visit! |
||||
|
||||
# Add a new WP on the board |
||||
board_page = board_index.open_board board_view |
||||
board_page.expect_query 'List 1', editable: true |
||||
board_page.add_card 'List 1', 'Task 1' |
||||
board_page.expect_notification message: I18n.t(:notice_successful_create) |
||||
|
||||
# Double click leads to the full view |
||||
click_target = board_page.find('.work-package--card--author') |
||||
page.driver.browser.action.double_click(click_target.native).perform |
||||
|
||||
wp = WorkPackage.last |
||||
expect(current_path).to eq project_work_package_path(project, wp.id, 'activity') |
||||
|
||||
# Click back goes back to the board |
||||
find('.work-packages-back-button').click |
||||
expect(current_path).to eq project_work_package_boards_path(project, board_view.id) |
||||
end |
||||
end |
||||
Loading…
Reference in new issue