Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 frontend/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module.exports = {
['@plone/volto-slate', `${coreLocation}/packages/volto-slate/src`],
['@plone/registry', `${coreLocation}/packages/registry/src`],
[
'volto-keywordmanager',
'@kitconcept/volto-keywordmanager',
`${projectRootPath}/packages/volto-keywordmanager/src`,
],
...addonAliases,
Expand Down
2 changes: 1 addition & 1 deletion frontend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ FROM plone/frontend-prod-config:${VOLTO_VERSION}

LABEL maintainer="kitconcept GmbH <info@kitconcept.com>" \
org.label-schema.name="kitconcept-keywordmanager-frontend" \
org.label-schema.description="kitconcept-keywordmanager frontend image." \
org.label-schema.description="@kitconcept/volto-keywordmanager frontend image." \
org.label-schema.vendor="kitconcept GmbH"

COPY --from=builder /app/ /app/
Expand Down
56 changes: 6 additions & 50 deletions frontend/README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# kitconcept-keywordmanager (volto-keywordmanager)
# Keyword Manager (@kitconcept/volto-keywordmanager)

Change, merge and delete keywords (subjects) in Plone.

[![npm](https://img.shields.io/npm/v/volto-keywordmanager)](https://www.npmjs.com/package/volto-keywordmanager)
[![](https://img.shields.io/badge/-Storybook-ff4785?logo=Storybook&logoColor=white&style=flat-square)](https://kitconcept.github.io/volto-keywordmanager/)
[![npm](https://img.shields.io/npm/v/@kitconcept/volto-keywordmanager)](https://www.npmjs.com/package/@kitconcept/volto-keywordmanager)
[![](https://img.shields.io/badge/-Storybook-ff4785?logo=Storybook&logoColor=white&style=flat-square)](https://kitconcept.github.io/kitconcept-keywordmanager/)
[![CI](https://github.com/kitconcept/kitconcept-keywordmanager/actions/workflows/main.yml/badge.svg)](https://github.com/kitconcept/kitconcept-keywordmanager/actions/workflows/main.yml)


Expand All @@ -18,61 +18,17 @@ To install your project, you must choose the method appropriate to your version

### Volto 18 and later

Add `volto-keywordmanager` to your `package.json`.
Add `@kitconcept/volto-keywordmanager` to your `package.json`.

```json
"dependencies": {
"volto-keywordmanager": "*"
}
```

Add `volto-keywordmanager` to your `volto.config.js`.

```javascript
const addons = ['volto-keywordmanager'];
```

If this package provides a Volto theme, and you want to activate it, then add the following to your `volto.config.js`.

```javascript
const theme = 'volto-keywordmanager';
```

### Volto 17 and earlier

Create a new Volto project.
You can skip this step if you already have one.

```
npm install -g yo @plone/generator-volto
yo @plone/volto my-volto-project --addon volto-keywordmanager
cd my-volto-project
```

Add `volto-keywordmanager` to your `package.json`.

```JSON
"addons": [
"volto-keywordmanager"
"@kitconcept/volto-keywordmanager"
],

"dependencies": {
"volto-keywordmanager": "*"
"@kitconcept/volto-keywordmanager": "*"
}
```

Download and install the new add-on.

```
yarn install
```

Start Volto.

```
yarn start
```

## Test installation

Visit http://localhost:3000/ in a browser, login, and check the awesome new features.
Expand Down
14 changes: 7 additions & 7 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,26 @@
"start:prod": "pnpm --filter @plone/volto start:prod",
"build": "VOLTOCONFIG=$(pwd)/volto.config.js pnpm --filter @plone/volto build",
"build:deps": "pnpm --filter @plone/registry --filter @plone/components build",
"i18n": "pnpm --filter volto-keywordmanager i18n && VOLTOCONFIG=$(pwd)/volto.config.js pnpm --filter @plone/volto i18n",
"test": "pnpm --filter volto-keywordmanager exec vitest",
"i18n": "pnpm --filter @kitconcept/volto-keywordmanager i18n && VOLTOCONFIG=$(pwd)/volto.config.js pnpm --filter @plone/volto i18n",
"test": "pnpm --filter @kitconcept/volto-keywordmanager exec vitest",
"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",
"dry-release": "pnpm --filter volto-keywordmanager dry-release",
"release": "pnpm --filter volto-keywordmanager release",
"release-major-alpha": "pnpm --filter volto-keywordmanager release-major-alpha",
"release-alpha": "pnpm --filter volto-keywordmanager release-alpha",
"dry-release": "pnpm --filter @kitconcept/volto-keywordmanager dry-release",
"release": "pnpm --filter @kitconcept/volto-keywordmanager release",
"release-major-alpha": "pnpm --filter @kitconcept/volto-keywordmanager release-major-alpha",
"release-alpha": "pnpm --filter @kitconcept/volto-keywordmanager release-alpha",
"storybook": "VOLTOCONFIG=$(pwd)/volto.config.js pnpm --filter @plone/volto storybook dev -p 6006 -c $(pwd)/.storybook",
"storybook-build": "VOLTOCONFIG=$(pwd)/volto.config.js pnpm --filter @plone/volto build-storybook -c $(pwd)/.storybook"
},
"dependencies": {
"@kitconcept/volto-light-theme": "^8.0.0-alpha.29",
"@plone/registry": "workspace:*",
"@plone/volto": "workspace:*",
"volto-keywordmanager": "workspace:*"
"@kitconcept/volto-keywordmanager": "workspace:*"
},
"devDependencies": {
"mrs-developer": "^2.2.0"
Expand Down
6 changes: 3 additions & 3 deletions frontend/packages/volto-keywordmanager/.release-it.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
},
"hooks": {
"after:bump": [
"pipx run towncrier build --draft --yes --version ${version} > .changelog.draft",
"pipx run towncrier build --yes --version ${version}",
"uvx towncrier build --draft --yes --version ${version} > .changelog.draft",
"uvx towncrier build --yes --version ${version}",
"cp ../../README.md ./ && cp CHANGELOG.md ../../CHANGELOG.md",
"python3 -c 'import json; data = json.load(open(\"../../package.json\")); data[\"version\"] = \"${version}\"; json.dump(data, open(\"../../package.json\", \"w\"), indent=2)'",
"git add ../../CHANGELOG.md ../../package.json"
Expand All @@ -19,7 +19,7 @@
"publish": false
},
"git": {
"changelog": "pipx run towncrier build --draft --yes --version 0.0.0",
"changelog": "uvx towncrier build --draft --yes --version 0.0.0",
"requireUpstream": false,
"requireCleanWorkingDir": false,
"commitMessage": "Release ${version}",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Renamed the frontend package from `volto-keywordmanager` to `@kitconcept/volto-keywordmanager`. @ericof
2 changes: 1 addition & 1 deletion frontend/packages/volto-keywordmanager/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "volto-keywordmanager",
"name": "@kitconcept/volto-keywordmanager",
"version": "1.0.0-alpha.0",
"description": "Change, merge and delete keywords (subjects) in Plone.",
"main": "src/index.ts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { GET_KEYWORD_INDEXES } from 'volto-keywordmanager/constants/KeywordIndexes';
import { GET_KEYWORD_INDEXES } from '@kitconcept/volto-keywordmanager/constants/KeywordIndexes';

export function getKeywordIndexes() {
return {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { GET_KEYWORDS } from 'volto-keywordmanager/constants/Keywords';
import { UPDATE_KEYWORDS } from 'volto-keywordmanager/constants/Keywords';
import { DELETE_KEYWORDS } from 'volto-keywordmanager/constants/Keywords';
import { GET_KEYWORDS } from '@kitconcept/volto-keywordmanager/constants/Keywords';
import { UPDATE_KEYWORDS } from '@kitconcept/volto-keywordmanager/constants/Keywords';
import { DELETE_KEYWORDS } from '@kitconcept/volto-keywordmanager/constants/Keywords';

export function getKeywords({
index = null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import {
getKeywords,
deleteKeywords,
updateKeywords,
} from 'volto-keywordmanager/actions/keywords';
import { getKeywordIndexes } from 'volto-keywordmanager/actions/keywordIndexes';
} from '@kitconcept/volto-keywordmanager/actions/keywords';
import { getKeywordIndexes } from '@kitconcept/volto-keywordmanager/actions/keywordIndexes';
import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
import RenameModal from './RenameModal';
import DeleteModal from './DeleteModal';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { createPortal } from 'react-dom';
import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
import { useDispatch, useSelector } from 'react-redux';
import { Link, useParams } from 'react-router-dom';
import { deleteKeywords } from 'volto-keywordmanager/actions/keywords';
import { deleteKeywords } from '@kitconcept/volto-keywordmanager/actions/keywords';
import DeleteModal from './DeleteModal';
import { toast } from 'react-toastify';
import { Toast } from '@plone/components';
Expand Down
8 changes: 4 additions & 4 deletions frontend/packages/volto-keywordmanager/src/config/settings.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { ConfigType } from '@plone/registry';
import KeywordManager from 'volto-keywordmanager/components/KeywordManager';
import { keywords } from 'volto-keywordmanager/reducers/keywords';
import { keywordIndexes } from 'volto-keywordmanager/reducers/keywordIndexes';
import KeywordView from 'volto-keywordmanager/components/KeywordView';
import KeywordManager from '@kitconcept/volto-keywordmanager/components/KeywordManager';
import { keywords } from '@kitconcept/volto-keywordmanager/reducers/keywords';
import { keywordIndexes } from '@kitconcept/volto-keywordmanager/reducers/keywordIndexes';
import KeywordView from '@kitconcept/volto-keywordmanager/components/KeywordView';

export default function install(config: ConfigType) {
config.settings.controlpanels = [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { GET_KEYWORD_INDEXES } from 'volto-keywordmanager/constants/KeywordIndexes';
import { GET_KEYWORD_INDEXES } from '@kitconcept/volto-keywordmanager/constants/KeywordIndexes';

const initialState = {
error: null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
DELETE_KEYWORDS,
GET_KEYWORDS,
UPDATE_KEYWORDS,
} from 'volto-keywordmanager/constants/Keywords';
} from '@kitconcept/volto-keywordmanager/constants/Keywords';

const initialState = {
type: '',
Expand Down
2 changes: 1 addition & 1 deletion frontend/packages/volto-keywordmanager/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"jsx": "react-jsx",
"paths": {
"@plone/volto/*": ["../../core/packages/volto/src/*"],
"volto-keywordmanager/*": ["./src/*"]
"@kitconcept/volto-keywordmanager/*": ["./src/*"]
}
},
"include": ["**/*.ts", "**/*.tsx", "**/*.js", "**/*.jsx"],
Expand Down
1 change: 1 addition & 0 deletions frontend/packages/volto-keywordmanager/vitest.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export default defineConfig({
resolve: {
alias: {
'@plone/volto': path.resolve(__dirname, '../../core/packages/volto/src'), // Add paths accordingly
'@kitconcept/volto-keywordmanager': path.resolve(__dirname, './src'),
// 'promise-file-reader': require.resolve('promise-file-reader') // Add to identify dependency from package
},
},
Expand Down
6 changes: 3 additions & 3 deletions frontend/pnpm-lock.yaml

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

5 changes: 4 additions & 1 deletion frontend/volto.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
const addons = ['volto-keywordmanager', '@kitconcept/volto-light-theme'];
const addons = [
'@kitconcept/volto-keywordmanager',
'@kitconcept/volto-light-theme',
];
const theme = '@kitconcept/volto-light-theme';

module.exports = {
Expand Down
1 change: 1 addition & 0 deletions news/+rename-package.internal
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Updated `repository.toml` for the frontend package rename to `@kitconcept/volto-keywordmanager`. @ericof
2 changes: 1 addition & 1 deletion repository.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ base_package = "Products.CMFPlone"
publish = true

[frontend.package]
name = "volto-keywordmanager"
name = "@kitconcept/volto-keywordmanager"
path = "frontend/packages/volto-keywordmanager"
code_path = "src"
changelog = "frontend/packages/volto-keywordmanager/CHANGELOG.md"
Expand Down
Loading