foreman_statistics 1.1.0 → 2.0.1

data/locale/zh_TW/foreman_statistics.edit.po

@@ -0,0 +1,266 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the foreman_statistics package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+# Translators:
+# 0868a4d1af5275b3f70b0a6dac4c99a4, 2021
+# ChrisLee <chris_lee@hiiir.com>, 2021
+# Bryan Kearney <bryan.kearney@gmail.com>, 2021
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: foreman_statistics 1.1.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-04 02:22+0100\n"
+"PO-Revision-Date: 2021-02-03 22:59+0000\n"
+"Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>, 2021\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/foreman/teams/114/z"
+"h_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../app/controllers/foreman_statistics/api/v2/statistics_controller.rb:12
+msgid "Get statistics"
+msgstr "取得數據"
+
+#: ../app/controllers/foreman_statistics/api/v2/trends_controller.rb:20
+msgid "List of trends counters"
+msgstr ""
+
+#: ../app/controllers/foreman_statistics/api/v2/trends_controller.rb:25
+msgid "Show a trend"
+msgstr ""
+
+#: ../app/controllers/foreman_statistics/api/v2/trends_controller.rb:29
+msgid "Create a trend counter"
+msgstr ""
+
+#: ../app/controllers/foreman_statistics/api/v2/trends_controller.rb:42
+msgid "Delete a trend counter"
+msgstr ""
+
+#: ../app/helpers/foreman_statistics/trends_helper.rb:6
+msgid "Environment"
+msgstr "環境"
+
+#: ../app/helpers/foreman_statistics/trends_helper.rb:6
+msgid "Operating system"
+msgstr "作業系統"
+
+#: ../app/helpers/foreman_statistics/trends_helper.rb:7
+msgid "Model"
+msgstr "型號"
+
+#: ../app/helpers/foreman_statistics/trends_helper.rb:7
+msgid "Facts"
+msgstr "詳情"
+
+#: ../app/helpers/foreman_statistics/trends_helper.rb:7
+msgid "Host group"
+msgstr "主機群組"
+
+#: ../app/helpers/foreman_statistics/trends_helper.rb:7
+msgid "Compute resource"
+msgstr "運算設定檔"
+
+#: ../app/helpers/foreman_statistics/trends_helper.rb:14
+msgid "Trend of the last %s days."
+msgstr "最後 %s 天的趨勢。"
+
+#: ../app/jobs/foreman_statistics/trend_counter_job.rb:20
+msgid "Trend Counter Job"
+msgstr ""
+
+#: ../app/models/concerns/foreman_statistics/general_setting_decorations.rb:12
+msgid "Max days for Trends graphs"
+msgstr "趨勢圖表的最大天數"
+
+#: ../app/models/concerns/foreman_statistics/general_setting_decorations.rb:12
+msgid "Max trends"
+msgstr "最大趨勢"
+
+#: ../app/services/foreman_statistics/statistics.rb:6
+msgid "Architecture Distribution"
+msgstr "架構發佈"
+
+#: ../app/services/foreman_statistics/statistics.rb:7
+msgid "Environment Distribution"
+msgstr ""
+
+#: ../app/services/foreman_statistics/statistics.rb:8
+msgid "Host Group Distribution"
+msgstr ""
+
+#: ../app/services/foreman_statistics/statistics.rb:9
+msgid "Compute Resource Distribution"
+msgstr ""
+
+#: ../app/services/foreman_statistics/statistics.rb:10
+msgid "Number of CPUs"
+msgstr "CPU 數量"
+
+#: ../app/services/foreman_statistics/statistics.rb:11
+msgid "Hardware"
+msgstr "硬體"
+
+#: ../app/services/foreman_statistics/statistics.rb:12
+msgid "Average Memory Usage"
+msgstr ""
+
+#: ../app/services/foreman_statistics/statistics.rb:13
+msgid "Average Swap Usage"
+msgstr ""
+
+#: ../app/services/foreman_statistics/statistics.rb:14
+msgid "Class Distribution"
+msgstr "類別發佈"
+
+#: ../app/services/foreman_statistics/statistics.rb:15
+msgid "Location Distribution"
+msgstr ""
+
+#: ../app/services/foreman_statistics/statistics.rb:16
+msgid "Organization Distribution"
+msgstr ""
+
+#: ../app/services/foreman_statistics/statistics/count_numerical_fact_pair.rb:22
+msgid "free memory"
+msgstr "可用記憶體"
+
+#: ../app/services/foreman_statistics/statistics/count_numerical_fact_pair.rb:26
+msgid "used memory"
+msgstr "已使用的記憶體"
+
+#: ../app/views/foreman_statistics/trends/_empty_data.html.erb:1 ../app/views/foreman_statistics/trends/show.html.erb:2
+msgid "Trends for %s"
+msgstr "%s 的趨勢"
+
+#: ../app/views/foreman_statistics/trends/_empty_data.html.erb:4
+msgid "No data for this trend."
+msgstr "此趨勢無資料。"
+
+#: ../app/views/foreman_statistics/trends/_form.html.erb:4
+msgid "Please Select"
+msgstr "請選擇"
+
+#: ../app/views/foreman_statistics/trends/_hosts.html.erb:7
+msgid "Show Host"
+msgstr "顯示主機"
+
+#: ../app/views/foreman_statistics/trends/edit.html.erb:1
+msgid "Edit Trend %s"
+msgstr "編輯趨勢 %s"
+
+#: ../app/views/foreman_statistics/trends/edit.html.erb:8
+msgid "Fact Name"
+msgstr "詳情名稱"
+
+#: ../app/views/foreman_statistics/trends/edit.html.erb:9 ../app/views/foreman_statistics/trends/edit.html.erb:30
+msgid "Display Name"
+msgstr "顯示名稱"
+
+#: ../app/views/foreman_statistics/trends/edit.html.erb:43
+msgid "Cancel"
+msgstr "取消"
+
+#: ../app/views/foreman_statistics/trends/edit.html.erb:44
+msgid "Submit"
+msgstr "提交"
+
+#: ../app/views/foreman_statistics/trends/index.html.erb:2 ../app/views/foreman_statistics/trends/welcome.html.erb:1 ../app/views/foreman_statistics/trends/welcome.html.erb:6 ../lib/foreman_statistics/engine.rb:63
+msgid "Trends"
+msgstr "趨勢"
+
+#: ../app/views/foreman_statistics/trends/index.html.erb:3 ../app/views/foreman_statistics/trends/welcome.html.erb:10
+msgid "Add Trend Counter"
+msgstr "新增趨勢計數器"
+
+#: ../app/views/foreman_statistics/trends/index.html.erb:9
+msgid "Name"
+msgstr "名稱"
+
+#: ../app/views/foreman_statistics/trends/index.html.erb:10
+msgid "Action"
+msgstr "動作"
+
+#: ../app/views/foreman_statistics/trends/index.html.erb:16
+msgid "Show Trends"
+msgstr "顯示趨勢"
+
+#: ../app/views/foreman_statistics/trends/index.html.erb:19
+msgid "Edit"
+msgstr "編輯"
+
+#: ../app/views/foreman_statistics/trends/index.html.erb:20
+msgid "Delete all the trend history for %s?"
+msgstr "是否要刪除 %s 的所有趨勢記錄？"
+
+#: ../app/views/foreman_statistics/trends/index.html.erb:28
+msgid "Last update:"
+msgstr ""
+
+#: ../app/views/foreman_statistics/trends/new.html.erb:1
+msgid "Create Trend"
+msgstr ""
+
+#: ../app/views/foreman_statistics/trends/show.html.erb:7
+msgid "last %s day"
+msgid_plural "last %s days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../app/views/foreman_statistics/trends/show.html.erb:8
+msgid "Number of Hosts"
+msgstr "主機數量"
+
+#: ../app/views/foreman_statistics/trends/show.html.erb:16
+msgid "Hosts"
+msgstr "主機"
+
+#: ../app/views/foreman_statistics/trends/welcome.html.erb:7
+msgid "Trends in Foreman allow you to track changes in your infrastructure over time. It allows you to track both Foreman related information and to any fact. The Trend pages give a graph of how the number of hosts with that value have changed over time, and list the current hosts."
+msgstr ""
+
+#: ../app/views/foreman_statistics/trends/welcome.html.erb:8
+msgid "Learn more about this in the documentation."
+msgstr "欲知更多，請參閱文件。"
+
+#: ../lib/foreman_statistics/engine.rb:69 ../webpack/src/Router/StatisticsPage/StatisticsPage.js:8
+msgid "Statistics"
+msgstr "數據"
+
+#: ../webpack/src/Components/StatisticsChartsList/index.js:14
+msgid "No data available"
+msgstr ""
+
+#: ../webpack/src/Components/StatisticsChartsList/index.js:15
+msgid "Expand the chart"
+msgstr "展開圖表"
+
+#: ../webpack/src/Router/StatisticsPage/Statistics/Statistics.js:13
+msgid "No Charts To Load"
+msgstr ""
+
+#: action_names.rb:2
+msgid "Action with sub plans"
+msgstr "有子計畫的動作"
+
+#: action_names.rb:3
+msgid "Import facts"
+msgstr "匯入詳情"
+
+#: action_names.rb:4
+msgid "Import Puppet classes"
+msgstr "匯入 Puppet 類別"
+
+#: action_names.rb:5
+msgid "Remote action:"
+msgstr "遠端動作："
+
+#: gemspec.rb:2
+msgid "Statistics and Trends for Foreman gives users overview of their infrastructure."
+msgstr ""

data/locale/zh_TW/foreman_statistics.po

@@ -0,0 +1,205 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the foreman_statistics package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+# Translators:
+# 0868a4d1af5275b3f70b0a6dac4c99a4, 2021
+# ChrisLee <chris_lee@hiiir.com>, 2021
+# Bryan Kearney <bryan.kearney@gmail.com>, 2021
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: foreman_statistics 1.1.1\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2021-02-03 22:59+0000\n"
+"Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>, 2021\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/foreman/teams/114/z"
+"h_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+msgid "Action"
+msgstr "動作"
+
+msgid "Action with sub plans"
+msgstr "有子計畫的動作"
+
+msgid "Add Trend Counter"
+msgstr "新增趨勢計數器"
+
+msgid "Architecture Distribution"
+msgstr "架構發佈"
+
+msgid "Average Memory Usage"
+msgstr ""
+
+msgid "Average Swap Usage"
+msgstr ""
+
+msgid "Cancel"
+msgstr "取消"
+
+msgid "Class Distribution"
+msgstr "類別發佈"
+
+msgid "Compute Resource Distribution"
+msgstr ""
+
+msgid "Compute resource"
+msgstr "運算設定檔"
+
+msgid "Create Trend"
+msgstr ""
+
+msgid "Create a trend counter"
+msgstr ""
+
+msgid "Delete a trend counter"
+msgstr ""
+
+msgid "Delete all the trend history for %s?"
+msgstr "是否要刪除 %s 的所有趨勢記錄？"
+
+msgid "Display Name"
+msgstr "顯示名稱"
+
+msgid "Edit"
+msgstr "編輯"
+
+msgid "Edit Trend %s"
+msgstr "編輯趨勢 %s"
+
+msgid "Environment"
+msgstr "環境"
+
+msgid "Environment Distribution"
+msgstr ""
+
+msgid "Expand the chart"
+msgstr "展開圖表"
+
+msgid "Fact Name"
+msgstr "詳情名稱"
+
+msgid "Facts"
+msgstr "詳情"
+
+msgid "Get statistics"
+msgstr "取得數據"
+
+msgid "Hardware"
+msgstr "硬體"
+
+msgid "Host Group Distribution"
+msgstr ""
+
+msgid "Host group"
+msgstr "主機群組"
+
+msgid "Hosts"
+msgstr "主機"
+
+msgid "Import Puppet classes"
+msgstr "匯入 Puppet 類別"
+
+msgid "Import facts"
+msgstr "匯入詳情"
+
+msgid "Last update:"
+msgstr ""
+
+msgid "Learn more about this in the documentation."
+msgstr "欲知更多，請參閱文件。"
+
+msgid "List of trends counters"
+msgstr ""
+
+msgid "Location Distribution"
+msgstr ""
+
+msgid "Max days for Trends graphs"
+msgstr "趨勢圖表的最大天數"
+
+msgid "Max trends"
+msgstr "最大趨勢"
+
+msgid "Model"
+msgstr "型號"
+
+msgid "Name"
+msgstr "名稱"
+
+msgid "No Charts To Load"
+msgstr ""
+
+msgid "No data available"
+msgstr ""
+
+msgid "No data for this trend."
+msgstr "此趨勢無資料。"
+
+msgid "Number of CPUs"
+msgstr "CPU 數量"
+
+msgid "Number of Hosts"
+msgstr "主機數量"
+
+msgid "Operating system"
+msgstr "作業系統"
+
+msgid "Organization Distribution"
+msgstr ""
+
+msgid "Please Select"
+msgstr "請選擇"
+
+msgid "Remote action:"
+msgstr "遠端動作："
+
+msgid "Show Host"
+msgstr "顯示主機"
+
+msgid "Show Trends"
+msgstr "顯示趨勢"
+
+msgid "Show a trend"
+msgstr ""
+
+msgid "Statistics"
+msgstr "數據"
+
+msgid "Statistics and Trends for Foreman gives users overview of their infrastructure."
+msgstr ""
+
+msgid "Submit"
+msgstr "提交"
+
+msgid "Trend Counter Job"
+msgstr ""
+
+msgid "Trend of the last %s days."
+msgstr "最後 %s 天的趨勢。"
+
+msgid "Trends"
+msgstr "趨勢"
+
+msgid "Trends for %s"
+msgstr "%s 的趨勢"
+
+msgid "Trends in Foreman allow you to track changes in your infrastructure over time. It allows you to track both Foreman related information and to any fact. The Trend pages give a graph of how the number of hosts with that value have changed over time, and list the current hosts."
+msgstr ""
+
+msgid "free memory"
+msgstr "可用記憶體"
+
+msgid "last %s day"
+msgid_plural "last %s days"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "used memory"
+msgstr "已使用的記憶體"

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/trends_controller_test.rb

@@ -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/trends_controller_test.rb

@@ -4,7 +4,6 @@ module ForemanStatistics
   class TrendsControllerTest < ActionController::TestCase
     setup do
       @routes = ForemanStatistics::Engine.routes
-      Setting::General.create(:name => 'max_trend', :default => 30, :description => 'Max days for Trends graphs')
     end
 
     let(:os_trend) { FactoryBot.create(:foreman_statistics_trend_os) }
@@ -50,12 +49,6 @@ module ForemanStatistics
           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&quot;:[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/unit/foreman_statistics/statistics_test.rb

@@ -50,19 +50,33 @@ module ForemanStatistics
       assert_kind_of Array, stat.calculate
     end
 
-    test 'it should initialize a host counter statistics object' do
-      stat = Statistics::CountHosts.new(:count_by => :compute_resource)
-      assert_kind_of Array, stat.calculate
-    end
+    describe 'CountHosts' do
+      test 'initializes a host counter statistics object' do
+        stat = Statistics::CountHosts.new(:count_by => :compute_resource)
+        assert_kind_of Array, stat.calculate
+      end
 
-    test 'it should fail to calculate a puppet class counter statistics object without an id' do
-      assert_raise(ArgumentError) { Statistics::CountPuppetClasses.new }
+      test 'calculates stats by given metric' do
+        host = FactoryBot.create(:host, :with_operatingsystem)
+        stat = Statistics::CountHosts.new(count_by: :operatingsystem, title: 'OS Distribution').calculate
+        _(stat).must_be_instance_of(Array)
+        _(stat.first[:data]).must_equal(1)
+        _(stat.first[:label]).must_equal(host.operatingsystem.to_label)
+      end
     end
 
-    test 'it should initialize a puppet class counter statistics object' do
-      stat = Statistics::CountPuppetClasses.new(:id => :classes)
-      assert_equal '/foreman_statistics/statistics/classes', stat.url
-      assert_kind_of Array, stat.calculate
+    context 'with puppet plugin' do
+      test 'it should fail to calculate a puppet class counter statistics object without an id' do
+        skip('no puppet plugin') unless Foreman::Plugin.find(:foreman_puppet)
+        assert_raise(ArgumentError) { Statistics::CountPuppetClasses.new }
+      end
+
+      test 'it should initialize a puppet class counter statistics object' do
+        skip('no puppet plugin') unless Foreman::Plugin.find(:foreman_puppet)
+        stat = Statistics::CountPuppetClasses.new(:id => :classes)
+        assert_equal '/foreman_statistics/statistics/classes', stat.url
+        assert_kind_of Array, stat.calculate
+      end
     end
 
     test 'it should fail to calculate a Fact class counter statistics object without count_by' do

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/__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]}