Feature/client issue improvements 2

client/src/app/case/components/issue/issue.component.html

@@ -42,7 +42,7 @@ <h1>{{issue.label}}</h1>
       </div>
       <div class="card-actions">
         <paper-button routerLink="form-revision"><mwc-icon>call_split</mwc-icon>{{'Propose'|translate}}</paper-button>
-        <!-- Not showing this on client for now paper-button *ngIf="hasProposedChange" (click)="onMergeClick()"><mwc-icon>call_merge</mwc-icon>Merge</paper-button -->
+        <paper-button *ngIf="hasProposedChange && hasMergeChangePermission" (click)="onMergeClick()"><mwc-icon>call_merge</mwc-icon>Commit</paper-button>
       </div>
     </paper-card>
 

client/src/app/case/components/issue/issue.component.ts

@@ -57,6 +57,7 @@ export class IssueComponent implements OnInit {
   numberOfChanges:number
   numberOfRevisions:number
   canMergeProposedChange = false
+  hasMergeChangePermission = false
   hasProposedChange = false
   isOpen = false
   diffMarkup:string
@@ -91,6 +92,8 @@ export class IssueComponent implements OnInit {
     this.isOpen = this.issue.status === IssueStatus.Open ? true : false
     this.canMergeProposedChange = await this.caseService.canMergeProposedChange(this.issue._id)
     this.hasProposedChange = await this.caseService.hasProposedChange(this.issue._id)
+    this.hasMergeChangePermission = await this.caseService.hasMergeChangePermission(this.issue._id)
+
     this.eventInfos = this.issue.events.map(event => {
       return <EventInfo>{
         id: event.id,

client/src/app/case/services/case.service.ts

@@ -284,7 +284,7 @@ class CaseService {
   hasEventFormPermission(operation:EventFormOperation, eventFormDefinition:EventFormDefinition, eventForm?:EventForm) {
     if (
       (
-        eventForm && !eventForm.inactive &&
+        eventForm && !eventForm.inactive && eventForm.permissions &&
         eventForm.permissions[operation].filter(op => this.userService.roles.includes(op)).length > 0
       ) ||
       (
@@ -848,7 +848,8 @@ class CaseService {
   async createIssuesInQueue() {
     const userProfile = await this.userService.getUserProfile()
     for (let queuedIssue of this.queuedIssuesForCreation) {
-      await this.createIssue(queuedIssue.label, queuedIssue.comment, this.case._id, this.getCurrentCaseEventId(), this.getCurrentEventFormId(), userProfile._id, this.userService.getCurrentUser(), false, '')
+      const device = await this.deviceService.getDevice()
+      await this.createIssue(queuedIssue.label, queuedIssue.comment, this.case._id, this.getCurrentCaseEventId(), this.getCurrentEventFormId(), userProfile._id, this.userService.getCurrentUser(), false, device._id)
     }
     this.queuedIssuesForCreation = []
   }
@@ -1055,7 +1056,9 @@ class CaseService {
 
   async hasProposedChange(issueId:string) {
     const issue = new Issue(await this.tangyFormService.getResponse(issueId))
-    return !!issue.events.find(event => event.type === IssueEventType.ProposedChange)
+    const baseEvent = [...issue.events].reverse().find(event => event.type === IssueEventType.Open || event.type === IssueEventType.Rebase)
+    const indexOfBaseEvent = issue.events.findIndex(event => event.id === baseEvent.id)
+    return !!issue.events.find((event, i) => event.type === IssueEventType.ProposedChange && i > indexOfBaseEvent)
   }
 
   async canMergeProposedChange(issueId:string) {
@@ -1068,6 +1071,32 @@ class CaseService {
     return currentFormResponse._rev === eventBase.data.response._rev && currentCaseInstance._rev === eventBase.data.caseInstance._rev ? true : false
   }
 
+  async hasMergeChangePermission(issueId:string) {
+    var allowed = false
+    const issue = new Issue(await this.tangyFormService.getResponse(issueId))
+    if (issue && issue.caseId && issue.eventId) {
+      const caseEvent = this.events.find(event => event.id === issue.eventId)
+      const caseEventDefinition = this.caseDefinition.eventDefinitions.find(eventDefinition => eventDefinition.id === caseEvent.caseEventDefinitionId)
+
+      const eventForm = caseEvent.eventForms.find(form => form.id === issue.eventFormId)
+      const eventFormDefinition = caseEventDefinition.eventFormDefinitions.find(formDefinition => formDefinition.id === eventForm.eventFormDefinitionId)
+
+      const caseEventUpdatePermission = this.hasCaseEventPermission(CaseEventOperation.UPDATE, caseEventDefinition)
+
+      const eventFormUpdatePermission = this.hasEventFormPermission(EventFormOperation.UPDATE, eventFormDefinition)
+
+      const appConfig = await this.appConfigService.getAppConfig()
+
+      if (caseEventUpdatePermission && eventFormUpdatePermission) {
+        allowed = true
+      } else if (appConfig.allowMergeOfIssues) {
+        allowed = true
+      }
+    }
+
+    return allowed
+  }
+
   async issueDiff(issueId) {
     const issue = new Issue(await this.tangyFormService.getResponse(issueId))
     const firstOpenEvent = issue.events.find(event => event.type === IssueEventType.Open)
@@ -1109,7 +1138,7 @@ class CaseService {
   }
 
   isIssueContext() {
-    return window.location.hash.includes('/issues/')
+    return window.location.hash.includes('/issues/') || window.location.hash.includes('/issue/')
       ? true
       : false
   }

client/src/app/device/classes/device.class.ts

@@ -8,6 +8,7 @@ export class Device {
   version:string
   syncLocations:Array<LocationConfig> = []
   assignedLocation:LocationConfig
+  assignedFormResponseIds:Array<string> = []
 }
 
 export interface LocationConfig {

client/src/app/shared/_classes/app-config.class.ts

@@ -115,7 +115,11 @@ export class AppConfig {
   barcodeSearchMapFunction:string
   // Determines if a "Create Issue" button appears when viewing submitted Event Forms.
   allowCreationOfIssues:boolean
+  // Determines if a "Merge Issue" button appears in the Issues Revision page.
+  allowMergeOfIssues:boolean
   filterCaseEventScheduleByDeviceAssignedLocation:boolean = false
+  pullFormsModifiedOnServer:boolean = false
+
 
   //
   // Tangerine Coach configuration.

client/src/app/sync/sync-couchdb.service.ts

@@ -17,6 +17,7 @@ import {TangyFormService} from "../tangy-forms/tangy-form.service";
 import { SyncDirection } from './sync-direction.enum';
 import { UserService } from '../shared/_services/user.service';
 import { DeviceService } from '../device/services/device.service';
+
 const sleep = (milliseconds) => new Promise((res) => setTimeout(() => res(true), milliseconds))
 const retryDelay = 5*1000
 
@@ -232,9 +233,10 @@ export class SyncCouchdbService {
     let pullReplicationStatus
     let hadPullSuccess = false
     this.retryCount = 1
+    let prePullLastSeq = await this.variableService.get('sync-pull-last_seq')
     while (!hadPullSuccess && !this.cancelling) {
       try {
-        pullReplicationStatus = await this.pull(userDb, remoteDb, appConfig, syncDetails, batchSize);
+        pullReplicationStatus = await this.pull(userDb, remoteDb, appConfig, syncDetails, batchSize, prePullLastSeq);
         if (!pullReplicationStatus.pullError) {
           await this.variableService.set('sync-pull-last_seq', pullReplicationStatus.info.last_seq)
           hadPullSuccess = true
@@ -254,9 +256,30 @@ export class SyncCouchdbService {
     replicationStatus = {...replicationStatus, ...pullReplicationStatus}
     this.syncMessage$.next(replicationStatus);
 
-    // Whatever we pulled, even if there was an error, we don't need to push so set last push sequence again.
-    const localSequenceAfterPull = (await userDb.changes({descending: true, limit: 1})).last_seq
-    await this.variableService.set('sync-push-last_seq', localSequenceAfterPull)
+    // Pull Form Response Ids Assigned to the Device
+    // get the list of docs assigned to the device from the server device database
+    const deviceDoc = await this.deviceService.getRemoteDeviceInfo(syncDetails.deviceId, syncDetails.deviceToken)
+    const assignedFormResponseIds = deviceDoc?.assignedFormResponseIds ? deviceDoc.assignedFormResponseIds : []
+
+    let pullIssueFormsReplicationStatus
+    let hadPullIssueFormsSuccess = false
+    while (!hadPullIssueFormsSuccess && !this.cancelling) {
+      try {
+        pullIssueFormsReplicationStatus = await this.pullFormResponses(userDb, remoteDb, assignedFormResponseIds, appConfig, syncDetails, batchSize, prePullLastSeq);
+        if (!pullIssueFormsReplicationStatus.pullError) {
+          hadPullIssueFormsSuccess = true
+          pullIssueFormsReplicationStatus.hadPullSuccess = true
+        } else {
+          await sleep(retryDelay)
+          ++this.retryCount
+        }
+      } catch (e) {
+        console.error(e)
+        await sleep(retryDelay)
+      }
+    }
+    replicationStatus = {...replicationStatus, ...pullIssueFormsReplicationStatus}
+    this.syncMessage$.next(replicationStatus);
 
     if (this.cancelling) {
       this.finishCancelling(replicationStatus)
@@ -507,7 +530,7 @@ export class SyncCouchdbService {
     })
   }
 
-  async pull(userDb, remoteDb, appConfig, syncDetails, batchSize): Promise<ReplicationStatus> {
+  async pull(userDb, remoteDb, appConfig, syncDetails, batchSize, prePullLastSeq): Promise<ReplicationStatus> {
     let status = <ReplicationStatus>{
       pulled: 0,
       pullError: '',
@@ -516,12 +539,11 @@ export class SyncCouchdbService {
       remaining: 0,
       direction: 'pull' 
     };
-    let pull_last_seq = await this.variableService.get('sync-pull-last_seq')
-    if (typeof pull_last_seq === 'undefined') {
-      pull_last_seq = 0;
+    if (typeof prePullLastSeq === 'undefined') {
+      prePullLastSeq = 0;
     }
     if (this.fullSync && this.fullSync === 'pull') {
-      pull_last_seq = 0;
+      prePullLastSeq = 0;
     }
     const pullSelector = this.getPullSelector(syncDetails);
     let progress = {
@@ -540,7 +562,7 @@ export class SyncCouchdbService {
      * are kept in memory at a time, so the maximum docs in memory at once would equal batch_size × batches_limit."
      */
     let syncOptions = {
-      ...syncDetails.usePouchDbLastSequenceTracking ? { } : { "since": pull_last_seq },
+      ...syncDetails.usePouchDbLastSequenceTracking ? { } : { "since": prePullLastSeq },
       "batch_size": batchSize,
       "write_batch_size": this.writeBatchSize,
       "batches_limit": 1,
@@ -567,7 +589,7 @@ export class SyncCouchdbService {
       error = e
     }
 
-    status.initialPullLastSeq = pull_last_seq
+    status.initialPullLastSeq = prePullLastSeq
     status.currentPushLastSeq = status.info.last_seq
     status.batchSize = batchSize
 
@@ -643,5 +665,75 @@ export class SyncCouchdbService {
     }
     return pullSelector;
   }
+
+  async pullFormResponses(userDb, remoteDb, docIds, appConfig, syncDetails, batchSize, prePullLastSeq): Promise<ReplicationStatus> {
+    let status = <ReplicationStatus>{
+      pulled: 0,
+      pullError: '',
+      pullConflicts: [],
+      info: '',
+      remaining: 0,
+      direction: 'pull' 
+    };
+    if (typeof prePullLastSeq === 'undefined') {
+      prePullLastSeq = await this.variableService.get('sync-pull-last_seq')
+    }
+    if (this.fullSync && this.fullSync === 'pull') {
+      prePullLastSeq = await this.variableService.get('sync-pull-last_seq')
+    }
+
+    let progress = {
+      'direction': 'pull',
+      'message': 'Received data from remote server.'
+    }
+    this.syncMessage$.next(progress)
+    let failureDetected = false
+    let error;
+    let pulled = 0
+
+    /**
+     * The sync option batches_limit is set to 1 in order to reduce the memory load on the tablet. 
+     * From the pouchdb API doc:      
+     * "Number of batches to process at a time. Defaults to 10. This (along wtih batch_size) controls how many docs 
+     * are kept in memory at a time, so the maximum docs in memory at once would equal batch_size × batches_limit."
+     */
+    let syncOptions = {
+      ...syncDetails.usePouchDbLastSequenceTracking ? { } : { "since": prePullLastSeq },
+      "batch_size": batchSize,
+      "write_batch_size": this.writeBatchSize,
+      "batches_limit": 1,
+      "pulled": pulled,
+      "doc_ids": docIds,
+      "checkpoint": 'target',
+      "changes_batch_size": this.changesBatchSize
+    }
+    syncOptions = this.pullSyncOptions ? this.pullSyncOptions : syncOptions
+
+    try {
+      status = <ReplicationStatus>await this._pull(userDb, remoteDb, syncOptions);
+      if (typeof status.pulled !== 'undefined') {
+        pulled = pulled + status.pulled
+        status.pulled = pulled
+      } else {
+        status.pulled = pulled
+      }
+      this.syncMessage$.next(status)
+    } catch (e) {
+      console.log("Error: " + e)
+      failureDetected = true
+      error = e
+    }
 
+    status.initialPullLastSeq = prePullLastSeq
+    status.currentPushLastSeq = status.info.last_seq
+    status.batchSize = batchSize
+
+    if (failureDetected) {
+      status.pullError = `${error.message || error}. ${window['t']('Trying again')}: ${window['t']('Retry ')}${this.retryCount}.`
+    } 
+
+    this.syncMessage$.next(status)
+
+    return status;
+  }
 }

editor/src/app/case/classes/case.class.ts

@@ -17,6 +17,7 @@ class Case extends TangyFormResponseModel {
   notifications: Array<Notification> = []
   type:string = 'case'
   archived:boolean
+  groupId:string
 
   constructor(data?:any) {
     super()

editor/src/app/case/components/event-form/event-form.component.css

@@ -13,3 +13,10 @@
   right: 15px;
   color: #fff;
 }
+
+.open-issue-button {
+  position: absolute;
+  top: 74px;
+  right: 15px;
+  color: #fff;
+}

editor/src/app/case/components/event-form/event-form.component.html

@@ -4,6 +4,7 @@
     [caseEventId]="caseEvent.id"
     [eventFormId]="eventForm.id"
 ></app-case-breadcrumb>
-<paper-button *ngIf="loaded" class="new-issue-button" routerLink="/new-issue/{{caseId}}/{{caseEvent.id}}/{{eventForm.id}}"><mwc-icon>playlist_add</mwc-icon> new issue</paper-button>
+<paper-button *ngIf="loaded && !issueExistsForFormResponse" class="new-issue-button" routerLink="/new-issue/{{caseId}}/{{caseEvent.id}}/{{eventForm.id}}"><mwc-icon>playlist_add</mwc-icon> new issue</paper-button>
+<paper-button *ngIf="loaded && issueExistsForFormResponse" class="open-issue-button" routerLink="/issue/{{caseId}}/{{caseEvent.id}}/{{eventForm.id}}"><mwc-icon>flag</mwc-icon> open issues</paper-button>
 <app-tangy-forms-player #formPlayer></app-tangy-forms-player>
 

editor/src/app/case/components/event-form/event-form.component.ts

@@ -27,6 +27,7 @@ export class EventFormComponent implements OnInit, OnDestroy {
   caseId:string
 
   loaded = false
+  issueExistsForFormResponse = false
 
   window:any
 
@@ -38,7 +39,7 @@ export class EventFormComponent implements OnInit, OnDestroy {
     private route: ActivatedRoute,
     private hostElementRef: ElementRef,
     private router: Router,
-    private caseService: CaseService,
+    private caseService: CaseService
   ) {
     this.window = window
   }
@@ -86,10 +87,13 @@ export class EventFormComponent implements OnInit, OnDestroy {
 
       // After render of the player, it will have created a new form response if one was not assigned.
       // Make sure to save that new form response ID into the EventForm.
+      // If it exists, check for issues
       this.formPlayer.$rendered.subscribe(async () => {
         if (!this.formResponseId) {
           this.eventForm.formResponseId = this.formPlayer.formResponseId
           await this.caseService.save()
+        } else {
+          this.issueExistsForFormResponse = !!await this.caseService.findIssuesByFormResponseId(this.caseId, this.formResponseId)
         }
       })
       this.formPlayer.$submit.subscribe(async () => {