diff --git a/src/cloud/architecture/pro-architecture.md b/src/cloud/architecture/pro-architecture.md index 974f120219d..a540e269024 100644 --- a/src/cloud/architecture/pro-architecture.md +++ b/src/cloud/architecture/pro-architecture.md @@ -156,7 +156,7 @@ The Production environment has three virtual machines (VMs) behind an Elastic Lo - `pub/static` - `app/etc` - **Redis**—one server per VM with only one active and the other two as replicas -- **Elasticsearch**—search for {{site.data.var.ece}} 2.1 and later +- **Elasticsearch**—search for {{site.data.var.ece}} 2.2 and later - **Galera**—database cluster with one MariaDB MySQL database per node with an auto-increment setting of three for unique IDs across every database The following figure shows the technologies used in the Production environment: diff --git a/src/cloud/architecture/pro-develop-deploy-workflow.md b/src/cloud/architecture/pro-develop-deploy-workflow.md index 2b222232d28..07f4296a0ee 100644 --- a/src/cloud/architecture/pro-develop-deploy-workflow.md +++ b/src/cloud/architecture/pro-develop-deploy-workflow.md @@ -61,7 +61,7 @@ Combine all verified code changes by merging your Active development branch into ### Merge to Staging -Staging is a pre-production environment that provides all services and settings as close to the Production environment as possible. You should always push your code changes in iterations to your Staging environment for full testing that includes all services. The first time you use the Staging environment, you must configure services, such as [Fastly CDN]({{ site.baseurl }}/cloud/cdn/cloud-fastly.html), [Blackfire Profiler]({{ site.baseurl }}/cloud/project/project-integrate-blackfire.html), and [New Relic]({{ site.baseurl }}/cloud/project/new-relic.html). Also, we recommend configuring payment gateways, shipping, notifications, and other vital services with sandbox or testing credentials. +Staging is a pre-production environment that provides all services and settings as close to the Production environment as possible. You should always push your code changes from the Integration environment to the Staging environment so that you can perform thorough testing with all services. The first time you use the Staging environment, you must configure services, such as [Fastly CDN]({{ site.baseurl }}/cloud/cdn/cloud-fastly.html), [Blackfire Profiler]({{ site.baseurl }}/cloud/project/project-integrate-blackfire.html), and [New Relic]({{ site.baseurl }}/cloud/project/new-relic.html). Also, we recommend configuring payment gateways, shipping, notifications, and other vital services with sandbox or testing credentials. It is best to thoroughly test every service, verify your performance testing tools, and perform UAT testing as an administrator and as a customer, until you feel that your store is ready for the Production environment. See [Deploy your store]({{ site.baseurl }}/cloud/live/stage-prod-live.html). diff --git a/src/cloud/cdn/fastly-vcl-blocking.md b/src/cloud/cdn/fastly-vcl-blocking.md index 74688dc7c59..84bd3e663ce 100644 --- a/src/cloud/cdn/fastly-vcl-blocking.md +++ b/src/cloud/cdn/fastly-vcl-blocking.md @@ -25,7 +25,7 @@ You create an Edge ACL to define the list of IP addresses to block. After creati If you want to manage access for both Staging and Production sites, create the Edge ACL with the same name in both environments. The VCL snippet code will apply to both environments. 1. Log in to the Magento Admin. -1. Navigate to **Stores** > **Settings** > **Configuration** > **Advanced** > **System** > **Fastly Configuration**. +1. Navigate to **Stores** > Settings > **Configuration** > **Advanced** > **System** > **Full Page Cache** > **Fastly Configuration**. 1. Expand the **Edge ACL** section. 1. Click **Add ACL** to create a list. For this example, name the list "blocklist". 1. Enter IP address values in the list. Any client IPs added to this list will be blocked access from the site. diff --git a/src/cloud/docker/docker-containers-service.md b/src/cloud/docker/docker-containers-service.md index 60c39aca1da..8480db453fc 100755 --- a/src/cloud/docker/docker-containers-service.md +++ b/src/cloud/docker/docker-containers-service.md @@ -77,7 +77,7 @@ The FPM container includes the following volumes: - `/app/pub/media` {:.bs-callout-tip} -You can add custom PHP extensions and manage their status from the `runtime` section of the `.magento.app.yaml` file. See [PHP extensions]. To test custom extensions without updating the {{site.data.var.ece}} environment configuration, you can add the custom configuration to the [`docker-compose.override.yml`][Docker override] file. Configuration settings in this file are applied only when you build and deploy to the Docker environment. +You can add custom PHP extensions and manage their status from the `runtime` section of the `.magento.app.yaml` file. See [PHP extensions]. To test custom extensions without updating the {{site.data.var.ece}} environment configuration, you can add the custom configuration to the [`docker-compose.override.yml`][Docker override file]. Configuration settings in this file are applied only when you build and deploy to the Docker environment. For additional information about configuring the php environment, see the [XDebug for Docker] documentation. diff --git a/src/cloud/docker/docker-containers.md b/src/cloud/docker/docker-containers.md index 5eab93d9040..b2f56d9708e 100644 --- a/src/cloud/docker/docker-containers.md +++ b/src/cloud/docker/docker-containers.md @@ -39,7 +39,7 @@ See [Docker CLI containers] for details. | [selenium][selenium-container]| Selenium | `--with-selenium`
`--selenium-version`
`--selenium-image`| Any | Enables Magento application testing using the Magento Functional Testing Framework (MFTF) | [tls][tls-container] | SSL Endpoint | | | Terminates SSL, can be configured to pass to varnish or nginx | [varnish][varnish-container] | Varnish | `--varnish` | 4, 6 | -| [web][web-container] | NGNIX | `--nginx` | 1.9, latest | +| [web][web-container] | NGINX | `--nginx` | 1.9, latest | The `ece-docker build:compose` command runs in interactive mode and verifies the configured service versions. To skip interactive mode, use the `-n, --no-interaction` option. diff --git a/src/cloud/project/ece-tools-upgrade-project.md b/src/cloud/project/ece-tools-upgrade-project.md index 78a6bcc67bd..b647ee61e3e 100644 --- a/src/cloud/project/ece-tools-upgrade-project.md +++ b/src/cloud/project/ece-tools-upgrade-project.md @@ -29,11 +29,11 @@ Each {{site.data.var.ee}} version requires a different constraint based on the f You can always find the latest metapackage constraint in the [`magento-cloud` template](https://github.com/magento/magento-cloud/blob/master/composer.json). -The following example places a constraint for the {{site.data.var.ece}} metapackage to any version greater than or equal to the current version 2.2.0 and lower than next version 2.2.1: +The following example places a constraint for the {{site.data.var.ece}} metapackage to any version greater than or equal to the current version 2.3.4 and lower than next version 2.3.5: ```json "require": { - "magento/magento-cloud-metapackage": ">=2.2.0 <2.2.1" + "magento/magento-cloud-metapackage": ">=2.3.4 <2.3.5" }, ``` @@ -46,9 +46,9 @@ To upgrade project to use ece-tools: 1. Update the `magento/magento-cloud-metapackage` version constraint in the `composer.json` file. - ```bash - composer require "magento//magento-cloud-metapackage": ">=2.2.0 <2.2.1" --no-update - ``` + ```bash + composer require "magento/magento-cloud-metapackage":">=2.3.4 <2.3.5" --no-update + ``` 1. Update the metapackage. diff --git a/src/cloud/project/project-conf-files_services-redis.md b/src/cloud/project/project-conf-files_services-redis.md index 570bd9e0545..e49d1162fc2 100644 --- a/src/cloud/project/project-conf-files_services-redis.md +++ b/src/cloud/project/project-conf-files_services-redis.md @@ -52,7 +52,7 @@ To enable Redis: Assuming your Redis relationship is named `redis`, you can access it using the `redis-cli` tool. -1. Use SSH to connect to the Integration environment with RabbitMQ installed and configured. +1. Use SSH to connect to the Integration environment with Redis installed and configured. 1. Open an SSH tunnel to a host. diff --git a/src/cloud/project/project-multi-sites.md b/src/cloud/project/project-multi-sites.md index 4f5fef883da..df52ea9a2df 100644 --- a/src/cloud/project/project-multi-sites.md +++ b/src/cloud/project/project-multi-sites.md @@ -82,7 +82,7 @@ To configure a new web location: ```yaml web: locations: - "/":&app + "/": &app # The public directory of the app, relative to its root. root: "pub" passthru: "/index.php" @@ -98,7 +98,7 @@ To configure a new web location: ```yaml web: locations: - "/":&app + "/": &app # The public directory of the app, relative to its root. root: "pub" passthru: "/index.php" @@ -130,14 +130,14 @@ To configure a location with a different directory: ```yaml web: locations: - "/":&root + "/": &root # The public directory of the app, relative to its root. root: "pub" passthru: "/index.php" index: - index.php ... - "/static":&static + "/static": &static root: "pub/static" ``` @@ -146,7 +146,7 @@ To configure a location with a different directory: ```yaml web: locations: - "/":&root + "/": &root # The public directory of the app, relative to its root. root: "pub" passthru: "/index.php" @@ -156,7 +156,7 @@ To configure a location with a different directory: "/media": root: "pub/media" ... - "/static":&static + "/static": &static root: "pub/static" allow: true scripts: false diff --git a/src/cloud/project/project-upgrade.md b/src/cloud/project/project-upgrade.md index 886480c2ed4..dabeb62a6a9 100644 --- a/src/cloud/project/project-upgrade.md +++ b/src/cloud/project/project-upgrade.md @@ -224,7 +224,7 @@ To resolve the error: [technology stack]: {{site.baseurl}}/guides/v2.3/install-gde/system-requirements-tech.html [Upgrades and patches]: {{site.baseurl}}/cloud/project/project-upgrade-parent.html -[Magento technology stack requirements]: {{site.baseurl}}/guides/v2.2/install-gde/system-requirements-tech.html +[Magento technology stack requirements]: {{site.baseurl}}/guides/v2.3/install-gde/system-requirements-tech.html [Configuration Management]: {{site.baseurl}}/cloud/live/sens-data-over.html [extensions section of the .magento.app.yaml file]: {{site.baseurl}}/cloud/project/project-conf-files_magento-app.html#configure-php-options [.magento.app.yaml]: {{site.baseurl}}/cloud/project/project-conf-files_magento-app.html diff --git a/src/cloud/release-notes/CloudReleaseNotes2.2.1.md b/src/cloud/release-notes/CloudReleaseNotes2.2.1.md deleted file mode 100644 index ef280e625b2..00000000000 --- a/src/cloud/release-notes/CloudReleaseNotes2.2.1.md +++ /dev/null @@ -1,106 +0,0 @@ ---- -group: release-notes -title: Magento Commerce (Cloud) 2.2.1 Release Notes ---- - -We are pleased to present {{site.data.var.ece}} 2.2.1. This release includes numerous functional fixes and enhancements. - -{:.bs-callout-warning} -We strongly recommend upgrading to Fastly v1.2.33 module for all Magento Commerce (Cloud) implementations that run on 2.0.x, 2.1.x, and 2.2.x. This version includes updates and additions to increase stability, performance, and resolve issues with caching shopping carts. This version of Fastly has specific updates for Magento. - -## Highlights {#highlights} - -{{site.data.var.ece}} 2.2.1 includes multiple new features, enhancements and fixes. For full {{site.data.var.ece}} highlights and updates, see the Magento Commerce 2.2.1 Release Notes. - -Look for the following {{site.data.var.ece}} highlights in this release: - -* **30-day free trials available for Starter and Pro projects**. Starting October 23, 2017, we provide trials for Start and Pro projects. We auto provision your project and configure basic settings to get you started. You can access a new Onboarding Portal to get started with your project. For more information, see [Subscriptions and plans]({{ site.baseurl }}/cloud/bk-cloud.html). - -* **Staging and Production environments in the UI for Pro projects**. Starting October 23, 2017, all projects created using the free 30-day trial or provisioned for new accounts includes Staging and Production environments in the Project Web Interface. - -* **Onboarding Portal for new accounts helps merchants new to Magento Commerce (Cloud) get started with their project**. Quickly ramp up and get started with your project with our [Onboarding Portal]({{ site.baseurl }}/cloud/onboarding/onboarding-portal.html): assign a Technical Admin, preview your store, plan your local development environment, walk-through UAT tests, and prep for launching. - -Looking for more information on these new features as well as many others? Check out Magento 2.2 Developer Documentation. - -## Security enhancements {#security} - -Magento 2.2.1 includes multiple security enhancements. Although this release includes these enhancements, no confirmed attacks related to these issues have occurred to date. However, certain vulnerabilities can potentially be exploited to access customer information or take over administrator sessions, so we recommend that you upgrade your Magento software to the latest version as soon as possible. - -In general, we’ve removed serialize/unserialize from most the code to improve protection against remote code execution attacks. We’ve enhanced protection of code where use of object serialization or unserialization was unavoidable. Additionally, we’ve increased our use of output escaping to protect against cross-site scripting (XSS) attacks. - -[Contact us](https://magento.com/company/contact-us) for more information. - -### New Updates - - - -* Magento Commerce (Cloud) supports scopes and [static content deployment strategies]({{ site.baseurl }}/guides/v2.3/config-guide/cli/config-cli-subcommands-static-deploy-strategies.html). We have added the `–s` parameter with a default setting of quick for the static content deployment strategy. You can use the environment variable [SCD_STRATEGY]({{ site.baseurl }}/cloud/env/environment-vars_magento.html) to customize and use these strategies with your build and deploy actions. This variable supports the options standard quick, or compact. If you select compact, we override the `STATIC_CONTENT_THREADS` value with 1, which can slow deployment, especially in production environments. - -* When you create a new project, we automatically provision the project with the latest Magento Commerce (Cloud) code. The steps include cloning the latest code repository, adding an environment variable for `ADMIN_EMAIL` using the License Owner’s email, setting a default randomized Magento Admin password, and sending emails to the License Owner to access the project and reset the default Magento Admin password. For details, see [Onboarding tasks]({{ site.baseurl }}/cloud/onboarding/onboarding-tasks.html). - - - -* We have created a new log file on environments to capture and compile build and deploy actions. The file is located in the `app/var/log/cloud.log` file inside the Magento root application directory. - -## Known issues {#known} - -For all known {{site.data.var.ee}} 2.2.1 issues, see Magento Commerce 2.2.1 Release Notes. - -## Fixed issues {#fixed} - - - -* You can now [manually reset stuck Magento cron jobs]({{ site.baseurl }}/cloud/trouble/reset-cron-jobs.html) using a CLI command in all environments via SSH access. The deployment process automatically resets cron jobs. You must [patch magento/ece-tools]({{ site.baseurl }}/cloud/project/project-patch.html) to get this update. - - - -* We resolved an issue with the ElasticSearch option being added and saved to `app/etc/env.php`. When ElasticSearch is configured and activated in your environment, the setting properly saves in the `env.php` file. For example: - - - array ( - 'default' => - array ( - 'catalog' => - array ( - 'search' => - array ( - 'engine' => 'elasticsearch', - 'elasticsearch_server_hostname' => 'elasticsearch.internal', - 'elasticsearch_server_port' => '9200', - ), - ), - ), - ), -//... - - -* The `ADMIN_EMAIL` variable must be set for new and existing projects. We require that you configure the `ADMIN_EMAIL` environment variable for deployments, including new installations and upgrades. You can set this variable through the Project Web Interface. For instructions, see [Change the Magento Admin URL, username, and password on master]({{ site.baseurl }}/cloud/before/before-setup-env-2_clone.html). - -## Community contributions {#community} - -We are grateful to the wider Magento community and would like to acknowledge their contributions to this release. Check out the Magento Commerce 2.2.1 Release Notes for more information. - -## System requirements {#requirements} - -For {{site.data.var.ece}} requirements, see [Technologies and Requirements]({{ site.baseurl }}/cloud/requirements/cloud-requirements.html). - -The {{site.data.var.ee}} technology stack is built on PHP and MySQL. For details, see [Technology stack requirements]({{ site.baseurl }}/guides/v2.3/install-gde/system-requirements-tech.html) and [System Requirements]({{ site.baseurl }}/guides/v2.3/install-gde/system-requirements.html). - -## Installation and upgrade instructions {#install-upgrade} - -If installing and working with {{site.data.var.ece}} for the first time, we recommend [First-time local environment setup]({{ site.baseurl }}/cloud/setup/first-time-setup.html). - -To test and implement your {{site.data.var.ece}} upgrade, see [Upgrade Magento Commerce (Cloud)]({{ site.baseurl }}/cloud/project/project-upgrade.html). We include upgrade paths and additional instructions for upgrading from 2.0.x and 2.1.x. - -You can directly upgrade to {{site.data.var.ece}} 2.2 from the following versions: - -* 2.0.x versions: 2.0.14, 2.0.15, 2.0.16 -* 2.1.x versions: 2.1.7, 2.1.8, 2.1.9 - -We have heavily tested and verified upgrades to 2.2 from the latest three versions of 2.0.x and 2.1.x. - -You can attempt to upgrade from any version directly to {{site.data.var.ece}} 2.2. We cannot guarantee the results. For example, you should be able to upgrade from 2.0.10 or 2.1.4 directly to 2.2. - -If you prefer a secured and verified upgrade path, you can upgrade to one of the verified and tested versions, then directly upgrade to 2.2. For example, you could upgrade from 2.0.10 to 2.0.14, then upgrade to 2.2. diff --git a/src/cloud/release-notes/CloudReleaseNotes2.2.md b/src/cloud/release-notes/CloudReleaseNotes2.2.md deleted file mode 100644 index 5d9e7627190..00000000000 --- a/src/cloud/release-notes/CloudReleaseNotes2.2.md +++ /dev/null @@ -1,147 +0,0 @@ ---- -group: release-notes -title: Magento Commerce (Cloud) 2.2.0 Release Notes ---- - -We are pleased to present {{site.data.var.ece}} 2.2.0 General Availability. This release includes numerous functional fixes and enhancements. - -To fully upgrade {{site.data.var.ece}}, see [Upgrade Magento Commerce (Cloud)]({{ site.baseurl }}/cloud/project/project-upgrade.html). Specific steps and vital information for upgrading from 2.0.X and 2.1.X are included. For specific changes for deployments, see [Changes in Deployment](#deploy). - -{% include cloud/note-ece-tools-release-info.md %} - -## Highlights {#highlights} - -{{site.data.var.ece}} 2.2.0 includes a wealth of new, exciting features, and hundreds of enhancements and fixes. For full {{site.data.var.ece}} highlights and updates, see Magento Commerce 2.2.0 Release Notes. - -Look for the following {{site.data.var.ece}} highlights in this release: - -* **B2B Commerce functionality** is designed to meet the needs of merchants whose primary customers are companies, rather than consumers. Companies can create and maintain their own accounts, each with teams of buyers with various roles and levels of permission. B2B Commerce functionality also includes a flexible API that integrates with a variety of ERP solutions from Magento partners. B2B is supported for {{site.data.var.ece}} Pro subscriptions. See [B2B Quick Tour](http://docs.magento.com/m2/ce/user_guide/getting-started/quick-tour.html) for an overview of the rich B2B feature set we're introducing in this release, and [Getting Started with Magento Commerce for B2B](http://docs.magento.com/m2/b2b/user_guide/getting-started.html) for a more complete exploration of these new features. - -* **Magento Commerce Starter**. In addition to our Pro plan, Magento Cloud (Commerce) now comes in a smaller, Platform-as-a-Service version — Magento Commerce Starter. For an overview of these plans, see [Welcome to Magento Commerce Cloud]({{ site.baseurl }}/cloud/bk-cloud.html). For specific information on Starter, see Starter [architecture]({{ site.baseurl }}/cloud/basic-information/starter-architecture.html) and [develop and deploy workflow]({{ site.baseurl }}/cloud/basic-information/starter-develop-deploy-workflow.html). - -* **Staging and Production environments in the UI** for Pro projects. Starting October 23, 2017, all projects created using the free 30-day trial or provisioned for new accounts includes Staging and Production environments in the Project Web Interface. - -* **30-day free trials available** for Starter and Pro projects. Starting October 23, 2017, we provide trials for Start and Pro projects. We auto provision your project, configuring basic settings to get you started. You can access a new Onboarding Portal to get started with your project. For more information, see [Subscriptions and plans]({{ site.baseurl }}/cloud/bk-cloud.html). - -* **Improvements to the {{site.data.var.ece}} deployment process**. This release includes new build and deployment variables. Users of earlier versions of {{site.data.var.ece}} will note that MCC has been replaced by ece-tools and ece-patches, which allows for patching your {{site.data.var.ece}} without requiring a full installation of base code and the patch. For more information, see [Magento application environment variables]({{ site.baseurl }}/cloud/env/environment-vars_magento.html), [Composer]({{ site.baseurl }}/cloud/reference/cloud-composer.html), and [Changes in Deployment](#deploy). - -* **Upgraded technology stack.** {{site.data.var.ece}} recommends Fastly 1.2.33 and dropped support for PHP 5.6 and Varnish 3. We now support PHP 7.1 and Varnish 5, along with Redis 3.2 and MySQL 5.7. All [third-party libraries]({{ site.baseurl }}/guides/v2.3/release-notes/packages-cloud.html) have been upgraded to the latest stable version. - -* **Pipeline deployment**, a new deployment process, enables build and deployment stages to minimize production system downtime for site updates. This deployment expands on the previous Configuration Management for {{site.data.var.ece}}. To learn more, see [Configuration Management]({{ site.baseurl }}/cloud/live/sens-data-over.html) and [Pipeline Deployment]({{ site.baseurl }}/guides/v2.3/config-guide/deployment/pipeline/). - -* **Bundled extensions**. This release of Magento includes the first third-party extension that we are bundling with Magento Commerce -- Magento Social. This extension establishes a connection between your store and your corporate Facebook account, and creates a page with products from your catalog. When shoppers click a product, they are redirected to the corresponding product page in your Magento store. - -* **Integrated Signifyd fraud protection**. You can learn more about this fraud protection service, which can help merchants eliminate liability for any losses or fees from fraudulent orders, in [Signifyd fraud protection]({{ site.baseurl }}/guides/v2.3/payments-integrations/signifyd/signifyd.html). - -* **Significant enhancements in platform security and developer experience**. Security improvements include the removal of unserialize calls and protection of this functionality to increase resilience against dangerous code execution attacks. We have also continued to review and improve our protection against Cross-Site Scripting (XSS) attacks. - -* **Performance gains from improvements in indexing, cart, and cache operations**. Customers can browse and shop on a storefront while indexers are running with no visible impact to their experience. Additionally, long-running indexers operate in batches to better manage memory and run times. Cart improvements enable a buyer to create a cart with more than 300 line items, and merchants can process a cart with at least 300 line items. Varnish cache configuration now includes saint and grace mode to ensure Varnish is always presenting a cached page to a shop’s customers. Enhancements to cache invalidation logic and optimization of edge side include blocks for frequently changing data that significantly boost cache hit ratios. - -* **Substantial contributions from our Community members**. Our Community Engineering Team has been working with skilled and enthusiastic community members, and together they've added hundreds of pull requests to the Magento code base. For more information about our Community Engineering Team. see [Magento Community Engineering](https://github.com/magento-engcom). - -Looking for more information on these new features as well as many others? Check out [Magento Developer Documentation]({{ site.baseurl }}/guides/v2.3/). - -## Security enhancements {#security} - -Magento 2.2.0 includes multiple security enhancements. Although this release includes these enhancements, no confirmed attacks related to these issues have occurred to date. However, certain vulnerabilities can potentially be exploited to access customer information or take over administrator sessions, so we recommend that you upgrade your Magento software to the latest version as soon as possible. - -In general, we’ve removed serialize/unserialize from most the code to improve protection against remote code execution attacks. We’ve enhanced protection of code where use of object serialization or unserialization was unavoidable. Additionally, we’ve increased our use of output escaping to protect against cross-site scripting (XSS) attacks. - -[Contact us](https://magento.com/company/contact-us) for more information. - -## Known issues {#known} - -For all known {{site.data.var.ee}} 2.2.0 GA issues, see Magento Commerce 2.2.0 Release Notes. - -## Fixed issues {#fixed} - -This release contains numerous fixes and enhancements. This section includes only fixes for {{site.data.var.ece}}. For all known {{site.data.var.ee}} 2.2.0 GA issues, see Magento Commerce 2.2.0 Release Notes. - - - -* We removed `var/view_preprocessed` symlinking to fix an issue that was causing JavaScript minification conflicts. - - - -* You can now [manually reset stuck Magento cron jobs]({{ site.baseurl }}/cloud/trouble/reset-cron-jobs.html) using a CLI command in all environments via SSH access. The deployment process automatically resets cron jobs. You must [patch magento/ece-tools]({{ site.baseurl }}/cloud/project/project-patch.html) to get this update. - - - -* You can now generate sitemap.xml and robots.txt normally through the Magento Admin panel, without needing to move the file and have a redirect entered. If you are upgrading to 2.2, please enter a [Support ticket] to have any redirects removed for sitemap and robots.txt. - - - -* Newly provisioned {{site.data.var.ece}} receive an email to change the Magento Admin password. For enhanced security, we generate a random password for the username "admin" and send an email to the Project Owner to properly set up Admin access for Starter `master` Production environment and the Pro Integration `master` environment. - - - -* We added additional environment variables and updated build and deploy hooks to [`.magento.app.yaml`]({{ site.baseurl }}/cloud/project/project-conf-files_magento-app.html). - -* When upgrading to {{site.data.var.ece}} 2.2.0, you will need to update your `.magento.app.yaml` file and Configuration Management `config.local.php` file. See [Upgrade Magento Commerce (Cloud)]({{ site.baseurl }}/cloud/project/project-upgrade.html). - -* We provide updated build and deploy variables. For details, see [Magento application environment variables]({{ site.baseurl }}/cloud/env/environment-vars_magento.html). - -* We’ve added support for the latest version of Redis and for PHP-Redis 3.1.3. For more information on this update, and for guidance on Redis troubleshooting on {{site.data.var.ece}}, see [Redis troubleshooting]({{ site.baseurl }}/cloud/project/project-conf-files_services-redis.html). - - - -* Magento now correctly displays customer address during account creation. Previously, when you selected a default billing address during creation of a new customer account, Magento would not display the address. - - - -* When you delete an image in Admin, Magento no longer deletes it on the server. Previously, Magento deleted it from the server as well, which caused errors for other products (example error message: `Cannot gather stats! Warning!stat(): stat failed for`). - - - -* We’ve fixed errors in processing valid orders using a PayPal account that had been previously used to pay for a valid order that had problems during checkout. - -## Changes in Deployment {#deploy} - -When upgrading to {{site.data.var.ece}} 2.2, consider the following changes in deployment: - -* `ADMIN_EMAIL` variable must be set. We require the `ADMIN_EMAIL` environment variable configured for deployments. You can set this variable through the Project Web Interface. This is required for new installations and upgrades. For instructions, see [Add admin variables for Admin access]({{ site.baseurl }}/cloud/onboarding/onboarding-tasks.html). - -* Update and include `config.php` and add a list of all modules. If you use Configuration Management with a `config.local.php` file, you must create a `config.php` and add it to your code. For instructions, see [Configuration Management and upgrading]({{ site.baseurl }}/cloud/project/project-upgrade.html). - -* The command for generating `config.php` changed in 2.2 from `php bin/magento magento-cloud:scd-dump` to `php vendor/bin/m2-ece-scd-dump`. - -* `.magento.app.yaml` has new build and deploy hooks. As part of your upgrade, you should update the `.magento.app.yaml` file with new build and deploy hooks and a set of environment variables. All actions completed by build and deploy are completed by these hooks. For instructions, see [Update .magento.app.yaml]({{ site.baseurl }}/cloud/project/project-upgrade.html#update-the-configuration-file). For additional technical information, we have removed pre-deployment tasks, refined build and deploy tasks, and modified build and deploy variables. - -* The deploy variable `GENERATED_CODE_SYMLINK` has been removed. The generated folders `var/generation` and `var/di` have been moved to a `generated/` read-only directory. The folder `var/generation` is now `generated/code` and `var/di` is now `generated/metapackage`. - -* With the removal of `GENERATED_CODE_SYMLINK`, you cannot execute `setup:di:compile` directly on a server. - -* Modified and updated available build and deploy variables. For a full list, see [Magento application environment variables]({{ site.baseurl }}/cloud/env/environment-vars_magento.html). For 2.2, we have removed `skip_di_compilation` and `skip_di_clearing` from `build-options.ini`. These cannot be run for 2.2 in the build phase. - -* For 2.2.X, we no longer enable all of your extensions are part of the build process. We will provide a new mechanism in a later release. - -## Community contributions {#community} - -We are grateful to the wider Magento community and would like to acknowledge their contributions to this release. Check out the following ways you can learn about the community contributions to our current releases: - -* If a community member has provided a fix for this release, we identify the fix in the Fixed Issue section of these notes with the phrase, "*Fix provided by community member @member_name*". - -* The Magento Community Engineering team [Magento Contributors](https://magento.com/magento-contributors) maintains a list of top contributing individuals and partners by month, quarter, and year. From that Contributors page, you can follow links to their merged PRs on GitHub. - -## System requirements {#requirements} - -For {{site.data.var.ece}} requirements, see [Technologies and Requirements]({{ site.baseurl }}/cloud/requirements/cloud-requirements.html). - -The {{site.data.var.ee}} technology stack is built on PHP and MySQL. For details, see [Technology stack requirements]({{ site.baseurl }}/guides/v2.3/install-gde/system-requirements-tech.html) and [System Requirements]({{ site.baseurl }}/guides/v2.3/install-gde/system-requirements.html). - -## Installation and upgrade instructions {#install-upgrade} - -If installing and working with {{site.data.var.ece}} for the first time, we recommend [First-time local environment setup]({{ site.baseurl }}/cloud/setup/first-time-setup.html). - -To test and implement your {{site.data.var.ece}} upgrade, see [Upgrade Magento Commerce (Cloud)]({{ site.baseurl }}/cloud/project/project-upgrade.html). We include upgrade paths and additional instructions for upgrading from 2.0.X and 2.1.X. - -You can directly upgrade to {{site.data.var.ece}} 2.2 from the following versions: - -* 2.0.X versions: 2.0.14, 2.0.15, 2.0.16 -* 2.1.X versions: 2.1.7, 2.1.8, 2.1.9 - -We have heavily tested and verified upgrades to 2.2 from the latest three versions of 2.0.X and 2.1.X. - -You can attempt to upgrade from any version directly to {{site.data.var.ece}} 2.2. We cannot guarantee the results. For example, you should be able to upgrade from 2.0.10 or 2.1.4 directly to 2.2. - -If you prefer a secured and verified upgrade path, you can upgrade to one of the verified and tested versions, then directly upgrade to 2.2. For example, you could upgrade from 2.0.10 to 2.0.14, then upgrade to 2.2. diff --git a/src/guides/v2.3/comp-mgr/cli/cli-upgrade.md b/src/guides/v2.3/comp-mgr/cli/cli-upgrade.md index e3d3439b6ef..9551f800774 100644 --- a/src/guides/v2.3/comp-mgr/cli/cli-upgrade.md +++ b/src/guides/v2.3/comp-mgr/cli/cli-upgrade.md @@ -120,10 +120,10 @@ composer require magento/product-community-edition=2.3.3 --no-update Security patches contain security fixes only. They are designed to make the upgrade process faster and easier. -Security patches use the Composer naming convention `2.3.2-px`. Use Composer to specify a patch. For example, to download the {{site.data.var.ee}} 2.3.2-p1 metapackage: +Security patches use the Composer naming convention `2.3.3-px`. Use Composer to specify a patch. For example, to download the {{site.data.var.ce}} 2.3.3-p1 metapackage: ```bash -composer require magento/product-community-edition=2.3.2-p1 --no-update +composer require magento/product-community-edition=2.3.3-p1 --no-update ``` ## (_Optional)_ Recreate the Magento updater {#recreate-magento-updater} diff --git a/src/guides/v2.3/config-guide/prod/config-reference-envphp.md b/src/guides/v2.3/config-guide/prod/config-reference-envphp.md index a83c9337f16..76f2e2ff046 100644 --- a/src/guides/v2.3/config-guide/prod/config-reference-envphp.md +++ b/src/guides/v2.3/config-guide/prod/config-reference-envphp.md @@ -104,7 +104,7 @@ A list of downloadable domains available in this node. Additional domains can be ] ``` -Learn more about [downloadable-domains][downloadable_domains] commands. +Learn more about [Downloadable Domains][downloadable-domains] commands. ## install diff --git a/src/guides/v2.3/ext-best-practices/extension-coding/example-module-adminpage.md b/src/guides/v2.3/ext-best-practices/extension-coding/example-module-adminpage.md index a0ef6035166..8720d272d2e 100644 --- a/src/guides/v2.3/ext-best-practices/extension-coding/example-module-adminpage.md +++ b/src/guides/v2.3/ext-best-practices/extension-coding/example-module-adminpage.md @@ -48,7 +48,7 @@ For more information see: [`composer.json`]({{ page.baseurl }}/extension-dev-gui "AFL-3.0" ], "require": { - "php": "~5.6.0|7.0.2|7.0.4|~7.0.6" + "php": "~7.1.3||~7.2.0||~7.3.0" }, "autoload": { "files": [ "registration.php" ], @@ -102,6 +102,17 @@ If your module does not implement [Declarative Schema]({{ page.baseurl }}/extens ``` +If your module has a dependency with other modules, you can change the loading order sequence of the module by using the `sequence` node. +In the example below, `MyCompany_ExampleAdminNewPage` will be loaded after the `Magento_Checkout` module. + +```xml + + + + + +``` + ## Routing and navigation Before we can view the module's page, we need a way to navigate to it. These files create a link to the page in the left navigation and tells Magento how to resolve requests for that page. diff --git a/src/guides/v2.3/extension-dev-guide/cli-cmds/cli-add.md b/src/guides/v2.3/extension-dev-guide/cli-cmds/cli-add.md index 1405523190f..1410e967d37 100644 --- a/src/guides/v2.3/extension-dev-guide/cli-cmds/cli-add.md +++ b/src/guides/v2.3/extension-dev-guide/cli-cmds/cli-add.md @@ -7,7 +7,7 @@ menu_node: parent menu_order: 1 --- -You [module](https://glossary.magento.com/module) can optionally use Magento 2's Symfony-based [command-line interface (CLI)]({{ page.baseurl }}/config-guide/cli/config-cli.html#config-new-cli-intro) to provide commands for users to interact with. To use the CLI, see the following topics: +Your [module](https://glossary.magento.com/module) can optionally use Magento 2's Symfony-based [command-line interface (CLI)]({{ page.baseurl }}/config-guide/cli/config-cli.html#config-new-cli-intro) to provide commands for users to interact with. To use the CLI, see the following topics: * [Command naming guidelines]({{ page.baseurl }}/extension-dev-guide/cli-cmds/cli-naming-guidelines.html) * [How to add CLI commands]({{ page.baseurl }}/extension-dev-guide/cli-cmds/cli-howto.html) diff --git a/src/guides/v2.3/extension-dev-guide/declarative-schema/db-schema.md b/src/guides/v2.3/extension-dev-guide/declarative-schema/db-schema.md index 02877ef9299..304c064b2f0 100644 --- a/src/guides/v2.3/extension-dev-guide/declarative-schema/db-schema.md +++ b/src/guides/v2.3/extension-dev-guide/declarative-schema/db-schema.md @@ -416,6 +416,9 @@ In the following example, the selected `constraint` node defines the characteris ``` +{:.bs-callout-info} +Foreign keys can only be added to tables when both tables were created using a declarative schema (`db_schema.xml`). + ### Drop a foreign key The following example removes the `FL_ALLOWED_SEVERITIES` foreign key by deleting its `constraint` node. To drop a constraint declared in another module, redeclare it with the `disabled` attribute set to `true`. diff --git a/src/guides/v2.3/graphql/mutations/merge-carts.md b/src/guides/v2.3/graphql/mutations/merge-carts.md index 5ea2c35f63e..44f45647849 100644 --- a/src/guides/v2.3/graphql/mutations/merge-carts.md +++ b/src/guides/v2.3/graphql/mutations/merge-carts.md @@ -83,3 +83,13 @@ Attribute | Data Type | Description {% include graphql/cart-object.md %} [Cart query output]({{page.baseurl}}/graphql/queries/cart.html#cart-output) provides more information about the `Cart` object. + +## Errors + +Error | Description +--- | --- +`Current user does not have an active cart.` | The `mergeCarts` mutation deactivates the guest cart specified in the `source_cart_id` after merging. The guest cannot make any further operations with it. +`Required parameter "destination_cart_id" is missing` | The `destination_cart_id` attribute contains an empty value. +`Required parameter "source_cart_id" is missing` | The `source_cart_id` attribute contains an empty value. +`The current customer isn't authorized.` | The current customer is not currently logged in, or the customer's token does not exist in the `oauth_token` table, or you tried to merge two guest carts. +`The current user cannot perform operations on cart` | The authorized customer tried to merge a guest cart into the cart of another customer. diff --git a/src/guides/v2.3/graphql/mutations/set-billing-address.md b/src/guides/v2.3/graphql/mutations/set-billing-address.md index 4bb75e83549..bc2da8f9066 100644 --- a/src/guides/v2.3/graphql/mutations/set-billing-address.md +++ b/src/guides/v2.3/graphql/mutations/set-billing-address.md @@ -46,8 +46,16 @@ mutation { company street city + region{ + code + label + } postcode telephone + country{ + code + label + } } } } @@ -70,8 +78,16 @@ mutation { "Main Street" ], "city": "Austin", + "region": { + "code": "TX", + "label": "Texas" + }, "postcode": "78758", - "telephone": "8675309" + "telephone": "8675309", + "country": { + "code": "US", + "label": "US" + } } } } diff --git a/src/guides/v2.3/graphql/mutations/set-shipping-address.md b/src/guides/v2.3/graphql/mutations/set-shipping-address.md index e3cdc9409c3..1fa921b3b50 100644 --- a/src/guides/v2.3/graphql/mutations/set-shipping-address.md +++ b/src/guides/v2.3/graphql/mutations/set-shipping-address.md @@ -48,8 +48,16 @@ mutation { company street city + region { + code + label + } postcode telephone + country { + code + label + } } } } @@ -73,8 +81,16 @@ mutation { "Main Street" ], "city": "Austin", + "region": { + "code": "TX", + "label": "Texas" + }, "postcode": "78758", - "telephone": "8675309" + "telephone": "8675309", + "country": { + "code": "US", + "label": "US" + } } ] } diff --git a/src/guides/v2.3/graphql/product/bundle-product.md b/src/guides/v2.3/graphql/product/bundle-product.md index 2cedc5c05a7..67916a9340d 100644 --- a/src/guides/v2.3/graphql/product/bundle-product.md +++ b/src/guides/v2.3/graphql/product/bundle-product.md @@ -107,3 +107,203 @@ The following query returns information about bundle product `24-WG080`, which i } } ``` + +{% collapsible Response %} + +```json +{ + "data": { + "products": { + "items": [ + { + "sku": "24-WG080", + "type_id": "bundle", + "id": 46, + "name": "Sprite Yoga Companion Kit", + "dynamic_sku": true, + "dynamic_price": true, + "dynamic_weight": true, + "price_view": "PRICE_RANGE", + "ship_bundle_items": "TOGETHER", + "items": [ + { + "option_id": 1, + "title": "Sprite Stasis Ball", + "required": true, + "type": "radio", + "position": 1, + "sku": "24-WG080", + "options": [ + { + "id": 1, + "quantity": 1, + "position": 1, + "is_default": true, + "price": 0, + "price_type": "FIXED", + "can_change_quantity": true, + "label": "Sprite Stasis Ball 55 cm", + "product": { + "id": 26, + "name": "Sprite Stasis Ball 55 cm", + "sku": "24-WG081-blue", + "type_id": "simple" + } + }, + { + "id": 2, + "quantity": 1, + "position": 2, + "is_default": false, + "price": 0, + "price_type": "FIXED", + "can_change_quantity": true, + "label": "Sprite Stasis Ball 65 cm", + "product": { + "id": 29, + "name": "Sprite Stasis Ball 65 cm", + "sku": "24-WG082-blue", + "type_id": "simple" + } + }, + { + "id": 3, + "quantity": 1, + "position": 3, + "is_default": false, + "price": 0, + "price_type": "FIXED", + "can_change_quantity": true, + "label": "Sprite Stasis Ball 75 cm", + "product": { + "id": 32, + "name": "Sprite Stasis Ball 75 cm", + "sku": "24-WG083-blue", + "type_id": "simple" + } + } + ] + }, + { + "option_id": 2, + "title": "Sprite Foam Yoga Brick", + "required": true, + "type": "radio", + "position": 2, + "sku": "24-WG080", + "options": [ + { + "id": 4, + "quantity": 1, + "position": 1, + "is_default": true, + "price": 0, + "price_type": "FIXED", + "can_change_quantity": true, + "label": "Sprite Foam Yoga Brick", + "product": { + "id": 21, + "name": "Sprite Foam Yoga Brick", + "sku": "24-WG084", + "type_id": "simple" + } + } + ] + }, + { + "option_id": 3, + "title": "Sprite Yoga Strap", + "required": true, + "type": "radio", + "position": 3, + "sku": "24-WG080", + "options": [ + { + "id": 5, + "quantity": 1, + "position": 1, + "is_default": true, + "price": 0, + "price_type": "FIXED", + "can_change_quantity": true, + "label": "Sprite Yoga Strap 6 foot", + "product": { + "id": 33, + "name": "Sprite Yoga Strap 6 foot", + "sku": "24-WG085", + "type_id": "simple" + } + }, + { + "id": 6, + "quantity": 1, + "position": 2, + "is_default": false, + "price": 0, + "price_type": "FIXED", + "can_change_quantity": true, + "label": "Sprite Yoga Strap 8 foot", + "product": { + "id": 34, + "name": "Sprite Yoga Strap 8 foot", + "sku": "24-WG086", + "type_id": "simple" + } + }, + { + "id": 7, + "quantity": 1, + "position": 3, + "is_default": false, + "price": 0, + "price_type": "FIXED", + "can_change_quantity": true, + "label": "Sprite Yoga Strap 10 foot", + "product": { + "id": 35, + "name": "Sprite Yoga Strap 10 foot", + "sku": "24-WG087", + "type_id": "simple" + } + } + ] + }, + { + "option_id": 4, + "title": "Sprite Foam Roller", + "required": true, + "type": "radio", + "position": 4, + "sku": "24-WG080", + "options": [ + { + "id": 8, + "quantity": 1, + "position": 1, + "is_default": true, + "price": 0, + "price_type": "FIXED", + "can_change_quantity": true, + "label": "Sprite Foam Roller", + "product": { + "id": 22, + "name": "Sprite Foam Roller", + "sku": "24-WG088", + "type_id": "simple" + } + } + ] + } + ] + } + ] + } + } +} +``` + +{% endcollapsible %} + +## Related topics + +- [addBundleProductsToCart mutation]({{page.baseurl}}/graphql/mutations/add-bundle-products.html) diff --git a/src/guides/v2.3/graphql/product/grouped-product.md b/src/guides/v2.3/graphql/product/grouped-product.md index 1f3fe5364fc..a13c9d90969 100644 --- a/src/guides/v2.3/graphql/product/grouped-product.md +++ b/src/guides/v2.3/graphql/product/grouped-product.md @@ -29,7 +29,7 @@ Attribute | Type | Description The following query returns information about downloadable product `24-WG085_Group`, which is defined in the sample data. -``` text +```graphql { products(filter: {sku: {eq: "24-WG085_Group"}} @@ -56,3 +56,57 @@ The following query returns information about downloadable product `24-WG085_Gro } } ``` + +{% collapsible Response %} + +```json +{ + "data": { + "products": { + "items": [ + { + "id": 45, + "name": "Set of Sprite Yoga Straps", + "sku": "24-WG085_Group", + "type_id": "grouped", + "items": [ + { + "qty": 0, + "position": 0, + "product": { + "sku": "24-WG085", + "name": "Sprite Yoga Strap 6 foot", + "type_id": "simple", + "url_key": "sprite-yoga-strap-6-foot" + } + }, + { + "qty": 0, + "position": 1, + "product": { + "sku": "24-WG086", + "name": "Sprite Yoga Strap 8 foot", + "type_id": "simple", + "url_key": "sprite-yoga-strap-8-foot" + } + }, + { + "qty": 0, + "position": 2, + "product": { + "sku": "24-WG087", + "name": "Sprite Yoga Strap 10 foot", + "type_id": "simple", + "url_key": "sprite-yoga-strap-10-foot" + } + } + ] + } + ] + } + } +} +``` + +{% endcollapsible %} + diff --git a/src/guides/v2.3/graphql/tutorials/checkout/checkout-shipping-address.md b/src/guides/v2.3/graphql/tutorials/checkout/checkout-shipping-address.md index 9557e15179f..4b2325be43e 100644 --- a/src/guides/v2.3/graphql/tutorials/checkout/checkout-shipping-address.md +++ b/src/guides/v2.3/graphql/tutorials/checkout/checkout-shipping-address.md @@ -61,7 +61,10 @@ mutation { company street city - region + region { + code + label + } postcode telephone country { diff --git a/src/guides/v2.3/install-gde/composer.md b/src/guides/v2.3/install-gde/composer.md index acfa8284226..03f1f041750 100644 --- a/src/guides/v2.3/install-gde/composer.md +++ b/src/guides/v2.3/install-gde/composer.md @@ -36,13 +36,13 @@ To get the Magento metapackage: **{{site.data.var.ce}}** ```bash - composer create-project --repository=https://repo.magento.com/ magento/project-community-edition + composer create-project --repository-url=https://repo.magento.com/ magento/project-community-edition ``` **{{site.data.var.ee}}** ```bash - composer create-project --repository=https://repo.magento.com/ magento/project-enterprise-edition + composer create-project --repository-url=https://repo.magento.com/ magento/project-enterprise-edition ``` When prompted, enter your Magento authentication keys. Public and private keys are created and configured in your [Magento Marketplace][]. diff --git a/src/guides/v2.3/inventory/release-notes.md b/src/guides/v2.3/inventory/release-notes.md index 55385721c54..c7d87617119 100644 --- a/src/guides/v2.3/inventory/release-notes.md +++ b/src/guides/v2.3/inventory/release-notes.md @@ -20,6 +20,16 @@ The release notes include: - {:.fix}Fixes and improvements - {:.bug}Known issues +### v1.1.4 + +{{site.data.var.im}} 1.1.4 (module version: `inventory-composer-metapackage = 1.1.4`) is supported with version 2.3.4 and compatible with version 2.3.3, 2.3.2, 2.3.1, and 2.3.0 of {{site.data.var.ce}}, {{site.data.var.ee}}, and {{site.data.var.ece}}. + +- {:.fix}**Increased performance.** Introduced bunching logic for Inventory Reservations CLI command to reduce memory usage and avoid cases when the process is stuck without any response. + +- {:.new}**Increased test coverage.** Introduced many new Functional tests. Almost all manual Inventory scenarios are covered with automated tests. + +- {:.bug} Numerous bug fixes targeted to resolve issues with credit memos, grouped products, source and stock mass actions. + ### v1.1.3 {{site.data.var.im}} 1.1.3 (module version: `inventory-composer-metapackage = 1.1.3`) is supported with version 2.3.3 and compatible with version 2.3.2, 2.3.1, and 2.3.0 of {{site.data.var.ce}}, {{site.data.var.ee}}, and {{site.data.var.ece}}. diff --git a/src/guides/v2.3/javascript-dev-guide/widgets/widget_modal.md b/src/guides/v2.3/javascript-dev-guide/widgets/widget_modal.md index cb688787394..aa7e42214d8 100644 --- a/src/guides/v2.3/javascript-dev-guide/widgets/widget_modal.md +++ b/src/guides/v2.3/javascript-dev-guide/widgets/widget_modal.md @@ -358,7 +358,7 @@ The following example shows how to initialize the modal widget and pass options 'trigger': '[data-trigger=trigger]', 'responsive': true, 'buttons': [{ - text: $.mage.__('Submit'), + text: jQuery.mage.__('Submit'), class: 'action' }] }}"> diff --git a/src/guides/v2.3/release-notes/release-notes-2-3-4-open-source.md b/src/guides/v2.3/release-notes/release-notes-2-3-4-open-source.md index 5b3f9a51ace..f7c16d35720 100644 --- a/src/guides/v2.3/release-notes/release-notes-2-3-4-open-source.md +++ b/src/guides/v2.3/release-notes/release-notes-2-3-4-open-source.md @@ -81,7 +81,7 @@ Inventory Management enhancements for this release include: * Resolved multiple quality issues, including those related to credit memos, grouped products, source and stock mass actions. -See [Inventory Management release notes](https://devdocs.magento.com/guides/v2.3/inventory/release-notes.html) for a more detailed discussion of recent GraphQL bug fixes. +See [Inventory Management release notes](https://devdocs.magento.com/guides/v2.3/inventory/release-notes.html) for a more detailed discussion of recent Inventory bug fixes. ### GraphQL diff --git a/src/recommendations/configure.md b/src/recommendations/configure.md index 0043907ec42..9bc055852d9 100644 --- a/src/recommendations/configure.md +++ b/src/recommendations/configure.md @@ -14,7 +14,7 @@ The Catalog SaaS Export module is a requirement to successfully use the [Product ### Provide API key {#apikeys} -1. Log in to your Magento account at `https://account.magento.com`. +1. Log in to your Magento account at [https://account.magento.com](https://account.magento.com/). 1. Under the **Magento** tab, select **API Portal** on the sidebar.