feature/FOUR-21456 added ellipsis options to add settings to bundles#7879

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.

Sign up for GitHub

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

Merged
ryancooley merged 1 commit into from
Jan 23, 2025
Merged

feature/FOUR-21456 added ellipsis options to add settings to bundles #7879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 12 additions & 1 deletion ProcessMaker/Http/Controllers/Api/DevLinkController.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -223,7 +223,7 @@ public function addAsset(Request $request, Bundle $bundle)

public function addSettings(Request $request, Bundle $bundle)
{
$bundle->addSettings($request->input('setting'), $request->input('config'));
$bundle->addSettings($request->input('setting'), $request->input('config'), $request->input('type'));
}

public function addAssetToBundles(Request $request)
Expand All@@ -238,6 +238,17 @@ public function addAssetToBundles(Request $request)
}
}

public function addSettingToBundles(Request $request)
{
$bundles = $request->input('bundles');
foreach ($bundles as $id) {
$bundle = Bundle::find($id);
if ($bundle) {
$bundle->addSettingToBundles($request->input('setting'), $request->input('config'));
}
}
}

public function sharedAssets(Request $request)
{
return Setting::Where('group', 'Devlink')->get();
Expand Down
59 changes: 53 additions & 6 deletions ProcessMaker/Models/Bundle.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
use ProcessMaker\ImportExport\Logger;
use ProcessMaker\ImportExport\Options;
use ProcessMaker\Models\ProcessMakerModel;
use ProcessMaker\Models\SettingsMenus;
use Spatie\MediaLibrary\HasMedia;
use Spatie\MediaLibrary\InteractsWithMedia;

Expand DownExpand Up@@ -138,18 +139,52 @@ public function addAsset(ProcessMakerModel $asset)
]);
}

public function addSettings($setting, $config)
public function addSettings($setting, $newId, $type = null)
{
$exists = $this->settings()->where('setting', $setting)->exists();
if ($exists) {
$this->settings()->where('setting', $setting)->update([
'config' => $config,
$existingSetting = $this->settings()->where('setting', $setting)->first();

if ($existingSetting) {
// If the config is null, do not add the new ID
if (is_null($existingSetting->config)) {
return;
}

// Decode the existing JSON
$config = json_decode($existingSetting->config, true);

// Ensure 'id' is an array
if (!isset($config['id']) || !is_array($config['id'])) {
$config['id'] = [];
}

// Add the new ID
$config['id'][] = $newId;

// Remove duplicates
$config['id'] = array_unique($config['id']);

// Update the config
$existingSetting->update([
'config' => json_encode($config),
]);
} else {
// Create a new BundleSetting with the initial ID
$config = ['id' => []];
if ($newId) {
$config['id'][] = $newId;
}

if ($type) {
$settingsMenu = SettingsMenus::where('menu_group', $setting)->first();
if ($settingsMenu) {
$config['id'] = $settingsMenu->id;
}
}

BundleSetting::create([
'bundle_id' => $this->id,
'setting' => $setting,
'config' => $config,
'config' => json_encode($config),
]);
}
}
Expand All@@ -166,6 +201,18 @@ public function addAssetToBundles(ProcessMakerModel $asset)
return $message;
}

public function addSettingToBundles($setting, $newId)
{
$message = null;
try {
$this->addSettings($setting, $newId);
} catch (ValidationException $ve) {
$message = $ve->getMessage();
}

return $message;
}

public function validateEditable()
{
if (!$this->editable()) {
Expand Down
11 changes: 7 additions & 4 deletions ProcessMaker/Models/Setting.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,7 @@ public static function messages()
*
* @param string $key
*
* @return \ProcessMaker\Models\Setting|null
* @return Setting|null
* @throws \Exception
*/
public static function byKey(string $key)
Expand DownExpand Up@@ -382,7 +382,7 @@ public static function getFavicon()
*/
public static function groupsByMenu($menuId)
{
$query = Setting::query()
$query = self::query()
->select('group')
->groupBy('group')
->where('group_id', $menuId)
Expand All@@ -409,7 +409,7 @@ public static function groupsByMenu($menuId)
*/
public static function updateSettingsGroup($settingsGroup, $id)
{
Setting::where('group', $settingsGroup)->whereNull('group_id')->chunk(
self::where('group', $settingsGroup)->whereNull('group_id')->chunk(
50,
function ($settings) use ($id) {
foreach ($settings as $setting) {
Expand All@@ -429,7 +429,7 @@ function ($settings) use ($id) {
*/
public static function updateAllSettingsGroupId()
{
Setting::whereNull('group_id')->chunk(100, function ($settings) {
self::whereNull('group_id')->chunk(100, function ($settings) {
$defaultId = SettingsMenus::EMAIL_MENU_GROUP;
foreach ($settings as $setting) {
// Define the value of 'menu_group' based on 'group'
Expand DownExpand Up@@ -466,6 +466,9 @@ public static function updateAllSettingsGroupId()
case 'System': // System not related with settings menu
$id = null;
break;
case 'Devlink':
$id = null;
break;
default: // The default value
if (preg_match('/^Email Server/', $setting->group)) {
$id = SettingsMenus::getId(SettingsMenus::EMAIL_MENU_GROUP);
Expand Down
11 changes: 9 additions & 2 deletions resources/js/admin/auth-clients/components/AuthClientsListing.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
@navigate="onNavigate"
:actions="actions"
:data="props.rowData"
:permission="permission"
:divider="true"
/>
</template>
Expand All@@ -46,6 +47,10 @@
{{ props.rowData.secret.substr(0, 10) }}...
</template>
</vuetable>
<add-to-bundle
asset-type="auth_clients"
:setting="true"
/>
<pagination
:single="$t('Auth Client')"
:plural="$t('Auth Clients')"
Expand All@@ -63,13 +68,14 @@
import datatableMixin from "../../../components/common/mixins/datatable";
import dataLoadingMixin from "../../../components/common/mixins/apiDataLoading";
import EllipsisMenu from "../../../components/shared/EllipsisMenu.vue";
import AddToBundle from "../../../components/shared/AddToBundle.vue";
import { createUniqIdsMixin } from "vue-uniq-ids";
const uniqIdsMixin = createUniqIdsMixin();

export default {
components: {EllipsisMenu},
components: {EllipsisMenu, AddToBundle},
mixins: [datatableMixin, dataLoadingMixin, uniqIdsMixin],
props: ["filter"],
props: ["filter", "permission"],
data() {
return {
copytext: "",
Expand All@@ -82,6 +88,7 @@ export default {
],
actions: [
{ value: "edit-item", content: "Edit Auth Client", icon: "fas fa-pen-square", ariaDescribedBy: 'data.id'},
{ value: "add-to-bundle", content: "Add to Bundle", icon: "fas fa-folder-plus", permission: "admin", emit_on_root: 'add-to-bundle'},
{ value: "delete-item", content: "Delete Auth Client", icon: "fas fa-trash-alt", ariaDescribedBy: 'data.id'},
],
fields: [
Expand Down
9 changes: 7 additions & 2 deletions resources/js/admin/devlink/components/BundleConfigurations.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,10 @@
:checked="!!isInSettings(config)"
switch
@change="$emit('config-change', {
key: config.type,
key: config.type,
value: $event,
settingId: isInSettings(config)?.id
settingId: isInSettings(config)?.id,
type: props.type
})"
/>
</div>
Expand All@@ -46,6 +47,10 @@ const props = defineProps({
title: {
type: String,
required: true
},
type: {
type: String,
required: false
}
});

Expand Down
2 changes: 2 additions & 0 deletions resources/js/admin/devlink/components/BundleDetail.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@
:values="bundle.settings"
@config-change="handleConfigChange"
title="Settings"
type="settings"
/>

<BundleModal
Expand DownExpand Up@@ -184,6 +185,7 @@ const handleConfigChange = (event) => {
ProcessMaker.apiClient.post(`devlink/local-bundles/${bundle.value.id}/add-settings`, {
setting: event.key,
config: null,
type: event.type,
})
.then(() => {
loadAssets();
Expand Down
12 changes: 8 additions & 4 deletions resources/js/admin/devlink/components/platformConfigurations.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,12 +16,16 @@ export default [
name: "UI Settings",
},
{
type: "script_executors",
name: "Script Executors",
type: "ui_dashboards",
name: "Dashboards",
},
{
type: "ui_menus",
name: "Menus",
},
{
type: "analytics_settings",
name: "Analytics Settings",
type: "script_executors",
name: "Script Executors",
},
{
type: "public_files",
Expand Down
8 changes: 4 additions & 4 deletions resources/js/admin/devlink/components/settings.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
export default [
{
type: "email_settings",
type: "Email",
name: "Email Settings",
},
{
type: "log-in_auth",
type: "Log-In & Auth",
name: "Log-in & Auth",
},
{
type: "user_settings",
type: "User Settings",
name: "User Settings",
},
{
type: "integrations",
type: "Integrations",
name: "Integrations",
},
];
8 changes: 7 additions & 1 deletion resources/js/admin/groups/components/GroupsListing.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,10 @@
/>
</template>
</vuetable>
<add-to-bundle
asset-type="groups"
:setting="true"
/>
<pagination
:single="$t('Group')"
:plural="$t('Groups')"
Expand All@@ -49,11 +53,12 @@
import datatableMixin from "../../../components/common/mixins/datatable";
import dataLoadingMixin from "../../../components/common/mixins/apiDataLoading";
import EllipsisMenu from "../../../components/shared/EllipsisMenu.vue";
import AddToBundle from "../../../components/shared/AddToBundle.vue";
import { createUniqIdsMixin } from "vue-uniq-ids";
const uniqIdsMixin = createUniqIdsMixin();

export default {
components: {EllipsisMenu},
components: {EllipsisMenu, AddToBundle},
mixins: [datatableMixin, dataLoadingMixin, uniqIdsMixin],
props: ["filter", "permission"],
data() {
Expand All@@ -69,6 +74,7 @@ export default {
],
actions: [
{ value: "edit-item", content: "Edit Group", link: true, href: '/admin/groups/{{id}}/edit', icon: "fas fa-pen-square", permission:'edit-groups', ariaDescribedBy: 'data.id'},
{ value: "add-to-bundle", content: "Add to Bundle", icon: "fas fa-folder-plus", permission: "admin", emit_on_root: 'add-to-bundle'},
{ value: "delete-item", content: "Delete Group", icon: "fas fa-trash-alt", permission: 'delete-groups', ariaDescribedBy: 'data.id'},
],
fields: [
Expand Down
18 changes: 18 additions & 0 deletions resources/js/admin/script-executors/ScriptExecutors.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,10 +53,23 @@
>
<i class="fas fa-trash-alt fa-lg fa-fw"></i>
</b-btn>
<b-btn
variant="link"
@click="onAddToBundle(props.rowData)"
v-b-tooltip.hover
:title="$t('Add to Bundle')"
v-uni-aria-describedby="props.rowData.id.toString()"
>
<i class="fas fa-folder-plus fa-lg fa-fw"></i>
</b-btn>
</div>
</div>
</template>
</vuetable>
<add-to-bundle
asset-type="script_executors"
:setting="true"
/>
<pagination
:single="$t('Script Executor')"
:plural="$t('Script Executors')"
Expand DownExpand Up@@ -221,11 +234,13 @@
<script>
import datatableMixin from "../../components/common/mixins/datatable";
import dataLoadingMixin from "../../components/common/mixins/apiDataLoading";
import AddToBundle from "../../components/shared/AddToBundle.vue";
import { createUniqIdsMixin } from "vue-uniq-ids";
const uniqIdsMixin = createUniqIdsMixin();

export default {
mixins: [datatableMixin, dataLoadingMixin, uniqIdsMixin],
components: { AddToBundle },
props: ["filter", "permission"],
data() {
return {
Expand DownExpand Up@@ -508,6 +523,9 @@ export default {
this.loading = false;
});
},
onAddToBundle(data) {
this.$root.$emit('add-to-bundle', data);
},
},
};
</script>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
feature/FOUR-21456 added ellipsis options to add settings to bundles#7879

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.

 Sign up for GitHub

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

 Merged

ryancooley
merged 1 commit into

from

Jan 23, 2025
 Merged


feature/FOUR-21456 added ellipsis options to add settings to bundles
#7879
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


13 changes: 12 additions & 1 deletion
ProcessMaker/Http/Controllers/Api/DevLinkController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -223,7 +223,7 @@ public function addAsset(Request $request, Bundle $bundle)

 public function addSettings(Request $request, Bundle $bundle)
 {
 $bundle->addSettings($request->input('setting'), $request->input('config'));
 $bundle->addSettings($request->input('setting'), $request->input('config'), $request->input('type'));
 }

 public function addAssetToBundles(Request $request)
Expand All@@ -238,6 +238,17 @@ public function addAssetToBundles(Request $request)
 }
 }

 public function addSettingToBundles(Request $request)
 {
 $bundles = $request->input('bundles');
 foreach ($bundles as $id) {
 $bundle = Bundle::find($id);
 if ($bundle) {
 $bundle->addSettingToBundles($request->input('setting'), $request->input('config'));
 }
 }
 }

 public function sharedAssets(Request $request)
 {
 return Setting::Where('group', 'Devlink')->get();
Expand Down

59 changes: 53 additions & 6 deletions
ProcessMaker/Models/Bundle.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
use ProcessMaker\ImportExport\Logger;
use ProcessMaker\ImportExport\Options;
use ProcessMaker\Models\ProcessMakerModel;
use ProcessMaker\Models\SettingsMenus;
use Spatie\MediaLibrary\HasMedia;
use Spatie\MediaLibrary\InteractsWithMedia;

Expand DownExpand Up@@ -138,18 +139,52 @@ public function addAsset(ProcessMakerModel $asset)
 ]);
 }

 public function addSettings($setting, $config)
 public function addSettings($setting, $newId, $type = null)
 {
 $exists = $this->settings()->where('setting', $setting)->exists();
 if ($exists) {
 $this->settings()->where('setting', $setting)->update([
 'config' => $config,
 $existingSetting = $this->settings()->where('setting', $setting)->first();

 if ($existingSetting) {
 // If the config is null, do not add the new ID
 if (is_null($existingSetting->config)) {
 return;
 }

 // Decode the existing JSON
 $config = json_decode($existingSetting->config, true);

 // Ensure 'id' is an array
 if (!isset($config['id']) || !is_array($config['id'])) {
 $config['id'] = [];
 }

 // Add the new ID
 $config['id'][] = $newId;

 // Remove duplicates
 $config['id'] = array_unique($config['id']);

 // Update the config
 $existingSetting->update([
 'config' => json_encode($config),
 ]);
 } else {
 // Create a new BundleSetting with the initial ID
 $config = ['id' => []];
 if ($newId) {
 $config['id'][] = $newId;
 }

 if ($type) {
 $settingsMenu = SettingsMenus::where('menu_group', $setting)->first();
 if ($settingsMenu) {
 $config['id'] = $settingsMenu->id;
 }
 }

 BundleSetting::create([
 'bundle_id' => $this->id,
 'setting' => $setting,
 'config' => $config,
 'config' => json_encode($config),
 ]);
 }
 }
Expand All@@ -166,6 +201,18 @@ public function addAssetToBundles(ProcessMakerModel $asset)
 return $message;
 }

 public function addSettingToBundles($setting, $newId)
 {
 $message = null;
 try {
 $this->addSettings($setting, $newId);
 } catch (ValidationException $ve) {
 $message = $ve->getMessage();
 }

 return $message;
 }

 public function validateEditable()
 {
 if (!$this->editable()) {
Expand Down

11 changes: 7 additions & 4 deletions
ProcessMaker/Models/Setting.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,7 @@ public static function messages()
 *
 * @param string $key
 *
 * @return \ProcessMaker\Models\Setting|null
 * @return Setting|null
 * @throws \Exception
 */
 public static function byKey(string $key)
Expand DownExpand Up@@ -382,7 +382,7 @@ public static function getFavicon()
 */
 public static function groupsByMenu($menuId)
 {
 $query = Setting::query()
 $query = self::query()
 ->select('group')
 ->groupBy('group')
 ->where('group_id', $menuId)
Expand All@@ -409,7 +409,7 @@ public static function groupsByMenu($menuId)
 */
 public static function updateSettingsGroup($settingsGroup, $id)
 {
Setting::where('group', $settingsGroup)->whereNull('group_id')->chunk(
self::where('group', $settingsGroup)->whereNull('group_id')->chunk(
 50,
 function ($settings) use ($id) {
 foreach ($settings as $setting) {
Expand All@@ -429,7 +429,7 @@ function ($settings) use ($id) {
 */
 public static function updateAllSettingsGroupId()
 {
Setting::whereNull('group_id')->chunk(100, function ($settings) {
self::whereNull('group_id')->chunk(100, function ($settings) {
 $defaultId = SettingsMenus::EMAIL_MENU_GROUP;
 foreach ($settings as $setting) {
 // Define the value of 'menu_group' based on 'group'
Expand DownExpand Up@@ -466,6 +466,9 @@ public static function updateAllSettingsGroupId()
 case 'System': // System not related with settings menu
 $id = null;
 break;
 case 'Devlink':
 $id = null;
 break;
 default: // The default value
 if (preg_match('/^Email Server/', $setting->group)) {
 $id = SettingsMenus::getId(SettingsMenus::EMAIL_MENU_GROUP);
Expand Down

11 changes: 9 additions & 2 deletions
resources/js/admin/auth-clients/components/AuthClientsListing.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
 @navigate="onNavigate"
 :actions="actions"
 :data="props.rowData"
 :permission="permission"
 :divider="true"
 />
 </template>
Expand All@@ -46,6 +47,10 @@
 {{ props.rowData.secret.substr(0, 10) }}...
 </template>
 </vuetable>
 <add-to-bundle
 asset-type="auth_clients"
 :setting="true"
 />
 <pagination
 :single="$t('Auth Client')"
 :plural="$t('Auth Clients')"
Expand All@@ -63,13 +68,14 @@
import datatableMixin from "../../../components/common/mixins/datatable";
import dataLoadingMixin from "../../../components/common/mixins/apiDataLoading";
import EllipsisMenu from "../../../components/shared/EllipsisMenu.vue";
import AddToBundle from "../../../components/shared/AddToBundle.vue";
import { createUniqIdsMixin } from "vue-uniq-ids";
const uniqIdsMixin = createUniqIdsMixin();

export default {
 components: {EllipsisMenu},
 components: {EllipsisMenu, AddToBundle},
 mixins: [datatableMixin, dataLoadingMixin, uniqIdsMixin],
 props: ["filter"],
 props: ["filter", "permission"],
 data() {
 return {
 copytext: "",
Expand All@@ -82,6 +88,7 @@ export default {
 ],
 actions: [
 { value: "edit-item", content: "Edit Auth Client", icon: "fas fa-pen-square", ariaDescribedBy: 'data.id'},
 { value: "add-to-bundle", content: "Add to Bundle", icon: "fas fa-folder-plus", permission: "admin", emit_on_root: 'add-to-bundle'},
 { value: "delete-item", content: "Delete Auth Client", icon: "fas fa-trash-alt", ariaDescribedBy: 'data.id'},
 ],
 fields: [
Expand Down

9 changes: 7 additions & 2 deletions
resources/js/admin/devlink/components/BundleConfigurations.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,10 @@
 :checked="!!isInSettings(config)"
 switch
 @change="$emit('config-change', { 
 key: config.type,
 key: config.type,
 value: $event,
 settingId: isInSettings(config)?.id
 settingId: isInSettings(config)?.id,
 type: props.type
 })"
 />
 </div>
Expand All@@ -46,6 +47,10 @@ const props = defineProps({
 title: {
 type: String,
 required: true
 },
 type: {
 type: String,
 required: false
 }
});

Expand Down

2 changes: 2 additions & 0 deletions
resources/js/admin/devlink/components/BundleDetail.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@
 :values="bundle.settings"
 @config-change="handleConfigChange"
 title="Settings"
 type="settings"
 />

 <BundleModal
Expand DownExpand Up@@ -184,6 +185,7 @@ const handleConfigChange = (event) => {
 ProcessMaker.apiClient.post(`devlink/local-bundles/${bundle.value.id}/add-settings`, {
 setting: event.key,
 config: null,
 type: event.type,
 })
 .then(() => {
 loadAssets();
Expand Down

12 changes: 8 additions & 4 deletions
resources/js/admin/devlink/components/platformConfigurations.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,12 +16,16 @@ export default [
 name: "UI Settings",
 },
 {
 type: "script_executors",
 name: "Script Executors",
 type: "ui_dashboards",
 name: "Dashboards",
 },
 {
 type: "ui_menus",
 name: "Menus",
 },
 {
 type: "analytics_settings",
 name: "Analytics Settings",
 type: "script_executors",
 name: "Script Executors",
 },
 {
 type: "public_files",
Expand Down

8 changes: 4 additions & 4 deletions
resources/js/admin/devlink/components/settings.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
export default [
 {
 type: "email_settings",
 type: "Email",
 name: "Email Settings",
 },
 {
 type: "log-in_auth",
 type: "Log-In & Auth",
 name: "Log-in & Auth",
 },
 {
 type: "user_settings",
 type: "User Settings",
 name: "User Settings",
 },
 {
 type: "integrations",
 type: "Integrations",
 name: "Integrations",
 },
];

8 changes: 7 additions & 1 deletion
resources/js/admin/groups/components/GroupsListing.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,10 @@
 />
 </template>
 </vuetable>
 <add-to-bundle
 asset-type="groups"
 :setting="true"
 />
 <pagination
 :single="$t('Group')"
 :plural="$t('Groups')"
Expand All@@ -49,11 +53,12 @@
import datatableMixin from "../../../components/common/mixins/datatable";
import dataLoadingMixin from "../../../components/common/mixins/apiDataLoading";
import EllipsisMenu from "../../../components/shared/EllipsisMenu.vue";
import AddToBundle from "../../../components/shared/AddToBundle.vue";
import { createUniqIdsMixin } from "vue-uniq-ids";
const uniqIdsMixin = createUniqIdsMixin();

export default {
 components: {EllipsisMenu},
 components: {EllipsisMenu, AddToBundle},
 mixins: [datatableMixin, dataLoadingMixin, uniqIdsMixin],
 props: ["filter", "permission"],
 data() {
Expand All@@ -69,6 +74,7 @@ export default {
 ],
 actions: [
 { value: "edit-item", content: "Edit Group", link: true, href: '/admin/groups/{{id}}/edit', icon: "fas fa-pen-square", permission:'edit-groups', ariaDescribedBy: 'data.id'},
 { value: "add-to-bundle", content: "Add to Bundle", icon: "fas fa-folder-plus", permission: "admin", emit_on_root: 'add-to-bundle'},
 { value: "delete-item", content: "Delete Group", icon: "fas fa-trash-alt", permission: 'delete-groups', ariaDescribedBy: 'data.id'},
 ],
 fields: [
Expand Down

18 changes: 18 additions & 0 deletions
resources/js/admin/script-executors/ScriptExecutors.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,10 +53,23 @@
 >
 <i class="fas fa-trash-alt fa-lg fa-fw"></i>
 </b-btn>
 <b-btn
 variant="link"
 @click="onAddToBundle(props.rowData)"
 v-b-tooltip.hover
 :title="$t('Add to Bundle')"
 v-uni-aria-describedby="props.rowData.id.toString()"
 >
 <i class="fas fa-folder-plus fa-lg fa-fw"></i>
 </b-btn>
 </div>
 </div>
 </template>
 </vuetable>
 <add-to-bundle
 asset-type="script_executors"
 :setting="true"
 />
 <pagination
 :single="$t('Script Executor')"
 :plural="$t('Script Executors')"
Expand DownExpand Up@@ -221,11 +234,13 @@
<script>
import datatableMixin from "../../components/common/mixins/datatable";
import dataLoadingMixin from "../../components/common/mixins/apiDataLoading";
import AddToBundle from "../../components/shared/AddToBundle.vue";
import { createUniqIdsMixin } from "vue-uniq-ids";
const uniqIdsMixin = createUniqIdsMixin();

export default {
 mixins: [datatableMixin, dataLoadingMixin, uniqIdsMixin],
 components: { AddToBundle },
 props: ["filter", "permission"],
 data() {
 return {
Expand DownExpand Up@@ -508,6 +523,9 @@ export default {
 this.loading = false;
 });
 },
 onAddToBundle(data) {
 this.$root.$emit('add-to-bundle', data);
 },
 },
};
</script>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feature/FOUR-21456 added ellipsis options to add settings to bundles#7879

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.

 Sign up for GitHub

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

 Merged

ryancooley
merged 1 commit into

from

Jan 23, 2025
 Merged


feature/FOUR-21456 added ellipsis options to add settings to bundles
#7879
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


13 changes: 12 additions & 1 deletion
ProcessMaker/Http/Controllers/Api/DevLinkController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -223,7 +223,7 @@ public function addAsset(Request $request, Bundle $bundle)

 public function addSettings(Request $request, Bundle $bundle)
 {
 $bundle->addSettings($request->input('setting'), $request->input('config'));
 $bundle->addSettings($request->input('setting'), $request->input('config'), $request->input('type'));
 }

 public function addAssetToBundles(Request $request)
Expand All@@ -238,6 +238,17 @@ public function addAssetToBundles(Request $request)
 }
 }

 public function addSettingToBundles(Request $request)
 {
 $bundles = $request->input('bundles');
 foreach ($bundles as $id) {
 $bundle = Bundle::find($id);
 if ($bundle) {
 $bundle->addSettingToBundles($request->input('setting'), $request->input('config'));
 }
 }
 }

 public function sharedAssets(Request $request)
 {
 return Setting::Where('group', 'Devlink')->get();
Expand Down

59 changes: 53 additions & 6 deletions
ProcessMaker/Models/Bundle.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
use ProcessMaker\ImportExport\Logger;
use ProcessMaker\ImportExport\Options;
use ProcessMaker\Models\ProcessMakerModel;
use ProcessMaker\Models\SettingsMenus;
use Spatie\MediaLibrary\HasMedia;
use Spatie\MediaLibrary\InteractsWithMedia;

Expand DownExpand Up@@ -138,18 +139,52 @@ public function addAsset(ProcessMakerModel $asset)
 ]);
 }

 public function addSettings($setting, $config)
 public function addSettings($setting, $newId, $type = null)
 {
 $exists = $this->settings()->where('setting', $setting)->exists();
 if ($exists) {
 $this->settings()->where('setting', $setting)->update([
 'config' => $config,
 $existingSetting = $this->settings()->where('setting', $setting)->first();

 if ($existingSetting) {
 // If the config is null, do not add the new ID
 if (is_null($existingSetting->config)) {
 return;
 }

 // Decode the existing JSON
 $config = json_decode($existingSetting->config, true);

 // Ensure 'id' is an array
 if (!isset($config['id']) || !is_array($config['id'])) {
 $config['id'] = [];
 }

 // Add the new ID
 $config['id'][] = $newId;

 // Remove duplicates
 $config['id'] = array_unique($config['id']);

 // Update the config
 $existingSetting->update([
 'config' => json_encode($config),
 ]);
 } else {
 // Create a new BundleSetting with the initial ID
 $config = ['id' => []];
 if ($newId) {
 $config['id'][] = $newId;
 }

 if ($type) {
 $settingsMenu = SettingsMenus::where('menu_group', $setting)->first();
 if ($settingsMenu) {
 $config['id'] = $settingsMenu->id;
 }
 }

 BundleSetting::create([
 'bundle_id' => $this->id,
 'setting' => $setting,
 'config' => $config,
 'config' => json_encode($config),
 ]);
 }
 }
Expand All@@ -166,6 +201,18 @@ public function addAssetToBundles(ProcessMakerModel $asset)
 return $message;
 }

 public function addSettingToBundles($setting, $newId)
 {
 $message = null;
 try {
 $this->addSettings($setting, $newId);
 } catch (ValidationException $ve) {
 $message = $ve->getMessage();
 }

 return $message;
 }

 public function validateEditable()
 {
 if (!$this->editable()) {
Expand Down

11 changes: 7 additions & 4 deletions
ProcessMaker/Models/Setting.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,7 @@ public static function messages()
 *
 * @param string $key
 *
 * @return \ProcessMaker\Models\Setting|null
 * @return Setting|null
 * @throws \Exception
 */
 public static function byKey(string $key)
Expand DownExpand Up@@ -382,7 +382,7 @@ public static function getFavicon()
 */
 public static function groupsByMenu($menuId)
 {
 $query = Setting::query()
 $query = self::query()
 ->select('group')
 ->groupBy('group')
 ->where('group_id', $menuId)
Expand All@@ -409,7 +409,7 @@ public static function groupsByMenu($menuId)
 */
 public static function updateSettingsGroup($settingsGroup, $id)
 {
Setting::where('group', $settingsGroup)->whereNull('group_id')->chunk(
self::where('group', $settingsGroup)->whereNull('group_id')->chunk(
 50,
 function ($settings) use ($id) {
 foreach ($settings as $setting) {
Expand All@@ -429,7 +429,7 @@ function ($settings) use ($id) {
 */
 public static function updateAllSettingsGroupId()
 {
Setting::whereNull('group_id')->chunk(100, function ($settings) {
self::whereNull('group_id')->chunk(100, function ($settings) {
 $defaultId = SettingsMenus::EMAIL_MENU_GROUP;
 foreach ($settings as $setting) {
 // Define the value of 'menu_group' based on 'group'
Expand DownExpand Up@@ -466,6 +466,9 @@ public static function updateAllSettingsGroupId()
 case 'System': // System not related with settings menu
 $id = null;
 break;
 case 'Devlink':
 $id = null;
 break;
 default: // The default value
 if (preg_match('/^Email Server/', $setting->group)) {
 $id = SettingsMenus::getId(SettingsMenus::EMAIL_MENU_GROUP);
Expand Down

11 changes: 9 additions & 2 deletions
resources/js/admin/auth-clients/components/AuthClientsListing.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
 @navigate="onNavigate"
 :actions="actions"
 :data="props.rowData"
 :permission="permission"
 :divider="true"
 />
 </template>
Expand All@@ -46,6 +47,10 @@
 {{ props.rowData.secret.substr(0, 10) }}...
 </template>
 </vuetable>
 <add-to-bundle
 asset-type="auth_clients"
 :setting="true"
 />
 <pagination
 :single="$t('Auth Client')"
 :plural="$t('Auth Clients')"
Expand All@@ -63,13 +68,14 @@
import datatableMixin from "../../../components/common/mixins/datatable";
import dataLoadingMixin from "../../../components/common/mixins/apiDataLoading";
import EllipsisMenu from "../../../components/shared/EllipsisMenu.vue";
import AddToBundle from "../../../components/shared/AddToBundle.vue";
import { createUniqIdsMixin } from "vue-uniq-ids";
const uniqIdsMixin = createUniqIdsMixin();

export default {
 components: {EllipsisMenu},
 components: {EllipsisMenu, AddToBundle},
 mixins: [datatableMixin, dataLoadingMixin, uniqIdsMixin],
 props: ["filter"],
 props: ["filter", "permission"],
 data() {
 return {
 copytext: "",
Expand All@@ -82,6 +88,7 @@ export default {
 ],
 actions: [
 { value: "edit-item", content: "Edit Auth Client", icon: "fas fa-pen-square", ariaDescribedBy: 'data.id'},
 { value: "add-to-bundle", content: "Add to Bundle", icon: "fas fa-folder-plus", permission: "admin", emit_on_root: 'add-to-bundle'},
 { value: "delete-item", content: "Delete Auth Client", icon: "fas fa-trash-alt", ariaDescribedBy: 'data.id'},
 ],
 fields: [
Expand Down

9 changes: 7 additions & 2 deletions
resources/js/admin/devlink/components/BundleConfigurations.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,10 @@
 :checked="!!isInSettings(config)"
 switch
 @change="$emit('config-change', { 
 key: config.type,
 key: config.type,
 value: $event,
 settingId: isInSettings(config)?.id
 settingId: isInSettings(config)?.id,
 type: props.type
 })"
 />
 </div>
Expand All@@ -46,6 +47,10 @@ const props = defineProps({
 title: {
 type: String,
 required: true
 },
 type: {
 type: String,
 required: false
 }
});

Expand Down

2 changes: 2 additions & 0 deletions
resources/js/admin/devlink/components/BundleDetail.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@
 :values="bundle.settings"
 @config-change="handleConfigChange"
 title="Settings"
 type="settings"
 />

 <BundleModal
Expand DownExpand Up@@ -184,6 +185,7 @@ const handleConfigChange = (event) => {
 ProcessMaker.apiClient.post(`devlink/local-bundles/${bundle.value.id}/add-settings`, {
 setting: event.key,
 config: null,
 type: event.type,
 })
 .then(() => {
 loadAssets();
Expand Down

12 changes: 8 additions & 4 deletions
resources/js/admin/devlink/components/platformConfigurations.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,12 +16,16 @@ export default [
 name: "UI Settings",
 },
 {
 type: "script_executors",
 name: "Script Executors",
 type: "ui_dashboards",
 name: "Dashboards",
 },
 {
 type: "ui_menus",
 name: "Menus",
 },
 {
 type: "analytics_settings",
 name: "Analytics Settings",
 type: "script_executors",
 name: "Script Executors",
 },
 {
 type: "public_files",
Expand Down

8 changes: 4 additions & 4 deletions
resources/js/admin/devlink/components/settings.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
export default [
 {
 type: "email_settings",
 type: "Email",
 name: "Email Settings",
 },
 {
 type: "log-in_auth",
 type: "Log-In & Auth",
 name: "Log-in & Auth",
 },
 {
 type: "user_settings",
 type: "User Settings",
 name: "User Settings",
 },
 {
 type: "integrations",
 type: "Integrations",
 name: "Integrations",
 },
];

8 changes: 7 additions & 1 deletion
resources/js/admin/groups/components/GroupsListing.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,10 @@
 />
 </template>
 </vuetable>
 <add-to-bundle
 asset-type="groups"
 :setting="true"
 />
 <pagination
 :single="$t('Group')"
 :plural="$t('Groups')"
Expand All@@ -49,11 +53,12 @@
import datatableMixin from "../../../components/common/mixins/datatable";
import dataLoadingMixin from "../../../components/common/mixins/apiDataLoading";
import EllipsisMenu from "../../../components/shared/EllipsisMenu.vue";
import AddToBundle from "../../../components/shared/AddToBundle.vue";
import { createUniqIdsMixin } from "vue-uniq-ids";
const uniqIdsMixin = createUniqIdsMixin();

export default {
 components: {EllipsisMenu},
 components: {EllipsisMenu, AddToBundle},
 mixins: [datatableMixin, dataLoadingMixin, uniqIdsMixin],
 props: ["filter", "permission"],
 data() {
Expand All@@ -69,6 +74,7 @@ export default {
 ],
 actions: [
 { value: "edit-item", content: "Edit Group", link: true, href: '/admin/groups/{{id}}/edit', icon: "fas fa-pen-square", permission:'edit-groups', ariaDescribedBy: 'data.id'},
 { value: "add-to-bundle", content: "Add to Bundle", icon: "fas fa-folder-plus", permission: "admin", emit_on_root: 'add-to-bundle'},
 { value: "delete-item", content: "Delete Group", icon: "fas fa-trash-alt", permission: 'delete-groups', ariaDescribedBy: 'data.id'},
 ],
 fields: [
Expand Down

18 changes: 18 additions & 0 deletions
resources/js/admin/script-executors/ScriptExecutors.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,10 +53,23 @@
 >
 <i class="fas fa-trash-alt fa-lg fa-fw"></i>
 </b-btn>
 <b-btn
 variant="link"
 @click="onAddToBundle(props.rowData)"
 v-b-tooltip.hover
 :title="$t('Add to Bundle')"
 v-uni-aria-describedby="props.rowData.id.toString()"
 >
 <i class="fas fa-folder-plus fa-lg fa-fw"></i>
 </b-btn>
 </div>
 </div>
 </template>
 </vuetable>
 <add-to-bundle
 asset-type="script_executors"
 :setting="true"
 />
 <pagination
 :single="$t('Script Executor')"
 :plural="$t('Script Executors')"
Expand DownExpand Up@@ -221,11 +234,13 @@
<script>
import datatableMixin from "../../components/common/mixins/datatable";
import dataLoadingMixin from "../../components/common/mixins/apiDataLoading";
import AddToBundle from "../../components/shared/AddToBundle.vue";
import { createUniqIdsMixin } from "vue-uniq-ids";
const uniqIdsMixin = createUniqIdsMixin();

export default {
 mixins: [datatableMixin, dataLoadingMixin, uniqIdsMixin],
 components: { AddToBundle },
 props: ["filter", "permission"],
 data() {
 return {
Expand DownExpand Up@@ -508,6 +523,9 @@ export default {
 this.loading = false;
 });
 },
 onAddToBundle(data) {
 this.$root.$emit('add-to-bundle', data);
 },
 },
};
</script>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feature/FOUR-21456 added ellipsis options to add settings to bundles#7879

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.

 Sign up for GitHub

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

 Merged

ryancooley
merged 1 commit into

from

Jan 23, 2025
 Merged


feature/FOUR-21456 added ellipsis options to add settings to bundles
#7879
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


13 changes: 12 additions & 1 deletion
ProcessMaker/Http/Controllers/Api/DevLinkController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -223,7 +223,7 @@ public function addAsset(Request $request, Bundle $bundle)

 public function addSettings(Request $request, Bundle $bundle)
 {
 $bundle->addSettings($request->input('setting'), $request->input('config'));
 $bundle->addSettings($request->input('setting'), $request->input('config'), $request->input('type'));
 }

 public function addAssetToBundles(Request $request)
Expand All@@ -238,6 +238,17 @@ public function addAssetToBundles(Request $request)
 }
 }

 public function addSettingToBundles(Request $request)
 {
 $bundles = $request->input('bundles');
 foreach ($bundles as $id) {
 $bundle = Bundle::find($id);
 if ($bundle) {
 $bundle->addSettingToBundles($request->input('setting'), $request->input('config'));
 }
 }
 }

 public function sharedAssets(Request $request)
 {
 return Setting::Where('group', 'Devlink')->get();
Expand Down

59 changes: 53 additions & 6 deletions
ProcessMaker/Models/Bundle.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
use ProcessMaker\ImportExport\Logger;
use ProcessMaker\ImportExport\Options;
use ProcessMaker\Models\ProcessMakerModel;
use ProcessMaker\Models\SettingsMenus;
use Spatie\MediaLibrary\HasMedia;
use Spatie\MediaLibrary\InteractsWithMedia;

Expand DownExpand Up@@ -138,18 +139,52 @@ public function addAsset(ProcessMakerModel $asset)
 ]);
 }

 public function addSettings($setting, $config)
 public function addSettings($setting, $newId, $type = null)
 {
 $exists = $this->settings()->where('setting', $setting)->exists();
 if ($exists) {
 $this->settings()->where('setting', $setting)->update([
 'config' => $config,
 $existingSetting = $this->settings()->where('setting', $setting)->first();

 if ($existingSetting) {
 // If the config is null, do not add the new ID
 if (is_null($existingSetting->config)) {
 return;
 }

 // Decode the existing JSON
 $config = json_decode($existingSetting->config, true);

 // Ensure 'id' is an array
 if (!isset($config['id']) || !is_array($config['id'])) {
 $config['id'] = [];
 }

 // Add the new ID
 $config['id'][] = $newId;

 // Remove duplicates
 $config['id'] = array_unique($config['id']);

 // Update the config
 $existingSetting->update([
 'config' => json_encode($config),
 ]);
 } else {
 // Create a new BundleSetting with the initial ID
 $config = ['id' => []];
 if ($newId) {
 $config['id'][] = $newId;
 }

 if ($type) {
 $settingsMenu = SettingsMenus::where('menu_group', $setting)->first();
 if ($settingsMenu) {
 $config['id'] = $settingsMenu->id;
 }
 }

 BundleSetting::create([
 'bundle_id' => $this->id,
 'setting' => $setting,
 'config' => $config,
 'config' => json_encode($config),
 ]);
 }
 }
Expand All@@ -166,6 +201,18 @@ public function addAssetToBundles(ProcessMakerModel $asset)
 return $message;
 }

 public function addSettingToBundles($setting, $newId)
 {
 $message = null;
 try {
 $this->addSettings($setting, $newId);
 } catch (ValidationException $ve) {
 $message = $ve->getMessage();
 }

 return $message;
 }

 public function validateEditable()
 {
 if (!$this->editable()) {
Expand Down

11 changes: 7 additions & 4 deletions
ProcessMaker/Models/Setting.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,7 @@ public static function messages()
 *
 * @param string $key
 *
 * @return \ProcessMaker\Models\Setting|null
 * @return Setting|null
 * @throws \Exception
 */
 public static function byKey(string $key)
Expand DownExpand Up@@ -382,7 +382,7 @@ public static function getFavicon()
 */
 public static function groupsByMenu($menuId)
 {
 $query = Setting::query()
 $query = self::query()
 ->select('group')
 ->groupBy('group')
 ->where('group_id', $menuId)
Expand All@@ -409,7 +409,7 @@ public static function groupsByMenu($menuId)
 */
 public static function updateSettingsGroup($settingsGroup, $id)
 {
Setting::where('group', $settingsGroup)->whereNull('group_id')->chunk(
self::where('group', $settingsGroup)->whereNull('group_id')->chunk(
 50,
 function ($settings) use ($id) {
 foreach ($settings as $setting) {
Expand All@@ -429,7 +429,7 @@ function ($settings) use ($id) {
 */
 public static function updateAllSettingsGroupId()
 {
Setting::whereNull('group_id')->chunk(100, function ($settings) {
self::whereNull('group_id')->chunk(100, function ($settings) {
 $defaultId = SettingsMenus::EMAIL_MENU_GROUP;
 foreach ($settings as $setting) {
 // Define the value of 'menu_group' based on 'group'
Expand DownExpand Up@@ -466,6 +466,9 @@ public static function updateAllSettingsGroupId()
 case 'System': // System not related with settings menu
 $id = null;
 break;
 case 'Devlink':
 $id = null;
 break;
 default: // The default value
 if (preg_match('/^Email Server/', $setting->group)) {
 $id = SettingsMenus::getId(SettingsMenus::EMAIL_MENU_GROUP);
Expand Down

11 changes: 9 additions & 2 deletions
resources/js/admin/auth-clients/components/AuthClientsListing.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
 @navigate="onNavigate"
 :actions="actions"
 :data="props.rowData"
 :permission="permission"
 :divider="true"
 />
 </template>
Expand All@@ -46,6 +47,10 @@
 {{ props.rowData.secret.substr(0, 10) }}...
 </template>
 </vuetable>
 <add-to-bundle
 asset-type="auth_clients"
 :setting="true"
 />
 <pagination
 :single="$t('Auth Client')"
 :plural="$t('Auth Clients')"
Expand All@@ -63,13 +68,14 @@
import datatableMixin from "../../../components/common/mixins/datatable";
import dataLoadingMixin from "../../../components/common/mixins/apiDataLoading";
import EllipsisMenu from "../../../components/shared/EllipsisMenu.vue";
import AddToBundle from "../../../components/shared/AddToBundle.vue";
import { createUniqIdsMixin } from "vue-uniq-ids";
const uniqIdsMixin = createUniqIdsMixin();

export default {
 components: {EllipsisMenu},
 components: {EllipsisMenu, AddToBundle},
 mixins: [datatableMixin, dataLoadingMixin, uniqIdsMixin],
 props: ["filter"],
 props: ["filter", "permission"],
 data() {
 return {
 copytext: "",
Expand All@@ -82,6 +88,7 @@ export default {
 ],
 actions: [
 { value: "edit-item", content: "Edit Auth Client", icon: "fas fa-pen-square", ariaDescribedBy: 'data.id'},
 { value: "add-to-bundle", content: "Add to Bundle", icon: "fas fa-folder-plus", permission: "admin", emit_on_root: 'add-to-bundle'},
 { value: "delete-item", content: "Delete Auth Client", icon: "fas fa-trash-alt", ariaDescribedBy: 'data.id'},
 ],
 fields: [
Expand Down

9 changes: 7 additions & 2 deletions
resources/js/admin/devlink/components/BundleConfigurations.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,10 @@
 :checked="!!isInSettings(config)"
 switch
 @change="$emit('config-change', { 
 key: config.type,
 key: config.type,
 value: $event,
 settingId: isInSettings(config)?.id
 settingId: isInSettings(config)?.id,
 type: props.type
 })"
 />
 </div>
Expand All@@ -46,6 +47,10 @@ const props = defineProps({
 title: {
 type: String,
 required: true
 },
 type: {
 type: String,
 required: false
 }
});

Expand Down

2 changes: 2 additions & 0 deletions
resources/js/admin/devlink/components/BundleDetail.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@
 :values="bundle.settings"
 @config-change="handleConfigChange"
 title="Settings"
 type="settings"
 />

 <BundleModal
Expand DownExpand Up@@ -184,6 +185,7 @@ const handleConfigChange = (event) => {
 ProcessMaker.apiClient.post(`devlink/local-bundles/${bundle.value.id}/add-settings`, {
 setting: event.key,
 config: null,
 type: event.type,
 })
 .then(() => {
 loadAssets();
Expand Down

12 changes: 8 additions & 4 deletions
resources/js/admin/devlink/components/platformConfigurations.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,12 +16,16 @@ export default [
 name: "UI Settings",
 },
 {
 type: "script_executors",
 name: "Script Executors",
 type: "ui_dashboards",
 name: "Dashboards",
 },
 {
 type: "ui_menus",
 name: "Menus",
 },
 {
 type: "analytics_settings",
 name: "Analytics Settings",
 type: "script_executors",
 name: "Script Executors",
 },
 {
 type: "public_files",
Expand Down

8 changes: 4 additions & 4 deletions
resources/js/admin/devlink/components/settings.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
export default [
 {
 type: "email_settings",
 type: "Email",
 name: "Email Settings",
 },
 {
 type: "log-in_auth",
 type: "Log-In & Auth",
 name: "Log-in & Auth",
 },
 {
 type: "user_settings",
 type: "User Settings",
 name: "User Settings",
 },
 {
 type: "integrations",
 type: "Integrations",
 name: "Integrations",
 },
];

8 changes: 7 additions & 1 deletion
resources/js/admin/groups/components/GroupsListing.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,10 @@
 />
 </template>
 </vuetable>
 <add-to-bundle
 asset-type="groups"
 :setting="true"
 />
 <pagination
 :single="$t('Group')"
 :plural="$t('Groups')"
Expand All@@ -49,11 +53,12 @@
import datatableMixin from "../../../components/common/mixins/datatable";
import dataLoadingMixin from "../../../components/common/mixins/apiDataLoading";
import EllipsisMenu from "../../../components/shared/EllipsisMenu.vue";
import AddToBundle from "../../../components/shared/AddToBundle.vue";
import { createUniqIdsMixin } from "vue-uniq-ids";
const uniqIdsMixin = createUniqIdsMixin();

export default {
 components: {EllipsisMenu},
 components: {EllipsisMenu, AddToBundle},
 mixins: [datatableMixin, dataLoadingMixin, uniqIdsMixin],
 props: ["filter", "permission"],
 data() {
Expand All@@ -69,6 +74,7 @@ export default {
 ],
 actions: [
 { value: "edit-item", content: "Edit Group", link: true, href: '/admin/groups/{{id}}/edit', icon: "fas fa-pen-square", permission:'edit-groups', ariaDescribedBy: 'data.id'},
 { value: "add-to-bundle", content: "Add to Bundle", icon: "fas fa-folder-plus", permission: "admin", emit_on_root: 'add-to-bundle'},
 { value: "delete-item", content: "Delete Group", icon: "fas fa-trash-alt", permission: 'delete-groups', ariaDescribedBy: 'data.id'},
 ],
 fields: [
Expand Down

18 changes: 18 additions & 0 deletions
resources/js/admin/script-executors/ScriptExecutors.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,10 +53,23 @@
 >
 <i class="fas fa-trash-alt fa-lg fa-fw"></i>
 </b-btn>
 <b-btn
 variant="link"
 @click="onAddToBundle(props.rowData)"
 v-b-tooltip.hover
 :title="$t('Add to Bundle')"
 v-uni-aria-describedby="props.rowData.id.toString()"
 >
 <i class="fas fa-folder-plus fa-lg fa-fw"></i>
 </b-btn>
 </div>
 </div>
 </template>
 </vuetable>
 <add-to-bundle
 asset-type="script_executors"
 :setting="true"
 />
 <pagination
 :single="$t('Script Executor')"
 :plural="$t('Script Executors')"
Expand DownExpand Up@@ -221,11 +234,13 @@
<script>
import datatableMixin from "../../components/common/mixins/datatable";
import dataLoadingMixin from "../../components/common/mixins/apiDataLoading";
import AddToBundle from "../../components/shared/AddToBundle.vue";
import { createUniqIdsMixin } from "vue-uniq-ids";
const uniqIdsMixin = createUniqIdsMixin();

export default {
 mixins: [datatableMixin, dataLoadingMixin, uniqIdsMixin],
 components: { AddToBundle },
 props: ["filter", "permission"],
 data() {
 return {
Expand DownExpand Up@@ -508,6 +523,9 @@ export default {
 this.loading = false;
 });
 },
 onAddToBundle(data) {
 this.$root.$emit('add-to-bundle', data);
 },
 },
};
</script>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
feature/FOUR-21456 added ellipsis options to add settings to bundles#7879

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.

 Sign up for GitHub

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

 Merged

ryancooley
merged 1 commit into

from

Jan 23, 2025
 Merged


feature/FOUR-21456 added ellipsis options to add settings to bundles
#7879
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


13 changes: 12 additions & 1 deletion
ProcessMaker/Http/Controllers/Api/DevLinkController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -223,7 +223,7 @@ public function addAsset(Request $request, Bundle $bundle)

 public function addSettings(Request $request, Bundle $bundle)
 {
 $bundle->addSettings($request->input('setting'), $request->input('config'));
 $bundle->addSettings($request->input('setting'), $request->input('config'), $request->input('type'));
 }

 public function addAssetToBundles(Request $request)
Expand All@@ -238,6 +238,17 @@ public function addAssetToBundles(Request $request)
 }
 }

 public function addSettingToBundles(Request $request)
 {
 $bundles = $request->input('bundles');
 foreach ($bundles as $id) {
 $bundle = Bundle::find($id);
 if ($bundle) {
 $bundle->addSettingToBundles($request->input('setting'), $request->input('config'));
 }
 }
 }

 public function sharedAssets(Request $request)
 {
 return Setting::Where('group', 'Devlink')->get();
Expand Down

59 changes: 53 additions & 6 deletions
ProcessMaker/Models/Bundle.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
use ProcessMaker\ImportExport\Logger;
use ProcessMaker\ImportExport\Options;
use ProcessMaker\Models\ProcessMakerModel;
use ProcessMaker\Models\SettingsMenus;
use Spatie\MediaLibrary\HasMedia;
use Spatie\MediaLibrary\InteractsWithMedia;

Expand DownExpand Up@@ -138,18 +139,52 @@ public function addAsset(ProcessMakerModel $asset)
 ]);
 }

 public function addSettings($setting, $config)
 public function addSettings($setting, $newId, $type = null)
 {
 $exists = $this->settings()->where('setting', $setting)->exists();
 if ($exists) {
 $this->settings()->where('setting', $setting)->update([
 'config' => $config,
 $existingSetting = $this->settings()->where('setting', $setting)->first();

 if ($existingSetting) {
 // If the config is null, do not add the new ID
 if (is_null($existingSetting->config)) {
 return;
 }

 // Decode the existing JSON
 $config = json_decode($existingSetting->config, true);

 // Ensure 'id' is an array
 if (!isset($config['id']) || !is_array($config['id'])) {
 $config['id'] = [];
 }

 // Add the new ID
 $config['id'][] = $newId;

 // Remove duplicates
 $config['id'] = array_unique($config['id']);

 // Update the config
 $existingSetting->update([
 'config' => json_encode($config),
 ]);
 } else {
 // Create a new BundleSetting with the initial ID
 $config = ['id' => []];
 if ($newId) {
 $config['id'][] = $newId;
 }

 if ($type) {
 $settingsMenu = SettingsMenus::where('menu_group', $setting)->first();
 if ($settingsMenu) {
 $config['id'] = $settingsMenu->id;
 }
 }

 BundleSetting::create([
 'bundle_id' => $this->id,
 'setting' => $setting,
 'config' => $config,
 'config' => json_encode($config),
 ]);
 }
 }
Expand All@@ -166,6 +201,18 @@ public function addAssetToBundles(ProcessMakerModel $asset)
 return $message;
 }

 public function addSettingToBundles($setting, $newId)
 {
 $message = null;
 try {
 $this->addSettings($setting, $newId);
 } catch (ValidationException $ve) {
 $message = $ve->getMessage();
 }

 return $message;
 }

 public function validateEditable()
 {
 if (!$this->editable()) {
Expand Down

11 changes: 7 additions & 4 deletions
ProcessMaker/Models/Setting.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,7 @@ public static function messages()
 *
 * @param string $key
 *
 * @return \ProcessMaker\Models\Setting|null
 * @return Setting|null
 * @throws \Exception
 */
 public static function byKey(string $key)
Expand DownExpand Up@@ -382,7 +382,7 @@ public static function getFavicon()
 */
 public static function groupsByMenu($menuId)
 {
 $query = Setting::query()
 $query = self::query()
 ->select('group')
 ->groupBy('group')
 ->where('group_id', $menuId)
Expand All@@ -409,7 +409,7 @@ public static function groupsByMenu($menuId)
 */
 public static function updateSettingsGroup($settingsGroup, $id)
 {
Setting::where('group', $settingsGroup)->whereNull('group_id')->chunk(
self::where('group', $settingsGroup)->whereNull('group_id')->chunk(
 50,
 function ($settings) use ($id) {
 foreach ($settings as $setting) {
Expand All@@ -429,7 +429,7 @@ function ($settings) use ($id) {
 */
 public static function updateAllSettingsGroupId()
 {
Setting::whereNull('group_id')->chunk(100, function ($settings) {
self::whereNull('group_id')->chunk(100, function ($settings) {
 $defaultId = SettingsMenus::EMAIL_MENU_GROUP;
 foreach ($settings as $setting) {
 // Define the value of 'menu_group' based on 'group'
Expand DownExpand Up@@ -466,6 +466,9 @@ public static function updateAllSettingsGroupId()
 case 'System': // System not related with settings menu
 $id = null;
 break;
 case 'Devlink':
 $id = null;
 break;
 default: // The default value
 if (preg_match('/^Email Server/', $setting->group)) {
 $id = SettingsMenus::getId(SettingsMenus::EMAIL_MENU_GROUP);
Expand Down

11 changes: 9 additions & 2 deletions
resources/js/admin/auth-clients/components/AuthClientsListing.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
 @navigate="onNavigate"
 :actions="actions"
 :data="props.rowData"
 :permission="permission"
 :divider="true"
 />
 </template>
Expand All@@ -46,6 +47,10 @@
 {{ props.rowData.secret.substr(0, 10) }}...
 </template>
 </vuetable>
 <add-to-bundle
 asset-type="auth_clients"
 :setting="true"
 />
 <pagination
 :single="$t('Auth Client')"
 :plural="$t('Auth Clients')"
Expand All@@ -63,13 +68,14 @@
import datatableMixin from "../../../components/common/mixins/datatable";
import dataLoadingMixin from "../../../components/common/mixins/apiDataLoading";
import EllipsisMenu from "../../../components/shared/EllipsisMenu.vue";
import AddToBundle from "../../../components/shared/AddToBundle.vue";
import { createUniqIdsMixin } from "vue-uniq-ids";
const uniqIdsMixin = createUniqIdsMixin();

export default {
 components: {EllipsisMenu},
 components: {EllipsisMenu, AddToBundle},
 mixins: [datatableMixin, dataLoadingMixin, uniqIdsMixin],
 props: ["filter"],
 props: ["filter", "permission"],
 data() {
 return {
 copytext: "",
Expand All@@ -82,6 +88,7 @@ export default {
 ],
 actions: [
 { value: "edit-item", content: "Edit Auth Client", icon: "fas fa-pen-square", ariaDescribedBy: 'data.id'},
 { value: "add-to-bundle", content: "Add to Bundle", icon: "fas fa-folder-plus", permission: "admin", emit_on_root: 'add-to-bundle'},
 { value: "delete-item", content: "Delete Auth Client", icon: "fas fa-trash-alt", ariaDescribedBy: 'data.id'},
 ],
 fields: [
Expand Down

9 changes: 7 additions & 2 deletions
resources/js/admin/devlink/components/BundleConfigurations.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,10 @@
 :checked="!!isInSettings(config)"
 switch
 @change="$emit('config-change', { 
 key: config.type,
 key: config.type,
 value: $event,
 settingId: isInSettings(config)?.id
 settingId: isInSettings(config)?.id,
 type: props.type
 })"
 />
 </div>
Expand All@@ -46,6 +47,10 @@ const props = defineProps({
 title: {
 type: String,
 required: true
 },
 type: {
 type: String,
 required: false
 }
});

Expand Down

2 changes: 2 additions & 0 deletions
resources/js/admin/devlink/components/BundleDetail.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@
 :values="bundle.settings"
 @config-change="handleConfigChange"
 title="Settings"
 type="settings"
 />

 <BundleModal
Expand DownExpand Up@@ -184,6 +185,7 @@ const handleConfigChange = (event) => {
 ProcessMaker.apiClient.post(`devlink/local-bundles/${bundle.value.id}/add-settings`, {
 setting: event.key,
 config: null,
 type: event.type,
 })
 .then(() => {
 loadAssets();
Expand Down

12 changes: 8 additions & 4 deletions
resources/js/admin/devlink/components/platformConfigurations.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,12 +16,16 @@ export default [
 name: "UI Settings",
 },
 {
 type: "script_executors",
 name: "Script Executors",
 type: "ui_dashboards",
 name: "Dashboards",
 },
 {
 type: "ui_menus",
 name: "Menus",
 },
 {
 type: "analytics_settings",
 name: "Analytics Settings",
 type: "script_executors",
 name: "Script Executors",
 },
 {
 type: "public_files",
Expand Down

8 changes: 4 additions & 4 deletions
resources/js/admin/devlink/components/settings.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
export default [
 {
 type: "email_settings",
 type: "Email",
 name: "Email Settings",
 },
 {
 type: "log-in_auth",
 type: "Log-In & Auth",
 name: "Log-in & Auth",
 },
 {
 type: "user_settings",
 type: "User Settings",
 name: "User Settings",
 },
 {
 type: "integrations",
 type: "Integrations",
 name: "Integrations",
 },
];

8 changes: 7 additions & 1 deletion
resources/js/admin/groups/components/GroupsListing.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,10 @@
 />
 </template>
 </vuetable>
 <add-to-bundle
 asset-type="groups"
 :setting="true"
 />
 <pagination
 :single="$t('Group')"
 :plural="$t('Groups')"
Expand All@@ -49,11 +53,12 @@
import datatableMixin from "../../../components/common/mixins/datatable";
import dataLoadingMixin from "../../../components/common/mixins/apiDataLoading";
import EllipsisMenu from "../../../components/shared/EllipsisMenu.vue";
import AddToBundle from "../../../components/shared/AddToBundle.vue";
import { createUniqIdsMixin } from "vue-uniq-ids";
const uniqIdsMixin = createUniqIdsMixin();

export default {
 components: {EllipsisMenu},
 components: {EllipsisMenu, AddToBundle},
 mixins: [datatableMixin, dataLoadingMixin, uniqIdsMixin],
 props: ["filter", "permission"],
 data() {
Expand All@@ -69,6 +74,7 @@ export default {
 ],
 actions: [
 { value: "edit-item", content: "Edit Group", link: true, href: '/admin/groups/{{id}}/edit', icon: "fas fa-pen-square", permission:'edit-groups', ariaDescribedBy: 'data.id'},
 { value: "add-to-bundle", content: "Add to Bundle", icon: "fas fa-folder-plus", permission: "admin", emit_on_root: 'add-to-bundle'},
 { value: "delete-item", content: "Delete Group", icon: "fas fa-trash-alt", permission: 'delete-groups', ariaDescribedBy: 'data.id'},
 ],
 fields: [
Expand Down

18 changes: 18 additions & 0 deletions
resources/js/admin/script-executors/ScriptExecutors.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,10 +53,23 @@
 >
 <i class="fas fa-trash-alt fa-lg fa-fw"></i>
 </b-btn>
 <b-btn
 variant="link"
 @click="onAddToBundle(props.rowData)"
 v-b-tooltip.hover
 :title="$t('Add to Bundle')"
 v-uni-aria-describedby="props.rowData.id.toString()"
 >
 <i class="fas fa-folder-plus fa-lg fa-fw"></i>
 </b-btn>
 </div>
 </div>
 </template>
 </vuetable>
 <add-to-bundle
 asset-type="script_executors"
 :setting="true"
 />
 <pagination
 :single="$t('Script Executor')"
 :plural="$t('Script Executors')"
Expand DownExpand Up@@ -221,11 +234,13 @@
<script>
import datatableMixin from "../../components/common/mixins/datatable";
import dataLoadingMixin from "../../components/common/mixins/apiDataLoading";
import AddToBundle from "../../components/shared/AddToBundle.vue";
import { createUniqIdsMixin } from "vue-uniq-ids";
const uniqIdsMixin = createUniqIdsMixin();

export default {
 mixins: [datatableMixin, dataLoadingMixin, uniqIdsMixin],
 components: { AddToBundle },
 props: ["filter", "permission"],
 data() {
 return {
Expand DownExpand Up@@ -508,6 +523,9 @@ export default {
 this.loading = false;
 });
 },
 onAddToBundle(data) {
 this.$root.$emit('add-to-bundle', data);
 },
 },
};
</script>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feature/FOUR-21456 added ellipsis options to add settings to bundles#7879

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.

 Sign up for GitHub

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

 Merged

ryancooley
merged 1 commit into

from

Jan 23, 2025
 Merged


feature/FOUR-21456 added ellipsis options to add settings to bundles
#7879
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


13 changes: 12 additions & 1 deletion
ProcessMaker/Http/Controllers/Api/DevLinkController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -223,7 +223,7 @@ public function addAsset(Request $request, Bundle $bundle)

 public function addSettings(Request $request, Bundle $bundle)
 {
 $bundle->addSettings($request->input('setting'), $request->input('config'));
 $bundle->addSettings($request->input('setting'), $request->input('config'), $request->input('type'));
 }

 public function addAssetToBundles(Request $request)
Expand All@@ -238,6 +238,17 @@ public function addAssetToBundles(Request $request)
 }
 }

 public function addSettingToBundles(Request $request)
 {
 $bundles = $request->input('bundles');
 foreach ($bundles as $id) {
 $bundle = Bundle::find($id);
 if ($bundle) {
 $bundle->addSettingToBundles($request->input('setting'), $request->input('config'));
 }
 }
 }

 public function sharedAssets(Request $request)
 {
 return Setting::Where('group', 'Devlink')->get();
Expand Down

59 changes: 53 additions & 6 deletions
ProcessMaker/Models/Bundle.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
use ProcessMaker\ImportExport\Logger;
use ProcessMaker\ImportExport\Options;
use ProcessMaker\Models\ProcessMakerModel;
use ProcessMaker\Models\SettingsMenus;
use Spatie\MediaLibrary\HasMedia;
use Spatie\MediaLibrary\InteractsWithMedia;

Expand DownExpand Up@@ -138,18 +139,52 @@ public function addAsset(ProcessMakerModel $asset)
 ]);
 }

 public function addSettings($setting, $config)
 public function addSettings($setting, $newId, $type = null)
 {
 $exists = $this->settings()->where('setting', $setting)->exists();
 if ($exists) {
 $this->settings()->where('setting', $setting)->update([
 'config' => $config,
 $existingSetting = $this->settings()->where('setting', $setting)->first();

 if ($existingSetting) {
 // If the config is null, do not add the new ID
 if (is_null($existingSetting->config)) {
 return;
 }

 // Decode the existing JSON
 $config = json_decode($existingSetting->config, true);

 // Ensure 'id' is an array
 if (!isset($config['id']) || !is_array($config['id'])) {
 $config['id'] = [];
 }

 // Add the new ID
 $config['id'][] = $newId;

 // Remove duplicates
 $config['id'] = array_unique($config['id']);

 // Update the config
 $existingSetting->update([
 'config' => json_encode($config),
 ]);
 } else {
 // Create a new BundleSetting with the initial ID
 $config = ['id' => []];
 if ($newId) {
 $config['id'][] = $newId;
 }

 if ($type) {
 $settingsMenu = SettingsMenus::where('menu_group', $setting)->first();
 if ($settingsMenu) {
 $config['id'] = $settingsMenu->id;
 }
 }

 BundleSetting::create([
 'bundle_id' => $this->id,
 'setting' => $setting,
 'config' => $config,
 'config' => json_encode($config),
 ]);
 }
 }
Expand All@@ -166,6 +201,18 @@ public function addAssetToBundles(ProcessMakerModel $asset)
 return $message;
 }

 public function addSettingToBundles($setting, $newId)
 {
 $message = null;
 try {
 $this->addSettings($setting, $newId);
 } catch (ValidationException $ve) {
 $message = $ve->getMessage();
 }

 return $message;
 }

 public function validateEditable()
 {
 if (!$this->editable()) {
Expand Down

11 changes: 7 additions & 4 deletions
ProcessMaker/Models/Setting.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,7 @@ public static function messages()
 *
 * @param string $key
 *
 * @return \ProcessMaker\Models\Setting|null
 * @return Setting|null
 * @throws \Exception
 */
 public static function byKey(string $key)
Expand DownExpand Up@@ -382,7 +382,7 @@ public static function getFavicon()
 */
 public static function groupsByMenu($menuId)
 {
 $query = Setting::query()
 $query = self::query()
 ->select('group')
 ->groupBy('group')
 ->where('group_id', $menuId)
Expand All@@ -409,7 +409,7 @@ public static function groupsByMenu($menuId)
 */
 public static function updateSettingsGroup($settingsGroup, $id)
 {
Setting::where('group', $settingsGroup)->whereNull('group_id')->chunk(
self::where('group', $settingsGroup)->whereNull('group_id')->chunk(
 50,
 function ($settings) use ($id) {
 foreach ($settings as $setting) {
Expand All@@ -429,7 +429,7 @@ function ($settings) use ($id) {
 */
 public static function updateAllSettingsGroupId()
 {
Setting::whereNull('group_id')->chunk(100, function ($settings) {
self::whereNull('group_id')->chunk(100, function ($settings) {
 $defaultId = SettingsMenus::EMAIL_MENU_GROUP;
 foreach ($settings as $setting) {
 // Define the value of 'menu_group' based on 'group'
Expand DownExpand Up@@ -466,6 +466,9 @@ public static function updateAllSettingsGroupId()
 case 'System': // System not related with settings menu
 $id = null;
 break;
 case 'Devlink':
 $id = null;
 break;
 default: // The default value
 if (preg_match('/^Email Server/', $setting->group)) {
 $id = SettingsMenus::getId(SettingsMenus::EMAIL_MENU_GROUP);
Expand Down

11 changes: 9 additions & 2 deletions
resources/js/admin/auth-clients/components/AuthClientsListing.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
 @navigate="onNavigate"
 :actions="actions"
 :data="props.rowData"
 :permission="permission"
 :divider="true"
 />
 </template>
Expand All@@ -46,6 +47,10 @@
 {{ props.rowData.secret.substr(0, 10) }}...
 </template>
 </vuetable>
 <add-to-bundle
 asset-type="auth_clients"
 :setting="true"
 />
 <pagination
 :single="$t('Auth Client')"
 :plural="$t('Auth Clients')"
Expand All@@ -63,13 +68,14 @@
import datatableMixin from "../../../components/common/mixins/datatable";
import dataLoadingMixin from "../../../components/common/mixins/apiDataLoading";
import EllipsisMenu from "../../../components/shared/EllipsisMenu.vue";
import AddToBundle from "../../../components/shared/AddToBundle.vue";
import { createUniqIdsMixin } from "vue-uniq-ids";
const uniqIdsMixin = createUniqIdsMixin();

export default {
 components: {EllipsisMenu},
 components: {EllipsisMenu, AddToBundle},
 mixins: [datatableMixin, dataLoadingMixin, uniqIdsMixin],
 props: ["filter"],
 props: ["filter", "permission"],
 data() {
 return {
 copytext: "",
Expand All@@ -82,6 +88,7 @@ export default {
 ],
 actions: [
 { value: "edit-item", content: "Edit Auth Client", icon: "fas fa-pen-square", ariaDescribedBy: 'data.id'},
 { value: "add-to-bundle", content: "Add to Bundle", icon: "fas fa-folder-plus", permission: "admin", emit_on_root: 'add-to-bundle'},
 { value: "delete-item", content: "Delete Auth Client", icon: "fas fa-trash-alt", ariaDescribedBy: 'data.id'},
 ],
 fields: [
Expand Down

9 changes: 7 additions & 2 deletions
resources/js/admin/devlink/components/BundleConfigurations.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,10 @@
 :checked="!!isInSettings(config)"
 switch
 @change="$emit('config-change', { 
 key: config.type,
 key: config.type,
 value: $event,
 settingId: isInSettings(config)?.id
 settingId: isInSettings(config)?.id,
 type: props.type
 })"
 />
 </div>
Expand All@@ -46,6 +47,10 @@ const props = defineProps({
 title: {
 type: String,
 required: true
 },
 type: {
 type: String,
 required: false
 }
});

Expand Down

2 changes: 2 additions & 0 deletions
resources/js/admin/devlink/components/BundleDetail.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@
 :values="bundle.settings"
 @config-change="handleConfigChange"
 title="Settings"
 type="settings"
 />

 <BundleModal
Expand DownExpand Up@@ -184,6 +185,7 @@ const handleConfigChange = (event) => {
 ProcessMaker.apiClient.post(`devlink/local-bundles/${bundle.value.id}/add-settings`, {
 setting: event.key,
 config: null,
 type: event.type,
 })
 .then(() => {
 loadAssets();
Expand Down

12 changes: 8 additions & 4 deletions
resources/js/admin/devlink/components/platformConfigurations.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,12 +16,16 @@ export default [
 name: "UI Settings",
 },
 {
 type: "script_executors",
 name: "Script Executors",
 type: "ui_dashboards",
 name: "Dashboards",
 },
 {
 type: "ui_menus",
 name: "Menus",
 },
 {
 type: "analytics_settings",
 name: "Analytics Settings",
 type: "script_executors",
 name: "Script Executors",
 },
 {
 type: "public_files",
Expand Down

8 changes: 4 additions & 4 deletions
resources/js/admin/devlink/components/settings.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
export default [
 {
 type: "email_settings",
 type: "Email",
 name: "Email Settings",
 },
 {
 type: "log-in_auth",
 type: "Log-In & Auth",
 name: "Log-in & Auth",
 },
 {
 type: "user_settings",
 type: "User Settings",
 name: "User Settings",
 },
 {
 type: "integrations",
 type: "Integrations",
 name: "Integrations",
 },
];

8 changes: 7 additions & 1 deletion
resources/js/admin/groups/components/GroupsListing.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,10 @@
 />
 </template>
 </vuetable>
 <add-to-bundle
 asset-type="groups"
 :setting="true"
 />
 <pagination
 :single="$t('Group')"
 :plural="$t('Groups')"
Expand All@@ -49,11 +53,12 @@
import datatableMixin from "../../../components/common/mixins/datatable";
import dataLoadingMixin from "../../../components/common/mixins/apiDataLoading";
import EllipsisMenu from "../../../components/shared/EllipsisMenu.vue";
import AddToBundle from "../../../components/shared/AddToBundle.vue";
import { createUniqIdsMixin } from "vue-uniq-ids";
const uniqIdsMixin = createUniqIdsMixin();

export default {
 components: {EllipsisMenu},
 components: {EllipsisMenu, AddToBundle},
 mixins: [datatableMixin, dataLoadingMixin, uniqIdsMixin],
 props: ["filter", "permission"],
 data() {
Expand All@@ -69,6 +74,7 @@ export default {
 ],
 actions: [
 { value: "edit-item", content: "Edit Group", link: true, href: '/admin/groups/{{id}}/edit', icon: "fas fa-pen-square", permission:'edit-groups', ariaDescribedBy: 'data.id'},
 { value: "add-to-bundle", content: "Add to Bundle", icon: "fas fa-folder-plus", permission: "admin", emit_on_root: 'add-to-bundle'},
 { value: "delete-item", content: "Delete Group", icon: "fas fa-trash-alt", permission: 'delete-groups', ariaDescribedBy: 'data.id'},
 ],
 fields: [
Expand Down

18 changes: 18 additions & 0 deletions
resources/js/admin/script-executors/ScriptExecutors.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,10 +53,23 @@
 >
 <i class="fas fa-trash-alt fa-lg fa-fw"></i>
 </b-btn>
 <b-btn
 variant="link"
 @click="onAddToBundle(props.rowData)"
 v-b-tooltip.hover
 :title="$t('Add to Bundle')"
 v-uni-aria-describedby="props.rowData.id.toString()"
 >
 <i class="fas fa-folder-plus fa-lg fa-fw"></i>
 </b-btn>
 </div>
 </div>
 </template>
 </vuetable>
 <add-to-bundle
 asset-type="script_executors"
 :setting="true"
 />
 <pagination
 :single="$t('Script Executor')"
 :plural="$t('Script Executors')"
Expand DownExpand Up@@ -221,11 +234,13 @@
<script>
import datatableMixin from "../../components/common/mixins/datatable";
import dataLoadingMixin from "../../components/common/mixins/apiDataLoading";
import AddToBundle from "../../components/shared/AddToBundle.vue";
import { createUniqIdsMixin } from "vue-uniq-ids";
const uniqIdsMixin = createUniqIdsMixin();

export default {
 mixins: [datatableMixin, dataLoadingMixin, uniqIdsMixin],
 components: { AddToBundle },
 props: ["filter", "permission"],
 data() {
 return {
Expand DownExpand Up@@ -508,6 +523,9 @@ export default {
 this.loading = false;
 });
 },
 onAddToBundle(data) {
 this.$root.$emit('add-to-bundle', data);
 },
 },
};
</script>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feature/FOUR-21456 added ellipsis options to add settings to bundles#7879

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.

 Sign up for GitHub

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

 Merged

ryancooley
merged 1 commit into

from

Jan 23, 2025
 Merged


feature/FOUR-21456 added ellipsis options to add settings to bundles
#7879
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


13 changes: 12 additions & 1 deletion
ProcessMaker/Http/Controllers/Api/DevLinkController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -223,7 +223,7 @@ public function addAsset(Request $request, Bundle $bundle)

 public function addSettings(Request $request, Bundle $bundle)
 {
 $bundle->addSettings($request->input('setting'), $request->input('config'));
 $bundle->addSettings($request->input('setting'), $request->input('config'), $request->input('type'));
 }

 public function addAssetToBundles(Request $request)
Expand All@@ -238,6 +238,17 @@ public function addAssetToBundles(Request $request)
 }
 }

 public function addSettingToBundles(Request $request)
 {
 $bundles = $request->input('bundles');
 foreach ($bundles as $id) {
 $bundle = Bundle::find($id);
 if ($bundle) {
 $bundle->addSettingToBundles($request->input('setting'), $request->input('config'));
 }
 }
 }

 public function sharedAssets(Request $request)
 {
 return Setting::Where('group', 'Devlink')->get();
Expand Down

59 changes: 53 additions & 6 deletions
ProcessMaker/Models/Bundle.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
use ProcessMaker\ImportExport\Logger;
use ProcessMaker\ImportExport\Options;
use ProcessMaker\Models\ProcessMakerModel;
use ProcessMaker\Models\SettingsMenus;
use Spatie\MediaLibrary\HasMedia;
use Spatie\MediaLibrary\InteractsWithMedia;

Expand DownExpand Up@@ -138,18 +139,52 @@ public function addAsset(ProcessMakerModel $asset)
 ]);
 }

 public function addSettings($setting, $config)
 public function addSettings($setting, $newId, $type = null)
 {
 $exists = $this->settings()->where('setting', $setting)->exists();
 if ($exists) {
 $this->settings()->where('setting', $setting)->update([
 'config' => $config,
 $existingSetting = $this->settings()->where('setting', $setting)->first();

 if ($existingSetting) {
 // If the config is null, do not add the new ID
 if (is_null($existingSetting->config)) {
 return;
 }

 // Decode the existing JSON
 $config = json_decode($existingSetting->config, true);

 // Ensure 'id' is an array
 if (!isset($config['id']) || !is_array($config['id'])) {
 $config['id'] = [];
 }

 // Add the new ID
 $config['id'][] = $newId;

 // Remove duplicates
 $config['id'] = array_unique($config['id']);

 // Update the config
 $existingSetting->update([
 'config' => json_encode($config),
 ]);
 } else {
 // Create a new BundleSetting with the initial ID
 $config = ['id' => []];
 if ($newId) {
 $config['id'][] = $newId;
 }

 if ($type) {
 $settingsMenu = SettingsMenus::where('menu_group', $setting)->first();
 if ($settingsMenu) {
 $config['id'] = $settingsMenu->id;
 }
 }

 BundleSetting::create([
 'bundle_id' => $this->id,
 'setting' => $setting,
 'config' => $config,
 'config' => json_encode($config),
 ]);
 }
 }
Expand All@@ -166,6 +201,18 @@ public function addAssetToBundles(ProcessMakerModel $asset)
 return $message;
 }

 public function addSettingToBundles($setting, $newId)
 {
 $message = null;
 try {
 $this->addSettings($setting, $newId);
 } catch (ValidationException $ve) {
 $message = $ve->getMessage();
 }

 return $message;
 }

 public function validateEditable()
 {
 if (!$this->editable()) {
Expand Down

11 changes: 7 additions & 4 deletions
ProcessMaker/Models/Setting.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,7 @@ public static function messages()
 *
 * @param string $key
 *
 * @return \ProcessMaker\Models\Setting|null
 * @return Setting|null
 * @throws \Exception
 */
 public static function byKey(string $key)
Expand DownExpand Up@@ -382,7 +382,7 @@ public static function getFavicon()
 */
 public static function groupsByMenu($menuId)
 {
 $query = Setting::query()
 $query = self::query()
 ->select('group')
 ->groupBy('group')
 ->where('group_id', $menuId)
Expand All@@ -409,7 +409,7 @@ public static function groupsByMenu($menuId)
 */
 public static function updateSettingsGroup($settingsGroup, $id)
 {
Setting::where('group', $settingsGroup)->whereNull('group_id')->chunk(
self::where('group', $settingsGroup)->whereNull('group_id')->chunk(
 50,
 function ($settings) use ($id) {
 foreach ($settings as $setting) {
Expand All@@ -429,7 +429,7 @@ function ($settings) use ($id) {
 */
 public static function updateAllSettingsGroupId()
 {
Setting::whereNull('group_id')->chunk(100, function ($settings) {
self::whereNull('group_id')->chunk(100, function ($settings) {
 $defaultId = SettingsMenus::EMAIL_MENU_GROUP;
 foreach ($settings as $setting) {
 // Define the value of 'menu_group' based on 'group'
Expand DownExpand Up@@ -466,6 +466,9 @@ public static function updateAllSettingsGroupId()
 case 'System': // System not related with settings menu
 $id = null;
 break;
 case 'Devlink':
 $id = null;
 break;
 default: // The default value
 if (preg_match('/^Email Server/', $setting->group)) {
 $id = SettingsMenus::getId(SettingsMenus::EMAIL_MENU_GROUP);
Expand Down

11 changes: 9 additions & 2 deletions
resources/js/admin/auth-clients/components/AuthClientsListing.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
 @navigate="onNavigate"
 :actions="actions"
 :data="props.rowData"
 :permission="permission"
 :divider="true"
 />
 </template>
Expand All@@ -46,6 +47,10 @@
 {{ props.rowData.secret.substr(0, 10) }}...
 </template>
 </vuetable>
 <add-to-bundle
 asset-type="auth_clients"
 :setting="true"
 />
 <pagination
 :single="$t('Auth Client')"
 :plural="$t('Auth Clients')"
Expand All@@ -63,13 +68,14 @@
import datatableMixin from "../../../components/common/mixins/datatable";
import dataLoadingMixin from "../../../components/common/mixins/apiDataLoading";
import EllipsisMenu from "../../../components/shared/EllipsisMenu.vue";
import AddToBundle from "../../../components/shared/AddToBundle.vue";
import { createUniqIdsMixin } from "vue-uniq-ids";
const uniqIdsMixin = createUniqIdsMixin();

export default {
 components: {EllipsisMenu},
 components: {EllipsisMenu, AddToBundle},
 mixins: [datatableMixin, dataLoadingMixin, uniqIdsMixin],
 props: ["filter"],
 props: ["filter", "permission"],
 data() {
 return {
 copytext: "",
Expand All@@ -82,6 +88,7 @@ export default {
 ],
 actions: [
 { value: "edit-item", content: "Edit Auth Client", icon: "fas fa-pen-square", ariaDescribedBy: 'data.id'},
 { value: "add-to-bundle", content: "Add to Bundle", icon: "fas fa-folder-plus", permission: "admin", emit_on_root: 'add-to-bundle'},
 { value: "delete-item", content: "Delete Auth Client", icon: "fas fa-trash-alt", ariaDescribedBy: 'data.id'},
 ],
 fields: [
Expand Down

9 changes: 7 additions & 2 deletions
resources/js/admin/devlink/components/BundleConfigurations.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,10 @@
 :checked="!!isInSettings(config)"
 switch
 @change="$emit('config-change', { 
 key: config.type,
 key: config.type,
 value: $event,
 settingId: isInSettings(config)?.id
 settingId: isInSettings(config)?.id,
 type: props.type
 })"
 />
 </div>
Expand All@@ -46,6 +47,10 @@ const props = defineProps({
 title: {
 type: String,
 required: true
 },
 type: {
 type: String,
 required: false
 }
});

Expand Down

2 changes: 2 additions & 0 deletions
resources/js/admin/devlink/components/BundleDetail.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@
 :values="bundle.settings"
 @config-change="handleConfigChange"
 title="Settings"
 type="settings"
 />

 <BundleModal
Expand DownExpand Up@@ -184,6 +185,7 @@ const handleConfigChange = (event) => {
 ProcessMaker.apiClient.post(`devlink/local-bundles/${bundle.value.id}/add-settings`, {
 setting: event.key,
 config: null,
 type: event.type,
 })
 .then(() => {
 loadAssets();
Expand Down

12 changes: 8 additions & 4 deletions
resources/js/admin/devlink/components/platformConfigurations.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,12 +16,16 @@ export default [
 name: "UI Settings",
 },
 {
 type: "script_executors",
 name: "Script Executors",
 type: "ui_dashboards",
 name: "Dashboards",
 },
 {
 type: "ui_menus",
 name: "Menus",
 },
 {
 type: "analytics_settings",
 name: "Analytics Settings",
 type: "script_executors",
 name: "Script Executors",
 },
 {
 type: "public_files",
Expand Down

8 changes: 4 additions & 4 deletions
resources/js/admin/devlink/components/settings.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
export default [
 {
 type: "email_settings",
 type: "Email",
 name: "Email Settings",
 },
 {
 type: "log-in_auth",
 type: "Log-In & Auth",
 name: "Log-in & Auth",
 },
 {
 type: "user_settings",
 type: "User Settings",
 name: "User Settings",
 },
 {
 type: "integrations",
 type: "Integrations",
 name: "Integrations",
 },
];

8 changes: 7 additions & 1 deletion
resources/js/admin/groups/components/GroupsListing.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,10 @@
 />
 </template>
 </vuetable>
 <add-to-bundle
 asset-type="groups"
 :setting="true"
 />
 <pagination
 :single="$t('Group')"
 :plural="$t('Groups')"
Expand All@@ -49,11 +53,12 @@
import datatableMixin from "../../../components/common/mixins/datatable";
import dataLoadingMixin from "../../../components/common/mixins/apiDataLoading";
import EllipsisMenu from "../../../components/shared/EllipsisMenu.vue";
import AddToBundle from "../../../components/shared/AddToBundle.vue";
import { createUniqIdsMixin } from "vue-uniq-ids";
const uniqIdsMixin = createUniqIdsMixin();

export default {
 components: {EllipsisMenu},
 components: {EllipsisMenu, AddToBundle},
 mixins: [datatableMixin, dataLoadingMixin, uniqIdsMixin],
 props: ["filter", "permission"],
 data() {
Expand All@@ -69,6 +74,7 @@ export default {
 ],
 actions: [
 { value: "edit-item", content: "Edit Group", link: true, href: '/admin/groups/{{id}}/edit', icon: "fas fa-pen-square", permission:'edit-groups', ariaDescribedBy: 'data.id'},
 { value: "add-to-bundle", content: "Add to Bundle", icon: "fas fa-folder-plus", permission: "admin", emit_on_root: 'add-to-bundle'},
 { value: "delete-item", content: "Delete Group", icon: "fas fa-trash-alt", permission: 'delete-groups', ariaDescribedBy: 'data.id'},
 ],
 fields: [
Expand Down

18 changes: 18 additions & 0 deletions
resources/js/admin/script-executors/ScriptExecutors.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,10 +53,23 @@
 >
 <i class="fas fa-trash-alt fa-lg fa-fw"></i>
 </b-btn>
 <b-btn
 variant="link"
 @click="onAddToBundle(props.rowData)"
 v-b-tooltip.hover
 :title="$t('Add to Bundle')"
 v-uni-aria-describedby="props.rowData.id.toString()"
 >
 <i class="fas fa-folder-plus fa-lg fa-fw"></i>
 </b-btn>
 </div>
 </div>
 </template>
 </vuetable>
 <add-to-bundle
 asset-type="script_executors"
 :setting="true"
 />
 <pagination
 :single="$t('Script Executor')"
 :plural="$t('Script Executors')"
Expand DownExpand Up@@ -221,11 +234,13 @@
<script>
import datatableMixin from "../../components/common/mixins/datatable";
import dataLoadingMixin from "../../components/common/mixins/apiDataLoading";
import AddToBundle from "../../components/shared/AddToBundle.vue";
import { createUniqIdsMixin } from "vue-uniq-ids";
const uniqIdsMixin = createUniqIdsMixin();

export default {
 mixins: [datatableMixin, dataLoadingMixin, uniqIdsMixin],
 components: { AddToBundle },
 props: ["filter", "permission"],
 data() {
 return {
Expand DownExpand Up@@ -508,6 +523,9 @@ export default {
 this.loading = false;
 });
 },
 onAddToBundle(data) {
 this.$root.$emit('add-to-bundle', data);
 },
 },
};
</script>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
feature/FOUR-21456 added ellipsis options to add settings to bundles#7879

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.

 Sign up for GitHub

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

 Merged

ryancooley
merged 1 commit into

from

Jan 23, 2025
 Merged


feature/FOUR-21456 added ellipsis options to add settings to bundles
#7879
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


13 changes: 12 additions & 1 deletion
ProcessMaker/Http/Controllers/Api/DevLinkController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -223,7 +223,7 @@ public function addAsset(Request $request, Bundle $bundle)

 public function addSettings(Request $request, Bundle $bundle)
 {
 $bundle->addSettings($request->input('setting'), $request->input('config'));
 $bundle->addSettings($request->input('setting'), $request->input('config'), $request->input('type'));
 }

 public function addAssetToBundles(Request $request)
Expand All@@ -238,6 +238,17 @@ public function addAssetToBundles(Request $request)
 }
 }

 public function addSettingToBundles(Request $request)
 {
 $bundles = $request->input('bundles');
 foreach ($bundles as $id) {
 $bundle = Bundle::find($id);
 if ($bundle) {
 $bundle->addSettingToBundles($request->input('setting'), $request->input('config'));
 }
 }
 }

 public function sharedAssets(Request $request)
 {
 return Setting::Where('group', 'Devlink')->get();
Expand Down

59 changes: 53 additions & 6 deletions
ProcessMaker/Models/Bundle.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@
use ProcessMaker\ImportExport\Logger;
use ProcessMaker\ImportExport\Options;
use ProcessMaker\Models\ProcessMakerModel;
use ProcessMaker\Models\SettingsMenus;
use Spatie\MediaLibrary\HasMedia;
use Spatie\MediaLibrary\InteractsWithMedia;

Expand DownExpand Up@@ -138,18 +139,52 @@ public function addAsset(ProcessMakerModel $asset)
 ]);
 }

 public function addSettings($setting, $config)
 public function addSettings($setting, $newId, $type = null)
 {
 $exists = $this->settings()->where('setting', $setting)->exists();
 if ($exists) {
 $this->settings()->where('setting', $setting)->update([
 'config' => $config,
 $existingSetting = $this->settings()->where('setting', $setting)->first();

 if ($existingSetting) {
 // If the config is null, do not add the new ID
 if (is_null($existingSetting->config)) {
 return;
 }

 // Decode the existing JSON
 $config = json_decode($existingSetting->config, true);

 // Ensure 'id' is an array
 if (!isset($config['id']) || !is_array($config['id'])) {
 $config['id'] = [];
 }

 // Add the new ID
 $config['id'][] = $newId;

 // Remove duplicates
 $config['id'] = array_unique($config['id']);

 // Update the config
 $existingSetting->update([
 'config' => json_encode($config),
 ]);
 } else {
 // Create a new BundleSetting with the initial ID
 $config = ['id' => []];
 if ($newId) {
 $config['id'][] = $newId;
 }

 if ($type) {
 $settingsMenu = SettingsMenus::where('menu_group', $setting)->first();
 if ($settingsMenu) {
 $config['id'] = $settingsMenu->id;
 }
 }

 BundleSetting::create([
 'bundle_id' => $this->id,
 'setting' => $setting,
 'config' => $config,
 'config' => json_encode($config),
 ]);
 }
 }
Expand All@@ -166,6 +201,18 @@ public function addAssetToBundles(ProcessMakerModel $asset)
 return $message;
 }

 public function addSettingToBundles($setting, $newId)
 {
 $message = null;
 try {
 $this->addSettings($setting, $newId);
 } catch (ValidationException $ve) {
 $message = $ve->getMessage();
 }

 return $message;
 }

 public function validateEditable()
 {
 if (!$this->editable()) {
Expand Down

11 changes: 7 additions & 4 deletions
ProcessMaker/Models/Setting.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -143,7 +143,7 @@ public static function messages()
 *
 * @param string $key
 *
 * @return \ProcessMaker\Models\Setting|null
 * @return Setting|null
 * @throws \Exception
 */
 public static function byKey(string $key)
Expand DownExpand Up@@ -382,7 +382,7 @@ public static function getFavicon()
 */
 public static function groupsByMenu($menuId)
 {
 $query = Setting::query()
 $query = self::query()
 ->select('group')
 ->groupBy('group')
 ->where('group_id', $menuId)
Expand All@@ -409,7 +409,7 @@ public static function groupsByMenu($menuId)
 */
 public static function updateSettingsGroup($settingsGroup, $id)
 {
Setting::where('group', $settingsGroup)->whereNull('group_id')->chunk(
self::where('group', $settingsGroup)->whereNull('group_id')->chunk(
 50,
 function ($settings) use ($id) {
 foreach ($settings as $setting) {
Expand All@@ -429,7 +429,7 @@ function ($settings) use ($id) {
 */
 public static function updateAllSettingsGroupId()
 {
Setting::whereNull('group_id')->chunk(100, function ($settings) {
self::whereNull('group_id')->chunk(100, function ($settings) {
 $defaultId = SettingsMenus::EMAIL_MENU_GROUP;
 foreach ($settings as $setting) {
 // Define the value of 'menu_group' based on 'group'
Expand DownExpand Up@@ -466,6 +466,9 @@ public static function updateAllSettingsGroupId()
 case 'System': // System not related with settings menu
 $id = null;
 break;
 case 'Devlink':
 $id = null;
 break;
 default: // The default value
 if (preg_match('/^Email Server/', $setting->group)) {
 $id = SettingsMenus::getId(SettingsMenus::EMAIL_MENU_GROUP);
Expand Down

11 changes: 9 additions & 2 deletions
resources/js/admin/auth-clients/components/AuthClientsListing.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@
 @navigate="onNavigate"
 :actions="actions"
 :data="props.rowData"
 :permission="permission"
 :divider="true"
 />
 </template>
Expand All@@ -46,6 +47,10 @@
 {{ props.rowData.secret.substr(0, 10) }}...
 </template>
 </vuetable>
 <add-to-bundle
 asset-type="auth_clients"
 :setting="true"
 />
 <pagination
 :single="$t('Auth Client')"
 :plural="$t('Auth Clients')"
Expand All@@ -63,13 +68,14 @@
import datatableMixin from "../../../components/common/mixins/datatable";
import dataLoadingMixin from "../../../components/common/mixins/apiDataLoading";
import EllipsisMenu from "../../../components/shared/EllipsisMenu.vue";
import AddToBundle from "../../../components/shared/AddToBundle.vue";
import { createUniqIdsMixin } from "vue-uniq-ids";
const uniqIdsMixin = createUniqIdsMixin();

export default {
 components: {EllipsisMenu},
 components: {EllipsisMenu, AddToBundle},
 mixins: [datatableMixin, dataLoadingMixin, uniqIdsMixin],
 props: ["filter"],
 props: ["filter", "permission"],
 data() {
 return {
 copytext: "",
Expand All@@ -82,6 +88,7 @@ export default {
 ],
 actions: [
 { value: "edit-item", content: "Edit Auth Client", icon: "fas fa-pen-square", ariaDescribedBy: 'data.id'},
 { value: "add-to-bundle", content: "Add to Bundle", icon: "fas fa-folder-plus", permission: "admin", emit_on_root: 'add-to-bundle'},
 { value: "delete-item", content: "Delete Auth Client", icon: "fas fa-trash-alt", ariaDescribedBy: 'data.id'},
 ],
 fields: [
Expand Down

9 changes: 7 additions & 2 deletions
resources/js/admin/devlink/components/BundleConfigurations.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,10 @@
 :checked="!!isInSettings(config)"
 switch
 @change="$emit('config-change', { 
 key: config.type,
 key: config.type,
 value: $event,
 settingId: isInSettings(config)?.id
 settingId: isInSettings(config)?.id,
 type: props.type
 })"
 />
 </div>
Expand All@@ -46,6 +47,10 @@ const props = defineProps({
 title: {
 type: String,
 required: true
 },
 type: {
 type: String,
 required: false
 }
});

Expand Down

2 changes: 2 additions & 0 deletions
resources/js/admin/devlink/components/BundleDetail.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,6 +91,7 @@
 :values="bundle.settings"
 @config-change="handleConfigChange"
 title="Settings"
 type="settings"
 />

 <BundleModal
Expand DownExpand Up@@ -184,6 +185,7 @@ const handleConfigChange = (event) => {
 ProcessMaker.apiClient.post(`devlink/local-bundles/${bundle.value.id}/add-settings`, {
 setting: event.key,
 config: null,
 type: event.type,
 })
 .then(() => {
 loadAssets();
Expand Down

12 changes: 8 additions & 4 deletions
resources/js/admin/devlink/components/platformConfigurations.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,12 +16,16 @@ export default [
 name: "UI Settings",
 },
 {
 type: "script_executors",
 name: "Script Executors",
 type: "ui_dashboards",
 name: "Dashboards",
 },
 {
 type: "ui_menus",
 name: "Menus",
 },
 {
 type: "analytics_settings",
 name: "Analytics Settings",
 type: "script_executors",
 name: "Script Executors",
 },
 {
 type: "public_files",
Expand Down

8 changes: 4 additions & 4 deletions
resources/js/admin/devlink/components/settings.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
export default [
 {
 type: "email_settings",
 type: "Email",
 name: "Email Settings",
 },
 {
 type: "log-in_auth",
 type: "Log-In & Auth",
 name: "Log-in & Auth",
 },
 {
 type: "user_settings",
 type: "User Settings",
 name: "User Settings",
 },
 {
 type: "integrations",
 type: "Integrations",
 name: "Integrations",
 },
];

8 changes: 7 additions & 1 deletion
resources/js/admin/groups/components/GroupsListing.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,10 @@
 />
 </template>
 </vuetable>
 <add-to-bundle
 asset-type="groups"
 :setting="true"
 />
 <pagination
 :single="$t('Group')"
 :plural="$t('Groups')"
Expand All@@ -49,11 +53,12 @@
import datatableMixin from "../../../components/common/mixins/datatable";
import dataLoadingMixin from "../../../components/common/mixins/apiDataLoading";
import EllipsisMenu from "../../../components/shared/EllipsisMenu.vue";
import AddToBundle from "../../../components/shared/AddToBundle.vue";
import { createUniqIdsMixin } from "vue-uniq-ids";
const uniqIdsMixin = createUniqIdsMixin();

export default {
 components: {EllipsisMenu},
 components: {EllipsisMenu, AddToBundle},
 mixins: [datatableMixin, dataLoadingMixin, uniqIdsMixin],
 props: ["filter", "permission"],
 data() {
Expand All@@ -69,6 +74,7 @@ export default {
 ],
 actions: [
 { value: "edit-item", content: "Edit Group", link: true, href: '/admin/groups/{{id}}/edit', icon: "fas fa-pen-square", permission:'edit-groups', ariaDescribedBy: 'data.id'},
 { value: "add-to-bundle", content: "Add to Bundle", icon: "fas fa-folder-plus", permission: "admin", emit_on_root: 'add-to-bundle'},
 { value: "delete-item", content: "Delete Group", icon: "fas fa-trash-alt", permission: 'delete-groups', ariaDescribedBy: 'data.id'},
 ],
 fields: [
Expand Down

18 changes: 18 additions & 0 deletions
resources/js/admin/script-executors/ScriptExecutors.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,10 +53,23 @@
 >
 <i class="fas fa-trash-alt fa-lg fa-fw"></i>
 </b-btn>
 <b-btn
 variant="link"
 @click="onAddToBundle(props.rowData)"
 v-b-tooltip.hover
 :title="$t('Add to Bundle')"
 v-uni-aria-describedby="props.rowData.id.toString()"
 >
 <i class="fas fa-folder-plus fa-lg fa-fw"></i>
 </b-btn>
 </div>
 </div>
 </template>
 </vuetable>
 <add-to-bundle
 asset-type="script_executors"
 :setting="true"
 />
 <pagination
 :single="$t('Script Executor')"
 :plural="$t('Script Executors')"
Expand DownExpand Up@@ -221,11 +234,13 @@
<script>
import datatableMixin from "../../components/common/mixins/datatable";
import dataLoadingMixin from "../../components/common/mixins/apiDataLoading";
import AddToBundle from "../../components/shared/AddToBundle.vue";
import { createUniqIdsMixin } from "vue-uniq-ids";
const uniqIdsMixin = createUniqIdsMixin();

export default {
 mixins: [datatableMixin, dataLoadingMixin, uniqIdsMixin],
 components: { AddToBundle },
 props: ["filter", "permission"],
 data() {
 return {
Expand DownExpand Up@@ -508,6 +523,9 @@ export default {
 this.loading = false;
 });
 },
 onAddToBundle(data) {
 this.$root.$emit('add-to-bundle', data);
 },
 },
};
</script>
Expand Down
Loading