Update versions sorting

Author: ilevd

src-cljc/playground/utils/utils.cljc

@@ -1,6 +1,6 @@
 (ns playground.utils.utils
   (:require [clojure.string :as string]
-            [version-clj.core :as version-clj]
+            [version-clj.core :as version-clj :refer [version-compare]]
     #?(:cljs
        [cljs-time.coerce :as c]
        :clj
@@ -33,9 +33,16 @@
   (filter released-or-8-version? versions))
 
 
-(defn sort-versions [versions]
-  (sort (comp - #(version-clj/version-compare %1 %2))
-        versions))
+(defn sort-versions
+  ([key versions]
+   (let [replace-fn (fn [version]
+                      ;; v8 -> 8.999.999
+                      (string/replace version #"^v(\d+)" "$1.999.999"))
+         compare-fn (fn [v1 v2]
+                      (version-compare (replace-fn v2) (replace-fn v1)))]
+     (sort-by key compare-fn versions)))
+  ([versions]
+   (sort-versions identity versions)))
 
 
 (defn replace-urls [version-name scripts]

src/playground/data/config.clj

@@ -1,7 +1,7 @@
 (ns playground.data.config
   (:require [cheshire.core :as json]
             [clj-http.client :as http]
-            [version-clj.core :as version-clj]))
+            [playground.utils.utils :as utils]))
 
 
 ;; Declarations
@@ -43,5 +43,6 @@
 
 
 (defn add-anychart-versions [versions]
-  (sort (comp - #(version-clj/version-compare %1 %2))
-        (distinct (concat versions @*anychart-versions))))
+  (-> (concat versions @*anychart-versions)
+      distinct
+      utils/sort-versions))

src/playground/db/request.clj

@@ -6,7 +6,6 @@
             [camel-snake-kebab.core :as kebab]
             [camel-snake-kebab.extras :as kebab-extra]
             [playground.utils.utils :as utils]
-            [version-clj.core :as version-clj]
             [clojure.java.jdbc :as jdbc]
             [mpg.core :as mpg]))
 
@@ -139,21 +138,23 @@
 (def versions (sql {:name          sql-versions
                     :row-fn        underscore->dash
                     :result-set-fn (fn [versions]
-                                     (sort (comp - #(version-clj/version-compare (:name %1) (:name %2))) versions))}))
+                                     (utils/sort-versions :name versions))}))
 
 
 (def versions-by-repo-name (sql {:name          sql-versions-by-repo-name
                                  :row-fn        underscore->dash
                                  :result-set-fn (fn [versions]
-                                                  (sort (comp - #(version-clj/version-compare %1 %2))
-                                                        (map :name versions)))}))
+                                                  (->> versions
+                                                       (map :name)
+                                                       utils/sort-versions))}))
 
 
 (def versions-by-repos-names (sql {:name          sql-versions-by-repos-names
                                    :row-fn        underscore->dash
                                    :result-set-fn (fn [versions]
-                                                    (sort (comp - #(version-clj/version-compare %1 %2))
-                                                          (map :name versions)))}))
+                                                    (->> versions
+                                                         (map :name)
+                                                         utils/sort-versions))}))
 
 
 (def versions-repos (sql {:name   sql-versions-repos
@@ -172,8 +173,7 @@
 
 (defn last-version [db data]
   (let [versions (versions db data)
-        last-version (first (sort (comp - #(version-clj/version-compare (:name %1) (:name %2)))
-                                  versions))]
+        last-version (first (utils/sort-versions :name versions))]
     last-version))
 
 ;; =====================================================================================================================

src/playground/web/middleware.clj

@@ -1,7 +1,6 @@
 (ns playground.web.middleware
   (:require [playground.db.request :as db-req]
             [playground.web.helpers :refer :all]
-            [version-clj.core :as version-clj :refer [version-compare]]
             [playground.web.auth :as auth]
             [playground.data.tags :as data-tags]
             [playground.web.utils :as web-utils]))