Feature/client work u ipatches #216
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
adam-buckley
approved these changes
Nov 9, 2023
iceaxeliehne
added a commit
that referenced
this pull request
Jul 31, 2024
* feat: Export to PDF button Creating the button and a sample template for Export to PDF refs: 10244 * feat: Export to PDF action Fetching insight in action for exporting to PDF and planning steps for action in comments refs: 10244 * feat: Find template list Adding service function to find a list of all available templates refs: 10244 * feat: Filter template list Filter list of template titles to only display those that include the insights name. refs: 10244 * feat: Filter templates for insight Get name of insight to filter templates available to choose from for exporting to PDF refs: 10244 * feat: Filter with category Use the category variable in the findTemplates template service function to filter templates shown to only show templates including the insight class name and PDF in the title refs: 10244 * feat: unnecessary line Removing unnecessary line and undefined, unnecessary variable. refs: 10244 * feat: find corrct template Changes to find correct template to display in list, and comments for more changes needed refs: 10244 * feat: multi-col form drop-down Changing drop-down into multi-col form and adding code to be edited for use in yet to be created POSt function refs: 10244 * feat: GET and POST making get and post functions for exporting to PDF refs: 10244 * feat: Export to PDF popup Changing export to PDF button from link to another page to a popup box refs: 10244 * feat: send data, render, redirect Sending data to the POST function, rendering the insight data using the template selected, and redirecting back to runInsight refs: 10244 * feat: correct postUrl Correct url in postUrl refs: 10244 * feat: Update variables Update the variables used in POST to get the values from the multiColForm $template_list refs: 10244 * feat: preparing data Creating and correcting variables to get correct data in the post function for rendering in the template and exporting to PDF refs: 10244 * feat: Check exportpdf function Checking how the exportpdf function that the report module uses works. refs: 10244 * feat: export to pdf using run_data Changing the exportpdf function to use the run_data variable instead of rows refs: 10244 * feat: Using run_data changing exportphp function to use run_data refs: 10244 * feat: checking variables Checking new variables for exportpdf function refs: 10244 * feat: using run_data Editing code to use run_data in exportpdf service function refs: 10244 * feat: Template mandatory Making selection of a template for exporting to a PDF mandatory refs: 10244 * feat: template and data Organising template and data for the table for exporting to PDF refs: 10244] * feat: Template required Change where user is told choosing a template is required refs: 10244 * feat: errors noted in VSCode Fixing small errors in the export PDF action and service function that VSCode had flagged with red underlines refs: 10244 * feat: Small changes Checking things in export action refs: 10244 * feat: working to fix table Trying to get all data rows to display when exported to PDF refs: 10244 * feat: Making template required Changing form setup so that selecting a template is a requirement for export to PDF to work refs: 10244 * feat: get data for PDF Making sure the export to PDF function finds the table data and changing how the title will display when a template is used. refs: 10244 * feat: Export PDF to template Preparing to move pdf.php GET function into the runInsight template refs: 10244 * feat: doc title for PDF Changing how the title on the PDF document will appear when exported based on using a template or not using a template refs: 10244 * feat: Notes on PDF export Comments on things to be done to have GET function for pdf.php action to be in runInsight template refs: 10244 * feat: re-create form Recreating the form in the same style as the cmfive standard in the template. Buttons are now editable for closing. Parameters for select option yet to be moved. refs: 10244 * feat: formatting Fix spacing and other formatting errors noted by phpcs refs: 10244 * feat: creating export PDF creating button and new select for export to PDF function in insights refs: 10244 * feat: comments in js Comments on what needs to be placed in the java script refs: 10244 * feat: variables and close Creating variables for modal, button, and modal elements in javascript and adding function to display modal and make modal disappear refs: 10244 * feat: Window close Commenting out function to close modal when clicking out because behaving wrong. Editing to find correct functions that cmfive uses for this purpose refs: 10244 * feat: Closing X Moving closing x to correct position in modal and trying to get clicking on Export to PDF to grey out page. Trying to get x to close modal and allow clicking on page ability to resume for user [body footer?] refs: 10244 * feat: labels, close, and ajax Add labels to modal including title select box and buttons. Fix issues with closing X, clicking outside modal, and cancel button. Setting up code ready to implement ajax with submit button to send form information to POST function. refs: 10244 * feat: Set export to submit Export button submits to export/pdf action refs: 10244 * feat: Clean up Removing excess white space and unnecessary comments (commented out code) in preparation for making a pull request refs: 10244 * feat: remove console.log remove console log lines which were added for the purpose of testing refs: 10244 * feat: remove old code Old commented out code removed refs: 10244 * feat: jQuery to Vanilla Updating jQuery code to Vanilla JavaScript refs: 10244 * fix: check for arrays and objects (#143) * fix: check for arrays and objects added a check for object or arrays as array_key_esists is depreciated for use on objects causing warnings refs: 10244 * feat: requested changes Changes requested on GitHub to tread $fields as object and use the allow operator instead of the array operator refs: 10244 * fix: requested changes Changes requested on GitHub to tread $fields as object and use the allow operator instead of the array operator refs: 10244 * fix: remove duplications deleted duplicated lines refs: 10244 * fix: check is fields object add an elseif to check if the fields variable is an object refs: 10244 Co-authored-by: Taliesin Millhouse <[email protected]> * feat: Fixing foundation Working to fix issue with foundation function refs: 10151 * feat: converting to jQuery Converting Vanilla JavaScript code to jQuery so that foundation function will work refs: 10151 * feat: Remove select duplicate Removing the duplicate of the select option appearing twice in the drop down wen choosing a template for PDF export [body footer?] refs: 10151 * feat: clean-up code remove testing code and unnecessary comments refs: 10151 * feat: Alt Approach On Insights Modal (#159) * Rough cut proof, WIP * Integral patches * H-Scroll wide tables * Fix default PDF heading layout * Remove experimental code for simple implementation * Confirmed use case for core_layout_tpl * Portrait & Landscape on Insights pdf * Removed some lint Co-authored-by: D.Crannaford <[email protected]> * feat!: add support for PHP8.1 (#163) * ! Removed magic __get functions from Web, DbObject and DbService * ! Removed request() from Web in lieu of the Request static class * ! Also removed cmp_weights(), sendFile(), service(), _callPreListeners() and _callPostListeners() from Web * Commented out CachedTemplate in Web, expected to be removed in future version * Added support for code sniffing in Github actions over multiple PHP versions * Migrated all usages of magic $w::__get method to the proper DbService::getInstance($w) function * ! Removed unused shorthand _tn and _cn functions from DbObject * ! Removed snake_case functions in lieu of the matching camelCase counterparts from DbPDO * ! Removed setMissingResponse() from JsonResponse * ! Removed getFileExtension(), lookupForSelect() , getStateSelectArray(), formatMoney(), returncorrectdates(), AESencrypt() and AESdecrypt() from functions.php * ! Updated FluentPDO to latest version * ! Removed all Lookup functions from AdminService (use LookupService instead) * Added missing functions to LookupService from point above * Removed checkPassword() from User model * Removed $update_salt flag from encryptPassword() function in User model * Removed getNewMessages() from ChannelService * Moved from Zend to Laminas (still Zend, just new name) * Added ability for migrations run on CLI to print errors to screen * Updated some composer dependencies to latest version * Updated development Docker container to Ubuntu 20.04 LTS * Fixed type bugs due to move to PHP 8.x * Fixed static service instantiation for PHP 8.x * Fixed some code formatting * Started adding property types to Web * Backwards breaking changes to cmfive core: Potentially breaking changes: * Updated FluentPDO to add support for PHP8.1 Notices: * Removed user account creation hook listener in the Inbox module Post test updates * Corrected reference to DbPDO * Tidied up some code that was commented * Updated workflow to remove reliance on python set up scripts * Updates to CI scripts Co-authored-by: Adam Buckley <[email protected]> Co-authored-by: DerekCrannaford <[email protected]> * feat: new designs (#166) ### General features/updates * Added CountryService methods * Added AdminService::getCountryWhere() method. * Added missing returns to User::deleted() method. * Added profile security vue component * Added Request::array() method * Added helper functions to Language model * Added ability to hide application name on login * Added better support for enabling/disabling help and search functionality * Added support for filtering uploadings based on file extension (checks mimetype) * Added country and language seed * Added login attempt tracking with account lock * Added password strength enforcement * Added automatic logout after inactivity * Added customisable login field labels * Added persistent banner for when mfa is required but user doesn't have it on * Added MFA insight * Added pagination to user list * Added antivirus service * Added support for test_mode banner * Updated tests * Updated .github/ci.yml * Fixed History class doubling up some endpoints * Fixed several typos. * Fixed issue with memory usage of uploads * Fixed issue with insights * Fixed usage of deprecated sass compiler function * Fixed issue with short login field size * Fixed more issues from PHP 8.1 migration ### New design features * Added ability to compile assets in project modules * Added new base template designs * Added dark mode * Added data-link-target support * Added dom update event bus, * Added new Bootstrap html functions * Added basic animation support * Added support for multifile upload, inputs. Fix a bug with multiple attachments in FileService * Added support for quill, added some helper functions * Removed build artifacts, added multiselect support, changed identifier of Language to 3 letter code * Added pagination styles, updated inputwithother * Added form class support to html, updated alerts to be in line with bootstraps styles * Added responsive table * Added persistence of theme settings via new user setting feature * Added 'dataCard' element * Added splash overly for long processes * Added support for bootstrap tooltips Co-authored-by: Adam Buckley <[email protected]> Co-authored-by: D.Crannaford <[email protected]> Co-authored-by: Dane Evans <[email protected]> Co-authored-by: Taliesin Millhouse * Various spot patches from 8.1 testing (#172) Co-authored-by: Derek Crannaford <[email protected]> * Fix: Patching From Module Observations (#173) * Language migrations if NOTABLE exists vs importDB * fixes for php8.1 and mysql8 migration * Db column, (_Typo, strip_tags_STR * Hide PolyFill dev logging * Small fixes, null strings and wrong typing * Some stray non-conditional STRPOS * Conformed Stray ->log-> --------- Co-authored-by: D.Crannaford <[email protected]> Co-authored-by: Carsten Eckelmann <[email protected]> Co-authored-by: Robert Lockerbie <[email protected]> * feat: add move action (#179) * Created move action for timelogs * Fixing display of duration for active timelogs * Add error checking on move_POST * fix: core tests against php8master (#186) * Merge develop into master (#171) PHP 8.1 changes * ! Removed magic __get functions from Web, DbObject and DbService * ! Removed request() from Web in lieu of the Request static class * ! Also removed cmp_weights(), sendFile(), service(), _callPreListeners() and _callPostListeners() from Web * Commented out CachedTemplate in Web, expected to be removed in future version * Added support for code sniffing in Github actions over multiple PHP versions * Migrated all usages of magic $w::__get method to the proper DbService::getInstance($w) function * ! Removed unused shorthand _tn and _cn functions from DbObject * ! Removed snake_case functions in lieu of the matching camelCase counterparts from DbPDO * ! Removed setMissingResponse() from JsonResponse * ! Removed getFileExtension(), lookupForSelect() , getStateSelectArray(), formatMoney(), returncorrectdates(), AESencrypt() and AESdecrypt() from functions.php * ! Updated FluentPDO to latest version * ! Removed all Lookup functions from AdminService (use LookupService instead) * Added missing functions to LookupService from point above * Removed checkPassword() from User model * Removed $update_salt flag from encryptPassword() function in User model * Removed getNewMessages() from ChannelService * Moved from Zend to Laminas (still Zend, just new name) * Added ability for migrations run on CLI to print errors to screen * Updated some composer dependencies to latest version * Updated development Docker container to Ubuntu 20.04 LTS * Fixed type bugs due to move to PHP 8.x * Fixed static service instantiation for PHP 8.x * Fixed some code formatting * Started adding property types to Web * Backwards breaking changes to cmfive core: Potentially breaking changes: * Updated FluentPDO to add support for PHP8.1 Notices: * Removed user account creation hook listener in the Inbox module Post test updates * Corrected reference to DbPDO * Tidied up some code that was commented * Updated workflow to remove reliance on python set up scripts * Updates to CI scripts ### General features/updates * Added CountryService methods * Added AdminService::getCountryWhere() method. * Added missing returns to User::deleted() method. * Added profile security vue component * Added Request::array() method * Added helper functions to Language model * Added ability to hide application name on login * Added better support for enabling/disabling help and search functionality * Added support for filtering uploadings based on file extension (checks mimetype) * Added country and language seed * Added login attempt tracking with account lock * Added password strength enforcement * Added automatic logout after inactivity * Added customisable login field labels * Added persistent banner for when mfa is required but user doesn't have it on * Added MFA insight * Added pagination to user list * Added antivirus service * Added support for test_mode banner * Updated tests * Updated .github/ci.yml * Fixed History class doubling up some endpoints * Fixed several typos. * Fixed issue with memory usage of uploads * Fixed issue with insights * Fixed usage of deprecated sass compiler function * Fixed issue with short login field size * Fixed more issues from PHP 8.1 migration ### New design features * Added ability to compile assets in project modules * Added new base template designs * Added dark mode * Added data-link-target support * Added dom update event bus, * Added new Bootstrap html functions * Added basic animation support * Added support for multifile upload, inputs. Fix a bug with multiple attachments in FileService * Added support for quill, added some helper functions * Removed build artifacts, added multiselect support, changed identifier of Language to 3 letter code * Added pagination styles, updated inputwithother * Added form class support to html, updated alerts to be in line with bootstraps styles * Added responsive table * Added persistence of theme settings via new user setting feature * Added 'dataCard' element * Added splash overly for long processes * Added support for bootstrap tooltips * Various spot patches from 8.1 testing (#172) * Fix: Patching From Module Observations (#173) * Language migrations if NOTABLE exists vs importDB * fixes for php8.1 and mysql8 migration * Db column, (_Typo, strip_tags_STR * Hide PolyFill dev logging * Small fixes, null strings and wrong typing * Some stray non-conditional STRPOS * Conformed Stray ->log-> Co-authored-by: Alice <[email protected]> Co-authored-by: Taliesin Millhouse <[email protected]> Co-authored-by: Alice Hutley <[email protected]> Co-authored-by: DerekCrannaford <[email protected]> Co-authored-by: D.Crannaford <[email protected]> Co-authored-by: Adam Buckley <[email protected]> Co-authored-by: Dane Evans <[email protected]> Co-authored-by: Carsten Eckelmann <[email protected]> Co-authored-by: Robert Lockerbie <[email protected]> * core Tests against new PHP8 master on boilerplate * Correct ci boilerplate branch --------- Co-authored-by: Adam Buckley <[email protected]> Co-authored-by: Alice <[email protected]> Co-authored-by: Taliesin Millhouse <[email protected]> Co-authored-by: Alice Hutley <[email protected]> Co-authored-by: D.Crannaford <[email protected]> Co-authored-by: Adam Buckley <[email protected]> Co-authored-by: Dane Evans <[email protected]> Co-authored-by: Carsten Eckelmann <[email protected]> Co-authored-by: Robert Lockerbie <[email protected]> * Feature: work to codeception5 (#187) * First cut namespace changes * Check remote can push * Patched task test * Update CI Selenium container reference * Patch deprecated sanitiser * Bump version on ci uploadArtifact action * Bump ci for core 8.1 explicit from Composer --------- Co-authored-by: Derek Crannaford <[email protected]> * fix: drop encryption migration support (#193) * Bump config and block out legacy code * Fix revealed typo * Restore dropped var * Clarify deprecatino in comments --------- Co-authored-by: Derek Crannaford <[email protected]> * Expose type ref for browser datetimelocal (#176) Co-authored-by: D.Crannaford <[email protected]> * Fix: Stable File Migration (#177) * First cut at arbitray count and catch * Make default be all files moved --------- Co-authored-by: D.Crannaford <[email protected]> * Feature: api backend on php8 (#194) * WIP with stubs for NONRELEASE * progress on the cmfive token model. Incomplete * Dane WIP, most of the way through getting user roles from a policy need to fix up a few issues, and then add group roles as well * getRoles working for the temporary tokens * moving to another hook for roles, but not working at this stage * working tokens and role system * added output templates, changed endpoints to give json responses * Better token concept may be viable * Oath base classes and generic actions * oauth flow, Cognito model, SplashScreen on Success * Cognito implemented with validation and user data * Suspend and embed stable test code * Part out oauth models * Avoid null roles exception * Factor token policies not visible as user roles * Deprecated magic methods * Ver8 logging corrections * Thumbs patched * Patch html fails on strlen * Patch html fails on substr * Patch missing auth token error * Patch typo for missing auth token * Patched toSlug for str vs null * Supressed dead and demo code * Heavy cleanup, defer examples/tests as external * Cleanup requested on PR * Cleaned comments --------- Co-authored-by: Derek Crannaford <[email protected]> Co-authored-by: Dane Evans <[email protected]> * fix: updating dependencies (#212) * Updating dependencies * fix: update PR template --------- Co-authored-by: Adam Buckley <[email protected]> * Feature/client work u ipatches (#216) * Fix affected table buttons of mapped form displays (#205) * Fix help viewNull and correct search select input * AllowToHide file:edit:restrict UI even when admin * Make favourites work again. * Qualify services against namespace * fix: fix scss compilation issue (#220) Co-authored-by: Adam Buckley <[email protected]> * fix: fix run report when run without a form (#226) Co-authored-by: Adam Buckley <[email protected]> * Admin module Bootstrap5 conversion (#215) Full transition of Admin and Channels module to Bootstrap 5 new designs. Full transition from Codeception to Playwright for UA tests Includes other misc fixes --------- Co-authored-by: Claire <[email protected]> Co-authored-by: Dane <[email protected]> Co-authored-by: Jareem <> Co-authored-by: Adam Buckley <[email protected]> Co-authored-by: Derek Crannaford <[email protected]> * feat: add CurlService:postRequestWithAuth (#217) * Update ci.yml * fix: fix issue with usage of new version of scssphp (#178) * fix: fix issue with usage of new version of scssphp * fix: corrected helper reference --------- Co-authored-by: Adam Buckley <[email protected]> * fix: remove pdf viewer (#231) Co-authored-by: Adam Buckley <[email protected]> * Remove Inbox module and references * fix: fix issue with pagination pathing from attachments partial (#235) Co-authored-by: Adam Buckley <[email protected]> * fix: fix codemirror issues (#248) * Merge develop into master (#229) * fix: fix codemirror issues * Add node matrix * Add latest * Update artifact output * Update phpCS to use a matrix * Migration for inbox table and roles * Update description * fix: fix Form cron SQL issues (#258) Co-authored-by: Adam Buckley <[email protected]> * Update ci.yml Remove node latest and php 8.2 on dev branch * Manually navigating to add timelog button instead of using helper function * CI changes for new cmfive image * remove redundant file * made Admin migrations test more robust * fix issue causing template tests to fail * Change to cmfive based core installation * Re-order theme. Fix reference to core. * Missing slash * Fix theme compiling * Run the command in docker instead * Restore symlink for tests * Link * Create dependencies.yml Add https://github.com/actions/dependency-review-action with warn only added * Feat/auth bs5 conversion (#263) * updated layout for auth module templates to use BS5 * Updated vue and replaced axios with fetch for auth login * Moved install database seeds admin playwright utility function * CSS improvements including responsive design * Removed redundant code * Feat/vue3 migration (#271) * fix: fix block grid foundation backwards compat * feat: working on migrations to Vue 3 * feat: added new navigation DbService method * feat: adding accordion styles for dark mode, added helper functions * fix: fix bugs in layout & InputField. Add DismissableAlert * fix: Fix bug with humanReadableBytes * fix: fixing issues from tests * Use dev tools script * Update ci.yml Add container name * Refactor container name * Update ci.yml * Update ci.yml * Update ci.yml * feat: form banner support (#196) * Added Form Banner * Added suport for horizontal lines on forms --------- Co-authored-by: Adam Buckley <[email protected]> Co-authored-by: Matt Bell <[email protected]> * Update ci.yml * Update ci.yml * Update ci.yml * Db env vars * Zip layout * Develop branch * Theme build action * Update name * Update theme.yml * Add artifact ID * Add paths, remove id * Update paths * Update theme.yml * Implement `input-large` class used by search tmpl * Fix bootstrap theme search I do not like this solution: Cmfive.openModal downloads the modal and appends it to the template modal box, and any scripts inside the downloaded content are expected to execute. However, as per MDN[1], setting element content with `innerHTML` should not execute scripts as a security measure. To get around this, I've had to manually `eval` any scripts the downloaded modal contains. I've also added jquery to the bootstrap template as the search module uses it. [1] https://developer.mozilla.org/en-US/docs/Web/API/Element/innerHTML#security_considerations * Fixing duplication of timelog entries * Filter timelogs by user and use gmdate to convert to UTC * Fix/menu links fix (#293) * fix: fix issue with menu links * fix: remove debugging --------- Co-authored-by: Adam Buckley <[email protected]> * Remove jquery dep of search modal * Making sure to filter by task * Fix 2fa QR code and secret not rendering * Fix naming * Add playwright test for deduping * Alter createTimelog to test for duplicate timelog * Fix deletion of editTimelog function * Hopefully fix bug in form gen where `required` prop is not set * Change test to use "admin admin" as opposed to "Admin Admin" for CI/CD tests * Simplify timelog deduplication verification in utility function * changes to test to log out timelogs that should be deduped but aren't in develop test * allow test to work on PR into develop * check compared date time strings and IDs to make sure there's no subtle differences * fix deleting timelogs when there's additional debug information in description * replace ugly, functionality changing code with LogService calls * better logs * change logging to use info rather than debug * set logger for dedupe logging * Send json content type when sending json Fixes invalid token responses getting html content type, etc * indentation * Force logout if deleting own user * include dedupe information in Timelog saved banner so playwright can log it out in Develop branch * delete layout file (#315) * Test admins can update user passwords (#318) * temporarily deprecate timelog deduplication test (#319) * feat: add ability to edit lookups, tests need doing (#219) * feat: add ability to edit lookups, tests need doing * fix: got tests working * Fix admin vue3 2fa prompt (#297) Co-authored-by: Chris Bateman <[email protected]> Co-authored-by: Adam Buckley <[email protected]> * Show sane error when creating user with existing login (#313) * Show sane error on useradd with existing login * fix: fixing merge conflicts from master merge (#321) * fix: fixing merge conflicts from master merge * fix: revert CI --------- Co-authored-by: Adam Buckley <[email protected]> Co-authored-by: Matt Bell <[email protected]> --------- Co-authored-by: Alice <[email protected]> Co-authored-by: Taliesin Millhouse <[email protected]> Co-authored-by: Alice Hutley <[email protected]> Co-authored-by: DerekCrannaford <[email protected]> Co-authored-by: D.Crannaford <[email protected]> Co-authored-by: Adam Buckley <[email protected]> Co-authored-by: Adam Buckley <[email protected]> Co-authored-by: Dane Evans <[email protected]> Co-authored-by: Carsten Eckelmann <[email protected]> Co-authored-by: Robert Lockerbie <[email protected]> Co-authored-by: claire <[email protected]> Co-authored-by: 2piJareem <[email protected]> Co-authored-by: Dane Evans <[email protected]> Co-authored-by: Claire <[email protected]> Co-authored-by: Matt Bell <[email protected]> Co-authored-by: Chris Bateman <[email protected]> Co-authored-by: Tynan Matthews <[email protected]> Co-authored-by: Madeline <[email protected]> Co-authored-by: timl07 <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Client work revealed several edge case patches required
Changelog