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

Faceted search #44

Merged
merged 65 commits into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
7ac2e15
feat: add inventory tools settings to boot (#81)
agritheory May 13, 2024
1150314
14.6.0
agritheory May 13, 2024
d0469ea
ci: track overrides for purchase cycle (PO/PI/PR) (#89)
HKuz May 24, 2024
a187f29
ci: track overrides for stock and manufacturing cycles (#90)
Alchez May 24, 2024
e8f300f
Test alternative workstation (#80)
agritheory May 29, 2024
06a8e53
wip: doctypes and vue setup
agritheory Nov 15, 2023
59b0063
wip: specification upload initerface
agritheory Nov 24, 2023
dd3cd17
wip: basic filters rendering + test setup
agritheory Nov 16, 2023
71a5042
wip: faceted search - specification editing report
agritheory Nov 30, 2023
8209072
feat: add loader for specification and listview filters
Dec 8, 2023
824973a
wip: all-products + "Fruits" filter working
agritheory Dec 11, 2023
8759b26
wip: set filter values in ranged filter
agritheory Dec 11, 2023
eb82198
chore: remove commented import
agritheory Dec 11, 2023
93bca5a
wip: serialize dates as epoch time
agritheory Dec 14, 2023
d619397
wip: sort order
agritheory Jan 4, 2024
f52d7a7
feat: facted search in listview also
agritheory Jan 30, 2024
188835f
feat: color picker
agritheory Feb 22, 2024
a409584
feat: color picker background, date bugfix
agritheory Feb 26, 2024
b42f9fc
refactor: filters UX under all-product page
bhattdevarsh Apr 10, 2024
242ec71
fix: field validations on specification attribute child
bhattdevarsh Apr 11, 2024
b6ad895
feat: collapsable filters for all-product page
bhattdevarsh Apr 11, 2024
94d3379
docs: faceted search functionality
bhattdevarsh Apr 19, 2024
2259fff
docs: fix images
bhattdevarsh Apr 19, 2024
391680b
refactor: documentation, filtering ux
bhattdevarsh Apr 21, 2024
414dce6
docs: correction of documentation errors
bhattdevarsh Apr 23, 2024
a763e48
fix: color picker deserialization
agritheory Apr 24, 2024
b7071e0
chore: add yarn.lock file
agritheory Apr 24, 2024
77d56a3
feat: add debounce, refactor to vue3 with build
agritheory Apr 24, 2024
aca2e57
feat: cleanup imports, mypy fixes
agritheory Apr 24, 2024
3d350ba
ci: install mypy and types non-interactive
agritheory Apr 24, 2024
bef31d7
ci: use python, bench is not installed
agritheory Apr 24, 2024
9467d51
ci: pipe yes
agritheory Apr 24, 2024
584e16f
ci: use --no-input instead og piping yes
agritheory Apr 24, 2024
60cd995
feat: add inventory tools settings
agritheory Apr 24, 2024
4acdcb9
feat: render in listview with style conflicts
agritheory Apr 24, 2024
a7800e4
docs: update docs
agritheory Apr 24, 2024
2d23ae4
feat: allow user to bulk create specification values from specifications
bhattdevarsh Apr 30, 2024
edbc78b
fix: update specification value attribute(s) if user change specifica…
bhattdevarsh May 6, 2024
8afcc41
chore: pre-commit
agritheory May 23, 2024
425ff71
fix: listview filter logic
May 24, 2024
96e8537
fix: faceted search various issues
agritheory Jun 8, 2024
a3ce2dc
fix: cleaner item attribute lookup
agritheory Jun 8, 2024
9af7364
feat: allow edit and generate of specs from Item and Spec doctypes
agritheory Jun 8, 2024
0d28a51
test: wip tests
agritheory Jun 9, 2024
6ec5867
chore: rebase to version-15, fix tests
agritheory Jul 26, 2024
ecd9f49
Merge branch 'version-15' into faceted_search
agritheory Jul 26, 2024
2bdbd5c
chore: black / prettier
agritheory Jul 26, 2024
a5f471c
ci: install mypy types non-interactive
agritheory Jul 26, 2024
f54fcae
ci: install webshop
agritheory Jul 26, 2024
769425c
ci: add payments
agritheory Jul 26, 2024
1599082
ci: install apps fixes, move test fixtures to separate job name
agritheory Jul 26, 2024
b7fddc2
wip: faceted search fixes
agritheory Aug 4, 2024
fc27225
feat: fix deleted value test
agritheory Aug 4, 2024
8fc863b
fix: filter UX on specification dialog
agritheory Aug 4, 2024
3af9015
chore: black
agritheory Aug 4, 2024
e5e8a66
fix: bad hex code for color fixture
agritheory Aug 4, 2024
65a8dbe
fix: reimplement convert_to_epoch function
Aug 5, 2024
4acaa2b
fix: minor changes
Aug 5, 2024
bdce27e
feat: use composition API for Vue components
Aug 5, 2024
5cf8e9b
fix: upstream override commit hashes
Aug 5, 2024
1677bb3
feat: obey inventory tools settings visibility
agritheory Aug 5, 2024
560bfc0
fix: web api filters setting correctly
agritheory Aug 5, 2024
fc76afb
fix: reset list filters when faceted search filters are reset
Aug 6, 2024
ac53a55
fix: reset facet filters when list filters are reset
Aug 6, 2024
f3ab5fb
fix: sort order functionality
Aug 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/helper/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,11 @@ sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile

bench get-app hrms --branch "${BRANCH_NAME}" --skip-assets --overwrite
bench get-app erpnext --branch "${BRANCH_NAME}" --skip-assets --overwrite
bench get-app payments --branch "${BRANCH_NAME}" --skip-assets --overwrite
bench get-app webshop --branch "${BRANCH_NAME}" --skip-assets --overwrite
bench get-app inventory_tools "${GITHUB_WORKSPACE}" --skip-assets

printf '%s\n' 'frappe' 'erpnext' 'hrms' 'inventory_tools' > ~/frappe-bench/sites/apps.txt
printf '%s\n' 'frappe' 'erpnext' 'hrms' 'payments' 'webshop' 'inventory_tools' > ~/frappe-bench/sites/apps.txt
bench setup requirements --python
bench use test_site

Expand All @@ -66,5 +68,4 @@ echo "SITE LIST-APPS:"
bench list-apps

bench start &> bench_run_logs.txt &
CI=Yes &
bench execute 'inventory_tools.tests.setup.before_test'
CI=Yes
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
run: pip install mypy

- name: Install mypy types
run: mypy ./inventory_tools/. --install-types
run: mypy ./inventory_tools/. --install-types --non-interactive

- name: Run mypy
uses: sasanquaneuf/mypy-github-action@releases/v1
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/overrides.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: Track Overrides

on:
pull_request:
branches:
- version-14
- version-15

jobs:
track_overrides:
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/pytest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,11 @@ jobs:
MYSQL_PWD: 'admin'
run: bash ${{ github.workspace }}/.github/helper/install.sh

- name: Install Test Fixtures
working-directory: /home/runner/frappe-bench
run: |
bench execute 'inventory_tools.tests.setup.before_test'

- name: Run Tests
working-directory: /home/runner/frappe-bench
run: |
Expand Down
14 changes: 4 additions & 10 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ repos:
- id: debug-statements

- repo: https://github.com/asottile/pyupgrade
rev: v2.34.0
rev: v3.17.0
hooks:
- id: pyupgrade
args: ['--py310-plus']
Expand All @@ -31,22 +31,16 @@ repos:
- id: black

- repo: https://github.com/PyCQA/flake8
rev: 5.0.4
rev: 7.1.1
hooks:
- id: flake8
additional_dependencies: ['flake8-bugbear']

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.5.1
hooks:
- id: mypy
exclude: ^tests/
args: [--ignore-missing-imports]

- repo: https://github.com/agritheory/test_utils
rev: v0.14.0
rev: v0.15.0
hooks:
- id: update_pre_commit_config
- id: mypy
- id: validate_copyright
files: '\.(js|ts|py|md)$'
args: ['--app', 'inventory_tools']
Expand Down
Loading
Loading