inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-3473] Show complete button when you can't attach a form (#3695)

Browse Source 
* ADF-3473 show complete button

* fix isCompletedTask case

* fix single run test option
This commit is contained in:
Eugenio Romano
2018-08-14 10:45:00 +01:00
committed by Eugenio Romano
parent 2deafbbdd7
commit 3c7c3316bf
4 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/process-services/task-list/components/task-details.component.html
View File

@@ -57,6 +57,26 @@
(complete)="onComplete()"
(showAttachForm)="onShowAttachForm()">
</adf-task-standalone>
<mat-card class="adf-message-card" *ngIf="!isTaskStandaloneComponentVisible() && !isCompletedTask()" >
<mat-card-content>
<div class="adf-no-form-message-container">
<div class="adf-no-form-message-list">
<div *ngIf="!isCompletedTask()" class="adf-no-form-message">
<span id="adf-no-form-message">{{'ADF_TASK_LIST.STANDALONE_TASK.NO_FORM_MESSAGE' | translate}}</span>
</div>
</div>
</div>
</mat-card-content>
<mat-card-actions class="adf-no-form-mat-card-actions">
<div>
<button mat-button id="adf-no-form-complete-button" color="primary" (click)="onComplete()">{{ 'ADF_TASK_LIST.DETAILS.BUTTON.COMPLETE' | translate }}</button>
</div>
</mat-card-actions>
</mat-card>
<adf-attach-form *ngIf="isShowAttachForm()"
[taskId]="taskDetails.id"
[formKey]="taskDetails.formKey"

1
lib/process-services/task-list/components/task-standalone.component.ts
View File

@@ -42,6 +42,7 @@ export class TaskStandaloneComponent {
@Input()
hasCompletePermission: boolean = true;
// TODO: rename all with show prefix
/** Toggles rendering of the `Cancel` button. */
@Input()
hideCancelButton: boolean = true;

9
protractor.conf.js
View File

@@ -16,6 +16,13 @@ var BROWSER_RUN = process.env.BROWSER_RUN;
var FOLDER = process.env.FOLDER || '';
var SELENIUM_SERVER = process.env.SELENIUM_SERVER || '';
var DIRECT_CONNECCT = SELENIUM_SERVER ? false : true;
var NAME_TEST = process.env.NAME_TEST ? true : false
var specsToRun = './e2e/' + FOLDER + '**/*.e2e.ts';
if (process.env.NAME_TEST) {
specsToRun = './e2e/**/' + process.env.NAME_TEST;
}
var args_options = [];
@@ -31,7 +38,7 @@ exports.config = {
allScriptsTimeout: 60000,
specs: [
'./e2e/' + FOLDER + '**/*.e2e.ts'
specsToRun
],
capabilities: {

13
scripts/test-e2e-lib.sh
View File

@@ -102,27 +102,16 @@ export SAVE_SCREENSHOT=$SAVE_SCREENSHOT
export TIMEOUT=$TIMEOUT
export FOLDER=$FOLDER'/'
export SELENIUM_SERVER=$SELENIUM_SERVER
export NAME_TEST=$NAME_TEST
npm run lint-e2e || exit 1
if [[ $DEVELOPMENT == "true" ]]; then
echo "====== Run against local development ====="
if [[ $SINGLE_TEST == "true" ]]; then
echo "====== Single test run $NAME_TEST ====="
npm run e2e-lib -- --specs ./e2e/$NAME_TEST || exit 1
else
npm run e2e-lib || exit 1
fi
else
if [[ $SINGLE_TEST == "true" ]]; then
npm install --save-dev jasmine2-protractor-utils -g
echo "====== Single test run $NAME_TEST ====="
webdriver-manager update --gecko=false --versions.chrome=2.38
./node_modules/protractor/bin/protractor protractor.conf.js --specs ./e2e/$NAME_TEST || exit 1
else
webdriver-manager update --gecko=false --versions.chrome=2.38
./node_modules/protractor/bin/protractor protractor.conf.js || exit 1
fi
fi