Remove 500

younginnovations · Oct 16, 2024 · ce50ac9 · ce50ac9
1 parent e09da2a
commit ce50ac9
Show file tree

Hide file tree

Showing 9 changed files with 2,442 additions and 4,311 deletions.
diff --git a/app/IATI/Repositories/Activity/ActivityRepository.php b/app/IATI/Repositories/Activity/ActivityRepository.php
@@ -84,7 +84,7 @@ public function getActivityForOrganization($organizationId, array $queryParams =
 
         $orderBy = 'updated_at';
         $direction = 'desc';
-        $limit = '100';
+        $limit = '25';
 
         if (array_key_exists('orderBy', $queryParams) && !empty($queryParams['orderBy'])) {
             $orderBy = $queryParams['orderBy'];

diff --git a/app/Jobs/RegistryValidatorJobForMultipleActivities.php b/app/Jobs/RegistryValidatorJobForMultipleActivities.php
@@ -2,7 +2,6 @@
 
 namespace App\Jobs;
 
-use App\Constants\Enums;
 use App\Exceptions\MaxMergeSizeExceededException;
 use App\IATI\Elements\Xml\XmlGenerator;
 use App\IATI\Repositories\Activity\ValidationStatusRepository;
@@ -57,18 +56,10 @@ public function handle(ActivityWorkflowService $activityWorkflowService): void
         $tmpSize = 0;
 
         try {
-            if ($sizeInMB > Enums::MAX_MERGE_SIZE) {
-                throw new MaxMergeSizeExceededException();
-            }
-
             $xmlData = $this->generateValidatableFileForActivities($this->activities, $this->organization, $this->settings);
 
             $tmpSize = $sizeInMB + calculateStringSizeInMb($xmlData);
 
-            if ($tmpSize > Enums::MAX_MERGE_SIZE) {
-                throw new MaxMergeSizeExceededException();
-            }
-
             /** @var $validationStatusRepository ValidationStatusRepository */
             $validationStatusRepository = app()->make(ValidationStatusRepository::class);
 

diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/css/webportal-app.css b/public/css/webportal-app.css
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/js/vendor.js b/public/js/vendor.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,10 +1,10 @@
 {
-    "/js/app.js": "/js/app.js?id=1442b175b62fb001438805b3cb638433",
-    "/js/script.js": "/js/script.js?id=486f329f14e1f080305e7c109ca928ac",
-    "/js/webportal-script.js": "/js/webportal-script.js?id=fd5980061c5c73a9d216570039251afa",
-    "/js/formbuilder.js": "/js/formbuilder.js?id=85537cfbc99853ea9793f54c417c10f9",
+    "/js/app.js": "/js/app.js?id=1e4913cbba9f27df6731f14b7bdde866",
+    "/js/script.js": "/js/script.js?id=5664c41472ea07b11e7b9e7ad4007a4c",
+    "/js/webportal-script.js": "/js/webportal-script.js?id=ec424584e8e86829641c324d807c42b5",
+    "/js/formbuilder.js": "/js/formbuilder.js?id=3e2a492e2c0e174106c21005aa5ca253",
     "/manifest.js": "/manifest.js?id=3ed1124c8f4dcb98acc36de67cb80349",
-    "/css/webportal-app.css": "/css/webportal-app.css?id=0cefd0b25edade91829b5b5e20168946",
-    "/css/app.css": "/css/app.css?id=f3112109bd11e3964690b47ded360f38",
+    "/css/webportal-app.css": "/css/webportal-app.css?id=bd0b9b29cb57ecd5c561ad461c5a07e8",
+    "/css/app.css": "/css/app.css?id=494ab5282aee47804039a81545780d9e",
     "/js/vendor.js": "/js/vendor.js?id=fd88a53589d5bef5911c2bfa2da9fc92"
 }
diff --git a/resources/assets/js/views/activity/partials/TableLayout.vue b/resources/assets/js/views/activity/partials/TableLayout.vue
@@ -63,7 +63,7 @@
               v-if="datum['linked_to_iati'] && datum['status'] === 'draft'"
               class="absolute left-0 top-0 inline-block whitespace-nowrap"
             />
-            {{ (currentPage - 1) * 10 + Number(index) + 1 }}
+            {{ (currentPage - 1) * 25 + Number(index) + 1 }}
           </td>
           <td class="title">
             <div
@@ -166,8 +166,16 @@
                 v-model="store.state.selectedActivities"
                 :value="datum.id"
                 type="checkbox"
+                class="cursor-pointer"
+                :disabled="maxLimitSelected(datum.id)"
+              />
+              <span
+                :class="
+                  maxLimitSelected(datum.id)
+                    ? 'checkmark cursor-not-allowed'
+                    : 'checkmark'
+                "
               />
-              <span class="checkmark" />
             </label>
           </th>
         </tr>
@@ -268,10 +276,21 @@ function containsAllValues(): boolean {
   const containsAllItems = selectedIds.every((item) =>
     store.state.selectedActivities.includes(item)
   );
-  console.log(containsAllItems);
+  console.log('containsAllItems', containsAllItems);
   return containsAllItems;
 }
 
+function maxLimitSelected(checkedActivityId: null | number = null) {
+  if (checkedActivityId) {
+    return (
+      store.state.selectedActivities.length >= 100 &&
+      !store.state.selectedActivities.includes(checkedActivityId)
+    );
+  }
+
+  return store.state.selectedActivities.length >= 100;
+}
+
 watch(
   () => props.data.data,
   () => {

diff --git a/resources/assets/sass/component/_input.scss b/resources/assets/sass/component/_input.scss
@@ -256,41 +256,41 @@ label {
 }
 
 select.select2.default-value-indicator
-+ .select2
-.selection
-.select2-selection:not(:focus) {
+  + .select2
+  .selection
+  .select2-selection:not(:focus) {
   border: 2px solid #3f9a7c;
   background-color: #3f9a7c15;
 }
 
 select.select2.default-value-indicator
-+ .select2
-.selection
-.select2-selection:not(:focus) {
+  + .select2
+  .selection
+  .select2-selection:not(:focus) {
   border: 2px solid #3f9a7c;
   background-color: #3f9a7c15;
 }
 
 select.select2.default-value-indicator
-+ .select2
-.selection
-.select2-selection
-.select2-selection__placeholder {
+  + .select2
+  .selection
+  .select2-selection
+  .select2-selection__placeholder {
   color: var(--bluecoral-50);
 }
 
 select.select2.default-value-indicator
-+ .select2.select2-container--open
-.selection
-.select2-selection {
+  + .select2.select2-container--open
+  .selection
+  .select2-selection {
   border: 1px solid #a6b5ba;
   background-color: transparent;
 }
 
 select.select2.default-value-indicator
-+ .select2
-.selection
-.select2-selection.select2-selection--clearable {
+  + .select2
+  .selection
+  .select2-selection.select2-selection--clearable {
   border: 1px solid #a6b5ba;
   background-color: transparent;
 }