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
12 changes: 10 additions & 2 deletions resources/js/processes/designer/AssetButtons.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<b-card-text>
<div class="button-container">
<div v-if="canCreate" class="button-container">
<b-button
size="sm"
class="custom-button mb-2"
Expand All @@ -11,7 +11,7 @@
<i class="fas fa-arrow-right ml-2 align-middle text-primary" />
</b-button>
</div>
<div class="button-container">
<div v-if="canView" class="button-container">
<b-button
size="sm"
class="custom-button"
Expand All @@ -28,6 +28,14 @@
<script>
export default {
props: {
canView: {
type: Boolean,
default: true,
},
canCreate: {
type: Boolean,
default: true,
},
asset_name_all: String,
urlPath: String,
urlAsset: String,
Expand Down
40 changes: 28 additions & 12 deletions resources/js/processes/designer/Assets.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<b-card-group deck>
<b-card
v-for="(asset, index) in assetsCore"
v-if="hasAssetPermission(asset)"
:key="index"
bg-variant="light"
class="text-center"
Expand All @@ -30,6 +31,8 @@

<template v-if="showButtonsCore[index]">
<asset-buttons
:can-view="canView(asset)"
:can-create="canCreate(asset)"
:asset_name_all="asset.asset_name_all"
:asset_name_new="asset.asset_name_new"
:url-path="asset.urlPath"
Expand All @@ -43,7 +46,7 @@
<b-card-group deck>
<b-card
v-for="(asset, index) in assetsPackage"
v-if="isPackageInstalled(asset.package)"
v-if="hasAssetPermission(asset)"
:key="index"
bg-variant="light"
class="text-center"
Expand All @@ -61,6 +64,8 @@

<template v-if="showButtonsPackage[index]">
<asset-buttons
:can-view="canView(asset)"
:can-create="canCreate(asset)"
:asset_name_all="asset.asset_name_all"
:asset_name_new="asset.asset_name_new"
:url-path="asset.urlPath"
Expand All @@ -74,7 +79,7 @@
<b-card-group deck>
<b-card
v-for="(asset, index) in assetsPackageExtra"
v-if="isPackageInstalled(asset.package)"
v-if="hasAssetPermission(asset)"
:key="index"
bg-variant="light"
class="text-center"
Expand All @@ -92,6 +97,8 @@

<template v-if="showButtonsPackageExtra[index]">
<asset-buttons
:can-view="canView(asset)"
:can-create="canCreate(asset)"
:asset_name_all="asset.asset_name_all"
:asset_name_new="asset.asset_name_new"
:url-path="asset.urlPath"
Expand Down Expand Up @@ -122,6 +129,7 @@ export default {
color: "#4DA2EB",
icon: "fas fa-play-circle",
asset_name: "Processes",
resource: "processes",
asset_name_all: "View All Processes",
asset_name_new: "New Process",
urlPath: "/processes",
Expand All @@ -131,6 +139,7 @@ export default {
color: "#8EB86F",
icon: "fas fa-file-alt",
asset_name: "Screens",
resource: "screens",
asset_name_all: "View All Screens",
asset_name_new: "New Screen",
urlPath: "/designer/screens",
Expand All @@ -140,6 +149,7 @@ export default {
color: "#F7CF5D",
icon: "fas fa-code",
asset_name: "Scripts",
resource: "scripts",
asset_name_all: "View All Scripts",
asset_name_new: "New Script",
urlPath: "/designer/scripts",
Expand All @@ -151,6 +161,7 @@ export default {
color: "#712F4A",
icon: "fas fa-table",
asset_name: "Decision Tables",
resource: "decision_tables",
asset_name_all: "View All Decision Tables",
asset_name_new: "New Decision Table",
urlPath: "/designer/decision-tables",
Expand All @@ -161,6 +172,7 @@ export default {
color: "#B5D3E7",
icon: "fas fa-share-alt",
asset_name: "Data Connectors",
resource: "data-sources",
asset_name_all: "View All Data Connectors",
asset_name_new: "New Data Connector",
urlPath: "/designer/data-sources",
Expand All @@ -171,6 +183,7 @@ export default {
color: "#556271",
image_icon: "/img/flowGenieIcon.svg",
asset_name: "FlowGenie",
resource: "flow_genies",
asset_name_all: "View All Genies",
asset_name_new: "New Genie",
urlPath: "/designer/flow-genies",
Expand All @@ -183,6 +196,7 @@ export default {
color: "#5E4FE2",
icon: "fas fa-database",
asset_name: "Collections",
resource: "collections",
asset_name_all: "View All Collections",
asset_name_new: "New Collection",
urlPath: "/collections",
Expand All @@ -196,6 +210,16 @@ export default {
};
},
methods: {
canView(asset) {
return this.permission.includes(`view-${asset.resource}`);
},
canCreate(asset) {
return this.canView(asset) && this.permission.includes(`create-${asset.resource}`);
},
hasAssetPermission(asset) {
return (!asset.package || this.isPackageInstalled(asset.package))
&& this.canView(asset);
},
isPackageInstalled(packageName) {
return window.ProcessMaker?.packages?.includes(packageName);
},
Expand All @@ -211,16 +235,8 @@ export default {
}
},
hasPermission() {
return this.permission.includes("view-processes")
|| this.permission.includes("view-screens")
|| this.permission.includes("view-data-sources")
|| this.permission.includes("view-decision_tables")
|| this.permission.includes("view-scripts")
|| this.permission.includes("create-data-sources")
|| this.permission.includes("create-decision_tables")
|| this.permission.includes("create-processes")
|| this.permission.includes("create-screens")
|| this.permission.includes("create-scripts");
return [...this.assetsCore, ...this.assetsPackage, ...this.assetsPackageExtra]
.some((asset) => this.hasAssetPermission(asset));
},
},
};
Expand Down
2 changes: 1 addition & 1 deletion resources/views/designer/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div class="col-6">
<div class="row">
<div class="col-12">
<assets :permission="{{ \Auth::user()->hasPermissionsFor('processes', 'scripts', 'screens', 'data-sources', 'decision_tables') }}" />
<assets :permission="{{ \Auth::user()->hasPermissionsFor('processes', 'scripts', 'screens', 'data-sources', 'decision_tables', 'flow_genies', 'collections') }}" />
</div>
<div class="col-12">
<my-project
Expand Down
Loading