Skip to content
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.

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

Integrate new file fields #2775

Merged
merged 105 commits into from
Nov 20, 2018
Merged

Integrate new file fields #2775

merged 105 commits into from
Nov 20, 2018

Commits on Oct 18, 2018

  1. Merge branch 'feature/2771' into feature/2766

    * feature/2771:
      markdown fix in testing docs #2771
      migrate in e2e tests #2771
      Setup test imports for e2e tests #2771
      setup unit tests seperate from WordPress 'unit' tests #2701
      cypress tests #2771
      cache dirs on travis #2771
      make phpunit integration tests run locally in container #2711
      docker install scripts #2771 added to bin
      #2771 delete old docker env
    
    # Conflicts:
    #	package-lock.json
    Josh Pollock committed Oct 18, 2018
    Configuration menu
    Copy the full SHA
    a7f60d4 View commit details
    Browse the repository at this point in the history
  2. #2766 add client for front-end render

    Josh Pollock committed Oct 18, 2018
    Configuration menu
    Copy the full SHA
    8f4043c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d0a6192 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2018

  1. Merge branch 'feature/2771' into feature/2766

    * feature/2771:
      fix bad package lock
      do not run cypress tests with Jest #2771
      #2771 run isolated unit tests in Travis
      Revert "record cypress test run in travis #2771"
      record cypress test run in travis #2771
      Prepare for cypress in CI #2771
      Minor code clean up for #2768
      Restore new form ID for cloned new forms
    
    # Conflicts:
    #	package-lock.json
    Josh Pollock committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    3f2f791 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b96204b View commit details
    Browse the repository at this point in the history
  3. impliment disbale conditionals for cf2 fields #2766

    Josh Pollock committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    26b7a9c View commit details
    Browse the repository at this point in the history
  4. #2766 move new field rendering to a field group component and write t…

    …ests for that
    Josh Pollock committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    51184d1 View commit details
    Browse the repository at this point in the history
  5. #2766 set required and disabled props more intelligently

    Josh Pollock committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    f449034 View commit details
    Browse the repository at this point in the history
  6. get validation slightly working for cf2 fields #2766

    Josh Pollock committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    ba2d295 View commit details
    Browse the repository at this point in the history
  7. add cf2 field values to submit request #2766

    Josh Pollock committed Oct 19, 2018
    Configuration menu
    Copy the full SHA
    769cfe2 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2018

  1. #2766 update state with default for cf2 fields correctly

    Josh Pollock committed Oct 20, 2018
    Configuration menu
    Copy the full SHA
    b727677 View commit details
    Browse the repository at this point in the history
  2. move input to its own component #2771

    Josh Pollock committed Oct 20, 2018
    Configuration menu
    Copy the full SHA
    a52b1fc View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2018

  1. Configuration menu
    Copy the full SHA
    9ecc5d6 View commit details
    Browse the repository at this point in the history
  2. #2766 more work on cf2 file fields

    Josh Pollock committed Oct 23, 2018
    Configuration menu
    Copy the full SHA
    800f711 View commit details
    Browse the repository at this point in the history
  3. #2771 php5 compatible include

    Josh Pollock committed Oct 23, 2018
    Configuration menu
    Copy the full SHA
    ec664fc View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2018

  1. Merge branch 'develop' into feature/2766

    # Conflicts:
    #	assets/build/css/caldera-forms-front.min.css
    #	assets/css/caldera-forms-front.css
    #	assets/js/caldera-forms-front.js
    #	tests/bootstrap-unit.php
    Josh Pollock committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    9b020f5 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'develop' into feature/2766

    Josh Pollock committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    93b3f13 View commit details
    Browse the repository at this point in the history
  3. endpoint for uploading files from file fields against #2766

    Josh Pollock committed Oct 24, 2018
    Configuration menu
    Copy the full SHA
    4ff1985 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2018

  1. add one command for all php tests #2766

    Josh Pollock committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    626b610 View commit details
    Browse the repository at this point in the history
  2. seperate file upload logic from rest api handler #2766

    Josh Pollock committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    f371307 View commit details
    Browse the repository at this point in the history
  3. seperate file upload logic from rest api handler #2766

    Josh Pollock committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    3aba811 View commit details
    Browse the repository at this point in the history
  4. test new upload handlers #2766

    Josh Pollock committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    8fbf3f8 View commit details
    Browse the repository at this point in the history
  5. make file process abstraction more sensible #2766

    Josh Pollock committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    d215155 View commit details
    Browse the repository at this point in the history
  6. #2766 respect caldera_forms_upload_directory when uploading cf2 file …

    …field file
    Josh Pollock committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    757fbce View commit details
    Browse the repository at this point in the history
  7. check file types before saving #2766

    Josh Pollock committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    4ab7fba View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    fb9ca9c View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    200bfb7 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    791beab View commit details
    Browse the repository at this point in the history
  11. #2766 work on uploading files with correc thashes

    Josh Pollock committed Oct 25, 2018
    Configuration menu
    Copy the full SHA
    937886d View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2018

  1. Configuration menu
    Copy the full SHA
    cba3b5f View commit details
    Browse the repository at this point in the history
  2. Clean dropzone inline styles

    New0 committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    3030301 View commit details
    Browse the repository at this point in the history
  3. Set local state to list files

    Also manage files state for each file individually in order to be able to add files one by one ( and later remove one by one )
    New0 committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    539c3fc View commit details
    Browse the repository at this point in the history
  4. Add a by file remove handler

    New0 committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    19283f6 View commit details
    Browse the repository at this point in the history
  5. #2766 import React in FileInput

    Josh Pollock committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    abad92d View commit details
    Browse the repository at this point in the history
  6. #2766 (failing tests) that would show file uploads are linked to comp…

    …leted submissions
    Josh Pollock committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    9a940b5 View commit details
    Browse the repository at this point in the history
  7. #2766 server-side handling for processing file fields

    Josh Pollock committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    dbf12fe View commit details
    Browse the repository at this point in the history
  8. add inline docs and tests for new file field logic #2776

    Josh Pollock committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    bd88ae6 View commit details
    Browse the repository at this point in the history
  9. #2766 write description for e2e tests for new file fields

    Josh Pollock committed Oct 26, 2018
    Configuration menu
    Copy the full SHA
    9056df9 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2018

  1. #2766 abstract our wp_mail test utils before testing new file fields …

    …wp_mail
    Josh Pollock committed Oct 27, 2018
    Configuration menu
    Copy the full SHA
    22e0677 View commit details
    Browse the repository at this point in the history
  2. (re)Make FileInput a stateless component

    Also added a condition to display preview only for images
    New0 committed Oct 27, 2018
    Configuration menu
    Copy the full SHA
    43a544c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1e350de View commit details
    Browse the repository at this point in the history
  4. Merge branch 'feature/2766' of github.com:CalderaWP/Caldera-Forms int…

    …o feature/2766
    
    * 'feature/2766' of github.com:CalderaWP/Caldera-Forms:
      (re)Make FileInput a stateless component
    Josh Pollock committed Oct 27, 2018
    Configuration menu
    Copy the full SHA
    6714093 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2018

  1. WIP Styles build and enqueue

    - Generate build css files in clients folder
    - enqueue styles for render client ( Tests don't respons to 'caldera_forms_render_assets_minify' filter hook yet )
    #2766
    New0 committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    e3cae9d View commit details
    Browse the repository at this point in the history
  2. enqueue render style if not loaded with form style #2766

    Josh Pollock committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    c6421a4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    595bcc8 View commit details
    Browse the repository at this point in the history
  4. Remove enqueue 'render' styles when not all forms stylesheets are set

    #2766 @Shelob9 I think we don't need to enqueue the render fields styles in this case (cf title), the render fields styles are included in caldera-forms-front styles after grunt is ran.
    
    That being said, I tried to enqueue it classes/render/assets.php l612 when ' 'caldera_forms_render_assets_minify' is set to false ( that way we can work on render styles running npm run dev without having to run grunt tasks during work. But I'm not sure that is necessary too...
    New0 committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    36bb1b9 View commit details
    Browse the repository at this point in the history
  5. Merge branch 'feature/2766' of github.com:CalderaWP/Caldera-Forms int…

    …o feature/2766
    Josh Pollock committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    c72dca5 View commit details
    Browse the repository at this point in the history
  6. #2766 working on wiring up file field submissions

    Josh Pollock committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    e19b9ed View commit details
    Browse the repository at this point in the history
  7. #2766 fix privacy client related issues for file fields (IE don't loa…

    …d when it should not)
    Josh Pollock committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    51c576e View commit details
    Browse the repository at this point in the history
  8. add save handler requirment for Handler contract #2766

    Josh Pollock committed Oct 30, 2018
    Configuration menu
    Copy the full SHA
    32d6ff7 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    e405c72 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    d727e1e View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2018

  1. Configuration menu
    Copy the full SHA
    60f89fa View commit details
    Browse the repository at this point in the history
  2. Work on html and styles

    New0 committed Oct 31, 2018
    Configuration menu
    Copy the full SHA
    7c1c1b1 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2018

  1. command to see server URL

    Josh Pollock committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    94f1560 View commit details
    Browse the repository at this point in the history
  2. more tests for file field submission #2766

    Josh Pollock committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    958abd7 View commit details
    Browse the repository at this point in the history
  3. remove extra fiel in last commit #2766

    Josh Pollock committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    2603d30 View commit details
    Browse the repository at this point in the history
  4. add tests for portal renderer #2766

    Josh Pollock committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    96e0d91 View commit details
    Browse the repository at this point in the history
  5. one true way to create Enzyme adapter #2766

    Josh Pollock committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    4864322 View commit details
    Browse the repository at this point in the history
  6. some tests for main form render methods #2766

    Josh Pollock committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    832e13e View commit details
    Browse the repository at this point in the history
  7. test and inline doc clean ups #2766

    Josh Pollock committed Nov 1, 2018
    Configuration menu
    Copy the full SHA
    450de92 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2018

  1. Configuration menu
    Copy the full SHA
    3e376b9 View commit details
    Browse the repository at this point in the history
  2. missing inline docs for new code #2766

    Josh Pollock committed Nov 2, 2018
    Configuration menu
    Copy the full SHA
    5d38eab View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    118bde4 View commit details
    Browse the repository at this point in the history
  4. smarter way to handle cf2 file registration #2677

    Josh Pollock committed Nov 2, 2018
    Configuration menu
    Copy the full SHA
    77313f5 View commit details
    Browse the repository at this point in the history
  5. allow jpeg files when jpg files are allowed and allow files to be re-…

    …uploaded if failed validation #2766
    Josh Pollock committed Nov 2, 2018
    Configuration menu
    Copy the full SHA
    9eafdd7 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    2724d29 View commit details
    Browse the repository at this point in the history
  7. #2766 pass file field accept argument with mime types

    Josh Pollock committed Nov 2, 2018
    Configuration menu
    Copy the full SHA
    c9e1ff5 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2018

  1. block submission when file field is empty and required and allow it t…

    …o upload once filled in #2766
    Josh Pollock committed Nov 3, 2018
    Configuration menu
    Copy the full SHA
    6734d80 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2018

  1. fix file paths for loading tests forms/pages #2766

    Josh Pollock committed Nov 5, 2018
    Configuration menu
    Copy the full SHA
    f514415 View commit details
    Browse the repository at this point in the history
  2. load test forms at caldera_forms_includes_complete #2766

    Josh Pollock committed Nov 5, 2018
    Configuration menu
    Copy the full SHA
    a026719 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    27dd274 View commit details
    Browse the repository at this point in the history
  4. #2766 target file field dropzone in cypress fixture

    Josh Pollock committed Nov 5, 2018
    Configuration menu
    Copy the full SHA
    323d96c View commit details
    Browse the repository at this point in the history
  5. #2766 setup for enzyme testing of file fields

    Josh Pollock committed Nov 5, 2018
    Configuration menu
    Copy the full SHA
    cb0f428 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2018

  1. Testing Cypress tests #1766

    New0 committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    d3fb9c4 View commit details
    Browse the repository at this point in the history
  2. #2766 faling tests for work left to be done on file fields

    Josh Pollock committed Nov 6, 2018
    Configuration menu
    Copy the full SHA
    1e92ca8 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2018

  1. Preview Options and multiple option #2766

    WIP: Tests work in progress
    The multiple and preview options are passed to the view
    New0 committed Nov 7, 2018
    Configuration menu
    Copy the full SHA
    dcf98b6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a49d116 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2018

  1. FileInput functions as props #2766

    - Move Functions from FileInput toCalderaFromsRender
    - Manage rejected files
    New0 committed Nov 8, 2018
    Configuration menu
    Copy the full SHA
    09cd536 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2018

  1. Small changes to FileInput #2766

    - Rename ulExpanded to value Set 
    - Set ptopType of accept to oneOfType boolean or string (string if it is set boolean when empty )
    New0 committed Nov 9, 2018
    Configuration menu
    Copy the full SHA
    6e31b75 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2018

  1. [WIP] Tests for FileInput.js and progress based on tests #2766

    - console errors need to be removed 
    - other tests needed to complete this series
    - review pertinence of all tests and remove non useful tests
    New0 committed Nov 14, 2018
    Configuration menu
    Copy the full SHA
    67c1427 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c850d41 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2018

  1. Configuration menu
    Copy the full SHA
    7891502 View commit details
    Browse the repository at this point in the history
  2. Remove unnecessary unit test

    This test is made with correct props with enzyme at L187 in clients\tests\unit\render\Fields\Mocks\MockFileRenderer.test.js 
    
    This should also make Trvis ci tests pass ( #2802 )
    New0 committed Nov 15, 2018
    Configuration menu
    Copy the full SHA
    e497b8e View commit details
    Browse the repository at this point in the history
  3. Create a proper job manager for deleting transients etc. (#2802)

    * #2801 add a job manager
    
    * #2801 run queue manager
    
    * schedule delete with job manager #2801
    
    * Remove var_dump #2801
    
    * mild cleanup for starting the runner #2801
    
    * add queue run endpoint #2801
    
    * rest api route for running queue now checked with CF PRo api keys #2801
    
    * #2801 more tests for the run queue endpoint and fixed its response
    
    * Resolve Conflicts #2802
    
    * Resolve conflicts #2802
    
    * Resolve conflicts #2802
    Josh Pollock authored and New0 committed Nov 15, 2018
    Configuration menu
    Copy the full SHA
    9d76ad6 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2018

  1. #2766 more cypress tests to ensure that if file fields are not requir…

    …ed and they have no value, you can submit the form
    Josh Pollock committed Nov 16, 2018
    Configuration menu
    Copy the full SHA
    be6d6ea View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2018

  1. Configuration menu
    Copy the full SHA
    0b0c94e View commit details
    Browse the repository at this point in the history
  2. Resolve conflicts #2766

    New0 committed Nov 19, 2018
    Configuration menu
    Copy the full SHA
    4d04990 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a8fa334 View commit details
    Browse the repository at this point in the history
  4. cleanup in the test files before adding new tests #2766

    Josh Pollock committed Nov 19, 2018
    Configuration menu
    Copy the full SHA
    10bc215 View commit details
    Browse the repository at this point in the history
  5. cleanup in the test files before adding new tests #2766

    Josh Pollock committed Nov 19, 2018
    Configuration menu
    Copy the full SHA
    8800eed View commit details
    Browse the repository at this point in the history
  6. test to prove that new file field validation does NOT set isRequired …

    …to false by default #2766
    Josh Pollock committed Nov 19, 2018
    Configuration menu
    Copy the full SHA
    d76d57e View commit details
    Browse the repository at this point in the history
  7. #2766 tests to prove that the file field does not indicate that it is…

    … required with a * and the right markup
    Josh Pollock committed Nov 19, 2018
    Configuration menu
    Copy the full SHA
    2b48a85 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    71cc344 View commit details
    Browse the repository at this point in the history
  9. tests to prove that the field group component is NOT showing a * indi…

    …cator #2766
    Josh Pollock committed Nov 19, 2018
    Configuration menu
    Copy the full SHA
    9e33d6d View commit details
    Browse the repository at this point in the history
  10. #2766 tests to prove that the isRequired prop is not set correctly se…

    …rver-side
    Josh Pollock committed Nov 19, 2018
    Configuration menu
    Copy the full SHA
    7ff3749 View commit details
    Browse the repository at this point in the history
  11. #2766 cf2 fiel field required indicator

    Josh Pollock committed Nov 19, 2018
    Configuration menu
    Copy the full SHA
    d1f48a5 View commit details
    Browse the repository at this point in the history
  12. set icon for file fields #2766

    Josh Pollock committed Nov 19, 2018
    Configuration menu
    Copy the full SHA
    6baa6fd View commit details
    Browse the repository at this point in the history
  13. #2766 update test data to use field.isRequired

    Josh Pollock committed Nov 19, 2018
    Configuration menu
    Copy the full SHA
    7776bbc View commit details
    Browse the repository at this point in the history
  14. correct the isRequired check #2766

    Josh Pollock committed Nov 19, 2018
    Configuration menu
    Copy the full SHA
    0b8e88c View commit details
    Browse the repository at this point in the history
  15. Merge branch 'develop' of github.com:CalderaWP/Caldera-Forms into fea…

    …ture/2766
    
    # Conflicts:
    #	classes/forms.php
    #	tests/test-entry-fields-collection.php
    #	tests/test-forms-api.php
    #	tests/test-save.php
    Josh Pollock committed Nov 19, 2018
    Configuration menu
    Copy the full SHA
    6859891 View commit details
    Browse the repository at this point in the history
  16. #2766 load tables for new job queue correctly

    Josh Pollock committed Nov 19, 2018
    Configuration menu
    Copy the full SHA
    3365fff View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2018

  1. #2766 Make Text Translatable and let the button disabled

    - Make all Files Field component texts translatable
    - When multiple isn't allowed and a file is set, let the button displayed as disabled instead of hiding it and adding text.
    New0 committed Nov 20, 2018
    Configuration menu
    Copy the full SHA
    c6f6877 View commit details
    Browse the repository at this point in the history
  2. remove console logs in tests #2766

    Josh Pollock committed Nov 20, 2018
    Configuration menu
    Copy the full SHA
    6505f50 View commit details
    Browse the repository at this point in the history
  3. minor cleanups #2766

    Josh Pollock committed Nov 20, 2018
    Configuration menu
    Copy the full SHA
    954c14e View commit details
    Browse the repository at this point in the history