@kitconcept/core 1.0.0-alpha.3 → 1.0.0-alpha.31

package/locales/volto.pot

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"
-"POT-Creation-Date: 2025-04-28T17:31:27.834Z\n"
+"POT-Creation-Date: 2025-05-23T14:22:05.270Z\n"
 "Last-Translator: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "Language-Team: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -18,6 +18,36 @@ msgstr ""
 msgid "Add-ons"
 msgstr ""
 
+#. Default: "Back"
+#: components/Controlpanels/UpgradeControlPanel
+msgid "Back"
+msgstr ""
+
+#. Default: "Configuration Versions"
+#: components/Controlpanels/UpgradeControlPanel
+msgid "Configuration Versions"
+msgstr ""
+
+#. Default: "Current active configuration"
+#: components/Controlpanels/UpgradeControlPanel
+msgid "Current active configuration"
+msgstr ""
+
+#. Default: "Dry run selected, transaction aborted."
+#: components/Controlpanels/UpgradeControlPanel
+msgid "Dry run selected, transaction aborted."
+msgstr ""
+
+#. Default: "Latest available configuration"
+#: components/Controlpanels/UpgradeControlPanel
+msgid "Latest available configuration"
+msgstr ""
+
+#. Default: "More information about the upgrade procedure can be found in the documentation section of plone.org in the Upgrade Guide."
+#: components/Controlpanels/UpgradeControlPanel
+msgid "More information about the upgrade procedure can be found in the documentation section of plone.org in the Upgrade Guide."
+msgstr ""
+
 #. Default: "No addons found"
 #: components/Controlpanels/VersionOverview
 msgid "No addons found"
@@ -28,6 +58,11 @@ msgstr ""
 msgid "Package Version"
 msgstr ""
 
+#. Default: "Please ensure you have a backup of your site before performing the upgrade."
+#: components/Controlpanels/UpgradeControlPanel
+msgid "Please ensure you have a backup of your site before performing the upgrade."
+msgstr ""
+
 #. Default: "Profile Version (File system)"
 #: components/Controlpanels/VersionOverview
 msgid "Profile Version (File system)"
@@ -38,7 +73,62 @@ msgstr ""
 msgid "Profile Version (Installed)"
 msgstr ""
 
+#. Default: "The following list shows which upgrade steps are going to be run. Upgrading sometimes performs a catalog/security update, which may take a long time on large sites. Be patient."
+#: components/Controlpanels/UpgradeControlPanel
+msgid "The following list shows which upgrade steps are going to be run. Upgrading sometimes performs a catalog/security update, which may take a long time on large sites. Be patient."
+msgstr ""
+
+#. Default: "The site configuration is outdated and needs to be upgraded."
+#: components/Controlpanels/UpgradeControlPanel
+msgid "The site configuration is outdated and needs to be upgraded."
+msgstr ""
+
+#. Default: "There was an error with the upgrade."
+#: components/Controlpanels/UpgradeControlPanel
+msgid "There was an error with the upgrade."
+msgstr ""
+
+#. Default: "Upgrade"
+#: components/Controlpanels/UpgradeControlPanel
+msgid "Upgrade"
+msgstr ""
+
+#. Default: "Upgrade Plone Site"
+#: components/Controlpanels/UpgradeControlPanel
+msgid "Upgrade Plone Site"
+msgstr ""
+
+#. Default: "Upgrade Report"
+#: components/Controlpanels/UpgradeControlPanel
+msgid "Upgrade Report"
+msgstr ""
+
+#. Default: "Upgrade Steps"
+#: components/Controlpanels/UpgradeControlPanel
+msgid "Upgrade Steps"
+msgstr ""
+
+#. Default: "Upgrade kitconcept.core"
+#: components/Controlpanels/UpgradeControlPanel
+msgid "Upgrade kitconcept.core"
+msgstr ""
+
+#. Default: "Upgrade your Site"
+#: components/Controlpanels/UpgradeControlPanel
+msgid "Upgrade your Site"
+msgstr ""
+
+#. Default: "Version Overview"
+#: components/Controlpanels/UpgradeControlPanel
+msgid "Version Overview"
+msgstr ""
+
 #. Default: "You are running in 'debug mode'. This mode is intended for sites that are under development. This allows many configuration changes to be immediately visible, but will make your site run more slowly. To turn off debug mode, stop the server, set 'debug-mode=off' in your buildout.cfg, re-run bin/buildout and then restart the server process."
 #: components/Controlpanels/VersionOverview
 msgid "Warning Regarding debug mode"
 msgstr ""
+
+#. Default: "Your site is up to date."
+#: components/Controlpanels/UpgradeControlPanel
+msgid "Your site is up to date."
+msgstr ""

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitconcept/core",
-  "version": "1.0.0-alpha.3",
+  "version": "1.0.0-alpha.31",
   "description": "Core setup for kitconcept GmbH distributions built on top of Plone",
   "main": "src/index.ts",
   "license": "MIT",
@@ -23,9 +23,11 @@
     "@eeacms/volto-accordion-block",
     "@kitconcept/volto-banner-block",
     "@kitconcept/volto-button-block",
+    "@kitconcept/volto-carousel-block",
     "@kitconcept/volto-heading-block",
     "@kitconcept/volto-highlight-block",
     "@kitconcept/volto-introduction-block",
+    "@kitconcept/volto-logos-block",
     "@kitconcept/volto-separator-block",
     "@kitconcept/volto-slider-block",
     "@mbarde/volto-image-crop-widget",
@@ -34,22 +36,28 @@
     "@kitconcept/volto-light-theme"
   ],
   "dependencies": {
-    "@plone-collective/volto-authomatic": "3.0.0-alpha.1",
-    "@kitconcept/volto-light-theme": "6.0.1",
+    "@plone-collective/volto-authomatic": "3.0.0-alpha.4",
+    "@kitconcept/volto-light-theme": "7.0.0-beta.7",
     "@mbarde/volto-image-crop-widget": "^0.5.1",
-    "@kitconcept/volto-banner-block": "^1.0.1",
     "@plone/components": "3.0.2"
   },
   "peerDependencies": {
+    "@plonegovbr/volto-social-media": "^2.0.0-alpha.8",
     "react": "18.2.0",
-    "react-dom": "18.2.0"
+    "react-dom": "18.2.0",
+    "react-intl": "^3.12.1",
+    "react-redux": "^8.1.2"
   },
   "devDependencies": {
     "@plone/scripts": "^3.6.1",
+    "@types/lodash": "^4.14.201",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
-    "release-it": "^18.1.2",
-    "@plone/types": "1.4.4"
+    "lodash": "4.17.21",
+    "release-it": "^19.0.4",
+    "typescript": "^5.7.3",
+    "vitest": "^3.1.2",
+    "@plone/types": "1.4.5"
   },
   "scripts": {
     "i18n": "rm -rf build/messages && NODE_ENV=production i18n --addon",

package/src/components/Controlpanels/UpgradeControlPanel.jsx

@@ -0,0 +1,355 @@
+/**
+ * Upgrade controlpanel container.
+ * @module components/manage/Controlpanels/Upgrade
+ */
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+import { compose } from 'redux';
+import { Link } from 'react-router-dom';
+import { createPortal } from 'react-dom';
+import {
+  Button,
+  Container,
+  Form,
+  Message,
+  Segment,
+  Table,
+} from 'semantic-ui-react';
+import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
+import map from 'lodash/map';
+
+import { getSystemInformation } from '@plone/volto/actions/controlpanels/controlpanels';
+import {
+  getUpgradeInformation,
+  runUpgrade,
+} from '@plone/volto/actions/upgrade/upgrade';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
+import Toolbar from '@plone/volto/components/manage/Toolbar/Toolbar';
+import VersionOverview from '@kitconcept/core/components/Controlpanels/VersionOverview';
+import backSVG from '@plone/volto/icons/back.svg';
+import { toast } from 'react-toastify';
+
+const messages = defineMessages({
+  back: {
+    id: 'Back',
+    defaultMessage: 'Back',
+  },
+  upgradeInformation: {
+    id: 'Upgrade kitconcept.core',
+    defaultMessage: 'Upgrade kitconcept.core',
+  },
+  upgrade: {
+    id: 'Upgrade your Site',
+    defaultMessage: 'Upgrade your Site',
+  },
+  upgradeSuccess: {
+    id: 'Your site is up to date.',
+    defaultMessage: 'Your site is up to date.',
+  },
+  dryRunSuccess: {
+    id: 'Dry run selected, transaction aborted.',
+    defaultMessage: 'Dry run selected, transaction aborted.',
+  },
+  upgradeError: {
+    id: 'There was an error with the upgrade.',
+    defaultMessage: 'There was an error with the upgrade.',
+  },
+});
+
+const UpgradeStep = ({ title, steps }) => {
+  const stepTitles = steps.map((step) => {
+    return step.title;
+  });
+  return (
+    <Message>
+      <Message.Header>{title}</Message.Header>
+      <Message.List items={stepTitles} />
+    </Message>
+  );
+};
+
+/**
+ * UpgradeControlPanel class.
+ * @class UpgradeControlPanel
+ * @extends Component
+ */
+class UpgradeControlPanel extends Component {
+  /**
+   * Property types.
+   * @property {Object} propTypes Property types.
+   * @static
+   */
+  static propTypes = {
+    getUpgradeInformation: PropTypes.func.isRequired,
+    getSystemInformation: PropTypes.func.isRequired,
+    runUpgrade: PropTypes.func.isRequired,
+  };
+
+  /**
+   * Constructor
+   * @method constructor
+   * @param {Object} props Component properties
+   * @constructs DiffComponent
+   */
+  constructor(props) {
+    super(props);
+    this.runUpgrade = this.runUpgrade.bind(this);
+    this.state = {
+      isClient: false,
+      dryRun: false,
+    };
+  }
+
+  /**
+   * Component did mount
+   * @method componentDidMount
+   * @returns {undefined}
+   */
+  componentDidMount() {
+    this.props.getUpgradeInformation();
+    this.props.getSystemInformation();
+    this.setState({ isClient: true, dryRun: false });
+  }
+
+  /**
+   * Run Upgrade handler
+   * @method runUpgrade
+   * @param {boolean} dryRun Id of package to install.
+   * @returns {undefined}
+   */
+  runUpgrade(dryRun) {
+    this.props
+      .runUpgrade(dryRun)
+      .then(() => {
+        if (!dryRun) {
+          // Upgrade completed
+          this.props.getUpgradeInformation();
+          toast.success(
+            <Toast
+              success
+              title={this.props.intl.formatMessage(messages.upgrade)}
+              content={this.props.intl.formatMessage(messages.upgradeSuccess)}
+            />,
+          );
+        } else {
+          toast.success(
+            <Toast
+              success
+              title={this.props.intl.formatMessage(messages.upgrade)}
+              content={this.props.intl.formatMessage(messages.dryRunSuccess)}
+            />,
+          );
+        }
+      })
+      .catch(() => {
+        toast.error(
+          <Toast
+            error
+            title={this.props.intl.formatMessage(messages.upgrade)}
+            content={this.props.intl.formatMessage(messages.upgradeError)}
+          />,
+        );
+      });
+  }
+
+  /**
+   * Render method.
+   * @method render
+   * @returns {string} Markup for the component.
+   */
+  render() {
+    const upgradeInformation = this.props.upgradeInformation;
+    const upgradeSteps = upgradeInformation
+      ? Object.entries(upgradeInformation.upgrade_steps)
+      : null;
+    return upgradeInformation ? (
+      <Container id="upgrade-page" className="controlpanel-upgrade">
+        <Helmet
+          title={this.props.intl.formatMessage(messages.upgradeInformation)}
+        />
+        <Segment.Group raised>
+          <Segment className="primary">
+            <FormattedMessage
+              id="Upgrade Plone Site"
+              defaultMessage="Upgrade Plone Site"
+            />
+          </Segment>
+          <Segment className="secondary">
+            <FormattedMessage
+              id="More information about the upgrade procedure can be found in the documentation section of plone.org in the Upgrade Guide."
+              defaultMessage="More information about the upgrade procedure can be found in the documentation section of plone.org in the Upgrade Guide."
+            />
+          </Segment>
+          <Message attached>
+            <Message.Header>
+              <FormattedMessage
+                id="Configuration Versions"
+                defaultMessage="Configuration Versions"
+              />
+            </Message.Header>
+          </Message>
+          <Segment>
+            {upgradeInformation.versions.fs ===
+            upgradeInformation.versions.instance ? (
+              <Message attached success>
+                <FormattedMessage
+                  id="Your site is up to date."
+                  defaultMessage="Your site is up to date."
+                />
+              </Message>
+            ) : (
+              <Message attached warning>
+                <FormattedMessage
+                  id="The site configuration is outdated and needs to be upgraded."
+                  defaultMessage="The site configuration is outdated and needs to be upgraded."
+                />
+              </Message>
+            )}
+            <Table celled padded columns="2">
+              <Table.Body>
+                <Table.Row>
+                  <Table.Cell>
+                    <FormattedMessage
+                      id="Current active configuration"
+                      defaultMessage="Current active configuration"
+                    />
+                  </Table.Cell>
+                  <Table.Cell>
+                    {upgradeInformation.versions.instance}
+                  </Table.Cell>
+                </Table.Row>
+                <Table.Row>
+                  <Table.Cell>
+                    <FormattedMessage
+                      id="Latest available configuration"
+                      defaultMessage="Latest available configuration"
+                    />
+                  </Table.Cell>
+                  <Table.Cell>{upgradeInformation.versions.fs}</Table.Cell>
+                </Table.Row>
+              </Table.Body>
+            </Table>
+          </Segment>
+          {upgradeSteps.length > 0 && (
+            <>
+              <Message attached>
+                <Message.Header>
+                  <FormattedMessage
+                    id="Upgrade Steps"
+                    defaultMessage="Upgrade Steps"
+                  />
+                </Message.Header>
+                <Message.Content>
+                  <FormattedMessage
+                    id="The following list shows which upgrade steps are going to be run. Upgrading sometimes performs a catalog/security update, which may take a long time on large sites. Be patient."
+                    defaultMessage="The following list shows which upgrade steps are going to be run. Upgrading sometimes performs a catalog/security update, which may take a long time on large sites. Be patient."
+                  />
+                </Message.Content>
+              </Message>
+              <Segment>
+                <Container>
+                  {map(upgradeSteps, (upgradeGroup) => [
+                    <UpgradeStep
+                      key={upgradeGroup[0]}
+                      title={upgradeGroup[0]}
+                      steps={upgradeGroup[1]}
+                    />,
+                  ])}
+                </Container>
+                <Message negative>
+                  <FormattedMessage
+                    id="Please ensure you have a backup of your site before performing the upgrade."
+                    defaultMessage="Please ensure you have a backup of your site before performing the upgrade."
+                  />
+                </Message>
+                <Form.Checkbox
+                  onChange={(e, data) =>
+                    this.setState({ dryRun: data.checked })
+                  }
+                  checked={this.state.dryRun}
+                  label="Dry run mode"
+                />
+                <br />
+                <Button
+                  aria-label={this.props.intl.formatMessage({
+                    id: 'Upgrade',
+                    defaultMessage: 'Upgrade',
+                  })}
+                  onClick={() => this.runUpgrade(this.state.dryRun)}
+                  primary
+                >
+                  <FormattedMessage id="Upgrade" defaultMessage="Upgrade" />
+                </Button>
+              </Segment>
+            </>
+          )}
+          {this.props.upgradeReport ? (
+            <>
+              <Message attached>
+                <Message.Header>
+                  <FormattedMessage
+                    id="Upgrade Report"
+                    defaultMessage="Upgrade Report"
+                  />
+                </Message.Header>
+              </Message>
+              <Segment>
+                <pre>{this.props.upgradeReport.report}</pre>
+              </Segment>
+            </>
+          ) : null}
+          <Message attached>
+            <Message.Header>
+              <FormattedMessage
+                id="Version Overview"
+                defaultMessage="Version Overview"
+              />
+            </Message.Header>
+          </Message>
+          <Segment>
+            {this.props.systemInformation ? (
+              <VersionOverview {...this.props.systemInformation} />
+            ) : null}
+          </Segment>
+        </Segment.Group>
+        {this.state.isClient &&
+          createPortal(
+            <Toolbar
+              pathname={this.props.pathname}
+              hideDefaultViewButtons
+              inner={
+                <>
+                  <Link to="/controlpanel" className="item">
+                    <Icon
+                      name={backSVG}
+                      aria-label={this.props.intl.formatMessage(messages.back)}
+                      className="contents circled"
+                      size="30px"
+                      title={this.props.intl.formatMessage(messages.back)}
+                    />
+                  </Link>
+                </>
+              }
+            />,
+            document.getElementById('toolbar'),
+          )}
+      </Container>
+    ) : null;
+  }
+}
+
+export default compose(
+  injectIntl,
+  connect(
+    (state, props) => ({
+      upgradeInformation: state.upgrade.upgradeinformation,
+      pathname: props.location.pathname,
+      systemInformation: state.controlpanels.systeminformation,
+      upgradeReport: state.upgrade.upgradereport,
+    }),
+    { getUpgradeInformation, getSystemInformation, runUpgrade },
+  ),
+)(UpgradeControlPanel);

package/src/config/slots.ts

@@ -0,0 +1,19 @@
+import type { ConfigType } from '@plone/registry';
+import TTWCustomCSS from '../slots/TTWCustomCSS/TTWCustomCSS';
+import ConfigInjector from '../slots/ConfigInjector/ConfigInjector';
+
+export default function install(config: ConfigType) {
+  config.registerSlotComponent({
+    slot: 'aboveHeader',
+    name: 'ConfigInjector',
+    component: ConfigInjector,
+  });
+
+  config.registerSlotComponent({
+    slot: 'aboveHeader',
+    name: 'TTWCustomCSS',
+    component: TTWCustomCSS,
+  });
+
+  return config;
+}

package/src/customizations/volto/components/manage/Controlpanels/UpgradeControlPanel.jsx

@@ -0,0 +1,7 @@
+/**
+ * OVERRIDE UpgradeControlPanel.jsx
+ * REASON: Add distribution info support
+ */
+import UpgradeControlPanel from '../../../../../components/Controlpanels/UpgradeControlPanel';
+
+export default UpgradeControlPanel;

package/src/helpers/BlocksConfigMerger.test.ts

@@ -0,0 +1,98 @@
+import { BlocksConfigMerger } from './BlocksConfigMerger';
+import { describe, it, expect } from 'vitest';
+
+const baseBlocksConfig = {
+  teaser: {
+    restricted: false,
+    variations: [
+      { id: 'variation1', label: 'Variation 1' },
+      { id: 'variation2', label: 'Variation 2' },
+      { id: 'variation3', label: 'Variation 3' },
+    ],
+    themes: [],
+  },
+  gridBlock: {
+    restricted: false,
+    variations: [
+      { id: 'variationA', label: 'Variation A' },
+      { id: 'variationB', label: 'Variation B' },
+    ],
+    themes: [],
+  },
+};
+
+const mutator = {
+  teaser: {
+    disable: true,
+    variations: ['variation1', 'variation2'],
+    themes: [
+      {
+        style: {
+          '--theme-color': '#fff',
+          '--theme-high-contrast-color': '#ecebeb',
+          '--theme-foreground-color': '#000',
+          '--theme-low-contrast-foreground-color': '#555555',
+        },
+        name: 'default',
+        label: 'Default',
+      },
+    ],
+  },
+  gridBlock: {
+    variations: ['variationB'],
+  },
+  description: {
+    disable: true,
+  },
+};
+
+describe('BlocksConfigMerger', () => {
+  it('disables the block if disable is true', () => {
+    const result = BlocksConfigMerger(baseBlocksConfig, mutator);
+    expect(result.teaser.restricted).toBe(true);
+  });
+
+  it('filters variations according to mutator', () => {
+    const result = BlocksConfigMerger(baseBlocksConfig, mutator);
+    expect(result.teaser.variations.map((v) => v.id)).toEqual([
+      'variation1',
+      'variation2',
+    ]);
+    expect(result.gridBlock.variations.map((v) => v.id)).toEqual([
+      'variationB',
+    ]);
+  });
+
+  it('assigns themes from mutator', () => {
+    const result = BlocksConfigMerger(baseBlocksConfig, mutator);
+    expect(result.teaser.themes).toEqual([
+      {
+        style: {
+          '--theme-color': '#fff',
+          '--theme-high-contrast-color': '#ecebeb',
+          '--theme-foreground-color': '#000',
+          '--theme-low-contrast-foreground-color': '#555555',
+        },
+        name: 'default',
+        label: 'Default',
+      },
+    ]);
+  });
+
+  it('does not modify blocks not present in mutator', () => {
+    const result = BlocksConfigMerger(baseBlocksConfig, mutator);
+    expect(result.teaser.variations.length).toBe(2);
+    expect(result.gridBlock.restricted).toBe(false);
+  });
+
+  it('ignores blocks in mutator that do not exist in blocksConfig', () => {
+    const result = BlocksConfigMerger(baseBlocksConfig, mutator);
+    expect(result.description).toBeUndefined();
+  });
+
+  it('does not mutate the original blocksConfig', () => {
+    const original = JSON.parse(JSON.stringify(baseBlocksConfig));
+    BlocksConfigMerger(baseBlocksConfig, mutator);
+    expect(baseBlocksConfig).toEqual(original);
+  });
+});