Merge pull request #334 from codepress/release/4.4.1

DGStefan · web-flow · commit e61a07acbfd9 · 2021-09-28T12:40:05.000+02:00
Release/4.4.1
diff --git a/assets/css/admin-page-columns.css b/assets/css/admin-page-columns.css
diff --git a/assets/js/admin-page-addons.js b/assets/js/admin-page-addons.js
diff --git a/classes/Admin/Asset/Addons.php b/classes/Admin/Asset/Addons.php
@@ -14,6 +14,10 @@ public function __construct( $handle, Location $location = null ) {
 	public function register() {
 		parent::register();
 
+		wp_localize_script( $this->handle, 'ACi18n', [
+			'plugin_installed' => __( 'The Add-on %s is activated.' ),
+		] );
+
 		$this->add_inline_variable( 'AC', [
 			'_ajax_nonce'      => wp_create_nonce( 'ac-ajax' ),
 			'is_network_admin' => is_network_admin(),
diff --git a/classes/Plugin/Updater/Site.php b/classes/Plugin/Updater/Site.php
@@ -21,6 +21,8 @@ class Site extends Updater {
 	public function __construct( $version_key, Version $version ) {
 		$this->version = $version;
 		$this->storage = new VersionStorage( (string) $version_key );
+
+		// TODO add VersionStorage for previous storage
 	}
 
 	/**
diff --git a/classes/Plugin/VersionStorage.php b/classes/Plugin/VersionStorage.php
@@ -2,12 +2,13 @@
 
 namespace AC\Plugin;
 
+use AC\Storage\KeyValuePair;
 use AC\Storage\OptionFactory;
 
 class VersionStorage {
 
 	/**
-	 * @var string
+	 * @var KeyValuePair
 	 */
 	private $storage;
 
diff --git a/codepress-admin-columns.php b/codepress-admin-columns.php
@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: Admin Columns
-Version: 4.4
+Version: 4.4.1
 Description: Customize columns on the administration screens for post(types), pages, media, comments, links and users with an easy to use drag-and-drop interface.
 Author: AdminColumns.com
 Author URI: https://www.admincolumns.com
@@ -36,7 +36,7 @@
 }
 
 define( 'AC_FILE', __FILE__ );
-define( 'AC_VERSION', '4.4' );
+define( 'AC_VERSION', '4.4.1' );
 
 require_once __DIR__ . '/classes/Dependencies.php';
 
diff --git a/languages/codepress-admin-columns-pl_PL.mo b/languages/codepress-admin-columns-pl_PL.mo
diff --git a/languages/codepress-admin-columns-pl_PL.po b/languages/codepress-admin-columns-pl_PL.po
@@ -2,7 +2,7 @@
 # This file is distributed under the same license as the Plugins - Admin Columns - Stable (latest release) package.
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2021-09-06 11:10:31+0000\n"
+"PO-Revision-Date: 2021-09-27 05:56:25+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1392,7 +1392,7 @@ msgstr "Zmodyfikuj ustawienia Edytora kolumn."
 #: classes/Admin/Section/General.php:36
 #: classes/Settings/Column/DateTimeFormat.php:45
 msgid "General Settings"
-msgstr "Ustawienia ogólne"
+msgstr "Ustawienia główne"
 
 #: templates/admin/help-tab/custom-fields.php:15
 msgid "Value: Can be either a string or array. This will display a count of the number of times the meta key is used by the item."
@@ -1574,7 +1574,7 @@ msgstr "Wybierz typ kolumny."
 
 #: templates/admin/edit-column.php:57 templates/admin/edit-column.php:92
 msgid "Clone"
-msgstr "Klonuj"
+msgstr "Powiel"
 
 #: classes/Settings/Column/Password.php:28
 msgid "Display format"
@@ -1721,7 +1721,7 @@ msgstr ""
 
 #: classes/Column/Post/PostParent.php:14
 msgid "Parent"
-msgstr "Rodzic"
+msgstr "Element nadrzędny"
 
 #: classes/Column/Post/PageTemplate.php:14
 msgid "Page Template"
@@ -1867,7 +1867,7 @@ msgstr ""
 
 #: classes/Column/Media/FileSize.php:14
 msgid "File Size"
-msgstr "Rozmiar pliku"
+msgstr "Wielkość pliku"
 
 #: classes/Column/Media/FileName.php:14
 msgid "Filename"
@@ -1976,7 +1976,7 @@ msgstr "Kolor"
 #: classes/Settings/Column/Separator.php:25
 #: templates/admin/help-tab/custom-fields.php:6
 msgid "Default"
-msgstr "Domyślny"
+msgstr "Domyślne"
 
 #: classes/Column/CustomField.php:19
 msgid "Custom Field"
@@ -2053,7 +2053,7 @@ msgstr "E-mail autora"
 
 #: classes/Column/Comment/AuthorAvatar.php:14
 msgid "Avatar"
-msgstr "Avatar"
+msgstr "Awatar"
 
 #: classes/Column/Comment/Approved.php:14 classes/Column/Comment/Status.php:34
 #: classes/Settings/Column/CommentCount.php:56
diff --git a/readme.txt b/readme.txt
@@ -5,7 +5,7 @@ Tags: plugins, wordpress, admin, column, columns, custom columns, custom fields,
 Requires at least: 4.7.1
 Tested up to: 5.8.1
 Requires PHP: 5.6.20
-Stable tag: 4.4
+Stable tag: 4.4.1
 
 Customise columns on the administration screens for post(types), pages, media, comments, links and users with an easy to use drag-and-drop interface.
 
@@ -209,6 +209,12 @@ You can find a list of the available actions and filters (and examples on how to
 
 == Changelog ==
 
+= 4.4.1 =
+Release Date: September 28th, 2021
+
+* [Improved] Small optimizations for the Add-on page
+* [Improved] Give an idea of the available pro settings
+
 = 4.4 =
 Release Date: September 21st, 2021
 
diff --git a/src/js/admin-page-addons.ts b/src/js/admin-page-addons.ts
@@ -1,11 +1,9 @@
 import {AddonDownload} from "./modules/addon-download";
-import {AddonActivator} from "./modules/addon-activator";
 
 document.addEventListener("DOMContentLoaded", function () {
 
     document.querySelectorAll<HTMLElement>('.ac-addon').forEach(element => {
         new AddonDownload(element, element.dataset.slug);
-        new AddonActivator(element, element.dataset.slug);
     });
 
 });
diff --git a/src/js/modules/addon-activator.ts b/src/js/modules/addon-activator.ts
diff --git a/src/js/modules/addon-download.ts b/src/js/modules/addon-download.ts
@@ -1,10 +1,11 @@
 import WPNotice from "./notice";
 // @ts-ignore
 import $ from 'jquery';
-import {LocalizedAcAddonSettings} from "../types/admin-columns";
+import {LocalizedAcAddonSettings, LocalizedAcAddonsi18n} from "../types/admin-columns";
 import AddonDownloader from "./addon-downloader";
 
 declare let AC: LocalizedAcAddonSettings
+declare let ACi18n: LocalizedAcAddonsi18n
 
 export class AddonDownload {
 
@@ -22,12 +23,12 @@ export class AddonDownload {
         this.initEvents();
     }
 
-    getDownloadButton(): HTMLAnchorElement {
-        return this.element.querySelector<HTMLAnchorElement>('[data-install]');
+    getButton(): HTMLAnchorElement {
+        return this.element.querySelector<HTMLAnchorElement>('[data-install],[data-activate]');
     }
 
     setLoadingState(): void {
-        const button = this.getDownloadButton();
+        const button = this.getButton();
 
         if (button) {
             button.classList.add('button-disabled');
@@ -39,7 +40,7 @@ export class AddonDownload {
 
     setLoadingFinished(): void {
         this.loadingState = false;
-        const button = this.getDownloadButton();
+        const button = this.getButton();
 
         this.element.querySelectorAll('.spinner').forEach(el => el.remove());
 
@@ -49,7 +50,7 @@ export class AddonDownload {
     }
 
     initEvents() {
-        const button = this.getDownloadButton();
+        const button = this.getButton();
 
         if (button) {
             button.addEventListener('click', e => {
@@ -73,7 +74,9 @@ export class AddonDownload {
         const title = this.element.querySelector('h3');
         const notice = new WPNotice();
 
-        notice.setMessage(`<p>The Add-on <strong>${title.innerHTML}</strong> is installed.</p>`)
+        let message = ACi18n.plugin_installed.replace('%s', `<strong>${title.innerHTML}</strong>`);
+
+        notice.setMessage(`<p>${message}</p>`)
             .makeDismissable()
             .addClass('updated');
 
@@ -110,13 +113,18 @@ export class AddonDownload {
 
     download() {
         this.downloader.download().then((response) => {
-            if (response.data.success) {
-                this.success(response.data.data.status);
-            } else {
-                let fallback = response.data.data as unknown;
-                this.failure(fallback as string);
+
+            switch (response.data.success) {
+                case true:
+                    this.success(response.data.data.status);
+
+                    break;
+                case false:
+                    this.failure(response.data.data);
+
+                    break;
             }
+
         });
     }
-
 }
diff --git a/src/js/modules/addon-downloader.ts b/src/js/modules/addon-downloader.ts
@@ -3,12 +3,19 @@ import {mapDataToFormData} from "../helpers/global";
 
 declare const ajaxurl: string;
 
-type DownloadResponse = {
+type DownloadResponse = DownloadSuccessResponse | DownloadFailureResponse
+
+type DownloadSuccessResponse = {
     data: {
         activated: boolean,
         status: string
     },
-    success: boolean
+    success: true
+}
+
+type DownloadFailureResponse = {
+    success: false,
+    data: string
 }
 
 export default class AddonDownloader {
diff --git a/src/js/types/admin-columns.ts b/src/js/types/admin-columns.ts
@@ -9,7 +9,7 @@ export type LocalizedAcColumnSettings = {
     original_columns: Array<string>
 }
 
-export type LocalizedAcAddoni18n = { [key:string] : string }
+export type LocalizedAcAddonsi18n = { [key:string] : string }
 
 export type LocalizedAcAddonSettings = {
     _ajax_nonce: string,
diff --git a/src/scss/_settings.scss b/src/scss/_settings.scss
@@ -198,7 +198,7 @@
 		.ac-setbox {
 
 			&__row__fields {
-				filter: blur(5px);
+				filter: blur(1.5px);
 			}
 
 		}
diff --git a/templates/admin/page/settings-section-pro-cta.php b/templates/admin/page/settings-section-pro-cta.php
@@ -48,8 +48,8 @@
 			'tooltip' => sprintf(
 				'%s %s %s',
 				__( 'Need certain columns for certain tasks?', 'codepress-admin-columns' ),
-				__( 'Pick the columns you need to do the task and save them for later use.', 'codepress-admin-columns' ),
-				__( 'Switching between views is easy can done from the overview.', 'codepress-admin-columns' )
+				__( 'Create multiple columns presets.', 'codepress-admin-columns' ),
+				__( 'Switching between sets is easy and can be done from any list table.', 'codepress-admin-columns' )
 			),
 		] ) )->set_template( 'admin/page/component/pro-feature-list-item' )->render();
 		?>

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@ class Site extends Updater {`
`21`	`21`	`public function __construct( $version_key, Version $version ) {`
`22`	`22`	`$this->version = $version;`
`23`	`23`	`$this->storage = new VersionStorage( (string) $version_key );`
	`24`	`+`
	`25`	`+ // TODO add VersionStorage for previous storage`
`24`	`26`	`}`
`25`	`27`
`26`	`28`	`/**`