Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/1.6' into 1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
@mcop1
mcop1 committed Jun 21, 2023
2 parents 2047947 + fbe90c3 commit 74b3457
Show file tree
Hide file tree
Showing 15 changed files with 539 additions and 169 deletions.
66 changes: 66 additions & 0 deletions .github/workflows/docs.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@

name: "Documentation"

on:
pull_request:
branches:
- "[0-9]+.[0-9]+"
- "[0-9]+.x"
paths:
- 'doc/**'
- '.github/workflows/docs.yaml'
push:
branches:
- "[0-9]+.[0-9]+"
- "[0-9]+.x"
- "*_actions"
paths:
- 'doc/**'

permissions:
contents: read

jobs:
docs:
name: "Generate docs Pimcore Docs Generator"
runs-on: "ubuntu-latest"
steps:
- name: "Checkout code"
uses: "actions/checkout@v3"

- name: "Checkout Docs Generator"
uses: "actions/checkout@v3"
with:
repository: "pimcore/docs-generator"
ref: "main"
path: "./docs-generator"
token: ${{ secrets.DOCS_GENERATOR_ACCESS_TOKEN }}

- name: "Install Node"
uses: actions/setup-node@v3
with:
node-version: 19.x
registry-url: 'https://registry.npmjs.org'

- name: Prepare Docs
working-directory: "./docs-generator"
run: |
mkdir docs
# copy docs to working directory
cp -r ../doc ./docs/
# copy readme to working directory
cp -r ../README.md ./docs/
# copy index page
cp bin/resources/00_index_empty.md ./docs/00_index.md
# use special docusaurus config (to exclude search plugin) and check for broken links
mv docusaurus.config.js.repos-tests docusaurus.config.js
- name: Build Docs
working-directory: "./docs-generator"
run: |
npm install
npm run build
28 changes: 14 additions & 14 deletions src/GraphQL/DocumentElementType/LinkDataType.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,39 +61,39 @@ public function __construct(Service $graphQlService)
'type' => Type::boolean(),
'resolve' => static function ($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null) {
if ($value instanceof \Pimcore\Model\Document\Editable\Link) {
return $value->getData() ? $value->getData()['internal'] : null;
return $value->getData()['internal'] ?? null;
}
}
],
'internalType' => [
'type' => Type::string(),
'resolve' => static function ($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null) {
if ($value instanceof \Pimcore\Model\Document\Editable\Link) {
return $value->getData() ? $value->getData()['internalType'] : null;
return $value->getData()['internalType'] ?? null;
}
}
],
'internalId' => [
'type' => Type::int(),
'resolve' => static function ($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null) {
if ($value instanceof \Pimcore\Model\Document\Editable\Link) {
return $value->getData() ? $value->getData()['internalId'] : null;
return $value->getData()['internalId'] ?? null;
}
}
],
'path' => [
'type' => Type::string(),
'resolve' => static function ($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null) {
if ($value instanceof \Pimcore\Model\Document\Editable\Link) {
return $value->getData() ? $value->getData()['path'] : null;
return $value->getData()['path'] ?? null;
}
}
],
'text' => [
'type' => Type::string(),
'resolve' => static function ($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null) {
if ($value instanceof \Pimcore\Model\Document\Editable\Link) {
return $value->getData() ? $value->getData()['text'] : null;
return $value->getData()['text'] ?? null;
}
}
],
Expand All @@ -105,71 +105,71 @@ public function __construct(Service $graphQlService)
'type' => Type::string(),
'resolve' => static function ($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null) {
if ($value instanceof \Pimcore\Model\Document\Editable\Link) {
return $value->getData() ? $value->getData()['target'] : null;
return $value->getData()['target'] ?? null;
}
}
],
'parameters' => [
'type' => Type::string(),
'resolve' => static function ($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null) {
if ($value instanceof \Pimcore\Model\Document\Editable\Link) {
return $value->getData() ? $value->getData()['parameters'] : null;
return $value->getData()['parameters'] ?? null;
}
}
],
'anchor' => [
'type' => Type::string(),
'resolve' => static function ($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null) {
if ($value instanceof \Pimcore\Model\Document\Editable\Link) {
return $value->getData() ? $value->getData()['anchor'] : null;
return $value->getData()['anchor'] ?? null;
}
}
],
'title' => [
'type' => Type::string(),
'resolve' => static function ($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null) {
if ($value instanceof \Pimcore\Model\Document\Editable\Link) {
return $value->getData() ? $value->getData()['title'] : null;
return $value->getData()['title'] ?? null;
}
}
],
'accesskey' => [
'type' => Type::string(),
'resolve' => static function ($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null) {
if ($value instanceof \Pimcore\Model\Document\Editable\Link) {
return $value->getData() ? $value->getData()['accesskey'] : null;
return $value->getData()['accesskey'] ?? null;
}
}
],
'relation' => [
'type' => Type::string(),
'resolve' => static function ($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null) {
if ($value instanceof \Pimcore\Model\Document\Editable\Link) {
return $value->getData() ? $value->getData()['rel'] : null;
return $value->getData()['rel'] ?? null;
}
}
],
'tabindex' => [
'type' => Type::string(),
'resolve' => static function ($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null) {
if ($value instanceof \Pimcore\Model\Document\Editable\Link) {
return $value->getData() ? $value->getData()['tabindex'] : null;
return $value->getData()['tabindex'] ?? null;
}
}
],
'class' => [
'type' => Type::string(),
'resolve' => static function ($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null) {
if ($value instanceof \Pimcore\Model\Document\Editable\Link) {
return $value->getData() ? $value->getData()['class'] : null;
return $value->getData()['class'] ?? null;
}
}
],
'attributes' => [
'type' => Type::string(),
'resolve' => static function ($value = null, $args = [], $context = [], ResolveInfo $resolveInfo = null) {
if ($value instanceof \Pimcore\Model\Document\Editable\Link) {
return $value->getData() ? $value->getData()['attributes'] : null;
return $value->getData()['attributes'] ?? null;
}
}
],
Expand Down
99 changes: 99 additions & 0 deletions src/Resources/translations/admin.ca.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
---
plugin_pimcore_datahub_toolbar: Datahub
plugin_pimcore_datahub_configpanel_add: Add Configuration
plugin_pimcore_datahub_configpanel_enterkey_title: Add a new configuration
plugin_pimcore_datahub_configpanel_enterkey_prompt: Unique Identifier
plugin_pimcore_datahub_configpanel_error_adding_config: Error adding configuration
plugin_pimcore_datahub_configpanel: Configuration
plugin_pimcore_datahub_configpanel_invalid_name: Invalid name
plugin_pimcore_datahub_configpanel_invalid_length: Exceeded maximum configuration
name length 80 of characters
plugin_pimcore_datahub_configpanel_error_cloning_config: Error cloning configuration
plugin_pimcore_datahub_configpanel_enterclonekey_title: Clone
plugin_pimcore_datahub_configpanel_enterclonekey_enterclonekey_prompt: Name of clone
plugin_pimcore_datahub_configpanel_item_save_success: Configuration saved
plugin_pimcore_datahub_configpanel_item_saveerror: Configuration could not be saved
plugin_pimcore_datahub_configpanel_item_saveerror_permissions: Configuration cannot
be saved because it would deprive your update permissions. Please check the permissions
tab.
plugin_pimcore_datahub_configpanel_item_general: General
plugin_pimcore_datahub_configpanel_sqlObjectCondition: SQL Condition
plugin_pimcore_datahub_configpanel_schema: Schema Definition
plugin_pimcore_datahub_configpanel_schema_fields: Schema Fields
plugin_pimcore_datahub_configpanel_security: Security Definition
plugin_pimcore_datahub_configpanel_security_method: Method
plugin_pimcore_datahub_configpanel_security_method_apikey: API Key
plugin_pimcore_datahub_configpanel_fields: Fields
plugin_pimcore_datahub_configpanel_entity: Entity
plugin_pimcore_datahub_configpanel_root: Root Node
plugin_pimcore_datahub_fieldName: Field Name
plugin_pimcore_datahub_configpanel_condition_hint: This is a global SQL condition
in addition to the workspace settings that will be added to all queries
plugin_pimcore_datahub_configpanel_available_fields: Available Fields
plugin_pimcore_datahub_operator_thumbnail_config: Configuration
plugin_pimcore_datahub_operator_select_entity: Select Entity
plugin_pimcore_datahub_security_datahub_apikey: Datahub API Keys
plugin_pimcore_datahub_security_definition: Security Definition
plugin_pimcore_datahub_security_apikey_description: API key required for web service
access. One API key per line allowed. At least one key with minimum 16 characters
needs to be provided.
plugin_pimcore_datahub_config: Datahub Config
plugin_datahub_config: Datahub Config
plugin_datahub_adapter_graphql: Datahub Adapter - GraphQL
plugin_datahub_admin: Datahub Admin
plugin_pimcore_datahub_type_graphql: GraphQL
plugin_pimcore_datahub_workspace_permission_create: Create
plugin_pimcore_datahub_workspace_permission_read: Read
plugin_pimcore_datahub_workspace_permission_update: Update
plugin_pimcore_datahub_workspace_permission_delete: Delete
plugin_pimcore_datahub_graphql_open_explorer_in_iframe: Open in Iframe
plugin_pimcore_datahub_graphql_open_explorer_in_tab: Open in Tab
plugin_pimcore_datahub_graphql_query_schema: Query Schema
plugin_pimcore_datahub_graphql_mutation_schema: Mutation Schema
plugin_pimcore_datahub_graphql_iexplorer: iExplorer
plugin_pimcore_datahub_datatype_not_supported_yet: datatype '%s' not supported yet
operator_alias: Alias
operator_concatenator: Operator Concatenator
operator_dateformatter: Date Formatter
operator_element_counter: Element Counter
operator_text: Operator Text
operator_merge: Merge (deprecated)
operator_substring: Substring
operator_thumbnail: Thumbnail
operator_thumbnail_html: Thumbnail HTML
operator_translate_value: Operator Translate Value
operator_trimmer: Trimmer
mutationoperator_locale_switcher: Locale Switcher
mutationoperator_ifempty: IfEmpty
mutationoperator_locale_collector: Locale Collector
mutationoperator_locale_switcher_description: Switches to different language other
than the default language.
mutationoperator_ifempty_description: Only sets the value if current one is empty.
mutationoperator_locale_collector_description: Allows editing all languages for a
single field.
plugin_pimcore_datahub_query: Query
plugin_pimcore_datahub_mutation: Mutation
plugin_pimcore_datahub_graphql_special_schema: Generic Types
plugin_pimcore_datahub_graphql_special_document: Document
plugin_pimcore_datahub_graphql_special_document_folder: Document Folder
plugin_pimcore_datahub_graphql_special_asset: Asset
plugin_pimcore_datahub_graphql_special_asset_folder: Asset Folder
plugin_pimcore_datahub_graphql_special_object_folder: Object Folder
plugin_pimcore_datahub_graphql_special_asset_listing: Asset Listing
plugin_pimcore_datahub_graphql_special_translation_listing: Translation Listing
plugin_pimcore_datahub_graphql_special_translation: Translation
read: Read
plugin_pimcore_datahub_skip_permission_check: Skip Permission Check
plugin_pimcore_datahub_configpanel_permissions: Permissions
plugin_pimcore_datahub_graphql_permissions_roles: Role Permissions
plugin_pimcore_datahub_graphql_permissions_users: User Permissions
plugin_pimcore_datahub_operator_select_user: Select User
plugin_pimcore_datahub_operator_select_role: Select Role
plugin_pimcore_datahub_configpanel_user: User
plugin_pimcore_datahub_configpanel_role: Role
plugin_pimcore_datahub_disable_introspection: Disable Introspection
plugin_pimcore_datahub_security_introspection_description: 'Please note: When introspection
is disabled, the autocomplete feature will not work.'
plugin_pimcore_datahub_import: Import
plugin_pimcore_datahub_export: Export
...
6 changes: 3 additions & 3 deletions src/Resources/translations/admin.cs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@ plugin_pimcore_datahub_graphql_mutation_schema: Mutation Schema
plugin_pimcore_datahub_graphql_iexplorer: iExplorer
plugin_pimcore_datahub_datatype_not_supported_yet: datatype '%s' not supported yet
operator_alias: Alias
operator_concatenator: Concatenator
operator_concatenator: Operator Concatenator
operator_dateformatter: Date Formatter
operator_element_counter: Element Counter
operator_text: text
operator_text: Operator Text
operator_merge: Merge (deprecated)
operator_substring: Substring
operator_thumbnail: Thumbnail
operator_thumbnail_html: Thumbnail HTML
operator_translate_value: Translate Value
operator_translate_value: Operator Translate Value
operator_trimmer: Trimmer
mutationoperator_locale_switcher: Locale Switcher
mutationoperator_ifempty: IfEmpty
Expand Down
Loading

0 comments on commit 74b3457

Please sign in to comment.