Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
5 changes: 5 additions & 0 deletions ProcessMaker/Observers/UserObserver.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ public function created(User $user): void
$perList = [
'view-process-catalog',
'view-my_requests',
'overview-tab-task',
'summary-tab-task',
'completed-tab-task',
'form-tab-task',
'files-tab-task',
];
$permissionIds = Permission::whereIn('name', $perList)->pluck('id')->toArray();
$user->permissions()->attach($permissionIds);
Expand Down
36 changes: 36 additions & 0 deletions database/migrations/2026_05_04_191751_add_permissions_tab_task.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?php

use Illuminate\Database\Migrations\Migration;
use ProcessMaker\Models\Permission;

return new class extends Migration {
/**
* Run the migrations.
*/
public function up(): void
{
$permissions = [
['Overview', 'overview-tab-task'],
['Summary', 'summary-tab-task'],
['Completed', 'completed-tab-task'],
['Form', 'form-tab-task'],
['Files', 'files-tab-task'],
];

foreach ($permissions as $permission) {
Permission::firstOrCreate([
'group' => 'Task tabs',
'title' => $permission[0],
'name' => $permission[1],
]);
}
}

/**
* Reverse the migrations.
*/
public function down(): void
{
Permission::where('group', 'Task tabs')->delete();
}
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Support\Facades\DB;
use ProcessMaker\Models\User;

return new class extends Migration {
private const TAB_TASK_PERMISSIONS = [
'overview-tab-task',
'summary-tab-task',
'completed-tab-task',
'form-tab-task',
'files-tab-task',
];

private const CHUNK_SIZE = 500;

/**
* Run the migrations.
*/
public function up(): void
{
$permissionIds = DB::table('permissions')
->whereIn('name', self::TAB_TASK_PERMISSIONS)
->pluck('id', 'name')
->values();

foreach ($permissionIds as $permissionId) {
$this->assignPermissionToUsers((int) $permissionId);
}
}

/**
* Reverse the migrations.
*/
public function down(): void
{
$permissionIds = DB::table('permissions')
->whereIn('name', self::TAB_TASK_PERMISSIONS)
->pluck('id', 'name')
->values();

DB::table('assignables')
->whereIn('permission_id', $permissionIds)
->where('assignable_type', User::class)
->delete();
}

private function assignPermissionToUsers(int $permissionId): void
{
$lastUserId = 0;

do {
$users = DB::table('users AS u')
->leftJoin('assignables AS a', function ($join) use ($permissionId) {
$join->on('u.id', '=', 'a.assignable_id')
->where('a.assignable_type', User::class)
->where('a.permission_id', $permissionId);
})
->whereNull('a.permission_id')
->where('u.id', '>', $lastUserId)
->where('u.is_administrator', false)
->select('u.id')
->orderBy('u.id')
->limit(self::CHUNK_SIZE)
->get();

if ($users->isEmpty()) {
return;
}

$records = $users->map(fn ($user) => [
'permission_id' => $permissionId,
'assignable_id' => $user->id,
'assignable_type' => User::class,
])->all();

DB::table('assignables')->insert($records);
$lastUserId = $users->last()->id;
} while ($users->count() === self::CHUNK_SIZE);
}
};
65 changes: 44 additions & 21 deletions resources/jscomposition/cases/casesDetail/components/CaseDetail.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,19 @@ const translate = ProcessMaker.i18n;
const { Router } = window.ProcessMaker;
const path = window.location.pathname;

const props = defineProps({
permissions: {
type: Object,
default: () => ({
overviewTabTask: true,
summaryTabTask: true,
completedTabTask: true,
formTabTask: true,
filesTabTask: true,
}),
},
});

const urlTabs = [
"errors",
"tasks",
Expand All @@ -45,29 +58,14 @@ const urlTabs = [
"requests",
];

const tabDefault = computed(() => {
if (urlTabs.includes(window.location.hash.substring(1))) {
return window.location.hash.substring(1);
}
// This section is for the package-files, the issue should be fixed in page with vue-router
const routeResolved = Router.resolve(path);
if (routeResolved.route?.name && routeResolved.route?.meta?.package === "package-files") {
return "file_manager";
}
if (isErrors()) {
return "errors";
}
return "tasks";
});

const componentToShow = computed(() => {
if (isTceCustomization()) {
return TabSummary;
}
return null;
});

const tabs = [
const tabs = computed(() => [
{
name: translate.t("Errors"),
href: "#errors",
Expand All @@ -86,28 +84,28 @@ const tabs = [
name: translate.t("Overview"),
href: "#overview",
current: "overview",
show: !isTceCustomization(),
show: props.permissions.overviewTabTask && !isTceCustomization(),
content: Overview,
},
{
name: translate.t("Summary"),
href: "#summary",
current: "summary",
show: getRequestStatus() !== "ERROR" && !isTceCustomization(),
show: props.permissions.summaryTabTask && getRequestStatus() !== "ERROR" && !isTceCustomization(),
content: TabSummary,
},
{
name: translate.t("Completed & Form"),
href: "#completed_form",
current: "completed_form",
show: true,
show: props.permissions.completedTabTask || props.permissions.formTabTask,
content: CompletedForms,
},
{
name: translate.t("File Manager"),
href: "#file_manager",
current: "file_manager",
show: true,
show: props.permissions.filesTabTask,
content: TabFiles,
},
{
Expand All @@ -124,5 +122,30 @@ const tabs = [
show: getRequestCount() !== 1 && !isTceCustomization(),
content: RequestTable,
},
];
]);

const tabDefault = computed(() => {
const requestedTab = window.location.hash.substring(1);
const visibleTab = (current) => tabs.value.find((tab) => tab.current === current && tab.show);

if (urlTabs.includes(requestedTab) && visibleTab(requestedTab)) {
return requestedTab;
}

// This section is for the package-files, the issue should be fixed in page with vue-router
const routeResolved = Router.resolve(path);
if (
routeResolved.route?.name
&& routeResolved.route?.meta?.package === "package-files"
&& visibleTab("file_manager")
) {
return "file_manager";
}

if (visibleTab("errors")) {
return "errors";
}

return tabs.value.find((tab) => tab.show)?.current || "tasks";
});
</script>
16 changes: 14 additions & 2 deletions resources/views/cases/edit.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,26 @@
<meta name="request-id" content="{{ $request->getKey() }}">
@endsection

@php
$permissions = [
'overviewTabTask' => Auth::user()->can('overview-tab-task'),
'summaryTabTask' => Auth::user()->can('summary-tab-task'),
'completedTabTask' => Auth::user()->can('completed-tab-task'),
'formTabTask' => Auth::user()->can('form-tab-task'),
'filesTabTask' => Auth::user()->can('files-tab-task'),
];
@endphp

@section('content')
<div
id="case-detail"
class="tw-p-4 tw-flex tw-overflow-hidden tw-space-x-2 tw-grow tw-h-full"
v-cloak
>
<case-detail class="tw-overflow-hidden tw-border tw-border-gray-200 tw-shadow-md tw-px-3
tw-flex-1 tw-bg-white tw-rounded-2xl" v-cloak>
<case-detail
class="tw-overflow-hidden tw-border tw-border-gray-200 tw-shadow-md tw-px-3 tw-flex-1 tw-bg-white tw-rounded-2xl"
:permissions='@json($permissions)'
v-cloak>
</case-detail>
<collapsable-container
v-model="collapseContainer"
Expand Down
14 changes: 12 additions & 2 deletions resources/views/requests/show.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,23 @@
@click="switchTab('pending')" href="#pending" role="tab" aria-controls="pending"
aria-selected="true">{{ __('Tasks') }}</a>
</li>
@can('overview-tab-task')
<li class="nav-item">
<a class="nav-link" id="overview-tab" data-toggle="tab" href="#overview" role="tab"
aria-controls="overview" aria-selected="false" @click="switchTab('overview')">
{{ __('Overview') }}
</a>
</li>
@endcan
@can('summary-tab-task')
<li class="nav-item" v-if="showSummary">
<a id="summary-tab" data-toggle="tab" href="#summary" role="tab" aria-controls="summary"
@click="switchTab('summary')" aria-selected="false"
v-bind:class="{ 'nav-link':true, active: showSummary && !activePending }">
{{ __('Summary') }}
</a>
</li>
@endcan
@if ($request->status === 'COMPLETED' && !$request->errors)
@can('editData', $request)
<li class="nav-item">
Expand All @@ -65,11 +69,13 @@
</li>
@endcan
@endif
@can('completed-tab-task')
<li class="nav-item">
<a class="nav-link" id="completed-tab" data-toggle="tab" href="#completed" role="tab"
aria-controls="completed" aria-selected="false"
@click="switchTab('completed')">{{ __('Completed') }}</a>
</li>
@endcan
@if (count($files) > 0 && !hasPackage('package-files'))
<li class="nav-item">
<a class="nav-link" id="files-tab" data-toggle="tab" href="#files" role="tab" aria-controls="files"
Expand All @@ -86,12 +92,14 @@
</li>
</template>

@can('form-tab-task')
<li class="nav-item" v-show="canViewPrint">
<a class="nav-link" id="forms-tab" data-toggle="tab" href="#forms" role="tab" aria-controls="forms"
aria-selected="false" @click="switchTab('forms')">
{{ __('Forms') }}
</a>
</li>
@endcan
@isset($addons)
@foreach ($addons as $addon) @if (!empty($addon['title']))
<li class="nav-item">
Expand Down Expand Up @@ -487,8 +495,10 @@ class="btn btn-outline-info btn-block"
<script src="{{$script}}"></script>
@endforeach
@if (hasPackage('package-files'))
<!-- TODO: Replace with script injector like we do for modeler and screen builder -->
<script src="{{ mix('js/manager.js', 'vendor/processmaker/packages/package-files') }}"></script>
@can('file-tab-task')
<!-- TODO: Replace with script injector like we do for modeler and screen builder -->
<script src="{{ mix('js/manager.js', 'vendor/processmaker/packages/package-files') }}"></script>
@endif
@endif

<script>
Expand Down
Loading
Loading