Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature/FOUR-12702: Start a Request: we need to enable only if the user was assigned "Start Permission" #5934

Merged
merged 18 commits into from
Jan 12, 2024
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 121 additions & 0 deletions ProcessMaker/Http/Controllers/Api/ProcessController.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use ProcessMaker\Events\TemplateUpdated;
use ProcessMaker\Exception\TaskDoesNotHaveUsersException;
use ProcessMaker\Facades\WorkflowManager;
use ProcessMaker\Http\Controllers\Api\GroupController;
use ProcessMaker\Http\Controllers\Api\TemplateController;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Http\Resources\ApiCollection;
Expand All @@ -25,6 +26,7 @@
use ProcessMaker\Jobs\ExportProcess;
use ProcessMaker\Jobs\ImportProcess;
use ProcessMaker\Models\Bookmark;
use ProcessMaker\Models\Group;
use ProcessMaker\Models\Process;
use ProcessMaker\Models\ProcessPermission;
use ProcessMaker\Models\Screen;
Expand Down Expand Up @@ -214,6 +216,83 @@ public function show(Request $request, Process $process)
return new Resource($process);
}

/**
* Display the specified resource.
*
* @param $process
*
* @return Response
*
* @OA\Get(
* path="/processes/{processId}/start_events",
* summary="Get start events of a process by Id",
* operationId="getStartEventsProcessById",
* tags={"Processes"},
* @OA\Parameter(
* description="ID of process to return",
* in="path",
* name="processId",
* required=true,
* @OA\Schema(
* type="integer",
* )
* ),
* @OA\Parameter(ref="#/components/parameters/include"),
* @OA\Response(
* response=200,
* description="Successfully found the start events process",
* @OA\JsonContent(
* type="object",
* @OA\Property(
* property="data",
* type="array",
* @OA\Items(ref="#/components/schemas/ProcessStartEvents"),
* ),
* @OA\Property(
* property="meta",
* type="object",
* ref="#/components/schemas/metadata",
* ),
* ),)
* ),
* )
*/
public function startEvents(Request $request, Process $process)
pmPaulis marked this conversation as resolved.
Show resolved Hide resolved
{
$startEvents = [];
$currentUser = Auth::user()->id;
foreach ($process->start_events as $event) {
if (count($event["eventDefinitions"]) === 0) {
if (array_key_exists("config", $event)) {
$webEntry = json_decode($event["config"])->web_entry;
$event["webEntry"] = $webEntry;
}
if (!Auth::user()->is_administrator && array_key_exists("assignment", $event)) {
switch ($event["assignment"]) {
case "user":
if ($currentUser === (int)$event["assignedUsers"]){
$startEvents[] = $event;
}
break;
case "group":
if ($this->checkUsersGroup($event, (int)$event["assignedGroups"], $request)){
$startEvents[] = $event;
}
break;
case "process_manager":
if ($currentUser === $process->manager_id){
$startEvents[] = $event;
}
break;
}
} else {
$startEvents[] = $event;
}
}
}
return new ApiCollection($startEvents);
}

/**
* Store a newly created resource in storage.
*
Expand Down Expand Up @@ -1434,6 +1513,48 @@ protected function getRequestFilterBy(Request $request, array $searchableColumns
return $where;
}

/**
* check if currentUser is member of a group
*
* @param object $event
* @param int $groupId
* @param Request $request
*
* @return bool
*/
protected function checkUsersGroup($event, int $groupId, Request $request)
pmPaulis marked this conversation as resolved.
Show resolved Hide resolved
{
$currentUser = Auth::user()->id;
$group = Group::find($groupId);
$response = false;
try {
$response = (new GroupController(new Group()))->users($group, $request);
$users = $response->all();

foreach ($users as $user) {
if($user->resource->id === $currentUser) {
$response = true;
}
}
} catch (\Exception $error) {
return ['error' => $error->getMessage()];
}

try {
$response = (new GroupController(new Group()))->groups($group, $request);
$groups = $response->all();

foreach ($groups as $group) {
if ($this->checkUsersGroup($event, $group->resource->id, $request)) {
$response = true;
}
}
} catch (\Exception $error) {
return ['error' => $error->getMessage()];
}
return $response;
}

/**
* Get included relationships.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<img src="../../../img/wizard-icon.svg" :alt="$t('Guided Template Icon')" />
{{ $t('Re-run Wizard') }}
</b-button>
<chart-save-search :process="process"/>
<chart-save-search :process="process" />

<wizard-helper-process-modal
v-if="createdFromWizardTemplate"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
data-toggle="dropdown"
aria-haspopup="true"
aria-expanded="false"
@click="getStartEvents()"
>
<span class="pl-3 pr-4"> {{ $t('Start this process') }} </span>
</button>
Expand Down Expand Up @@ -62,7 +63,6 @@
</template>

<script>

export default {
props: ["process"],
data() {
Expand All @@ -80,23 +80,19 @@ export default {
* get start events for dropdown Menu
*/
getStartEvents() {
const startEvents = this.process.start_events;
startEvents.forEach((event) => {
if (event.eventDefinitions.length === 0) {
if (event.config) {
const webEntry = JSON.parse(event.config).web_entry;
event.webEntry = webEntry;
this.processEvents = [];
ProcessMaker.apiClient
.get(`processes/${this.process.id}/start_events`)
.then((response) => {
this.processEvents = response.data.data;
if (this.processEvents.length <= 1) {
const event = this.processEvents[0] ?? {};
if (!("webEntry" in event)) {
this.havelessOneStartEvent = true;
this.startEvent = event.id ?? 0;
}
}
this.processEvents.push(event);
}
});
if (this.processEvents.length <= 1) {
const event = this.processEvents[0] ?? {};
if (!event.webEntry) {
this.havelessOneStartEvent = true;
this.startEvent = event.id ?? 0;
}
}
});
},
/**
* Start new request
Expand Down
2 changes: 2 additions & 0 deletions routes/api.php
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@
// Processes
Route::get('processes', [ProcessController::class, 'index'])->name('processes.index')->middleware('can:view-processes');
Route::get('processes/{process}', [ProcessController::class, 'show'])->name('processes.show')->middleware('can:view-processes,process');
Route::get('processes/{process}/start_events',
[ProcessController::class, 'startEvents'])->name('processes.start.events')->middleware('can:view-processes,process');
Route::post('processes/{process}/export', [ProcessController::class, 'export'])->name('processes.export')->middleware('can:export-processes,process');
Route::get('processes/{process}/bpmn', [ProcessController::class, 'downloadBpmn'])->name('processes.export.bpmn')->middleware('can:view-processes,process');
Route::post('processes/import', [ProcessController::class, 'import'])->name('processes.import')->middleware('can:import-processes');
Expand Down
Loading