From 0b5c5552c3e69ab4dab32d3e03bc911c7a1a1c9a Mon Sep 17 00:00:00 2001
From: Chaoyue Zhao <czhao@gitlab.com>
Date: Fri, 22 Nov 2024 18:48:52 -0500
Subject: [PATCH 01/18] Add additional fields and optional slot to commit
 changes modal

Changelog: added
---
 .../javascripts/repository/components/commit_changes_modal.vue  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/assets/javascripts/repository/components/commit_changes_modal.vue b/app/assets/javascripts/repository/components/commit_changes_modal.vue
index 90535115a0e7e1..c7abb73ae32073 100644
--- a/app/assets/javascripts/repository/components/commit_changes_modal.vue
+++ b/app/assets/javascripts/repository/components/commit_changes_modal.vue
@@ -144,6 +144,7 @@ export default {
           variant: 'confirm',
           loading: this.loading,
           disabled: this.loading || !this.form.state,
+          'data-testid': 'commit-change-modal-commit-button',
         },
       };
 
@@ -260,6 +261,7 @@ export default {
     v-bind="$attrs"
     :modal-id="modalId"
     :title="title"
+    data-testid="commit-change-modal"
     :action-primary="primaryOptions"
     :action-cancel="cancelOptions"
     @primary="handlePrimaryAction"
-- 
GitLab


From ad73b405905bfa3493af887997216d3fda3d4953 Mon Sep 17 00:00:00 2001
From: Chaoyue Zhao <czhao@gitlab.com>
Date: Tue, 26 Nov 2024 12:32:00 -0500
Subject: [PATCH 02/18] Use commit changes modal for upload/replace blob

Changelog: changed
---
 .../projects/details/upload_button.vue        |   5 +
 .../javascripts/projects/upload_file.js       |   3 +-
 .../components/blob_button_group.vue          |  12 +-
 .../components/commit_changes_modal.vue       |  13 +-
 .../components/header_area/breadcrumbs.vue    |   7 +
 .../components/upload_blob_modal.vue          | 158 +++++-------------
 app/assets/javascripts/repository/index.js    |   2 +
 app/helpers/tree_helper.rb                    |   1 +
 app/presenters/project_presenter.rb           |   1 +
 locale/gitlab.pot                             |   9 +-
 scripts/frontend/quarantined_vue3_specs.txt   |   1 -
 .../files/user_replaces_files_spec.rb         |  13 +-
 spec/fixtures/sample.pdf                      | Bin 420 -> 18810 bytes
 .../components/blob_button_group_spec.js      |   2 -
 .../header_area/breadcrumbs_spec.js           |   4 +-
 .../components/upload_blob_modal_spec.js      | 133 ++++-----------
 spec/helpers/tree_helper_spec.rb              |  33 ++++
 spec/presenters/project_presenter_spec.rb     |   1 +
 .../project_upload_files_shared_examples.rb   |  24 +--
 19 files changed, 157 insertions(+), 265 deletions(-)

diff --git a/app/assets/javascripts/projects/details/upload_button.vue b/app/assets/javascripts/projects/details/upload_button.vue
index d2158c6d9d4b37..8baa64547a361d 100644
--- a/app/assets/javascripts/projects/details/upload_button.vue
+++ b/app/assets/javascripts/projects/details/upload_button.vue
@@ -22,6 +22,9 @@ export default {
     canPushCode: {
       default: false,
     },
+    canPushToBranch: {
+      default: false,
+    },
     path: {
       default: '',
     },
@@ -44,11 +47,13 @@ export default {
       >{{ __('Upload File') }}</gl-button
     >
     <upload-blob-modal
+      :ref="$options.uploadBlobModalId"
       :modal-id="$options.uploadBlobModalId"
       :commit-message="__('Upload New File')"
       :target-branch="targetBranch"
       :original-branch="originalBranch"
       :can-push-code="canPushCode"
+      :can-push-to-branch="canPushToBranch"
       :path="path"
     />
   </span>
diff --git a/app/assets/javascripts/projects/upload_file.js b/app/assets/javascripts/projects/upload_file.js
index a1b19abee6bed7..e25c30de3a23a0 100644
--- a/app/assets/javascripts/projects/upload_file.js
+++ b/app/assets/javascripts/projects/upload_file.js
@@ -8,7 +8,7 @@ export const initUploadFileTrigger = () => {
 
   if (!uploadFileTriggerEl) return false;
 
-  const { targetBranch, originalBranch, canPushCode, path, projectPath } =
+  const { targetBranch, originalBranch, canPushCode, canPushToBranch, path, projectPath } =
     uploadFileTriggerEl.dataset;
 
   return new Vue({
@@ -18,6 +18,7 @@ export const initUploadFileTrigger = () => {
       targetBranch,
       originalBranch,
       canPushCode: parseBoolean(canPushCode),
+      canPushToBranch: parseBoolean(canPushToBranch),
       path,
       projectPath,
     },
diff --git a/app/assets/javascripts/repository/components/blob_button_group.vue b/app/assets/javascripts/repository/components/blob_button_group.vue
index 0a9df26306cc28..b4b68e4d3cc00c 100644
--- a/app/assets/javascripts/repository/components/blob_button_group.vue
+++ b/app/assets/javascripts/repository/components/blob_button_group.vue
@@ -14,7 +14,6 @@ const REPLACE_BLOB_MODAL_ID = 'modal-replace-blob';
 export default {
   i18n: {
     replace: __('Replace'),
-    replacePrimaryBtnText: __('Replace file'),
     delete: __('Delete'),
   },
   components: {
@@ -85,12 +84,12 @@ export default {
     },
   },
   computed: {
-    replaceModalTitle() {
-      return sprintf(__('Replace %{name}'), { name: this.name });
-    },
     deleteModalId() {
       return uniqueId('delete-modal');
     },
+    replaceCommitMessage() {
+      return sprintf(__('Replace %{name}'), { name: this.name });
+    },
     deleteModalCommitMessage() {
       return sprintf(__('Delete %{name}'), { name: this.name });
     },
@@ -143,14 +142,13 @@ export default {
     <upload-blob-modal
       :ref="$options.replaceBlobModalId"
       :modal-id="$options.replaceBlobModalId"
-      :modal-title="replaceModalTitle"
-      :commit-message="replaceModalTitle"
+      :commit-message="replaceCommitMessage"
       :target-branch="targetBranch || ref"
       :original-branch="originalBranch || ref"
       :can-push-code="canPushCode"
+      :can-push-to-branch="canPushToBranch"
       :path="path"
       :replace-path="replacePath"
-      :primary-btn-text="$options.i18n.replacePrimaryBtnText"
     />
     <commit-changes-modal
       :ref="deleteModalId"
diff --git a/app/assets/javascripts/repository/components/commit_changes_modal.vue b/app/assets/javascripts/repository/components/commit_changes_modal.vue
index c7abb73ae32073..8a09ad21d9452f 100644
--- a/app/assets/javascripts/repository/components/commit_changes_modal.vue
+++ b/app/assets/javascripts/repository/components/commit_changes_modal.vue
@@ -95,7 +95,8 @@ export default {
     },
     emptyRepo: {
       type: Boolean,
-      required: true,
+      required: false,
+      default: false,
     },
     isUsingLfs: {
       type: Boolean,
@@ -107,6 +108,11 @@ export default {
       required: false,
       default: false,
     },
+    isPrimaryButtonDisabled: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
     handleFormSubmit: {
       type: Function,
       required: true,
@@ -143,8 +149,7 @@ export default {
         attributes: {
           variant: 'confirm',
           loading: this.loading,
-          disabled: this.loading || !this.form.state,
-          'data-testid': 'commit-change-modal-commit-button',
+          disabled: this.loading || !this.form.state || this.isPrimaryButtonDisabled,
         },
       };
 
@@ -261,7 +266,6 @@ export default {
     v-bind="$attrs"
     :modal-id="modalId"
     :title="title"
-    data-testid="commit-change-modal"
     :action-primary="primaryOptions"
     :action-cancel="cancelOptions"
     @primary="handlePrimaryAction"
@@ -275,7 +279,6 @@ export default {
           </template>
         </gl-sprintf>
       </p>
-
       <p>
         <gl-sprintf :message="$options.i18n.LFS_WARNING_SECONDARY_CONTENT">
           <template #link="{ content }">
diff --git a/app/assets/javascripts/repository/components/header_area/breadcrumbs.vue b/app/assets/javascripts/repository/components/header_area/breadcrumbs.vue
index 1f1c2f24c7aca0..d28db33096f701 100644
--- a/app/assets/javascripts/repository/components/header_area/breadcrumbs.vue
+++ b/app/assets/javascripts/repository/components/header_area/breadcrumbs.vue
@@ -79,6 +79,11 @@ export default {
       required: false,
       default: false,
     },
+    canPushToBranch: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
     selectedBranch: {
       type: String,
       required: false,
@@ -327,11 +332,13 @@ export default {
     </ol>
     <upload-blob-modal
       v-if="showUploadModal"
+      :ref="$options.uploadBlobModalId"
       :modal-id="$options.uploadBlobModalId"
       :commit-message="__('Upload New File')"
       :target-branch="selectedBranch"
       :original-branch="originalBranch"
       :can-push-code="canPushCode"
+      :can-push-to-branch="canPushToBranch"
       :path="uploadPath"
     />
     <new-directory-modal
diff --git a/app/assets/javascripts/repository/components/upload_blob_modal.vue b/app/assets/javascripts/repository/components/upload_blob_modal.vue
index d4b8fdcf584ba1..bb89855f3244d2 100644
--- a/app/assets/javascripts/repository/components/upload_blob_modal.vue
+++ b/app/assets/javascripts/repository/components/upload_blob_modal.vue
@@ -1,14 +1,5 @@
 <script>
-import {
-  GlModal,
-  GlForm,
-  GlFormGroup,
-  GlFormInput,
-  GlFormTextarea,
-  GlButton,
-  GlAlert,
-  GlFormCheckbox,
-} from '@gitlab/ui';
+import { GlButton } from '@gitlab/ui';
 import FileIcon from '~/vue_shared/components/file_icon.vue';
 import { createAlert } from '~/alert';
 import axios from '~/lib/utils/axios_utils';
@@ -17,52 +8,20 @@ import { numberToHumanSize } from '~/lib/utils/number_utils';
 import { visitUrl, joinPaths } from '~/lib/utils/url_utility';
 import { __ } from '~/locale';
 import UploadDropzone from '~/vue_shared/components/upload_dropzone/upload_dropzone.vue';
-import {
-  SECONDARY_OPTIONS_TEXT,
-  COMMIT_LABEL,
-  TARGET_BRANCH_LABEL,
-  TOGGLE_CREATE_MR_LABEL,
-} from '../constants';
-
-const PRIMARY_OPTIONS_TEXT = __('Upload file');
-const MODAL_TITLE = __('Upload new file');
-const REMOVE_FILE_TEXT = __('Remove file');
-const NEW_BRANCH_IN_FORK = __(
-  'GitLab will create a branch in your fork and start a merge request.',
-);
-const ERROR_MESSAGE = __('Error uploading file. Please try again.');
+import CommitChangesModal from '~/repository/components/commit_changes_modal.vue';
 
 export default {
   components: {
-    GlModal,
-    GlForm,
-    GlFormGroup,
-    GlFormInput,
-    GlFormTextarea,
     GlButton,
     UploadDropzone,
-    GlAlert,
     FileIcon,
-    GlFormCheckbox,
+    CommitChangesModal,
   },
   i18n: {
-    COMMIT_LABEL,
-    TARGET_BRANCH_LABEL,
-    TOGGLE_CREATE_MR_LABEL,
-    REMOVE_FILE_TEXT,
-    NEW_BRANCH_IN_FORK,
+    REMOVE_FILE_TEXT: __('Remove file'),
+    ERROR_MESSAGE: __('Error uploading file. Please try again.'),
   },
   props: {
-    modalTitle: {
-      type: String,
-      default: MODAL_TITLE,
-      required: false,
-    },
-    primaryBtnText: {
-      type: String,
-      default: PRIMARY_OPTIONS_TEXT,
-      required: false,
-    },
     modalId: {
       type: String,
       required: true,
@@ -83,6 +42,10 @@ export default {
       type: Boolean,
       required: true,
     },
+    canPushToBranch: {
+      type: Boolean,
+      required: true,
+    },
     path: {
       type: String,
       required: true,
@@ -95,43 +58,15 @@ export default {
   },
   data() {
     return {
-      commit: this.commitMessage,
-      target: this.targetBranch,
-      createNewMr: true,
       file: null,
       filePreviewURL: null,
-      fileBinary: null,
       loading: false,
     };
   },
   computed: {
-    primaryOptions() {
-      return {
-        text: this.primaryBtnText,
-        attributes: {
-          variant: 'confirm',
-          loading: this.loading,
-          disabled: !this.formCompleted || this.loading,
-        },
-      };
-    },
-    cancelOptions() {
-      return {
-        text: SECONDARY_OPTIONS_TEXT,
-        attributes: {
-          disabled: this.loading,
-        },
-      };
-    },
     formattedFileSize() {
       return numberToHumanSize(this.file.size);
     },
-    showCreateNewMrToggle() {
-      return this.canPushCode && this.target !== this.originalBranch;
-    },
-    formCompleted() {
-      return this.file && this.commit && this.target;
-    },
   },
   methods: {
     show() {
@@ -152,14 +87,16 @@ export default {
       this.file = null;
       this.filePreviewURL = null;
     },
-    submitForm() {
-      return this.replacePath ? this.replaceFile() : this.uploadFile();
+    submitForm(formData) {
+      return this.replacePath ? this.replaceFile(formData) : this.uploadFile(formData);
     },
-    submitRequest(method, url) {
+    submitRequest(method, url, formData) {
+      formData.append('file', this.file);
+
       return axios({
         method,
         url,
-        data: this.formData(),
+        data: formData,
         headers: {
           ...contentTypeMultipartFormData,
         },
@@ -168,27 +105,20 @@ export default {
           visitUrl(response.data.filePath);
         })
         .catch(() => {
+          createAlert({ message: this.$options.i18n.ERROR_MESSAGE });
+        })
+        .finally(() => {
           this.loading = false;
-          createAlert({ message: ERROR_MESSAGE });
         });
     },
-    formData() {
-      const formData = new FormData();
-      formData.append('branch_name', this.target);
-      formData.append('create_merge_request', this.createNewMr);
-      formData.append('commit_message', this.commit);
-      formData.append('file', this.file);
-
-      return formData;
-    },
-    replaceFile() {
+    replaceFile(formData) {
       this.loading = true;
 
-      // The PUT path can be geneated from $route (similar to "uploadFile") once router is connected
+      // The PUT path can be generated from $route (similar to "uploadFile") once router is connected
       // Follow-up issue: https://gitlab.com/gitlab-org/gitlab/-/issues/332736
-      return this.submitRequest('put', this.replacePath);
+      return this.submitRequest('put', this.replacePath, formData);
     },
-    uploadFile() {
+    uploadFile(formData) {
       this.loading = true;
 
       const {
@@ -198,22 +128,26 @@ export default {
       } = this;
       const uploadPath = joinPaths(this.path, path);
 
-      return this.submitRequest('post', uploadPath);
+      return this.submitRequest('post', uploadPath, formData);
     },
   },
   validFileMimetypes: [],
 };
 </script>
 <template>
-  <gl-form>
-    <gl-modal
-      :ref="modalId"
-      :modal-id="modalId"
-      :title="modalTitle"
-      :action-primary="primaryOptions"
-      :action-cancel="cancelOptions"
-      @primary.prevent="submitForm"
-    >
+  <commit-changes-modal
+    :ref="modalId"
+    :modal-id="modalId"
+    :commit-message="commitMessage"
+    :target-branch="targetBranch"
+    :original-branch="originalBranch"
+    :can-push-code="canPushCode"
+    :can-push-to-branch="canPushToBranch"
+    :is-primary-button-disabled="!file || loading"
+    :handle-form-submit="submitForm"
+    data-testid="upload-blob-modal"
+  >
+    <template #body>
       <upload-dropzone
         class="gl-mb-6 gl-h-26"
         single-file-selection
@@ -240,22 +174,6 @@ export default {
           >
         </div>
       </upload-dropzone>
-      <gl-form-group :label="$options.i18n.COMMIT_LABEL" label-for="commit_message">
-        <gl-form-textarea v-model="commit" name="commit_message" :disabled="loading" no-resize />
-      </gl-form-group>
-      <gl-form-group
-        v-if="canPushCode"
-        :label="$options.i18n.TARGET_BRANCH_LABEL"
-        label-for="branch_name"
-      >
-        <gl-form-input id="branch_name" v-model="target" :disabled="loading" name="branch_name" />
-      </gl-form-group>
-      <gl-form-checkbox v-if="showCreateNewMrToggle" v-model="createNewMr" :disabled="loading">
-        {{ $options.i18n.TOGGLE_CREATE_MR_LABEL }}
-      </gl-form-checkbox>
-      <gl-alert v-if="!canPushCode" variant="info" :dismissible="false" class="gl-mt-3">
-        {{ $options.i18n.NEW_BRANCH_IN_FORK }}
-      </gl-alert>
-    </gl-modal>
-  </gl-form>
+    </template>
+  </commit-changes-modal>
 </template>
diff --git a/app/assets/javascripts/repository/index.js b/app/assets/javascripts/repository/index.js
index 33127a165f8bf4..b3a368bd6e7572 100644
--- a/app/assets/javascripts/repository/index.js
+++ b/app/assets/javascripts/repository/index.js
@@ -223,6 +223,7 @@ export default function setupVueRepositoryList() {
       canCollaborate,
       canEditTree,
       canPushCode,
+      canPushToBranch,
       selectedBranch,
       newBranchPath,
       newTagPath,
@@ -249,6 +250,7 @@ export default function setupVueRepositoryList() {
             currentPath: this.$route.params.path,
             refType: this.$route.query.ref_type,
             canCollaborate: parseBoolean(canCollaborate),
+            canPushToBranch: parseBoolean(canPushToBranch),
             canEditTree: parseBoolean(canEditTree),
             canPushCode: parseBoolean(canPushCode),
             originalBranch: ref,
diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb
index 52b9872b793520..f46b5852adfe62 100644
--- a/app/helpers/tree_helper.rb
+++ b/app/helpers/tree_helper.rb
@@ -115,6 +115,7 @@ def breadcrumb_data_attributes
     attrs = {
       selected_branch: selected_branch,
       can_push_code: can?(current_user, :push_code, @project).to_s,
+      can_push_to_branch: user_access(@project).can_push_to_branch?(@ref).to_s,
       can_collaborate: can_collaborate_with_project?(@project).to_s,
       new_blob_path: project_new_blob_path(@project, @ref),
       upload_path: project_create_blob_path(@project, @ref),
diff --git a/app/presenters/project_presenter.rb b/app/presenters/project_presenter.rb
index 59a83133f90fcc..52a70c1184e2b7 100644
--- a/app/presenters/project_presenter.rb
+++ b/app/presenters/project_presenter.rb
@@ -266,6 +266,7 @@ def upload_anchor_data
           'target_branch' => default_branch_or_main,
           'original_branch' => default_branch_or_main,
           'can_push_code' => 'true',
+          'can_push_to_branch' => can_current_user_push_to_branch?(current_ref).to_s,
           'path' => project_create_blob_path(project, default_branch_or_main),
           'project_path' => project.full_path
         }
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 6cc5ed9ebc4c26..8ecd78ccc47498 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -46178,6 +46178,12 @@ msgstr ""
 msgid "Replace file"
 msgstr ""
 
+msgid "Replace image"
+msgstr ""
+
+msgid "Replace video"
+msgstr ""
+
 msgid "Replaced all labels with %{label_references} %{label_text}."
 msgstr ""
 
@@ -59589,9 +59595,6 @@ msgstr ""
 msgid "Upload file"
 msgstr ""
 
-msgid "Upload new file"
-msgstr ""
-
 msgid "Uploaded date"
 msgstr ""
 
diff --git a/scripts/frontend/quarantined_vue3_specs.txt b/scripts/frontend/quarantined_vue3_specs.txt
index 14c0ef9ed39076..6f8732c041b299 100644
--- a/scripts/frontend/quarantined_vue3_specs.txt
+++ b/scripts/frontend/quarantined_vue3_specs.txt
@@ -282,7 +282,6 @@ spec/frontend/releases/components/tag_create_spec.js
 spec/frontend/releases/components/tag_field_exsting_spec.js
 spec/frontend/releases/components/tag_search_spec.js
 spec/frontend/repository/components/header_area/blob_controls_spec.js
-spec/frontend/repository/components/header_area/breadcrumbs_spec.js
 spec/frontend/repository/components/table/index_spec.js
 spec/frontend/repository/components/table/row_spec.js
 spec/frontend/repository/router_spec.js
diff --git a/spec/features/projects/files/user_replaces_files_spec.rb b/spec/features/projects/files/user_replaces_files_spec.rb
index 148ccd9e399021..926efbd4c2cb8d 100644
--- a/spec/features/projects/files/user_replaces_files_spec.rb
+++ b/spec/features/projects/files/user_replaces_files_spec.rb
@@ -48,12 +48,11 @@
       click_on('Replace')
       find(".upload-dropzone-card").drop(File.join(Rails.root, 'spec', 'fixtures', 'doc_sample.txt'))
 
-      page.within('#modal-replace-blob') do
+      within_testid('upload-blob-modal') do
         fill_in(:commit_message, with: 'Replacement file commit message')
+        click_button('Commit changes')
       end
 
-      click_button('Replace file')
-
       expect(page).to have_content('Lorem ipsum dolor sit amet')
       expect(page).to have_content('Sed ut perspiciatis unde omnis')
       expect(page).to have_content('Replacement file commit message')
@@ -89,10 +88,9 @@
 
       page.within('#modal-replace-blob') do
         fill_in(:commit_message, with: 'Replacement file commit message')
+        click_button('Commit changes')
       end
 
-      click_button('Replace file')
-
       expect(page).to have_content('Replacement file commit message')
 
       fork = user.fork_of(project2.reload)
@@ -124,14 +122,13 @@
       click_on('Replace')
 
       epoch = Time.zone.now.strftime('%s%L').last(5)
-      expect(find_field(_('Target branch')).value).to eq "#{user.username}-protected-branch-patch-#{epoch}"
+      expect(find_field(_('Commit to a new branch')).value).to eq "#{user.username}-protected-branch-patch-#{epoch}"
       find(".upload-dropzone-card").drop(File.join(Rails.root, 'spec', 'fixtures', 'doc_sample.txt'))
       page.within('#modal-replace-blob') do
         fill_in(:commit_message, with: 'Replacement file commit message')
+        click_button('Commit changes')
       end
 
-      click_button('Replace file')
-
       expect(page).to have_content('Replacement file commit message')
 
       expect(page).to have_current_path(project_new_merge_request_path(project3), ignore_query: true)
diff --git a/spec/fixtures/sample.pdf b/spec/fixtures/sample.pdf
index 81ea09d7d12267293c04bc0ad1bd938a70bf4187..c01805e89c1684e79130151abc23bb80401583a9 100644
GIT binary patch
literal 18810
zcmY!laB<T$)HCK%J@WL^)7Q&CFSu~z7?+8HfkJ*#7MG2Ug1%2`UV2G}f~kUmLXd*K
zTV_s4YLSAzTTWt0s!M8eeoCr>ogG(kNl|KIE>{KP+^Ex&Zo3KXd93~GMCXT|o4j`Y
zaW}g@9J{61etdU3ue^bZNftXt5R1Y5-S;=myc)_Iuq37To8Y5{UboV)uxreJUep!K
z-<A0v`}4uI+Yiod{oS8^_j|t8`?9&8*WIrD^|#u*KH}_Cdp*DXIt9l2b)MJlo|S)T
ztswu0O|Rzt{~)=$`S<a~+Tky?{>8FCf3E$#qTv4iul&W&yN`d*`&M0QVY;>Y`{Ucz
z-+xU1{ZjDQxt%Z5&Av$2o^dnNalU0>bB6o<j)#xiZ&?0WUlhA#?cM*gejVH^8};4p
z@BhS_8@<m(3}ie6H&!dL9S%>e^7B0WbI$)=H~05Fw|;&-FHHX3oxj(1&pf>U>7}!e
zR!Udo?$vv8E9rIG?_}lI&QZ_2V_qknw>Eoui7kAU^WFM#cK4U7c=z3wy}j<<*HZf{
z&v!qP`~BI{E@63=y#L1AN54hRKa-!~dH0B1dy9FA;k&Bu3tzojCTSJJuex93-Cr5`
zd*Qop9MSvKE%f}Mn#r>r{qFA))qb=3tot6*>i<dOPHhMOjhFu4f1H1^SGr*m=X{1;
z_hOiTrCEggZ<Md_`Vl#A!vW4+jP5ok8=K@Zm}l3?&RQn)VzQ~ptEG7f_q6WrZYkA0
z_qE~glRfY1Iv@YN;=VI??z)c^v9%VAG0ShPQ?rZFP>@^QE@!P<qTRpT<iqI;j4u|H
z=M{XMd+CuxbVbnlhs<^%zJDx2*ez!0DE^CHv;Mqjrh?u2`LE>;>=Qei8|e|_`?B&^
zfTaEJ;#PJEXWQIcvi$9j|9Px?$#_~}+a1v*Una(En9L^kRlu>#)qc%K#w~Y_JKz20
zRBF$j=)t*v&hAJnRiz+3Ryp4eXMr6WDskPMKZ12RymvfWzwmYcrnIHfi3in|IDE>E
zVA4NeRx=^=3-=zrvIpnGABjDioqeY+ueyTq!d>SrPb8m8ol$DawoQ&aWU`BQ-u8e9
zooPqkoZYEZP<864%=64uI>M&B%lDe>x%23XZ;hPP&B&j@lO%RO<T+)`amF<IPRRC;
z4$Bh#@9l5+a<*>8?OjZ#r%Cm9i`td!-nH`l#@`lKBGjWBw(^u5<h=eRvD?zFBXFDg
zmzrzcZZ(o;l~(>v^<nQgCCdGOZqMr7c6PkI0j(F03Rl?G$qPENyD=#|y~_J<s)gX;
zYh4UNT+JfSpL6ci6R4QT@Nc2G?c9W-wxcRjbkwry)4jId=56mQP&>MqgK-O2&4R62
zCe6=PzlpAkwD`fhFXZUf&1*k8t~vbpzfRoJUPjJ`T<)Tr`#l>4R`kyblDIxaggK3u
zW&SL#i=6vb-fY|@7p=3ngImQr{>(Y&da?OBXY=HqJ{GWE7qX0PnSQXx;uM9ae$JnT
zqEGlFnn~Pq@#M_rb3SNrF(<$4rR|y8mFEnfs#@Qd`R0^3@8rYQw_QsNnKv%n;qtXq
zQe7uMLq+3YieUVzW}A7pR3EG<*lKO&dq+|JEvtpMqN<?Fth5#_Ywu6~DJOTxPP52i
zDGq7+?x|84c2mApKqC0~_tM?$SG;Y@JZ~AKKD@ANOUfxP!_MxP-zH^#Xt8Mhbxre}
z@9NW6_Xy}+YD|+`d69XC+{@+v*j|L0rxf)}(>W@{Html}<BLqq={}r1%JHkF7^|or
z3)VXl9{oXQr+Ch`=!c)~x4&bVlXSh2XKAf-m+8k&(}^iMIrAcY7N&h=67bPyF0=`$
z)lc=?r*$*_)CSgXlP6^~w??%;JtI=ld-J!`VdlRFru@At?zngDv<uT#Yy59Wj=E&m
z9lGqztY`anYggnIoiMiDx~5T~<bY{x?4w8TgBD**S(nVZv?=w=w~+oUhk}JBmr~EH
zv0w75<@Q<OzcW%os)9~-{B^iEJ=yq+`pNn=Qa@(AT{Pp)`CmNYl3MRyKeY5}J$!b@
z6ux@NS(h(_dq$~mYyNZA{L19SYG>o+dj$JFJoJ{C%XGY7b56#R2OZv)6CZ@Ae|C{q
ztrB*WaWY-X;-ss-f8(@==RZH5&z#y~x=2;|*`^R>G2@kjk#Pme?>TvdIsaW~ICd*U
zB|ufgK8!i`tIX8XE1h%`T#w#U%$Rt{gdwkN?-Z4#Nj}HxXRdv5XPxu{p+CD*vc>Av
zUmogwY<EBGZcn37`<^?ZxmS00t`nTP;n2pV!IzXDFvT#i$_4J4UNd8LVOZauttm71
zTZfmjFFbO;lDVdS?rxKHOsOkmZ^>?PTR7#)(j^<O=@>XAZIylyv!jh)Cqa8p!n#KN
zqW3D6AzsljA?9tW+m`Dbx^iB9^X&tTN5c=89$)_0^5pFB!%IEi6izjLA;vlXPr#;$
z2`gs{KTceI<f-e@Wfq&%Zu5J1?W}UO4$csg;n%c1$L)1#n^#&yx^}FZnVUdF{mYrB
z>qV!m-L~8@>Q~dhEVV~b%nl*vdeW5>kIpa6;OUO}y?39g?nVB%M5}LSRs@Jz+)$YN
z{9VPgWfxzmy!z<6{#}pVj^;^?!T~*=B4V!gYNA|RMq*z#-aY#Ff>Doe?2J<v1esH1
zcBZahpygNF|9dyn^w!rmo^4W9?*GW!x>xeX@}%(7^X}~J^_O3EMSI_>V*QJ|Vh>JX
zxmY7@^Gr^-(Y*3@Lq=?Am+9+((^nhU9JZXZ^;=`?<f8(MS+_i8v_1SZpj6iIfQ?%0
zlq>6<_A)yci~8tJo#gZJqr~G3&!`nvi`x%uU3t%8<5lT-qHj-|NZi<TiSLwoL)}V^
z*Xx%{N^jKuvt+BLPI7fv$g#Z1#e69(u>m|6jb<or*bsE>QPxx&zBZAlJ}Iw=HB7lX
ze&1QRLFe|0evWvq5O1?O-ap4r`n;33SviH%d%DlOt?kq2vn^oW9@u^91$Wz~R_!&)
zA8KBuL^VB~f89}5BW~Lq?k~>a2~likl}@M$1*`g;l3>hAU+`Ca?WXWWtV*-oisvYt
zRMc>f5{^>i6>6BqpriHvViVKrs&=olQF9KMl>95mDZi9*BjfbtbzI!B(-`=oQYt)F
z2JB<~wq-G2W^vb!2S-wwbT)32>W$g{@_gQmC%>B(KbSrFmVX1QRrrCvsWDnVC%&Jd
z_?prE#9p@NJm;UkQhg`6d>SK@Ym}IjhHCcWi5KPssH`cB)0`zyZCd6x>10ZuF3+5p
z8Ou!;H6L)%nc=F-$ji~0=d~))JtmRSV}93v7sZ@4!Z)Tqy{W4(Ws2U^?bmkSKM=6v
zV#5{At%rU*xb)?iue9ZlyUQNLKVSZ}m*L0Gy~WF_bTas_Hf-yf5>)$v<yFx4Aj$rT
z><_2K<o|j6Cb}v}=<1`!y7NcR?|rJJwZ$TGTB32=1CJVI=1P6ttsmo}W_BNP+<Bnq
zAcy9fy&qK?pIwrf^QPn9g6z^o+DDuD)@KUs^%Y+F&&gm<S;St4)I_^8m;ZN`Oi<IY
zJ7AHJqRimGDAKk`=%SJfo7~%pmJ@u$D;15bCLYys)i>e~i!lBBJLG+&+Y_Cm8J8C>
zeygwCB6W4OyV!)gJ5LBLKPmt5!gYR!5CNrYD^~rSX?gCHo9tF4hr({tx`;1cE8~*3
zWhg9ja9BJ4nVm&|U#-p2e)kvZ7X-x=TUK7-y%)G;VnM^MB&C13+2<^{%f9V-qG=SQ
zcrYk#g7nfaip(Kg9b313x^cFpg;)FFUTwGK0qtAvZFtge`youzzcfiIs4L{b&l;Oo
zHaW8ocXsLhyp__EIQ4jJmW8}s;3xg2>do>I_oVioDvUX2=HmIPR${`1DAB0CiGf@*
z(}Vwr>BkskNzP8Ra9GY@HX*h9D3egSZ?5g~t2@m2Jb#GKKm46L^V15x4^tGS>k=D%
z1#FsQmT4BOoVmHxQcRLFapT-m6Q@0^;9jzm?`ba6`@`Ejmj6^*W}e-x+L6>Ub%nk|
zglEJzJwDl~vjf9;1NVtt%-9mie*BivWhG|OiKbR^-Fnh<ZdI-fS2xM2oigw23(duh
zE4402t^EJurp?ve+8$*G-JEtmi!k)Rrs29XtyOiVNO4Zu;#kw8X%jP7tzG(c;>*K1
zDV|y)Ke+<BPwz_Nytt2Hs(z6A+9t)5?h$Hf{%4zY4HGBbiVvMUHODV^r{aWJMW2>k
z-sSwPtxzP{*`qIR+0nJK6W97=^%Xx$+-aJ5q@mqy{g*?JU!1vdK+2~ir)t@ie+zya
zs&_@n-xfT%e(i;6C#u3dvb@`G3H<IC?)#(W9sf7;bCYre8z0Xh|K$(OZcIIweI})K
zW4nIMB?&=kRe8_1bJSGXWOg0AvS5N^m#f0N6@M;23A;D>)!#kZ{ET|7wKDs&WPa*O
z9`O8Q?!z;E`?K}t>TQ!YnEwC3^UNwLJ$6?5rZ(Y&6SK}N_@vhRaM@f|_9vo7(r$NO
z?odg6<&zS+>qO>h7dc+{dp4R@7u=sRb@csOx~g1a&xsqcohN;cHJtqH8sqQz@DPI}
z-~N4CQTL>Fewy1KytnM--}WC8@9pL0JSjbX=*_`Ix3|mmBV@Atrt3^J;&rIscVNd%
z=I|Muv8+e*kAD`9U$!E}!*LaJSYbq=|Ji3-_={E^^#9|&O}SC>ZUH;Dz}3iep_3Lc
zBxMPkcJ<A@l2cRPVS4FQkElXxnA=wF#X`<1{`%r-erHYwyQRHMmoWVOv2mBHRNsbk
z$6Z&?neq1(<H40B!qb+OdoF%(Vtw<zMXE6e*J;-rKYX)7r$>-SUdmPVLFt33A6)hx
z2+XR=UiNCC^1O7(;+H?TeAgamO^$r~>ZaHYgVI(lw+ZQ1H;$+GSbjJxzh+yGb}Hwj
z`F|r4wVY*E?eSdy?9zMj8=DWzc(<dw>B$d|2R$2~eViS)VC{t9^$QMb>-KmWsy43u
zwwvRSYMyDVnoE0E`ziH9`H=;J`G-3?s^)vX3z@5^DzUEfpUSh3Ulk-~YwO4fNo{OS
zD_XMS%6;{X7p&d)bRCzj%F7n^{lug1_R@W-$a%fLTK*h+6T~N+7Tp_lO#aA{dpvI4
z^EWU`_3M9nUsmI+v)*A#o9mlf%kO`U$a}ij`tM5tE0fC%|DLE#<+aeX>ked@WLz|N
zQ`XgHsT(cLLfTt%k8)1Ccx$sw>lDT$<__Z>JWg%B$vI2+-_>3(Y0CPJEg@&&o0BQO
zCr*0nP~Ue{?v2Uej~1CharzHdM^BEKDC!gN#iFK|JGHGe%)N4&*yO?xG3iNciE8?y
zpS6GMioCcizjBFHe461c?cj4CvZahdSF}{BJebEPKH2|idQ8-}+Y)_qZ>E$i`1i<K
zxl*4s)O<z6wg~Nm7XBPv$^W0RzB~Ibp||evj}?<;`w|(a`WDpvwqIVAe~~LSF9q63
zPR&aJ^{qi2Y7lK~VP*!B1+k5g`rRRw1*r=90g35gvM4pLM8O!+2M<au&Mz%WPAyh2
zg9te1=ar=9l@u$0`t3mq`o5_tnTbyM6$;S?3I+;hhDHkJmPWB$c6Km(K>9%Tf%^9W
zMfu6WsU-^03i<&qZVLJ#sTCy(u?qUm`8oMT!3BxQsR|%v&c%ib=3wjW>=g9f^7Bf-
z!fu9o1_~A+aV~u~V?6@}Ly(oAfdV5v0|iTvgo2$NXovvnZ9_vOKl(t%77RiD4pPwf
zQ!rG}cg!hCEy_zQNmbByNiEAvPIWIztRy_}&>H0LArdI_@2r_nONV1?MMpUo=Tyx#
zYZlxpD~+6*8$I>XB8l|-yB2RYzC8P;>Cwq7v5Ra<`4=UZyt%M&_Vh&u)_7l6SgF8a
zQ~Kif**C8=TJkHc@BjY$x9)zmOYYod@2xc*LyDcJYA;=$=jYqqEU)P*d&Mtendpy~
zNrgQdU+<i>fA{rk>6dP7x_5kQ+3#<*Tc@TbD8AC&wq4+t;>0ut`I+-IQX4iOke#;v
zh8?3#1m7B|56X*}`Dg7kxO{O=$<j@_6N8^E($HF;WbL``_s^Zj_H}RVZ2lM1pLVTp
z@8(ylF8W;A^4(?O9{zPMlIP<?zU7#TEa!bZ$HQ4l^V7Pk_qBbF3r^G)@L~%xP1!j=
z%WrP!gHnmzvAZTe{_#y<solwh6`fmOZkj3ETFX$Tb^49K2i6xKHzn~uZ>&!IA02pj
z@&WZk`;_*|Yis4diLVQOP~Bo{`rw?%x}zU&b;-x+GCF?`QO@Wo_C0d>x@GZ_j`xOF
zBxihgvs}h)SUzo)uz7=ZqI~44G_H-Yzt_D|eOJv?e)+NW#o3nJF$-ioi#Ceh6uDr-
z86i^Jy}^^u#_pV4=!5bVGY-h??7VYU<Gb8dLFx3xL5*Qmz2V3FAMgBl^haur#QBE0
zHD%YUYyQ7{ELwVfo1M+i-l{v6>-Nr-4owUzOy$1&|F}_0|4ntvWd|=WjEu;>QTBv?
z))}7-JQ_#pS?#9(nj{>0=jyw+J6wg%1lZ~1sP6I($<w^@%C^~Sjg0mUhO&Z5M|7fO
zb_8edvaBe-p;VRo(>Hw6>$ZQtzE%Cc^+_)G)Cx@v;j^1v(xz;TUi{>4#qGao69wm6
zSnYehw=3%8KTlTy`&P>+txqDMU%~>e9m!AUtCQYV7h}Kl`B%rkHk`I==U-g^VzJ;p
zo)XXVhl&H`7khr#kg51cXhB!A@fE+2<X+}Snjb%HiB6gLm)}A1ZyG3Lq81O}JORq1
z<_0DpSuhitb)psYJ)NDM5{pw)6u|i@NFf%c22@6X)PnLXq6jI*RVaY+d1+n=DC2o&
zrW7kgD?svMEOM5`G}Ae;BrzvH9a26OLklKE`C<qvh+wXOWpYq~7X%wmG*mD)F*YKc
zt=ER-W<+0?w0j;CIccfKv?tn{({duOZ^}#YytZ8R=1TjN<C~sZ6#ogd-qog3_Gj+R
z)zfz=Hs*ajWM=gD#i!LvH^{5XwmQAs;@F(^O}VG`!Y28)Qu}QwI<2C|Bo^CG;ysr0
z)-rrkWV>do@1u*A_rK5ieDAx>^V<8`PMnI%Pv{AHlx1cY&feoO@8GBG1$#=0k9)h+
zaQ-zbIs59{t*{eDzqntNb0)rDpL;K^cVFJh1TF85cQ1dPdh{vYx>o$*2JY9FUmIl9
zAN|KzD_r&a*R^xHzgK^8e(`-lyLo&>)Rp5rt1r}Z{rz(7(c0W+;%*D-dG7w+dUWm7
z`oB+-wZAOC@c6d=o*mBj7MXJxvMwmkzaMe)o?4sb3+@YF8IDe`_Y>5u6kj~u=c>-C
zpY^{IZ|Kf>;JEnKE58|*Mw!`7?@lb}s|s4*$9AqzvZiOc=iiiv$EWODH6`<@b*j;w
zPmI?%!q=Bf<K(U0yR-M9P;A4YLk29W9!@u`gM|JlUuK>ENVlpx`Lyf%j`G^Vol8Eh
zR#pq^^12eOWZcU8$1Z+?SLD%Jopl<gB7a;gu)opt)Rk3k-F2IU5Z{Z;I;*(*tG%0S
zB4=n#DQmyG^v#Ax(^T@;eJR)!P-XFEnh5LaEypJ+J<89Sv+n2`=QFnyo_!6~H~zpV
z?zQnmtyA)*kg5osUELO)Ssy)9y|UQmOj$4ZXQ$CwKd~Pn*VK3JJgELt<;X&w!{xOV
zHOnSAs|fWU`EYcKR6q04TfrRXR|IAKvJcGqXEepEM$=38_{6%tAnl}W1zx%8!LNQZ
zIrU4Pn|I(t-qeS8g(dR-@V8a|GMeOY^Doa)MFCkup%hP%mm<AK|4s`16s@X#*ZR)V
z-R;|7*xLT}sqc`zTAP^@mmt3|Z1#z;nL8F&YlI35I-SVnE^(-dQQLLAx%A2R4}ZlQ
zV&zH}tCZYWq%7;eZ@{K;fUQ9KhujCY4}2dOKPV>b>N#<yqep2|kLk=02D>xT>=={m
zy-QtZy#J&Aa_dW%ns2X}{pEP??YcB~=a#8LH*3#_ztcIt*XZ&=IhiHQo6E(`x`KuH
z95^2>uXq0Qb;(rsb(VcGyW^7^A5~h}tiPzWR3%$z|MQpp{GXL-XVy(F>t@fal07@M
z_{7eRl`$44y;Co-=$%oRT%5?ppCWJ8WA!0%^`}H;`EAN}IS&rA;UPlpI38I)V!61|
z<%HeIt_oqksq;REc%1pN?QVqipT!=&r@QBc*m)HDe%$!tk!j2N3#UJCKA5w7@@K_R
zyJXF89bYESw7t}I?eyaOtp#}#WVS}<9@Xrz=$#nPnqr+&?aTM5q-Gzt@_gwE9=X3W
z-Y~YCND9{Errnv<ZfV;j6&u~Mv?hw*de<RiLB*?A`L7<1SggTvPIKjjr4tJb%*9^?
z99tyoY<zIuYRkwavX8TCC;qJYac07#4w0gT4<0PB|5h`9{>FPVms}Q;@h#<@S17^L
z`>(MiMdQYeD{E8Q#edCud$DFywMN0M6p`EKk0mh|HA~1o|NeZ1&Eok+#+{P|KmC%^
z$O!Sj^L^*#_Y)cNpC>3aT)xVD_V-o8js07$CCz4@&}d@7bcS*D0pAC^4`d&>eSrDF
z^oEy4U5~d5*s<Pty6U;j^RtZiOgt8+{kRg5YkT5QioNZr>ba6URu=g)Ra%~BobpjN
zNnKkMQ+_5de81UbvDeR*Pujb-D*cbssoB0;;%0L2EU&3jv$SDbUeRUd{_9rK;zDuV
z9l^q#3I5g1+IKEnPvDb!5%h17^^AgTTg<L-o>7_G`?ToWH;>CZ#ddpS&fVGA$F{pR
zEj-0xr`B`h+%nB4FFdwMnEKpLc(%tZblxTVhH&!;$s5jcA7?#~yjn9Su=l|R!S-CX
z`AR8*MvZq4t=`b9-7qnH?-aMG*Ml@Bd!*N-y>jOIxwNkF^Ci#w$-Xna_bz-{cXR5z
zx4L(Xx|Xf?OVv9v=S%P5(1p6jVm>h*yZC~x>$%)2K7DiE(v1wUv*yp8+CHVGYTfzQ
z=g%o^;W;GZuFHL7=kkAv56tx<1bE-GyS!!h%yvtWmtC@vN4}K*H}B>N5-Z<4Tpp!w
zIH&2MOO46LRrlSiYnT>rUz=#IIAxWWve}Fd)(=dE3fw+S+y~4ya9>fj)zQ!uFaN4m
zn7DoQt1S6LlUE&z-TB}YYq;KyqJvYp*Tob(ZPFHx*%=b9TafCQQs?r*ebLE^7S_(N
zUUQ~wmgBhxyI9V<*OlGNzSAJLVRf{|#pKg+olVSoALC|jxt4X~U%b+O+qLJ!7h1(E
zIye1P$GL$0GG5g^i<ED?=1)_ZoH6nD;=QeGX|rB^U2;fHHu=qi3BR0#&;Oj2eDm93
z_L3#F1{aI0?&!<!b6?)Pv*L5WuJj2vpSC;~og-^GeWlN({mRe%CM#4f_c_FI#c@v7
zKFb2Bd)+@z<hMOkNIbz-a4^^X=ke6I+iX2WTjNi^xc(_{|FnziQ@><O{*7|O!DQS1
z=kHPDNGFRwyjm;w+{_NrdACK)R^$Dx-D|uioS&6Bx!+1@{ma6%-F9<lo!e4TwQN%Q
zxzdwtYX4rI>V0;_#l}!Bzv$R8Zxd@HX{&nO+HX;I4|u+9xobT`qyBYSQk{js3C&Kw
z)Gd>rujYDK-n>3G_eHJS+C%db74853D|`L%#R?y##qy5p!yi8tzM;M+lv8kf+Sd>6
zQ!CG^UKO5i`Agzu@T3KNF^6L(Et@~V<Td-W4wjpZJJpKXQ&^Z!Zcy8LZq`MPIJNI9
z+wLU_mQBAaeyz2BRa|e1@cCTkRsYRDENcB>_iWY0+gazYJqmSIYfJlFT)gnlsb^=W
z&h1@#v~%k8FspR)@;sfm8xhg>A6^XIJK+@nkN<Op?c8p#6tPX8<?>xlt+Gfk)wo&4
z;p^lJ`x##|to;RQRG~G?K&=>1%f`si+zccQVjCj&ryz|kPzT8+wK%ybv!EouNI~DR
zI2qJ~votnT(05KO@JP)}&nQtaH!=qGav*ZLMux`ViPiLC1!E&Fa39MF+>6sSHa1t#
zH8QkRFf=qYRIoHQjD>W;{1S6h74-d_LOsI5v^`RD%2G=*lN0??OH*}2b4rR5eL%Kw
z>3fzW=42*2=B4MPDi|o}2bZMghA9{sfZAe-DVcfc3P$D%`o4)3;h8BV848AmMrII2
z9$-ZgP{*1Y89*H6mYI`kqyTQ?1tB*RLES@8a6~H@nS;87pq?N_n9D%H%mieTi3O<F
zh;EjtIjETl>fmCNg{cPX<pS|c4L~FU8yXuZm_uD^YHW^ZLxZdYc?8jh21TcWesF10
z3Ak4tQdF7>iDytF93n|D7C_37k_0%>1S#l)1HD+m5EOc#esg9~afx$AVvz!<dF+!2
z<ro?oDd@ZACFg_Ui%Z`(F*ztdH!%+;f*cLVu7|a~Asumj2-i@-!Wd*Yp}G9Ek<~fT
z*DLLx$4r{!@lmx)Waa7Q8j~J53#oSTcM56Vnxf;qN!LE9voC&=(($6VE|q6I8pKK)
z^_*LEGrQki&GVk77Cl+1clM!HC7#adrM}WRtHakEm6CAlUgUg%FGFk#_p~Ed>hAB|
zvuTcn<3Enh{_k^&-`hU_z3=nyxb`07V^KF<)i!=y`nh}cAL&ONZvR-n>|M&u&lYLD
zucuzH_U_B8yU(lV?*1qFcfEm{-u>El4=<lHzvuh#nojcER^!v%<$uey=A@nZUuiSn
zx|#8?zl!m%{|$BDXMX0lGx-~Oc>lux#b5qEy0h22`}^N7!TAPa6&!!}J{Omd5`BD0
z@k@O}-G_NcKc9BC{%+H4H!pGJ)oS^QfbH(zm+xSmcf)q|cm4J2j2<U`$=sVJaD2Mm
z+A{~P74mNSd91^z=5)V<|E|<0hpnvcTu45qmdbl9Y6^SrnU+$C=9(W74q<7*x8DEX
zxY_JkgWTLRN3CYeu8dHZn>cg&&l&Ss52SXKZZvqECV0tQ!vE}=&C_<a<`@6V$eo-2
z@1fP|UvWovUFv+i_jS+mrh}bRU#Zp!$xb}vpwu#L3YTBpB&EshVu!Xqh$_ha9-Dpe
z<b#<<ck8`WIwfj8?RwVVgWhi*9OA0u*KN`3z5ZnFv!b<TO_e1k{BZ{#XPcfW*k;JQ
z?o_~kUYjNUXIb<;FYavp%ROB$?5X$TtFvUdSk?7nXGZTRS*q2ZWonap<B^C=ecI8x
z4|a0eNDJ+_zvf(#KygCXty@xOJLh$@>BUAyPrk0uX(YtAw)mPv!;&vOA~PeNKQ87j
z$+nT1l&K)Y)qcQzZP(7|AY*oMwF90V7KU|OynLg39^DMvkRBA0^{*u)>!*d*);gW3
zx3*dAbzNHaAxC-Yw!3jlANB{lnAUbYfAPcaRc-qB+z$8UN~xXUHscVkVQo`A80NFV
zq1OJvmHBcVEpHZf*rq&}{@VQ~>969yqiO%rie>XJv~NzH&A;*V8=W;88y50-crLib
z))2$`HF=rXnIi_lc5lw?&{=dca?+;h{Hi<lZC!g+v}oqJd8R*8rt4*XaGRu;+U5G^
z(j1}5<|66~&Yd(9S-re3#hYKG(riz~iwlu9XO29x{_(S?g11I8aejr<!}$>k+jx5J
zB~^Hf37vo9EGzl%PIC77tM!JZGyKoIU$_6@-9PhwP5;SlUUYqZvQ&*lciukLc>?yy
zg=KZj%kqNMIB#hgJ>x#4%n~Uwh1s`>ui39zuR)ISujGsO4)<AW<x}j!E^eN`;G^~g
z3%1OZ3fV{A+j0|*bzCxQaG&>b@}XF<hdJN7&m?$0IV|?&w@cZImVNOZ%vYDa*?08J
z!t-)oDj$OPRh!)nxmw<ThWDLSEGLWB^75l)qL2TqJ@jx<{hN30%a+Sq+FmoREpz{s
zu+lnwcm9$cQKw6nXl;2P{NtxG#~mK|?=wrUF_uay+H6ccqF2`N<vPQK?1X=%AAV;~
zuwWD2vfv@(QOCmz?k<qZVEtn7f_uS!7F*^j!7t7eW-iHVOw0Tw=5cnzjBUnz)ys}-
zcD^_xMO|_3TQR|TRli^R+yDLgz9#eh-r(5S;P3AQ*WW$ya$fzz*5{?>VMiZcxbnBS
z_`82=#(IxF!4ru|l2J}m7qH%Wy)Maj?k2Uh?EY&M5}AcwPc1VxdAFf`6T>d2;6H1B
zG5*W=TlbGg*Zh#R`woeV*9?+-#n^OBO|NAfl6s^ia9nhWY3^D6Gn%=#0#7VE8~3#R
z_4!ZdFJAdG!OHmTUiQnioW<U2lC957tqlFW(DGZzOIw?^eyz>ovbHzp?K{|iudTep
zF*Hph!F!+PKl!hru4;{28ko2G?CJiln^X6DmUKYU=0m$Uqg@;?rQ}QJ6*$#7Zq2B;
zbxezAyXX8lD|L$(FFiH4@B#O|!)kVsqWk6l&s}lv>;8Q0qBVDZ6gz&o)$4xr?<$|&
z2QD9eaPml6-qTJei(J{4yCqZha4G#ibWpJHsDtnJf|NZ|`T6ADB<@?S^+R}bXrTSd
z4+US21@Ev^?Ys1AmF<-cb;ghWieH<_F8qlt<HYJphujV9d$ahfZZyYjX19Ig$X|Wo
zu-umoxS3z4svYVV^uC)Vy_Q!;vr4AK@-}ZGpX(&=6MSDgKgj>Dx_;=;x?laP|4+Xc
z{oyxv_2oY@@8`{$H}BE$#&wRC*0cT2r={L{El_il@y8~v-_b_QMhAIS^kPp5CB7+c
z6q3w&Vx|2>ds|#X4y*4rrW9=l+(eVo?4P&TUgzc<vU+`#ZRbL3<B}bprPdU!c{u&}
zh8lh&ty}lx7MRMLY4rKK2Yvf&=UH4MD=D=5p(OJieN8{6c^`d3yUx$kp5EWnDq9tw
zmi{Gr-HiM1<X5yT7QQ)Qh1znzv~<5`x1WX>e%O(&q3PaUUct^ceRuul$3IrASH5)p
z_T^bxs<p?K+`A_E@yipZu=E<8dG-+>)VwFp?VKoAUVP@khvk1Z*4%jJ;j68+#$oyM
z22uW*v)P?h8rTnQIh3{H?y6f#QWXa-PPn%4M)KjU>5QI5B~R|YoqFKh)R!}-&TU*}
zzP-F4A)oJ9?D^-@mrXwTa;eS##M(_J^S@Vo`mEY#`^4*vb<@|`8+K%|r!Wg$GcuVn
zPtIY><3vpz$%@Z*_l&;AKjLNmy8iBuIX`qB+V1!%ww{~)bW-sDI_3`r8gs%GTvs*z
zo+9;8tD{2HWe=B99P7TtO&#HmM^-C53Kc*S7F@r`6)f+dbjLEn^`L~|sYcdM7yhkQ
z__A`Yvvuoho`=aIlIAN5Mb7XXm>*c(u%+E$VQYsPx5EXF$&yPao=)d|xNgl}M$x@(
zf=q$?j(py^X@=}qK9@Pm%Id4rGUKD(>6g2IKDi<GMXufUn|WD=uDgn^uDkcLX2ScA
zyl-BVsW$c9J84~YCYG&km(86=ee84RhBX_^XinaFqu@y1%bv<x&Uu>!B4ej)=MCL;
z_HCyuzkElZT8x<GqrPLY%hVE09GNft)F^m-Y~Rj>kDgzPls7wb*P&l}6ZZ>;32PUu
zb&hT?lfSk0f_U#vgJ*{#v~S5><*!UwEq6A|Hlr$GwcL$W?6+Svu7xtUAu|JWrl#>t
zmRB<P-KcqKoBXWphs{>zh8N5}nf523?lAK~k=cjJ)+z3oIKQWl<9g6e3;Rc3`_72(
zZ7n&X@uSeaW>0y6(#rxBb++o`kNFNgTzSW%D2-EKzGq|&r~dnu;#J?KCT+a5Z{D$~
zF`?oHzoZjPd@5&bZ}eK<<)t6+l2vQ3!&31TUzn!GEx5!TQq_nom<1MJ!DI2-fklPW
zT461psO(nFEG7QOv$mh)d6wsUIOdOZ>Sbp3?(%6(2QSS%+8SCM`Ra}2r>|kv)>a>a
z=RH}T#l7<7QYS{XJw-M%x_2&GTKn<GzMzu!F6LAEtOXZN{<?Ac^&0uE=MC(-{u|vI
zw)}nXe!EDtrFMCt`K>&ge&6(%jT%yKk7TIN+ps`4KKN6J<gbYf<#7^`m-~7Cp19Dz
zE3RdNqom)WhYCU$Lb-(^leV$$;tI^EjlVUk@DrPoiL}Tfot}v$_qMb4Jv=xg@XG&R
z%@0=mUvB<z^OBGfmE3(T&qc)Fv$qFq_^7rav86{{qqtC0C-9k*s@+ESvLvR$jP_e~
zF(>aEY+=q||JB&2$KlOiuGta(n$`N2Oz<jcCYu&7p`Ws~8s)}3D-SUE{bH%#_pj;P
zWQpE`Z>(S4e^{?{=V$Ash_wo*TW{T1>A!XQ+G_Qx<HCG$yzkGjFwK<Rdgs)?ga2%o
z8*ONKa<cW}$`>c{4zabfv$HkuMxH%;OH@sz;11uSyUWYe-*PS0xaL-r5^524G_1?O
zCgsp!wGQuE^;;@s$3s0P^R6zudUaxG;k(Bg7bheXyxd|?ZSAYK`D$(_UqvrBcj~{z
zIqNq^Z}U`AZ&|%u;MMtS>_7SsXuoxAyDX;?(fRkXm3BQ#-|2`N>%P$VWwRdm%1o|l
zdAOzPp^2Gk?_Xc$!<h*dygbVrADS4<VQag5pg>B(4=lJg5hT9dz{Y7R!%e2Q>Q`fQ
zJF2cM^HRBapj0TL@5bSC(HrKRPS^N(NbLBbI)?=+Ng^AzH_qN4DW<#7<yiO(eKxCh
zaj(PWJC59IJ$G=2fBdwhqc0;W?VkS(&9b@p&ZFo1w`tY4=5z)%?T;&VtKIfvo$$>+
zk3woxY%BlhO}2j4ExtH6_Obi&!-p?#oM*duVn(K!)NDDv)i*Slq(hdJZTc&Hs!@dV
zBBx?Nq9)VL1-tzOT!nV6y65!qZOYLnZe{`RS8{F@)~{-?ICb}GPps=sVUK{M6^wfO
zBA&@6XwCY#ecJ7y-Nio_=YELsFsfcWweIFz3BIfGk2cp{mV94e&(9#7obdJXgNf&a
zlWrSViZ(pC&T){<X~V3&$+_ujw_8GwpL)8fBDeDAZ}WS?R#(35zjNo}jMFE}>VCw$
zjrx++W;?-ah0lcx`L4S~ySF`3af)S^&gwWer&&*R*2P6{CobETHu<uMS5?%Nukl=J
zmd~9RDVseJmfUoDc2RA}Tr;+R`PVWR8+h2hS=|2j_u4zN*N3WnGcxOycYbWR_G9$c
zh2h_X+1W*IsG2SB3DWH2T`FGRy=LLZq{SaMSvl$NdN}*;t?rW9N=$Q;X3X^M6kqaJ
zLqv#GB<Y5Zr{q+_Sv!{fsB-Fj6?=$xNlW4660f+HTXq$KtGrCDFU-<owR))MEc{dS
zfVy>5Ubjf~AI|=jIegC^U5)uUd#1ANwC0(g>iShm%<nxu_`~Jcb-8!%*Vv!jy}O)`
zwXE;@{Ab7Y`O_XGT>hLe!C3S=pM#vn3zd2HdhhHze)2n4ecR@t&X?c(MXDm;&;95_
z9e+z5Caz!9(s=990t2&GlUEB@FDT#_d4KRs*j4?ghvI8Lq=)@*)&8?cwC*C;{*2c6
zEr%e&-4Nl>&tS#@#`+AGb?#Xvhqy1?wAp(5A@j~MmdgbtKXac4hD<A*KJ7(DxUO(k
z%+FHY+ZWeG>PkA9I(rKKt6LCL!CsWezF}6<{gC3sPen)A9D8geVz=6Kd`jT{;+1Tk
z%$^;xPQ=)5WlzLL##Ohjyt&T!_lNY#<?_E2@1$ReSa9VL*BSc>9NIVi4z5nMeyTeC
zfp^rpWPcw%&CU()+&bC!a;|qh-P*k~`0K7|ua`V?+dWahIXv)%mqYjz{kX8tu79c*
zzvyb(_3Y!yvIX0gZGOA+@!5<8Za4h(yqC<Jsx$Fb`|Ozyzx5c}E~u|harJDgaV}Qq
zwQ_o(a$Z7O=H8{*`u?gee?5JRqc}fKs(2cbekcF(CKv805&tdsFIt%w&C4i%ru$Hn
zkNlg9^W9qvIBjOHZ@N;f@+i8uGo;Jt&Vu6CZSAj5xP|&ZJL{vSKK-s!VRYY*BMWp+
z1#SIf@T{euYe85gYjsG<d4U9`Q&u5viU+iE`?hgDt~+}FlHjbO7i+)7ygJ#<eRWQE
zjrrV7y9DOMu6P!M9~pcq6>IJdIA`6F&2!yw)$*su3j3?>%?ZCz`M>h>+2E-fMRV7B
z<^R^?*}q=r&&;_S*L6DG5S8Y7Q+}+O&(iQh;6CT@ynXM_y?dFo#dzLS{+o*&m#?;d
zIpwmTxP5=g^1IhUJ6fxl&pk8SdsOm;Lu$^Np7|Cz-6F!V&9Q!SozwHaTiV8+6WeUQ
z^2O%N&$0KE<k}<nYc^OJC3I)-&n{T{>o{v>roHCX(hSk=wS~uWnje)~lq~MO{*duj
zyw#&H#)chT+osKWbun-Gi)pTE9dm9ps3=Z9xYJ4g{4L{~>ZjcMJ{;V1G<)Jxz299I
zYTstx{PozH%_U6eA%p#_(2W5sV(XNf3xnsCefD|LTy*D4%I(!V*RJVZBtBQc)VwIf
zYU8phZ^P*sJy9i0PLW#s<MO)uj-(%R*=cKOXi#*BdCs-}>So45^JYCM{+j>Ym-p1q
zg~?rcALaS}hky7U_}ty-yv2(@9(#6ume=<0Q0M$QW8;aB=|&G@7k2ya`TULZ^^5mA
zV;B9ezWH4)nl~dnC0{bd-rjjXtDVo^2evP-o>lq$((mg0n`>UGO_?cWKGl25|32QL
z8Eh{kG6G|6)VRka27Z*8E%e(_ZqCp6^y(K{4{f-<mvwSW>_6aCu}taP<DY6`BC2Lx
z+2ZR0cNKL?x^UI<=X`N}Qmmi%Z_>IM$y1I^ss6$@@42hlsrrLVd)iGe+Fr3%X%xTj
zSvG0y#_vBo|E1Qo?mu^5F!W>P$7NqaUzWbKy<7gZ`m1!?;x>7cpR?<3-MPGH`%mq&
z_p>Z7d@?^4__*J9^|Iwr>Cy9ZYmdJ<nzQ7v#&44}zNQdfMWMx&lHWskx0`-RUa%$o
z{hd4excW?{pO1~GD@e^OeE&&a=li*JcWR#<Ja#+h^ZFP6_uQ^oBr#dw*V`Y*t-5lS
zviGST{S~OfyMgEQ!y9EYLT|Dxxy}0aUE1ZGwzH4+ch;V;`@Wg^je_-&cMj7G&x=V+
zl9v$Z=~VqM@5>z?1sV!Q8z}~jxq(IzO)L!!K++(#5oq)g#6TTdL>d-^j})7kqmC3C
z5jRq7VhkE7Hc>D%uryY%G&4sXDGmtmcXUA;DFzP`D<BUNbHN9R%`A`xi7gdS28oSe
zgT$s53i^maViU;FG<1;I0<;1MY2}d-Xs8wx0Qd%pA;ZTI5)@!~F_)P!NZ#DQM8V9$
zRKe8JSOGMc3lcLj0xf1R0P`)3jTJy@3=|;hVKhvSfr0^ekQk&7hD{AE6+nZ`$h48E
zrGlxc8Q4ri3sVIUHUN_#8$dRjnwoKeb(xze7#o@@fCiwAEFn5f%#0P_OEnBZ_JG0y
zH8BtxXT}qUs6)(L;M9f~Vg`pjz9D7{#1Jzms!@lSks}cltT2Z|#*`I|K#N3>mUoyM
zn3@q@-mx_zJ16?8to`%2+t<ynU;n6FceMY<vHocFGP!-db6XOuCthCW*>GXm+Or;+
z*Pew&&B|S9qvpbze90)&m1Cpmg_a{G4-Q8xTN!=g+rn99TS|pR6xnY5N}O$$>73!z
zah+xBckA!B8uMB|Cf@jUzxv$H=kq@Q|6lk2_(o3EmK!HB4^6%_QTX%fz2_P=d;atZ
zys|3F()GIaLG_Ejgt6{Ay}2*S-ux5&Rj=A&y}jhmx}!fEzb93Eu~7VU?9-t?7tNJ6
z+BwBso-sfASc5@&CGX$$3+3bOHkPHo$tyDd<-gdz_Ro`vKOaOrN&Ir(t^RoDPwViV
za&`8K?*x8by#35yXV0_Wr7V91zieKuzJHTj{rSC(|FnJyua1w4h*i~Pzi{8>KG(t@
zoBDZuyYKzF(rviYvNhXm-Hy*kw%j#eTzYg96Wbc4%!wP8=BTf2vFIqS{`LG$LG84!
z2jvfV`sWH2F8ieHwLkRklCSJ$o|b=P1Uc(ZFFd2R@MT6x&C)%N{EH7SHN3EN!O`W5
zcbok<vTpCx2-971vG<EhY<FqzvZ*gQJmtdsiVYj$-uC8AsGTYrldgTrZKc$mJiU<B
zha-+3xpq){#=f|tT*sxfAFSj58h1>kxJql+LG^Sk^Dr~N>CMthi%eH&T>RMk*?4O2
z=cfyT)+S9$jSkMJIp4K^;bw-py0H~`reQbRO*god*3MnqDK|aD?A-eG?AH@J?Sz8O
zG&6Y)1evw__vBx?<kM=ab##h?bcd!PYgNeUh-e@Gx2t=cg<CT(eR?^;>vmVtI^I{F
zR!ctp=M4It-niwfvE!>7*S>Ih%)M~)ph9V^?4=va8Fuv+ywu{DZzf<@E822b-g(AP
zGxtp$kK+~eDwPB}4|rES^xIqem-FaKl{sCL^RD_`zP#1?WpmiCWn0_KZ?p@^ulqhZ
zxnlj)oQGYayBs$!UjJWeR{zhmzrXtvdz3jc-U+^A`qVnTCX;)%#n;ZJ<SRb^8qU2I
z$jdY72q>Jypu#HI^rkUHQG3E}h5HS2T5Xss`94W^*lhRwGkwE;p57b(HYIcKzV+3t
zQ7<p<q}YzexwbJqySA=be)il-e;c=GKKl|CX&v48@ZA;nC$CrgelPl|Ud*|-yB=@6
zd2#B>D^Ek;9aug2{+_KziexX>bN=dH!u;Yw+_rreBI>zUc3r<MR;zz@?Gw=x<>#k;
zzo752b@`_+jMC9F&+!H4RY><&m)JBt`KH^Dr1Q-5gFr+3g(J=ka!eo=gAL0AMFxJx
z3XTIvLbClIR9|Ga&kIj_bmN$c$JU&d<bWe8s~D%UIo#LWw}eN<_TavtM_=7fC(A#}
zlk#oZ`ccHz?{U!*`*m@*pDt}r@Y(iwR`bs*5y#H|Ns#$*hr60Z=*Yf3ef<Yn3mNn~
zekxT6n8-yx&EK-Ocv;Oe*#;w?De@^31lIkl`>Xpa`kb#<%CtS(J-;1h<#+frUEs>}
z68nh_-B*sdGU*8wOl;_8iBWl=#3;_W!{Y#wknHro0Y|F^nMAD{s_(s&I`m7TH`$~w
zaO#uJEw-}`X0Sz77$$!blDXof_VJdAr&G~{*a^%NTu*48xUSgmu#f*I=ab3~8}_g9
zj*s&N^7!Ui@y(gByzg+Z`;7k!Y!B^m*Z#n!FLrQ}$eTUObq{6UjJcP-TyFg|-5~4U
zQZ@E6u^lyy*KK!QJ~xxq>=rZs_4d!Li!A4ybB)PrU%ps*lYjTrO%ENud)RzGs^G3^
zF2K{#q~Z}bIaJIys9WH?=<VRihqcab+bTEfTbb+K*w(v=vxRu0UvA7$%h+sj$ZqZF
ztfgVy>UJ}{o>|HMmGs-dU0H0uwCV0Mf4)*{<Gr@;B6jUvsvElN{evI(#Nu@(och7i
zS0v_n#Zs-T;17R+&P2UW>wPcrrd$?aw-Dp)b1l#@vlKhHkpskPN*0vqeh|TOT*(3<
z6!?5bgK<;n?t_umx87zf=Xn?OK#vs<;R}}A8j!MKQSZy1tEpR3fB1+T7ZkK(PJ67f
zX0s&w=6P(J<+f-R$tTZjN?m0zZSOp@?nuoGYTfh91m>JRJ}c%@dY1i`vaH3gZiuY4
zb(Md%vn+Q}c}}HL;p<CxqN*>3YO1vh>CNit&y>C1zjcTAzAfg)mI88nettXj=+@b(
z3-2n}K1==Bsmx>B^5e_Iyd%rmwNCTijaZj*+}L@$@1qt^owU0h;Y&W$FjgLVefs->
zgF0(Xmbn}7-V}>InzHNYT_wv!=YkGCTX8EdN=NUKIJ?>;L*eb0&-C*8@?QD%vb(1|
zs$P8h{)GR0pF-KX*W^Dp+%%Wx*i*H~MiSE{-z3DaffxsO@El7u&}%M~>^Th*+H`Km
zp-r-j=Qz#TuugV)NLrxvnr?&N4t%SbXZ>FM!%00oAzv`*opCz1v#xc~Qonww!kIrh
zALXrHpS_~^N5KT`S0|(2>{pb}{CMov(*<k4C0lJhJXs<@=BS*M`@5#vC#*NVfBfYc
zU_bHWCnhti$GTPhcf%}B#zsU`{QJ~C=j4GUANf}A@G1VwYxX<mVc<4(F_UK>(~kJ)
z|4f+tB{9l=3BQQv0xzfAADnuUb-Fx0Nl$#jzV4sey1ECi*zpju*VDeZY%G%4-MVph
z%eE|+$z2&ig1%adJY7vzcBqM7T%t591V!*HSUx2CM(*)VjvKCBO<2nv9ib?fbMls9
zn6=a$#ViJmN%Q3#c%sD|Ju8+AT%H>e@Yy|In`fKKrq*-wrlc-f;W_clR?W57H!Zg~
zIQvxa;bOsaHq)f-WFFnJxcroVrE2lvf^@x?`RjB47*`jV%=Bez+M52dM>$7+rrwvQ
zpIdp#FCYJVgV)~f<IbNS>wkZ6zqYw6H_@&B$<8ykR#&~NnNj@mTkWLha!F=|U#GuL
zo+JG4sk-%z$RmDERWEMzzTi37?c}S^b+Fs%!y<t_8Z5Y&FXOHpT{L;_%sUlxU6)D+
zu2hKJyzS5`Ii5>O30n%;5@Vj#>Nq|sNebDWd|yw*vRK7dLNaz<$lt%!o1QjvUH`WC
z?$dy}_`Dh|BNOguZj*}>IZrBYzhii*x^`c($87JgV^!j5#m0|oy?=jZYd5{Jpm;-h
zi_OWt!Z$NEwKgqz`O4sZ+RO9FM<%en-n#6o)RpTAd)Z!_Myx+r#d|G#LtOJ$sWk|p
zvQrnNo_F%?u<Z8VR(IW%<Mra$g!JnN-R$I8%s8LuxA`*Nc#<qu#$+%dusYx~_X{@*
z$I}ljx*zomHyveI)vhhFBO|Ze$k1|9z_0b3RTED!b@nXZ>t0ysD)mNxxz(xW!u_+(
zrd@SVxcQiqZwZtC_x|O#WjZI8>{)+Vy;Cp$gy@@+=%)eUD#3Ri7M1X+ES5Za{TW}$
zHugt$C&dn~XFYH&te$)6T^8o>2+NNzv`+K=?NL!SK5>G_$f&vJi~?5XflE8;+$K$w
zj4;edVVib(Ew9NM2j{}$71sH4N{cE>5_T0jTw?ik;pC$UTap(@{O%XYV{v+GtK4{;
z+2g^NUAHW48@G#9@hN6+{`F&0oP6_!<sElz71Vp~{x6^F!o=2DCvfWAPQ@py{8!EX
z>1O)l$giL7VQPM2{&7qD>MrQWSbgKE-}L(CeAc{7*~)gSpZkrk|9d*~YTvWDuBNMw
zvHtmXD6^~gQFHl^`PX)Po+#O|E#!XotV7l7CHkep&1+|;Xj&UpboT#dG%RL3q3JQJ
zr`YLlt)D^}*Pa~=S@(+DJ}mxP9ywq8O8m0=b=N=mN&mGxEW)Ya^6Nx%%4D~f65A(N
zPk#S+{)6p5#C`Z@XFUs^R(3k`bheNFleXOln6omSqyI>^J+rh)_P@#5cK7Cer$DE)
zZ~cDZZoAdR`sPPPL|Yow|2_1Ud*;ijOP_AF&Hj8mye~m6XWirb>wZ0cv;A$TU0%<}
zA0Jn|Vw|g<YScJkp3>zfY(~y`D!(6W6fKggcTf=U{Jx*@MdJx}Q1=(LcWeaeE`Yia
z#s(&qAZZZW2(+FD#6ay3Ve1{6qOGIC(L1&@gDhEsuA?$Bu!Q%HEfp+HQP)ugggW{}
zIAZG^Ll#h>E~L^mgm!?#6hK{dpH%2lDhp88sRF#J2egz5+LiWDK<gz#+y&_+gS)B7
zOR0=ttIY8Al0m&kBk1xa5F0NB_ifEAK<1hngO(bhtA_Q84ZyuybXgeR)X)-al7RxK
zPYmh{LweVcUNCAu*Z|yj2I&O#fFbHYJUE7$1m`P|%^EP1OiWA={dw4c4{GWq(48lo
z=ukWL3gAqF)TswWDeg`^Xb6PJbz{)YC1BTQmgJ-=XcQ;r7UZOAD(E|wmSp4?DQE;_
zWaeZRD0q~XBxht6=jUlE=sOpsCW2NtYJhgC6>BQ!2NdO}lqRPZDQNg6CM);{D?}(5
z8t9qonJ5I7CKi=cDFnE<IfFK=Rg`FQL9}P)=edA3d}+8?85tN@7?>Lv8kicHn3zWy
z7^oW<sB0?d`{t+MSAsM=QBjnd#$}*jWX5Fx2MT7UrpBfUX$lZALvu^es1Zn7ArC5M
zU~Fk&qyQ2!K!}+dm>Z*u85n>vEJz_jow21EhF%i`3o~@RrUszghpN}y($pMHouRq8
zi2=Hpv6&^N9YzM0XzC114M2+tQSC4_G{tm_kpYI7xrsT39p)yM7-3*;Zfc5duZ5ur
zx_O4iSjEgR{A+9iO4lfEHZ-;{$53Z(V2ELdIcAs|nj0G+`J<#LF*7H%2z;JVaAsAi
z0%(P6P=0=if+46L3R2Mb%uCBx0F6z8*e(ju3N|LGmL`^_hNg*$X@<r|CYBayW~K(I
q=1D23X2~hZMrn3jgq0|Ow^0?BBo>u`6Q!Yrp|KH{s;aBM8y5gYl%U)I

literal 420
zcmY!laB<T$)HCK%eZPM%e#B*>V4#qnl*MIZqoD7TnwMUZp<t?Dpb(^>@0OWUl3Jvo
z@0OETlIoJ0oS%}aU}wiwTvC*pn9Ehcm<lnO@BRM020Re9-O=9n`}aCXL3r=?@8wEL
ze7}Eh%KQC$84W|<@828te*a#9_xtz8TR@cLz2Cn#wHCtWP7{d$sY!@&1L-k>h(bvA
z_xtw-tLlip-@i97_Wl07))CI{_wTg?32O&dLe#w9zc<@1(a6r&(8=We{=Kr+aN!h9
zMPHB`eCyxu->dt6|6V7E6v!T^gZ$p_-y2;f!wQk8gHRH#@AvODg|Of6-y6rq%JF{x
y-l%wHh!FR=Me^_W@6CU|e{YT+$g`<=DbUbK%}W6VDkvmDw4tdf7gWdy8r}ehxa64t

diff --git a/spec/frontend/repository/components/blob_button_group_spec.js b/spec/frontend/repository/components/blob_button_group_spec.js
index 89f764372cb717..5fc87312871b61 100644
--- a/spec/frontend/repository/components/blob_button_group_spec.js
+++ b/spec/frontend/repository/components/blob_button_group_spec.js
@@ -132,14 +132,12 @@ describe('BlobButtonGroup component', () => {
     const title = `Replace ${name}`;
 
     expect(findUploadBlobModal().props()).toMatchObject({
-      modalTitle: title,
       commitMessage: title,
       targetBranch,
       originalBranch,
       canPushCode,
       path,
       replacePath,
-      primaryBtnText: 'Replace file',
     });
   });
 
diff --git a/spec/frontend/repository/components/header_area/breadcrumbs_spec.js b/spec/frontend/repository/components/header_area/breadcrumbs_spec.js
index f9653521b50895..0e62cfcdd62f55 100644
--- a/spec/frontend/repository/components/header_area/breadcrumbs_spec.js
+++ b/spec/frontend/repository/components/header_area/breadcrumbs_spec.js
@@ -196,7 +196,7 @@ describe('Repository breadcrumbs component', () => {
     });
 
     it('renders the modal once loaded', async () => {
-      await nextTick();
+      await waitForPromises();
 
       expect(findUploadBlobModal().exists()).toBe(true);
     });
@@ -211,7 +211,7 @@ describe('Repository breadcrumbs component', () => {
     });
 
     it('renders the modal once loaded', async () => {
-      await nextTick();
+      await waitForPromises();
 
       expect(findNewDirectoryModal().exists()).toBe(true);
       expect(findNewDirectoryModal().props('path')).toBe('root/master/some_dir');
diff --git a/spec/frontend/repository/components/upload_blob_modal_spec.js b/spec/frontend/repository/components/upload_blob_modal_spec.js
index c43afaac1acaff..d9b0029b983cc7 100644
--- a/spec/frontend/repository/components/upload_blob_modal_spec.js
+++ b/spec/frontend/repository/components/upload_blob_modal_spec.js
@@ -1,4 +1,3 @@
-import { GlModal, GlFormInput, GlFormTextarea, GlFormCheckbox, GlAlert } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import axios from 'axios';
 import MockAdapter from 'axios-mock-adapter';
@@ -10,11 +9,14 @@ import { HTTP_STATUS_OK } from '~/lib/utils/http_status';
 import { visitUrl } from '~/lib/utils/url_utility';
 import UploadBlobModal from '~/repository/components/upload_blob_modal.vue';
 import UploadDropzone from '~/vue_shared/components/upload_dropzone/upload_dropzone.vue';
+import CommitChangesModal from '~/repository/components/commit_changes_modal.vue';
 
 jest.mock('~/alert');
+
 jest.mock('~/lib/utils/url_utility', () => ({
   visitUrl: jest.fn(),
   joinPaths: () => '/new_upload',
+  setUrlFragment: jest.fn(),
 }));
 
 const initialProps = {
@@ -23,6 +25,7 @@ const initialProps = {
   targetBranch: 'main',
   originalBranch: 'main',
   canPushCode: true,
+  canPushToBranch: true,
   path: 'new_upload',
 };
 
@@ -30,14 +33,15 @@ describe('UploadBlobModal', () => {
   let wrapper;
   let mock;
 
-  const mockEvent = { preventDefault: jest.fn() };
-
   const createComponent = (props) => {
     wrapper = shallowMount(UploadBlobModal, {
       propsData: {
         ...initialProps,
         ...props,
       },
+      stubs: {
+        CommitChangesModal,
+      },
       mocks: {
         $route: {
           params: {
@@ -48,74 +52,32 @@ describe('UploadBlobModal', () => {
     });
   };
 
-  const findModal = () => wrapper.findComponent(GlModal);
-  const findAlert = () => wrapper.findComponent(GlAlert);
-  const findCommitMessage = () => wrapper.findComponent(GlFormTextarea);
-  const findBranchName = () => wrapper.findComponent(GlFormInput);
-  const findMrCheckbox = () => wrapper.findComponent(GlFormCheckbox);
+  const findCommitChangesModal = () => wrapper.findComponent(CommitChangesModal);
   const findUploadDropzone = () => wrapper.findComponent(UploadDropzone);
-  const actionButtonDisabledState = () => findModal().props('actionPrimary').attributes.disabled;
-  const cancelButtonDisabledState = () => findModal().props('actionCancel').attributes.disabled;
-  const actionButtonLoadingState = () => findModal().props('actionPrimary').attributes.loading;
+  const primaryButtonDisabledProp = () => findCommitChangesModal().props('isPrimaryButtonDisabled');
   const findFileIcon = () => wrapper.findComponent(FileIcon);
 
   describe.each`
-    canPushCode | displayBranchName | displayForkedBranchMessage
-    ${true}     | ${true}           | ${false}
-    ${false}    | ${false}          | ${true}
+    canPushCode | canPushToBranch
+    ${true}     | ${true}
+    ${true}     | ${false}
+    ${false}    | ${true}
   `(
-    'canPushCode = $canPushCode',
-    ({ canPushCode, displayBranchName, displayForkedBranchMessage }) => {
-      beforeEach(() => {
-        createComponent({ canPushCode });
-      });
-
-      it('displays the modal', () => {
-        expect(findModal().exists()).toBe(true);
+    'canPushCode = $canPushCode, canPushToBranch = $canPushToBranch',
+    ({ canPushCode, canPushToBranch }) => {
+      beforeEach(async () => {
+        createComponent({ canPushCode, canPushToBranch });
+        await nextTick();
       });
 
       it('includes the upload dropzone', () => {
         expect(findUploadDropzone().exists()).toBe(true);
       });
 
-      it('includes the commit message', () => {
-        expect(findCommitMessage().exists()).toBe(true);
-      });
-
       it('displays the disabled upload button', () => {
-        expect(actionButtonDisabledState()).toBe(true);
-      });
-
-      it('displays the enabled cancel button', () => {
-        expect(cancelButtonDisabledState()).toBe(false);
-      });
-
-      it('does not display the MR checkbox', () => {
-        expect(findMrCheckbox().exists()).toBe(false);
+        expect(primaryButtonDisabledProp()).toBe(true);
       });
 
-      it(`${
-        displayForkedBranchMessage ? 'displays' : 'does not display'
-      } the forked branch message`, () => {
-        expect(findAlert().exists()).toBe(displayForkedBranchMessage);
-      });
-
-      it(`${displayBranchName ? 'displays' : 'does not display'} the branch name`, () => {
-        expect(findBranchName().exists()).toBe(displayBranchName);
-      });
-
-      if (canPushCode) {
-        describe('when changing the branch name', () => {
-          it('displays the MR checkbox', async () => {
-            createComponent({ targetBranch: 'Not main' });
-
-            await nextTick();
-
-            expect(findMrCheckbox().exists()).toBe(true);
-          });
-        });
-      }
-
       describe('completed form', () => {
         beforeEach(() => {
           findUploadDropzone().vm.$emit(
@@ -125,36 +87,16 @@ describe('UploadBlobModal', () => {
         });
 
         it('enables the upload button when the form is completed', () => {
-          expect(actionButtonDisabledState()).toBe(false);
-        });
-
-        describe('form submission', () => {
-          beforeEach(() => {
-            mock = new MockAdapter(axios);
-
-            findModal().vm.$emit('primary', mockEvent);
-          });
-
-          afterEach(() => {
-            mock.restore();
-          });
-
-          it('disables the upload button', () => {
-            expect(actionButtonDisabledState()).toBe(true);
-          });
-
-          it('sets the upload button to loading', () => {
-            expect(actionButtonLoadingState()).toBe(true);
-          });
+          expect(primaryButtonDisabledProp()).toBe(false);
         });
 
         describe('successful response', () => {
           beforeEach(async () => {
+            const mockFormData = new FormData();
             mock = new MockAdapter(axios);
             mock.onPost(initialProps.path).reply(HTTP_STATUS_OK, { filePath: 'blah' });
 
-            findModal().vm.$emit('primary', mockEvent);
-
+            await wrapper.vm.submitForm(mockFormData);
             await waitForPromises();
           });
 
@@ -163,7 +105,7 @@ describe('UploadBlobModal', () => {
           });
 
           it('redirects to the uploaded file', () => {
-            expect(visitUrl).toHaveBeenCalled();
+            expect(visitUrl).toHaveBeenCalledWith('blah');
           });
 
           afterEach(() => {
@@ -173,12 +115,11 @@ describe('UploadBlobModal', () => {
 
         describe('error response', () => {
           beforeEach(async () => {
+            const mockFormData = new FormData();
             mock = new MockAdapter(axios);
             mock.onPost(initialProps.path).timeout();
 
-            findModal().vm.$emit('primary', mockEvent);
-
-            await waitForPromises();
+            await wrapper.vm.submitForm(mockFormData);
           });
 
           it('creates an alert error', () => {
@@ -197,8 +138,10 @@ describe('UploadBlobModal', () => {
 
   describe('blob file submission type', () => {
     const submitRequest = async () => {
+      const mockFormData = new FormData();
       mock = new MockAdapter(axios);
-      findModal().vm.$emit('primary', mockEvent);
+
+      await wrapper.vm.submitForm(mockFormData);
       await waitForPromises();
     };
 
@@ -207,14 +150,6 @@ describe('UploadBlobModal', () => {
         createComponent();
       });
 
-      it('displays the default "Upload new file" modal title', () => {
-        expect(findModal().props('title')).toBe('Upload new file');
-      });
-
-      it('display the defaul primary button text', () => {
-        expect(findModal().props('actionPrimary').text).toBe('Upload file');
-      });
-
       it('makes a POST request', async () => {
         await submitRequest();
 
@@ -224,26 +159,14 @@ describe('UploadBlobModal', () => {
     });
 
     describe('replace blob file', () => {
-      const modalTitle = 'Replace foo.js';
       const replacePath = 'replace-path';
-      const primaryBtnText = 'Replace file';
 
       beforeEach(() => {
         createComponent({
-          modalTitle,
           replacePath,
-          primaryBtnText,
         });
       });
 
-      it('displays the passed modal title', () => {
-        expect(findModal().props('title')).toBe(modalTitle);
-      });
-
-      it('display the passed primary button text', () => {
-        expect(findModal().props('actionPrimary').text).toBe(primaryBtnText);
-      });
-
       it('makes a PUT request', async () => {
         await submitRequest();
 
diff --git a/spec/helpers/tree_helper_spec.rb b/spec/helpers/tree_helper_spec.rb
index 61d1c8039ff157..0acf6a88198a30 100644
--- a/spec/helpers/tree_helper_spec.rb
+++ b/spec/helpers/tree_helper_spec.rb
@@ -19,6 +19,39 @@
     end
   end
 
+  describe '#breadcrumb_data_attributes' do
+    let(:ref) { 'main' }
+    let(:base_attributes) do
+      {
+        selected_branch: ref,
+        can_push_code: 'false',
+        can_push_to_branch: 'false',
+        can_collaborate: 'false',
+        new_blob_path: project_new_blob_path(project, ref),
+        upload_path: project_create_blob_path(project, ref),
+        new_dir_path: project_create_dir_path(project, ref),
+        new_branch_path: new_project_branch_path(project),
+        new_tag_path: new_project_tag_path(project),
+        can_edit_tree: 'false'
+      }
+    end
+
+    before do
+      helper.instance_variable_set(:@project, project)
+      helper.instance_variable_set(:@ref, ref)
+      allow(helper).to receive(:selected_branch).and_return(ref)
+      allow(helper).to receive(:current_user).and_return(user)
+      allow(helper).to receive(:can?).and_return(false)
+      allow(helper).to receive(:user_access).and_return(instance_double(Gitlab::UserAccess, can_push_to_branch?: false))
+      allow(helper).to receive(:can_collaborate_with_project?).and_return(false)
+      allow(helper).to receive(:can_edit_tree?).and_return(false)
+    end
+
+    it 'returns a list of breadcrumb attributes' do
+      expect(helper.breadcrumb_data_attributes).to eq(base_attributes)
+    end
+  end
+
   describe '#vue_file_list_data' do
     it 'returns a list of attributes related to the project' do
       helper.instance_variable_set(:@ref_type, 'heads')
diff --git a/spec/presenters/project_presenter_spec.rb b/spec/presenters/project_presenter_spec.rb
index 652509f62dd013..9ce360fdc8000b 100644
--- a/spec/presenters/project_presenter_spec.rb
+++ b/spec/presenters/project_presenter_spec.rb
@@ -674,6 +674,7 @@
             label: a_string_including('Upload file'),
             data: {
               "can_push_code" => "true",
+              "can_push_to_branch" => "true",
               "original_branch" => "master",
               "path" => "/#{project.full_path}/-/create/master",
               "project_path" => project.full_path,
diff --git a/spec/support/shared_examples/features/project_upload_files_shared_examples.rb b/spec/support/shared_examples/features/project_upload_files_shared_examples.rb
index 806ffdad2f14ce..63d77e9e0a0286 100644
--- a/spec/support/shared_examples/features/project_upload_files_shared_examples.rb
+++ b/spec/support/shared_examples/features/project_upload_files_shared_examples.rb
@@ -18,11 +18,11 @@
 
     page.within('#modal-upload-blob') do
       fill_in(:commit_message, with: 'New commit message')
+      choose(option: true)
+      fill_in(:branch_name, with: 'upload_text', visible: true)
+      click_button('Commit changes')
     end
 
-    fill_in(:branch_name, with: 'upload_text', visible: true)
-    click_button('Upload file')
-
     expect(page).to have_content('New commit message')
     expect(page).to have_current_path(project_new_merge_request_path(project), ignore_query: true)
 
@@ -54,8 +54,9 @@
 
     page.within('#modal-upload-blob') do
       fill_in(:commit_message, with: 'New commit message')
+      choose(option: true)
       fill_in(:branch_name, with: 'upload_image', visible: true)
-      click_button('Upload file')
+      click_button('Commit changes')
     end
 
     wait_for_all_requests
@@ -84,15 +85,19 @@
 
     page.within('#modal-upload-blob') do
       fill_in(:commit_message, with: 'New commit message')
+      choose(option: true)
       fill_in(:branch_name, with: 'upload_image', visible: true)
-      click_button('Upload file')
+      click_button('Commit changes')
     end
 
     wait_for_all_requests
 
     visit(project_blob_path(project, 'upload_image/sample.pdf'))
 
+    wait_for_all_requests
+
     expect(page).to have_css('.js-pdf-viewer')
+    expect(page).not_to have_content('An error occurred while loading the file. Please try again later.')
   end
 end
 
@@ -121,10 +126,9 @@
 
     page.within('#modal-upload-blob') do
       fill_in(:commit_message, with: 'New commit message')
+      click_button('Commit changes')
     end
 
-    click_button('Upload file')
-
     expect(page).to have_content('New commit message')
 
     fork = user.fork_of(project2.reload)
@@ -159,10 +163,9 @@
 
     page.within('#modal-upload-blob') do
       fill_in(:commit_message, with: 'New commit message')
+      click_button('Commit changes')
     end
 
-    click_button('Upload file')
-
     expect(page).to have_content('New commit message')
 
     page.within('.repo-breadcrumb') do
@@ -184,10 +187,9 @@
 
     page.within('#details-modal-upload-blob') do
       fill_in(:commit_message, with: 'New commit message')
+      click_button('Commit changes')
     end
 
-    click_button('Upload file')
-
     expect(page).to have_content('New commit message')
     expect(page).to have_content('Lorem ipsum dolor sit amet')
     expect(page).to have_content('Sed ut perspiciatis unde omnis')
-- 
GitLab


From 73e8f492d0e6c342fd339a0a99eef914b047a8ac Mon Sep 17 00:00:00 2001
From: Chaoyue Zhao <czhao@gitlab.com>
Date: Wed, 4 Dec 2024 18:18:09 -0500
Subject: [PATCH 03/18] Update `can_push_to_branch` to always `true` in
 `project_presenter.rb`

---
 app/presenters/project_presenter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/presenters/project_presenter.rb b/app/presenters/project_presenter.rb
index 52a70c1184e2b7..a89cb2e1071e4c 100644
--- a/app/presenters/project_presenter.rb
+++ b/app/presenters/project_presenter.rb
@@ -266,7 +266,7 @@ def upload_anchor_data
           'target_branch' => default_branch_or_main,
           'original_branch' => default_branch_or_main,
           'can_push_code' => 'true',
-          'can_push_to_branch' => can_current_user_push_to_branch?(current_ref).to_s,
+          'can_push_to_branch' => 'true',
           'path' => project_create_blob_path(project, default_branch_or_main),
           'project_path' => project.full_path
         }
-- 
GitLab


From 20836411a155406920218444869629cea641a904 Mon Sep 17 00:00:00 2001
From: Chaoyue Zhao <czhao@gitlab.com>
Date: Fri, 6 Dec 2024 10:26:40 -0500
Subject: [PATCH 04/18] Add new state for empty repo

---
 .../projects/details/upload_button.vue        |  4 ++
 .../javascripts/projects/upload_file.js       |  1 +
 .../components/commit_changes_modal.vue       | 53 +++++++++++--------
 .../components/upload_blob_modal.vue          |  6 +++
 .../components/commit_changes_modal_spec.js   | 17 +++---
 5 files changed, 53 insertions(+), 28 deletions(-)

diff --git a/app/assets/javascripts/projects/details/upload_button.vue b/app/assets/javascripts/projects/details/upload_button.vue
index 8baa64547a361d..9b0eddea2157be 100644
--- a/app/assets/javascripts/projects/details/upload_button.vue
+++ b/app/assets/javascripts/projects/details/upload_button.vue
@@ -31,6 +31,9 @@ export default {
     projectPath: {
       default: '',
     },
+    emptyRepo: {
+      default: false,
+    },
   },
   uploadBlobModalId: UPLOAD_BLOB_MODAL_ID,
 };
@@ -55,6 +58,7 @@ export default {
       :can-push-code="canPushCode"
       :can-push-to-branch="canPushToBranch"
       :path="path"
+      :empty-repo="emptyRepo"
     />
   </span>
 </template>
diff --git a/app/assets/javascripts/projects/upload_file.js b/app/assets/javascripts/projects/upload_file.js
index e25c30de3a23a0..794bf1dfd653be 100644
--- a/app/assets/javascripts/projects/upload_file.js
+++ b/app/assets/javascripts/projects/upload_file.js
@@ -21,6 +21,7 @@ export const initUploadFileTrigger = () => {
       canPushToBranch: parseBoolean(canPushToBranch),
       path,
       projectPath,
+      emptyRepo: true,
     },
     render(h) {
       return h(UploadButton);
diff --git a/app/assets/javascripts/repository/components/commit_changes_modal.vue b/app/assets/javascripts/repository/components/commit_changes_modal.vue
index 8a09ad21d9452f..094491faf60cd3 100644
--- a/app/assets/javascripts/repository/components/commit_changes_modal.vue
+++ b/app/assets/javascripts/repository/components/commit_changes_modal.vue
@@ -48,6 +48,9 @@ export default {
     COMMIT_IN_BRANCH_MESSAGE: __(
       'Your changes can be committed to %{branchName} because a merge request is open.',
     ),
+    COMMIT_IN_DEFAULT_BRANCH: __(
+      'GitLab will create %{branchName} branch and commit your changes to it.',
+    ),
     COMMIT_LABEL,
     COMMIT_MESSAGE_HINT: __(
       'Try to keep the first line under 52 characters and the others under 72.',
@@ -291,33 +294,40 @@ export default {
       <gl-form ref="form" novalidate>
         <input :value="$options.csrf.token" type="hidden" name="authenticity_token" />
         <slot name="form-fields"></slot>
+        <gl-form-group
+          :label="$options.i18n.COMMIT_LABEL"
+          label-for="commit_message"
+          :invalid-feedback="form.fields['commit_message'].feedback"
+        >
+          <gl-form-textarea
+            id="commit_message"
+            ref="message"
+            v-model="form.fields['commit_message'].value"
+            v-validation:[form.showValidation]
+            name="commit_message"
+            no-resize
+            data-testid="commit-message-field"
+            :state="form.fields['commit_message'].state"
+            :disabled="loading"
+            required
+          />
+          <p v-if="showHint" class="form-text gl-text-subtle" data-testid="hint">
+            {{ $options.i18n.COMMIT_MESSAGE_HINT }}
+          </p>
+        </gl-form-group>
         <template v-if="emptyRepo">
           <input type="hidden" name="branch_name" :value="originalBranch" class="js-branch-name" />
+          <gl-alert v-if="emptyRepo" :dismissible="false" class="gl-my-3">
+            <gl-sprintf :message="$options.i18n.COMMIT_IN_DEFAULT_BRANCH">
+              <template #branchName
+                ><strong>{{ originalBranch }}</strong>
+              </template>
+            </gl-sprintf>
+          </gl-alert>
         </template>
         <template v-else>
           <input type="hidden" name="original_branch" :value="originalBranch" />
           <input v-if="createNewMr" type="hidden" name="create_merge_request" value="1" />
-          <gl-form-group
-            :label="$options.i18n.COMMIT_LABEL"
-            label-for="commit_message"
-            :invalid-feedback="form.fields['commit_message'].feedback"
-          >
-            <gl-form-textarea
-              id="commit_message"
-              ref="message"
-              v-model="form.fields['commit_message'].value"
-              v-validation:[form.showValidation]
-              name="commit_message"
-              no-resize
-              data-testid="commit-message-field"
-              :state="form.fields['commit_message'].state"
-              :disabled="loading"
-              required
-            />
-            <p v-if="showHint" class="form-text gl-text-subtle" data-testid="hint">
-              {{ $options.i18n.COMMIT_MESSAGE_HINT }}
-            </p>
-          </gl-form-group>
           <gl-form-group
             v-if="canPushCode"
             :label="$options.i18n.BRANCH"
@@ -358,7 +368,6 @@ export default {
                 </gl-form-checkbox>
               </div>
             </template>
-
             <template v-else>
               <label for="branchNameInput">
                 {{ $options.i18n.NEW_BRANCH_LABEl }}
diff --git a/app/assets/javascripts/repository/components/upload_blob_modal.vue b/app/assets/javascripts/repository/components/upload_blob_modal.vue
index bb89855f3244d2..5680fbf659ef03 100644
--- a/app/assets/javascripts/repository/components/upload_blob_modal.vue
+++ b/app/assets/javascripts/repository/components/upload_blob_modal.vue
@@ -55,6 +55,11 @@ export default {
       default: null,
       required: false,
     },
+    emptyRepo: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   data() {
     return {
@@ -145,6 +150,7 @@ export default {
     :can-push-to-branch="canPushToBranch"
     :is-primary-button-disabled="!file || loading"
     :handle-form-submit="submitForm"
+    :empty-repo="emptyRepo"
     data-testid="upload-blob-modal"
   >
     <template #body>
diff --git a/spec/frontend/repository/components/commit_changes_modal_spec.js b/spec/frontend/repository/components/commit_changes_modal_spec.js
index 5b98fd51acbdb8..db581ea4ff7946 100644
--- a/spec/frontend/repository/components/commit_changes_modal_spec.js
+++ b/spec/frontend/repository/components/commit_changes_modal_spec.js
@@ -147,6 +147,15 @@ describe('CommitChangesModal', () => {
       expect(findForm().attributes('action')).toBe(initialProps.actionPath);
     });
 
+    it('shows the correct form fields when repo is empty', () => {
+      createComponent({ props: { emptyRepo: true } });
+      expect(findCommitTextarea().exists()).toBe(true);
+      expect(findRadioGroup().exists()).toBe(false);
+      expect(findModal().text()).toContain(
+        'GitLab will create main branch and commit your changes to it.',
+      );
+    });
+
     it('shows the correct form fields when commit to current branch', () => {
       createComponent();
       expect(findCommitTextarea().exists()).toBe(true);
@@ -176,12 +185,8 @@ describe('CommitChangesModal', () => {
     });
 
     describe('when `canPushToCode` is `false`', () => {
-      const commitInBranchMessage = sprintf(
-        'Your changes can be committed to %{branchName} because a merge request is open.',
-        {
-          branchName: 'main',
-        },
-      );
+      const commitInBranchMessage =
+        'Your changes can be committed to main because a merge request is open.';
 
       it('shows the correct form fields when `branchAllowsCollaboration` is `true`', () => {
         createComponent({ props: { canPushCode: false, branchAllowsCollaboration: true } });
-- 
GitLab


From 9ede23e8c2c74065c2c32582c0311ad2fc71d735 Mon Sep 17 00:00:00 2001
From: Chaoyue Zhao <czhao@gitlab.com>
Date: Fri, 6 Dec 2024 10:32:14 -0500
Subject: [PATCH 05/18] Clean up unused refs

---
 app/assets/javascripts/projects/details/upload_button.vue        | 1 -
 .../repository/components/header_area/breadcrumbs.vue            | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/assets/javascripts/projects/details/upload_button.vue b/app/assets/javascripts/projects/details/upload_button.vue
index 9b0eddea2157be..7d037bd6fce277 100644
--- a/app/assets/javascripts/projects/details/upload_button.vue
+++ b/app/assets/javascripts/projects/details/upload_button.vue
@@ -50,7 +50,6 @@ export default {
       >{{ __('Upload File') }}</gl-button
     >
     <upload-blob-modal
-      :ref="$options.uploadBlobModalId"
       :modal-id="$options.uploadBlobModalId"
       :commit-message="__('Upload New File')"
       :target-branch="targetBranch"
diff --git a/app/assets/javascripts/repository/components/header_area/breadcrumbs.vue b/app/assets/javascripts/repository/components/header_area/breadcrumbs.vue
index d28db33096f701..2675cbc458aed2 100644
--- a/app/assets/javascripts/repository/components/header_area/breadcrumbs.vue
+++ b/app/assets/javascripts/repository/components/header_area/breadcrumbs.vue
@@ -332,7 +332,6 @@ export default {
     </ol>
     <upload-blob-modal
       v-if="showUploadModal"
-      :ref="$options.uploadBlobModalId"
       :modal-id="$options.uploadBlobModalId"
       :commit-message="__('Upload New File')"
       :target-branch="selectedBranch"
-- 
GitLab


From f6c8dd3595aa16a9138726adb7f84ade0454611a Mon Sep 17 00:00:00 2001
From: Chaoyue Zhao <czhao@gitlab.com>
Date: Fri, 6 Dec 2024 11:34:49 -0500
Subject: [PATCH 06/18] Add `can_push_to_branch` in `header_area` app

---
 .../repository/components/header_area.vue     |  2 +
 .../javascripts/repository/init_header_app.js |  2 +
 .../repository/components/header_area_spec.js | 47 +++++++++++++++++++
 3 files changed, 51 insertions(+)

diff --git a/app/assets/javascripts/repository/components/header_area.vue b/app/assets/javascripts/repository/components/header_area.vue
index f62eea9583de87..0d089895527559 100644
--- a/app/assets/javascripts/repository/components/header_area.vue
+++ b/app/assets/javascripts/repository/components/header_area.vue
@@ -42,6 +42,7 @@ export default {
     'canCollaborate',
     'canEditTree',
     'canPushCode',
+    'canPushToBranch',
     'originalBranch',
     'selectedBranch',
     'newBranchPath',
@@ -179,6 +180,7 @@ export default {
         :can-collaborate="canCollaborate"
         :can-edit-tree="canEditTree"
         :can-push-code="canPushCode"
+        :can-push-to-branch="canPushToBranch"
         :original-branch="originalBranch"
         :selected-branch="selectedBranch"
         :new-branch-path="newBranchPath"
diff --git a/app/assets/javascripts/repository/init_header_app.js b/app/assets/javascripts/repository/init_header_app.js
index 9d4082b7f2554b..58f0daf97bac77 100644
--- a/app/assets/javascripts/repository/init_header_app.js
+++ b/app/assets/javascripts/repository/init_header_app.js
@@ -40,6 +40,7 @@ export default function initHeaderApp({ router, isReadmeView = false, isBlobView
       breadcrumbsCanCollaborate,
       breadcrumbsCanEditTree,
       breadcrumbsCanPushCode,
+      breadcrumbsCanPushToBranch,
       breadcrumbsSelectedBranch,
       breadcrumbsNewBranchPath,
       breadcrumbsNewTagPath,
@@ -88,6 +89,7 @@ export default function initHeaderApp({ router, isReadmeView = false, isBlobView
         canCollaborate: parseBoolean(breadcrumbsCanCollaborate),
         canEditTree: parseBoolean(breadcrumbsCanEditTree),
         canPushCode: parseBoolean(breadcrumbsCanPushCode),
+        canPushToBranch: parseBoolean(breadcrumbsCanPushToBranch),
         originalBranch: ref,
         selectedBranch: breadcrumbsSelectedBranch,
         newBranchPath: breadcrumbsNewBranchPath,
diff --git a/spec/frontend/repository/components/header_area_spec.js b/spec/frontend/repository/components/header_area_spec.js
index 5de269ca71b7f1..a7a89787a6ed35 100644
--- a/spec/frontend/repository/components/header_area_spec.js
+++ b/spec/frontend/repository/components/header_area_spec.js
@@ -23,6 +23,53 @@ const defaultMockRoute = {
   },
 };
 
+const defaultProvided = {
+  canCollaborate: true,
+  canEditTree: true,
+  canPushCode: true,
+  canPushToBranch: true,
+  originalBranch: 'main',
+  selectedBranch: 'feature/new-ui',
+  newBranchPath: '/project/new-branch',
+  newTagPath: '/project/new-tag',
+  newBlobPath: '/project/new-file',
+  forkNewBlobPath: '/project/fork/new-file',
+  forkNewDirectoryPath: '/project/fork/new-directory',
+  forkUploadBlobPath: '/project/fork/upload',
+  uploadPath: '/project/upload',
+  newDirPath: '/project/new-directory',
+  projectRootPath: '/project/root/path',
+  comparePath: undefined,
+  isReadmeView: false,
+  isFork: false,
+  needsToFork: true,
+  gitpodEnabled: false,
+  isBlob: true,
+  showEditButton: true,
+  showWebIdeButton: true,
+  showGitpodButton: false,
+  showPipelineEditorUrl: true,
+  webIdeUrl: 'https://gitlab.com/project/-/ide/',
+  editUrl: 'https://gitlab.com/project/-/edit/main/',
+  pipelineEditorUrl: 'https://gitlab.com/project/-/ci/editor',
+  gitpodUrl: 'https://gitpod.io/#https://gitlab.com/project',
+  userPreferencesGitpodPath: '/profile/preferences#gitpod',
+  userProfileEnableGitpodPath: '/profile/preferences?enable_gitpod=true',
+  httpUrl: 'https://gitlab.com/example-group/example-project.git',
+  xcodeUrl: 'xcode://clone?repo=https://gitlab.com/example-group/example-project.git',
+  sshUrl: 'git@gitlab.com:example-group/example-project.git',
+  kerberosUrl: 'https://kerberos@gitlab.com/example-group/example-project.git',
+  downloadLinks: [
+    'https://gitlab.com/example-group/example-project/-/archive/main/example-project-main.zip',
+    'https://gitlab.com/example-group/example-project/-/archive/main/example-project-main.tar.gz',
+    'https://gitlab.com/example-group/example-project/-/archive/main/example-project-main.tar.bz2',
+    'https://gitlab.com/example-group/example-project/-/releases',
+  ],
+  downloadArtifacts: [
+    'https://gitlab.com/example-group/example-project/-/jobs/artifacts/main/download?job=build',
+  ],
+};
+
 describe('HeaderArea', () => {
   let wrapper;
 
-- 
GitLab


From eebbb7d258acafe0b52a0862e6f0cffdeb5cdab7 Mon Sep 17 00:00:00 2001
From: Chaoyue Zhao <czhao@gitlab.com>
Date: Fri, 6 Dec 2024 12:28:27 -0500
Subject: [PATCH 07/18] Update `valid` and `loading` prop

- Update loading` to be handle outside commit change modal
- Rename `isPrimaryButtonDisabled` to `valid`
- Add `delete_blob_modal` to pull delete logic out of `blob_button_group`
- Disable radio button while `loading` is true
---
 .../components/blob_button_group.vue          | 25 ++------
 .../components/commit_changes_modal.vue       | 21 +++----
 .../components/delete_blob_modal.vue          | 63 +++++++++++++++++++
 .../components/upload_blob_modal.vue          |  6 +-
 .../components/commit_changes_modal_spec.js   | 37 +++++++++++
 .../components/upload_blob_modal_spec.js      |  8 +--
 6 files changed, 124 insertions(+), 36 deletions(-)
 create mode 100644 app/assets/javascripts/repository/components/delete_blob_modal.vue

diff --git a/app/assets/javascripts/repository/components/blob_button_group.vue b/app/assets/javascripts/repository/components/blob_button_group.vue
index b4b68e4d3cc00c..cea445bc5cfb7d 100644
--- a/app/assets/javascripts/repository/components/blob_button_group.vue
+++ b/app/assets/javascripts/repository/components/blob_button_group.vue
@@ -1,12 +1,10 @@
 <script>
 import { GlButtonGroup, GlButton } from '@gitlab/ui';
 import { uniqueId } from 'lodash';
-import axios from '~/lib/utils/axios_utils';
-import { visitUrl } from '~/lib/utils/url_utility';
 import { sprintf, __ } from '~/locale';
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import getRefMixin from '../mixins/get_ref';
-import CommitChangesModal from './commit_changes_modal.vue';
+import DeleteBlobModal from './delete_blob_modal.vue';
 import UploadBlobModal from './upload_blob_modal.vue';
 
 const REPLACE_BLOB_MODAL_ID = 'modal-replace-blob';
@@ -20,7 +18,7 @@ export default {
     GlButtonGroup,
     GlButton,
     UploadBlobModal,
-    CommitChangesModal,
+    DeleteBlobModal,
     LockFileButton: () => import('ee_component/repository/components/lock_file_button.vue'),
   },
   mixins: [getRefMixin, glFeatureFlagMixin()],
@@ -106,15 +104,6 @@ export default {
 
       this.$refs[modalId].show();
     },
-    handleBlobDelete(formData) {
-      return axios({
-        method: 'post',
-        url: this.deletePath,
-        data: formData,
-      }).then((response) => {
-        visitUrl(response.data.filePath);
-      });
-    },
   },
   replaceBlobModalId: REPLACE_BLOB_MODAL_ID,
 };
@@ -150,8 +139,9 @@ export default {
       :path="path"
       :replace-path="replacePath"
     />
-    <commit-changes-modal
+    <delete-blob-modal
       :ref="deleteModalId"
+      :delete-path="deletePath"
       :modal-id="deleteModalId"
       :commit-message="deleteModalCommitMessage"
       :target-branch="targetBranch || ref"
@@ -160,11 +150,6 @@ export default {
       :can-push-to-branch="canPushToBranch"
       :empty-repo="emptyRepo"
       :is-using-lfs="isUsingLfs"
-      :handle-form-submit="handleBlobDelete"
-    >
-      <template #form-fields>
-        <input type="hidden" name="_method" value="delete" />
-      </template>
-    </commit-changes-modal>
+    />
   </div>
 </template>
diff --git a/app/assets/javascripts/repository/components/commit_changes_modal.vue b/app/assets/javascripts/repository/components/commit_changes_modal.vue
index 094491faf60cd3..31616d91a9cea8 100644
--- a/app/assets/javascripts/repository/components/commit_changes_modal.vue
+++ b/app/assets/javascripts/repository/components/commit_changes_modal.vue
@@ -111,7 +111,12 @@ export default {
       required: false,
       default: false,
     },
-    isPrimaryButtonDisabled: {
+    valid: {
+      type: Boolean,
+      required: false,
+      default: true,
+    },
+    loading: {
       type: Boolean,
       required: false,
       default: false,
@@ -139,7 +144,6 @@ export default {
     };
     return {
       lfsWarningDismissed: false,
-      loading: false,
       createNewBranch: false,
       createNewMr: true,
       form,
@@ -152,7 +156,7 @@ export default {
         attributes: {
           variant: 'confirm',
           loading: this.loading,
-          disabled: this.loading || !this.form.state || this.isPrimaryButtonDisabled,
+          disabled: this.loading || !this.form.state || !this.valid,
         },
       };
 
@@ -244,17 +248,12 @@ export default {
         return;
       }
 
-      this.loading = true;
       this.form.showValidation = false;
 
       const form = this.$refs.form.$el;
       const formData = new FormData(form);
 
-      try {
-        this.handleFormSubmit(formData);
-      } finally {
-        this.loading = false;
-      }
+      this.handleFormSubmit(formData);
     },
   },
   deleteLfsHelpPath: helpPagePath('topics/git/lfs', {
@@ -339,14 +338,14 @@ export default {
                 name="branch_selection"
                 :label="$options.i18n.BRANCH"
               >
-                <gl-form-radio :value="false">
+                <gl-form-radio :value="false" :disabled="loading">
                   <gl-sprintf :message="$options.i18n.CURRENT_BRANCH_LABEL">
                     <template #branchName
                       ><code>{{ originalBranch }}</code>
                     </template>
                   </gl-sprintf>
                 </gl-form-radio>
-                <gl-form-radio :value="true">
+                <gl-form-radio :value="true" :disabled="loading">
                   {{ $options.i18n.NEW_BRANCH_LABEl }}
                 </gl-form-radio>
               </gl-form-radio-group>
diff --git a/app/assets/javascripts/repository/components/delete_blob_modal.vue b/app/assets/javascripts/repository/components/delete_blob_modal.vue
new file mode 100644
index 00000000000000..0ad089068bbd14
--- /dev/null
+++ b/app/assets/javascripts/repository/components/delete_blob_modal.vue
@@ -0,0 +1,63 @@
+<script>
+import axios from '~/lib/utils/axios_utils';
+import { visitUrl } from '~/lib/utils/url_utility';
+import { logError } from '~/lib/logger';
+import { createAlert } from '~/alert';
+import { __ } from '~/locale';
+import CommitChangesModal from './commit_changes_modal.vue';
+
+export default {
+  components: {
+    CommitChangesModal,
+  },
+  props: {
+    deletePath: {
+      type: String,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      loading: false,
+    };
+  },
+  methods: {
+    show() {
+      this.$refs.modal.show();
+    },
+    handleBlobDelete(formData) {
+      this.loading = true;
+
+      return axios({
+        method: 'post',
+        url: this.deletePath,
+        data: formData,
+      })
+        .then((response) => {
+          visitUrl(response.data.filePath);
+        })
+        .catch((e) => {
+          // eslint-disable-next-line @gitlab/require-i18n-strings
+          logError('Failed to delete file. See exception details for more information.', e);
+          createAlert({ message: __('Failed to delete file! Please try again.'), error: e });
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+  },
+};
+</script>
+<template>
+  <commit-changes-modal
+    ref="modal"
+    :handle-form-submit="handleBlobDelete"
+    :loading="loading"
+    v-bind="$attrs"
+    v-on="$listeners"
+  >
+    <template #form-fields>
+      <input type="hidden" name="_method" value="delete" />
+    </template>
+  </commit-changes-modal>
+</template>
diff --git a/app/assets/javascripts/repository/components/upload_blob_modal.vue b/app/assets/javascripts/repository/components/upload_blob_modal.vue
index 5680fbf659ef03..a4e9621c09d07d 100644
--- a/app/assets/javascripts/repository/components/upload_blob_modal.vue
+++ b/app/assets/javascripts/repository/components/upload_blob_modal.vue
@@ -72,6 +72,9 @@ export default {
     formattedFileSize() {
       return numberToHumanSize(this.file.size);
     },
+    isValid() {
+      return Boolean(this.file);
+    },
   },
   methods: {
     show() {
@@ -148,7 +151,8 @@ export default {
     :original-branch="originalBranch"
     :can-push-code="canPushCode"
     :can-push-to-branch="canPushToBranch"
-    :is-primary-button-disabled="!file || loading"
+    :valid="isValid"
+    :loading="loading"
     :handle-form-submit="submitForm"
     :empty-repo="emptyRepo"
     data-testid="upload-blob-modal"
diff --git a/spec/frontend/repository/components/commit_changes_modal_spec.js b/spec/frontend/repository/components/commit_changes_modal_spec.js
index db581ea4ff7946..21bbdb414efd4b 100644
--- a/spec/frontend/repository/components/commit_changes_modal_spec.js
+++ b/spec/frontend/repository/components/commit_changes_modal_spec.js
@@ -139,6 +139,26 @@ describe('CommitChangesModal', () => {
       });
       expect(findSlot().text()).toBe('test form fields slot');
     });
+
+    it('disables actionable while loading', () => {
+      createComponent({ props: { loading: true } });
+
+      expect(findModal().props('actionPrimary').attributes).toEqual(
+        expect.objectContaining({ disabled: true }),
+      );
+      expect(findModal().props('actionCancel').attributes).toEqual(
+        expect.objectContaining({ disabled: true }),
+      );
+      expect(findCommitTextarea().attributes()).toEqual(
+        expect.objectContaining({ disabled: 'true' }),
+      );
+      expect(findCurrentBranchRadioOption().attributes()).toEqual(
+        expect.objectContaining({ disabled: 'true' }),
+      );
+      expect(findNewBranchRadioOption().attributes()).toEqual(
+        expect.objectContaining({ disabled: 'true' }),
+      );
+    });
   });
 
   describe('form', () => {
@@ -328,6 +348,23 @@ describe('CommitChangesModal', () => {
       });
     });
 
+    describe('invalid prop is passed in', () => {
+      beforeEach(() => {
+        createComponent({ props: { isValid: false } });
+      });
+
+      it('disables submit button', () => {
+        expect(findModal().props('actionPrimary').attributes).toEqual(
+          expect.objectContaining({ disabled: true }),
+        );
+      });
+
+      it('does not submit form', () => {
+        findModal().vm.$emit('primary', { preventDefault: () => {} });
+        expect(handleFormSubmitSpy).not.toHaveBeenCalled();
+      });
+    });
+
     describe('valid form', () => {
       beforeEach(async () => {
         findFormRadioGroup().vm.$emit('input', true);
diff --git a/spec/frontend/repository/components/upload_blob_modal_spec.js b/spec/frontend/repository/components/upload_blob_modal_spec.js
index d9b0029b983cc7..02ce1023c56bef 100644
--- a/spec/frontend/repository/components/upload_blob_modal_spec.js
+++ b/spec/frontend/repository/components/upload_blob_modal_spec.js
@@ -54,7 +54,7 @@ describe('UploadBlobModal', () => {
 
   const findCommitChangesModal = () => wrapper.findComponent(CommitChangesModal);
   const findUploadDropzone = () => wrapper.findComponent(UploadDropzone);
-  const primaryButtonDisabledProp = () => findCommitChangesModal().props('isPrimaryButtonDisabled');
+  const commitChangesModalValidProp = () => findCommitChangesModal().props('valid');
   const findFileIcon = () => wrapper.findComponent(FileIcon);
 
   describe.each`
@@ -74,8 +74,8 @@ describe('UploadBlobModal', () => {
         expect(findUploadDropzone().exists()).toBe(true);
       });
 
-      it('displays the disabled upload button', () => {
-        expect(primaryButtonDisabledProp()).toBe(true);
+      it('passes down invalid prop to commit changes modal', () => {
+        expect(commitChangesModalValidProp()).toBe(false);
       });
 
       describe('completed form', () => {
@@ -87,7 +87,7 @@ describe('UploadBlobModal', () => {
         });
 
         it('enables the upload button when the form is completed', () => {
-          expect(primaryButtonDisabledProp()).toBe(false);
+          expect(commitChangesModalValidProp()).toBe(true);
         });
 
         describe('successful response', () => {
-- 
GitLab


From 49b1cb9710e7fd23b156c5fabc72e21322d9fda2 Mon Sep 17 00:00:00 2001
From: Chaoyue Zhao <czhao@gitlab.com>
Date: Fri, 6 Dec 2024 13:00:10 -0500
Subject: [PATCH 08/18] Add `logError` in `catch`

---
 .../repository/components/upload_blob_modal.vue          | 7 ++++++-
 .../repository/components/upload_blob_modal_spec.js      | 9 ++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/repository/components/upload_blob_modal.vue b/app/assets/javascripts/repository/components/upload_blob_modal.vue
index a4e9621c09d07d..d53b0d179ef4a7 100644
--- a/app/assets/javascripts/repository/components/upload_blob_modal.vue
+++ b/app/assets/javascripts/repository/components/upload_blob_modal.vue
@@ -3,6 +3,7 @@ import { GlButton } from '@gitlab/ui';
 import FileIcon from '~/vue_shared/components/file_icon.vue';
 import { createAlert } from '~/alert';
 import axios from '~/lib/utils/axios_utils';
+import { logError } from '~/lib/logger';
 import { contentTypeMultipartFormData } from '~/lib/utils/headers';
 import { numberToHumanSize } from '~/lib/utils/number_utils';
 import { visitUrl, joinPaths } from '~/lib/utils/url_utility';
@@ -112,7 +113,11 @@ export default {
         .then((response) => {
           visitUrl(response.data.filePath);
         })
-        .catch(() => {
+        .catch((e) => {
+          logError(
+            `Failed to ${this.replacePath ? 'replace' : 'upload'} file. See exception details for more information.`,
+            e,
+          );
           createAlert({ message: this.$options.i18n.ERROR_MESSAGE });
         })
         .finally(() => {
diff --git a/spec/frontend/repository/components/upload_blob_modal_spec.js b/spec/frontend/repository/components/upload_blob_modal_spec.js
index 02ce1023c56bef..21fc798e3c6cd2 100644
--- a/spec/frontend/repository/components/upload_blob_modal_spec.js
+++ b/spec/frontend/repository/components/upload_blob_modal_spec.js
@@ -10,9 +10,10 @@ import { visitUrl } from '~/lib/utils/url_utility';
 import UploadBlobModal from '~/repository/components/upload_blob_modal.vue';
 import UploadDropzone from '~/vue_shared/components/upload_dropzone/upload_dropzone.vue';
 import CommitChangesModal from '~/repository/components/commit_changes_modal.vue';
+import { logError } from '~/lib/logger';
 
 jest.mock('~/alert');
-
+jest.mock('~/lib/logger');
 jest.mock('~/lib/utils/url_utility', () => ({
   visitUrl: jest.fn(),
   joinPaths: () => '/new_upload',
@@ -123,9 +124,15 @@ describe('UploadBlobModal', () => {
           });
 
           it('creates an alert error', () => {
+            const mockError = new Error('timeout of 0ms exceeded');
+
             expect(createAlert).toHaveBeenCalledWith({
               message: 'Error uploading file. Please try again.',
             });
+            expect(logError).toHaveBeenCalledWith(
+              'Failed to upload file. See exception details for more information.',
+              mockError,
+            );
           });
 
           afterEach(() => {
-- 
GitLab


From 98ad069d87be0356009a0ac0e2cf2b9c76e6594d Mon Sep 17 00:00:00 2001
From: Chaoyue Zhao <czhao@gitlab.com>
Date: Fri, 6 Dec 2024 13:01:02 -0500
Subject: [PATCH 09/18] Add translation strings

---
 locale/gitlab.pot | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 8ecd78ccc47498..dfc5beb29de332 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -23115,6 +23115,9 @@ msgstr ""
 msgid "Failed to delete custom emoji. Please try again."
 msgstr ""
 
+msgid "Failed to delete file! Please try again."
+msgstr ""
+
 msgid "Failed to deploy to"
 msgstr ""
 
@@ -25045,6 +25048,9 @@ msgstr ""
 msgid "GitLab version"
 msgstr ""
 
+msgid "GitLab will create %{branchName} branch and commit your changes to it."
+msgstr ""
+
 msgid "GitLab will create a branch in your fork and start a merge request."
 msgstr ""
 
-- 
GitLab


From 2f38e0503f7424376dc9b1120b12acd1497a2b8d Mon Sep 17 00:00:00 2001
From: Chaoyue Zhao <czhao@gitlab.com>
Date: Mon, 9 Dec 2024 14:23:10 -0500
Subject: [PATCH 10/18] Update empty repo copy

---
 .../repository/components/commit_changes_modal.vue            | 2 +-
 locale/gitlab.pot                                             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/repository/components/commit_changes_modal.vue b/app/assets/javascripts/repository/components/commit_changes_modal.vue
index 31616d91a9cea8..63c68410b14c10 100644
--- a/app/assets/javascripts/repository/components/commit_changes_modal.vue
+++ b/app/assets/javascripts/repository/components/commit_changes_modal.vue
@@ -49,7 +49,7 @@ export default {
       'Your changes can be committed to %{branchName} because a merge request is open.',
     ),
     COMMIT_IN_DEFAULT_BRANCH: __(
-      'GitLab will create %{branchName} branch and commit your changes to it.',
+      'GitLab will create a default branch, %{branchName}, and commit your changes.',
     ),
     COMMIT_LABEL,
     COMMIT_MESSAGE_HINT: __(
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index dfc5beb29de332..d7866e61cbc733 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -25048,10 +25048,10 @@ msgstr ""
 msgid "GitLab version"
 msgstr ""
 
-msgid "GitLab will create %{branchName} branch and commit your changes to it."
+msgid "GitLab will create a branch in your fork and start a merge request."
 msgstr ""
 
-msgid "GitLab will create a branch in your fork and start a merge request."
+msgid "GitLab will create a default branch, %{branchName}, and commit your changes."
 msgstr ""
 
 msgid "GitLab.com (SaaS)"
-- 
GitLab


From 77e250672cef78b40b2b32963c9627d2f3db83c0 Mon Sep 17 00:00:00 2001
From: Chaoyue Zhao <czhao@gitlab.com>
Date: Mon, 9 Dec 2024 14:31:12 -0500
Subject: [PATCH 11/18] Update to use custom events

---
 .../repository/components/commit_changes_modal.vue          | 6 +-----
 .../javascripts/repository/components/upload_blob_modal.vue | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/repository/components/commit_changes_modal.vue b/app/assets/javascripts/repository/components/commit_changes_modal.vue
index 63c68410b14c10..074cfe1c766898 100644
--- a/app/assets/javascripts/repository/components/commit_changes_modal.vue
+++ b/app/assets/javascripts/repository/components/commit_changes_modal.vue
@@ -121,10 +121,6 @@ export default {
       required: false,
       default: false,
     },
-    handleFormSubmit: {
-      type: Function,
-      required: true,
-    },
   },
   data() {
     const form = {
@@ -253,7 +249,7 @@ export default {
       const form = this.$refs.form.$el;
       const formData = new FormData(form);
 
-      this.handleFormSubmit(formData);
+      this.$emit('submit-form', formData);
     },
   },
   deleteLfsHelpPath: helpPagePath('topics/git/lfs', {
diff --git a/app/assets/javascripts/repository/components/upload_blob_modal.vue b/app/assets/javascripts/repository/components/upload_blob_modal.vue
index d53b0d179ef4a7..d53806d7ed14d4 100644
--- a/app/assets/javascripts/repository/components/upload_blob_modal.vue
+++ b/app/assets/javascripts/repository/components/upload_blob_modal.vue
@@ -158,9 +158,9 @@ export default {
     :can-push-to-branch="canPushToBranch"
     :valid="isValid"
     :loading="loading"
-    :handle-form-submit="submitForm"
     :empty-repo="emptyRepo"
     data-testid="upload-blob-modal"
+    @submit-form="submitForm"
   >
     <template #body>
       <upload-dropzone
-- 
GitLab


From c024d4281ada0e5769aa8cdb266bde6ffd155517 Mon Sep 17 00:00:00 2001
From: Chaoyue Zhao <czhao@gitlab.com>
Date: Mon, 9 Dec 2024 14:40:35 -0500
Subject: [PATCH 12/18] Post rebase

---
 ee/spec/frontend/repository/mock_data.js      |  1 +
 .../repository/components/header_area_spec.js | 47 -------------------
 2 files changed, 1 insertion(+), 47 deletions(-)

diff --git a/ee/spec/frontend/repository/mock_data.js b/ee/spec/frontend/repository/mock_data.js
index 8740d7dcc12551..56131b1b4ab520 100644
--- a/ee/spec/frontend/repository/mock_data.js
+++ b/ee/spec/frontend/repository/mock_data.js
@@ -24,6 +24,7 @@ export const headerAppInjected = {
   canCollaborate: true,
   canEditTree: true,
   canPushCode: true,
+  canPushToBranch: true,
   originalBranch: 'main',
   selectedBranch: 'feature/new-ui',
   newBranchPath: '/project/new-branch',
diff --git a/spec/frontend/repository/components/header_area_spec.js b/spec/frontend/repository/components/header_area_spec.js
index a7a89787a6ed35..5de269ca71b7f1 100644
--- a/spec/frontend/repository/components/header_area_spec.js
+++ b/spec/frontend/repository/components/header_area_spec.js
@@ -23,53 +23,6 @@ const defaultMockRoute = {
   },
 };
 
-const defaultProvided = {
-  canCollaborate: true,
-  canEditTree: true,
-  canPushCode: true,
-  canPushToBranch: true,
-  originalBranch: 'main',
-  selectedBranch: 'feature/new-ui',
-  newBranchPath: '/project/new-branch',
-  newTagPath: '/project/new-tag',
-  newBlobPath: '/project/new-file',
-  forkNewBlobPath: '/project/fork/new-file',
-  forkNewDirectoryPath: '/project/fork/new-directory',
-  forkUploadBlobPath: '/project/fork/upload',
-  uploadPath: '/project/upload',
-  newDirPath: '/project/new-directory',
-  projectRootPath: '/project/root/path',
-  comparePath: undefined,
-  isReadmeView: false,
-  isFork: false,
-  needsToFork: true,
-  gitpodEnabled: false,
-  isBlob: true,
-  showEditButton: true,
-  showWebIdeButton: true,
-  showGitpodButton: false,
-  showPipelineEditorUrl: true,
-  webIdeUrl: 'https://gitlab.com/project/-/ide/',
-  editUrl: 'https://gitlab.com/project/-/edit/main/',
-  pipelineEditorUrl: 'https://gitlab.com/project/-/ci/editor',
-  gitpodUrl: 'https://gitpod.io/#https://gitlab.com/project',
-  userPreferencesGitpodPath: '/profile/preferences#gitpod',
-  userProfileEnableGitpodPath: '/profile/preferences?enable_gitpod=true',
-  httpUrl: 'https://gitlab.com/example-group/example-project.git',
-  xcodeUrl: 'xcode://clone?repo=https://gitlab.com/example-group/example-project.git',
-  sshUrl: 'git@gitlab.com:example-group/example-project.git',
-  kerberosUrl: 'https://kerberos@gitlab.com/example-group/example-project.git',
-  downloadLinks: [
-    'https://gitlab.com/example-group/example-project/-/archive/main/example-project-main.zip',
-    'https://gitlab.com/example-group/example-project/-/archive/main/example-project-main.tar.gz',
-    'https://gitlab.com/example-group/example-project/-/archive/main/example-project-main.tar.bz2',
-    'https://gitlab.com/example-group/example-project/-/releases',
-  ],
-  downloadArtifacts: [
-    'https://gitlab.com/example-group/example-project/-/jobs/artifacts/main/download?job=build',
-  ],
-};
-
 describe('HeaderArea', () => {
   let wrapper;
 
-- 
GitLab


From ab0cfe297054df9917b9bb8aa6fa26bffbab5ecf Mon Sep 17 00:00:00 2001
From: Chaoyue Zhao <czhao@gitlab.com>
Date: Mon, 9 Dec 2024 15:14:16 -0500
Subject: [PATCH 13/18] Fix test

---
 .../components/commit_changes_modal_spec.js   | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/spec/frontend/repository/components/commit_changes_modal_spec.js b/spec/frontend/repository/components/commit_changes_modal_spec.js
index 21bbdb414efd4b..903a56e80d1933 100644
--- a/spec/frontend/repository/components/commit_changes_modal_spec.js
+++ b/spec/frontend/repository/components/commit_changes_modal_spec.js
@@ -172,7 +172,7 @@ describe('CommitChangesModal', () => {
       expect(findCommitTextarea().exists()).toBe(true);
       expect(findRadioGroup().exists()).toBe(false);
       expect(findModal().text()).toContain(
-        'GitLab will create main branch and commit your changes to it.',
+        'GitLab will create a default branch, main, and commit your changes.',
       );
     });
 
@@ -317,17 +317,11 @@ describe('CommitChangesModal', () => {
   });
 
   describe('form submission', () => {
-    const handleFormSubmitSpy = jest.fn();
-
     beforeEach(async () => {
-      createFullComponent({ props: { handleFormSubmit: handleFormSubmitSpy } });
+      createFullComponent();
       await nextTick();
     });
 
-    afterEach(() => {
-      handleFormSubmitSpy.mockRestore();
-    });
-
     describe('invalid form', () => {
       beforeEach(async () => {
         findFormRadioGroup().vm.$emit('input', true);
@@ -344,7 +338,7 @@ describe('CommitChangesModal', () => {
 
       it('does not submit form', () => {
         findModal().vm.$emit('primary', { preventDefault: () => {} });
-        expect(handleFormSubmitSpy).not.toHaveBeenCalled();
+        expect(wrapper.emitted('submit-form')).toBeUndefined();
       });
     });
 
@@ -361,7 +355,7 @@ describe('CommitChangesModal', () => {
 
       it('does not submit form', () => {
         findModal().vm.$emit('primary', { preventDefault: () => {} });
-        expect(handleFormSubmitSpy).not.toHaveBeenCalled();
+        expect(wrapper.emitted('submit-form')).toBeUndefined();
       });
     });
 
@@ -381,9 +375,10 @@ describe('CommitChangesModal', () => {
         );
       });
 
-      it('submits form', () => {
-        findModal().vm.$emit('primary', { preventDefault: () => {} });
-        expect(handleFormSubmitSpy).toHaveBeenCalled();
+      it('submits form', async () => {
+        await findModal().vm.$emit('primary', { preventDefault: jest.fn() });
+        await nextTick();
+        expect(wrapper.emitted('submit-form')[0][0]).toStrictEqual(expect.any(FormData));
       });
     });
   });
-- 
GitLab


From 8d308e6e03ed5fc6342b7445fa9869c57970bd4c Mon Sep 17 00:00:00 2001
From: Chaoyue Zhao <czhao@gitlab.com>
Date: Mon, 9 Dec 2024 16:51:21 -0500
Subject: [PATCH 14/18] Fix tests again

---
 .../javascripts/repository/components/delete_blob_modal.vue     | 2 +-
 spec/frontend/repository/components/blob_button_group_spec.js   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/javascripts/repository/components/delete_blob_modal.vue b/app/assets/javascripts/repository/components/delete_blob_modal.vue
index 0ad089068bbd14..7d106d7e3841e7 100644
--- a/app/assets/javascripts/repository/components/delete_blob_modal.vue
+++ b/app/assets/javascripts/repository/components/delete_blob_modal.vue
@@ -51,10 +51,10 @@ export default {
 <template>
   <commit-changes-modal
     ref="modal"
-    :handle-form-submit="handleBlobDelete"
     :loading="loading"
     v-bind="$attrs"
     v-on="$listeners"
+    @submit-form="handleBlobDelete"
   >
     <template #form-fields>
       <input type="hidden" name="_method" value="delete" />
diff --git a/spec/frontend/repository/components/blob_button_group_spec.js b/spec/frontend/repository/components/blob_button_group_spec.js
index 5fc87312871b61..d9568dd61ef6c0 100644
--- a/spec/frontend/repository/components/blob_button_group_spec.js
+++ b/spec/frontend/repository/components/blob_button_group_spec.js
@@ -155,7 +155,6 @@ describe('BlobButtonGroup component', () => {
       canPushCode,
       emptyRepo,
       isUsingLfs,
-      handleFormSubmit: expect.any(Function),
     });
   });
 });
-- 
GitLab


From c2556fa9efb67b4cb5fcf33cfb7798f7029b6106 Mon Sep 17 00:00:00 2001
From: Chaoyue Zhao <czhao@gitlab.com>
Date: Tue, 10 Dec 2024 13:06:58 -0500
Subject: [PATCH 15/18] Code review comments:

- Update assertion in `breadcrumbs_spec.js`
- Update assertion in `commit_changes_modal_spec.js`
- Add new tests for `delete_blob_modal`
- Move `this.loading` in `upload_blob_modal`
- Update event emitted in `upload_blob_modal_spec.js`
---
 .../components/upload_blob_modal.vue          |   6 +-
 .../components/commit_changes_modal_spec.js   |  10 +-
 .../components/delete_blob_modal_spec.js      | 104 ++++++++++++++++++
 .../header_area/breadcrumbs_spec.js           |  11 ++
 .../components/upload_blob_modal_spec.js      |  17 ++-
 5 files changed, 134 insertions(+), 14 deletions(-)
 create mode 100644 spec/frontend/repository/components/delete_blob_modal_spec.js

diff --git a/app/assets/javascripts/repository/components/upload_blob_modal.vue b/app/assets/javascripts/repository/components/upload_blob_modal.vue
index d53806d7ed14d4..01089652eaeaea 100644
--- a/app/assets/javascripts/repository/components/upload_blob_modal.vue
+++ b/app/assets/javascripts/repository/components/upload_blob_modal.vue
@@ -100,6 +100,8 @@ export default {
       return this.replacePath ? this.replaceFile(formData) : this.uploadFile(formData);
     },
     submitRequest(method, url, formData) {
+      this.loading = true;
+
       formData.append('file', this.file);
 
       return axios({
@@ -125,15 +127,11 @@ export default {
         });
     },
     replaceFile(formData) {
-      this.loading = true;
-
       // The PUT path can be generated from $route (similar to "uploadFile") once router is connected
       // Follow-up issue: https://gitlab.com/gitlab-org/gitlab/-/issues/332736
       return this.submitRequest('put', this.replacePath, formData);
     },
     uploadFile(formData) {
-      this.loading = true;
-
       const {
         $route: {
           params: { path },
diff --git a/spec/frontend/repository/components/commit_changes_modal_spec.js b/spec/frontend/repository/components/commit_changes_modal_spec.js
index 903a56e80d1933..941ae8307c7d0a 100644
--- a/spec/frontend/repository/components/commit_changes_modal_spec.js
+++ b/spec/frontend/repository/components/commit_changes_modal_spec.js
@@ -378,7 +378,15 @@ describe('CommitChangesModal', () => {
       it('submits form', async () => {
         await findModal().vm.$emit('primary', { preventDefault: jest.fn() });
         await nextTick();
-        expect(wrapper.emitted('submit-form')[0][0]).toStrictEqual(expect.any(FormData));
+        const submission = wrapper.emitted('submit-form')[0][0];
+        expect(Object.fromEntries(submission)).toStrictEqual({
+          authenticity_token: 'mock-csrf-token',
+          branch_name: 'some valid target branch',
+          branch_selection: 'true',
+          commit_message: 'some valid commit message',
+          create_merge_request: '1',
+          original_branch: 'main',
+        });
       });
     });
   });
diff --git a/spec/frontend/repository/components/delete_blob_modal_spec.js b/spec/frontend/repository/components/delete_blob_modal_spec.js
new file mode 100644
index 00000000000000..9e8a1177a2d9ca
--- /dev/null
+++ b/spec/frontend/repository/components/delete_blob_modal_spec.js
@@ -0,0 +1,104 @@
+import axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
+import { shallowMount } from '@vue/test-utils';
+import DeleteBlobModal from '~/repository/components/delete_blob_modal.vue';
+import CommitChangesModal from '~/repository/components/commit_changes_modal.vue';
+import { HTTP_STATUS_OK } from '~/lib/utils/http_status';
+import { visitUrl } from '~/lib/utils/url_utility';
+import { createAlert } from '~/alert';
+import { logError } from '~/lib/logger';
+
+jest.mock('~/alert');
+jest.mock('~/lib/logger');
+jest.mock('~/lib/utils/url_utility', () => ({
+  visitUrl: jest.fn(),
+  joinPaths: () => '/new_upload',
+  setUrlFragment: jest.fn(),
+}));
+
+describe('DeleteBlobModal', () => {
+  let wrapper;
+  let mock;
+
+  const initialProps = {
+    deletePath: '/delete/blob',
+    modalId: 'Delete-blob',
+    commitMessage: 'Delete File',
+    targetBranch: 'some-target-branch',
+    originalBranch: 'main',
+    canPushCode: true,
+    canPushToBranch: true,
+    emptyRepo: false,
+    isUsingLfs: false,
+  };
+  const createComponent = () => {
+    wrapper = shallowMount(DeleteBlobModal, {
+      propsData: {
+        ...initialProps,
+      },
+      stubs: {
+        CommitChangesModal,
+      },
+    });
+  };
+
+  const findCommitChangesModal = () => wrapper.findComponent(CommitChangesModal);
+  const submitForm = (formData) => findCommitChangesModal().vm.$emit('submit-form', formData);
+
+  beforeEach(() => {
+    createComponent();
+  });
+
+  it('renders commit change modal with correct props', () => {
+    expect(findCommitChangesModal().props()).toStrictEqual({
+      branchAllowsCollaboration: false,
+      canPushCode: true,
+      canPushToBranch: true,
+      commitMessage: 'Delete File',
+      emptyRepo: false,
+      isUsingLfs: false,
+      loading: false,
+      modalId: 'Delete-blob',
+      originalBranch: 'main',
+      targetBranch: 'some-target-branch',
+      valid: true,
+    });
+  });
+
+  describe('form submission', () => {
+    afterEach(() => {
+      mock.restore();
+    });
+
+    it('handles successful request', async () => {
+      const mockFormData = new FormData();
+      mock = new MockAdapter(axios);
+      mock.onPost(initialProps.deletePath).reply(HTTP_STATUS_OK, { filePath: 'blah' });
+
+      await submitForm(mockFormData);
+      await axios.waitForAll();
+
+      expect(visitUrl).toHaveBeenCalledWith('blah');
+    });
+
+    it('handles failed request', async () => {
+      const mockFormData = new FormData();
+      mock = new MockAdapter(axios);
+      mock.onPost(initialProps.deletePath).timeout();
+
+      await submitForm(mockFormData);
+      await axios.waitForAll();
+
+      const mockError = new Error('timeout of 0ms exceeded');
+
+      expect(createAlert).toHaveBeenCalledWith({
+        message: 'Failed to delete file! Please try again.',
+        error: mockError,
+      });
+      expect(logError).toHaveBeenCalledWith(
+        'Failed to delete file. See exception details for more information.',
+        mockError,
+      );
+    });
+  });
+});
diff --git a/spec/frontend/repository/components/header_area/breadcrumbs_spec.js b/spec/frontend/repository/components/header_area/breadcrumbs_spec.js
index 0e62cfcdd62f55..53324051883141 100644
--- a/spec/frontend/repository/components/header_area/breadcrumbs_spec.js
+++ b/spec/frontend/repository/components/header_area/breadcrumbs_spec.js
@@ -199,6 +199,17 @@ describe('Repository breadcrumbs component', () => {
       await waitForPromises();
 
       expect(findUploadBlobModal().exists()).toBe(true);
+      expect(findUploadBlobModal().props()).toStrictEqual({
+        canPushCode: false,
+        canPushToBranch: false,
+        commitMessage: 'Upload New File',
+        emptyRepo: false,
+        modalId: 'modal-upload-blob',
+        originalBranch: '',
+        path: '',
+        replacePath: null,
+        targetBranch: '',
+      });
     });
   });
 
diff --git a/spec/frontend/repository/components/upload_blob_modal_spec.js b/spec/frontend/repository/components/upload_blob_modal_spec.js
index 21fc798e3c6cd2..e5fb073fe1462b 100644
--- a/spec/frontend/repository/components/upload_blob_modal_spec.js
+++ b/spec/frontend/repository/components/upload_blob_modal_spec.js
@@ -3,7 +3,6 @@ import axios from 'axios';
 import MockAdapter from 'axios-mock-adapter';
 import { nextTick } from 'vue';
 import FileIcon from '~/vue_shared/components/file_icon.vue';
-import waitForPromises from 'helpers/wait_for_promises';
 import { createAlert } from '~/alert';
 import { HTTP_STATUS_OK } from '~/lib/utils/http_status';
 import { visitUrl } from '~/lib/utils/url_utility';
@@ -57,6 +56,7 @@ describe('UploadBlobModal', () => {
   const findUploadDropzone = () => wrapper.findComponent(UploadDropzone);
   const commitChangesModalValidProp = () => findCommitChangesModal().props('valid');
   const findFileIcon = () => wrapper.findComponent(FileIcon);
+  const submitForm = (formData) => findCommitChangesModal().vm.$emit('submit-form', formData);
 
   describe.each`
     canPushCode | canPushToBranch
@@ -97,8 +97,8 @@ describe('UploadBlobModal', () => {
             mock = new MockAdapter(axios);
             mock.onPost(initialProps.path).reply(HTTP_STATUS_OK, { filePath: 'blah' });
 
-            await wrapper.vm.submitForm(mockFormData);
-            await waitForPromises();
+            await submitForm(mockFormData);
+            await axios.waitForAll();
           });
 
           it('displays the correct file type icon', () => {
@@ -120,7 +120,8 @@ describe('UploadBlobModal', () => {
             mock = new MockAdapter(axios);
             mock.onPost(initialProps.path).timeout();
 
-            await wrapper.vm.submitForm(mockFormData);
+            await submitForm(mockFormData);
+            await axios.waitForAll();
           });
 
           it('creates an alert error', () => {
@@ -148,8 +149,8 @@ describe('UploadBlobModal', () => {
       const mockFormData = new FormData();
       mock = new MockAdapter(axios);
 
-      await wrapper.vm.submitForm(mockFormData);
-      await waitForPromises();
+      await submitForm(mockFormData);
+      await axios.waitForAll();
     };
 
     describe('upload blob file', () => {
@@ -157,9 +158,7 @@ describe('UploadBlobModal', () => {
         createComponent();
       });
 
-      it('makes a POST request', async () => {
-        await submitRequest();
-
+      it('makes a POST request', () => {
         expect(mock.history.put).toHaveLength(0);
         expect(mock.history.post).toHaveLength(1);
       });
-- 
GitLab


From ab30d437b8555453ab907ca5e5e48abebf8c8218 Mon Sep 17 00:00:00 2001
From: Chaoyue Zhao <czhao@gitlab.com>
Date: Wed, 11 Dec 2024 10:45:37 -0500
Subject: [PATCH 16/18] Add translation strings

---
 locale/gitlab.pot | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index d7866e61cbc733..d706652d1f529a 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -46181,15 +46181,6 @@ msgstr ""
 msgid "Replace all labels"
 msgstr ""
 
-msgid "Replace file"
-msgstr ""
-
-msgid "Replace image"
-msgstr ""
-
-msgid "Replace video"
-msgstr ""
-
 msgid "Replaced all labels with %{label_references} %{label_text}."
 msgstr ""
 
-- 
GitLab


From 7efcc033d5fad2c1e3def1eba41357451ad4e8af Mon Sep 17 00:00:00 2001
From: Chaoyue Zhao <czhao@gitlab.com>
Date: Wed, 11 Dec 2024 12:37:18 -0500
Subject: [PATCH 17/18] Add `canPushToBranch` to CE mock

---
 spec/frontend/repository/mock_data.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/frontend/repository/mock_data.js b/spec/frontend/repository/mock_data.js
index 272947fe54d634..e7ab1eb607b295 100644
--- a/spec/frontend/repository/mock_data.js
+++ b/spec/frontend/repository/mock_data.js
@@ -191,6 +191,7 @@ export const headerAppInjected = {
   canCollaborate: true,
   canEditTree: true,
   canPushCode: true,
+  canPushToBranch: true,
   originalBranch: 'main',
   selectedBranch: 'feature/new-ui',
   newBranchPath: '/project/new-branch',
-- 
GitLab


From c4d66c587da1ffd6d6a8e62ddf94ba6dd301d624 Mon Sep 17 00:00:00 2001
From: Paul Slaughter <pslaughter@gitlab.com>
Date: Wed, 11 Dec 2024 13:55:17 -0500
Subject: [PATCH 18/18] Polish upload/delete blob modal specs

---
 .../components/delete_blob_modal_spec.js      |  38 ++--
 .../components/upload_blob_modal_spec.js      | 189 ++++++++----------
 2 files changed, 102 insertions(+), 125 deletions(-)

diff --git a/spec/frontend/repository/components/delete_blob_modal_spec.js b/spec/frontend/repository/components/delete_blob_modal_spec.js
index 9e8a1177a2d9ca..308c3d1674d6ff 100644
--- a/spec/frontend/repository/components/delete_blob_modal_spec.js
+++ b/spec/frontend/repository/components/delete_blob_modal_spec.js
@@ -4,21 +4,17 @@ import { shallowMount } from '@vue/test-utils';
 import DeleteBlobModal from '~/repository/components/delete_blob_modal.vue';
 import CommitChangesModal from '~/repository/components/commit_changes_modal.vue';
 import { HTTP_STATUS_OK } from '~/lib/utils/http_status';
-import { visitUrl } from '~/lib/utils/url_utility';
+import * as urlUtility from '~/lib/utils/url_utility';
 import { createAlert } from '~/alert';
 import { logError } from '~/lib/logger';
 
 jest.mock('~/alert');
 jest.mock('~/lib/logger');
-jest.mock('~/lib/utils/url_utility', () => ({
-  visitUrl: jest.fn(),
-  joinPaths: () => '/new_upload',
-  setUrlFragment: jest.fn(),
-}));
 
 describe('DeleteBlobModal', () => {
   let wrapper;
   let mock;
+  let visitUrlSpy;
 
   const initialProps = {
     deletePath: '/delete/blob',
@@ -31,6 +27,7 @@ describe('DeleteBlobModal', () => {
     emptyRepo: false,
     isUsingLfs: false,
   };
+
   const createComponent = () => {
     wrapper = shallowMount(DeleteBlobModal, {
       propsData: {
@@ -43,12 +40,24 @@ describe('DeleteBlobModal', () => {
   };
 
   const findCommitChangesModal = () => wrapper.findComponent(CommitChangesModal);
-  const submitForm = (formData) => findCommitChangesModal().vm.$emit('submit-form', formData);
+  const submitForm = async () => {
+    findCommitChangesModal().vm.$emit('submit-form', new FormData());
+
+    await axios.waitForAll();
+  };
 
   beforeEach(() => {
+    mock = new MockAdapter(axios);
+
+    visitUrlSpy = jest.spyOn(urlUtility, 'visitUrl');
+
     createComponent();
   });
 
+  afterEach(() => {
+    mock.restore();
+  });
+
   it('renders commit change modal with correct props', () => {
     expect(findCommitChangesModal().props()).toStrictEqual({
       branchAllowsCollaboration: false,
@@ -66,28 +75,19 @@ describe('DeleteBlobModal', () => {
   });
 
   describe('form submission', () => {
-    afterEach(() => {
-      mock.restore();
-    });
-
     it('handles successful request', async () => {
-      const mockFormData = new FormData();
-      mock = new MockAdapter(axios);
       mock.onPost(initialProps.deletePath).reply(HTTP_STATUS_OK, { filePath: 'blah' });
 
-      await submitForm(mockFormData);
-      await axios.waitForAll();
+      await submitForm();
 
-      expect(visitUrl).toHaveBeenCalledWith('blah');
+      expect(visitUrlSpy).toHaveBeenCalledWith('blah');
     });
 
     it('handles failed request', async () => {
-      const mockFormData = new FormData();
       mock = new MockAdapter(axios);
       mock.onPost(initialProps.deletePath).timeout();
 
-      await submitForm(mockFormData);
-      await axios.waitForAll();
+      await submitForm();
 
       const mockError = new Error('timeout of 0ms exceeded');
 
diff --git a/spec/frontend/repository/components/upload_blob_modal_spec.js b/spec/frontend/repository/components/upload_blob_modal_spec.js
index e5fb073fe1462b..d8c293deed2098 100644
--- a/spec/frontend/repository/components/upload_blob_modal_spec.js
+++ b/spec/frontend/repository/components/upload_blob_modal_spec.js
@@ -5,7 +5,7 @@ import { nextTick } from 'vue';
 import FileIcon from '~/vue_shared/components/file_icon.vue';
 import { createAlert } from '~/alert';
 import { HTTP_STATUS_OK } from '~/lib/utils/http_status';
-import { visitUrl } from '~/lib/utils/url_utility';
+import * as urlUtility from '~/lib/utils/url_utility';
 import UploadBlobModal from '~/repository/components/upload_blob_modal.vue';
 import UploadDropzone from '~/vue_shared/components/upload_dropzone/upload_dropzone.vue';
 import CommitChangesModal from '~/repository/components/commit_changes_modal.vue';
@@ -13,11 +13,11 @@ import { logError } from '~/lib/logger';
 
 jest.mock('~/alert');
 jest.mock('~/lib/logger');
-jest.mock('~/lib/utils/url_utility', () => ({
-  visitUrl: jest.fn(),
-  joinPaths: () => '/new_upload',
-  setUrlFragment: jest.fn(),
-}));
+
+const NEW_PATH = '/new-upload';
+const REPLACE_PATH = '/replace-path';
+const ERROR_UPLOAD = 'Failed to upload file. See exception details for more information.';
+const ERROR_REPLACE = 'Failed to replace file. See exception details for more information.';
 
 const initialProps = {
   modalId: 'upload-blob',
@@ -26,12 +26,13 @@ const initialProps = {
   originalBranch: 'main',
   canPushCode: true,
   canPushToBranch: true,
-  path: 'new_upload',
+  path: NEW_PATH,
 };
 
 describe('UploadBlobModal', () => {
   let wrapper;
   let mock;
+  let visitUrlSpy;
 
   const createComponent = (props) => {
     wrapper = shallowMount(UploadBlobModal, {
@@ -52,134 +53,110 @@ describe('UploadBlobModal', () => {
     });
   };
 
+  beforeEach(() => {
+    visitUrlSpy = jest.spyOn(urlUtility, 'visitUrl');
+    mock = new MockAdapter(axios);
+
+    mock.onPut(REPLACE_PATH).replyOnce(HTTP_STATUS_OK, { filePath: '/replace_file' });
+  });
+
+  afterEach(() => {
+    mock.restore();
+  });
+
+  const setupUploadMock = () => {
+    mock.onPost(NEW_PATH).replyOnce(HTTP_STATUS_OK, { filePath: '/new_file' });
+  };
+  const setupUploadMockAsError = () => {
+    mock.onPost(NEW_PATH).timeout();
+  };
+  const setupReplaceMock = () => {
+    mock.onPut(REPLACE_PATH).replyOnce(HTTP_STATUS_OK, { filePath: '/replace_file' });
+  };
+  const setupReplaceMockAsError = () => {
+    mock.onPut(REPLACE_PATH).timeout();
+  };
+
   const findCommitChangesModal = () => wrapper.findComponent(CommitChangesModal);
   const findUploadDropzone = () => wrapper.findComponent(UploadDropzone);
-  const commitChangesModalValidProp = () => findCommitChangesModal().props('valid');
   const findFileIcon = () => wrapper.findComponent(FileIcon);
-  const submitForm = (formData) => findCommitChangesModal().vm.$emit('submit-form', formData);
+  const submitForm = async () => {
+    findCommitChangesModal().vm.$emit('submit-form', new FormData());
+
+    await axios.waitForAll();
+  };
+
+  describe('default', () => {
+    beforeEach(() => {
+      createComponent();
+    });
+
+    it('renders commit changes modal', () => {
+      expect(findCommitChangesModal().props()).toMatchObject({
+        modalId: 'upload-blob',
+        commitMessage: 'Upload New File',
+        targetBranch: 'main',
+        originalBranch: 'main',
+        canPushCode: true,
+        canPushToBranch: true,
+        valid: false,
+        loading: false,
+        emptyRepo: false,
+      });
+    });
+
+    it('includes the upload dropzone', () => {
+      expect(findUploadDropzone().exists()).toBe(true);
+    });
+  });
 
   describe.each`
-    canPushCode | canPushToBranch
-    ${true}     | ${true}
-    ${true}     | ${false}
-    ${false}    | ${true}
+    props                            | setupMock           | setupMockAsError           | expectedVisitUrl   | expectedError
+    ${{}}                            | ${setupUploadMock}  | ${setupUploadMockAsError}  | ${'/new_file'}     | ${ERROR_UPLOAD}
+    ${{ replacePath: REPLACE_PATH }} | ${setupReplaceMock} | ${setupReplaceMockAsError} | ${'/replace_file'} | ${ERROR_REPLACE}
   `(
-    'canPushCode = $canPushCode, canPushToBranch = $canPushToBranch',
-    ({ canPushCode, canPushToBranch }) => {
+    'with props=$props',
+    ({ props, setupMock, setupMockAsError, expectedVisitUrl, expectedError }) => {
       beforeEach(async () => {
-        createComponent({ canPushCode, canPushToBranch });
+        setupMock();
+        createComponent(props);
         await nextTick();
       });
 
-      it('includes the upload dropzone', () => {
-        expect(findUploadDropzone().exists()).toBe(true);
-      });
-
-      it('passes down invalid prop to commit changes modal', () => {
-        expect(commitChangesModalValidProp()).toBe(false);
-      });
-
       describe('completed form', () => {
         beforeEach(() => {
           findUploadDropzone().vm.$emit(
             'change',
-            new File(['http://file.com?format=jpg'], 'file.jpg'),
+            new File(['http://gitlab.com/-/uploads/file.jpg'], 'file.jpg'),
           );
         });
 
         it('enables the upload button when the form is completed', () => {
-          expect(commitChangesModalValidProp()).toBe(true);
+          expect(findCommitChangesModal().props('valid')).toBe(true);
         });
 
-        describe('successful response', () => {
-          beforeEach(async () => {
-            const mockFormData = new FormData();
-            mock = new MockAdapter(axios);
-            mock.onPost(initialProps.path).reply(HTTP_STATUS_OK, { filePath: 'blah' });
-
-            await submitForm(mockFormData);
-            await axios.waitForAll();
-          });
-
-          it('displays the correct file type icon', () => {
-            expect(findFileIcon().props('fileName')).toBe('file.jpg');
-          });
-
-          it('redirects to the uploaded file', () => {
-            expect(visitUrl).toHaveBeenCalledWith('blah');
-          });
-
-          afterEach(() => {
-            mock.restore();
-          });
+        it('displays the correct file type icon', () => {
+          expect(findFileIcon().props('fileName')).toBe('file.jpg');
         });
 
-        describe('error response', () => {
-          beforeEach(async () => {
-            const mockFormData = new FormData();
-            mock = new MockAdapter(axios);
-            mock.onPost(initialProps.path).timeout();
+        it('on submit, redirects to the uploaded file', async () => {
+          await submitForm();
 
-            await submitForm(mockFormData);
-            await axios.waitForAll();
-          });
+          expect(visitUrlSpy).toHaveBeenCalledWith(expectedVisitUrl);
+        });
 
-          it('creates an alert error', () => {
-            const mockError = new Error('timeout of 0ms exceeded');
+        it('on error, creates an alert error', async () => {
+          setupMockAsError();
+          await submitForm();
 
-            expect(createAlert).toHaveBeenCalledWith({
-              message: 'Error uploading file. Please try again.',
-            });
-            expect(logError).toHaveBeenCalledWith(
-              'Failed to upload file. See exception details for more information.',
-              mockError,
-            );
-          });
+          const mockError = new Error('timeout of 0ms exceeded');
 
-          afterEach(() => {
-            mock.restore();
+          expect(createAlert).toHaveBeenCalledWith({
+            message: 'Error uploading file. Please try again.',
           });
+          expect(logError).toHaveBeenCalledWith(expectedError, mockError);
         });
       });
     },
   );
-
-  describe('blob file submission type', () => {
-    const submitRequest = async () => {
-      const mockFormData = new FormData();
-      mock = new MockAdapter(axios);
-
-      await submitForm(mockFormData);
-      await axios.waitForAll();
-    };
-
-    describe('upload blob file', () => {
-      beforeEach(() => {
-        createComponent();
-      });
-
-      it('makes a POST request', () => {
-        expect(mock.history.put).toHaveLength(0);
-        expect(mock.history.post).toHaveLength(1);
-      });
-    });
-
-    describe('replace blob file', () => {
-      const replacePath = 'replace-path';
-
-      beforeEach(() => {
-        createComponent({
-          replacePath,
-        });
-      });
-
-      it('makes a PUT request', async () => {
-        await submitRequest();
-
-        expect(mock.history.put).toHaveLength(1);
-        expect(mock.history.post).toHaveLength(0);
-        expect(mock.history.put[0].url).toBe(replacePath);
-      });
-    });
-  });
 });
-- 
GitLab