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.

Sign up for GitHub

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

Jump to bottom

Adding new diagram type - Block Diagram #5221

Merged
merged 76 commits into from
Feb 1, 2024
Merged

Adding new diagram type - Block Diagram #5221

merged 76 commits into from
Feb 1, 2024

Commits on Jul 5, 2023

  1. #3358 First commit with basic grammar and 1st test

    @knsv
    knsv committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    86e1bb3 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2023

  1. Rename BlockDiagram to Block

    @nirname
    nirname committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    791e676 View commit details
    Browse the repository at this point in the history

  2. Small cleanup

    @nirname
    nirname committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    fee2b24 View commit details
    Browse the repository at this point in the history

  3. Fixed block diagram parser import

    @nirname
    nirname committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    975f36c View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2023

  1. Adding some more tests

    @knsv
    knsv committed Jul 9, 2023
    Configuration menu
    Copy the full SHA
    c10f765 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2023

  1. Started block diag db development

    @nirname
    nirname committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    d165e8a View commit details
    Browse the repository at this point in the history

  2. Started layout and rendering

    @nirname
    nirname committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    e251baa View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2023

  1. Merge branch 'develop' into 3358-blocks-diagram

    @knsv
    knsv committed Jul 25, 2023
    Configuration menu
    Copy the full SHA
    13114eb View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2023

  1. Adding support for compound blocks

    @knsv
    knsv committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    b9531d5 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2023

  1. #3358 Adding db calls from node statements

    @knsv
    knsv committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    5fc99f1 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2023

  1. before refactoring

    @knsv
    knsv committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    aa7f5a8 View commit details
    Browse the repository at this point in the history

  2. Saving data from compound blocks

    @knsv
    knsv committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    8a55b21 View commit details
    Browse the repository at this point in the history

  3. Some cleanup

    @knsv
    knsv committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    e52de6c View commit details
    Browse the repository at this point in the history

  4. Support for compound blocks with id, title and type

    @knsv
    knsv committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    5f1cfc7 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2023

  1. Rendering, tmp commit before refactoring

    @knsv
    knsv committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    1e864a5 View commit details
    Browse the repository at this point in the history

  2. Rendering, interim

    @knsv
    knsv committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    ccdb803 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2023

  1. WIP

    @knsv
    knsv committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    836d3a8 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2023

  1. #3358 Recursive positioning

    @knsv
    knsv committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    b4e3254 View commit details
    Browse the repository at this point in the history

  2. #3358 Recursive positioning

    @knsv
    knsv committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    f00871a View commit details
    Browse the repository at this point in the history

  3. #3358 Recursive positioning

    @knsv
    knsv committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    c8d155c View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2023

  1. #3358 Recursive positioning paddings

    @knsv
    knsv committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    da79b37 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2023

  1. #3358 Adding support for column statements

    @knsv
    knsv committed Oct 15, 2023
    Configuration menu
    Copy the full SHA
    a641fd5 View commit details
    Browse the repository at this point in the history

  2. #3358 Putting the elements back in

    @knsv
    knsv committed Oct 15, 2023
    Configuration menu
    Copy the full SHA
    74a9e86 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2023

  1. #3358 Adding support for space blocks and different shapes

    @knsv
    knsv committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    5619f87 View commit details
    Browse the repository at this point in the history

  2. #3358 Adding support for space blocks and different shapes

    @knsv
    knsv committed Oct 20, 2023
    Configuration menu
    Copy the full SHA
    f3f25c7 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2023

  1. Parsing of block arrows with directions, creating a dedicated new nod… 

    …e for this.
    @knsv
    knsv committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    7198fe5 View commit details
    Browse the repository at this point in the history

  2. Parsing of block arrows with directions, creating a dedicated new nod… 

    …e for this.
    @knsv
    knsv committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    03c59ad View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2023

  1. #3358 Adding arrows to syntax

    @knsv
    knsv committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    df858dc View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2024

  1. #3358 Adding arrows to rendering

    @knsv
    knsv committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    2ed4469 View commit details
    Browse the repository at this point in the history

  2. #3358 Multiple arrows

    @knsv
    knsv committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    d0eca26 View commit details
    Browse the repository at this point in the history

  3. #3358 Edge labels

    @knsv
    knsv committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    72135c2 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2024

  1. #3358 Adding support for classDef and class statements

    @knsv
    knsv committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    275e01a View commit details
    Browse the repository at this point in the history

  2. #3358 Adding support for style statements

    @knsv
    knsv committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    818cb2f View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2024

  1. #3358 Support for adding tests and fixed issues for some shapes

    @knsv
    knsv committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    809c450 View commit details
    Browse the repository at this point in the history

  2. #3358 Fix for layout where a siebling has wider siize

    @knsv
    knsv committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    7043892 View commit details
    Browse the repository at this point in the history

  3. #3358 Sieblinmg height alignment

    @knsv
    knsv committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    1d18757 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2024

  1. #3358 Fix for width of composite blocks

    @knsv
    knsv committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    bbc7fe6 View commit details
    Browse the repository at this point in the history

  2. #3358 Removed logging, fixed som tests

    @knsv
    knsv committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    a0d328d View commit details
    Browse the repository at this point in the history

  3. #3358 Some cleanup

    @knsv
    knsv committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    1230da7 View commit details
    Browse the repository at this point in the history

  4. #3358 Removed logging som type fixes

    @knsv
    knsv committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    8e14720 View commit details
    Browse the repository at this point in the history

  5. Final console.log removed

    @knsv
    knsv committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    173ba2e View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' into 3358-blocks-diagram

    @knsv
    knsv committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    bf64509 View commit details
    Browse the repository at this point in the history

  7. Update docs

    @knsv
    knsv committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    5553cbb View commit details
    Browse the repository at this point in the history

  8. #3358 Doc updates after viewing the page

    @knsv
    knsv committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    d075766 View commit details
    Browse the repository at this point in the history

  9. Merge branch '3358-blocks-diagram' of github.com:mermaid-js/mermaid i… 

    …nto 3358-blocks-diagram
    @knsv
    knsv committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    b4dece8 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2024

  1. #3358 Reviving arrow heads after merging develop

    @knsv
    knsv committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    d96425d View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2024

  1. #3358 Adjusting docs and a bug fix for nested blocks

    @knsv
    knsv committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    fe89b95 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into 3358-blocks-diagram

    @knsv
    knsv committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    c85b248 View commit details
    Browse the repository at this point in the history

  3. Updated lockfile

    @knsv
    knsv committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    1629a91 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2024

  1. Update packages/mermaid/src/schemas/config.schema.yaml 

    Co-authored-by: Alois Klink <alois@aloisklink.com>
    @knsv @aloisklink
    knsv and aloisklink committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    1965f69 View commit details
    Browse the repository at this point in the history

  2. #3358 Second set of changes after review

    @knsv
    knsv committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    37d7c7e View commit details
    Browse the repository at this point in the history

  3. Merge branch '3358-blocks-diagram' of github.com:mermaid-js/mermaid i… 

    …nto 3358-blocks-diagram
    @knsv
    knsv committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    5aab2ba View commit details
    Browse the repository at this point in the history

  4. #3358 Third set of changes after review

    @knsv
    knsv committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    bfa8111 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2024

  1. Update packages/mermaid/src/defaultConfig.ts 

    Co-authored-by: Alois Klink <alois@aloisklink.com>
    @knsv @aloisklink
    knsv and aloisklink committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    dae8a13 View commit details
    Browse the repository at this point in the history

  2. Update packages/mermaid/src/diagrams/block/blockDB.ts 

    Co-authored-by: Alois Klink <alois@aloisklink.com>
    @knsv @aloisklink
    knsv and aloisklink committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    4823cf5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into 3358-blocks-diagram

    @knsv
    knsv committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    1023797 View commit details
    Browse the repository at this point in the history

  4. Update packages/mermaid/src/diagrams/block/blockRenderer.ts 

    Co-authored-by: Alois Klink <alois@aloisklink.com>
    @knsv @aloisklink
    knsv and aloisklink committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    4a14d99 View commit details
    Browse the repository at this point in the history

  5. Update packages/mermaid/src/diagrams/block/blockDB.ts 

    Co-authored-by: Alois Klink <alois@aloisklink.com>
    @knsv @aloisklink
    knsv and aloisklink committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    2f8f9dd View commit details
    Browse the repository at this point in the history

  6. #3358 Review changes

    @knsv
    knsv committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    452cb83 View commit details
    Browse the repository at this point in the history

  7. Merge branch '3358-blocks-diagram' of github.com:mermaid-js/mermaid i… 

    …nto 3358-blocks-diagram
    @knsv
    knsv committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    8f8ce2f View commit details
    Browse the repository at this point in the history

  8. Update packages/mermaid/src/diagrams/block/blockTypes.ts 

    Co-authored-by: Alois Klink <alois@aloisklink.com>
    @knsv @aloisklink
    knsv and aloisklink committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    010fc70 View commit details
    Browse the repository at this point in the history

  9. Update cypress/integration/rendering/block.spec.ts 

    Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
    @knsv @sidharthv96
    knsv and sidharthv96 committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    4a04ce6 View commit details
    Browse the repository at this point in the history

  10. #3358 Some fixes

    @knsv
    knsv committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    df9b801 View commit details
    Browse the repository at this point in the history

  11. #3358 Some fixes

    @knsv
    knsv committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    907006f View commit details
    Browse the repository at this point in the history

  12. #3358 Another set of review changes

    @knsv
    knsv committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    b99b1bf View commit details
    Browse the repository at this point in the history

  13. Update docs

    @knsv
    knsv committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    dbcb800 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'develop' into 3358-blocks-diagram

    @knsv
    knsv committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    8fdf512 View commit details
    Browse the repository at this point in the history

  15. #3358n Updated lockfile

    @knsv
    knsv committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    7bcdea9 View commit details
    Browse the repository at this point in the history

  16. 3358 Adding types for blockArrowHelper

    @knsv
    knsv committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    6fce617 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2024

  1. Merge branch 'develop' into 3358-blocks-diagram 

    * develop:
  Update container
  Update container
  Remove pnpm cache
  Use `.node-version` file in workflows
  Remove node version from matrix
  Update to Node v20
  Update to Node v20
    @sidharthv96
    sidharthv96 committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    2bfd5a9 View commit details
    Browse the repository at this point in the history

  2. #3358 Renaming of IOperation to ActionFun

    @knsv
    knsv committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    4786cfb View commit details
    Browse the repository at this point in the history

  3. Merge branch '3358-blocks-diagram' of github.com:mermaid-js/mermaid i… 

    …nto 3358-blocks-diagram
    @knsv
    knsv committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    cd7003e View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into 3358-blocks-diagram

    @ashishjain0512
    ashishjain0512 committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    13d0b61 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2024

  1. #3358 Fix after review

    @knsv
    knsv committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    16149ab View commit details
    Browse the repository at this point in the history

  2. Merge branch '3358-blocks-diagram' of github.com:mermaid-js/mermaid i… 

    …nto 3358-blocks-diagram
    @knsv
    knsv committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    d3c5b02 View commit details
    Browse the repository at this point in the history

  3. #3358 Removing redundant file

    @knsv
    knsv committed Feb 1, 2024
    Configuration menu
    Copy the full SHA
    a7afc11 View commit details
    Browse the repository at this point in the history