From 23b7e150ef6fdf28a490403273cce3f2bbab999e Mon Sep 17 00:00:00 2001 From: shuhaib s <95394061+shuhaib-aot@users.noreply.github.com> Date: Fri, 11 Nov 2022 19:00:00 +0530 Subject: [PATCH] Dev to Master 11-11-2022 (#285) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * added new event called resetValue to start from 1 (#260) * Fwf 1478 (#264) * form search added * sorting added * Formio token remove (#265) * removed token generation function * fixed * fixed lint errror * updated readme * updated package.json and lock * removed consoles * Fahad fwf1710 (#267) * removed token generation function * fixed * fixed lint errror * updated readme * updated package.json and lock * removed consoles * taskhistory updated * padding added for formviewsubmission Co-authored-by: shuhaib-aot * fixed form list and submission (#268) * 🐛 Fixed vue bugs (#270) * fixed form list and submission * updated pagination and form search * console.log changed to console.error * 🐛 modal close updated (#273) * modal close updated * Update CHANGELOG.md * Update CHANGELOG.md * sorting updated and warning removed * 🐛 UI FIX * fixed form list and submission * filter select bug fixed * updated form with overflow * Change log updated * modal close updated * Update CHANGELOG.md * Create FormList.md * Fahad aot patch 1 (#276) * modal close updated * Update CHANGELOG.md * Create FormList.md * added formloading * LHS bugs fixed (#277) * modal close updated * Update CHANGELOG.md * Create FormList.md * added formloading * Fwf1772 bugs fixed * 🐛 Fixed displaying form under history tab. (#278) * modal close updated * Update CHANGELOG.md * Create FormList.md * added formloading * Fwf1772 bugs fixed * FWF-1765 fixed * Fwf 1768 fixed * cmnts removed * Safari issue fix (#280) * fixed form list and submission * safari issue fix Regex issue * Drop down fix (#281) * fixed form list and submission * safari issue fix Regex issue * drop down issue fix and vue-formio package upgrade * Blank space fix in mobile screen (#282) * fixed form list and submission * fixed extra blank space * margin top added 3 when it was in small screen * Issues fix 🐛 and bugs (#283) * fixed form list and submission * fixed in duplicate and filter name * updated blank space issue * Update CHANGELOG.md (#284) Co-authored-by: fahad-aot <99656326+fahad-aot@users.noreply.github.com> --- camunda-formio-tasklist-vue/docs/CHANGELOG.md | 17 + .../docs/components/FormList.md | 26 + .../docs/components/TaskList.md | 15 +- camunda-formio-tasklist-vue/package-lock.json | 470 +++++++----------- camunda-formio-tasklist-vue/package.json | 4 +- .../src/components/FormViewSubmission.vue | 6 +- .../src/components/TaskList.vue | 88 ++-- .../src/components/addons/TaskHistory.vue | 42 +- .../src/components/form/FormListModal.vue | 294 ++++++++--- .../src/components/layout/Header.vue | 17 +- .../src/components/layout/LeftSider.vue | 26 +- .../src/components/layout/Pagination.vue | 9 +- .../src/components/layout/RightSider.vue | 130 ++--- .../src/components/search/TaskListSearch.vue | 4 +- .../src/components/search/TaskSearchItem.vue | 45 +- camunda-formio-tasklist-vue/src/main.ts | 1 - .../src/mixins/BaseMixin.vue | 15 +- .../src/models/ApplicationCreatePayload.ts | 3 +- .../src/services/CamundaRest.ts | 10 +- .../src/services/Constants.ts | 2 +- .../src/services/FormioToken.ts | 49 -- .../src/services/FormsFlowApi.ts | 21 +- .../src/services/GetFormio.ts | 45 +- .../src/services/index.ts | 1 - .../src/styles/camundaFormIOFormList.scss | 8 + .../src/views/TaskList.vue | 23 +- 26 files changed, 733 insertions(+), 638 deletions(-) create mode 100644 camunda-formio-tasklist-vue/docs/components/FormList.md delete mode 100644 camunda-formio-tasklist-vue/src/services/FormioToken.ts diff --git a/camunda-formio-tasklist-vue/docs/CHANGELOG.md b/camunda-formio-tasklist-vue/docs/CHANGELOG.md index 0a2cb361..c2864653 100644 --- a/camunda-formio-tasklist-vue/docs/CHANGELOG.md +++ b/camunda-formio-tasklist-vue/docs/CHANGELOG.md @@ -1,5 +1,22 @@ # Changes for camunda-formio-tasklist-vue + +## v1.1.4, 2022-11-11 + +#### Modified +- Added Form search and Form sorting +- Removed formio token generation mechanism +- Added Pagination from server side +- Reduced props +- Exported FormList component +- Vue-formio package Upgraded +- Chosen Filter will display now + +#### Fixes +- Fixed null value accept in the filter +- Fixed forms showing under the history tab +- Fixed tasklist when expanding a task + ## v1.1.3, 2022-07-12 #### Modified diff --git a/camunda-formio-tasklist-vue/docs/components/FormList.md b/camunda-formio-tasklist-vue/docs/components/FormList.md new file mode 100644 index 00000000..ab314cba --- /dev/null +++ b/camunda-formio-tasklist-vue/docs/components/FormList.md @@ -0,0 +1,26 @@ +# FormList Component + +Customised component for listing the forms. When use this component you can see a button with labeled "Form". By clicking the button you can view all the forms here in a modal . + +## Props + +| Name | Type | Default | Description | +| --- | -- | --- | ------- | +| bpmApiUrl:triangular_flag_on_post: | string | undefined | To specify the Camunda Rest API URL from which the TaskList is being generated. Use Camunda Rest API URL used in formsflow.ai installation.| +| token :triangular_flag_on_post: | string | undefined | To pass the JWT token used for authorising TaskList component.| +| update-task:triangular_flag_on_post: | string | undefined | Function that emits when a Form submitted.| + +:triangular_flag_on_post: - mandatory props to be passed + +## Usage + +``` +import FormList from "camunda-formio-tasklist-vue/src/components/form/FormList.vue"; + + +``` diff --git a/camunda-formio-tasklist-vue/docs/components/TaskList.md b/camunda-formio-tasklist-vue/docs/components/TaskList.md index b9e0b712..3f89f648 100644 --- a/camunda-formio-tasklist-vue/docs/components/TaskList.md +++ b/camunda-formio-tasklist-vue/docs/components/TaskList.md @@ -9,14 +9,15 @@ solution in your Vue.js based project. | --- | -- | --- | ------- | | bpmApiUrl :triangular_flag_on_post: | string | undefined | To specify the Camunda Rest API URL from which the TaskList is being generated. Use Camunda Rest API URL used in formsflow.ai installation.| | token :triangular_flag_on_post: | string | undefined | To pass the JWT token used for authorising TaskList component.| -| formIO :triangular_flag_on_post: | Object | `{ apiUrl:'', resourceId:'', reviewerId:'', reviewer:'', userRoles:'' }` | `apiUrl` 🚩 The URL of the form.io server for showing forms
`resourceId` 🚩 User forms form-Id obtained from formio for role based access.
`reviewerId` 🚩 User forms form-Id obtained from formio for role based access.
`reviewer` 🚩 The group name passed to specify which user has access to the TaskList component. In formsflow.ai, it usually set as "formsflow-reviewer"
`userRoles` 🚩 The valid FORMIO_ROLES as part of formio service. It should be passed as props to user | | formsflowaiApiUrl :triangular_flag_on_post: | string | undefined | The URL of the form-flow API endpoint.| +| reviewer :triangular_flag_on_post: | string | undefined | To specify the reviewer| +| userRoles :triangular_flag_on_post: | Array | undefined | To set the user roles| +| formioServerUrl :triangular_flag_on_post: | string | undefined | To set the formio url| | containerHeight | string | 100vh | Prop to adjust the height values of Vue component, in case of Vue component is too much for your integrated application. You can adjust the height from the range 100-400 | | taskSortBy | string | "created" | Prop to decide by default what value should the tasks be sorted when displayed at first. You can use the values like - "created", "dueDate", "follweowUpDate", "priority", "name", "assignee" | | taskSortOrder | string | "desc" | Prop to decide by default what value should the tasks should be ordered when displayed at first. You can use the values like - "desc", "asc" | | taskDefaultFilterListNames | Array[string] | optional | Prop to set default filterNames to be available for the component and corresponding to it get the filtered Tasklist. `eg: ['Clerk Tasks', 'XYZ | | webSocketEncryptkey | string | "formflowai" | Specifies the secret key used to connect to webSocket endpoint for encrypting keys in the taskList | -| formIOJwtSecret :triangular_flag_on_post: | string | "--- change me now ---" | Specifies the secret key used in forms-flow-forms server jwt secret | | disableComponents | Object | `{filterList:false, filterTask:false, sort:false, form:false}` | Prop to decide to disable the option from components. "filterList", "sort", "form": these are Header component. if you need to disable these option the value should be =true."filterTask" is on Left side. | | hideTaskDetails | Object | ` {assignee:false, group:false, followUpDate:false, dueDate:false, createdDate:false}` | Prop to decide to hide the option from Task Details| | listItemCardStyle | boolean |false |Prop to decide to make the list item in a card style | @@ -31,15 +32,11 @@ import CamundaTasklist from "camunda-formio-tasklist-vue/src/components/TaskList - -
- +
+
+
- + diff --git a/camunda-formio-tasklist-vue/src/components/layout/Header.vue b/camunda-formio-tasklist-vue/src/components/layout/Header.vue index f34de69c..bae4231f 100644 --- a/camunda-formio-tasklist-vue/src/components/layout/Header.vue +++ b/camunda-formio-tasklist-vue/src/components/layout/Header.vue @@ -10,7 +10,7 @@ aria-expanded="false" > - Filters + {{ filterName }}
    {{ filter.name }}
  • @@ -86,6 +86,7 @@ export default class Header extends Mixins(BaseMixin) { public setFormsFlowTaskCurrentPage: any; private activefilter = 0; + private filterName: string= "Filters"; updateCheck(){ this.$root.$emit("call-fetchPaginatedTaskList", { @@ -96,8 +97,20 @@ export default class Header extends Mixins(BaseMixin) { }); } + setFilterName(){ + const filter = this.filterList.find((item)=> item.id === this.selectedfilterId); + if(filter){ + this.filterName = filter.name; + } + } + + mounted(){ + this.setFilterName(); + } + togglefilter(filter: FilterPayload, index: number) { this.activefilter = index; + this.filterName=filter.name; this.$root.$emit("call-fetchTaskListCount", { filterId: filter.id, requestData: this.payload, diff --git a/camunda-formio-tasklist-vue/src/components/layout/LeftSider.vue b/camunda-formio-tasklist-vue/src/components/layout/LeftSider.vue index 2fc2656e..1571b742 100644 --- a/camunda-formio-tasklist-vue/src/components/layout/LeftSider.vue +++ b/camunda-formio-tasklist-vue/src/components/layout/LeftSider.vue @@ -49,7 +49,7 @@ > {{ getProcessDataFromList( - getProcessDefinitions, + processDefinitions, task.processDefinitionId, "name" ) @@ -80,13 +80,13 @@ data-bs-toggle="tooltip" :title="getExactDate(task.due)" v-if="task.due" - >Due in {{ timedifference(task.due) }} + >Due {{ timedifference(task.due) }},
    Follow up in {{ timedifference(task.followUp) }}
    + >   Follow up {{ timedifference(task.followUp) }} @@ -117,15 +118,16 @@