From b3e7aa33f7741f3b6592b736af33b5998856a6db Mon Sep 17 00:00:00 2001 From: MisRob Date: Thu, 29 Feb 2024 09:50:23 +0100 Subject: [PATCH] Install KDS 3.0.1 Release notes - https://github.com/learningequality/kolibri-design-system/releases/tag/v3.0.0 - https://github.com/learningequality/kolibri-design-system/releases/tag/v3.0.1 --- kolibri/core/assets/src/views/UserTable/index.vue | 2 +- .../language-switcher/LanguageSwitcherModal.vue | 2 +- .../assets/src/views/sync/RadioButtonGroup.vue | 2 +- .../SelectDeviceModalGroup/SelectDeviceForm.vue | 4 ++-- .../src/views/sync/SelectSyncSourceModal.vue | 4 ++-- kolibri/core/package.json | 2 +- .../plan/CreateExamPage/CreateExamPreview.vue | 4 ++-- .../views/plan/assignments/AssignmentCopyModal.vue | 2 +- .../views/plan/assignments/RecipientSelector.vue | 2 +- .../PrimaryStorageLocationModal.vue | 2 +- .../RemoveStorageLocationModal.vue | 2 +- .../__test__/DeviceSettingsPage.spec.js | 4 ++-- .../assets/src/views/DeviceSettingsPage/index.vue | 14 +++++++------- .../SelectTransferSourceModal/DriveList.vue | 2 +- .../SelectImportSourceModal.vue | 6 +++--- .../facility/assets/src/views/UserCreatePage.vue | 4 ++-- .../facility/assets/src/views/UserEditPage.vue | 4 ++-- .../MediaPlayerLanguages/LanguagesMenuItem.vue | 2 +- .../setup_wizard/assets/src/views/JoinOrNewLOD.vue | 4 ++-- .../onboarding-forms/CreateLearnerAccountForm.vue | 4 ++-- .../onboarding-forms/FacilityPermissionsForm.vue | 4 ++-- .../onboarding-forms/FullOrLearnOnlyDeviceForm.vue | 4 ++-- .../views/onboarding-forms/GettingStartedForm.vue | 4 ++-- .../src/views/onboarding-forms/GuestAccessForm.vue | 4 ++-- .../onboarding-forms/HowAreYouUsingKolibri.vue | 4 ++-- .../RequirePasswordForLearnersForm.vue | 4 ++-- .../onboarding-forms/SetUpLearningFacilityForm.vue | 4 ++-- .../src/views/onboarding-forms/YesNoForm.vue | 4 ++-- .../src/views/ChangeFacility/SelectFacility.vue | 2 +- .../MeteredConnectionNotificationModal.vue | 4 ++-- packages/kolibri-core-for-export/package.json | 2 +- yarn.lock | 12 ++++++++---- 32 files changed, 64 insertions(+), 60 deletions(-) diff --git a/kolibri/core/assets/src/views/UserTable/index.vue b/kolibri/core/assets/src/views/UserTable/index.vue index d5aca01adff..e50d9bb651c 100644 --- a/kolibri/core/assets/src/views/UserTable/index.vue +++ b/kolibri/core/assets/src/views/UserTable/index.vue @@ -107,7 +107,7 @@ diff --git a/kolibri/core/package.json b/kolibri/core/package.json index 5fac3833773..409b964b581 100644 --- a/kolibri/core/package.json +++ b/kolibri/core/package.json @@ -21,7 +21,7 @@ "js-cookie": "^3.0.5", "knuth-shuffle-seeded": "^1.0.6", "kolibri-constants": "0.2.0", - "kolibri-design-system": "https://github.com/learningequality/kolibri-design-system#v2.0.0", + "kolibri-design-system": "3.0.1", "lockr": "0.8.5", "lodash": "^4.17.21", "loglevel": "^1.8.1", diff --git a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateExamPreview.vue b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateExamPreview.vue index 7a35e7128c8..3d00590cae0 100644 --- a/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateExamPreview.vue +++ b/kolibri/plugins/coach/assets/src/views/plan/CreateExamPage/CreateExamPreview.vue @@ -78,13 +78,13 @@ v-model="fixedOrder" :label="coachString('orderRandomLabel')" :description="coachString('orderRandomDescription')" - :value="false" + :buttonValue="false" /> diff --git a/kolibri/plugins/coach/assets/src/views/plan/assignments/AssignmentCopyModal.vue b/kolibri/plugins/coach/assets/src/views/plan/assignments/AssignmentCopyModal.vue index 505673420c1..107a71c4efe 100644 --- a/kolibri/plugins/coach/assets/src/views/plan/assignments/AssignmentCopyModal.vue +++ b/kolibri/plugins/coach/assets/src/views/plan/assignments/AssignmentCopyModal.vue @@ -14,7 +14,7 @@ :key="classroom.id" v-model="selectedClassroomId" :label="classroomLabel(classroom)" - :value="classroom.id" + :buttonValue="classroom.id" data-test="radio-button" /> diff --git a/kolibri/plugins/coach/assets/src/views/plan/assignments/RecipientSelector.vue b/kolibri/plugins/coach/assets/src/views/plan/assignments/RecipientSelector.vue index d959d983680..775c80a6f7c 100644 --- a/kolibri/plugins/coach/assets/src/views/plan/assignments/RecipientSelector.vue +++ b/kolibri/plugins/coach/assets/src/views/plan/assignments/RecipientSelector.vue @@ -3,7 +3,7 @@
diff --git a/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/RemoveStorageLocationModal.vue b/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/RemoveStorageLocationModal.vue index e96fbcb9faa..d4b8d094e70 100644 --- a/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/RemoveStorageLocationModal.vue +++ b/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/RemoveStorageLocationModal.vue @@ -15,7 +15,7 @@ v-for="path in storageLocations" :key="path.index" v-model="selectedPath" - :value="path" + :buttonValue="path" :label="path" /> diff --git a/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/__test__/DeviceSettingsPage.spec.js b/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/__test__/DeviceSettingsPage.spec.js index 50d0e053e17..6db3a810df8 100644 --- a/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/__test__/DeviceSettingsPage.spec.js +++ b/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/__test__/DeviceSettingsPage.spec.js @@ -126,10 +126,10 @@ describe('DeviceSettingsPage', () => { function assertIsSelected(button, expected) { /* * HACK(kds-test) The only way to tell it's checked in the DOM - * is to check if "value" and "currentValue" props have the same value + * is to check if "buttonValue" and "currentValue" props have the same value */ const buttonProps = button.props(); - const checked = buttonProps.value === buttonProps.currentValue; + const checked = buttonProps.buttonValue === buttonProps.currentValue; expect(checked).toBe(expected); } diff --git a/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/index.vue b/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/index.vue index 0b3a314a681..c0d87812274 100644 --- a/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/index.vue +++ b/kolibri/plugins/device/assets/src/views/DeviceSettingsPage/index.vue @@ -70,14 +70,14 @@ @@ -85,7 +85,7 @@ diff --git a/kolibri/plugins/device/assets/src/views/ManageContentPage/SelectTransferSourceModal/DriveList.vue b/kolibri/plugins/device/assets/src/views/ManageContentPage/SelectTransferSourceModal/DriveList.vue index b93943f5a0f..2e28604faee 100644 --- a/kolibri/plugins/device/assets/src/views/ManageContentPage/SelectTransferSourceModal/DriveList.vue +++ b/kolibri/plugins/device/assets/src/views/ManageContentPage/SelectTransferSourceModal/DriveList.vue @@ -16,7 +16,7 @@ v-for="drive in drives" :key="drive.id" :label="enabledDriveLabel(drive)" - :value="drive.id" + :buttonValue="drive.id" :currentValue="value" @change="$emit('input', drive.id)" /> diff --git a/kolibri/plugins/device/assets/src/views/ManageContentPage/SelectTransferSourceModal/SelectImportSourceModal.vue b/kolibri/plugins/device/assets/src/views/ManageContentPage/SelectTransferSourceModal/SelectImportSourceModal.vue index 5ffdd179f0d..fbc0f737a6c 100644 --- a/kolibri/plugins/device/assets/src/views/ManageContentPage/SelectTransferSourceModal/SelectImportSourceModal.vue +++ b/kolibri/plugins/device/assets/src/views/ManageContentPage/SelectTransferSourceModal/SelectImportSourceModal.vue @@ -9,7 +9,7 @@ diff --git a/kolibri/plugins/facility/assets/src/views/UserCreatePage.vue b/kolibri/plugins/facility/assets/src/views/UserCreatePage.vue index f608b6c1779..f48c3fe6ad7 100644 --- a/kolibri/plugins/facility/assets/src/views/UserCreatePage.vue +++ b/kolibri/plugins/facility/assets/src/views/UserCreatePage.vue @@ -54,14 +54,14 @@ :disabled="busy" :label="coreString('classCoachLabel')" :description="coreString('classCoachDescription')" - :value="true" + :buttonValue="true" /> diff --git a/kolibri/plugins/facility/assets/src/views/UserEditPage.vue b/kolibri/plugins/facility/assets/src/views/UserEditPage.vue index efb7db4dcf4..8c4be5d5d98 100644 --- a/kolibri/plugins/facility/assets/src/views/UserEditPage.vue +++ b/kolibri/plugins/facility/assets/src/views/UserEditPage.vue @@ -64,14 +64,14 @@ :disabled="formDisabled" :label="coreString('classCoachLabel')" :description="coreString('classCoachDescription')" - :value="true" + :buttonValue="true" /> diff --git a/kolibri/plugins/media_player/assets/src/views/MediaPlayerLanguages/LanguagesMenuItem.vue b/kolibri/plugins/media_player/assets/src/views/MediaPlayerLanguages/LanguagesMenuItem.vue index 8fb004c063b..cc690e9d9ac 100644 --- a/kolibri/plugins/media_player/assets/src/views/MediaPlayerLanguages/LanguagesMenuItem.vue +++ b/kolibri/plugins/media_player/assets/src/views/MediaPlayerLanguages/LanguagesMenuItem.vue @@ -5,7 +5,7 @@ ref="kRadioButton" name="languages-menu-item" :label="label" - :value="1" + :buttonValue="1" :currentValue="selected ? 1 : 0" @change="setLanguage(value)" @keydown.enter="setLanguage(value), $emit('hide')" diff --git a/kolibri/plugins/setup_wizard/assets/src/views/JoinOrNewLOD.vue b/kolibri/plugins/setup_wizard/assets/src/views/JoinOrNewLOD.vue index fadc0901869..662f37647ab 100644 --- a/kolibri/plugins/setup_wizard/assets/src/views/JoinOrNewLOD.vue +++ b/kolibri/plugins/setup_wizard/assets/src/views/JoinOrNewLOD.vue @@ -8,13 +8,13 @@

{{ getCommonSyncString('changeLater') }} diff --git a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/FacilityPermissionsForm.vue b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/FacilityPermissionsForm.vue index 3f2b79e693a..0ee1ea17e1e 100644 --- a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/FacilityPermissionsForm.vue +++ b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/FacilityPermissionsForm.vue @@ -11,7 +11,7 @@ ref="first-button" v-model="selected" class="permission-preset-radio-button" - :value="Presets.NONFORMAL" + :buttonValue="Presets.NONFORMAL" :label="$tr('nonFormalLabel')" :description="$tr('nonFormalDescription')" /> @@ -24,7 +24,7 @@ diff --git a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/FullOrLearnOnlyDeviceForm.vue b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/FullOrLearnOnlyDeviceForm.vue index e99f13dd900..31817e72a7c 100644 --- a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/FullOrLearnOnlyDeviceForm.vue +++ b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/FullOrLearnOnlyDeviceForm.vue @@ -7,13 +7,13 @@ diff --git a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/GettingStartedForm.vue b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/GettingStartedForm.vue index 6be5af6762f..00ca54a7568 100644 --- a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/GettingStartedForm.vue +++ b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/GettingStartedForm.vue @@ -6,13 +6,13 @@ > diff --git a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/GuestAccessForm.vue b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/GuestAccessForm.vue index 8a21c6b4d3d..81f8e949653 100644 --- a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/GuestAccessForm.vue +++ b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/GuestAccessForm.vue @@ -14,13 +14,13 @@ ref="yesRadio" v-model="setting" :label="$tr('yesOptionLabel')" - :value="true" + :buttonValue="true" />

{{ $tr('changeLater') }} diff --git a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/HowAreYouUsingKolibri.vue b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/HowAreYouUsingKolibri.vue index 30a432d786a..5ed028f17d3 100644 --- a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/HowAreYouUsingKolibri.vue +++ b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/HowAreYouUsingKolibri.vue @@ -9,13 +9,13 @@ diff --git a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/RequirePasswordForLearnersForm.vue b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/RequirePasswordForLearnersForm.vue index 1645bbcaae7..690f8cc08a0 100644 --- a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/RequirePasswordForLearnersForm.vue +++ b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/RequirePasswordForLearnersForm.vue @@ -13,14 +13,14 @@ v-model="setting" class="radio-button" :label="$tr('yesOptionLabel')" - :value="true" + :buttonValue="true" />

{{ getCommonSyncString('changeLater') }} diff --git a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/SetUpLearningFacilityForm.vue b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/SetUpLearningFacilityForm.vue index f4a4095ead1..d8c59ef38af 100644 --- a/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/SetUpLearningFacilityForm.vue +++ b/kolibri/plugins/setup_wizard/assets/src/views/onboarding-forms/SetUpLearningFacilityForm.vue @@ -8,13 +8,13 @@ diff --git a/kolibri/plugins/user_profile/assets/src/views/ChangeFacility/SelectFacility.vue b/kolibri/plugins/user_profile/assets/src/views/ChangeFacility/SelectFacility.vue index 658616f774d..d3ae9478646 100644 --- a/kolibri/plugins/user_profile/assets/src/views/ChangeFacility/SelectFacility.vue +++ b/kolibri/plugins/user_profile/assets/src/views/ChangeFacility/SelectFacility.vue @@ -23,7 +23,7 @@ diff --git a/packages/kolibri-common/components/MeteredConnectionNotificationModal.vue b/packages/kolibri-common/components/MeteredConnectionNotificationModal.vue index 30edec9fc27..3943f77a039 100644 --- a/packages/kolibri-common/components/MeteredConnectionNotificationModal.vue +++ b/packages/kolibri-common/components/MeteredConnectionNotificationModal.vue @@ -13,14 +13,14 @@ diff --git a/packages/kolibri-core-for-export/package.json b/packages/kolibri-core-for-export/package.json index 38330827095..f5349131469 100644 --- a/packages/kolibri-core-for-export/package.json +++ b/packages/kolibri-core-for-export/package.json @@ -24,7 +24,7 @@ "js-cookie": "^3.0.5", "knuth-shuffle-seeded": "^1.0.6", "kolibri-constants": "0.2.0", - "kolibri-design-system": "https://github.com/learningequality/kolibri-design-system#v2.0.0", + "kolibri-design-system": "3.0.1", "lockr": "0.8.5", "lodash": "^4.17.21", "loglevel": "^1.8.1", diff --git a/yarn.lock b/yarn.lock index 946479d0694..73e472612f2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4293,7 +4293,7 @@ data-urls@^3.0.2: whatwg-mimetype "^3.0.0" whatwg-url "^11.0.0" -date-fns@^1.28.2: +date-fns@^1.28.2, date-fns@^1.30.1: version "1.30.1" resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c" integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw== @@ -7583,13 +7583,16 @@ kolibri-constants@0.2.0: resolved "https://registry.yarnpkg.com/kolibri-constants/-/kolibri-constants-0.2.0.tgz#47c9d773894e23251ba5ac4db420822e45603142" integrity sha512-WYDMGDzB9gNxRbpX1O2cGe1HrJvLvSZGwMuAv6dqrxJgPf7iO+Hi40/1CXjHM7nk5CRt+hn5bqnMzCBmj1omPA== -"kolibri-design-system@https://github.com/learningequality/kolibri-design-system#v2.0.0": - version "1.3.0" - resolved "https://github.com/learningequality/kolibri-design-system#13e539592fd87508cd32f60e4ad22c1ec320559b" +kolibri-design-system@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/kolibri-design-system/-/kolibri-design-system-3.0.1.tgz#ba6368c78ffab1d6195b828b1aacc4f11b9a67c3" + integrity sha512-/O+KuYTGiv5z9VTlm8bIWZwanMdearGmIP162EqaVn2tIbo/hY42lsuAbGSTZPi5CITm+LJ9r99ogImDRH8z2w== dependencies: + "@vue/composition-api" "^1.7.2" aphrodite "https://github.com/learningequality/aphrodite/" autosize "^3.0.21" css-element-queries "^1.2.0" + date-fns "^1.30.1" frame-throttle "^3.0.0" fuzzysearch "^1.0.3" keen-ui "^1.3.0" @@ -7598,6 +7601,7 @@ kolibri-constants@0.2.0: purecss "^0.6.2" tippy.js "^4.2.1" vue-intl "^3.1.0" + xstate "^4.38.3" launch-editor-middleware@^2.6.1: version "2.6.1"