foreman_statistics 0.1.3 → 1.2.0

data/package.json

@@ -3,40 +3,41 @@
   "version": "1.0.0",
   "description": "DESCRIPTION",
   "main": "index.js",
-  "scripts": {
-    "lint": "tfm-lint --plugin -d /webpack",
-    "test": "tfm-test --plugin",
-    "test:watch": "tfm-test --plugin --watchAll",
-    "test:current": "tfm-test --plugin --watch",
-    "publish-coverage": "tfm-publish-coverage",
-    "stories": "tfm-stories --plugin",
-    "stories:build": "tfm-build-stories --plugin",
-    "create-react-component": "yo react-domain"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/theforeman/foreman_statistics.git"
-  },
   "bugs": {
     "url": "http://projects.theforeman.org/projects/foreman_statistics/issues"
   },
   "peerDependencies": {
-    "@theforeman/vendor": ">= 4.0.2"
-  },
-  "dependencies": {
-    "react-intl": "^2.8.0"
+    "@theforeman/vendor": ">= 6.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.7.0",
-    "@theforeman/builder": "^4.0.2",
-    "@theforeman/eslint-plugin-foreman": "4.0.5",
-    "@theforeman/stories": "^4.0.2",
-    "@theforeman/test": "^4.0.2",
-    "@theforeman/vendor-dev": "^4.0.2",
+    "@theforeman/builder": "^8.4.1",
+    "@theforeman/eslint-plugin-foreman": "^8.4.1",
+    "@theforeman/find-foreman": "^8.4.1",
+    "@theforeman/stories": "^8.4.1",
+    "@theforeman/test": "^8.4.1",
+    "@theforeman/vendor-dev": "^8.4.1",
     "babel-eslint": "^10.0.3",
     "eslint": "^6.7.2",
-    "prettier": "^1.13.5",
+    "prettier": "^1.19.1",
     "stylelint-config-standard": "^18.0.0",
     "stylelint": "^9.3.0"
+  },
+  "dependencies": {
+    "react-intl": "^2.8.0"
+  },
+  "scripts": {
+    "lint": "tfm-lint --plugin -d /webpack",
+    "test": "tfm-test --plugin --config config/jest.config.js",
+    "test:watch": "tfm-test --plugin --config config/jest.config.js --watchAll",
+    "test:current": "tfm-test --plugin --config config/jest.config.js --watch",
+    "publish-coverage": "tfm-publish-coverage",
+    "stories": "tfm-stories --plugin",
+    "stories:build": "tfm-build-stories --plugin",
+    "create-react-component": "yo react-domain"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/theforeman/foreman_statistics.git"
   }
 }

data/test/functional/foreman_statistics/api/v2/statistics_controller_test.rb

@@ -1,4 +1,4 @@
-require_relative '../../../../test_plugin_helper'
+require 'test_statistics_helper'
 
 class ForemanStatistics::Api::V2::StatisticsControllerTest < ActionController::TestCase
   setup do

data/test/functional/foreman_statistics/api/v2/trends_controller_test.rb

@@ -1,4 +1,4 @@
-require_relative '../../../../test_plugin_helper'
+require 'test_statistics_helper'
 
 class ForemanStatistics::Api::V2::TrendsControllerTest < ActionController::TestCase
   setup do
@@ -9,7 +9,7 @@ class ForemanStatistics::Api::V2::TrendsControllerTest < ActionController::TestC
   end
 
   let(:host) { FactoryBot.create(:host) }
-  let(:foreman_trend) { FactoryBot.create(:foreman_statistics_foreman_trend, :trendable_type => 'Environment', :fact_name => 'fact') }
+  let(:foreman_trend) { FactoryBot.create(:foreman_statistics_foreman_trend, :trendable_type => 'Operatingsystem', :fact_name => 'fact') }
   let(:fact_trend) { FactoryBot.create(:foreman_statistics_fact_trend, :trendable_type => 'FactName') }
   let(:os_fact) do
     FactoryBot.create(:fact_value, :value => 'fedora', :host => host,

data/test/functional/foreman_statistics/statistics_controller_test.rb

@@ -1,4 +1,4 @@
-require_relative '../../test_plugin_helper'
+require 'test_statistics_helper'
 
 module ForemanStatistics
   class StatisticsControllerTest < ActionController::TestCase
@@ -7,16 +7,14 @@ module ForemanStatistics
     end
 
     test 'user with viewer rights should succeed in viewing statistics' do
-      @request.session[:user] = users(:one).id
-      users(:one).roles = [Role.default, Role.find_by(name: 'Viewer')]
-      get :index, session: set_session_user
+      setup_user('view', 'statistics')
+      get :index, session: set_session_user(:one)
       assert_response :success
     end
 
     test 'user with viewer rights should succeed in requesting statistics data via ajax' do
-      @request.session[:user] = users(:one).id
-      users(:one).roles = [Role.default, Role.find_by(name: 'Viewer')]
-      get :show, params: { :id => 'operatingsystem', :format => 'json' }, session: set_session_user
+      setup_user('view', 'statistics')
+      get :show, params: { :id => 'operatingsystem', :format => 'json' }, session: set_session_user(:one)
       assert_response :success
     end
   end

data/test/functional/foreman_statistics/trends_controller_test.rb

@@ -1,4 +1,4 @@
-require_relative '../../test_plugin_helper'
+require 'test_statistics_helper'
 
 module ForemanStatistics
   class TrendsControllerTest < ActionController::TestCase
@@ -46,16 +46,10 @@ module ForemanStatistics
         test 'should render correct per_page value' do
           get :index, params: { per_page: entries_per_page + 1 }, session: set_session_user
           assert_response :success
-          per_page_results = response.body.scan(/perPage":\d+/).first.gsub(/[^\d]/, '').to_i
+          per_page_results = response.body.scan(/perPage&quot;:(\d+)/).first.first.to_i
           assert_equal entries_per_page, per_page_results
         end
 
-        test 'should render per page dropdown with correct values' do
-          get :index, params: { per_page: entries_per_page + 1 }, session: set_session_user
-          assert_response :success
-          assert_not_nil response.body['perPageOptions":[5,6,10,15,25,50]']
-        end
-
         test 'sort links should include per page param' do
           get :index, params: { per_page: entries_per_page + 1 }, session: set_session_user
           assert_response :success

data/test/models/foreman_statistics/trend_counter_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test_statistics_helper'
 
 module ForemanStatistics
   class TrendCounterTest < ActiveSupport::TestCase

data/test/models/foreman_statistics/trend_test.rb

@@ -1,4 +1,4 @@
-require_relative '../../test_plugin_helper'
+require 'test_statistics_helper'
 
 module ForemanStatistics
   class TrendTest < ActiveSupport::TestCase

data/test/unit/foreman_statistics/access_permissions_test.rb

@@ -1,4 +1,4 @@
-require 'test_plugin_helper'
+require 'test_statistics_helper'
 require 'unit/shared/access_permissions_test_base'
 
 # Permissions are added in AccessPermissions with lists of controllers and

data/test/unit/foreman_statistics/statistics_test.rb

@@ -1,4 +1,4 @@
-require_relative '../../test_plugin_helper'
+require 'test_statistics_helper'
 
 module ForemanStatistics
   class StatisticsTest < ActiveSupport::TestCase

data/test/unit/foreman_statistics_test.rb

@@ -1,4 +1,4 @@
-require 'test_plugin_helper'
+require 'test_statistics_helper'
 
 class ForemanStatisticsTest < ActiveSupport::TestCase
   setup do

data/test/unit/tasks/foreman_statistics_tasks_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test_statistics_helper'
 require 'rake'
 
 class ForemanStatisticsTasksTest < ActiveSupport::TestCase

data/webpack/src/Components/StatisticsChartsList/__snapshots__/StatisticsChartsList.test.js.snap

@@ -19,6 +19,9 @@ exports[`StatisticsChartsList rendering should render two panels for fixtures da
         "url": "statistics/operatingsystem",
       }
     }
+    className=""
+    config="regular"
+    errorText=""
     key="operatingsystem"
     noDataMsg="No data available"
     tip="Expand the chart"
@@ -33,6 +36,9 @@ exports[`StatisticsChartsList rendering should render two panels for fixtures da
         "url": "statistics/architecture",
       }
     }
+    className=""
+    config="regular"
+    errorText=""
     key="architecture"
     noDataMsg="No data available"
     tip="Expand the chart"

data/webpack/src/Router/StatisticsPage/StatisticsPageSelectors.js

@@ -1,4 +1,5 @@
-export const selectStatisticsPage = state => state.statisticsPage;
+export const selectStatisticsPage = state =>
+  state.foremanStatistics.statisticsPage;
 
 export const selectStatisticsMetadata = state =>
   selectStatisticsPage(state).metadata;

data/webpack/src/Router/StatisticsPage/__tests__/StatisticsPageSelectors.test.js

@@ -10,8 +10,10 @@ import {
 import { statisticsProps } from '../StatisticsPage.fixtures';
 
 const state = {
-  statisticsPage: {
-    ...statisticsProps,
+  foremanStatistics: {
+    statisticsPage: {
+      ...statisticsProps,
+    },
   },
 };
 

data/webpack/src/Router/StatisticsPage/__tests__/__snapshots__/StatisticsPage.test.js.snap

@@ -2,8 +2,18 @@
 
 exports[`StatisticsPage rendering render with props 1`] = `
 <PageLayout
+  beforeToolbarComponent={null}
+  breadcrumbOptions={null}
+  customBreadcrumbs={null}
   header="Statistics"
+  isLoading={false}
+  onBookmarkClick={[Function]}
+  onSearch={[Function]}
+  searchProps={Object {}}
+  searchQuery=""
   searchable={false}
+  toastNotifications={Array []}
+  toolbarButtons={null}
 >
   <Component
     getStatisticsMeta={[Function]}

data/webpack/src/reducers.js

@@ -1,7 +1,9 @@
-// import { combineReducers } from 'redux';
+import { combineReducers } from 'redux';
+
+import { reducers as statisticsPageReducers } from './Router/StatisticsPage';
 
 const reducers = {
-  // foremanStatistics: combineReducers({}),
+  foremanStatistics: combineReducers(statisticsPageReducers),
 };
 
 export default reducers;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_statistics
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Ondrej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-22 00:00:00.000000000 Z
+date: 2021-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -24,62 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.83'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.83'
-- !ruby/object:Gem::Dependency
-  name: rubocop-minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.2
-- !ruby/object:Gem::Dependency
-  name: rubocop-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.5.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.5.2
 description: Statistics and Trends for Foreman gives users overview of their infrastructure.
 email:
 - oezr@redhat.com
@@ -97,12 +41,9 @@ files:
 - app/controllers/foreman_statistics/statistics_controller.rb
 - app/controllers/foreman_statistics/trends_controller.rb
 - app/helpers/foreman_statistics/trends_helper.rb
-- app/models/concerns/foreman_statistics/compute_resource_decorations.rb
-- app/models/concerns/foreman_statistics/environment_decorations.rb
+- app/jobs/foreman_statistics/trend_counter_job.rb
 - app/models/concerns/foreman_statistics/general_setting_decorations.rb
-- app/models/concerns/foreman_statistics/hostgroup_decorations.rb
-- app/models/concerns/foreman_statistics/model_decorations.rb
-- app/models/concerns/foreman_statistics/operatingsystem_decorations.rb
+- app/models/concerns/foreman_statistics/has_many_trends.rb
 - app/models/concerns/foreman_statistics/setting_decorations.rb
 - app/models/foreman_statistics/fact_trend.rb
 - app/models/foreman_statistics/foreman_trend.rb
@@ -131,8 +72,10 @@ files:
 - app/views/foreman_statistics/trends/new.html.erb
 - app/views/foreman_statistics/trends/show.html.erb
 - app/views/foreman_statistics/trends/welcome.html.erb
+- config/jest.config.js
 - config/routes.rb
 - db/migrate/20200605153005_migrate_core_types.rb
+- db/migrate/20210523143005_migrate_environments.rb
 - db/migrate_foreman/20121012170851_create_trends.rb
 - db/migrate_foreman/20121012170936_create_trend_counters.rb
 - db/migrate_foreman/20150202094307_add_range_to_trend_counters.rb
@@ -142,9 +85,81 @@ files:
 - lib/foreman_statistics/version.rb
 - lib/tasks/foreman_statistics_tasks.rake
 - locale/Makefile
+- locale/action_names.rb
+- locale/ca/LC_MESSAGES/foreman_statistics.mo
+- locale/ca/foreman_statistics.edit.po
+- locale/ca/foreman_statistics.po
+- locale/ca/foreman_statistics.po.time_stamp
+- locale/cs_CZ/LC_MESSAGES/foreman_statistics.mo
+- locale/cs_CZ/foreman_statistics.edit.po
+- locale/cs_CZ/foreman_statistics.po
+- locale/cs_CZ/foreman_statistics.po.time_stamp
+- locale/de/LC_MESSAGES/foreman_statistics.mo
+- locale/de/foreman_statistics.edit.po
+- locale/de/foreman_statistics.po
+- locale/de/foreman_statistics.po.time_stamp
+- locale/en/LC_MESSAGES/foreman_statistics.mo
+- locale/en/foreman_statistics.edit.po
 - locale/en/foreman_statistics.po
+- locale/en/foreman_statistics.po.time_stamp
+- locale/en_GB/LC_MESSAGES/foreman_statistics.mo
+- locale/en_GB/foreman_statistics.edit.po
+- locale/en_GB/foreman_statistics.po
+- locale/en_GB/foreman_statistics.po.time_stamp
+- locale/es/LC_MESSAGES/foreman_statistics.mo
+- locale/es/foreman_statistics.edit.po
+- locale/es/foreman_statistics.po
+- locale/es/foreman_statistics.po.time_stamp
 - locale/foreman_statistics.pot
+- locale/fr/LC_MESSAGES/foreman_statistics.mo
+- locale/fr/foreman_statistics.edit.po
+- locale/fr/foreman_statistics.po
+- locale/fr/foreman_statistics.po.time_stamp
 - locale/gemspec.rb
+- locale/gl/LC_MESSAGES/foreman_statistics.mo
+- locale/gl/foreman_statistics.edit.po
+- locale/gl/foreman_statistics.po
+- locale/gl/foreman_statistics.po.time_stamp
+- locale/it/LC_MESSAGES/foreman_statistics.mo
+- locale/it/foreman_statistics.edit.po
+- locale/it/foreman_statistics.po
+- locale/it/foreman_statistics.po.time_stamp
+- locale/ja/LC_MESSAGES/foreman_statistics.mo
+- locale/ja/foreman_statistics.edit.po
+- locale/ja/foreman_statistics.po
+- locale/ja/foreman_statistics.po.time_stamp
+- locale/ko/LC_MESSAGES/foreman_statistics.mo
+- locale/ko/foreman_statistics.edit.po
+- locale/ko/foreman_statistics.po
+- locale/ko/foreman_statistics.po.time_stamp
+- locale/nl_NL/LC_MESSAGES/foreman_statistics.mo
+- locale/nl_NL/foreman_statistics.edit.po
+- locale/nl_NL/foreman_statistics.po
+- locale/nl_NL/foreman_statistics.po.time_stamp
+- locale/pl/LC_MESSAGES/foreman_statistics.mo
+- locale/pl/foreman_statistics.edit.po
+- locale/pl/foreman_statistics.po
+- locale/pl/foreman_statistics.po.time_stamp
+- locale/pt_BR/LC_MESSAGES/foreman_statistics.mo
+- locale/pt_BR/foreman_statistics.edit.po
+- locale/pt_BR/foreman_statistics.po
+- locale/pt_BR/foreman_statistics.po.time_stamp
+- locale/ru/LC_MESSAGES/foreman_statistics.mo
+- locale/ru/foreman_statistics.edit.po
+- locale/ru/foreman_statistics.po
+- locale/ru/foreman_statistics.po.time_stamp
+- locale/sv_SE/LC_MESSAGES/foreman_statistics.mo
+- locale/sv_SE/foreman_statistics.edit.po
+- locale/sv_SE/foreman_statistics.po
+- locale/sv_SE/foreman_statistics.po.time_stamp
+- locale/zh_CN/LC_MESSAGES/foreman_statistics.mo
+- locale/zh_CN/foreman_statistics.edit.po
+- locale/zh_CN/foreman_statistics.po
+- locale/zh_CN/foreman_statistics.po.time_stamp
+- locale/zh_TW/LC_MESSAGES/foreman_statistics.mo
+- locale/zh_TW/foreman_statistics.edit.po
+- locale/zh_TW/foreman_statistics.po
+- locale/zh_TW/foreman_statistics.po.time_stamp
 - package.json
 - test/factories/foreman_statistics_factories.rb
 - test/fixtures/permissions.yml
@@ -155,34 +170,11 @@ files:
 - test/functional/foreman_statistics/trends_controller_test.rb
 - test/models/foreman_statistics/trend_counter_test.rb
 - test/models/foreman_statistics/trend_test.rb
-- test/test_plugin_helper.rb
+- test/test_statistics_helper.rb
 - test/unit/foreman_statistics/access_permissions_test.rb
 - test/unit/foreman_statistics/statistics_test.rb
 - test/unit/foreman_statistics_test.rb
 - test/unit/tasks/foreman_statistics_tasks_test.rb
-- webpack/__mocks__/foremanReact/API.js
-- webpack/__mocks__/foremanReact/common/HOC.js
-- webpack/__mocks__/foremanReact/common/I18n.js
-- webpack/__mocks__/foremanReact/common/helpers.js
-- webpack/__mocks__/foremanReact/common/urlHelpers.js
-- webpack/__mocks__/foremanReact/components/ChartBox/index.js
-- webpack/__mocks__/foremanReact/components/ForemanModal/ForemanModalActions.js
-- webpack/__mocks__/foremanReact/components/ForemanModal/ForemanModalHooks.js
-- webpack/__mocks__/foremanReact/components/ForemanModal/index.js
-- webpack/__mocks__/foremanReact/components/Layout/LayoutActions.js
-- webpack/__mocks__/foremanReact/components/Pagination/PaginationWrapper.js
-- webpack/__mocks__/foremanReact/components/common/EmptyState.js
-- webpack/__mocks__/foremanReact/components/common/MessageBox.js
-- webpack/__mocks__/foremanReact/components/common/dates/LongDateTime.js
-- webpack/__mocks__/foremanReact/components/common/dates/RelativeDateTime.js
-- webpack/__mocks__/foremanReact/components/common/table.js
-- webpack/__mocks__/foremanReact/components/common/table/actionsHelpers/actionTypeCreator.js
-- webpack/__mocks__/foremanReact/constants.js
-- webpack/__mocks__/foremanReact/readme.md
-- webpack/__mocks__/foremanReact/redux/actions/toasts.js
-- webpack/__mocks__/foremanReact/routes/common/PageLayout/PageLayout.js
-- webpack/__mocks__/foremanReact/routes/common/PageLayout/components/ExportButton/ExportButton.js
-- webpack/__mocks__/foremanReact/routes/common/reducerHOC/withDataReducer.js
 - webpack/fills_index.js
 - webpack/index.js
 - webpack/src/Components/StatisticsChartsList/StatisticsChartsList.fixtures.js
@@ -231,11 +223,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Add Statistics and Trends.
 test_files:
+- test/test_statistics_helper.rb
 - test/functional/foreman_statistics/trends_controller_test.rb
 - test/functional/foreman_statistics/statistics_controller_test.rb
 - test/functional/foreman_statistics/api/v2/trends_controller_test.rb
@@ -249,4 +242,3 @@ test_files:
 - test/factories/foreman_statistics_factories.rb
 - test/fixtures/settings.yml
 - test/fixtures/permissions.yml
-- test/test_plugin_helper.rb