Merge branch '2.4.2-develop' into new-topic/graphql/issue-7987-company-team-mutations

Author: andrewbess

.github/workflows/linter.yml

@@ -54,4 +54,4 @@ jobs:
           VALIDATE_ALL_CODEBASE: false
           DEFAULT_BRANCH: master
           VALIDATE_HTML: false
-          VALIDATE_MD: false
+          VALIDATE_MARKDOWN: false

Rakefile

@@ -69,15 +69,31 @@ task check: %w[check:image_optim check:mdl]
 
 desc 'Generate data for a news digest. Default timeframe is a week since today. For other period, use "since" argument: since="jul 4"'
 task :whatsnew do
-  date = ENV['since']
-  print 'Generating data for the weekly digest: $ '.magenta
-  if date.nil? || date.empty?
-    sh 'bin/whatsup_github'
-  elsif date.is_a? String
-    sh 'bin/whatsup_github', 'since', ENV['since'].to_s
+  since = ENV['since']
+  current_file = 'src/_data/whats-new.yml'
+  generated_file = 'tmp/whats-new.yml'
+  current_data = YAML.load_file current_file
+  last_update = current_data['updated']
+
+  print 'Generating data for the What\'s New digest: $ '.magenta
+
+  # Generate tmp/whats-new.yml
+  if since.nil? || since.empty?
+    sh 'bin/whatsup_github', 'since', last_update
+  elsif since.is_a? String
+    sh 'bin/whatsup_github', 'since', since
   else
-    puts 'The "since" argument must be a string. Example: "jul 4"'
+    abort 'The "since" argument must be a string. Example: "jul 4"'
   end
+
+  # Merge generated tmp/whats-new.yml with existing src/_data/whats-new.yml
+  generated_data = YAML.load_file generated_file
+  current_data['updated'] = generated_data['updated']
+  current_data['entries'].prepend(generated_data['entries']).flatten!
+  current_data['entries'].uniq! { |entry| entry['link'] }
+
+  puts "Writing updates to #{current_file}"
+  File.write current_file, current_data.to_yaml
 end
 
 desc 'Generate index for Algolia'

src/_data/main-nav.yml

@@ -179,8 +179,6 @@
     - label: Web API Functional Testing
       url: /get-started/web-api-functional-testing.html
 
--
-
 - label: Functional Areas
   children:
 

src/_data/mde.yml

@@ -12,6 +12,18 @@ extensions:
   -
     name: Amazon Sales Channel
     versions:
+      -
+        name: 4.3.0
+        support:
+          2.3.0: compatible
+          2.3.1: compatible
+          2.3.2: compatible
+          2.3.3: compatible
+          2.3.4: compatible
+          2.3.5-p1: compatible
+          2.3.6: compatible
+          2.4.0: compatible
+          2.4.1: supported
       -
         name: 4.2.0
         support:
@@ -22,9 +34,8 @@ extensions:
           2.3.4: compatible
           2.3.5-p1: compatible
           2.3.6: compatible
-          2.4.0: supported
+          2.4.0: compatible
           2.4.1: supported
-
       -
         name: 4.1.0
         support:
@@ -48,7 +59,7 @@ extensions:
           2.3.5-p1: not supported
           2.3.6: not supported
           2.4.0: not supported
-          2.4.1: compatible
+          2.4.1: not supported
       -
         name: 3.0.1
         support:
@@ -344,9 +355,8 @@ extensions:
           2.3.4: compatible
           2.3.5-p1: compatible
           2.3.6: compatible
-          2.4.0: compatible
+          2.4.0: not supported
           2.4.1: compatible
-      
       -
         name: 3.0.2
         support:
@@ -357,7 +367,7 @@ extensions:
           2.3.4: compatible
           2.3.5-p1: compatible
           2.3.6: compatible
-          2.4.0: compatible
+          2.4.0: not supported
           2.4.1: compatible
       -
         name: 3.0.1
@@ -369,7 +379,7 @@ extensions:
           2.3.4: compatible
           2.3.5-p1: compatible
           2.3.6: compatible
-          2.4.0: compatible
+          2.4.0: not supported
           2.4.1: compatible
       -
         name: 3.0.0

src/_data/toc/graphql.yml

@@ -69,6 +69,21 @@ pages:
         - label: categoryList query
           url: /graphql/queries/category-list.html
 
+        - label: checkCompanyAdminEmail query
+          url: /graphql/queries/check-company-admin-email.html
+          edition: b2b-only
+          exclude_versions: ["2.3"]
+
+        - label: checkCompanyEmail query
+          url: /graphql/queries/check-company-email.html
+          edition: b2b-only
+          exclude_versions: ["2.3"]
+
+        - label: checkCompanyUserEmail query
+          url: /graphql/queries/check-company-admin-email.html
+          edition: b2b-only
+          exclude_versions: ["2.3"]
+
         - label: checkoutAgreements query
           url: /graphql/queries/checkout-agreements.html
 
@@ -77,6 +92,11 @@ pages:
 
         - label: cmsPage query
           url: /graphql/queries/cms-page.html
+
+        - label: company query
+          url: /graphql/queries/company.html
+          edition: b2b-only
+          exclude_versions: ["2.3"]
 
         - label: countries query
           url: /graphql/queries/directory-countries.html
@@ -210,6 +230,11 @@ pages:
         - label: createBraintreeClientToken mutation
           url: /graphql/mutations/create-braintree-client-token.html
 
+        - label: createCompany mutation
+          url: /graphql/mutations/create-company.html
+          edition: b2b-only
+          exclude_versions: ["2.3"]
+
         - label: createCustomer mutation
           url: /graphql/mutations/create-customer.html
 
@@ -344,6 +369,11 @@ pages:
         - label: updateCartItems mutation
           url: /graphql/mutations/update-cart-items.html
 
+        - label: updateCompany mutation
+          url: /graphql/mutations/update-company.html
+          edition: b2b-only
+          exclude_versions: ["2.3"]
+
         - label: updateCustomer mutation
           url: /graphql/mutations/update-customer.html
 

src/_data/toc/software-update-guide.yml

@@ -101,9 +101,21 @@ pages:
       url: /comp-mgr/patching.html
       children:
 
-       - label: MQP release notes
-         url: /quality-patches/release-notes.html
-         versionless: true
+       - label: Magento Quality Patches
+         url: /comp-mgr/patching/mqp.html
+         children:
+
+           - label: MQP release notes
+             url: /quality-patches/release-notes.html
+             versionless: true
+
+       - label: Command Line
+         url: /comp-mgr/patching/command-line.html
+         children:
+
+       - label: Composer
+         url: /comp-mgr/patching/composer.html
+         children:
 
     - label: Update the updater application
       url: /comp-mgr/updater/update-updater.html

src/_data/toc/testing.yml

@@ -62,4 +62,16 @@ pages:
           children:
 
             - label: '@dataProvider'
-              url: /test/unit/annotations/data-provider.html
+              url: /test/unit/annotations/data-provider.html
+
+    - label: Static Testing
+      children:
+
+        - label: Running Static Tests
+          url: /test/static/static_test_execution.html
+
+    - label: Semantic Version Checker
+      children:
+
+        - label: Running SVC tool
+          url: /test/svc/semver_test_execution.html

src/_data/var.yml

@@ -28,7 +28,7 @@ ct-repo: magento/ece-tools
 ct-release: 2002.1.2
 mcp-prod: Magento Cloud Patches
 mcp-package: magento/magento-cloud-patches
-mcp-release: 1.0.6
+mcp-release: 1.0.7
 mcd-package: magento/magento-cloud-docker
 mcd-prod: Magento Cloud Docker
 mcd-release: 1.1.2