changelog version 1.1.7 ready for released

Author: manchumahara

README.txt

@@ -3,7 +3,7 @@ Contributors: codeboxr, manchumahara
 Tags: changelog,history,release,version,product log
 Requires at least: 5.3
 Tested up to: 6.7.1
-Stable tag: 1.1.6
+Stable tag: 1.1.7
 Requires PHP: 7.4
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -73,6 +73,11 @@ This helps to write changes log for any digital products, projects releases. Any
 
 
 == Changelog ==
+= 1.1.7 =
+* [fixed] Fixed the order issue in changelog edit screen
+* [new] Added new order by param 'id', here is release id, please note, release id and dashboard display index is not same.
+
+
 = 1.1.6 =
 * [new] New dashboard style
 * [new] Plugin check version V1.3.1 compatible

assets/css/cbxchangelog-admin.css

@@ -105,7 +105,7 @@
 
             //var rendered = Mustache.render($release_template, {increment: $counter, incrementplus: ($counter + 1)});
             var rendered = Mustache.render($release_template, {increment: ($counter - 1), incrementplus: ($counter)});
-            $('#cbxchangelog_wrapper').prepend(rendered);
+            $('#cbxchangelog_wrapper').append(rendered);
 
             $counter++;
             $this.attr('data-counter', $counter);

assets/css/cbxchangelog-listing.css

@@ -16,7 +16,7 @@
  * Plugin Name:       CBX Changelog
  * Plugin URI:        http://codeboxr.com/product/cbx-changelog-for-wordpress/
  * Description:       Easy change log manager for WordPress, use for any product post type or releases notes
- * Version:           1.1.6
+ * Version:           1.1.7
  * Author:            Codeboxr
  * Author URI:        http://codeboxr.com
  * License:           GPL-2.0+
@@ -32,7 +32,7 @@
 
 
 defined( 'CBXCHANGELOG_PLUGIN_NAME' ) or define( 'CBXCHANGELOG_PLUGIN_NAME', 'cbxchangelog' );
-defined( 'CBXCHANGELOG_PLUGIN_VERSION' ) or define( 'CBXCHANGELOG_PLUGIN_VERSION', '1.1.6' );
+defined( 'CBXCHANGELOG_PLUGIN_VERSION' ) or define( 'CBXCHANGELOG_PLUGIN_VERSION', '1.1.7' );
 defined( 'CBXCHANGELOG_ROOT_PATH' ) or define( 'CBXCHANGELOG_ROOT_PATH', plugin_dir_path( __FILE__ ) );
 defined( 'CBXCHANGELOG_ROOT_URL' ) or define( 'CBXCHANGELOG_ROOT_URL', plugin_dir_url( __FILE__ ) );
 defined( 'CBXCHANGELOG_BASE_NAME' ) or define( 'CBXCHANGELOG_BASE_NAME', plugin_basename( __FILE__ ) );

assets/js/cbxchangelog-edit.js

@@ -268,7 +268,7 @@ public function shortcode_metabox_display( $post ) {
 
 
 	/**
-	 * Save meta box for cbxchangelog
+	 * Save meta box
 	 *
 	 * @param $post_id
 	 * @param $post
@@ -321,7 +321,8 @@ public function metabox_save( $post_id, $post, $update ) {
 
 			$meta_data = CBXChangelogHelper::get_changelog_data( $post_id );
 			$used_keys = $meta_data->getUsedKeys();
-
+			//let's reset as we need to honor the index order to display
+			$meta_data->resetRows();
 
 			foreach ( $submitted_values as $value ) {
 				$valid_change_log = [];
@@ -333,11 +334,6 @@ public function metabox_save( $post_id, $post, $update ) {
 				$valid_change_log['date']    = isset( $value['date'] ) ? sanitize_text_field( wp_unslash( $value['date'] ) ) : '';
 				$valid_change_log['note']    = isset( $value['note'] ) ? sanitize_textarea_field( wp_unslash( $value['note'] ) ) : '';
 
-				//$valid_change_log['version'] = $version;
-				//$valid_change_log['url']     = $url;
-				//$valid_change_log['date']    = $date;
-				//$valid_change_log['note']    = $note;
-
 				//labels
 				if ( isset( $value['label'] ) && is_array( $value['label'] ) ) {
 					$value['label'] = array_filter( $value['label'] );
@@ -378,15 +374,23 @@ public function metabox_save( $post_id, $post, $update ) {
 				//end features
 
 				//if ( $id > 0 && in_array( $id, $used_keys ) ) {
-				if ( $id > 0 ) {
+				/*if ( $id > 0 ) {
 					//update
 					$meta_data->update( $id, $valid_change_log );
 				} else {
 					//add
 					$meta_data->insert( $valid_change_log );
 					//$used_keys = $meta_data->getUsedKeys();
+				}*/
+
+
+				if($id > 0){
+					$valid_change_log['id'] = $id;
 				}
 
+				$meta_data->insert( $valid_change_log );
+
+
 				unset( $valid_change_log );
 				//$valid_change_logs[] = $valid_change_log;
 			}//end for each
@@ -406,9 +410,17 @@ public function metabox_save( $post_id, $post, $update ) {
 			$extras['show_label']    = isset( $extras['show_label'] ) ? intval( $extras['show_label'] ) : 1;
 			$extras['show_date']     = isset( $extras['show_date'] ) ? intval( $extras['show_date'] ) : 1;
 			$extras['relative_date'] = isset( $extras['relative_date'] ) ? intval( $extras['relative_date'] ) : 0;
-			$extras['layout']        = isset( $extras['layout'] ) ? esc_attr( wp_unslash( $extras['layout'] ) ) : 'prepros';
-			$extras['order']         = isset( $extras['order'] ) ? esc_attr( wp_unslash( $extras['order'] ) ) : 'desc';
-			$extras['orderby']       = isset( $extras['orderby'] ) ? esc_attr( wp_unslash( $extras['orderby'] ) ) : 'order';
+			$extras['layout']        = isset( $extras['layout'] ) ? sanitize_text_field( wp_unslash( $extras['layout'] ) ) : 'prepros';
+			$extras['order']         = isset( $extras['order'] ) ? sanitize_text_field( wp_unslash( $extras['order'] ) ) : 'desc';
+			$extras['orderby']       = isset( $extras['orderby'] ) ? sanitize_text_field( wp_unslash( $extras['orderby'] ) ) : 'order'; //'order' == 'default'
+
+			if(!in_array($extras['orderby'], ['order', 'id', 'date'])){
+				$extras['orderby'] = 'order';
+			}
+
+			if(!in_array($extras['order'], ['desc', 'asc'])){
+				$extras['order'] = 'desc';
+			}
 
 			//now update post meta
 			update_post_meta( $post_id, '_cbxchangelog_extra', $extras );
@@ -420,7 +432,6 @@ public function metabox_save( $post_id, $post, $update ) {
 
 
 		do_action( 'cbxchangelog_meta_save', $post_id, $post, $update );
-
 	}//end metabox_save
 
 	/**
@@ -961,15 +972,16 @@ public function custom_message_after_plugin_row_proaddon( $plugin_file, $plugin_
 		}
 
 		$pro_addon_version = CBXChangelogHelper::get_any_plugin_version( 'cbxchangelogpro/cbxchangelogpro.php' );
+		$pro_latest_version  = '1.1.6';
 
 
-		if ( $pro_addon_version != '' && version_compare( $pro_addon_version, '1.1.6', '<' ) ) {
+		if ( $pro_addon_version != '' && version_compare( $pro_addon_version, $pro_latest_version, '<' ) ) {
 			// Custom message to display
 			$plugin_manual_update = 'https://codeboxr.com/manual-update-pro-addon/';
 
 			/* translators:translators: %s: plugin setting url for licence */
-			$custom_message = wp_kses( sprintf( __( '<strong>Note:</strong> CBX Changelog Pro Addon is custom plugin. This plugin can not be auto update from dashboard/plugin manager. For manual update please check <a target="_blank" href="%1$s">documentation</a>. <strong style="color: red;">It seems this plugin\'s current version is older than 1.1.6 . To get the latest pro addon features, this plugin needs to upgrade to 1.1.6 or later.</strong>', 'cbxchangelog' ),
-				esc_url( $plugin_manual_update ) ), [ 'strong' => [ 'style' => [] ], 'a' => [ 'href' => [], 'target' => [] ] ] );
+			$custom_message = wp_kses( sprintf( __( '<strong>Note:</strong> CBX Changelog Pro Addon is custom plugin. This plugin can not be auto update from dashboard/plugin manager. For manual update please check <a target="_blank" href="%1$s">documentation</a>. <strong style="color: red;">It seems this plugin\'s current version is older than %2$s . To get the latest pro addon features, this plugin needs to upgrade to %2$s or later.</strong>', 'cbxchangelog' ),
+				esc_url( $plugin_manual_update ), $pro_latest_version ), [ 'strong' => [ 'style' => [] ], 'a' => [ 'href' => [], 'target' => [] ] ] );
 
 			// Output a row with custom content
 			echo '<tr class="plugin-update-tr">
@@ -1165,6 +1177,11 @@ public function init_changelog_shortcode_block() {
 			'value' => 'order',
 		];
 
+		$orderby_options[] = [
+			'label' => esc_html__( 'Release No/ID', 'cbxchangelog' ),
+			'value' => 'id',
+		];
+
 		$orderby_options[] = [
 			'label' => esc_html__( 'Date', 'cbxchangelog' ),
 			'value' => 'date',
@@ -1301,9 +1318,14 @@ public function cbxchangelog_block_render( $attr ) {
 		$params['relative_date'] = ( $params['relative_date'] == 'true' ) ? 1 : 0;
 
 
-		$params['layout']  = isset( $attr['layout'] ) ? sanitize_text_field( $attr['layout'] ) : 'prepros';
-		$params['order']   = isset( $attr['order'] ) ? sanitize_text_field( $attr['order'] ) : 'desc';
-		$params['orderby'] = isset( $attr['orderby'] ) ? sanitize_text_field( $attr['orderby'] ) : 'default';
+		$params['layout']  = isset( $attr['layout'] ) ? sanitize_text_field( wp_unslash($attr['layout']) ) : 'prepros';
+		$params['order']   = isset( $attr['order'] ) ? sanitize_text_field( wp_unslash($attr['order']) ) : 'desc';
+		$params['orderby'] = isset( $attr['orderby'] ) ? sanitize_text_field( wp_unslash($attr['orderby']) ) : 'default';
+
+		if($params['orderby'] === 'order'){
+			$params['orderby'] = 'default';
+		}
+
 
 		$params = apply_filters( 'cbxchangelog_shortcode_builder_block_attr', $params, $attr );
 

cbxchangelog.php

@@ -544,7 +544,7 @@ public static function get_order_keys() {
 	 *
 	 */
 	public static function get_orderby_keys() {
-		return [ 'default', 'date' ];
+		return [ 'default', 'date', 'id' ];
 	}//end method get_orderby_keys
 
 	/**

includes/CBXChangelogAdmin.php

@@ -132,7 +132,7 @@ public function delete($key) {
 	}//end method delete
 
 	// Get all rows with optional sorting
-	public function getAll( $orderBy = null, $order = 'asc' ) {
+	/*public function getAll( $orderBy = null, $order = 'asc' ) {
 		$data = $this->data;
 
 		// Apply sorting if column is provided
@@ -148,7 +148,39 @@ public function getAll( $orderBy = null, $order = 'asc' ) {
 		}
 
 		return array_values( $data );
-	}//end method getAll
+	}//end method getAll*/
+
+	// Get paginated rows with sorting
+	/*public function getPaginatedRows( $page = 1, $perPage = 10, $orderBy = null, $order = 'asc' ) {
+		$data = $this->data;
+
+		// Apply sorting if column is provided
+		if ( $orderBy !== null ) {
+			usort( $data, function ( $a, $b ) use ( $orderBy, $order ) {
+				if ( ! isset( $a[ $orderBy ] ) || ! isset( $b[ $orderBy ] ) ) {
+					return 0; // Skip sorting if column doesn't exist
+				}
+				$comparison = $a[ $orderBy ] <=> $b[ $orderBy ];
+
+				return $order === 'desc' ? - $comparison : $comparison;
+			} );
+		}
+
+		// Paginate the data
+		$totalRows     = count( $data );
+		$start         = ( $page - 1 ) * $perPage;
+		$paginatedData = array_slice( $data, $start, $perPage );
+
+		return [
+			'data'        => $paginatedData,
+			'totalRows'   => $totalRows,
+			'currentPage' => $page,
+			'perPage'     => $perPage,
+			'totalPages'  => ceil( $totalRows / $perPage ),
+		];
+	}//end method getPaginatedRows*/
+
+
 
 	// Get the total number of rows
 	public function getTotalRows() {
@@ -199,6 +231,37 @@ public function getPrevRow($key) {
 		return null; // No previous row
 	}//end method getPrevRow
 
+	// Get all rows with optional sorting
+	public function getAll( $orderBy = null, $order = 'asc' ) {
+		$data = $this->data;
+
+		// Apply sorting if column is provided
+		if ( $orderBy !== null ) {
+			usort( $data, function ( $a, $b ) use ( $orderBy, $order ) {
+				if ( ! isset( $a[ $orderBy ] ) || ! isset( $b[ $orderBy ] ) ) {
+					return 0; // Skip sorting if column doesn't exist
+				}
+
+				// Check if the field is a date type
+				$isDate = ($orderBy === 'date' || preg_match('/^\d{4}-\d{2}-\d{2}$/', $a[ $orderBy ]) && preg_match('/^\d{4}-\d{2}-\d{2}$/', $b[ $orderBy ]));
+
+				if ( $isDate ) {
+					$comparison = strtotime( $a[ $orderBy ] ) <=> strtotime( $b[ $orderBy ] );
+				} else {
+					$comparison = $a[ $orderBy ] <=> $b[ $orderBy ];
+				}
+
+				return $order === 'desc' ? - $comparison : $comparison;
+			} );
+		}
+		else{
+			// Sort by natural index if no column is provided
+			$data = $order === 'desc' ? array_reverse( $data ) : $data;
+		}
+
+		return array_values( $data );
+	}//end method getAll
+
 	// Get paginated rows with sorting
 	public function getPaginatedRows( $page = 1, $perPage = 10, $orderBy = null, $order = 'asc' ) {
 		$data = $this->data;
@@ -209,11 +272,23 @@ public function getPaginatedRows( $page = 1, $perPage = 10, $orderBy = null, $or
 				if ( ! isset( $a[ $orderBy ] ) || ! isset( $b[ $orderBy ] ) ) {
 					return 0; // Skip sorting if column doesn't exist
 				}
-				$comparison = $a[ $orderBy ] <=> $b[ $orderBy ];
+
+				// Check if the field is a date type
+				$isDate = ($orderBy === 'date' || preg_match('/^\d{4}-\d{2}-\d{2}$/', $a[ $orderBy ]) && preg_match('/^\d{4}-\d{2}-\d{2}$/', $b[ $orderBy ]));
+
+				if ( $isDate ) {
+					$comparison = strtotime( $a[ $orderBy ] ) <=> strtotime( $b[ $orderBy ] );
+				} else {
+					$comparison = $a[ $orderBy ] <=> $b[ $orderBy ];
+				}
 
 				return $order === 'desc' ? - $comparison : $comparison;
 			} );
 		}
+		else{
+			// Sort by natural index if no column is provided
+			$data = $order === 'desc' ? array_reverse( $data ) : $data;
+		}
 
 		// Paginate the data
 		$totalRows     = count( $data );
@@ -238,4 +313,12 @@ public function setPrimaryKeyFromIndex() {
 		// Save the updated data
 		$this->saveData();
 	}
+
+	// Reset all rows and properties to their initial state
+	public function resetRows() {
+		$this->data = [];
+		$this->usedKeys = [];
+		$this->nextIndex = 1;
+		$this->saveData();
+	}//end method resetRows
 }//end class CBXChangelogMetaAsArray