release: fixes

- Updated dependencies
- Fixed early textdomain loading issue

Author: selul

.github/workflows/create-build-zip.yml

@@ -25,7 +25,7 @@ jobs:
         run: |
           echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Configure Composer cache
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

.github/workflows/deploy-s3-store.yml

@@ -12,8 +12,8 @@ jobs:
       - uses: actions/checkout@master
       - name: Setup node 14
         uses: actions/setup-node@v1
-        with:
-          node-version: 14.x 
+        with: 
+          node-version: 14.x
       - name: Build & create dist/artifact
         run: |
           yarn install --frozen-lockfile

.github/workflows/test-js.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -34,4 +34,4 @@ jobs:
       - name: Build source
         run: yarn run build
       - name: Run lint checks
-        run: yarn run lint
+        run: yarn run lint

.github/workflows/test-php.yml

@@ -3,17 +3,17 @@ name: Test PHP
 on:
   push:
     branches-ignore:
-      - 'master'
+      - "master"
 
 jobs:
   phplint:
     name: Phplint
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Setup PHP version
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.2'
+          php-version: "7.2"
           extensions: simplexml
       - name: Checkout source code
         uses: actions/checkout@v2
@@ -22,7 +22,7 @@ jobs:
         run: |
           echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Setup Composer cache
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -34,7 +34,7 @@ jobs:
         run: composer run lint
   phpunit:
     name: Phpunit
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     services:
       mysql:
         image: mysql:5.7
@@ -47,7 +47,7 @@ jobs:
       - name: Setup PHP version
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.2'
+          php-version: "7.2"
           extensions: simplexml, mysql
           tools: phpunit-polyfills
       - name: Checkout source code
@@ -60,7 +60,7 @@ jobs:
         run: |
           echo "::set-output name=dir::$(composer config cache-files-dir)"
       - name: Setup Composer cache
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -69,4 +69,4 @@ jobs:
       - name: Install composer
         run: composer install --prefer-dist --no-progress --no-suggest
       - name: Run phpunit
-        run: composer run-script phpunit
+        run: composer run-script phpunit

composer.lock

@@ -71,6 +71,7 @@ function define_constants() {
 	define( 'JAXON_DEBUG', defined( 'WP_DEBUG' ) && WP_DEBUG === true );
 	define( 'JAXON_DIR', trailingslashit( get_template_directory() ) );
 	define( 'JAXON_URL', trailingslashit( get_template_directory_uri() ) );
+	define( 'JAXON_PRODUCT_SLUG', basename( JAXON_DIR ) );
 }
 
 /**

functions.php

@@ -33,7 +33,7 @@ public function setup_admin_hooks() {
 		add_action( 'admin_notices', array( $this, 'render_welcome_notice' ), 0 );
 		add_action( 'wp_ajax_jaxon_dismiss_welcome_notice', array( $this, 'remove_welcome_notice' ) );
 		add_action( 'wp_ajax_jaxon_set_otter_ref', array( $this, 'set_otter_ref' ) );
-		add_action( 'admin_print_scripts', array( $this, 'add_nps_form' ) );
+		add_action( 'admin_enqueue_scripts', array( $this, 'register_internal_page' ) );
 
 		add_action( 'enqueue_block_editor_assets', array( $this, 'add_fse_design_pack_notice' ) );
 		add_action( 'wp_ajax_jaxon_dismiss_design_pack_notice', array( $this, 'remove_design_pack_notice' ) );
@@ -307,50 +307,35 @@ private function get_otter_status(): string {
 	}
 
 	/**
-	 * Add NPS form.
+	 * Register internal pages.
 	 *
 	 * @return void
 	 */
-	public function add_nps_form() {
+	public function register_internal_page() {
 		$screen = get_current_screen();
-
-		if ( current_user_can( 'manage_options' ) && ( 'dashboard' === $screen->id || 'themes' === $screen->id ) ) {
-			$website_url = preg_replace( '/[^a-zA-Z0-9]+/', '', get_site_url() );
-
-			$config = array(
-				'environmentId' => 'clr7jjqypey8v8up0bg5lk2nw',
-				'apiHost'       => 'https://app.formbricks.com',
-				'userId'        => 'jaxon_' . $website_url,
-				'attributes'    => array(
-					'days_since_install' => self::convert_to_category( round( ( time() - get_option( 'jaxon_install', time() ) ) / DAY_IN_SECONDS ) ),
-				),
-			);
-
-			echo '<script type="text/javascript">!function(){var t=document.createElement("script");t.type="text/javascript",t.async=!0,t.src="https://unpkg.com/@formbricks/js@^1.6.5/dist/index.umd.js";var e=document.getElementsByTagName("script")[0];e.parentNode.insertBefore(t,e),setTimeout(function(){window.formbricks.init(' . wp_json_encode( $config ) . ')},500)}();</script>';
+		
+		if ( ! current_user_can( 'manage_options' ) || ( 'dashboard' !== $screen->id && 'themes' !== $screen->id ) ) {
+			return;
 		}
-	}
+		
+		add_filter(
+			'themeisle-sdk/survey/' . JAXON_PRODUCT_SLUG,
+			function( $data, $page_slug ) {
+				$install_days_number = intval( ( time() - get_option( 'jaxon_install', time() ) ) / DAY_IN_SECONDS );
+
+				$data = array(
+					'environmentId' => 'clr7jjqypey8v8up0bg5lk2nw',
+					'attributes'    => array(
+						'install_days_number' => $install_days_number,
+						'version'             => JAXON_VERSION,
+					),
+				);
 
-	/**
-	 * Convert a number to a category.
-	 *
-	 * @param int $number Number to convert.
-	 * @param int $scale  Scale.
-	 *
-	 * @return int
-	 */
-	public static function convert_to_category( $number, $scale = 1 ) {
-		$normalized_number = intval( round( $number / $scale ) );
-
-		if ( 0 === $normalized_number || 1 === $normalized_number ) {
-			return 0;
-		} elseif ( $normalized_number > 1 && $normalized_number < 8 ) {
-			return 7;
-		} elseif ( $normalized_number >= 8 && $normalized_number < 31 ) {
-			return 30;
-		} elseif ( $normalized_number > 30 && $normalized_number < 90 ) {
-			return 90;
-		} elseif ( $normalized_number > 90 ) {
-			return 91;
-		}
+				return $data;
+			},
+			10,
+			2 
+		);
+		do_action( 'themeisle_internal_page', JAXON_PRODUCT_SLUG, $screen->id );
 	}
 }

inc/Admin.php

@@ -37,8 +37,6 @@ class Block_Patterns {
 	 * Block_Patterns constructor.
 	 */
 	public function __construct() {
-		$this->setup_properties();
-
 		add_action( 'init', array( $this, 'run' ) );
 	}
 
@@ -48,6 +46,7 @@ public function __construct() {
 	 * @return void
 	 */
 	public function run() {
+		$this->setup_properties();
 		$this->register_categories();
 		$this->register_patterns();
 	}