Four 32412

ProcessMaker/Http/Controllers/Process/ScreenBuilderController.php

@@ -43,6 +43,7 @@ public function edit(ScreenBuilderManager $manager, Screen $screen, $processId =
 
         return view('processes.screen-builder.screen', [
             'screen' => $screen,
+            'type' => strtoupper($screen->type ?? 'FORM'),
             'manager' => $manager,
             'autoSaveDelay' => config('versions.delay.process', 5000),
             'isVersionsInstalled' => PackageHelper::isPmPackageVersionsInstalled(),

ProcessMaker/Managers/ModelerManager.php

@@ -16,7 +16,7 @@ public function __construct()
     {
         $this->javascriptRegistry = [];
         // Include our default javascript for our core controls
-        $this->addScript(mix('js/processes/modeler/initialLoad.js'));
+        // $this->addScript(mix('js/processes/modeler/initialLoad.js'));
     }
 
     /**

resources/js/admin/auth-clients/index.js

@@ -1,4 +1,113 @@
 import Vue from "vue";
-import AuthClientsListing from "./components/AuthClientsListing";
+import AuthClientsListing from "./components/AuthClientsListing.vue";
 
 Vue.component("AuthClientsListing", AuthClientsListing);
+
+new Vue({
+  el: "#authClients",
+  data: {
+    authClient: {
+      id: null,
+      name: "",
+      types: [],
+      redirect: "",
+      secret: "",
+    },
+    filter: "",
+    errors: null,
+    disabled: false,
+    title: "",
+    secretTitle: "",
+    customModalButtons: [],
+    secret: "",
+  },
+  beforeMount() {
+    this.initCustomModalButtons();
+    this.resetValues();
+  },
+  methods: {
+    onClose() {
+      this.resetValues();
+    },
+    onSave() {
+      if (this.disabled) {
+        return;
+      }
+      this.disabled = true;
+
+      this.loading = true;
+      let method = "POST";
+      let url = "/oauth/clients";
+      let verb = "created";
+      if (this.authClient.id) {
+        method = "PUT";
+        url = `${url}/${this.authClient.id}`;
+        verb = "saved";
+      }
+      ProcessMaker.apiClient({
+        method,
+        url,
+        baseURL: "/",
+        data: this.authClient,
+      }).then((response) => {
+        this.$refs.createEditAuthClient.hide();
+        this.loading = false;
+        if (response.data.secret) {
+          this.secret = response.data.secret;
+          this.$refs.secretModal.show();
+        } else {
+          this.$refs.authClientList.fetch();
+        }
+        ProcessMaker.alert(`${this.$t("The auth client was ")}${verb}.`, this.$t("success"));
+      }).catch((error) => {
+        this.disabled = false;
+        this.errors = error.response.data.errors;
+      });
+    },
+    resetValues() {
+      this.title = this.$t("Create Auth-Client");
+      this.secretTitle = this.$t("Copy Secret To Clipboard");
+      this.authClient = {
+        id: null,
+        name: "",
+        types: [],
+        redirect: "",
+        secret: "",
+      };
+      this.errors = {
+        name: null,
+        redirect: null,
+        types: null,
+      };
+      this.disabled = false;
+      this.initCustomModalButtons();
+    },
+    edit(item) {
+      this.title = this.$t("Edit Auth Client");
+      this.authClient = item;
+      this.$refs.createEditAuthClient.show();
+    },
+    initCustomModalButtons() {
+      this.customModalButtons = [
+        {
+          content: "Close",
+          action: "close",
+          variant: "secondary",
+          disabled: false,
+          hidden: false,
+        },
+      ];
+    },
+    hideSecretModal() {
+      this.$refs.secretModal.hide();
+      this.$refs.authClientList.fetch();
+    },
+    copySecret(secret) {
+      navigator.clipboard.writeText(secret).then(() => {
+        ProcessMaker.alert(this.$t("Secret copied to clipboard."), "success");
+      }, () => {
+        ProcessMaker.alert(this.$t("Secret not copied to clipboard."), "danger");
+      });
+    },
+  },
+});

resources/js/admin/auth-clients/loaderAuthClients.js

@@ -0,0 +1,6 @@
+import { setupMain } from "../../next/setupMain";
+
+setupMain();
+
+window.ProcessMaker.packages = window.temporal?.packages || [];
+window.packages = window.ProcessMaker.packages;

resources/js/admin/cssOverride/components/ColorPicker.vue

@@ -10,8 +10,8 @@
 
   import {Sketch} from 'vue-color';
   import { createUniqIdsMixin } from "vue-uniq-ids";
+  import tinycolor from 'tinycolor2';
   const uniqIdsMixin = createUniqIdsMixin();
-  const tinycolor = require("tinycolor2");
 
   export default {
     components: {

resources/js/admin/cssOverride/components/SiteDesign.vue

@@ -193,6 +193,9 @@
 
 <script>
 import AddToBundle from '../../../components/shared/AddToBundle.vue';
+// Content iframe CSS must be inlined; parent-page CSS imports do not apply inside the editor iframe.
+import oxideContentCss from 'tinymce/skins/ui/oxide/content.min.css?raw';
+import defaultContentCss from 'tinymce/skins/content/default/content.min.css?raw';
 
 export default {
   components: {
@@ -204,16 +207,17 @@ export default {
       altText: '',
       loginFooter: '',
       editorSettings: {
+        // Toolbar skin is imported in edit.js. Iframe body styles go via content_style / content_css.
         content_css: '/css/app.css',
-        content_style: "body {padding: 10px}",
+        content_style: `${oxideContentCss}\n${defaultContentCss}\nbody { padding: 10px; }`,
         menubar: false,
         plugins: [ 'link', 'lists', 'code' ],
         toolbar: 'code | undo redo | link | styleselect fontsizeselect | bold italic forecolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent',
         skin: false,
         relative_urls: false,
         remove_script_host: false,
       },
-      config: config,
+      config: window.config,
       key: 'css-override',
       fileLogin: {
         file: null,
@@ -394,8 +398,8 @@ export default {
       }
     });
 
-    this.loginFooter = _.get(loginFooterSetting, 'config.html', '');
-    this.altText = altTextSetting;
+    this.loginFooter = _.get(window.loginFooterSetting, 'config.html', '');
+    this.altText = window.altTextSetting;
   },
   methods: {
     placeholder(object, string) {

resources/js/admin/cssOverride/edit.js

@@ -1,12 +1,16 @@
 import Vue from "vue";
 import Editor from "@tinymce/tinymce-vue";
-import SiteDesign from "./components/SiteDesign";
-import ColorPicker from "./components/ColorPicker";
+import SiteDesign from "./components/SiteDesign.vue";
+import ColorPicker from "./components/ColorPicker.vue";
+import "tinymce/tinymce";
 import "tinymce/themes/silver";
+import "tinymce/icons/default";
 import "tinymce/plugins/link";
 import "tinymce/plugins/lists";
 import "tinymce/plugins/code";
+// skin: false skips TinyMCE's default skin fetch; Vite does not expose node_modules CSS URLs.
+import "tinymce/skins/ui/oxide/skin.min.css";
 
 Vue.component("SiteDesign", SiteDesign);
 Vue.component("ColorPicker", ColorPicker);
-Vue.component("Editor", Editor);
+Vue.component("Editor", Editor);

resources/js/admin/cssOverride/loaderCssOverride.js

@@ -0,0 +1,6 @@
+import { setupMain } from "../../next/setupMain";
+
+setupMain();
+
+window.ProcessMaker.packages = window.temporal?.packages || [];
+window.packages = window.ProcessMaker.packages;

resources/js/admin/groups/index.js

@@ -1,4 +1,71 @@
 import Vue from "vue";
-import GroupsListing from "./components/GroupsListing";
+
+import GroupsListing from "./components/GroupsListing.vue";
 
 Vue.component("GroupsListing", GroupsListing);
+
+new Vue({
+  el: "#listGroups",
+  data() {
+    return {
+      filter: "",
+      formData: {},
+      errors: {
+        name: null,
+        description: null,
+        status: null,
+      },
+      disabled: false,
+    };
+  },
+  mounted() {
+    this.resetFormData();
+    this.resetErrors();
+  },
+  methods: {
+    reload() {
+      this.$refs.groupList.dataManager([
+        {
+          field: "updated_at",
+          direction: "desc",
+        },
+      ]);
+    },
+    onClose() {
+      this.resetFormData();
+      this.resetErrors();
+    },
+    resetFormData() {
+      this.formData = Object.assign({}, {
+        name: null,
+        description: null,
+        status: "ACTIVE",
+      });
+    },
+    resetErrors() {
+      this.errors = Object.assign({}, {
+        name: null,
+        description: null,
+        status: null,
+      });
+    },
+    onSubmit() {
+      this.resetErrors();
+      if (this.disabled) {
+        return;
+      }
+      this.disabled = true;
+      ProcessMaker.apiClient.post("groups", this.formData)
+        .then((response) => {
+          ProcessMaker.alert(this.$t("The group was created."), "success");
+          window.location = `/admin/groups/${response.data.id}/edit`;
+        })
+        .catch((error) => {
+          if (error.response.status && error.response.status === 422) {
+            this.errors = error.response.data.errors;
+          }
+          this.disabled = false;
+        });
+    },
+  },
+});

resources/js/admin/groups/loaderGroups.js

@@ -0,0 +1,6 @@
+import { setupMain } from "../../next/setupMain";
+
+setupMain();
+
+window.ProcessMaker.packages = window.temporal?.packages || [];
+window.packages = window.ProcessMaker.packages;

resources/js/admin/loaderAdmin.js

@@ -0,0 +1,6 @@
+import { setupMain } from "../next/setupMain";
+
+setupMain();
+
+window.ProcessMaker.packages = window.temporal?.packages || [];
+window.packages = window.ProcessMaker.packages;

resources/js/admin/profile/loaderProfile.js

@@ -0,0 +1,6 @@
+import { setupMain } from "../../next/setupMain";
+
+setupMain();
+
+window.ProcessMaker.packages = window.temporal?.packages || [];
+window.packages = window.ProcessMaker.packages;

resources/js/admin/settings/components/SettingDriverAuthorization.vue

@@ -100,7 +100,8 @@
 </template>
 <script>
 // eslint-disable-next-line import/no-unresolved
-import { FormErrorsMixin, Required } from "SharedComponents";
+import FormErrorsMixin from "../../../components/shared/FormErrorsMixin";
+import Required from "../../../components/shared/Required";
 import settingMixin from "../mixins/setting";
 import AdditionalDriverConnectionProperties from "./AdditionalDriverConnectionProperties.vue";
 import OauthConnectionProperties from "./cdata/OauthConnectionProperties.vue";

resources/js/admin/settings/components/SettingsListing.vue

@@ -193,7 +193,7 @@
 </template>
 
 <script>
-import { BasicSearch } from "SharedComponents";
+import  BasicSearch  from "../../../components/shared/BasicSearch.vue";
 import isPMQL from "../../../modules/isPMQL";
 import dataLoadingMixin from "../../../components/common/mixins/apiDataLoading";
 import PmqlInput from "../../../components/shared/PmqlInput";

resources/js/admin/settings/components/cdata/BamboohrConnectionProperties.vue

@@ -59,7 +59,7 @@
 </template>
 <script>
 // eslint-disable-next-line import/no-unresolved
-import { FormErrorsMixin } from "SharedComponents";
+import FormErrorsMixin  from "../../../../components/shared/FormErrorsMixin";
 
 export default {
   mixins: [FormErrorsMixin],

resources/js/admin/settings/components/cdata/DocusignConnectionProperties.vue

@@ -24,7 +24,7 @@
 </template>
 <script>
 // eslint-disable-next-line import/no-unresolved
-import { FormErrorsMixin } from "SharedComponents";
+import FormErrorsMixin  from "../../../../components/shared/FormErrorsMixin";
 
 export default {
   mixins: [FormErrorsMixin],

resources/js/admin/settings/components/cdata/ExcelConnectionProperties.vue

@@ -46,7 +46,7 @@
 
 <script>
 // eslint-disable-next-line import/no-unresolved
-import { FormErrorsMixin } from "SharedComponents";
+import FormErrorsMixin  from "../../../../components/shared/FormErrorsMixin";
 
 export default {
   mixins: [FormErrorsMixin],

resources/js/admin/settings/components/cdata/GithubConnectionProperties.vue

@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import { FormErrorsMixin } from "SharedComponents";
+import FormErrorsMixin  from "../../../../components/shared/FormErrorsMixin";
 
 export default {
     mixins: [FormErrorsMixin],

resources/js/admin/settings/components/cdata/GmailConnectionProperties.vue

@@ -4,7 +4,7 @@
 
 <script>
 // eslint-disable-next-line import/no-unresolved
-import { FormErrorsMixin } from "SharedComponents";
+import FormErrorsMixin  from "../../../../components/shared/FormErrorsMixin";
 
 export default {
   mixins: [FormErrorsMixin],

resources/js/admin/settings/components/cdata/OauthConnectionProperties.vue

@@ -102,7 +102,7 @@
 </template>
 <script>
 // eslint-disable-next-line import/no-unresolved
-import { FormErrorsMixin } from "SharedComponents";
+import FormErrorsMixin  from "../../../../components/shared/FormErrorsMixin";
 
 export default {
   mixins: [FormErrorsMixin],

resources/js/admin/settings/components/cdata/PasswordConnectionProperties.vue

@@ -59,7 +59,7 @@
 </template>
 <script>
 // eslint-disable-next-line import/no-unresolved
-import { FormErrorsMixin } from "SharedComponents";
+import FormErrorsMixin  from "../../../../components/shared/FormErrorsMixin";
 
 export default {
   mixins: [FormErrorsMixin],