Skip to content

Commit

Permalink
Merge branch 'refs/heads/develop' into tagsIsBlankFilterFix
Browse files Browse the repository at this point in the history
  • Loading branch information
jskupsik committed Jan 23, 2025
2 parents b6c0f22 + 52e06ba commit 301d507
Show file tree
Hide file tree
Showing 108 changed files with 5,848 additions and 4,358 deletions.
60 changes: 60 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
max_line_length = 100
trim_trailing_whitespace = true

[*.js]
ij_continuation_indent_size = 4
ij_javascript_blank_lines_after_imports = 1
ij_javascript_enforce_trailing_comma = remove
ij_javascript_force_quote_style = true
ij_javascript_force_semicolon_style = true
ij_javascript_import_merge_members = global
ij_javascript_import_prefer_absolute_path = global
ij_javascript_import_sort_members = true
ij_javascript_import_sort_module_name = true
ij_javascript_import_use_node_resolution = true
ij_javascript_keep_blank_lines_in_code = 2
ij_javascript_keep_indents_on_empty_lines = false
ij_javascript_line_comment_add_space = true
ij_javascript_space_after_colon = true
ij_javascript_space_after_comma = true
ij_javascript_space_before_colon = true
ij_javascript_space_before_comma = false
ij_javascript_use_double_quotes = false
ij_javascript_use_semicolon_after_statement = true

[*.ts]
ij_typescript_blank_lines_after_imports = 1
ij_typescript_enforce_trailing_comma = remove
ij_typescript_force_quote_style = true
ij_typescript_force_semicolon_style = true
ij_typescript_import_merge_members = global
ij_typescript_import_prefer_absolute_path = global
ij_typescript_import_sort_members = true
ij_typescript_import_sort_module_name = true
ij_typescript_import_use_node_resolution = true
ij_typescript_keep_blank_lines_in_code = 2
ij_typescript_keep_indents_on_empty_lines = false
ij_typescript_line_comment_add_space = true
ij_typescript_space_after_colon = true
ij_typescript_space_after_comma = true
ij_typescript_space_before_colon = true
ij_typescript_space_before_comma = false
ij_typescript_spaces_within_object_literal_braces = false
ij_typescript_use_double_quotes = false
ij_typescript_use_semicolon_after_statement = true

[*.json]
indent_size = 2

[*.css]
indent_size = 2

[*.scss]
indent_size = 2
34 changes: 34 additions & 0 deletions .env.template
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Duplicate this file in your local repo with filename `.env`. It will be ignored by git, but loaded
# by Gradle via a dotenv Gradle plugin and passed to Toolbox to use as instance configs.

# Note that any values provided in this template will never be read - they are there to provide
# example values only. Any uncommented vars in this file *must* be set in a local .env file.
# See the README for more information.

# Required variables - must be set in .env, build will throw if missing.
APP_TOOLBOX_ENVIRONMENT=Development
APP_TOOLBOX_DB_HOST=localhost
APP_TOOLBOX_DB_SCHEMA=toolbox
APP_TOOLBOX_DB_USER=toolbox
APP_TOOLBOX_DB_PASSWORD=toolbox

# Additional DB options
#APP_TOOLBOX_USE_H2=true
#APP_TOOLBOX_DB_CREATE=update

# Bootstrap admin
# The _USER var can be set on its own to grant an OAuth (Auth0) sourced user admin rights in local
# development. This is supported by Toolbox's use of Hoist Core DefaultRoleService.
#APP_TOOLBOX_BOOTSTRAP_ADMIN_USER=

# If the _PASSWORD var is also set, Toolbox will create a password-enabled user in its user
# database that can be used when Auth0 is not available. Pair this with the env below to disable
# the OAuth flow entirely and present a form-based login. This is especially useful when testing
# the client on a private IP address via `yarn startWithHoistAndIp` for on-device mobile testing.
#APP_TOOLBOX_BOOTSTRAP_ADMIN_PASSWORD=
#APP_TOOLBOX_USE_OAUTH=false

# Email support
#APP_TOOLBOX_SMTP_HOST=
#APP_TOOLBOX_SMTP_USER=
#APP_TOOLBOX_SMTP_PASSWORD=
15 changes: 7 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# IDE Files (mostly)
###################
.idea/*
!/.idea/scopes/
!/.idea/copyright/
Expand All @@ -8,8 +7,11 @@
.project
.classpath

# Compiled source #
###################
# Local instance configs w/secrets
toolbox.yml
.env

# Compiled source
.gradle/
build/
bin/
Expand All @@ -18,14 +20,11 @@ out/
/client-app/node_modules/
/client-app/tsconfig.tsbuildinfo

# Logs #
########
# Logs
toolbox-logs/
*.log
toolbox.yml

# OS generated files #
######################
# OS generated files
.DS_Store
.DS_Store?
ehthumbs.db
Expand Down
45 changes: 36 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,32 +1,59 @@
# Changelog

## v6.0-SNAPSHOT - unreleased
## v7.0-SNAPSHOT - unreleased

## v6.0.0 - 2025-01-08

### New Features
* Added the new Hoist `ViewManager` component to the Portfolio example, as well as an in-depth test page hosted within the Admin Console.
* Refactored and updated the Portfolio example for clarity and to better demonstrate potential usages of saved layouts via `ViewManager`.

### Libraries
* hoist-core 27.0.0
* @xh/hoist 71.0.0
* @xh/hoist-dev-utils 10.0.0


## v5.3.0 - 2024-10-17

### Libraries
* hoist-core 24.0.0
* @xh/hoist 69.0.0

## v5.2.0 - 2024-09-27

### New Features
* Enabled new Correlation ID tracking support in Hoist.

### Bug Fixes
* Fixed `InputsPanel` "Set Focus" popover.

## 5.1.0 - 2024-06-21
### Libraries
* hoist-core 23.0.0
* @xh/hoist 68.1.0

## v5.1.0 - 2024-06-21

### πŸ“š Libraries
### Libraries
* hoist-core 20.1.0

## v5.0.2 - 2024-06-20

### πŸ“š Libraries
### Libraries
* hoist-core 20.0.2
* @xh/hoist 64.0.5

## v5.0.1 - 2024-05-19

### πŸ“š Libraries
### Libraries
* @xh/hoist 64.0.1

## v5.0.0 - 2024-05-17

### New Features
* Support for new `mockDirectoryGroups` config - see `RoleService` for details.

### πŸ“š Libraries
### Libraries
* hoist-core 20.0 (multi-instance)
* @xh/hoist 64.0
* @ag-grid 31.2
Expand Down Expand Up @@ -95,7 +122,7 @@
### Libraries
* hoist-core 16.3.0
* @xh/hoist 57.0.0
* @xh/hoist-dev-utils 6.3.0
* @xh/hoist-dev-utils 6.3.0

## v3.0.2 - 2023-06-01

Expand All @@ -106,7 +133,7 @@
## v3.0.1 - 2023-05-26

### New Features
* Toolbox can now be run with an in memory H2 DB, and all needed configs and preferences will be pre-loaded into this DB.
* Toolbox can now be run with an in memory H2 DB, and all needed configs and preferences will be pre-loaded into this DB.
* Useful for devs who want to quickly check out the project and run it on their local development machine without going through the trouble of creating a database.
* See the section on "instance config file" in README.md for the settings that trigger use of H2.

Expand All @@ -120,7 +147,7 @@
* Toolbox has been completely rewritten in TypeScript.
* New application permission role: `HOIST_ADMIN_READER`.
* All Hoist Framework Admin tabs are now readable (read only) by users who have this new role: `HOIST_ADMIN_READER`.
* `CustomLogSupportConverter` added as an example of an alternative log output format.
* `CustomLogSupportConverter` added as an example of an alternative log output format.
Applied to Monitor log file.

### Libraries
Expand Down
Loading

0 comments on commit 301d507

Please sign in to comment.