diff --git a/ProcessMaker/Http/Resources/V1_1/CaseResource.php b/ProcessMaker/Http/Resources/V1_1/CaseResource.php index 03d6afd2fc..ba4d25dc14 100644 --- a/ProcessMaker/Http/Resources/V1_1/CaseResource.php +++ b/ProcessMaker/Http/Resources/V1_1/CaseResource.php @@ -58,7 +58,7 @@ public function toArray($request): array */ private function getParticipantData(array $participants): array { - return array_map(fn($participant) => self::$users->get($participant), $participants); + return array_map(fn ($participant) => self::$users->get($participant), $participants); } /** diff --git a/ProcessMaker/ProcessTranslations/ScreenTranslation.php b/ProcessMaker/ProcessTranslations/ScreenTranslation.php index 4a1089fa67..3925481f92 100644 --- a/ProcessMaker/ProcessTranslations/ScreenTranslation.php +++ b/ProcessMaker/ProcessTranslations/ScreenTranslation.php @@ -28,7 +28,6 @@ public function applyTranslations($screen, $defaultLanguage = '') $language = $this->getTargetLanguage($defaultLanguage); - return $this->searchTranslations($screen['screen_id'], $config, $language); } diff --git a/devhub/pm-font/svg/trash.svg b/devhub/pm-font/svg/trash.svg new file mode 100644 index 0000000000..163615e4f1 --- /dev/null +++ b/devhub/pm-font/svg/trash.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/fonts/pm-font/index.html b/resources/fonts/pm-font/index.html index b43d9c263d..281a2aa4c4 100644 --- a/resources/fonts/pm-font/index.html +++ b/resources/fonts/pm-font/index.html @@ -115,7 +115,7 @@

ProcessMaker Icons4.12.0+alpha-3

diff --git a/resources/fonts/pm-font/processmaker-font.css b/resources/fonts/pm-font/processmaker-font.css index 30f6f98325..d7fdea0a5e 100644 --- a/resources/fonts/pm-font/processmaker-font.css +++ b/resources/fonts/pm-font/processmaker-font.css @@ -1,11 +1,11 @@ @font-face { font-family: "processmaker-font"; - src: url('processmaker-font.eot?t=1730126674531'); /* IE9*/ - src: url('processmaker-font.eot?t=1730126674531#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url("processmaker-font.woff2?t=1730126674531") format("woff2"), - url("processmaker-font.woff?t=1730126674531") format("woff"), - url('processmaker-font.ttf?t=1730126674531') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ - url('processmaker-font.svg?t=1730126674531#processmaker-font') format('svg'); /* iOS 4.1- */ + src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/ + src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url("processmaker-font.woff2?t=1730322668195") format("woff2"), + url("processmaker-font.woff?t=1730322668195") format("woff"), + url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */ } [class^="fp-"], [class*=" fp-"] { @@ -55,5 +55,6 @@ .fp-slack:before { content: "\ea25"; } .fp-slideshow:before { content: "\ea26"; } .fp-table:before { content: "\ea27"; } -.fp-unlink:before { content: "\ea28"; } +.fp-trash:before { content: "\ea28"; } +.fp-unlink:before { content: "\ea29"; } diff --git a/resources/fonts/pm-font/processmaker-font.eot b/resources/fonts/pm-font/processmaker-font.eot index b9042aaa3f..58983ffe0e 100644 Binary files a/resources/fonts/pm-font/processmaker-font.eot and b/resources/fonts/pm-font/processmaker-font.eot differ diff --git a/resources/fonts/pm-font/processmaker-font.less b/resources/fonts/pm-font/processmaker-font.less index f76662a474..004b55fd66 100644 --- a/resources/fonts/pm-font/processmaker-font.less +++ b/resources/fonts/pm-font/processmaker-font.less @@ -1,10 +1,10 @@ @font-face {font-family: "processmaker-font"; - src: url('processmaker-font.eot?t=1730126674531'); /* IE9*/ - src: url('processmaker-font.eot?t=1730126674531#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url("processmaker-font.woff2?t=1730126674531") format("woff2"), - url("processmaker-font.woff?t=1730126674531") format("woff"), - url('processmaker-font.ttf?t=1730126674531') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ - url('processmaker-font.svg?t=1730126674531#processmaker-font') format('svg'); /* iOS 4.1- */ + src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/ + src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url("processmaker-font.woff2?t=1730322668195") format("woff2"), + url("processmaker-font.woff?t=1730322668195") format("woff"), + url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */ } [class^="fp-"], [class*=" fp-"] { @@ -53,4 +53,5 @@ .fp-slack:before { content: "\ea25"; } .fp-slideshow:before { content: "\ea26"; } .fp-table:before { content: "\ea27"; } -.fp-unlink:before { content: "\ea28"; } +.fp-trash:before { content: "\ea28"; } +.fp-unlink:before { content: "\ea29"; } diff --git a/resources/fonts/pm-font/processmaker-font.module.less b/resources/fonts/pm-font/processmaker-font.module.less index 9941af309c..026d3cf05f 100644 --- a/resources/fonts/pm-font/processmaker-font.module.less +++ b/resources/fonts/pm-font/processmaker-font.module.less @@ -1,10 +1,10 @@ @font-face {font-family: "processmaker-font"; - src: url('processmaker-font.eot?t=1730126674531'); /* IE9*/ - src: url('processmaker-font.eot?t=1730126674531#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url("processmaker-font.woff2?t=1730126674531") format("woff2"), - url("processmaker-font.woff?t=1730126674531") format("woff"), - url('processmaker-font.ttf?t=1730126674531') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ - url('processmaker-font.svg?t=1730126674531#processmaker-font') format('svg'); /* iOS 4.1- */ + src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/ + src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url("processmaker-font.woff2?t=1730322668195") format("woff2"), + url("processmaker-font.woff?t=1730322668195") format("woff"), + url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */ } [class^="fp-"], [class*=" fp-"] { @@ -54,6 +54,7 @@ .fp-slack:before { content: "\ea25"; } .fp-slideshow:before { content: "\ea26"; } .fp-table:before { content: "\ea27"; } -.fp-unlink:before { content: "\ea28"; } +.fp-trash:before { content: "\ea28"; } +.fp-unlink:before { content: "\ea29"; } } \ No newline at end of file diff --git a/resources/fonts/pm-font/processmaker-font.scss b/resources/fonts/pm-font/processmaker-font.scss index ed687bcd12..1b4de47a37 100644 --- a/resources/fonts/pm-font/processmaker-font.scss +++ b/resources/fonts/pm-font/processmaker-font.scss @@ -1,10 +1,10 @@ @font-face {font-family: "processmaker-font"; - src: url('processmaker-font.eot?t=1730126674531'); /* IE9*/ - src: url('processmaker-font.eot?t=1730126674531#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url("processmaker-font.woff2?t=1730126674531") format("woff2"), - url("processmaker-font.woff?t=1730126674531") format("woff"), - url('processmaker-font.ttf?t=1730126674531') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ - url('processmaker-font.svg?t=1730126674531#processmaker-font') format('svg'); /* iOS 4.1- */ + src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/ + src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url("processmaker-font.woff2?t=1730322668195") format("woff2"), + url("processmaker-font.woff?t=1730322668195") format("woff"), + url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */ } [class^="fp-"], [class*=" fp-"] { @@ -53,7 +53,8 @@ .fp-slack:before { content: "\ea25"; } .fp-slideshow:before { content: "\ea26"; } .fp-table:before { content: "\ea27"; } -.fp-unlink:before { content: "\ea28"; } +.fp-trash:before { content: "\ea28"; } +.fp-unlink:before { content: "\ea29"; } $fp-bpmn-action-by-email: "\ea01"; $fp-bpmn-data-connector: "\ea02"; @@ -94,5 +95,6 @@ $fp-slack-notification: "\ea24"; $fp-slack: "\ea25"; $fp-slideshow: "\ea26"; $fp-table: "\ea27"; -$fp-unlink: "\ea28"; +$fp-trash: "\ea28"; +$fp-unlink: "\ea29"; diff --git a/resources/fonts/pm-font/processmaker-font.styl b/resources/fonts/pm-font/processmaker-font.styl index f76662a474..004b55fd66 100644 --- a/resources/fonts/pm-font/processmaker-font.styl +++ b/resources/fonts/pm-font/processmaker-font.styl @@ -1,10 +1,10 @@ @font-face {font-family: "processmaker-font"; - src: url('processmaker-font.eot?t=1730126674531'); /* IE9*/ - src: url('processmaker-font.eot?t=1730126674531#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url("processmaker-font.woff2?t=1730126674531") format("woff2"), - url("processmaker-font.woff?t=1730126674531") format("woff"), - url('processmaker-font.ttf?t=1730126674531') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ - url('processmaker-font.svg?t=1730126674531#processmaker-font') format('svg'); /* iOS 4.1- */ + src: url('processmaker-font.eot?t=1730322668195'); /* IE9*/ + src: url('processmaker-font.eot?t=1730322668195#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url("processmaker-font.woff2?t=1730322668195") format("woff2"), + url("processmaker-font.woff?t=1730322668195") format("woff"), + url('processmaker-font.ttf?t=1730322668195') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/ + url('processmaker-font.svg?t=1730322668195#processmaker-font') format('svg'); /* iOS 4.1- */ } [class^="fp-"], [class*=" fp-"] { @@ -53,4 +53,5 @@ .fp-slack:before { content: "\ea25"; } .fp-slideshow:before { content: "\ea26"; } .fp-table:before { content: "\ea27"; } -.fp-unlink:before { content: "\ea28"; } +.fp-trash:before { content: "\ea28"; } +.fp-unlink:before { content: "\ea29"; } diff --git a/resources/fonts/pm-font/processmaker-font.svg b/resources/fonts/pm-font/processmaker-font.svg index 1891fac272..e18aaa0817 100644 --- a/resources/fonts/pm-font/processmaker-font.svg +++ b/resources/fonts/pm-font/processmaker-font.svg @@ -124,6 +124,9 @@ + diff --git a/resources/fonts/pm-font/processmaker-font.symbol.svg b/resources/fonts/pm-font/processmaker-font.symbol.svg index a2102d3bbf..08cc447028 100644 --- a/resources/fonts/pm-font/processmaker-font.symbol.svg +++ b/resources/fonts/pm-font/processmaker-font.symbol.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/fonts/pm-font/processmaker-font.ttf b/resources/fonts/pm-font/processmaker-font.ttf index 0124e66d71..f185cad7db 100644 Binary files a/resources/fonts/pm-font/processmaker-font.ttf and b/resources/fonts/pm-font/processmaker-font.ttf differ diff --git a/resources/fonts/pm-font/processmaker-font.woff b/resources/fonts/pm-font/processmaker-font.woff index 9d1d6d664f..df77709fdb 100644 Binary files a/resources/fonts/pm-font/processmaker-font.woff and b/resources/fonts/pm-font/processmaker-font.woff differ diff --git a/resources/fonts/pm-font/processmaker-font.woff2 b/resources/fonts/pm-font/processmaker-font.woff2 index d6004fcf82..4baf9b66f0 100644 Binary files a/resources/fonts/pm-font/processmaker-font.woff2 and b/resources/fonts/pm-font/processmaker-font.woff2 differ diff --git a/resources/fonts/pm-font/symbol.html b/resources/fonts/pm-font/symbol.html index 74b9a17f5b..40b2f080af 100644 --- a/resources/fonts/pm-font/symbol.html +++ b/resources/fonts/pm-font/symbol.html @@ -387,6 +387,13 @@

fp-slideshow

fp-table

+
  • + +

    fp-trash

    +
    • +

  • ProcessMaker Icons4.12.0+alpha-3

    diff --git a/resources/js/admin/devlink/components/BundleModal.vue b/resources/js/admin/devlink/components/BundleModal.vue index f91dce0542..abc1c3ae41 100644 --- a/resources/js/admin/devlink/components/BundleModal.vue +++ b/resources/js/admin/devlink/components/BundleModal.vue @@ -1,13 +1,20 @@ - + - \ No newline at end of file + diff --git a/resources/js/admin/devlink/components/DeleteModal.vue b/resources/js/admin/devlink/components/DeleteModal.vue new file mode 100644 index 0000000000..7afb24bb6d --- /dev/null +++ b/resources/js/admin/devlink/components/DeleteModal.vue @@ -0,0 +1,100 @@ + + + diff --git a/resources/js/admin/devlink/components/Index.vue b/resources/js/admin/devlink/components/Index.vue index 9eec4e4492..968f88791b 100644 --- a/resources/js/admin/devlink/components/Index.vue +++ b/resources/js/admin/devlink/components/Index.vue @@ -4,6 +4,7 @@ import { useRouter, useRoute } from 'vue-router/composables'; import debounce from 'lodash/debounce'; import Status from './Status.vue'; import EllipsisMenu from '../../../components/shared/EllipsisMenu.vue'; +import DeleteModal from './DeleteModal.vue'; import { store } from '../common'; const vue = getCurrentInstance().proxy; @@ -11,6 +12,8 @@ const router = useRouter(); const route = useRoute(); const devlinks = ref([]); const editModal = ref(null); +const deleteModal = ref(null); +const deleteWarningTitle = ref(vue.$t("Delete Confirmation")); const filter = ref(""); const actions = [ { value: "edit-item", content: "Edit" }, @@ -115,20 +118,17 @@ const updateDevLink = () => { }); }; -const deleteDevLink = async (devlink) => { - selected.value = devlink; - const confirm = await vue.$bvModal.msgBoxConfirm( - vue.$t('Are you sure you want to delete {{name}}?', { - name: selected.value.name - }), { - okTitle: vue.$t('Ok'), - cancelTitle: vue.$t('Cancel') - }); +const deleteWarning = computed(() => { + const name = selected.value?.name; + return vue.$t('Are you sure you want to delete {{name}}? The action is irreversible.', { name }); +}); - if (!confirm) { - return; - } +const deleteDevLink = (devlink) => { + selected.value = { ...devlink }; + deleteModal.value.show(); +}; +const destroyDevLink = async () => { await ProcessMaker.apiClient.delete(`/devlink/${selected.value.id}`); load(); }; @@ -204,6 +204,9 @@ const urlIsValid = computed(() => { + + +

    { router.push({ name: 'bundle-assets', params: { id: bundle.id } }); } -const deleteWaring = computed(() => { +const deleteWarning = computed(() => { const name = selected?.value.name; - return vue.$t('Are you sure you want to delete {{name}}?', { name }); + return vue.$t('Are you sure you want to delete {{name}}? The action is irreversible.', { name }); }); const confirmPublishNewVersionText = computed(() => { @@ -227,15 +229,8 @@ const confirmPublishNewVersionText = computed(() => {
    - -

    {{ deleteWaring }}'

    -     + + @@ -311,6 +306,38 @@ const confirmPublishNewVersionText = computed(() => { } @import "styles/components/table"; +@import "styles/components/modal"; +::v-deep .delete-modal-style .modal-header .delete-icon { + width: 48px; + height: 48px; + background-color: #FEE6E5; + display: flex; + align-items: center; + justify-content: center; + border-radius: 8px; + color: #EC5962; + font-size: 26px; +} +::v-deep .delete-modal-style .modal-body-text { + font-size: 16px; + font-weight: 500; +} +::v-deep .delete-modal-style .modal-footer { + background-color: #FBFBFC; + border-top: 1px solid #E9ECF1; + border-bottom-left-radius: 16px; + border-bottom-right-radius: 16px; +} +::v-deep .delete-modal-style .modal-footer .btn-primary { + border: none; + background-color: #EC5962; + color: #FFFFFF; +} +::v-deep .delete-modal-style .modal-footer .btn-secondary { + border: 1px solid #D7DDE5; + background-color: #FFFFFF; + color: #20242A; +} .local-bundles-card { border-radius: 8px; diff --git a/resources/lang/en.json b/resources/lang/en.json index 818a86e8e0..1575ac60cc 100644 --- a/resources/lang/en.json +++ b/resources/lang/en.json @@ -143,6 +143,7 @@ "Are you sure you want to delete {{item}}? Deleting this asset will break any active tasks that are assigned.": "Are you sure you want to delete {{item}}? Deleting this asset will break any active tasks that are assigned.", "Are you sure you want to delete {{item}}?": "Are you sure you want to delete {{item}}?", "Are you sure you want to delete {{item}}": "Are your sure you want to delete {{item}}", + "Are you sure you want to delete {{name}}? The action is irreversible.": "Are you sure you want to delete {{name}}? The action is irreversible.", "Are you sure you want to delete expression {{item}}": "Are you sure you want to delete expression {{item}}", "Are you sure you want to delete the auth client": "Are you sure you want to delete the auth client", "Are you sure you want to delete the environment variable {{ name }} ?": "Are you sure you want to delete the environment variable {{ name }} ?", @@ -489,6 +490,7 @@ "Delete Categories": "Delete Categories", "Delete Category": "Delete Category", "Delete Comments": "Delete Comments", + "Delete Confirmation": "Delete Confirmation", "Delete Control": "Delete Control", "Delete Environment Variables": "Delete Environment Variables", "Delete Files": "Delete Files", diff --git a/resources/sass/components/modal.scss b/resources/sass/components/modal.scss new file mode 100644 index 0000000000..91b412377a --- /dev/null +++ b/resources/sass/components/modal.scss @@ -0,0 +1,40 @@ +::v-deep .modal-content { + border-radius: 16px; + border: 1px solid #E9ECF1; +} +::v-deep .modal-header { + border-bottom: none; +} +::v-deep .modal-title { + font-size: 24px; + font-weight: 500; +} +::v-deep .modal-body { + font-size: 14px; + font-weight: 400; +} +::v-deep .modal-footer { + border-top: none; + margin-top: 0px !important; +} +::v-deep .modal-footer .btn { + border-radius: 8px; + font-size: 14px; + font-weight: 500; +} +::v-deep .modal-footer .btn-secondary { + background-color: white; + border: none; + color: #20242A; + text-transform: none; +} +::v-deep .modal-footer .btn-secondary:hover { + background-color: #E9ECF1; +} +::v-deep .modal-footer .btn-primary { + background-color: #2773F3; + text-transform: none; +} +::v-deep .modal-footer .btn-primary:hover { + background-color: #1E5AC7; +}