Merge branch 'feat/weedremeed' into 'develop'

RC - new features from major project requirements

See merge request 2pisoftware/cosine/core!420

Author: Derek Crannaford

system/classes/HtmlBootstrap5.php

@@ -48,6 +48,205 @@ public static function dropdownButton($title, $contents, $class)
         </div>';
     }
 
+/**
+     * creates a simple one column form from the following array:
+     * array(
+     *       array("title","type","fieldname","value",{size | array(select options) | cols, rows}),
+     *       ...
+     * )
+     *
+     * valid field types are:
+     *  text, password, autocomplete, static, date, textarea, section,
+     *  select, multiselect, checkbox, hidden
+     *
+     * Field type auto uses ui hints from a DbObject.
+     *
+     * when prefixing a fieldname with a minus sign '-' this field will be read-only
+     */
+    public static function form($data, $action = null, $method = "POST", $submitTitle = "Save", $id = null, $class = null, $target = "_self", $enctype = null)
+    {
+        if (empty($data)) {
+            return;
+        }
+
+        $buffer = "";
+
+        if (null !== $action) {
+            $form = new \Html\FormBootstrap5();
+
+            // If form tag is needed print it
+            $class .= " col";
+            $form->id($id)->setClass($class)->method($method)->action($action)->target($target);
+
+            if (in_modified_multiarray("file", $data, 1)) {
+                $form->enctype("multipart/form-data");
+            }
+
+            $buffer .= $form->open();
+        }
+
+        foreach ($data as $row) {
+            $buffer .= "<div class='row'><div class='col-12'>";
+
+            // Backwards compatibility - provide option to pass additional data
+            $field = null;
+            $tooltip = null;
+            if (is_object($row)) {
+                $field = property_exists($row, 'field') ? $row->field : $row;
+                $tooltip = property_exists($row, 'tooltip') ? $row->tooltip : null;
+            } else {
+                $field = array_key_exists('field', $row) ? $row['field'] : $row;
+                $tooltip = array_key_exists('tooltip', $row) ? $row['tooltip'] : null;
+            }
+
+            // Check if the row is an object like an InputField
+            if (!is_array($field) && is_object($field)) {
+                $label_class = 'form-label';
+                $field->setClass(str_replace(['small-12', 'columns', 'column'], '', $field->class ?? ''));
+                switch (get_class($field)) {
+                    case 'Html\Form\Select':
+                    case 'Html\Cmfive\SelectWithOther':
+                        $field->setClass($field->class . ' form-select');
+                        break;
+                    case 'Html\Form\InputField\Checkbox':
+                    case 'Html\Form\InputField\Radio':
+                        $field->setClass($field->class . ' form-check-control');
+                        // $label_class = 'form-check-label';
+                        break;
+                    case 'Html\Form\InputField\Text':
+                    case 'Html\Form\InputField\Date':
+                    case 'Html\Form\InputField\File':
+                    case 'Html\Form\InputField\Number':
+                    default:
+                        $field->setClass($field->class . ' form-control');
+                        break;
+                }
+                if ((property_exists($field, "type") && $field->type !== "hidden") || !property_exists($field, "type")) {
+                    $buffer .= '<div class="col"><label class="' . $label_class . '"'
+                        . (property_exists($field, 'id') && !empty($field->id) ? ' for="' . $field->id . '"' : '')
+                        . '>'
+                        . $field->label
+                        . (property_exists($field, "required") && $field->required ? " <small>Required</small>" : "")
+                        . "</label>"
+                        . $field->__toString() . '</div>';
+                } else {
+                    $buffer .= $field->__toString();
+                }
+                continue;
+            }
+
+            $title = !empty($field[0]) ? $field[0] : '';
+            $type = !empty($field[1]) ? $field[1] : '';
+            $name = !empty($field[2]) ? $field[2] : '';
+            $value = !empty($field[3]) ? $field[3] : '';
+            $readonly = "";
+
+            // handle disabled fields
+            if (substr(($name ?? ""), 0, 1) == '-') {
+                $name = substr(($name ?? ""), 1);
+                $readonly = " readonly='true' ";
+            }
+            // Add title field
+            if ("section" === $type) {
+                $buffer .= "<h4>{$title}</h4></div></div>";
+                continue;
+            }
+
+            if (!empty($title) && "static" !== $type && "hidden" !== $type) {
+                $buffer .= "<label class='col-12'>$title";
+            }
+
+            switch ($type) {
+                case "text":
+                case "password":
+                    $size = !empty($field[4]) ? $field[4] : '';
+                    $required = !empty($field[5]) ? $field[5] : '';
+                    $buffer .= '<input' . $readonly . ' style="width:100%;" type="' . $type . '" name="' . $name . '" value="' . htmlspecialchars($value) . '" size="' . $size . '" id="' . $name . '"  ' . $required . '/>';
+                    break;
+                case "autocomplete":
+                    $options = !empty($field[4]) ? $field[4] : '';
+                    $minValue = !empty($field[5]) ? $field[5] : 1;
+                    $required = !empty($field[6]) ? $field[6] : '';
+                    $buffer .= HtmlBootstrap5::autocomplete($name, $options, $value, null, "width: 100%;", $minValue, $required);
+                    break;
+                case "date":
+                    $size = !empty($field[4]) ? $field[4] : '';
+                    $buffer .= HtmlBootstrap5::datePicker($name, $value, $size);
+                    break;
+                case "datetime":
+                    $size = !empty($field[4]) ? $field[4] : '';
+                    $buffer .= HtmlBootstrap5::datetimePicker($name, $value, $size);
+                    break;
+                case "time":
+                    $size = !empty($field[4]) ? $field[4] : '';
+                    $buffer .= HtmlBootstrap5::timePicker($name, $value, $size);
+                    break;
+                case "static":
+                    $size = !empty($field[4]) ? $field[4] : '';
+                    $buffer .= "<div class='col-6 col-md-3'>{$title}</div><div class='col-6 col-md-9'>{$value}</div>";
+                    break;
+                case "textarea":
+                    $c = !empty($field[4]) ? $field[4] : '';
+                    $r = !empty($field[5]) ? $field[5] : '';
+                    $custom_class = true;
+                    if (isset($field[6])) {
+                        $custom_class = $field[6];
+                    }
+                    $buffer .= '<textarea' . $readonly . ' style="width:100%; height:auto; " name="' . $name . '" rows="' . $r . '" cols="' . $c . '" ' .
+                        (!empty($custom_class) ? ($custom_class === true ? "class='ckeditor'" : "class='$custom_class' ") : '') . ' id="' . $name . '">' . $value . '</textarea>';
+                    break;
+                case "select":
+                    $items = !empty($field[4]) ? $field[4] : '';
+                    $default = !empty($field[5]) ? ($field[5] == "null" ? '' : $field[5]) : "-- Select --";
+                    $class = !empty($field[6]) ? $field[6] : '';
+                    if ($readonly == "") {
+                        $buffer .= HtmlBootstrap5::select($name, $items, $value, $class, "width: 100%;", $default, $readonly != "");
+                    } else {
+                        $buffer .= $value;
+                    }
+                    break;
+                case "multiSelect":
+                    $items = !empty($field[4]) ? $field[4] : '';
+                    if ($readonly == "") {
+                        $buffer .= HtmlBootstrap5::multiSelect($name, $items, $value, null, "width: 100%;");
+                    } else {
+                        $buffer .= $value;
+                    }
+                    break;
+                case "checkbox":
+                    $defaultValue = !empty($field[4]) ? $field[4] : '';
+                    $class = !empty($field[5]) ? $field[5] : '';
+                    $buffer .= HtmlBootstrap5::checkbox($name, $value, $defaultValue, $class);
+                    break;
+                case "radio":
+                    $group = !empty($field[4]) ? $field[4] : '';
+                    $defaultValue = !empty($field[5]) ? $field[5] : '';
+                    $class = !empty($field[6]) ? $field[6] : '';
+                    $buffer .= HtmlBootstrap5::radio($name, $group, $value, $defaultValue, $class) . "&nbsp;" . htmlentities($title);
+                    break;
+                case "hidden":
+                    $buffer .= '<input type="hidden" name="' . $name . '" value="' . htmlspecialchars($value) . '" id="' . $name . '"/>';
+                    break;
+                case "file":
+                    $size = !empty($field[4]) ? $field[4] : '';
+                    $buffer .= '<input style="width:100%;"  type="' . $type . '" name="' . $name . '" size="' . $size . '" id="' . $name . '"/>';
+                    break;
+                case "multifile":
+                    $buffer .= HtmlBootstrap5::multiFileUpload($name);
+                    break;
+            }
+            if (!empty($title) && "static" !== $type && "hidden" !== $type) {
+                $buffer .= "</label>";
+            }
+            $buffer .= "</div></div>";
+        }
+
+        if (null !== $action) {
+            $buffer .= $form->close($submitTitle);
+        }
+        return $buffer;
+    }
+
     /**
      * Creates a complex form where each section can have
      * a different number of columns.

system/classes/html/GlobalAttributes.php

@@ -49,7 +49,7 @@ trait GlobalAttributes
      * used by Angular JS.
      *
      * @param string $name
-     * @param Mixed $value
+     * @param mixed $value
      * @return this
      */
     public function setAttribute($name, $value)

system/modules/file/actions/ajax_multipart.php

@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Start a multipart upload for bucket defined in file.adapters.s3.bucket
+ * If you need to change parameters such as s3 bucket/key/etc,
+ * you should make a new endpoint in your module that accepts your own values
+ */
+function ajax_multipart_POST(Web $w)
+{
+    $w->setLayout(null);
+
+    $body = json_decode(file_get_contents('php://input'), true);
+
+    $filename = $body["filename"];
+    $prefix = Config::get("file.adapters.s3.options.directory");
+    $key = $prefix . "/" . hash("md5", $filename);
+
+    $mime = $body["mime"];
+
+    $upload = FileMultipartUploadService::getInstance($w)
+        ->startMultipart(
+            $key,
+            $mime,
+            Config::get("file.adapters.s3.bucket")
+        );
+
+    $w->out(json_encode(["id" => $upload->id]));
+}
+
+/**
+ * Abort a multipart upload
+ */
+function ajax_multipart_DELETE(Web $w)
+{
+    $w->setLayout(null);
+
+    [$upload_id] = $w->pathMatch("id");
+
+    $obj = FileMultipartUploadService::getInstance($w)
+        ->getObject("FileS3Object", $upload_id);
+
+    FileMultipartUploadService::getInstance($w)
+        ->abortMultipart($obj);
+
+    $obj->delete();
+
+    $w->out((new JsonResponse())->setStatus(200));
+}

system/modules/file/actions/multipart/ajax_done.php

@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * Mark a multipart upload as done
+ */
+function ajax_done_POST(Web $w)
+{
+    $w->setLayout(null);
+
+    [$upload_id] = $w->pathMatch("id");
+
+    // TODO: check if user has permission to upload to this
+    // they already must have file_upload to get to this route
+    // but do they have permission to upload to this upload_id?
+
+    $obj = FileMultipartUploadService::getInstance($w)
+        ->getObject("FileS3Object", $upload_id);
+
+    $attachment = FileMultipartUploadService::getInstance($w)
+        ->finishMultipart($obj);
+
+    $obj->delete();
+
+    $w->out(
+        (new JsonResponse())
+            ->setSuccessfulResponse(
+                "Success",
+                !empty($attachment->id) ? ["id" => $attachment->id] : []
+            )
+    );
+}

system/modules/file/actions/multipart/ajax_part.php

@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Receive a presigned UploadPart url for multipart uploads
+ */
+function ajax_part_POST(Web $w)
+{
+    $w->setLayout(null);
+
+    $body = json_decode(file_get_contents('php://input'), true);
+
+    $upload_id = $body["id"];
+    $partNumber = $body["part"];
+    $length = $body["length"];
+    $md5 = $body["md5"];
+
+    // TODO: check if user has permission to upload to this
+
+    $obj = FileMultipartUploadService::getInstance($w)
+        ->getObject("FileS3Object", $upload_id);
+
+    $presigned = FileMultipartUploadService::getInstance($w)
+        ->getPresignedUploadPart($obj, $partNumber, $length, $md5);
+
+    $w->out(json_encode(["endpoint" => $presigned]));
+}

system/modules/file/assets/ts/LocalFilePreview.vue

@@ -0,0 +1,16 @@
+<script setup lang="ts">
+    import { computed } from "vue";
+
+    const props = defineProps<{
+        file: File
+    }>();
+
+    const src = computed(() => URL.createObjectURL(props.file));
+</script>
+
+<template>
+    <img v-if="props.file.type.startsWith('image')" :src="src" :alt="props.file.name" height="200" class="img-thumbnail h-100"/>
+    <audio v-else-if="props.file.type.startsWith('audio')" :src="src" :title="props.file.name" controls></audio>
+    <video v-else-if="props.file.type.startsWith('video')" :src="src" :title="props.file.name" height="200" controls></video>
+    <a v-else rel="noreferer" target="_blank" :href="src">{{ props.file.name }}</a>
+</template>

system/modules/file/assets/ts/MultipartUploaderComponent.ts

@@ -0,0 +1,11 @@
+import { createApp } from 'vue';
+
+import MultipartUploaderComponent from "./MultipartUploaderComponent.vue";
+
+window.addEventListener("load", () => {
+    createApp({
+        components: {
+            MultipartUploaderComponent,
+        }
+    }).mount("#multipart-uploader");
+})