From ea44c74f9634738b93a96bb7f71a5aa13179bd0e Mon Sep 17 00:00:00 2001 From: Markus Haack Date: Fri, 30 Aug 2024 15:38:11 +0200 Subject: [PATCH] chore: update models --- .github/workflows/semantic-release.yaml | 23 ---- component-definition.json | 49 +++++++- component-filters.json | 6 + component-models.json | 147 +++++++++++++++++++++++- 4 files changed, 199 insertions(+), 26 deletions(-) delete mode 100644 .github/workflows/semantic-release.yaml diff --git a/.github/workflows/semantic-release.yaml b/.github/workflows/semantic-release.yaml deleted file mode 100644 index 857b40a6..00000000 --- a/.github/workflows/semantic-release.yaml +++ /dev/null @@ -1,23 +0,0 @@ -# Generate a changelog with semantic-release -# Skip if the commit message is "Initial commit" -on: - push: - branches: - - main -jobs: - semantic-release: - if: ${{ ! contains(github.event.head_commit.message, 'Initial commit') }} - runs-on: [self-hosted, solinas] - steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Setup Node.js - uses: actions/setup-node@v4 - with: - node-version: 18 - - name: Install dependencies - run: npm ci - - name: Run semantic-release - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: npm run semantic-release diff --git a/component-definition.json b/component-definition.json index b355f181..2db9480e 100644 --- a/component-definition.json +++ b/component-definition.json @@ -121,7 +121,8 @@ "resourceType": "core/franklin/components/block/v1/block", "template": { "name": "Hero", - "model": "hero" + "model": "hero", + "titleType": "h1" } } } @@ -192,6 +193,52 @@ } } } + }, + { + "title": "Featured Articles", + "id": "featured-articles", + "plugins": { + "xwalk": { + "page": { + "resourceType": "core/franklin/components/block/v1/block", + "template": { + "name": "Featured Articles", + "model": "featured-articles" + } + } + } + } + }, + { + "title": "Featured Article", + "id": "featured-article", + "plugins": { + "xwalk": { + "page": { + "resourceType": "core/franklin/components/block/v1/block/item", + "template": { + "name": "Featured Article", + "model": "featured-article" + } + } + } + } + }, + { + "title": "Resource Center", + "id": "resource-center", + "plugins": { + "xwalk": { + "page": { + "resourceType": "core/franklin/components/block/v1/block", + "template": { + "name": "Resource Center", + "model": "resource-center", + "key-value": true + } + } + } + } } ] } diff --git a/component-filters.json b/component-filters.json index 5bf533f0..fd06d046 100644 --- a/component-filters.json +++ b/component-filters.json @@ -40,5 +40,11 @@ "components": [ "fast-fact" ] + }, + { + "id": "featured-articles", + "components": [ + "featured-article" + ] } ] \ No newline at end of file diff --git a/component-models.json b/component-models.json index bc40cdba..8a8f4f85 100644 --- a/component-models.json +++ b/component-models.json @@ -1,10 +1,81 @@ [ + { + "id": "page-metadata", + "fields": [ + { + "component": "container", + "label": "Fieldset", + "fields": [ + { + "component": "text", + "valueType": "string", + "name": "jcr:title", + "label": "Title" + }, + { + "component": "text", + "valueType": "string", + "name": "jcr:description", + "label": "Description" + }, + { + "component": "text", + "valueType": "string", + "name": "cq:canonicalUrl", + "label": "Canonical" + }, + { + "component": "text", + "valueType": "string", + "name": "keywords", + "multi": true, + "label": "Keywords" + }, + { + "component": "text", + "valueType": "string", + "name": "Tags", + "multi": true, + "label": "Tags" + }, + { + "component": "text", + "valueType": "string", + "name": "Author", + "label": "Author" + }, + { + "component": "date-time", + "valueType": "date-time", + "name": "Published Time", + "label": "Published Time" + }, + { + "component": "date-time", + "valueType": "date-time", + "name": "Modified Time", + "label": "Modified Time" + }, + { + "component": "select", + "label": "Table of Contents", + "name": "toc", + "valueType": "string", + "options": [ + { "name": "Enabled", "value": "yes" }, + { "name": "Disabled", "value": "" } + ] + } + ] + } + ] + }, { "id": "image", "fields": [ { "component": "reference", - "name": "image", + "name": "fileReference", "label": "Image", "multi": false }, @@ -108,6 +179,25 @@ "value": "additional reading" } ] + }, + { + "component": "select", + "name": "location", + "label": "Location", + "options": [ + { + "name": "main", + "value": "main" + }, + { + "name": "sidebar", + "value": "sidebar" + }, + { + "name": "document-footer", + "value": "document-footer" + } + ] } ] }, @@ -176,6 +266,20 @@ "label": "Alt", "value": "" }, + { + "component": "text", + "valueType": "string", + "name": "title", + "label": "Title", + "value": "" + }, + { + "component": "text", + "valueType": "string", + "name": "titleType", + "value": "h1", + "hidden": true + }, { "component": "richtext", "name": "text", @@ -223,7 +327,7 @@ "label": "Text" }, { - "component": "aem-content", + "component": "text", "valueType": "string", "name": "promo_link", "label": "Promo Link" @@ -302,5 +406,44 @@ "valueType": "string" } ] + }, + { + "id": "featured-article", + "fields": [ + { + "component": "aem-content", + "name": "link", + "value": "" + } + ] + }, + { + "id": "resource-center", + "fields": [ + { + "component": "string", + "valueType": "string", + "name": "Tags", + "label": "Tags" + }, + { + "component": "text", + "valueType": "string", + "name": "Content Type", + "label": "Content Type" + }, + { + "component": "text", + "valueType": "string", + "name": "Limit", + "label": "Limit" + }, + { + "component": "text", + "valueType": "string", + "name": "Info", + "label": "Info" + } + ] } ] \ No newline at end of file