mumuki-laboratory 9.2.0 → 9.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 575261b55ce7a6e70830f4c1ac284a4a0b627ed473b8c477101bab1ad670ef41
-  data.tar.gz: 827241baa6456ea5c2333750e338570accd833673eab4767214efee77148acb0
+  metadata.gz: 7fcf8057854fbb65bd0ddb801770c0d7a9de320735217bb50ac239d3c303651d
+  data.tar.gz: 6466a0bfca548fce3eb105daa98b9f9790616ad0009928efd7c46719fc9526d7
 SHA512:
-  metadata.gz: 41986c0a626ad255fad58aaf6b52b00e45c9957ae6127a590d619540e80915066999b35add1659862cda087d1c2cccb16505b78ee3c014a425186f361c458323
-  data.tar.gz: 728fffdbd64b00a85f022c0838f6d09dc7d089a5d85ed208a58034596378e5f7d0aa08bac8303e37c6603313b7b6220ea0f404b75810c141160799c9a64f4fc4
+  metadata.gz: fe7ff6eb305b615a33cea3d90be11d06b58acbeb7e6e6add7049bf632055d676e6a9cc475c88649a8341ca8038fe7d8b6ce7b8616ceef1a6d3094bdffba75422
+  data.tar.gz: d7fba0d3d8a4e3223efc8987649a482794be90958d5e6b618b4bce519e72b72b7e42cddaecf8f4f151ca864a8caa9a4b18369abe2c281c5c5d9e9cba99ca4f6a

data/app/assets/javascripts/mumuki_laboratory/application/profile.js

@@ -9,11 +9,10 @@ mumuki.load(function() {
   let avatarId = "";
   let avatarType = "";
 
-  let originalData = $userForm.serialize();
-  let originalProfilePicture = $userAvatar.attr('src');
+  toggleEditButtonIfRequiredFieldsNotCompleted();
 
   $userForm.on('change keyup', function() {
-    toggleEditButtonIfThereAreChanges();
+    toggleEditButtonIfRequiredFieldsNotCompleted();
   });
 
   $avatarItem.on('keypress click', function(e) {
@@ -25,26 +24,19 @@ mumuki.load(function() {
       const clickedAvatarType = $(this).attr('type');
       avatarId = clickedAvatarId || "";
       avatarType = clickedAvatarType || "";
-
-      toggleEditButtonIfThereAreChanges();
     });
   });
 
-  function toggleEditButtonIfThereAreChanges() {
-    let shouldEnable = requiredFieldsAreFilled() && (dataChanged() || avatarChanged());
-
-    $editButton.prop('disabled', !shouldEnable);
+  function toggleEditButtonIfRequiredFieldsNotCompleted() {
+    $editButton.prop('disabled', !requiredFieldsAreCompleted());
   }
 
-  const requiredFieldsAreFilled = () =>
-    $userForm.find('select, textarea, input').toArray().every(elem => {
+  function requiredFieldsAreCompleted() {
+    return $userForm.find('select, textarea, input').toArray().every(elem => {
       const $elem = $(elem);
       return !($elem.prop('required')) || !!$elem.val();
     });
-
-  const dataChanged = () => $userForm.serialize() !== originalData;
-
-  const avatarChanged = () => $userAvatar.attr('src') !== originalProfilePicture;
+  }
 
   $('#mu-user-image').on('keypress click', function(e){
     onClickOrSpacebarOrEnter($(this), e, function() {

data/app/controllers/concerns/organizations_controller_template.rb

@@ -26,6 +26,7 @@ module OrganizationsControllerTemplate
       .require(:organization)
       .permit(:book,
               :name,
+              :faqs,
               *Mumuki::Domain::Organization::Profile.attributes,
               *Mumuki::Domain::Organization::Theme.attributes,
               *(Mumuki::Domain::Organization::Settings.attributes - [:login_methods]),

data/app/helpers/profile_helper.rb

@@ -8,6 +8,6 @@ module ProfileHelper
   end
 
   def save_edit_profile_button(form)
-    form.submit t(:save), disabled: true, class: 'btn btn-complementary mu-edit-profile-btn'
+    form.submit t(:save), class: 'btn btn-complementary mu-edit-profile-btn'
   end
 end

data/lib/mumuki/laboratory/locales/en.yml

@@ -118,6 +118,7 @@ en:
   exam_registration_explanation_html: You have until <strong>%{date}</strong> to register. After that date, your request will be processed and you will receive a confirmation. <br> Don't forget to check the notifications!
   exam_registration_open: Registrations open for %{description}!
   exam_registration_to: Registration to %{description}
+  exams_will_be_here: Your exams in the organization will appear here.
   exams: Exams
   exercise: Exercise
   exercises: Exercises

data/lib/mumuki/laboratory/locales/es-CL.yml

@@ -118,6 +118,7 @@ es-CL:
   exam_registration_explanation_html: Tienes tiempo hasta el <strong>%{date}</strong> para inscribirte. Pasada esa fecha, tu solicitud será evaluada y recibirás una confirmación. <br> ¡No olvides revisar las notificaciones!
   exam_registration_open: ¡Ya puedes inscribirte a %{description}!
   exam_registration_to: Inscripción a %{description}
+  exams_will_be_here: Tus exámenes en esta organización aparecerán acá
   exams: Exámenes
   exercise: Ejercicio
   exercise_count: ejercicios

data/lib/mumuki/laboratory/locales/es.yml

@@ -126,6 +126,7 @@ es:
   exam_registration_explanation_html: Tenés tiempo hasta el <strong>%{date}</strong> para inscribirte. Pasada esa fecha, tu solicitud será evaluada y recibirás una confirmación. <br> ¡No te olvides de revisar las notificaciones!
   exam_registration_open: ¡Ya podés inscribirte a %{description}!
   exam_registration_to: Inscripción a %{description}
+  exams_will_be_here: Tus exámenes en esta organización aparecerán acá
   exams: Exámenes
   exercise: Ejercicio
   exercise_count: ejercicios

data/lib/mumuki/laboratory/locales/pt.yml

@@ -121,6 +121,7 @@ pt:
   exam_registration_explanation_html: Você tem tempo até <strong>%{date}</strong> para se inscrever. Após essa data, sua inscrição será avaliada e você receberá uma confirmação. <br> Não se esqueça de verificar as notificações!
   exam_registration_open: "¡Inscrições abertas para %{description}!"
   exam_registration_to: Inscrição a %{description}
+  exams_will_be_here: Seus Examesca nesta organização aparecerão aqui
   exams: Examesca
   exercise: Exercício
   exercise_count: exercícios

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '9.2.0'
+    VERSION = '9.3.0'
   end
 end

data/spec/controllers/organizations_api_controller_spec.rb

@@ -143,7 +143,8 @@ describe Api::OrganizationsController, type: :controller, organization_workspace
              logo_url: 'http://a-logo-url.com',
              theme_stylesheet: '.theme { color: red }',
              extension_javascript: 'window.a = function() { }',
-             terms_of_service: 'A TOS'}
+             terms_of_service: 'A TOS',
+             faqs: 'some faqs'}
           end
 
           it { expect(organization.public?).to eq false }
@@ -153,6 +154,7 @@ describe Api::OrganizationsController, type: :controller, organization_workspace
           it { expect(organization.theme_stylesheet).to eq ".theme { color: red }" }
           it { expect(organization.extension_javascript).to eq "window.a = function() { }" }
           it { expect(organization.terms_of_service).to eq 'A TOS' }
+          it { expect(organization.faqs).to eq 'some faqs' }
         end
 
         context 'with missing values' do

data/spec/features/profile_flow_spec.rb

@@ -73,19 +73,12 @@ feature 'Profile Flow', organization_workspace: :test do
     context 'user with uncompleted profile after saving' do
       before { user.update! last_name: 'last_name', birthdate: Time.now - 20.years, gender: 'female' }
 
-      let(:button_options) do
-        # Match :first is used because there are two buttons: mobile and desktop.
-        { class: 'mu-edit-profile-btn', match: :first }.tap do |options|
-          options.merge!(disabled: true) unless run_with_selenium?
-        end
-      end
-
       context 'when visiting an exercise' do
         scenario 'is redirected to previous path' do
           visit "/exercises/#{exercise.transparent_id}"
           fill_in('user_first_name', with: 'first_name')
 
-          click_on(button_options)
+          click_on(class: 'mu-edit-profile-btn', match: :first)
           expect(page).to have_text(exercise.description)
         end
       end
@@ -95,7 +88,7 @@ feature 'Profile Flow', organization_workspace: :test do
           visit "/user/edit"
           fill_in('user_first_name', with: 'first_name')
 
-          click_on(button_options)
+          click_on(class: 'mu-edit-profile-btn', match: :first)
           expect(page).to have_text('Your data was updated successfully')
           expect(page).to have_text('My profile')
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 9.2.0
+  version: 9.3.0
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-06 00:00:00.000000000 Z
+date: 2021-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails