oxidized-web 0.15.1 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef98fc626264e84687d7bdbfdb2a0a34aa5744086f34cdf3b84ddd823995246f
-  data.tar.gz: 7d43d90aa5027a130fba180db8c976200a19875978fb09bb9572d65a37ceb104
+  metadata.gz: 01c4432ff37c67ec0a06e7aaa39eecb03631f290fd95d1de12bc9237310aad61
+  data.tar.gz: 4f9a2860285850aaaf64d557807fec1e31d433a9f4ffaefaa68dd0ffb295bed8
 SHA512:
-  metadata.gz: 9fdc33d367f0beb19545a31d73a830ecfb786d152cfdb8b6b28f0335c04b3fa40d524c47c49107cabe48785c788bcf38686e822038eb2e2cf37cf54b1b7267a8
-  data.tar.gz: 863d0e8381d5c55053922e581bf788fd93da4e45f90435e47b2afea678515f2d0e064b2471e81ce607b897c8deb6f0dbeb0fad57d67c088d4e323be2530f9bdd
+  metadata.gz: '029095fa609376853c3e0b446ee48749f02a9b7578b50d928ee43ed5b9c3d9ba5bf747e12805a669bbfebfe0d3b08b8ee57b409f6de6c9a53f6059df9b77acbd'
+  data.tar.gz: 76dc6f389eb8170f290e33718fc11d9636539a8999f3c6a542965b4aa50f8bf5899446f18e828dc30246d9aa37b1f1f83d34cba133f94ee5a4656f26ae439713

data/.gitignore

@@ -52,3 +52,4 @@ Gemfile.lock
 
 # npm files
 /node_modules/
+/.rake_tasks~

data/.rubocop_todo.yml

@@ -1,17 +1,17 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2025-02-20 10:05:16 UTC using RuboCop version 1.72.2.
+# on 2025-03-26 07:50:20 UTC using RuboCop version 1.74.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 2
+# Offense count: 3
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 31
 
-# Offense count: 1
+# Offense count: 2
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 9
@@ -21,7 +21,7 @@ Metrics/CyclomaticComplexity:
 Metrics/MethodLength:
   Max: 28
 
-# Offense count: 1
+# Offense count: 2
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
   Max: 11

data/CHANGELOG.md

@@ -3,8 +3,20 @@
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
+## [0.16.0 - 2025-03-25]
+This release introduces the possibility for an extended configuration of
+oxidized-web in the oxidized configuration file. Oxidized versions after 0.32.2
+will only work with oxidized-web version 0.16.0 or later.
+
+### Changed
+- Allow connection to any virtual hosts + prepare extended configuration to specify which vhosts to accept. Fixes #298 (@robertcheramy)
+
+### Fixed
+- the table preferences (pagelength, column visibility, search) are stored in the local browser cache. Fixes #315 #314 #265 #211 (@robertcheramy)
+- Update "refresh" and "Upldate node list" to more meaningfull texts (@robertcheramy)
+
 ## [0.15.1 – 2025-02-20]
-This minor release fixes javascript errors.
+This patch release fixes javascript errors.
 
 ### Fixed
 - Fix javascript not working (@robertcheramy)

data/docs/development.md

@@ -132,9 +132,10 @@ When testing the web application, open the javascript console in the browser to
 see any errors.
 
 ## Version numbering
-Oxidized-web versions are nummered like 0.major.minor
-- major is incremented when releasing new features. minor is then set to 0
-- minor is incremented when releasing fixes only, just after a major version.
+Oxidized-web versions are nummered like major.minor.patch
+- currently, the major version is 0.
+- minor is incremented when releasing new features.
+- patch is incremented when releasing fixes only.
 
 ## Release
 1. Checkout the master branch of oxidized-web. Make sure you are up to date with origin.

data/lib/oxidized/web/public/weblibs/dataTables.js

@@ -13802,7 +13802,7 @@
 				_fnDraw( settings );
 			} );
 	
-		// Update node value whenever anything changes the table's length
+		// targets value whenever anything changes the table's length
 		$(settings.nTable).on( 'length.dt.DT', function (e, s, len) {
 			if ( settings === s ) {
 				$('select', div).val( len );

data/lib/oxidized/web/version.rb

@@ -2,6 +2,6 @@
 
 module Oxidized
   module API
-    WEB_VERSION = '0.15.1'
+    WEB_VERSION = '0.16.0'
   end
 end

data/lib/oxidized/web/views/conf_search.haml

@@ -9,7 +9,7 @@
     %form.float-end#oxButtons
       %button.btn.btn-primary{type: 'button', onclick: 'history.go();'}
         %i.bi.bi-arrow-clockwise
-        Refresh
+        Refresh page
 
 .row
   .table-responsive

data/lib/oxidized/web/views/nodes.haml

@@ -5,10 +5,13 @@
     %form.float-end#oxButtons
       %button.btn.btn-primary{type: 'button', onclick: 'history.go();'}
         %i.bi.bi-arrow-clockwise
-        Refresh
+        Refresh page
+      %button.btn.btn-primary#resetSearch{type: 'button'}
+        %i.bi.bi-eraser-fill
+        Reset search
       %button.btn.btn-primary#reload{type: 'button'}
         %i.bi.bi-repeat
-        Update node list
+        Reload node list from source backend
 
 .hidden.alert#flashMessage
 
@@ -76,11 +79,16 @@
           className: 'btn-primary',
         }],
       autoWidth: false,
-      lengthMenu: [20, 50, 250, 500, { label: 'All', value: -1 }]
+      lengthMenu: [20, 50, 250, 500, { label: 'All', value: -1 }],
+      stateSave: true,
     });
 
     table.buttons(0,0).container().prependTo($('#oxButtons'));
     table.buttons(0,0).nodes().removeClass('btn-secondary');
+
+    $('#resetSearch').on('click', function() {
+        table.search('').draw();
+    });
   });
 
 

data/lib/oxidized/web/views/stats.haml

@@ -7,7 +7,10 @@
     %form.float-end#oxButtons
       %button.btn.btn-primary{type: 'button', onclick: 'history.go();'}
         %i.bi.bi-arrow-clockwise
-        Refresh
+        Refresh page
+      %button.btn.btn-primary#resetSearch{type: 'button'}
+        %i.bi.bi-eraser-fill
+        Reset search
 
 .row
   .table-responsive
@@ -102,8 +105,13 @@
         }],
       autoWidth: false,
       lengthMenu: [20, 50, 250, 500, { label: 'All', value: -1 }],
+      stateSave: true,
     });
 
     table.buttons(0,0).container().prependTo($('#oxButtons'));
     table.buttons(0,0).nodes().removeClass('btn-secondary');
+
+    $('#resetSearch').on('click', function() {
+        table.search('').draw();
+    });
   });

data/lib/oxidized/web/views/versions.haml

@@ -8,7 +8,8 @@
     %form.float-end#oxButtons
       %button.btn.btn-primary{type: 'button', onclick: 'history.go();'}
         %i.bi.bi-arrow-clockwise
-        Refresh
+        Refresh page
+
 .row
   .table-responsive
     %table.table.table-sm.table-striped.table-hover#versionsTable
@@ -46,6 +47,8 @@
           targets: '_all',
           className: 'text-start'
         }
-      ]
+      ],
+      stateSave: true,
+      searching: false
     });
   });

data/lib/oxidized/web/webapp.rb

@@ -2,10 +2,7 @@ require 'sinatra/base'
 require 'sinatra/json'
 require 'sinatra/url_for'
 require 'tilt/haml'
-# We need PP in node.haml, but rubocop can't see this
-# rubocop:disable Lint/RedundantRequireStatement
 require 'pp'
-# rubocop:enable Lint/RedundantRequireStatement
 require 'htmlentities'
 require 'charlock_holmes'
 module Oxidized
@@ -28,7 +25,7 @@ module Oxidized
       # :filter can be "group" or "model"
       # URL: /nodes/group/<GroupName>[.json]
       # URL: /nodes/model/<ModelName>[.json]
-      # an optional .json extention returns the data as JSON
+      # an optional .json extension returns the data as JSON
       #
       # as GroupName can include /, we use splat to match its value
       # and extract the optional ".json" with route_parse

data/lib/oxidized/web.rb

@@ -6,13 +6,23 @@ module Oxidized
       require 'rack/handler/puma'
       attr_reader :thread
 
-      def initialize(nodes, listen)
+      def initialize(nodes, configuration)
         require 'oxidized/web/webapp'
-        listen, uri = listen.split '/'
-        addr, _, port = listen.rpartition ':'
-        unless port
-          port = addr
-          addr = nil
+        if configuration.instance_of? Asetus::ConfigStruct
+          # New configuration syle: extensions.oxidized-web
+          addr = configuration.listen? || '127.0.0.1'
+          port = configuration.port? || 8888
+          uri = configuration.url_prefix? || ''
+          vhosts = configuration.vhosts? || []
+        else
+          # Old configuration stlyle: "rest: 127.0.0.1:8888/prefix"
+          listen, uri = configuration.split '/'
+          addr, _, port = listen.rpartition ':'
+          unless port
+            port = addr
+            addr = nil
+          end
+          vhosts = []
         end
         uri = "/#{uri}"
         @opts = {
@@ -20,6 +30,7 @@ module Oxidized
           Port: port
         }
         WebApp.set :nodes, nodes
+        WebApp.set :host_authorization, { permitted_hosts: vhosts }
         @app = Rack::Builder.new do
           map uri do
             run WebApp

data/oxidized-web.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rack-test',            '~> 2.1'
   s.add_development_dependency 'rails_best_practices', '~> 1.19'
   s.add_development_dependency 'rake',                 '~> 13.0'
-  s.add_development_dependency 'rubocop',              '~> 1.72.1'
+  s.add_development_dependency 'rubocop',              '~> 1.74.0'
   s.add_development_dependency 'rubocop-minitest',     '~> 0.37.1'
   s.add_development_dependency 'rubocop-rails',        '~> 2.30.0'
   s.add_development_dependency 'rubocop-rake',         '~> 0.7.1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxidized-web
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.0
 platform: ruby
 authors:
 - Saku Ytti
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-20 00:00:00.000000000 Z
+date: 2025-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: charlock_holmes
@@ -241,14 +241,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.72.1
+        version: 1.74.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.72.1
+        version: 1.74.0
 - !ruby/object:Gem::Dependency
   name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement