Skip to content

WIP Update kitconcept.solr with FHNW improvements #314

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

Open
reekitconcept wants to merge 7 commits into
base: main
Choose a base branch
from
Open

WIP Update kitconcept.solr with FHNW improvements #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4047d43
Update kitconcept.solr with FHNW improvements
reekitconcept Jan 28, 2026
6e12a15
Make sure intranet header is enabled for acceptance tests, try to mak…
davisagli Jan 31, 2026
e2627af
Revert change to has_intranet_header due to hydration errors
davisagli Jan 31, 2026
54a9242
use placeholder to find search input
davisagli Jan 31, 2026
80b6b2f
Revert selector to version from main
reekitconcept Feb 4, 2026
e4f0374
Update kitconcept.solr to fhnw-features-6dfab30
reekitconcept Feb 4, 2026
b083292
fix bad merge
davisagli Feb 4, 2026
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ solr-start-and-rebuild: ## Start solr, force rebuild
.PHONY: solr-stop
solr-stop: ## Stop solr
@echo "Stop solr"
$(COMPOSE_DEV) down solr
$(COMPOSE_DEV) down solr tika

.PHONY: solr-logs
solr-logs: ## Show solr logs
Expand Down
1 change: 1 addition & 0 deletions backend/news/+kitconcept-solr-fhnw-update.internal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update kitconcept.solr with FHNW improvements @reebalazs
3 changes: 1 addition & 2 deletions backend/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ dependencies = [
"pas.plugins.keycloakgroups==1.0.0b1",
"pas.plugins.oidc==2.0.0",
"collective-solr==10.0.0",
"kitconcept.solr==2.0.0a9",
"kitconcept.solr @ git+https://github.com/kitconcept/kitconcept.solr.git@fhnw-features-7676fac#subdirectory=backend",
]

[dependency-groups]
Expand Down Expand Up @@ -296,7 +296,6 @@ constraint-dependencies = [
"jsonschema==4.24.1",
"keyring==25.6.0",
"kitconcept.core==2.0.0a9",
"kitconcept.solr==2.0.0a9",
"kitconcept.voltolighttheme>=8.0.0a9",
"legacy-cgi==2.6.2",
"lockfile==0.12.2",
Expand Down
2 changes: 1 addition & 1 deletion backend/src/kitconcept/intranet/profiles/default/metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<version>20260122001</version>
<version>20260128001</version>
<dependencies>
<!-- <dependency>kitconcept.solr:default</dependency> -->
<dependency>plone.app.discussion:default</dependency>
Expand Down
5 changes: 5 additions & 0 deletions ...intranet/profiles/default/registry/kitconcept.solr.interfaces.IKitconceptSolrSettings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@
"organisational_unit_reference",
"location_reference"
],
"highlightingFields": [
{"field": "content", "prop": "highlighting"},
{"field": "Title", "prop": "highlighting_title"},
{"field": "Description", "prop": "highlighting_description"}
],
"searchTabs": [
{
"label": "All",
Expand Down
1 change: 1 addition & 0 deletions backend/src/kitconcept/intranet/upgrades/configure.zcml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,6 @@
<include package=".v20251118001" />
<include package=".v20251218001" />
<include package=".v20260122001" />
<include package=".v20260128001" />

</configure>
Empty file added backend/src/kitconcept/intranet/upgrades/v20260128001/__init__.py
View file
Open in desktop
Empty file.
15 changes: 15 additions & 0 deletions backend/src/kitconcept/intranet/upgrades/v20260128001/configure.zcml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<configure
xmlns="http://namespaces.zope.org/zope"
xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
>
<genericsetup:upgradeSteps
profile="kitconcept.intranet:default"
source="20260122001"
destination="20260128001"
>
<genericsetup:upgradeDepends
title="Update Solr configuration."
import_steps="plone.app.registry"
/>
</genericsetup:upgradeSteps>
Comment thread
davisagli marked this conversation as resolved.
</configure>
11 changes: 3 additions & 8 deletions backend/uv.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion devops/stacks/demo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ services:
- ${STACK_NAME}-tika

solr:
image: ghcr.io/kitconcept/solr:latest
image: ghcr.io/kitconcept/solr:sha-7676fac
command:
- solr-precreate
- plone
Expand Down
2 changes: 1 addition & 1 deletion devops/stacks/persistent.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ services:
- ${STACK_NAME}-tika

solr:
image: ghcr.io/kitconcept/solr:latest
image: ghcr.io/kitconcept/solr:sha-7676fac
command:
- solr-precreate
- plone
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ x-tika: &tika
- 9998:9998

x-solr: &solr
image: ghcr.io/kitconcept/solr:latest
image: ghcr.io/kitconcept/solr:sha-7676fac
platform: linux/amd64
ports:
- 8983:8983
Expand Down
4 changes: 2 additions & 2 deletions frontend/mrs.developer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,12 @@
"tag": "1.0.0-alpha.0"
},
"volto-solr": {
"develop": false,
"develop": true,
"output": "packages",
"package": "@kitconcept/volto-solr",
"url": "git@github.com:kitconcept/kitconcept.solr.git",
"https": "https://github.com/kitconcept/kitconcept.solr.git",
"path": "frontend",
"tag": "2.0.0a9"
"tag": "fhnw-features-7676fac"
}
}
14 changes: 7 additions & 7 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
"build:deps": "pnpm --filter @plone/registry --filter @plone/components build",
"i18n": "pnpm --filter @kitconcept/intranet i18n",
"test": "pnpm --filter @kitconcept/intranet exec vitest --passWithNoTests",
"lint": "VOLTOCONFIG=$(pwd)/volto.config.js eslint --max-warnings=0 'packages/**/src/**/*.{js,jsx,ts,tsx}'",
"lint:fix": "VOLTOCONFIG=$(pwd)/volto.config.js eslint --fix 'packages/**/src/**/*.{js,jsx,ts,tsx}'",
"prettier": "prettier --check 'packages/**/src/**/*.{js,jsx,ts,tsx}'",
"prettier:fix": "prettier --write 'packages/**/src/**/*.{js,jsx,ts,tsx}' ",
"stylelint": "stylelint 'packages/**/src/**/*.{css,scss,less}' --allow-empty-input",
"stylelint:fix": "stylelint 'packages/**/src/**/*.{css,scss,less}' --fix --allow-empty-input",
"lint": "VOLTOCONFIG=$(pwd)/volto.config.js eslint --max-warnings=0 'packages/**/src/**/*.{js,jsx,ts,tsx}' --ignore-pattern 'packages/volto-solr/**'",
"lint:fix": "VOLTOCONFIG=$(pwd)/volto.config.js eslint --fix 'packages/**/src/**/*.{js,jsx,ts,tsx}' --ignore-pattern 'packages/volto-solr/**'",
"prettier": "prettier --check 'packages/**/src/**/*.{js,jsx,ts,tsx}' '!packages/volto-solr/**'",
"prettier:fix": "prettier --write 'packages/**/src/**/*.{js,jsx,ts,tsx}' '!packages/volto-solr/**'",
"stylelint": "stylelint 'packages/**/src/**/*.{css,scss,less}' '!packages/volto-solr/**' --allow-empty-input",
"stylelint:fix": "stylelint 'packages/**/src/**/*.{css,scss,less}' '!packages/volto-solr/**' --fix --allow-empty-input",

@davisagli davisagli Jan 29, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@reekitconcept We should add this permanently in frontend/.eslintignore instead of here. I'm not sure if we have something similar for prettier and stylelint.

@reekitconcept reekitconcept Feb 4, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree - we use the same from fhnw for eslint.

Re prettier and stylelint: I'm not sure what's best.

"dry-release": "pnpm --filter volto-intranet dry-release",
"release": "pnpm --filter volto-intranet release",
"release-major-alpha": "pnpm --filter volto-intranet release-major-alpha",
Expand Down Expand Up @@ -73,4 +73,4 @@
]
},
"packageManager": "pnpm@10.20.0"
}
}
1 change: 1 addition & 0 deletions frontend/packages/kitconcept-intranet/news/+kitconcept-solr-fhnw-update.internal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update kitconcept.solr with FHNW improvements @reebalazs
2 changes: 1 addition & 1 deletion frontend/packages/kitconcept-intranet/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"@kitconcept/volto-separator-block": "workspace:*",
"@kitconcept/volto-slider-block": "workspace:*",
"@plonegovbr/volto-social-media": "^2.0.0-alpha.10",
"@kitconcept/volto-solr": "2.0.0-alpha.9",
"@kitconcept/volto-solr": "workspace:*",
"@kitconcept/volto-iframe-block": "workspace:*",
"@kitconcept/volto-light-theme": "workspace:*",
"@plone/components": "workspace:*",
Expand Down
20 changes: 2 additions & 18 deletions frontend/pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions news/+kitconcept-solr-fhnw-update.internal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update kitconcept.solr with FHNW improvements @reebalazs