diff --git a/projects/packages/stats-admin/changelog/add-odyssey-site-plan-products b/projects/packages/stats-admin/changelog/add-odyssey-site-plan-products new file mode 100644 index 0000000000000..1f446d1a430e2 --- /dev/null +++ b/projects/packages/stats-admin/changelog/add-odyssey-site-plan-products @@ -0,0 +1,4 @@ +Significance: minor +Type: added + +Stats Admin: add plan and product for site diff --git a/projects/packages/stats-admin/composer.json b/projects/packages/stats-admin/composer.json index e0c4e659a92df..d329e9b3c14ab 100644 --- a/projects/packages/stats-admin/composer.json +++ b/projects/packages/stats-admin/composer.json @@ -51,7 +51,7 @@ "autotagger": true, "mirror-repo": "Automattic/jetpack-stats-admin", "branch-alias": { - "dev-trunk": "0.11.x-dev" + "dev-trunk": "0.12.x-dev" }, "textdomain": "jetpack-stats-admin", "version-constants": { diff --git a/projects/packages/stats-admin/package.json b/projects/packages/stats-admin/package.json index 73ac6d77a67c4..ddfdc1b45d016 100644 --- a/projects/packages/stats-admin/package.json +++ b/projects/packages/stats-admin/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-stats-admin", - "version": "0.11.0", + "version": "0.12.0-alpha", "description": "Stats Dashboard", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/stats-admin/#readme", "bugs": { diff --git a/projects/packages/stats-admin/src/class-main.php b/projects/packages/stats-admin/src/class-main.php index 91924ea2deb51..61332623ea80b 100644 --- a/projects/packages/stats-admin/src/class-main.php +++ b/projects/packages/stats-admin/src/class-main.php @@ -22,7 +22,7 @@ class Main { /** * Stats version. */ - const VERSION = '0.11.0'; + const VERSION = '0.12.0-alpha'; /** * Singleton Main instance. diff --git a/projects/packages/stats-admin/src/class-odyssey-config-data.php b/projects/packages/stats-admin/src/class-odyssey-config-data.php index f3f4ab23eec88..7e99cb7bf2314 100644 --- a/projects/packages/stats-admin/src/class-odyssey-config-data.php +++ b/projects/packages/stats-admin/src/class-odyssey-config-data.php @@ -37,9 +37,8 @@ public function get_js_config_data( $config_variable_name = 'configData', $confi public function get_data() { global $wp_version; - $blog_id = Jetpack_Options::get_option( 'id' ); - $empty_object = json_decode( '{}' ); - $host = new Host(); + $blog_id = Jetpack_Options::get_option( 'id' ); + $host = new Host(); return array( 'admin_page_base' => $this->get_admin_path(), @@ -81,8 +80,8 @@ public function get_data() { 'jetpack' => true, 'visible' => true, 'capabilities' => $this->get_current_user_capabilities(), - 'products' => array(), - 'plan' => $empty_object, // we need this empty object, otherwise the front end would crash on insight page. + 'products' => Jetpack_Plan::get_products(), + 'plan' => $this->get_plan(), 'options' => array( 'wordads' => ( new Modules() )->is_active( 'wordads' ), 'admin_url' => admin_url(), @@ -178,6 +177,18 @@ protected function get_plan_features() { return $plan['features']; } + /** + * Get the current plan. + * + * @return array + */ + protected function get_plan() { + $plan = Jetpack_Plan::get(); + unset( $plan['features'] ); + unset( $plan['supports'] ); + return $plan; + } + /** * Get the capabilities of the current user. * diff --git a/projects/plugins/jetpack/changelog/add-odyssey-site-plan-products b/projects/plugins/jetpack/changelog/add-odyssey-site-plan-products new file mode 100644 index 0000000000000..a1c1831fa1ef7 --- /dev/null +++ b/projects/plugins/jetpack/changelog/add-odyssey-site-plan-products @@ -0,0 +1,5 @@ +Significance: patch +Type: other +Comment: Updated composer.lock. + + diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock index 71887d6770f4a..c41871eaada4c 100644 --- a/projects/plugins/jetpack/composer.lock +++ b/projects/plugins/jetpack/composer.lock @@ -2392,7 +2392,7 @@ "dist": { "type": "path", "url": "../../packages/stats-admin", - "reference": "857b8f2a389c1daa46ad3e98755b1aea8778bcf7" + "reference": "e0895310c76cf3314c87e55650bc0591da4c1f58" }, "require": { "automattic/jetpack-connection": "@dev", @@ -2415,7 +2415,7 @@ "autotagger": true, "mirror-repo": "Automattic/jetpack-stats-admin", "branch-alias": { - "dev-trunk": "0.11.x-dev" + "dev-trunk": "0.12.x-dev" }, "textdomain": "jetpack-stats-admin", "version-constants": {