From 82462daa3d7fdaba5f3cb7fa6f315265dd3a93e4 Mon Sep 17 00:00:00 2001 From: Zack Lee Date: Fri, 11 Oct 2024 02:24:08 +0900 Subject: [PATCH 1/2] (Release) Fix the Not-Allowed Cursor Bug on Disabled Slide Toggles --- ...section-card-action-buttons.component.scss | 1 - frontend/projects/upgrade/src/styles.scss | 24 +++++++++++-------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-section-card-action-buttons/common-section-card-action-buttons.component.scss b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-section-card-action-buttons/common-section-card-action-buttons.component.scss index 559fcf3ba4..a5453942f5 100644 --- a/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-section-card-action-buttons/common-section-card-action-buttons.component.scss +++ b/frontend/projects/upgrade/src/app/shared-standalone-component-lib/components/common-section-card-action-buttons/common-section-card-action-buttons.component.scss @@ -17,7 +17,6 @@ .options-container { display: flex; column-gap: 4px; - cursor: not-allowed; .mat-mdc-icon-button:not(.mat-mdc-button-disabled) .mat-icon { color: var(--dark-grey); diff --git a/frontend/projects/upgrade/src/styles.scss b/frontend/projects/upgrade/src/styles.scss index fdda464024..66c9cec8ea 100755 --- a/frontend/projects/upgrade/src/styles.scss +++ b/frontend/projects/upgrade/src/styles.scss @@ -330,10 +330,20 @@ button[mat-icon-button] { } .mat-mdc-slide-toggle { - cursor: not-allowed; - .mdc-switch { + &:has(.mdc-switch--disabled) { + cursor: not-allowed; + + .mdc-label { + margin-left: 5px; + color: var(--dark-grey) !important; + cursor: not-allowed; + } + } + + .mdc-switch--disabled { cursor: not-allowed !important; - &--unselected { + + &.mdc-switch--unselected { .mdc-switch__track { opacity: 1.0 !important; &::before { @@ -350,7 +360,7 @@ button[mat-icon-button] { } } - &--selected { + &.mdc-switch--selected { .mdc-switch__track { opacity: 1.0 !important; &::after { @@ -367,12 +377,6 @@ button[mat-icon-button] { } } } - - .mdc-label { - margin-left: 5px; - color: var(--dark-grey) !important; - cursor: not-allowed; - } } // Material library doesn't expose any params to prevent content truncation for these widgets. From 211d4795c02f3e674fcfd8c6e93675058d741d80 Mon Sep 17 00:00:00 2001 From: danoswaltCL Date: Thu, 10 Oct 2024 16:12:52 -0400 Subject: [PATCH 2/2] version bump --- backend/package-lock.json | 4 ++-- backend/package.json | 2 +- backend/packages/Scheduler/package-lock.json | 4 ++-- backend/packages/Scheduler/package.json | 2 +- backend/packages/Upgrade/package-lock.json | 4 ++-- backend/packages/Upgrade/package.json | 2 +- clientlibs/java/pom.xml | 2 +- clientlibs/js/package-lock.json | 4 ++-- clientlibs/js/package.json | 2 +- frontend/package-lock.json | 4 ++-- frontend/package.json | 2 +- package-lock.json | 4 ++-- package.json | 2 +- types/package-lock.json | 4 ++-- types/package.json | 2 +- 15 files changed, 22 insertions(+), 22 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 64f13a3a55..8effc47933 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -1,12 +1,12 @@ { "name": "ab_testing_backend", - "version": "6.0.0-prerelease.1", + "version": "6.0.0-prerelease.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ab_testing_backend", - "version": "6.0.0-prerelease.1", + "version": "6.0.0-prerelease.3", "license": "ISC", "dependencies": { "dayjs": "^1.11.10", diff --git a/backend/package.json b/backend/package.json index c8cd8ee4ac..659013590f 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "ab_testing_backend", - "version": "6.0.0-prerelease.2", + "version": "6.0.0-prerelease.3", "description": "Backend for A/B Testing Project", "scripts": { "install:all": "npm ci && cd packages/Scheduler && npm ci && cd ../Upgrade && npm ci", diff --git a/backend/packages/Scheduler/package-lock.json b/backend/packages/Scheduler/package-lock.json index b7c155150b..96499cbe8f 100644 --- a/backend/packages/Scheduler/package-lock.json +++ b/backend/packages/Scheduler/package-lock.json @@ -1,12 +1,12 @@ { "name": "ppl-upgrade-serverless", - "version": "6.0.0-prerelease.1", + "version": "6.0.0-prerelease.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ppl-upgrade-serverless", - "version": "6.0.0-prerelease.1", + "version": "6.0.0-prerelease.3", "license": "MIT", "dependencies": { "jsonwebtoken": "^9.0.0", diff --git a/backend/packages/Scheduler/package.json b/backend/packages/Scheduler/package.json index 3fda044e9e..76110f0da6 100644 --- a/backend/packages/Scheduler/package.json +++ b/backend/packages/Scheduler/package.json @@ -1,6 +1,6 @@ { "name": "ppl-upgrade-serverless", - "version": "6.0.0-prerelease.2", + "version": "6.0.0-prerelease.3", "description": "Serverless webpack example using Typescript", "main": "handler.js", "scripts": { diff --git a/backend/packages/Upgrade/package-lock.json b/backend/packages/Upgrade/package-lock.json index 78b3dc6fa7..b382c662d2 100644 --- a/backend/packages/Upgrade/package-lock.json +++ b/backend/packages/Upgrade/package-lock.json @@ -1,12 +1,12 @@ { "name": "ab_testing_backend", - "version": "6.0.0-prerelease.1", + "version": "6.0.0-prerelease.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "ab_testing_backend", - "version": "6.0.0-prerelease.1", + "version": "6.0.0-prerelease.3", "license": "ISC", "dependencies": { "@aws-sdk/client-s3": "^3.633.0", diff --git a/backend/packages/Upgrade/package.json b/backend/packages/Upgrade/package.json index 7564dd467f..cd8010f90d 100644 --- a/backend/packages/Upgrade/package.json +++ b/backend/packages/Upgrade/package.json @@ -1,6 +1,6 @@ { "name": "ab_testing_backend", - "version": "6.0.0-prerelease.2", + "version": "6.0.0-prerelease.3", "description": "Backend for A/B Testing Project", "main": "index.js", "scripts": { diff --git a/clientlibs/java/pom.xml b/clientlibs/java/pom.xml index a6675ada40..8a4601baef 100644 --- a/clientlibs/java/pom.xml +++ b/clientlibs/java/pom.xml @@ -9,7 +9,7 @@ at the same time that happen to rev to the same new version will be caught by a merge conflict. --> - 6.0.0-prelease.0-prerelease.2 + 6.0.0-prelease.0-prerelease.3 diff --git a/clientlibs/js/package-lock.json b/clientlibs/js/package-lock.json index 25167425b8..68da0b99a2 100644 --- a/clientlibs/js/package-lock.json +++ b/clientlibs/js/package-lock.json @@ -1,12 +1,12 @@ { "name": "upgrade_client_lib", - "version": "6.0.0-prerelease.1", + "version": "6.0.0-prerelease.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "upgrade_client_lib", - "version": "6.0.0-prerelease.1", + "version": "6.0.0-prerelease.3", "license": "ISC", "dependencies": { "axios": "^1.4.0", diff --git a/clientlibs/js/package.json b/clientlibs/js/package.json index e727a222d5..dfbe338708 100644 --- a/clientlibs/js/package.json +++ b/clientlibs/js/package.json @@ -1,6 +1,6 @@ { "name": "upgrade_client_lib", - "version": "6.0.0-prerelease.2", + "version": "6.0.0-prerelease.3", "description": "Client library to communicate with the Upgrade server", "files": [ "dist/*" diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 663c6c192f..bbee1e2192 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "ab-testing", - "version": "6.0.0-prerelease.1", + "version": "6.0.0-prerelease.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "ab-testing", - "version": "6.0.0-prerelease.1", + "version": "6.0.0-prerelease.3", "license": "MIT", "dependencies": { "@angular/animations": "^17.1.2", diff --git a/frontend/package.json b/frontend/package.json index 7ce540d630..5866beb980 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "ab-testing", - "version": "6.0.0-prerelease.2", + "version": "6.0.0-prerelease.3", "license": "MIT", "scripts": { "ng": "ng", diff --git a/package-lock.json b/package-lock.json index 6015b4bdf0..9307b14d4a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "UpGrade", - "version": "6.0.0-prerelease.1", + "version": "6.0.0-prerelease.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "UpGrade", - "version": "6.0.0-prerelease.1", + "version": "6.0.0-prerelease.3", "license": "ISC", "devDependencies": { "@angular-eslint/eslint-plugin": "^14.1.2", diff --git a/package.json b/package.json index f18ca4826f..527034085f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "UpGrade", - "version": "6.0.0-prerelease.2", + "version": "6.0.0-prerelease.3", "description": "This is a combined repository for UpGrade, an open-source platform to support large-scale A/B testing in educational applications. Learn more at www.upgradeplatform.org", "main": "index.js", "devDependencies": { diff --git a/types/package-lock.json b/types/package-lock.json index 6500abe8a4..97de07815d 100644 --- a/types/package-lock.json +++ b/types/package-lock.json @@ -1,12 +1,12 @@ { "name": "upgrade_types", - "version": "6.0.0-prerelease.1", + "version": "6.0.0-prerelease.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "upgrade_types", - "version": "6.0.0-prerelease.1", + "version": "6.0.0-prerelease.3", "license": "ISC", "devDependencies": { "eslint": "^8.27.0", diff --git a/types/package.json b/types/package.json index b655e034b3..7f3e7b4d3b 100644 --- a/types/package.json +++ b/types/package.json @@ -1,6 +1,6 @@ { "name": "upgrade_types", - "version": "6.0.0-prerelease.2", + "version": "6.0.0-prerelease.3", "description": "", "main": "src/index.ts", "types": "src/index.ts",