Merge branch 'unstable' into button-in-edit-channel-details

Author: z-ABYa

.github/workflows/deploytest.yml

@@ -31,7 +31,7 @@ jobs:
     - name: Use pnpm
       uses: pnpm/action-setup@v4
     - name: Use Node.js
-      uses: actions/setup-node@v5
+      uses: actions/setup-node@v6
       with:
         node-version: '20.x'
         cache: 'pnpm'
@@ -61,13 +61,15 @@ jobs:
           ${{ runner.os }}-pyprod-
     - name: Install pip-tools and python dependencies
       run: |
-        python -m pip install --upgrade pip
+        # Pin pip to 25.2 to avoid incompatibility with pip-tools and 25.3
+        # see https://github.com/jazzband/pip-tools/issues/2252
+        python -m pip install pip==25.2
         pip install pip-tools
         pip-sync requirements.txt
     - name: Use pnpm
       uses: pnpm/action-setup@v4
     - name: Use Node.js
-      uses: actions/setup-node@v5
+      uses: actions/setup-node@v6
       with:
         node-version: '20.x'
         cache: 'pnpm'

.github/workflows/frontendtest.yml

@@ -31,7 +31,7 @@ jobs:
     - name: Use pnpm
       uses: pnpm/action-setup@v4
     - name: Use Node.js
-      uses: actions/setup-node@v5
+      uses: actions/setup-node@v6
       with:
         node-version: '20.x'
         cache: 'pnpm'

.github/workflows/pre-commit.yml

@@ -38,7 +38,7 @@ jobs:
     - name: Use pnpm
       uses: pnpm/action-setup@v4
     - name: Use Node.js
-      uses: actions/setup-node@v5
+      uses: actions/setup-node@v6
       with:
         node-version: '20.x'
         cache: 'pnpm'

.github/workflows/pythontest.yml

@@ -68,7 +68,7 @@ jobs:
                     -e "MINIO_ROOT_USER=development" \
                     -e "MINIO_ROOT_PASSWORD=development" \
                     -e "MINIO_DEFAULT_BUCKETS=content:public" \
-                    bitnami/minio:2024.5.28
+                    bitnamilegacy/minio:2024.5.28
     - name: Set up Python 3.10
       uses: actions/setup-python@v6
       with:
@@ -82,7 +82,9 @@ jobs:
           ${{ runner.os }}-pytest-
     - name: Install pip-tools and python dependencies
       run: |
-        python -m pip install --upgrade pip
+        # Pin pip to 25.2 to avoid incompatibility with pip-tools and 25.3
+        # see https://github.com/jazzband/pip-tools/issues/2252
+        python -m pip install pip==25.2
         pip install pip-tools
         pip-sync requirements.txt requirements-dev.txt
     - name: Test pytest

contentcuration/contentcuration/frontend/administration/components/ConfirmationDialog.vue

@@ -5,6 +5,12 @@
     :header="title"
     :text="text"
   >
+    <div
+      v-if="errorText"
+      class="error-text lighten-4 ma-3 pa-2 red red--text"
+    >
+      {{ errorText }}
+    </div>
     <template #buttons="{ close }">
       <VBtn
         flat
@@ -17,6 +23,7 @@
         color="primary"
         dark
         data-test="confirm"
+        :disabled="disableSubmit"
         @click="$emit('confirm')"
       >
         {{ confirmButtonText }}
@@ -55,6 +62,14 @@
         type: String,
         default: 'Cancel',
       },
+      errorText: {
+        type: String,
+        default: '',
+      },
+      disableSubmit: {
+        type: Boolean,
+        default: false,
+      },
     },
     computed: {
       show: {

contentcuration/contentcuration/frontend/administration/pages/Channels/ChannelActionsDropdown.vue

@@ -14,6 +14,8 @@
       v-model="makePublicDialog"
       title="Make channel public"
       :text="`All users will be able to view and import content from ${name}.`"
+      :error-text="communityChannelErrorMessage"
+      :disable-submit="isCommunityChannel"
       data-test="confirm-public"
       confirmButtonText="Make public"
       @confirm="makePublicHandler"
@@ -124,6 +126,7 @@
   import ConfirmationDialog from '../../components/ConfirmationDialog';
   import { RouteNames } from '../../constants';
   import { channelExportMixin } from 'shared/views/channel/mixins';
+  import { CommunityLibraryStatus } from 'shared/constants';
 
   export default {
     name: 'ChannelActionsDropdown',
@@ -160,6 +163,16 @@
           },
         };
       },
+      isCommunityChannel() {
+        const status = this.channel.latest_community_library_submission_status;
+        return status === CommunityLibraryStatus.APPROVED || status === CommunityLibraryStatus.LIVE;
+      },
+      communityChannelErrorMessage() {
+        if (this.isCommunityChannel) {
+          return 'This channel has been added to the Community Library and cannot be marked public.';
+        }
+        return '';
+      },
     },
     methods: {
       ...mapActions('channelAdmin', [

contentcuration/contentcuration/frontend/administration/pages/Users/UserActionsDropdown.vue

@@ -1,25 +1,32 @@
 <template>
 
   <div>
-    <ConfirmationDialog
-      v-model="deleteDialog"
+    <KModal
+      v-if="deleteDialog"
       title="Delete user"
-      :text="`Are you sure you want to permanently delete ${user.name}'s account?`"
-      confirmButtonText="Delete"
+      submitText="Delete"
+      cancelText="Cancel"
       data-test="confirm-delete"
-      @confirm="deleteHandler"
-    />
-    <ConfirmationDialog
-      v-model="deactivateDialog"
+      @submit="deleteHandler"
+      @cancel="deleteDialog = false"
+    >
+      <p>Are you sure you want to permanently delete {{ user.name }}'s account?</p>
+    </KModal>
+
+    <KModal
+      v-if="deactivateDialog"
       title="Deactivate user"
-      :text="
-        `Deactivating ${user.name}'s account will block them from ` +
-          `accessing their account. Are you sure you want to continue?`
-      "
-      confirmButtonText="Deactivate"
+      submitText="Deactivate"
+      cancelText="Cancel"
       data-test="confirm-deactivate"
-      @confirm="deactivateHandler"
-    />
+      @submit="deactivateHandler"
+      @cancel="deactivateDialog = false"
+    >
+      <p>
+        Deactivating {{ user.name }}'s account will block them from accessing their account. Are you
+        sure you want to continue?
+      </p>
+    </KModal>
     <UserPrivilegeModal
       v-model="addAdminPrivilegeDialog"
       header="Add admin privileges"
@@ -106,14 +113,13 @@
 <script>
 
   import { mapActions, mapGetters, mapState } from 'vuex';
-  import ConfirmationDialog from '../../components/ConfirmationDialog';
+
   import EmailUsersDialog from './EmailUsersDialog';
   import UserPrivilegeModal from './UserPrivilegeModal';
 
   export default {
     name: 'UserActionsDropdown',
     components: {
-      ConfirmationDialog,
       EmailUsersDialog,
       UserPrivilegeModal,
     },

contentcuration/contentcuration/frontend/administration/pages/Users/UserStorage.vue

@@ -41,23 +41,21 @@
         </template>
       </DropdownWrapper>
     </VLayout>
-    <VBtn
-      v-if="showCancel"
-      flat
-      class="ma-0 mr-4"
-      data-test="cancel"
-      @click="cancel"
-    >
-      Cancel
-    </VBtn>
-    <VBtn
-      class="ma-0"
-      color="primary"
-      type="submit"
-      data-test="submit"
-    >
-      Save changes
-    </VBtn>
+    <KButtonGroup>
+      <KButton
+        v-if="showCancel"
+        appearance="flat-button"
+        text="Cancel"
+        data-test="cancel"
+        @click="cancel"
+      />
+      <KButton
+        :primary="true"
+        text="Save changes"
+        type="submit"
+        data-test="submit"
+      />
+    </KButtonGroup>
   </VForm>
 
 </template>

contentcuration/contentcuration/frontend/administration/pages/Users/__tests__/userActionsDropdown.spec.js

@@ -71,8 +71,8 @@ describe('userActionsDropdown', () => {
     });
 
     it('confirm delete user should call deleteUser', async () => {
-      wrapper.find('[data-test="confirm-delete"]').vm.$emit('confirm');
-      await wrapper.vm.$nextTick();
+      await wrapper.findComponent('[data-test="delete"]').trigger('click');
+      wrapper.findComponent('[data-test="confirm-delete"]').vm.$emit('submit');
       expect(mocks.deleteUser).toHaveBeenCalledWith(userId);
     });
 
@@ -93,8 +93,8 @@ describe('userActionsDropdown', () => {
     });
 
     it('confirm deactivate should call updateUser with is_active = false', async () => {
-      wrapper.findComponent('[data-test="confirm-deactivate"]').vm.$emit('confirm');
-      await wrapper.vm.$nextTick();
+      await wrapper.findComponent('[data-test="deactivate"]').trigger('click');
+      wrapper.findComponent('[data-test="confirm-deactivate"]').vm.$emit('submit');
       expect(mocks.updateUser).toHaveBeenCalledWith({ id: userId, is_active: false });
     });
 

contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditLanguageModal.vue

@@ -178,7 +178,7 @@
           }),
         );
         /* eslint-disable-next-line kolibri/vue-no-undefined-string-uses */
-        await this.showSnackbarSimple(commonStrings.$tr('changesSaved'));
+        this.showSnackbarSimple(commonStrings.$tr('changesSaved'));
         this.close(this.changed);
       },
       showSnackbarSimple(message) {