Merge pull request #10364 from opf/feature/boards-ce
[41511] Make basic boards a CE featurepull/10369/head
Henriette Darge
3 years ago
committed by
GitHub
commit
83afed93f2
@ -1,16 +1,25 @@ |
||||
<div |
||||
class="op-modal op-modal_wide confirm-form-submit--modal loading-indicator--location" |
||||
class="op-modal op-modal_wide confirm-form-submit--modal loading-indicator--location" |
||||
data-indicator-name="modal" |
||||
> |
||||
<op-modal-header (close)="closeMe($event)">{{text.board_type}}</op-modal-header> |
||||
|
||||
<div class="op-modal--body"> |
||||
<p [textContent]="text.select_board_type"></p> |
||||
<enterprise-banner |
||||
*ngIf="eeShowBanners" |
||||
[linkMessage]="text.upgrade_to_ee_text" |
||||
[textMessage]="text.teaser_text" |
||||
opReferrer="boards" |
||||
></enterprise-banner> |
||||
|
||||
<p |
||||
*ngIf="!eeShowBanners" |
||||
[textContent]="text.select_board_type"></p> |
||||
<section class="new-board--section"> |
||||
<tile-view |
||||
[tiles]="available" |
||||
[disable]="inFlight" |
||||
(create)="createBoard($event)"> |
||||
[tiles]="available" |
||||
[disable]="inFlight" |
||||
(create)="createBoard($event)"> |
||||
</tile-view> |
||||
</section> |
||||
</div> |
||||
|
||||
@ -1,15 +1,19 @@ |
||||
<div class="tile-blocks--container"> |
||||
<div class="op-tile-block"> |
||||
<button |
||||
*ngFor="let tile of tiles" |
||||
class="tile-block button" |
||||
class="op-tile-block--tile button" |
||||
data-qa-selector="op-tile-block" |
||||
type="button" |
||||
[disabled]="disabled()" |
||||
[disabled]="tile.disabled || disable" |
||||
(click)="created(tile.attribute)" |
||||
> |
||||
<img [src]="tile.image" class="tile-block-image"/> |
||||
<img [src]="tile.image" class="op-tile-block--image"/> |
||||
<div> |
||||
<span class="tile-block-title">{{ tile.text }}</span> |
||||
<p class="tile-block-description" [textContent]="tile.description"></p> |
||||
<span |
||||
data-qa-selector="op-tile-block-title" |
||||
class="op-tile-block--title" |
||||
>{{ tile.text }}</span> |
||||
<p class="op-tile-block--description" [textContent]="tile.description"></p> |
||||
</div> |
||||
</button> |
||||
</div> |
||||
@ -1,44 +1,47 @@ |
||||
.tile-blocks--container |
||||
.op-tile-block |
||||
$block: & |
||||
display: grid |
||||
grid-template-rows: repeat(minmax(200px, auto)) |
||||
grid-template-columns: auto auto |
||||
grid-column-gap: 10px |
||||
grid-row-gap: 10px |
||||
|
||||
|
||||
.tile-block |
||||
border-radius: 10px |
||||
display: grid |
||||
grid-template: 95px 1fr / 1fr |
||||
grid-template-columns: auto 1fr auto |
||||
grid-template-rows: auto |
||||
grid-row-gap: 5px |
||||
justify-items: left |
||||
background: #f7fafc |
||||
min-height: 150px |
||||
|
||||
&:hover |
||||
text-decoration: none |
||||
border: 1px solid grey |
||||
border-radius: 10px !important |
||||
cursor: pointer |
||||
|
||||
.tile-block-image |
||||
display: block |
||||
margin-top: auto |
||||
margin-bottom: auto |
||||
|
||||
.tile-block-title |
||||
padding-top: 30px |
||||
padding-bottom: 5px |
||||
color: var(--primary-color-dark) |
||||
display: block |
||||
text-align: left |
||||
font-weight: bolder |
||||
font-size: large |
||||
|
||||
.tile-block p |
||||
text-align: left |
||||
width: 90% |
||||
&--tile |
||||
border-radius: 10px |
||||
display: grid |
||||
grid-template: 95px 1fr / 1fr |
||||
grid-template-columns: auto 1fr auto |
||||
grid-template-rows: auto |
||||
grid-row-gap: 5px |
||||
justify-items: left |
||||
background: #f7fafc |
||||
min-height: 150px |
||||
|
||||
&:disabled |
||||
background: #fafafa |
||||
|
||||
&:hover |
||||
text-decoration: none |
||||
border: 1px solid grey |
||||
border-radius: 10px !important |
||||
cursor: pointer |
||||
|
||||
&--image |
||||
display: block |
||||
margin-top: auto |
||||
margin-bottom: auto |
||||
|
||||
&--title |
||||
padding-top: 30px |
||||
padding-bottom: 5px |
||||
color: var(--primary-color-dark) |
||||
display: block |
||||
text-align: left |
||||
font-weight: bolder |
||||
font-size: large |
||||
|
||||
&--description |
||||
text-align: left |
||||
width: 90% |
||||
|
||||
|
||||
|
||||
@ -0,0 +1,84 @@ |
||||
#-- copyright |
||||
# OpenProject is an open source project management software. |
||||
# Copyright (C) 2012-2022 the OpenProject GmbH |
||||
# |
||||
# 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 COPYRIGHT and LICENSE files for more details. |
||||
#++ |
||||
|
||||
require 'spec_helper' |
||||
require_relative './support/board_index_page' |
||||
require_relative './support/board_page' |
||||
|
||||
describe 'Boards enterprise spec', type: :feature, js: true do |
||||
shared_let(:admin) { create(:admin) } |
||||
|
||||
shared_let(:project) { create(:project, enabled_module_names: %i[work_package_tracking board_view]) } |
||||
shared_let(:priority) { create :default_priority } |
||||
shared_let(:status) { create :default_status } |
||||
|
||||
let(:board_index) { Pages::BoardIndex.new(project) } |
||||
|
||||
shared_let(:manual_board) { create :board_grid_with_query, name: 'My board', project: project } |
||||
shared_let(:action_board) do |
||||
create(:subproject_board, |
||||
name: 'Subproject board', |
||||
project: project, |
||||
projects_columns: []) |
||||
end |
||||
|
||||
context 'when EE inactive' do |
||||
before do |
||||
login_as(admin) |
||||
board_index.visit! |
||||
end |
||||
|
||||
it 'disabled all action boards' do |
||||
# Expect both existing boards to show |
||||
expect(page).to have_content 'My board' |
||||
expect(page).to have_content 'Subproject board' |
||||
|
||||
page.find('.toolbar-item a', text: I18n.t('js.button_create')).click |
||||
|
||||
expect(page).to have_selector('[data-qa-selector="op-tile-block"]:not([disabled])', text: 'Basic') |
||||
expect(page).to have_selector('[data-qa-selector="op-tile-block"]:disabled', count: 5) |
||||
end |
||||
end |
||||
|
||||
context 'when EE active' do |
||||
before do |
||||
with_enterprise_token :board_view |
||||
login_as(admin) |
||||
board_index.visit! |
||||
end |
||||
|
||||
it 'enables all options' do |
||||
expect(page).to have_content 'My board' |
||||
expect(page).to have_content 'Subproject board' |
||||
|
||||
page.find('.toolbar-item a', text: I18n.t('js.button_create')).click |
||||
|
||||
expect(page).to have_selector('[data-qa-selector="op-tile-block"]:not([disabled])', count: 6) |
||||
end |
||||
end |
||||
end |
||||
Loading…
Reference in new issue