feature/FOUR-20314 Add clear user errors for Instance connections#7956

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
nolanpro merged 3 commits into from
Jan 30, 2025
Merged

feature/FOUR-20314 Add clear user errors for Instance connections #7956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f55c40f
Changed the frontend to handle connection errors
gustavobascope Jan 29, 2025
b4666ec
Merge branch 'epic/FOUR-20308' of github.com:ProcessMaker/processmake…
gustavobascope Jan 30, 2025
99bd6d5
Merge branch 'epic/FOUR-20308' of github.com:ProcessMaker/processmake…
gustavobascope Jan 30, 2025
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
22 changes: 15 additions & 7 deletions ProcessMaker/Http/Controllers/Api/DevLinkController.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,13 +55,17 @@ public function show(DevLink $devLink)
public function store(Request $request)
{
$request->validate([
'name' => ['required', 'unique:dev_links,name'],
'url' => ['required', 'url', 'unique:dev_links,url'],
'name' => ['required'],
'url' => ['required', 'url'],
]);

$devLink = new DevLink();
$devLink->name = $request->input('name');
$devLink->url = $request->input('url');
$devLink = DevLink::where('name', $request->input('name'))->first();
if ($devLink) {
$devLink->url = $request->input('url');
} else {
$devLink = new DevLink();
$devLink->name = $request->input('name');
$devLink->url = $request->input('url');
}
$devLink->saveOrFail();

return $devLink;
Expand All@@ -82,7 +86,11 @@ public function destroy(DevLink $devLink)

public function ping(DevLink $devLink)
{
return $devLink->client()->get(route('api.devlink.pong', [], false));
try {
return$devLink->client()->get(route('api.devlink.pong', [], false));
} catch (\Exception $e) {
return response()->json(['error' => 'DevLink connection error'], $e->getCode());
}
}

public function pong()
Expand Down
11 changes: 1 addition & 10 deletions resources/js/admin/devlink/components/BundleSettingsModal.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@
</b-modal>
</template>
<script setup>
import { ref, onMounted, getCurrentInstance } from 'vue';
import { ref } from 'vue';
import { useRoute } from 'vue-router/composables';

const emit = defineEmits(['settings-saved']);
Expand All@@ -58,7 +58,6 @@ const selectedIds = ref([]);
const allSelected = ref(false);

const onOk = async () => {
console.log(selectedIds.value);
configs.value = {
id: selectedIds.value,
};
Expand DownExpand Up@@ -124,14 +123,6 @@ const toggleAll = () => {
});
};

const refreshSettings = () => {
console.log('refreshSettings');
};

onMounted(() => {
//loadSettings();
});

defineExpose({
show,
hide,
Expand Down
163 changes: 163 additions & 0 deletions resources/js/admin/devlink/components/CreateDevLinkModal.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
<template>
<b-modal
ref="createDevLinkModal"
id="create"
centered
size="lg"
:title="$t('Create new DevLink')"
@hidden="clear"
@ok="create"
:ok-title="$t('Create')"
:cancel-title="$t('Cancel')"
>
<div v-if="status === 'error'" class="alert alert-danger" role="alert">
<div class="alert-header">
<span class="icon">!</span>
<strong>Connection Error</strong>
</div>
<a href="#" @click.prevent="toggleDetails">{{ showDetails ? 'See Less Details' : 'See More Details' }}</a>
<ul v-show="showDetails">
<li>Please check your internet connection.</li>
<li>Verify if the server is available or try again later.</li>
<li>If the issue persists, contact support for assistance.</li>
</ul>
</div>
<div>
<b-form-group :label="$t('Please assign a name to the desired linked instance')">
<b-form-input v-model="newName" :readonly="status === 'error'" />
</b-form-group>
<p>{{ $t('We require the access token of the instance you want to connect. If the token is correct, you will have to log-in in the corresponding instance.') }}</p>
<b-form-group
:label="$t('Instance URL')"
:invalid-feedback="$t('Invalid URL')"
:state="urlIsValid"
>
<b-form-input v-model="newUrl"></b-form-input>
</b-form-group>
</div>
</b-modal>
</template>

<script setup>
import { ref, watch } from 'vue';

const props = defineProps({
newName: {
type: String,
required: true
},
newUrl: {
type: String,
required: true
},
urlIsValid: {
type: Boolean,
required: true
},
status: {
type: String,
default: ''
},
showDetails: {
type: Boolean,
default: false
}
});
const createDevLinkModal = ref(null);

const newName = ref(props.newName);
const newUrl = ref(props.newUrl);
const emit = defineEmits(['clear', 'create', 'update:newUrl']);

const showDetails = ref(false);

const clear = () => {
newName.value = '';
newUrl.value = '';
};

const create = (e) => {
e.preventDefault();
if (props.urlIsValid) {
emit('create', newName.value, newUrl.value);
if (props.status === 'success') {
hide();
}
}
};

const show = () => {
if (createDevLinkModal.value) {
createDevLinkModal.value.show();
}
};

const hide = () => {
if (createDevLinkModal.value) {
createDevLinkModal.value.hide();
}
};

const toggleDetails = () => {
showDetails.value = !showDetails.value;
};

watch(newUrl, (newValue) => {
emit('update:newUrl', newValue);
});

defineExpose({
show,
hide,
});
</script>

<style lang="scss" scoped>
@import "styles/components/modal";

.alert {
background-color: #FDF2F2;
border: 1px solid #FBD0D0;
color: #596372;
padding: 20px;
border-radius: 8px;
position: relative;
margin: 20px auto;
font-size: 14px;
}

.alert-header {
display: flex;
align-items: center;
}

.alert .icon {
font-weight: bold;
color: #EC5962;
border: 1px solid #EC5962;
border-radius: 50%;
margin-right: 10px;
padding: 1px 7px;
font-size: 10px;
}

.alert strong {
margin-bottom: 0;
}

.alert ul {
margin: 10px 0 0 0;
padding-left: 20px;
list-style-type: disc;
}

.alert a {
color: #007bff;
cursor: pointer;
text-decoration: none;
}

.alert a:hover {
text-decoration: underline;
}
</style>
57 changes: 45 additions & 12 deletions resources/js/admin/devlink/components/Index.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import debounce from 'lodash/debounce';
import Status from './Status.vue';
import EllipsisMenu from '../../../components/shared/EllipsisMenu.vue';
import DeleteModal from './DeleteModal.vue';
import CreateDevLinkModal from './CreateDevLinkModal.vue';
import { store } from '../common';

const vue = getCurrentInstance().proxy;
Expand All@@ -13,6 +14,7 @@ const route = useRoute();
const devlinks = ref([]);
const editModal = ref(null);
const deleteModal = ref(null);
const createDevLinkModal = ref(null);
const deleteWarningTitle = ref(vue.$t("Delete Confirmation"));
const filter = ref("");
const actions = [
Expand DownExpand Up@@ -53,6 +55,7 @@ onMounted(() => {

const newName = ref('');
const newUrl = ref('');
const status = ref('');

const load = () => {
ProcessMaker.apiClient
Expand All@@ -78,16 +81,12 @@ const clear = () => {
newUrl.value = '';
}

const create = (e) => {
if (!urlIsValid.value) {
e.preventDefault();
return;
}

const create = (name, url) => {
status.value = '';
ProcessMaker.apiClient
.post('/devlink', {
name: newName.value,
url: newUrl.value
name: name,
url: url
})
.then((result) => {
const newUrl = result.data.url;
Expand All@@ -97,7 +96,22 @@ const create = (e) => {
devlink_id: newId,
redirect_uri: redirectUri,
};
window.location.href = `${newUrl}/admin/devlink/oauth-client?${new URLSearchParams(params).toString()}`;
const fullUrl = `${newUrl}/admin/devlink/oauth-client?${new URLSearchParams(params).toString()}`;

ProcessMaker.apiClient
.get(`devlink/${newId}/ping`)
.then((response) => {
status.value = 'success';
window.location.href = fullUrl;
})
.catch((e) => {
if (e.response.status === 401) {
status.value = 'success';
window.location.href = fullUrl;
} else {
status.value = 'error';
}
});
});
};

Expand DownExpand Up@@ -146,6 +160,15 @@ const handleFilterChange = () => {
debouncedLoad();
};

const showCreateModal = () => {
status.value = '';
createDevLinkModal.value.show();
};

const handleNewUrlUpdate = (newValue) => {
newUrl.value = newValue;
};

const urlIsValid = computed(() => {
return /^(https?:\/\/[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})(:\d{1,5})?$/.test(newUrl.value);
});
Expand All@@ -161,15 +184,15 @@ const urlIsValid = computed(() => {
<div class="col-2">
<b-button
variant="primary"
v-b-modal.create
@click="showCreateModal"
class="new-button"
>
<i class="fas fa-plus-circle" style="padding-right: 8px;"></i>{{ $t('Add Instance') }}
</b-button>
</div>
</div>

<b-modal
<!-- <b-modal
id="create"
centered
:title="$t('Create new DevLink')"
Expand All@@ -188,7 +211,17 @@ const urlIsValid = computed(() => {
>
<b-form-input v-model="newUrl"></b-form-input>
</b-form-group>
</b-modal>
</b-modal> -->
<CreateDevLinkModal
ref="createDevLinkModal"
:newName="newName"
:newUrl="newUrl"
:urlIsValid="urlIsValid"
:status="status"
@clear="clear"
@create="create"
@update:newUrl="handleNewUrlUpdate"
/>

<b-modal
ref="editModal"
Expand Down
, '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-20314 Add clear user errors for Instance connections#7956

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

nolanpro
merged 3 commits into

from

Jan 30, 2025
 Merged


feature/FOUR-20314 Add clear user errors for Instance connections
#7956
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f55c40f

Changed the frontend to handle connection errors


gustavobascope Jan 29, 2025
b4666ec

Merge branch 'epic/FOUR-20308' of github.com:ProcessMaker/processmake…


gustavobascope Jan 30, 2025
99bd6d5

Merge branch 'epic/FOUR-20308' of github.com:ProcessMaker/processmake…


gustavobascope Jan 30, 2025

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


22 changes: 15 additions & 7 deletions
ProcessMaker/Http/Controllers/Api/DevLinkController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,13 +55,17 @@ public function show(DevLink $devLink)
 public function store(Request $request)
 {
 $request->validate([
 'name' => ['required', 'unique:dev_links,name'],
 'url' => ['required', 'url', 'unique:dev_links,url'],
 'name' => ['required'],
 'url' => ['required', 'url'],
 ]);

 $devLink = new DevLink();
 $devLink->name = $request->input('name');
 $devLink->url = $request->input('url');
 $devLink = DevLink::where('name', $request->input('name'))->first();
 if ($devLink) {
 $devLink->url = $request->input('url');
 } else {
 $devLink = new DevLink();
 $devLink->name = $request->input('name');
 $devLink->url = $request->input('url');
 }
 $devLink->saveOrFail();

 return $devLink;
Expand All@@ -82,7 +86,11 @@ public function destroy(DevLink $devLink)

 public function ping(DevLink $devLink)
 {
 return $devLink->client()->get(route('api.devlink.pong', [], false));
 try {
 return$devLink->client()->get(route('api.devlink.pong', [], false));
 } catch (\Exception $e) {
 return response()->json(['error' => 'DevLink connection error'], $e->getCode());
 }
 }

 public function pong()
Expand Down

11 changes: 1 addition & 10 deletions
resources/js/admin/devlink/components/BundleSettingsModal.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@
 </b-modal>
</template>
<script setup>
import { ref, onMounted, getCurrentInstance } from 'vue';
import { ref } from 'vue';
import { useRoute } from 'vue-router/composables';

const emit = defineEmits(['settings-saved']);
Expand All@@ -58,7 +58,6 @@ const selectedIds = ref([]);
const allSelected = ref(false);

const onOk = async () => {
 console.log(selectedIds.value);
 configs.value = {
 id: selectedIds.value,
 };
Expand DownExpand Up@@ -124,14 +123,6 @@ const toggleAll = () => {
 });
};

const refreshSettings = () => {
 console.log('refreshSettings');
};

onMounted(() => {
 //loadSettings();
});

defineExpose({
 show,
 hide,
Expand Down

163 changes: 163 additions & 0 deletions
resources/js/admin/devlink/components/CreateDevLinkModal.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
<template>
 <b-modal
 ref="createDevLinkModal"
 id="create"
 centered
 size="lg"
 :title="$t('Create new DevLink')"
 @hidden="clear"
 @ok="create"
 :ok-title="$t('Create')"
 :cancel-title="$t('Cancel')"
 >
 <div v-if="status === 'error'" class="alert alert-danger" role="alert">
 <div class="alert-header">
 <span class="icon">!</span>
 <strong>Connection Error</strong>
 </div>
 <a href="#" @click.prevent="toggleDetails">{{ showDetails ? 'See Less Details' : 'See More Details' }}</a>
 <ul v-show="showDetails">
 <li>Please check your internet connection.</li>
 <li>Verify if the server is available or try again later.</li>
 <li>If the issue persists, contact support for assistance.</li>
 </ul>
 </div>
 <div>
 <b-form-group :label="$t('Please assign a name to the desired linked instance')">
 <b-form-input v-model="newName" :readonly="status === 'error'" />
 </b-form-group>
 <p>{{ $t('We require the access token of the instance you want to connect. If the token is correct, you will have to log-in in the corresponding instance.') }}</p>
 <b-form-group
 :label="$t('Instance URL')"
 :invalid-feedback="$t('Invalid URL')"
 :state="urlIsValid"
 >
 <b-form-input v-model="newUrl"></b-form-input>
 </b-form-group>
 </div>
 </b-modal>
</template>

<script setup>
import { ref, watch } from 'vue';

const props = defineProps({
 newName: {
 type: String,
 required: true
 },
 newUrl: {
 type: String,
 required: true
 },
 urlIsValid: {
 type: Boolean,
 required: true
 },
 status: {
 type: String,
 default: ''
 },
 showDetails: {
 type: Boolean,
 default: false
 }
});
const createDevLinkModal = ref(null);

const newName = ref(props.newName);
const newUrl = ref(props.newUrl);
const emit = defineEmits(['clear', 'create', 'update:newUrl']);

const showDetails = ref(false);

const clear = () => {
 newName.value = '';
 newUrl.value = '';
};

const create = (e) => {
 e.preventDefault();
 if (props.urlIsValid) {
 emit('create', newName.value, newUrl.value);
 if (props.status === 'success') {
 hide();
 }
 }
};

const show = () => {
 if (createDevLinkModal.value) {
 createDevLinkModal.value.show();
 }
};

const hide = () => {
 if (createDevLinkModal.value) {
 createDevLinkModal.value.hide();
 }
};

const toggleDetails = () => {
 showDetails.value = !showDetails.value;
};

watch(newUrl, (newValue) => {
 emit('update:newUrl', newValue);
});

defineExpose({
 show,
 hide,
});
</script>

<style lang="scss" scoped>
 @import "styles/components/modal";

 .alert {
 background-color: #FDF2F2;
 border: 1px solid #FBD0D0;
 color: #596372;
 padding: 20px;
 border-radius: 8px;
 position: relative;
 margin: 20px auto;
 font-size: 14px;
 }

 .alert-header {
 display: flex;
 align-items: center;
 }

 .alert .icon {
 font-weight: bold;
 color: #EC5962;
 border: 1px solid #EC5962;
 border-radius: 50%;
 margin-right: 10px;
 padding: 1px 7px;
 font-size: 10px;
 }

 .alert strong {
 margin-bottom: 0;
 }

 .alert ul {
 margin: 10px 0 0 0;
 padding-left: 20px;
 list-style-type: disc;
 }

 .alert a {
 color: #007bff;
 cursor: pointer;
 text-decoration: none;
 }

 .alert a:hover {
 text-decoration: underline;
 }
</style>

57 changes: 45 additions & 12 deletions
resources/js/admin/devlink/components/Index.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import debounce from 'lodash/debounce';
import Status from './Status.vue';
import EllipsisMenu from '../../../components/shared/EllipsisMenu.vue';
import DeleteModal from './DeleteModal.vue';
import CreateDevLinkModal from './CreateDevLinkModal.vue';
import { store } from '../common';

const vue = getCurrentInstance().proxy;
Expand All@@ -13,6 +14,7 @@ const route = useRoute();
const devlinks = ref([]);
const editModal = ref(null);
const deleteModal = ref(null);
const createDevLinkModal = ref(null);
const deleteWarningTitle = ref(vue.$t("Delete Confirmation"));
const filter = ref("");
const actions = [
Expand DownExpand Up@@ -53,6 +55,7 @@ onMounted(() => {

const newName = ref('');
const newUrl = ref('');
const status = ref('');

const load = () => {
 ProcessMaker.apiClient
Expand All@@ -78,16 +81,12 @@ const clear = () => {
 newUrl.value = '';
}

const create = (e) => {
 if (!urlIsValid.value) {
 e.preventDefault();
 return;
 }

const create = (name, url) => {
 status.value = '';
 ProcessMaker.apiClient
 .post('/devlink', {
 name: newName.value,
 url: newUrl.value
 name: name,
 url: url
 })
 .then((result) => {
 const newUrl = result.data.url;
Expand All@@ -97,7 +96,22 @@ const create = (e) => {
 devlink_id: newId,
 redirect_uri: redirectUri,
 };
 window.location.href = `${newUrl}/admin/devlink/oauth-client?${new URLSearchParams(params).toString()}`;
 const fullUrl = `${newUrl}/admin/devlink/oauth-client?${new URLSearchParams(params).toString()}`;

 ProcessMaker.apiClient
 .get(`devlink/${newId}/ping`)
 .then((response) => {
 status.value = 'success';
 window.location.href = fullUrl;
 })
 .catch((e) => {
 if (e.response.status === 401) {
 status.value = 'success';
 window.location.href = fullUrl;
 } else {
 status.value = 'error';
 }
 });
 });
};

Expand DownExpand Up@@ -146,6 +160,15 @@ const handleFilterChange = () => {
 debouncedLoad();
};

const showCreateModal = () => {
 status.value = '';
 createDevLinkModal.value.show();
};

const handleNewUrlUpdate = (newValue) => {
 newUrl.value = newValue;
};

const urlIsValid = computed(() => {
 return /^(https?:\/\/[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})(:\d{1,5})?$/.test(newUrl.value);
});
Expand All@@ -161,15 +184,15 @@ const urlIsValid = computed(() => {
 <div class="col-2">
 <b-button
 variant="primary"
v-b-modal.create
@click="showCreateModal"
 class="new-button"
 >
 <i class="fas fa-plus-circle" style="padding-right: 8px;"></i>{{ $t('Add Instance') }}
 </b-button>
 </div>
 </div>

 <b-modal
 <!-- <b-modal
 id="create"
 centered
 :title="$t('Create new DevLink')"
Expand All@@ -188,7 +211,17 @@ const urlIsValid = computed(() => {
 >
 <b-form-input v-model="newUrl"></b-form-input>
 </b-form-group>
 </b-modal>
 </b-modal> -->
 <CreateDevLinkModal
 ref="createDevLinkModal"
 :newName="newName"
 :newUrl="newUrl"
 :urlIsValid="urlIsValid"
 :status="status"
 @clear="clear"
 @create="create"
 @update:newUrl="handleNewUrlUpdate"
 />

 <b-modal
 ref="editModal"
Expand Down

, '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-20314 Add clear user errors for Instance connections#7956

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

nolanpro
merged 3 commits into

from

Jan 30, 2025
 Merged


feature/FOUR-20314 Add clear user errors for Instance connections
#7956
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f55c40f

Changed the frontend to handle connection errors


gustavobascope Jan 29, 2025
b4666ec

Merge branch 'epic/FOUR-20308' of github.com:ProcessMaker/processmake…


gustavobascope Jan 30, 2025
99bd6d5

Merge branch 'epic/FOUR-20308' of github.com:ProcessMaker/processmake…


gustavobascope Jan 30, 2025

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


22 changes: 15 additions & 7 deletions
ProcessMaker/Http/Controllers/Api/DevLinkController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,13 +55,17 @@ public function show(DevLink $devLink)
 public function store(Request $request)
 {
 $request->validate([
 'name' => ['required', 'unique:dev_links,name'],
 'url' => ['required', 'url', 'unique:dev_links,url'],
 'name' => ['required'],
 'url' => ['required', 'url'],
 ]);

 $devLink = new DevLink();
 $devLink->name = $request->input('name');
 $devLink->url = $request->input('url');
 $devLink = DevLink::where('name', $request->input('name'))->first();
 if ($devLink) {
 $devLink->url = $request->input('url');
 } else {
 $devLink = new DevLink();
 $devLink->name = $request->input('name');
 $devLink->url = $request->input('url');
 }
 $devLink->saveOrFail();

 return $devLink;
Expand All@@ -82,7 +86,11 @@ public function destroy(DevLink $devLink)

 public function ping(DevLink $devLink)
 {
 return $devLink->client()->get(route('api.devlink.pong', [], false));
 try {
 return$devLink->client()->get(route('api.devlink.pong', [], false));
 } catch (\Exception $e) {
 return response()->json(['error' => 'DevLink connection error'], $e->getCode());
 }
 }

 public function pong()
Expand Down

11 changes: 1 addition & 10 deletions
resources/js/admin/devlink/components/BundleSettingsModal.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@
 </b-modal>
</template>
<script setup>
import { ref, onMounted, getCurrentInstance } from 'vue';
import { ref } from 'vue';
import { useRoute } from 'vue-router/composables';

const emit = defineEmits(['settings-saved']);
Expand All@@ -58,7 +58,6 @@ const selectedIds = ref([]);
const allSelected = ref(false);

const onOk = async () => {
 console.log(selectedIds.value);
 configs.value = {
 id: selectedIds.value,
 };
Expand DownExpand Up@@ -124,14 +123,6 @@ const toggleAll = () => {
 });
};

const refreshSettings = () => {
 console.log('refreshSettings');
};

onMounted(() => {
 //loadSettings();
});

defineExpose({
 show,
 hide,
Expand Down

163 changes: 163 additions & 0 deletions
resources/js/admin/devlink/components/CreateDevLinkModal.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
<template>
 <b-modal
 ref="createDevLinkModal"
 id="create"
 centered
 size="lg"
 :title="$t('Create new DevLink')"
 @hidden="clear"
 @ok="create"
 :ok-title="$t('Create')"
 :cancel-title="$t('Cancel')"
 >
 <div v-if="status === 'error'" class="alert alert-danger" role="alert">
 <div class="alert-header">
 <span class="icon">!</span>
 <strong>Connection Error</strong>
 </div>
 <a href="#" @click.prevent="toggleDetails">{{ showDetails ? 'See Less Details' : 'See More Details' }}</a>
 <ul v-show="showDetails">
 <li>Please check your internet connection.</li>
 <li>Verify if the server is available or try again later.</li>
 <li>If the issue persists, contact support for assistance.</li>
 </ul>
 </div>
 <div>
 <b-form-group :label="$t('Please assign a name to the desired linked instance')">
 <b-form-input v-model="newName" :readonly="status === 'error'" />
 </b-form-group>
 <p>{{ $t('We require the access token of the instance you want to connect. If the token is correct, you will have to log-in in the corresponding instance.') }}</p>
 <b-form-group
 :label="$t('Instance URL')"
 :invalid-feedback="$t('Invalid URL')"
 :state="urlIsValid"
 >
 <b-form-input v-model="newUrl"></b-form-input>
 </b-form-group>
 </div>
 </b-modal>
</template>

<script setup>
import { ref, watch } from 'vue';

const props = defineProps({
 newName: {
 type: String,
 required: true
 },
 newUrl: {
 type: String,
 required: true
 },
 urlIsValid: {
 type: Boolean,
 required: true
 },
 status: {
 type: String,
 default: ''
 },
 showDetails: {
 type: Boolean,
 default: false
 }
});
const createDevLinkModal = ref(null);

const newName = ref(props.newName);
const newUrl = ref(props.newUrl);
const emit = defineEmits(['clear', 'create', 'update:newUrl']);

const showDetails = ref(false);

const clear = () => {
 newName.value = '';
 newUrl.value = '';
};

const create = (e) => {
 e.preventDefault();
 if (props.urlIsValid) {
 emit('create', newName.value, newUrl.value);
 if (props.status === 'success') {
 hide();
 }
 }
};

const show = () => {
 if (createDevLinkModal.value) {
 createDevLinkModal.value.show();
 }
};

const hide = () => {
 if (createDevLinkModal.value) {
 createDevLinkModal.value.hide();
 }
};

const toggleDetails = () => {
 showDetails.value = !showDetails.value;
};

watch(newUrl, (newValue) => {
 emit('update:newUrl', newValue);
});

defineExpose({
 show,
 hide,
});
</script>

<style lang="scss" scoped>
 @import "styles/components/modal";

 .alert {
 background-color: #FDF2F2;
 border: 1px solid #FBD0D0;
 color: #596372;
 padding: 20px;
 border-radius: 8px;
 position: relative;
 margin: 20px auto;
 font-size: 14px;
 }

 .alert-header {
 display: flex;
 align-items: center;
 }

 .alert .icon {
 font-weight: bold;
 color: #EC5962;
 border: 1px solid #EC5962;
 border-radius: 50%;
 margin-right: 10px;
 padding: 1px 7px;
 font-size: 10px;
 }

 .alert strong {
 margin-bottom: 0;
 }

 .alert ul {
 margin: 10px 0 0 0;
 padding-left: 20px;
 list-style-type: disc;
 }

 .alert a {
 color: #007bff;
 cursor: pointer;
 text-decoration: none;
 }

 .alert a:hover {
 text-decoration: underline;
 }
</style>

57 changes: 45 additions & 12 deletions
resources/js/admin/devlink/components/Index.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import debounce from 'lodash/debounce';
import Status from './Status.vue';
import EllipsisMenu from '../../../components/shared/EllipsisMenu.vue';
import DeleteModal from './DeleteModal.vue';
import CreateDevLinkModal from './CreateDevLinkModal.vue';
import { store } from '../common';

const vue = getCurrentInstance().proxy;
Expand All@@ -13,6 +14,7 @@ const route = useRoute();
const devlinks = ref([]);
const editModal = ref(null);
const deleteModal = ref(null);
const createDevLinkModal = ref(null);
const deleteWarningTitle = ref(vue.$t("Delete Confirmation"));
const filter = ref("");
const actions = [
Expand DownExpand Up@@ -53,6 +55,7 @@ onMounted(() => {

const newName = ref('');
const newUrl = ref('');
const status = ref('');

const load = () => {
 ProcessMaker.apiClient
Expand All@@ -78,16 +81,12 @@ const clear = () => {
 newUrl.value = '';
}

const create = (e) => {
 if (!urlIsValid.value) {
 e.preventDefault();
 return;
 }

const create = (name, url) => {
 status.value = '';
 ProcessMaker.apiClient
 .post('/devlink', {
 name: newName.value,
 url: newUrl.value
 name: name,
 url: url
 })
 .then((result) => {
 const newUrl = result.data.url;
Expand All@@ -97,7 +96,22 @@ const create = (e) => {
 devlink_id: newId,
 redirect_uri: redirectUri,
 };
 window.location.href = `${newUrl}/admin/devlink/oauth-client?${new URLSearchParams(params).toString()}`;
 const fullUrl = `${newUrl}/admin/devlink/oauth-client?${new URLSearchParams(params).toString()}`;

 ProcessMaker.apiClient
 .get(`devlink/${newId}/ping`)
 .then((response) => {
 status.value = 'success';
 window.location.href = fullUrl;
 })
 .catch((e) => {
 if (e.response.status === 401) {
 status.value = 'success';
 window.location.href = fullUrl;
 } else {
 status.value = 'error';
 }
 });
 });
};

Expand DownExpand Up@@ -146,6 +160,15 @@ const handleFilterChange = () => {
 debouncedLoad();
};

const showCreateModal = () => {
 status.value = '';
 createDevLinkModal.value.show();
};

const handleNewUrlUpdate = (newValue) => {
 newUrl.value = newValue;
};

const urlIsValid = computed(() => {
 return /^(https?:\/\/[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})(:\d{1,5})?$/.test(newUrl.value);
});
Expand All@@ -161,15 +184,15 @@ const urlIsValid = computed(() => {
 <div class="col-2">
 <b-button
 variant="primary"
v-b-modal.create
@click="showCreateModal"
 class="new-button"
 >
 <i class="fas fa-plus-circle" style="padding-right: 8px;"></i>{{ $t('Add Instance') }}
 </b-button>
 </div>
 </div>

 <b-modal
 <!-- <b-modal
 id="create"
 centered
 :title="$t('Create new DevLink')"
Expand All@@ -188,7 +211,17 @@ const urlIsValid = computed(() => {
 >
 <b-form-input v-model="newUrl"></b-form-input>
 </b-form-group>
 </b-modal>
 </b-modal> -->
 <CreateDevLinkModal
 ref="createDevLinkModal"
 :newName="newName"
 :newUrl="newUrl"
 :urlIsValid="urlIsValid"
 :status="status"
 @clear="clear"
 @create="create"
 @update:newUrl="handleNewUrlUpdate"
 />

 <b-modal
 ref="editModal"
Expand Down

, '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-20314 Add clear user errors for Instance connections#7956

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

nolanpro
merged 3 commits into

from

Jan 30, 2025
 Merged


feature/FOUR-20314 Add clear user errors for Instance connections
#7956
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f55c40f

Changed the frontend to handle connection errors


gustavobascope Jan 29, 2025
b4666ec

Merge branch 'epic/FOUR-20308' of github.com:ProcessMaker/processmake…


gustavobascope Jan 30, 2025
99bd6d5

Merge branch 'epic/FOUR-20308' of github.com:ProcessMaker/processmake…


gustavobascope Jan 30, 2025

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


22 changes: 15 additions & 7 deletions
ProcessMaker/Http/Controllers/Api/DevLinkController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,13 +55,17 @@ public function show(DevLink $devLink)
 public function store(Request $request)
 {
 $request->validate([
 'name' => ['required', 'unique:dev_links,name'],
 'url' => ['required', 'url', 'unique:dev_links,url'],
 'name' => ['required'],
 'url' => ['required', 'url'],
 ]);

 $devLink = new DevLink();
 $devLink->name = $request->input('name');
 $devLink->url = $request->input('url');
 $devLink = DevLink::where('name', $request->input('name'))->first();
 if ($devLink) {
 $devLink->url = $request->input('url');
 } else {
 $devLink = new DevLink();
 $devLink->name = $request->input('name');
 $devLink->url = $request->input('url');
 }
 $devLink->saveOrFail();

 return $devLink;
Expand All@@ -82,7 +86,11 @@ public function destroy(DevLink $devLink)

 public function ping(DevLink $devLink)
 {
 return $devLink->client()->get(route('api.devlink.pong', [], false));
 try {
 return$devLink->client()->get(route('api.devlink.pong', [], false));
 } catch (\Exception $e) {
 return response()->json(['error' => 'DevLink connection error'], $e->getCode());
 }
 }

 public function pong()
Expand Down

11 changes: 1 addition & 10 deletions
resources/js/admin/devlink/components/BundleSettingsModal.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@
 </b-modal>
</template>
<script setup>
import { ref, onMounted, getCurrentInstance } from 'vue';
import { ref } from 'vue';
import { useRoute } from 'vue-router/composables';

const emit = defineEmits(['settings-saved']);
Expand All@@ -58,7 +58,6 @@ const selectedIds = ref([]);
const allSelected = ref(false);

const onOk = async () => {
 console.log(selectedIds.value);
 configs.value = {
 id: selectedIds.value,
 };
Expand DownExpand Up@@ -124,14 +123,6 @@ const toggleAll = () => {
 });
};

const refreshSettings = () => {
 console.log('refreshSettings');
};

onMounted(() => {
 //loadSettings();
});

defineExpose({
 show,
 hide,
Expand Down

163 changes: 163 additions & 0 deletions
resources/js/admin/devlink/components/CreateDevLinkModal.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
<template>
 <b-modal
 ref="createDevLinkModal"
 id="create"
 centered
 size="lg"
 :title="$t('Create new DevLink')"
 @hidden="clear"
 @ok="create"
 :ok-title="$t('Create')"
 :cancel-title="$t('Cancel')"
 >
 <div v-if="status === 'error'" class="alert alert-danger" role="alert">
 <div class="alert-header">
 <span class="icon">!</span>
 <strong>Connection Error</strong>
 </div>
 <a href="#" @click.prevent="toggleDetails">{{ showDetails ? 'See Less Details' : 'See More Details' }}</a>
 <ul v-show="showDetails">
 <li>Please check your internet connection.</li>
 <li>Verify if the server is available or try again later.</li>
 <li>If the issue persists, contact support for assistance.</li>
 </ul>
 </div>
 <div>
 <b-form-group :label="$t('Please assign a name to the desired linked instance')">
 <b-form-input v-model="newName" :readonly="status === 'error'" />
 </b-form-group>
 <p>{{ $t('We require the access token of the instance you want to connect. If the token is correct, you will have to log-in in the corresponding instance.') }}</p>
 <b-form-group
 :label="$t('Instance URL')"
 :invalid-feedback="$t('Invalid URL')"
 :state="urlIsValid"
 >
 <b-form-input v-model="newUrl"></b-form-input>
 </b-form-group>
 </div>
 </b-modal>
</template>

<script setup>
import { ref, watch } from 'vue';

const props = defineProps({
 newName: {
 type: String,
 required: true
 },
 newUrl: {
 type: String,
 required: true
 },
 urlIsValid: {
 type: Boolean,
 required: true
 },
 status: {
 type: String,
 default: ''
 },
 showDetails: {
 type: Boolean,
 default: false
 }
});
const createDevLinkModal = ref(null);

const newName = ref(props.newName);
const newUrl = ref(props.newUrl);
const emit = defineEmits(['clear', 'create', 'update:newUrl']);

const showDetails = ref(false);

const clear = () => {
 newName.value = '';
 newUrl.value = '';
};

const create = (e) => {
 e.preventDefault();
 if (props.urlIsValid) {
 emit('create', newName.value, newUrl.value);
 if (props.status === 'success') {
 hide();
 }
 }
};

const show = () => {
 if (createDevLinkModal.value) {
 createDevLinkModal.value.show();
 }
};

const hide = () => {
 if (createDevLinkModal.value) {
 createDevLinkModal.value.hide();
 }
};

const toggleDetails = () => {
 showDetails.value = !showDetails.value;
};

watch(newUrl, (newValue) => {
 emit('update:newUrl', newValue);
});

defineExpose({
 show,
 hide,
});
</script>

<style lang="scss" scoped>
 @import "styles/components/modal";

 .alert {
 background-color: #FDF2F2;
 border: 1px solid #FBD0D0;
 color: #596372;
 padding: 20px;
 border-radius: 8px;
 position: relative;
 margin: 20px auto;
 font-size: 14px;
 }

 .alert-header {
 display: flex;
 align-items: center;
 }

 .alert .icon {
 font-weight: bold;
 color: #EC5962;
 border: 1px solid #EC5962;
 border-radius: 50%;
 margin-right: 10px;
 padding: 1px 7px;
 font-size: 10px;
 }

 .alert strong {
 margin-bottom: 0;
 }

 .alert ul {
 margin: 10px 0 0 0;
 padding-left: 20px;
 list-style-type: disc;
 }

 .alert a {
 color: #007bff;
 cursor: pointer;
 text-decoration: none;
 }

 .alert a:hover {
 text-decoration: underline;
 }
</style>

57 changes: 45 additions & 12 deletions
resources/js/admin/devlink/components/Index.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import debounce from 'lodash/debounce';
import Status from './Status.vue';
import EllipsisMenu from '../../../components/shared/EllipsisMenu.vue';
import DeleteModal from './DeleteModal.vue';
import CreateDevLinkModal from './CreateDevLinkModal.vue';
import { store } from '../common';

const vue = getCurrentInstance().proxy;
Expand All@@ -13,6 +14,7 @@ const route = useRoute();
const devlinks = ref([]);
const editModal = ref(null);
const deleteModal = ref(null);
const createDevLinkModal = ref(null);
const deleteWarningTitle = ref(vue.$t("Delete Confirmation"));
const filter = ref("");
const actions = [
Expand DownExpand Up@@ -53,6 +55,7 @@ onMounted(() => {

const newName = ref('');
const newUrl = ref('');
const status = ref('');

const load = () => {
 ProcessMaker.apiClient
Expand All@@ -78,16 +81,12 @@ const clear = () => {
 newUrl.value = '';
}

const create = (e) => {
 if (!urlIsValid.value) {
 e.preventDefault();
 return;
 }

const create = (name, url) => {
 status.value = '';
 ProcessMaker.apiClient
 .post('/devlink', {
 name: newName.value,
 url: newUrl.value
 name: name,
 url: url
 })
 .then((result) => {
 const newUrl = result.data.url;
Expand All@@ -97,7 +96,22 @@ const create = (e) => {
 devlink_id: newId,
 redirect_uri: redirectUri,
 };
 window.location.href = `${newUrl}/admin/devlink/oauth-client?${new URLSearchParams(params).toString()}`;
 const fullUrl = `${newUrl}/admin/devlink/oauth-client?${new URLSearchParams(params).toString()}`;

 ProcessMaker.apiClient
 .get(`devlink/${newId}/ping`)
 .then((response) => {
 status.value = 'success';
 window.location.href = fullUrl;
 })
 .catch((e) => {
 if (e.response.status === 401) {
 status.value = 'success';
 window.location.href = fullUrl;
 } else {
 status.value = 'error';
 }
 });
 });
};

Expand DownExpand Up@@ -146,6 +160,15 @@ const handleFilterChange = () => {
 debouncedLoad();
};

const showCreateModal = () => {
 status.value = '';
 createDevLinkModal.value.show();
};

const handleNewUrlUpdate = (newValue) => {
 newUrl.value = newValue;
};

const urlIsValid = computed(() => {
 return /^(https?:\/\/[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})(:\d{1,5})?$/.test(newUrl.value);
});
Expand All@@ -161,15 +184,15 @@ const urlIsValid = computed(() => {
 <div class="col-2">
 <b-button
 variant="primary"
v-b-modal.create
@click="showCreateModal"
 class="new-button"
 >
 <i class="fas fa-plus-circle" style="padding-right: 8px;"></i>{{ $t('Add Instance') }}
 </b-button>
 </div>
 </div>

 <b-modal
 <!-- <b-modal
 id="create"
 centered
 :title="$t('Create new DevLink')"
Expand All@@ -188,7 +211,17 @@ const urlIsValid = computed(() => {
 >
 <b-form-input v-model="newUrl"></b-form-input>
 </b-form-group>
 </b-modal>
 </b-modal> -->
 <CreateDevLinkModal
 ref="createDevLinkModal"
 :newName="newName"
 :newUrl="newUrl"
 :urlIsValid="urlIsValid"
 :status="status"
 @clear="clear"
 @create="create"
 @update:newUrl="handleNewUrlUpdate"
 />

 <b-modal
 ref="editModal"
Expand Down

, '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-20314 Add clear user errors for Instance connections#7956

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

nolanpro
merged 3 commits into

from

Jan 30, 2025
 Merged


feature/FOUR-20314 Add clear user errors for Instance connections
#7956
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f55c40f

Changed the frontend to handle connection errors


gustavobascope Jan 29, 2025
b4666ec

Merge branch 'epic/FOUR-20308' of github.com:ProcessMaker/processmake…


gustavobascope Jan 30, 2025
99bd6d5

Merge branch 'epic/FOUR-20308' of github.com:ProcessMaker/processmake…


gustavobascope Jan 30, 2025

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


22 changes: 15 additions & 7 deletions
ProcessMaker/Http/Controllers/Api/DevLinkController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,13 +55,17 @@ public function show(DevLink $devLink)
 public function store(Request $request)
 {
 $request->validate([
 'name' => ['required', 'unique:dev_links,name'],
 'url' => ['required', 'url', 'unique:dev_links,url'],
 'name' => ['required'],
 'url' => ['required', 'url'],
 ]);

 $devLink = new DevLink();
 $devLink->name = $request->input('name');
 $devLink->url = $request->input('url');
 $devLink = DevLink::where('name', $request->input('name'))->first();
 if ($devLink) {
 $devLink->url = $request->input('url');
 } else {
 $devLink = new DevLink();
 $devLink->name = $request->input('name');
 $devLink->url = $request->input('url');
 }
 $devLink->saveOrFail();

 return $devLink;
Expand All@@ -82,7 +86,11 @@ public function destroy(DevLink $devLink)

 public function ping(DevLink $devLink)
 {
 return $devLink->client()->get(route('api.devlink.pong', [], false));
 try {
 return$devLink->client()->get(route('api.devlink.pong', [], false));
 } catch (\Exception $e) {
 return response()->json(['error' => 'DevLink connection error'], $e->getCode());
 }
 }

 public function pong()
Expand Down

11 changes: 1 addition & 10 deletions
resources/js/admin/devlink/components/BundleSettingsModal.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@
 </b-modal>
</template>
<script setup>
import { ref, onMounted, getCurrentInstance } from 'vue';
import { ref } from 'vue';
import { useRoute } from 'vue-router/composables';

const emit = defineEmits(['settings-saved']);
Expand All@@ -58,7 +58,6 @@ const selectedIds = ref([]);
const allSelected = ref(false);

const onOk = async () => {
 console.log(selectedIds.value);
 configs.value = {
 id: selectedIds.value,
 };
Expand DownExpand Up@@ -124,14 +123,6 @@ const toggleAll = () => {
 });
};

const refreshSettings = () => {
 console.log('refreshSettings');
};

onMounted(() => {
 //loadSettings();
});

defineExpose({
 show,
 hide,
Expand Down

163 changes: 163 additions & 0 deletions
resources/js/admin/devlink/components/CreateDevLinkModal.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
<template>
 <b-modal
 ref="createDevLinkModal"
 id="create"
 centered
 size="lg"
 :title="$t('Create new DevLink')"
 @hidden="clear"
 @ok="create"
 :ok-title="$t('Create')"
 :cancel-title="$t('Cancel')"
 >
 <div v-if="status === 'error'" class="alert alert-danger" role="alert">
 <div class="alert-header">
 <span class="icon">!</span>
 <strong>Connection Error</strong>
 </div>
 <a href="#" @click.prevent="toggleDetails">{{ showDetails ? 'See Less Details' : 'See More Details' }}</a>
 <ul v-show="showDetails">
 <li>Please check your internet connection.</li>
 <li>Verify if the server is available or try again later.</li>
 <li>If the issue persists, contact support for assistance.</li>
 </ul>
 </div>
 <div>
 <b-form-group :label="$t('Please assign a name to the desired linked instance')">
 <b-form-input v-model="newName" :readonly="status === 'error'" />
 </b-form-group>
 <p>{{ $t('We require the access token of the instance you want to connect. If the token is correct, you will have to log-in in the corresponding instance.') }}</p>
 <b-form-group
 :label="$t('Instance URL')"
 :invalid-feedback="$t('Invalid URL')"
 :state="urlIsValid"
 >
 <b-form-input v-model="newUrl"></b-form-input>
 </b-form-group>
 </div>
 </b-modal>
</template>

<script setup>
import { ref, watch } from 'vue';

const props = defineProps({
 newName: {
 type: String,
 required: true
 },
 newUrl: {
 type: String,
 required: true
 },
 urlIsValid: {
 type: Boolean,
 required: true
 },
 status: {
 type: String,
 default: ''
 },
 showDetails: {
 type: Boolean,
 default: false
 }
});
const createDevLinkModal = ref(null);

const newName = ref(props.newName);
const newUrl = ref(props.newUrl);
const emit = defineEmits(['clear', 'create', 'update:newUrl']);

const showDetails = ref(false);

const clear = () => {
 newName.value = '';
 newUrl.value = '';
};

const create = (e) => {
 e.preventDefault();
 if (props.urlIsValid) {
 emit('create', newName.value, newUrl.value);
 if (props.status === 'success') {
 hide();
 }
 }
};

const show = () => {
 if (createDevLinkModal.value) {
 createDevLinkModal.value.show();
 }
};

const hide = () => {
 if (createDevLinkModal.value) {
 createDevLinkModal.value.hide();
 }
};

const toggleDetails = () => {
 showDetails.value = !showDetails.value;
};

watch(newUrl, (newValue) => {
 emit('update:newUrl', newValue);
});

defineExpose({
 show,
 hide,
});
</script>

<style lang="scss" scoped>
 @import "styles/components/modal";

 .alert {
 background-color: #FDF2F2;
 border: 1px solid #FBD0D0;
 color: #596372;
 padding: 20px;
 border-radius: 8px;
 position: relative;
 margin: 20px auto;
 font-size: 14px;
 }

 .alert-header {
 display: flex;
 align-items: center;
 }

 .alert .icon {
 font-weight: bold;
 color: #EC5962;
 border: 1px solid #EC5962;
 border-radius: 50%;
 margin-right: 10px;
 padding: 1px 7px;
 font-size: 10px;
 }

 .alert strong {
 margin-bottom: 0;
 }

 .alert ul {
 margin: 10px 0 0 0;
 padding-left: 20px;
 list-style-type: disc;
 }

 .alert a {
 color: #007bff;
 cursor: pointer;
 text-decoration: none;
 }

 .alert a:hover {
 text-decoration: underline;
 }
</style>

57 changes: 45 additions & 12 deletions
resources/js/admin/devlink/components/Index.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import debounce from 'lodash/debounce';
import Status from './Status.vue';
import EllipsisMenu from '../../../components/shared/EllipsisMenu.vue';
import DeleteModal from './DeleteModal.vue';
import CreateDevLinkModal from './CreateDevLinkModal.vue';
import { store } from '../common';

const vue = getCurrentInstance().proxy;
Expand All@@ -13,6 +14,7 @@ const route = useRoute();
const devlinks = ref([]);
const editModal = ref(null);
const deleteModal = ref(null);
const createDevLinkModal = ref(null);
const deleteWarningTitle = ref(vue.$t("Delete Confirmation"));
const filter = ref("");
const actions = [
Expand DownExpand Up@@ -53,6 +55,7 @@ onMounted(() => {

const newName = ref('');
const newUrl = ref('');
const status = ref('');

const load = () => {
 ProcessMaker.apiClient
Expand All@@ -78,16 +81,12 @@ const clear = () => {
 newUrl.value = '';
}

const create = (e) => {
 if (!urlIsValid.value) {
 e.preventDefault();
 return;
 }

const create = (name, url) => {
 status.value = '';
 ProcessMaker.apiClient
 .post('/devlink', {
 name: newName.value,
 url: newUrl.value
 name: name,
 url: url
 })
 .then((result) => {
 const newUrl = result.data.url;
Expand All@@ -97,7 +96,22 @@ const create = (e) => {
 devlink_id: newId,
 redirect_uri: redirectUri,
 };
 window.location.href = `${newUrl}/admin/devlink/oauth-client?${new URLSearchParams(params).toString()}`;
 const fullUrl = `${newUrl}/admin/devlink/oauth-client?${new URLSearchParams(params).toString()}`;

 ProcessMaker.apiClient
 .get(`devlink/${newId}/ping`)
 .then((response) => {
 status.value = 'success';
 window.location.href = fullUrl;
 })
 .catch((e) => {
 if (e.response.status === 401) {
 status.value = 'success';
 window.location.href = fullUrl;
 } else {
 status.value = 'error';
 }
 });
 });
};

Expand DownExpand Up@@ -146,6 +160,15 @@ const handleFilterChange = () => {
 debouncedLoad();
};

const showCreateModal = () => {
 status.value = '';
 createDevLinkModal.value.show();
};

const handleNewUrlUpdate = (newValue) => {
 newUrl.value = newValue;
};

const urlIsValid = computed(() => {
 return /^(https?:\/\/[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})(:\d{1,5})?$/.test(newUrl.value);
});
Expand All@@ -161,15 +184,15 @@ const urlIsValid = computed(() => {
 <div class="col-2">
 <b-button
 variant="primary"
v-b-modal.create
@click="showCreateModal"
 class="new-button"
 >
 <i class="fas fa-plus-circle" style="padding-right: 8px;"></i>{{ $t('Add Instance') }}
 </b-button>
 </div>
 </div>

 <b-modal
 <!-- <b-modal
 id="create"
 centered
 :title="$t('Create new DevLink')"
Expand All@@ -188,7 +211,17 @@ const urlIsValid = computed(() => {
 >
 <b-form-input v-model="newUrl"></b-form-input>
 </b-form-group>
 </b-modal>
 </b-modal> -->
 <CreateDevLinkModal
 ref="createDevLinkModal"
 :newName="newName"
 :newUrl="newUrl"
 :urlIsValid="urlIsValid"
 :status="status"
 @clear="clear"
 @create="create"
 @update:newUrl="handleNewUrlUpdate"
 />

 <b-modal
 ref="editModal"
Expand Down

, '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-20314 Add clear user errors for Instance connections#7956

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

nolanpro
merged 3 commits into

from

Jan 30, 2025
 Merged


feature/FOUR-20314 Add clear user errors for Instance connections
#7956
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f55c40f

Changed the frontend to handle connection errors


gustavobascope Jan 29, 2025
b4666ec

Merge branch 'epic/FOUR-20308' of github.com:ProcessMaker/processmake…


gustavobascope Jan 30, 2025
99bd6d5

Merge branch 'epic/FOUR-20308' of github.com:ProcessMaker/processmake…


gustavobascope Jan 30, 2025

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


22 changes: 15 additions & 7 deletions
ProcessMaker/Http/Controllers/Api/DevLinkController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,13 +55,17 @@ public function show(DevLink $devLink)
 public function store(Request $request)
 {
 $request->validate([
 'name' => ['required', 'unique:dev_links,name'],
 'url' => ['required', 'url', 'unique:dev_links,url'],
 'name' => ['required'],
 'url' => ['required', 'url'],
 ]);

 $devLink = new DevLink();
 $devLink->name = $request->input('name');
 $devLink->url = $request->input('url');
 $devLink = DevLink::where('name', $request->input('name'))->first();
 if ($devLink) {
 $devLink->url = $request->input('url');
 } else {
 $devLink = new DevLink();
 $devLink->name = $request->input('name');
 $devLink->url = $request->input('url');
 }
 $devLink->saveOrFail();

 return $devLink;
Expand All@@ -82,7 +86,11 @@ public function destroy(DevLink $devLink)

 public function ping(DevLink $devLink)
 {
 return $devLink->client()->get(route('api.devlink.pong', [], false));
 try {
 return$devLink->client()->get(route('api.devlink.pong', [], false));
 } catch (\Exception $e) {
 return response()->json(['error' => 'DevLink connection error'], $e->getCode());
 }
 }

 public function pong()
Expand Down

11 changes: 1 addition & 10 deletions
resources/js/admin/devlink/components/BundleSettingsModal.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@
 </b-modal>
</template>
<script setup>
import { ref, onMounted, getCurrentInstance } from 'vue';
import { ref } from 'vue';
import { useRoute } from 'vue-router/composables';

const emit = defineEmits(['settings-saved']);
Expand All@@ -58,7 +58,6 @@ const selectedIds = ref([]);
const allSelected = ref(false);

const onOk = async () => {
 console.log(selectedIds.value);
 configs.value = {
 id: selectedIds.value,
 };
Expand DownExpand Up@@ -124,14 +123,6 @@ const toggleAll = () => {
 });
};

const refreshSettings = () => {
 console.log('refreshSettings');
};

onMounted(() => {
 //loadSettings();
});

defineExpose({
 show,
 hide,
Expand Down

163 changes: 163 additions & 0 deletions
resources/js/admin/devlink/components/CreateDevLinkModal.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
<template>
 <b-modal
 ref="createDevLinkModal"
 id="create"
 centered
 size="lg"
 :title="$t('Create new DevLink')"
 @hidden="clear"
 @ok="create"
 :ok-title="$t('Create')"
 :cancel-title="$t('Cancel')"
 >
 <div v-if="status === 'error'" class="alert alert-danger" role="alert">
 <div class="alert-header">
 <span class="icon">!</span>
 <strong>Connection Error</strong>
 </div>
 <a href="#" @click.prevent="toggleDetails">{{ showDetails ? 'See Less Details' : 'See More Details' }}</a>
 <ul v-show="showDetails">
 <li>Please check your internet connection.</li>
 <li>Verify if the server is available or try again later.</li>
 <li>If the issue persists, contact support for assistance.</li>
 </ul>
 </div>
 <div>
 <b-form-group :label="$t('Please assign a name to the desired linked instance')">
 <b-form-input v-model="newName" :readonly="status === 'error'" />
 </b-form-group>
 <p>{{ $t('We require the access token of the instance you want to connect. If the token is correct, you will have to log-in in the corresponding instance.') }}</p>
 <b-form-group
 :label="$t('Instance URL')"
 :invalid-feedback="$t('Invalid URL')"
 :state="urlIsValid"
 >
 <b-form-input v-model="newUrl"></b-form-input>
 </b-form-group>
 </div>
 </b-modal>
</template>

<script setup>
import { ref, watch } from 'vue';

const props = defineProps({
 newName: {
 type: String,
 required: true
 },
 newUrl: {
 type: String,
 required: true
 },
 urlIsValid: {
 type: Boolean,
 required: true
 },
 status: {
 type: String,
 default: ''
 },
 showDetails: {
 type: Boolean,
 default: false
 }
});
const createDevLinkModal = ref(null);

const newName = ref(props.newName);
const newUrl = ref(props.newUrl);
const emit = defineEmits(['clear', 'create', 'update:newUrl']);

const showDetails = ref(false);

const clear = () => {
 newName.value = '';
 newUrl.value = '';
};

const create = (e) => {
 e.preventDefault();
 if (props.urlIsValid) {
 emit('create', newName.value, newUrl.value);
 if (props.status === 'success') {
 hide();
 }
 }
};

const show = () => {
 if (createDevLinkModal.value) {
 createDevLinkModal.value.show();
 }
};

const hide = () => {
 if (createDevLinkModal.value) {
 createDevLinkModal.value.hide();
 }
};

const toggleDetails = () => {
 showDetails.value = !showDetails.value;
};

watch(newUrl, (newValue) => {
 emit('update:newUrl', newValue);
});

defineExpose({
 show,
 hide,
});
</script>

<style lang="scss" scoped>
 @import "styles/components/modal";

 .alert {
 background-color: #FDF2F2;
 border: 1px solid #FBD0D0;
 color: #596372;
 padding: 20px;
 border-radius: 8px;
 position: relative;
 margin: 20px auto;
 font-size: 14px;
 }

 .alert-header {
 display: flex;
 align-items: center;
 }

 .alert .icon {
 font-weight: bold;
 color: #EC5962;
 border: 1px solid #EC5962;
 border-radius: 50%;
 margin-right: 10px;
 padding: 1px 7px;
 font-size: 10px;
 }

 .alert strong {
 margin-bottom: 0;
 }

 .alert ul {
 margin: 10px 0 0 0;
 padding-left: 20px;
 list-style-type: disc;
 }

 .alert a {
 color: #007bff;
 cursor: pointer;
 text-decoration: none;
 }

 .alert a:hover {
 text-decoration: underline;
 }
</style>

57 changes: 45 additions & 12 deletions
resources/js/admin/devlink/components/Index.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import debounce from 'lodash/debounce';
import Status from './Status.vue';
import EllipsisMenu from '../../../components/shared/EllipsisMenu.vue';
import DeleteModal from './DeleteModal.vue';
import CreateDevLinkModal from './CreateDevLinkModal.vue';
import { store } from '../common';

const vue = getCurrentInstance().proxy;
Expand All@@ -13,6 +14,7 @@ const route = useRoute();
const devlinks = ref([]);
const editModal = ref(null);
const deleteModal = ref(null);
const createDevLinkModal = ref(null);
const deleteWarningTitle = ref(vue.$t("Delete Confirmation"));
const filter = ref("");
const actions = [
Expand DownExpand Up@@ -53,6 +55,7 @@ onMounted(() => {

const newName = ref('');
const newUrl = ref('');
const status = ref('');

const load = () => {
 ProcessMaker.apiClient
Expand All@@ -78,16 +81,12 @@ const clear = () => {
 newUrl.value = '';
}

const create = (e) => {
 if (!urlIsValid.value) {
 e.preventDefault();
 return;
 }

const create = (name, url) => {
 status.value = '';
 ProcessMaker.apiClient
 .post('/devlink', {
 name: newName.value,
 url: newUrl.value
 name: name,
 url: url
 })
 .then((result) => {
 const newUrl = result.data.url;
Expand All@@ -97,7 +96,22 @@ const create = (e) => {
 devlink_id: newId,
 redirect_uri: redirectUri,
 };
 window.location.href = `${newUrl}/admin/devlink/oauth-client?${new URLSearchParams(params).toString()}`;
 const fullUrl = `${newUrl}/admin/devlink/oauth-client?${new URLSearchParams(params).toString()}`;

 ProcessMaker.apiClient
 .get(`devlink/${newId}/ping`)
 .then((response) => {
 status.value = 'success';
 window.location.href = fullUrl;
 })
 .catch((e) => {
 if (e.response.status === 401) {
 status.value = 'success';
 window.location.href = fullUrl;
 } else {
 status.value = 'error';
 }
 });
 });
};

Expand DownExpand Up@@ -146,6 +160,15 @@ const handleFilterChange = () => {
 debouncedLoad();
};

const showCreateModal = () => {
 status.value = '';
 createDevLinkModal.value.show();
};

const handleNewUrlUpdate = (newValue) => {
 newUrl.value = newValue;
};

const urlIsValid = computed(() => {
 return /^(https?:\/\/[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})(:\d{1,5})?$/.test(newUrl.value);
});
Expand All@@ -161,15 +184,15 @@ const urlIsValid = computed(() => {
 <div class="col-2">
 <b-button
 variant="primary"
v-b-modal.create
@click="showCreateModal"
 class="new-button"
 >
 <i class="fas fa-plus-circle" style="padding-right: 8px;"></i>{{ $t('Add Instance') }}
 </b-button>
 </div>
 </div>

 <b-modal
 <!-- <b-modal
 id="create"
 centered
 :title="$t('Create new DevLink')"
Expand All@@ -188,7 +211,17 @@ const urlIsValid = computed(() => {
 >
 <b-form-input v-model="newUrl"></b-form-input>
 </b-form-group>
 </b-modal>
 </b-modal> -->
 <CreateDevLinkModal
 ref="createDevLinkModal"
 :newName="newName"
 :newUrl="newUrl"
 :urlIsValid="urlIsValid"
 :status="status"
 @clear="clear"
 @create="create"
 @update:newUrl="handleNewUrlUpdate"
 />

 <b-modal
 ref="editModal"
Expand Down

, '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-20314 Add clear user errors for Instance connections#7956

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

nolanpro
merged 3 commits into

from

Jan 30, 2025
 Merged


feature/FOUR-20314 Add clear user errors for Instance connections
#7956
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f55c40f

Changed the frontend to handle connection errors


gustavobascope Jan 29, 2025
b4666ec

Merge branch 'epic/FOUR-20308' of github.com:ProcessMaker/processmake…


gustavobascope Jan 30, 2025
99bd6d5

Merge branch 'epic/FOUR-20308' of github.com:ProcessMaker/processmake…


gustavobascope Jan 30, 2025

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


22 changes: 15 additions & 7 deletions
ProcessMaker/Http/Controllers/Api/DevLinkController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,13 +55,17 @@ public function show(DevLink $devLink)
 public function store(Request $request)
 {
 $request->validate([
 'name' => ['required', 'unique:dev_links,name'],
 'url' => ['required', 'url', 'unique:dev_links,url'],
 'name' => ['required'],
 'url' => ['required', 'url'],
 ]);

 $devLink = new DevLink();
 $devLink->name = $request->input('name');
 $devLink->url = $request->input('url');
 $devLink = DevLink::where('name', $request->input('name'))->first();
 if ($devLink) {
 $devLink->url = $request->input('url');
 } else {
 $devLink = new DevLink();
 $devLink->name = $request->input('name');
 $devLink->url = $request->input('url');
 }
 $devLink->saveOrFail();

 return $devLink;
Expand All@@ -82,7 +86,11 @@ public function destroy(DevLink $devLink)

 public function ping(DevLink $devLink)
 {
 return $devLink->client()->get(route('api.devlink.pong', [], false));
 try {
 return$devLink->client()->get(route('api.devlink.pong', [], false));
 } catch (\Exception $e) {
 return response()->json(['error' => 'DevLink connection error'], $e->getCode());
 }
 }

 public function pong()
Expand Down

11 changes: 1 addition & 10 deletions
resources/js/admin/devlink/components/BundleSettingsModal.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@
 </b-modal>
</template>
<script setup>
import { ref, onMounted, getCurrentInstance } from 'vue';
import { ref } from 'vue';
import { useRoute } from 'vue-router/composables';

const emit = defineEmits(['settings-saved']);
Expand All@@ -58,7 +58,6 @@ const selectedIds = ref([]);
const allSelected = ref(false);

const onOk = async () => {
 console.log(selectedIds.value);
 configs.value = {
 id: selectedIds.value,
 };
Expand DownExpand Up@@ -124,14 +123,6 @@ const toggleAll = () => {
 });
};

const refreshSettings = () => {
 console.log('refreshSettings');
};

onMounted(() => {
 //loadSettings();
});

defineExpose({
 show,
 hide,
Expand Down

163 changes: 163 additions & 0 deletions
resources/js/admin/devlink/components/CreateDevLinkModal.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
<template>
 <b-modal
 ref="createDevLinkModal"
 id="create"
 centered
 size="lg"
 :title="$t('Create new DevLink')"
 @hidden="clear"
 @ok="create"
 :ok-title="$t('Create')"
 :cancel-title="$t('Cancel')"
 >
 <div v-if="status === 'error'" class="alert alert-danger" role="alert">
 <div class="alert-header">
 <span class="icon">!</span>
 <strong>Connection Error</strong>
 </div>
 <a href="#" @click.prevent="toggleDetails">{{ showDetails ? 'See Less Details' : 'See More Details' }}</a>
 <ul v-show="showDetails">
 <li>Please check your internet connection.</li>
 <li>Verify if the server is available or try again later.</li>
 <li>If the issue persists, contact support for assistance.</li>
 </ul>
 </div>
 <div>
 <b-form-group :label="$t('Please assign a name to the desired linked instance')">
 <b-form-input v-model="newName" :readonly="status === 'error'" />
 </b-form-group>
 <p>{{ $t('We require the access token of the instance you want to connect. If the token is correct, you will have to log-in in the corresponding instance.') }}</p>
 <b-form-group
 :label="$t('Instance URL')"
 :invalid-feedback="$t('Invalid URL')"
 :state="urlIsValid"
 >
 <b-form-input v-model="newUrl"></b-form-input>
 </b-form-group>
 </div>
 </b-modal>
</template>

<script setup>
import { ref, watch } from 'vue';

const props = defineProps({
 newName: {
 type: String,
 required: true
 },
 newUrl: {
 type: String,
 required: true
 },
 urlIsValid: {
 type: Boolean,
 required: true
 },
 status: {
 type: String,
 default: ''
 },
 showDetails: {
 type: Boolean,
 default: false
 }
});
const createDevLinkModal = ref(null);

const newName = ref(props.newName);
const newUrl = ref(props.newUrl);
const emit = defineEmits(['clear', 'create', 'update:newUrl']);

const showDetails = ref(false);

const clear = () => {
 newName.value = '';
 newUrl.value = '';
};

const create = (e) => {
 e.preventDefault();
 if (props.urlIsValid) {
 emit('create', newName.value, newUrl.value);
 if (props.status === 'success') {
 hide();
 }
 }
};

const show = () => {
 if (createDevLinkModal.value) {
 createDevLinkModal.value.show();
 }
};

const hide = () => {
 if (createDevLinkModal.value) {
 createDevLinkModal.value.hide();
 }
};

const toggleDetails = () => {
 showDetails.value = !showDetails.value;
};

watch(newUrl, (newValue) => {
 emit('update:newUrl', newValue);
});

defineExpose({
 show,
 hide,
});
</script>

<style lang="scss" scoped>
 @import "styles/components/modal";

 .alert {
 background-color: #FDF2F2;
 border: 1px solid #FBD0D0;
 color: #596372;
 padding: 20px;
 border-radius: 8px;
 position: relative;
 margin: 20px auto;
 font-size: 14px;
 }

 .alert-header {
 display: flex;
 align-items: center;
 }

 .alert .icon {
 font-weight: bold;
 color: #EC5962;
 border: 1px solid #EC5962;
 border-radius: 50%;
 margin-right: 10px;
 padding: 1px 7px;
 font-size: 10px;
 }

 .alert strong {
 margin-bottom: 0;
 }

 .alert ul {
 margin: 10px 0 0 0;
 padding-left: 20px;
 list-style-type: disc;
 }

 .alert a {
 color: #007bff;
 cursor: pointer;
 text-decoration: none;
 }

 .alert a:hover {
 text-decoration: underline;
 }
</style>

57 changes: 45 additions & 12 deletions
resources/js/admin/devlink/components/Index.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import debounce from 'lodash/debounce';
import Status from './Status.vue';
import EllipsisMenu from '../../../components/shared/EllipsisMenu.vue';
import DeleteModal from './DeleteModal.vue';
import CreateDevLinkModal from './CreateDevLinkModal.vue';
import { store } from '../common';

const vue = getCurrentInstance().proxy;
Expand All@@ -13,6 +14,7 @@ const route = useRoute();
const devlinks = ref([]);
const editModal = ref(null);
const deleteModal = ref(null);
const createDevLinkModal = ref(null);
const deleteWarningTitle = ref(vue.$t("Delete Confirmation"));
const filter = ref("");
const actions = [
Expand DownExpand Up@@ -53,6 +55,7 @@ onMounted(() => {

const newName = ref('');
const newUrl = ref('');
const status = ref('');

const load = () => {
 ProcessMaker.apiClient
Expand All@@ -78,16 +81,12 @@ const clear = () => {
 newUrl.value = '';
}

const create = (e) => {
 if (!urlIsValid.value) {
 e.preventDefault();
 return;
 }

const create = (name, url) => {
 status.value = '';
 ProcessMaker.apiClient
 .post('/devlink', {
 name: newName.value,
 url: newUrl.value
 name: name,
 url: url
 })
 .then((result) => {
 const newUrl = result.data.url;
Expand All@@ -97,7 +96,22 @@ const create = (e) => {
 devlink_id: newId,
 redirect_uri: redirectUri,
 };
 window.location.href = `${newUrl}/admin/devlink/oauth-client?${new URLSearchParams(params).toString()}`;
 const fullUrl = `${newUrl}/admin/devlink/oauth-client?${new URLSearchParams(params).toString()}`;

 ProcessMaker.apiClient
 .get(`devlink/${newId}/ping`)
 .then((response) => {
 status.value = 'success';
 window.location.href = fullUrl;
 })
 .catch((e) => {
 if (e.response.status === 401) {
 status.value = 'success';
 window.location.href = fullUrl;
 } else {
 status.value = 'error';
 }
 });
 });
};

Expand DownExpand Up@@ -146,6 +160,15 @@ const handleFilterChange = () => {
 debouncedLoad();
};

const showCreateModal = () => {
 status.value = '';
 createDevLinkModal.value.show();
};

const handleNewUrlUpdate = (newValue) => {
 newUrl.value = newValue;
};

const urlIsValid = computed(() => {
 return /^(https?:\/\/[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})(:\d{1,5})?$/.test(newUrl.value);
});
Expand All@@ -161,15 +184,15 @@ const urlIsValid = computed(() => {
 <div class="col-2">
 <b-button
 variant="primary"
v-b-modal.create
@click="showCreateModal"
 class="new-button"
 >
 <i class="fas fa-plus-circle" style="padding-right: 8px;"></i>{{ $t('Add Instance') }}
 </b-button>
 </div>
 </div>

 <b-modal
 <!-- <b-modal
 id="create"
 centered
 :title="$t('Create new DevLink')"
Expand All@@ -188,7 +211,17 @@ const urlIsValid = computed(() => {
 >
 <b-form-input v-model="newUrl"></b-form-input>
 </b-form-group>
 </b-modal>
 </b-modal> -->
 <CreateDevLinkModal
 ref="createDevLinkModal"
 :newName="newName"
 :newUrl="newUrl"
 :urlIsValid="urlIsValid"
 :status="status"
 @clear="clear"
 @create="create"
 @update:newUrl="handleNewUrlUpdate"
 />

 <b-modal
 ref="editModal"
Expand Down

, '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-20314 Add clear user errors for Instance connections#7956

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

nolanpro
merged 3 commits into

from

Jan 30, 2025
 Merged


feature/FOUR-20314 Add clear user errors for Instance connections
#7956
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f55c40f

Changed the frontend to handle connection errors


gustavobascope Jan 29, 2025
b4666ec

Merge branch 'epic/FOUR-20308' of github.com:ProcessMaker/processmake…


gustavobascope Jan 30, 2025
99bd6d5

Merge branch 'epic/FOUR-20308' of github.com:ProcessMaker/processmake…


gustavobascope Jan 30, 2025

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


22 changes: 15 additions & 7 deletions
ProcessMaker/Http/Controllers/Api/DevLinkController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,13 +55,17 @@ public function show(DevLink $devLink)
 public function store(Request $request)
 {
 $request->validate([
 'name' => ['required', 'unique:dev_links,name'],
 'url' => ['required', 'url', 'unique:dev_links,url'],
 'name' => ['required'],
 'url' => ['required', 'url'],
 ]);

 $devLink = new DevLink();
 $devLink->name = $request->input('name');
 $devLink->url = $request->input('url');
 $devLink = DevLink::where('name', $request->input('name'))->first();
 if ($devLink) {
 $devLink->url = $request->input('url');
 } else {
 $devLink = new DevLink();
 $devLink->name = $request->input('name');
 $devLink->url = $request->input('url');
 }
 $devLink->saveOrFail();

 return $devLink;
Expand All@@ -82,7 +86,11 @@ public function destroy(DevLink $devLink)

 public function ping(DevLink $devLink)
 {
 return $devLink->client()->get(route('api.devlink.pong', [], false));
 try {
 return$devLink->client()->get(route('api.devlink.pong', [], false));
 } catch (\Exception $e) {
 return response()->json(['error' => 'DevLink connection error'], $e->getCode());
 }
 }

 public function pong()
Expand Down

11 changes: 1 addition & 10 deletions
resources/js/admin/devlink/components/BundleSettingsModal.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@
 </b-modal>
</template>
<script setup>
import { ref, onMounted, getCurrentInstance } from 'vue';
import { ref } from 'vue';
import { useRoute } from 'vue-router/composables';

const emit = defineEmits(['settings-saved']);
Expand All@@ -58,7 +58,6 @@ const selectedIds = ref([]);
const allSelected = ref(false);

const onOk = async () => {
 console.log(selectedIds.value);
 configs.value = {
 id: selectedIds.value,
 };
Expand DownExpand Up@@ -124,14 +123,6 @@ const toggleAll = () => {
 });
};

const refreshSettings = () => {
 console.log('refreshSettings');
};

onMounted(() => {
 //loadSettings();
});

defineExpose({
 show,
 hide,
Expand Down

163 changes: 163 additions & 0 deletions
resources/js/admin/devlink/components/CreateDevLinkModal.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
<template>
 <b-modal
 ref="createDevLinkModal"
 id="create"
 centered
 size="lg"
 :title="$t('Create new DevLink')"
 @hidden="clear"
 @ok="create"
 :ok-title="$t('Create')"
 :cancel-title="$t('Cancel')"
 >
 <div v-if="status === 'error'" class="alert alert-danger" role="alert">
 <div class="alert-header">
 <span class="icon">!</span>
 <strong>Connection Error</strong>
 </div>
 <a href="#" @click.prevent="toggleDetails">{{ showDetails ? 'See Less Details' : 'See More Details' }}</a>
 <ul v-show="showDetails">
 <li>Please check your internet connection.</li>
 <li>Verify if the server is available or try again later.</li>
 <li>If the issue persists, contact support for assistance.</li>
 </ul>
 </div>
 <div>
 <b-form-group :label="$t('Please assign a name to the desired linked instance')">
 <b-form-input v-model="newName" :readonly="status === 'error'" />
 </b-form-group>
 <p>{{ $t('We require the access token of the instance you want to connect. If the token is correct, you will have to log-in in the corresponding instance.') }}</p>
 <b-form-group
 :label="$t('Instance URL')"
 :invalid-feedback="$t('Invalid URL')"
 :state="urlIsValid"
 >
 <b-form-input v-model="newUrl"></b-form-input>
 </b-form-group>
 </div>
 </b-modal>
</template>

<script setup>
import { ref, watch } from 'vue';

const props = defineProps({
 newName: {
 type: String,
 required: true
 },
 newUrl: {
 type: String,
 required: true
 },
 urlIsValid: {
 type: Boolean,
 required: true
 },
 status: {
 type: String,
 default: ''
 },
 showDetails: {
 type: Boolean,
 default: false
 }
});
const createDevLinkModal = ref(null);

const newName = ref(props.newName);
const newUrl = ref(props.newUrl);
const emit = defineEmits(['clear', 'create', 'update:newUrl']);

const showDetails = ref(false);

const clear = () => {
 newName.value = '';
 newUrl.value = '';
};

const create = (e) => {
 e.preventDefault();
 if (props.urlIsValid) {
 emit('create', newName.value, newUrl.value);
 if (props.status === 'success') {
 hide();
 }
 }
};

const show = () => {
 if (createDevLinkModal.value) {
 createDevLinkModal.value.show();
 }
};

const hide = () => {
 if (createDevLinkModal.value) {
 createDevLinkModal.value.hide();
 }
};

const toggleDetails = () => {
 showDetails.value = !showDetails.value;
};

watch(newUrl, (newValue) => {
 emit('update:newUrl', newValue);
});

defineExpose({
 show,
 hide,
});
</script>

<style lang="scss" scoped>
 @import "styles/components/modal";

 .alert {
 background-color: #FDF2F2;
 border: 1px solid #FBD0D0;
 color: #596372;
 padding: 20px;
 border-radius: 8px;
 position: relative;
 margin: 20px auto;
 font-size: 14px;
 }

 .alert-header {
 display: flex;
 align-items: center;
 }

 .alert .icon {
 font-weight: bold;
 color: #EC5962;
 border: 1px solid #EC5962;
 border-radius: 50%;
 margin-right: 10px;
 padding: 1px 7px;
 font-size: 10px;
 }

 .alert strong {
 margin-bottom: 0;
 }

 .alert ul {
 margin: 10px 0 0 0;
 padding-left: 20px;
 list-style-type: disc;
 }

 .alert a {
 color: #007bff;
 cursor: pointer;
 text-decoration: none;
 }

 .alert a:hover {
 text-decoration: underline;
 }
</style>

57 changes: 45 additions & 12 deletions
resources/js/admin/devlink/components/Index.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@ import debounce from 'lodash/debounce';
import Status from './Status.vue';
import EllipsisMenu from '../../../components/shared/EllipsisMenu.vue';
import DeleteModal from './DeleteModal.vue';
import CreateDevLinkModal from './CreateDevLinkModal.vue';
import { store } from '../common';

const vue = getCurrentInstance().proxy;
Expand All@@ -13,6 +14,7 @@ const route = useRoute();
const devlinks = ref([]);
const editModal = ref(null);
const deleteModal = ref(null);
const createDevLinkModal = ref(null);
const deleteWarningTitle = ref(vue.$t("Delete Confirmation"));
const filter = ref("");
const actions = [
Expand DownExpand Up@@ -53,6 +55,7 @@ onMounted(() => {

const newName = ref('');
const newUrl = ref('');
const status = ref('');

const load = () => {
 ProcessMaker.apiClient
Expand All@@ -78,16 +81,12 @@ const clear = () => {
 newUrl.value = '';
}

const create = (e) => {
 if (!urlIsValid.value) {
 e.preventDefault();
 return;
 }

const create = (name, url) => {
 status.value = '';
 ProcessMaker.apiClient
 .post('/devlink', {
 name: newName.value,
 url: newUrl.value
 name: name,
 url: url
 })
 .then((result) => {
 const newUrl = result.data.url;
Expand All@@ -97,7 +96,22 @@ const create = (e) => {
 devlink_id: newId,
 redirect_uri: redirectUri,
 };
 window.location.href = `${newUrl}/admin/devlink/oauth-client?${new URLSearchParams(params).toString()}`;
 const fullUrl = `${newUrl}/admin/devlink/oauth-client?${new URLSearchParams(params).toString()}`;

 ProcessMaker.apiClient
 .get(`devlink/${newId}/ping`)
 .then((response) => {
 status.value = 'success';
 window.location.href = fullUrl;
 })
 .catch((e) => {
 if (e.response.status === 401) {
 status.value = 'success';
 window.location.href = fullUrl;
 } else {
 status.value = 'error';
 }
 });
 });
};

Expand DownExpand Up@@ -146,6 +160,15 @@ const handleFilterChange = () => {
 debouncedLoad();
};

const showCreateModal = () => {
 status.value = '';
 createDevLinkModal.value.show();
};

const handleNewUrlUpdate = (newValue) => {
 newUrl.value = newValue;
};

const urlIsValid = computed(() => {
 return /^(https?:\/\/[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})(:\d{1,5})?$/.test(newUrl.value);
});
Expand All@@ -161,15 +184,15 @@ const urlIsValid = computed(() => {
 <div class="col-2">
 <b-button
 variant="primary"
v-b-modal.create
@click="showCreateModal"
 class="new-button"
 >
 <i class="fas fa-plus-circle" style="padding-right: 8px;"></i>{{ $t('Add Instance') }}
 </b-button>
 </div>
 </div>

 <b-modal
 <!-- <b-modal
 id="create"
 centered
 :title="$t('Create new DevLink')"
Expand All@@ -188,7 +211,17 @@ const urlIsValid = computed(() => {
 >
 <b-form-input v-model="newUrl"></b-form-input>
 </b-form-group>
 </b-modal>
 </b-modal> -->
 <CreateDevLinkModal
 ref="createDevLinkModal"
 :newName="newName"
 :newUrl="newUrl"
 :urlIsValid="urlIsValid"
 :status="status"
 @clear="clear"
 @create="create"
 @update:newUrl="handleNewUrlUpdate"
 />

 <b-modal
 ref="editModal"
Expand Down