release: v3.14.1

- Improve error handling on connection
- Fixes sub-API keys displaying the site selector in Cloud Library settings

Author: abaicus

.distignore

@@ -24,8 +24,6 @@ composer.lock
 npm-debug.log
 bin
 key.enc
-cypress
-cypress.json
 node_modules
 logs
 grunt
@@ -36,9 +34,10 @@ assets/src
 .wporg
 .nvmrc
 .github
-cypress.config.js
 .eslintrc
 postcss.config.js
 tailwind.config.js
 phpstan.neon
 development.php
+playwright.config.ts
+test-results

.github/workflows/test-e2e.yml

@@ -6,34 +6,23 @@ on:
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.ref }}
   cancel-in-progress: true
-env:
-  CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
 
 jobs:
   e2e:
     if: ( github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name ) && ( github.actor != 'dependabot[bot]' )
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Setup Node
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v4
         with:
           node-version: 16
-      - name: Get Composer Cache Directory
-        id: composer-cache
-        run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - name: Configure Composer cache
-        uses: actions/cache@v1
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-
+          cache: 'npm'
       - name: Install dependencies
         run: |
           npm ci
           composer install --no-dev --prefer-dist --no-progress --no-suggest
+          npx playwright install
       - name: Make build
         run: |
           npm run build
@@ -48,23 +37,11 @@ jobs:
           SSH_HOST: ${{ secrets.SSH_HOST }}
           SSH_PATH: ${{ secrets.SSH_PATH }}
         run: ./bin/run-e2e-tests.sh
-      - name: E2E tests chrome
-        uses: cypress-io/github-action@v6
-        with:
-          env: host=testing.optimole.com
-          config-file: cypress.config.js
-          browser: chrome
-  e2eFirefox:
-    needs: e2e
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: 16
-      - uses: cypress-io/github-action@v6
-        with:
-          env: host=testing.optimole.com
-          config-file: cypress.config.js
-          browser: firefox
+      - name: Run E2E tests
+        id: run_tests
+        run: |
+          npm run e2e:run
+        continue-on-error: false
+      - name: Check test results
+        if: steps.run_tests.outcome != 'success'
+        run: exit 1

.gitignore

@@ -4,11 +4,10 @@ node_modules
 logs
 dist
 artifact
-cypress/videos
-cypress/fixtures
 vendor
 code_quality
 build
 .DS_Store
 cc-test-reporter
-assets/build
+assets/build
+test-results

assets/src/dashboard/parts/connected/settings/CloudLibrary.js

@@ -17,16 +17,18 @@ export default function CloudLibrary( props ) {
 	} = props;
 
 	const storeData = useSelect( select => {
-		const { isLoading } = select( 'optimole' );
+		const { isLoading, isSubApiKey } = select( 'optimole' );
 		return {
-			isLoading: isLoading()
+			isLoading: isLoading(),
+			isSubApiKey: isSubApiKey()
 		};
 	}, []);
 
-	const { isLoading } = storeData;
+	const { isLoading, isSubApiKey } = storeData;
 
 
 	const isCloudLibraryEnabled = 'disabled' !== settings[ 'cloud_images' ];
+	const showSiteSelector = ! isSubApiKey && isCloudLibraryEnabled;
 	const whitelistedDomains = user_data.whitelist || [];
 
 
@@ -81,7 +83,7 @@ export default function CloudLibrary( props ) {
 
 			<hr className="my-8 border-grayish-blue"/>
 
-			{isCloudLibraryEnabled && (
+			{showSiteSelector && (
 				<BaseControl
 					label={options_strings.cloud_site_title}
 					help={options_strings.cloud_site_desc}

assets/src/dashboard/store/selectors.js

@@ -93,6 +93,9 @@ const selectors = {
 		}
 
 		return state.logs;
+	},
+	isSubApiKey( state ) {
+		return state.apiKey && state.apiKey.startsWith( 'optml-s' );
 	}
 };