Merge branch 'release-2024-fall' into observation/FOUR-19998

ProcessMaker/Http/Controllers/Api/ProcessRequestController.php

@@ -24,6 +24,7 @@
 use ProcessMaker\Http\Resources\ApiResource;
 use ProcessMaker\Http\Resources\ProcessRequests as ProcessRequestResource;
 use ProcessMaker\Jobs\CancelRequest;
+use ProcessMaker\Jobs\CaseUpdateStatus;
 use ProcessMaker\Jobs\TerminateRequest;
 use ProcessMaker\Managers\DataManager;
 use ProcessMaker\Models\Comment;
@@ -602,6 +603,8 @@ private function cancelRequestToken(ProcessRequest $request)
         // Close process request
         $request->status = 'CANCELED';
         $request->save();
+        // Update case status
+        CaseUpdateStatus::dispatchSync($request);
 
         event(new RequestAction($request, RequestAction::ACTION_CANCELED));
     }

ProcessMaker/Http/Controllers/Api/UserController.php

@@ -187,6 +187,7 @@ public function index(Request $request)
     public function getUsersTaskCount(Request $request)
     {
         $query = User::nonSystem();
+        $query->select('id', 'username', 'firstname', 'lastname');
 
         $filter = $request->input('filter', '');
         if (!empty($filter)) {

ProcessMaker/Http/Middleware/GenerateMenus.php

@@ -4,6 +4,7 @@
 
 use Closure;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Lavary\Menu\Facade as Menu;
 use ProcessMaker\Models\Permission;
 use ProcessMaker\Models\Setting;
@@ -208,7 +209,7 @@ public function handle(Request $request, Closure $next)
                     'id' => 'process-scripts',
                 ])->data('order', 2);
             }
-            if ($this->userHasPermission('view-collections')) {
+            if (hasPackage('package-collections') && $this->userHasPermission('view-collections')) {
                 $submenu->add(__('Collections'), [
                     'route' => 'plugin-collections-index',
                     'customicon' => 'nav-icon fas fa-database',
@@ -323,7 +324,7 @@ public function handle(Request $request, Closure $next)
 
     public static function userHasPermission($permission)
     {
-        $user = \Auth::user();
+        $user = Auth::user();
 
         if (!$user || !$user->is_administrator) {
             return $user && $user->can($permission) && $user->hasPermission($permission);

ProcessMaker/ImportExport/Exporters/ScreenExporter.php

@@ -68,7 +68,14 @@ public function import() : bool
 
         // There should only be one default interstitial screen
         if ($screen->key === 'interstitial') {
-            $screen->key = null;
+            $existingScreenInterstitial = Screen::where('key', 'interstitial')->first();
+            // If the screen we are trying to import is not this system's default interstitial screen
+            // then set the key to null since there should only be one default interstitial screen
+            if ($existingScreenInterstitial && $existingScreenInterstitial->id !== $screen->id) {
+                $screen->key = null;
+            }
+            // On the other hand, if this import is attempting to update the default interstitial screen,
+            // that should be allowed and there should be no changes to the key or id, but the config will be updated.
         }
 
         $success = $screen->saveOrFail();

ProcessMaker/Repositories/CaseRepository.php

@@ -118,6 +118,12 @@ public function update(ExecutionInstanceInterface $instance, TokenInterface $tok
      */
     public function updateStatus(ExecutionInstanceInterface $instance): void
     {
+        if (is_null($instance->case_number)) {
+            Log::error('case started not found, method=updateStatus, instance=' . $instance->getKey());
+
+            return;
+        }
+
         // If a sub-process is completed, do not update the case started status
         if (!is_null($instance->parent_request_id)) {
             return;
@@ -130,7 +136,7 @@ public function updateStatus(ExecutionInstanceInterface $instance): void
                 'case_status' => $caseStatus,
             ];
 
-            if ($caseStatus === CaseStatusConstants::COMPLETED) {
+            if (in_array($caseStatus, [CaseStatusConstants::COMPLETED, CaseStatusConstants::CANCELED])) {
                 $data['completed_at'] = $instance->completed_at;
             }
 

ProcessMaker/Repositories/TokenRepository.php

@@ -314,10 +314,7 @@ public function persistActivityException(ActivityInterface $activity, TokenInter
         $token->save();
         $token->setId($token->getKey());
 
-        // Update Case Started Task
-        $caseTaskRepo = new CaseTaskRepository($token->getInstance()->case_number, $token);
-        $caseTaskRepo->updateCaseStartedTaskStatus();
-        $caseTaskRepo->updateCaseParticipatedTaskStatus();
+        $this->updateCaseStartedTask($token);
 
         $request = $token->getInstance();
         $request->notifyProcessUpdated('ACTIVITY_EXCEPTION', $token);
@@ -354,10 +351,7 @@ public function persistActivityCompleted(ActivityInterface $activity, TokenInter
         $token->save();
         $token->setId($token->getKey());
 
-        // Update Case Started Task
-        $caseTaskRepo = new CaseTaskRepository($token->getInstance()->case_number, $token);
-        $caseTaskRepo->updateCaseStartedTaskStatus();
-        $caseTaskRepo->updateCaseParticipatedTaskStatus();
+        $this->updateCaseStartedTask($token);
 
         $request = $token->getInstance();
         $request->notifyProcessUpdated('ACTIVITY_COMPLETED', $token);
@@ -690,4 +684,26 @@ public function persistEventBasedGatewayActivated(EventBasedGatewayInterface $ev
     {
         Log::info('persistEventBasedGatewayActivated');
     }
+
+    /**
+     * The function updates the status of a case task.
+     *
+     * @param TokenInterface token The `token` parameter in the `updateCaseStartedTask` function is an object of type
+     * `TokenInterface`. It is used to access the instance's case number and pass the token itself to the
+     * `CaseTaskRepository` constructor for further processing.
+     *
+     * @return void
+     */
+    private function updateCaseStartedTask(TokenInterface $token): void
+    {
+        if (is_null($token->getInstance()->case_number)) {
+            Log::info('CaseException: case number not found, method=updateCaseStartedTask, instance=' . $token->getInstance()->getKey());
+
+            return;
+        }
+
+        $caseTaskRepo = new CaseTaskRepository($token->getInstance()->case_number, $token);
+        $caseTaskRepo->updateCaseStartedTaskStatus();
+        $caseTaskRepo->updateCaseParticipatedTaskStatus();
+    }
 }

resources/js/Mobile/Card.vue

@@ -131,7 +131,7 @@ export default {
         return this.item.case_number;
       }
       if (this.type === "tasks") {
-        return this.item.process_request.id;
+        return this.item.process_request.case_number;
       }
       return null;
     },

resources/js/components/AvatarImage.vue

@@ -4,6 +4,7 @@
     <template v-for="(value, key) in options">
       <div class="vertical-view">
       <b-button
+        v-if="value.initials"
         ref="button"
         :variant="variant(value)"
         class="avatar-button rounded-circle overflow-hidden p-0 m-0 d-inline-flex"
@@ -44,7 +45,7 @@
               {{ limitCharacters(value.name) }}
             </template>
           </span>
-          <span v-else>ProcessMaker</span>
+          <span v-else><b-badge class="status-alternative-a">{{ $t('Unclaimed') }}</b-badge></span>
       </span>
       </div>
     </template>

resources/js/tasks/components/TasksList.vue

@@ -37,14 +37,9 @@
               width="20"
               height="20"
             />
-            <b-form-checkbox v-else-if="column.field === 'check_control'"
-                             v-model="headCheckbox"
-                             @change="changeHeadCheckbox">
-            </b-form-checkbox>
             <span v-else>{{ $t(column.label) }}</span>
           </div>
           <b-tooltip
-            v-if="column.field !== 'check_control'"
             :key="index"
             :target="`tasks-table-column-${column.field}`"
             custom-class="pm-table-tooltip-header"
@@ -152,12 +147,6 @@
                   </span>
                   <span>{{ getNestedPropertyValue(row, header) }}</span>
                 </template>
-                <template v-else-if="header.field === 'check_control'">
-                  <b-form-checkbox :checked="arrayOfCheckedRows.includes(row.id)"
-                                   ref="checkboxRegister"
-                                   @change="changeCheckbox($event, row)">
-                  </b-form-checkbox>
-                </template>
                 <template v-else-if="header.field === 'is_priority'">
                   <span>
                     <img
@@ -232,7 +221,6 @@
       :tooltip-button="tooltipFromButton"
       @onSetViewed="setViewed"
       @onWatchShowPreview="onWatchShowPreview"
-      @on-reassign-user="onReassignUser"
     >
       <template v-slot:header="{ close, screenFilteredTaskData, taskReady }">
         <slot name="preview-header" v-bind:close="close" v-bind:screenFilteredTaskData="screenFilteredTaskData" v-bind:taskReady="taskReady"></slot>
@@ -410,8 +398,6 @@ export default {
       hideTimer: null,
       ellipsisShow: false,
       columnMouseover: null,
-      headCheckbox: false,
-      arrayOfCheckedRows: []
     };
   },
   computed: {
@@ -464,7 +450,6 @@ export default {
       }
       this.$emit('count', newData.meta?.total);
       this.$emit("tab-count", newData.meta?.total);
-      this.checkHeadCheckboxAfterChangeData();
     },
     shouldShowLoader(value) {
       if (this.apiNoResults) {
@@ -938,48 +923,6 @@ export default {
     handleColumnMouseleave() {
       this.columnMouseover = null;
     },
-    addCheckedItem(value, row) {
-      if (value === true) {
-        if (!this.arrayOfCheckedRows.includes(row.id)) {
-          this.arrayOfCheckedRows.push(row.id);
-        }
-      } else {
-        let index = this.arrayOfCheckedRows.indexOf(row.id);
-        this.arrayOfCheckedRows.splice(index, 1);
-      }
-      this.$emit('add-checked-item', this.arrayOfCheckedRows);
-    },
-    getArrayOfCheckedRows() {
-      return this.arrayOfCheckedRows;
-    },
-    clearArrayOfCheckedRows() {
-      this.arrayOfCheckedRows = [];
-    },
-    changeHeadCheckbox(event) {
-      this.data.data.forEach(row => {
-        this.addCheckedItem(event, row);
-      });
-    },
-    changeCheckbox(event, row) {
-      this.addCheckedItem(event, row);
-      this.$nextTick(() => {
-        if (this.$refs.checkboxRegister) {
-          let sw = this.$refs.checkboxRegister.every(item => item.checked === true);
-          this.headCheckbox = sw;
-        }
-      });
-    },
-    checkHeadCheckboxAfterChangeData() {
-      this.$nextTick(() => {
-        if (this.$refs.checkboxRegister) {
-          let sw = this.$refs.checkboxRegister.every(item => item.checked === true);
-          this.headCheckbox = sw;
-        }
-      });
-    },
-    onReassignUser(idUser) {
-      this.fetch();
-    }
   },
 };
 </script>

resources/jscomposition/cases/casesDetail/api/index.js

@@ -62,3 +62,9 @@ export const getCommentsData = (params) => {
 
   return response;
 };
+
+export const updateRequest = async (id, data) => {
+  const response = await ProcessMaker.apiClient.put(`requests/${id}`, data);
+
+  return response;
+};

resources/jscomposition/cases/casesDetail/components/DisplayForm.vue

@@ -33,21 +33,32 @@
         v-show="!showPlaceholder && screen"
         class="tw-pointer-events-none"
       >
-        <vue-form-renderer
-          v-if="screen !== null"
-          v-model="previewData"
-          :data="previewData"
-          :config="configScreen"
-          :custom-css="screen.custom_css"
-          :show-errors="true"
-        />
+        <div
+          v-for="(page, index) in pagesPrintable"
+          :key="index"
+          class="card"
+        >
+          <div class="card-body">
+            <vue-form-renderer
+              v-if="screen !== null"
+              ref="formRender"
+              v-model="previewData"
+              :data="previewData"
+              :config="configScreen"
+              :custom-css="screen.custom_css"
+              :show-errors="true"
+            />
+          </div>
+        </div>
       </div>
     </transition>
   </div>
 </template>
 
 <script setup>
-import { onMounted, ref, computed } from "vue";
+import {
+  onMounted, ref, computed, nextTick,
+} from "vue";
 import { getScreenData } from "../api/index";
 import LoadingPlaceholder from "./placeholder/LoadingPlaceholder.vue";
 
@@ -62,6 +73,35 @@ const previewData = computed(() => props.data.taskData);
 const screen = ref(null);
 const configScreen = ref({});
 const showPlaceholder = ref(false);
+const pagesPrintable = ref([]);
+const formRender = ref([]);
+
+const findPagesInNavButtons = (object, found = []) => {
+  if (object.items) {
+    object.items.forEach((item) => {
+      findPagesInNavButtons(item, found);
+    });
+  } else if (object instanceof Array) {
+    object.forEach((item) => {
+      findPagesInNavButtons(item, found);
+    });
+  } else if (object.config && object.config.event === "pageNavigate" && object.config.eventData) {
+    const page = parseInt(object.config.eventData, 10);
+    if (found.indexOf(page) === -1) {
+      found.push(page);
+    }
+  }
+};
+
+const loadPages = () => {
+  const pages = [0];
+  if (screen.value.config instanceof Array) {
+    screen.value.config.forEach((page) => {
+      findPagesInNavButtons(page, pages);
+    });
+  }
+  return pages;
+};
 
 const disableForm = (screenConfig) => {
   if (screenConfig instanceof Array) {
@@ -88,6 +128,16 @@ const disableForm = (screenConfig) => {
   return screenConfig;
 };
 
+const loadPagesPrint = () => {
+  nextTick(() => {
+    formRender.value.forEach((page, index) => {
+      if (page.setCurrentPage) {
+        page.setCurrentPage(pagesPrintable.value[index]);
+      }
+    });
+  });
+};
+
 const getScreen = async (screenId) => {
   showPlaceholder.value = true;
 
@@ -98,7 +148,9 @@ const getScreen = async (screenId) => {
 
     if (response.data) {
       screen.value = response.data;
+      pagesPrintable.value = loadPages();
       configScreen.value = disableForm(screen.value.config);
+      loadPagesPrint();
     }
   }, 300);
 };