Merge pull request #470 from AnalogJ/beta

AnalogJ · Apr 6, 2023 · 4192ac7 · 4192ac7
2 parents 8c65166 + 539c945
commit 4192ac7
Show file tree

Hide file tree

Showing 39 changed files with 8,873 additions and 28,582 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -55,7 +55,7 @@ The frontend is written in Angular. If you're working on the frontend and can us
     ```bash
     cd webapp/frontend
     npm install
-    npm run start -- --deploy-url="/web/" --base-href="/web/" --port 4200
+    npm run start -- --serve-path="/web/" --port 4200
     ```
 3. open your browser and visit [http://localhost:4200/web](http://localhost:4200/web)
 

diff --git a/Makefile b/Makefile
@@ -98,7 +98,6 @@ endif
 # reduce logging, disable angular-cli analytics for ci environment
 binary-frontend: export NPM_CONFIG_LOGLEVEL = warn
 binary-frontend: export NG_CLI_ANALYTICS = false
-binary-frontend: export NODE_OPTIONS = --openssl-legacy-provider
 binary-frontend:
 	cd webapp/frontend
 	npm install -g @angular/[email protected]
@@ -108,7 +107,6 @@ binary-frontend:
 
 .PHONY: binary-frontend-test-coverage
 # reduce logging, disable angular-cli analytics for ci environment
-binary-frontend-test-coverage: export NODE_OPTIONS = --openssl-legacy-provider
 binary-frontend-test-coverage:
 	cd webapp/frontend
 	npm ci

diff --git a/webapp/backend/pkg/database/scrutiny_repository_migrations.go b/webapp/backend/pkg/database/scrutiny_repository_migrations.go
@@ -325,6 +325,12 @@ func (sr *scrutinyRepository) Migrate(ctx context.Context) error {
 						SettingDataType:       "bool",
 						SettingValueBool:      false,
 					},
+					{
+						SettingKeyName:        "line_stroke",
+						SettingKeyDescription: "Temperature chart line stroke ('smooth' | 'straight' | 'stepline')",
+						SettingDataType:       "string",
+						SettingValueString:    "smooth",
+					},
 
 					{
 						SettingKeyName:        "metrics.notify_level",
@@ -348,6 +354,21 @@ func (sr *scrutinyRepository) Migrate(ctx context.Context) error {
 				return tx.Create(&defaultSettings).Error
 			},
 		},
+		{
+			ID: "m20221115214900", // add line_stroke setting.
+			Migrate: func(tx *gorm.DB) error {
+				//add line_stroke setting default.
+				var defaultSettings = []m20220716214900.Setting{
+					{
+						SettingKeyName:        "line_stroke",
+						SettingKeyDescription: "Temperature chart line stroke ('smooth' | 'straight' | 'stepline')",
+						SettingDataType:       "string",
+						SettingValueString:    "smooth",
+					},
+				}
+				return tx.Create(&defaultSettings).Error
+			},
+		},
 	})
 
 	if err := m.Migrate(); err != nil {

diff --git a/webapp/backend/pkg/models/settings.go b/webapp/backend/pkg/models/settings.go
@@ -14,6 +14,7 @@ type Settings struct {
 	DashboardSort    string `json:"dashboard_sort" mapstructure:"dashboard_sort"`
 	TemperatureUnit  string `json:"temperature_unit" mapstructure:"temperature_unit"`
 	FileSizeSIUnits  bool   `json:"file_size_si_units" mapstructure:"file_size_si_units"`
+	LineStroke       string `json:"line_stroke" mapstructure:"line_stroke"`
 
 	Metrics struct {
 		NotifyLevel            int `json:"notify_level" mapstructure:"notify_level"`

diff --git a/webapp/frontend/angular.json b/webapp/frontend/angular.json
@@ -52,7 +52,6 @@
                             "optimization": true,
                             "outputHashing": "all",
                             "sourceMap": false,
-                            "extractCss": true,
                             "namedChunks": false,
                             "extractLicenses": true,
                             "vendorChunk": false,
@@ -91,7 +90,6 @@
                 },
                 "test": {
                     "builder": "@angular-devkit/build-angular:karma",
-                    "defaultConfiguration": "production",
                     "options": {
                         "main": "src/test.ts",
                         "polyfills": "src/polyfills.ts",

diff --git a/webapp/frontend/karma.conf.js b/webapp/frontend/karma.conf.js
@@ -10,24 +10,24 @@ module.exports = function (config)
             require('karma-jasmine'),
             require('karma-chrome-launcher'),
             require('karma-jasmine-html-reporter'),
-            require('karma-coverage-istanbul-reporter'),
+            require('karma-coverage'),
             require('@angular-devkit/build-angular/plugins/karma')
         ],
-        client                  : {
+        client: {
             clearContext: false // leave Jasmine Spec Runner output visible in browser
         },
         coverageIstanbulReporter: {
             dir: require('path').join(__dirname, './coverage'),
             reports: ['html', 'lcovonly', 'text-summary'],
             fixWebpackSourcePaths: true
         },
-        reporters               : ['progress', 'kjhtml'],
-        port                    : 9876,
-        colors                  : true,
-        logLevel                : config.LOG_INFO,
-        autoWatch               : true,
-        browsers                : ['Chrome'],
-        singleRun               : false,
-        restartOnFileChange     : true
+        reporters: ['progress', 'kjhtml'],
+        port: 9876,
+        colors: true,
+        logLevel: config.LOG_INFO,
+        autoWatch: true,
+        browsers: ['Chrome'],
+        singleRun: false,
+        restartOnFileChange: true
     });
 };