Merge branch 'version-230' into 'master'

Version 230

See merge request mohit.panjvani/crater-web!620

app/Space/Updater.php

@@ -30,7 +30,7 @@ class Updater
 
         $data = json_decode($data);
 
-        if ($data->success && $data->version) {
+        if ($data->success && $data->version && $data->version->extensions) {
             $extensions = $data->version->extensions;
             $extensionData = [];
             foreach (json_decode($extensions) as $extension) {

public/mix-manifest.json

@@ -1,4 +1,4 @@
 {
-    "/assets/js/app.js": "/assets/js/app.js?id=1783cc4eb981af6b4a06",
-    "/assets/css/crater.css": "/assets/css/crater.css?id=672d21e2c7c182b9da75"
+    "/assets/js/app.js": "/assets/js/app.js?id=4b0accf5cfab2addac60",
+    "/assets/css/crater.css": "/assets/css/crater.css?id=bd085810e0311282c464"
 }

resources/assets/js/views/settings/UpdateApp.vue

@@ -36,8 +36,11 @@
           }}</label
           ><br />
           <label class="version">{{ updateData.version }}</label>
-          <p class="page-sub-title" style="white-space: pre-wrap;">
-            {{ description }}
+          <p
+            class="page-sub-title"
+            style="white-space: pre-wrap;"
+            v-html="description"
+          >
           </p>
           <label class="input-label">
             {{ $t('settings.update_app.requirements') }}
@@ -60,6 +63,7 @@
             icon="rocket"
             color="theme"
             class="mt-5"
+            v-if="hasUiUpdate"
             @click="onUpdateApp"
           >
             {{ $t('settings.update_app.update') }}
@@ -82,12 +86,12 @@
             <li class="update-step" v-for="step in updateSteps">
               <p class="update-step-text">{{ $t(step.translationKey) }}</p>
               <div class="update-status-container">
-                <span v-if="step.time" class="update-time">{{
-                  step.time
-                }}</span>
-                <span :class="'update-status status-' + getStatus(step)">{{
-                  getStatus(step)
-                }}</span>
+                <span v-if="step.time" class="update-time">
+                  {{step.time}}
+                </span>
+                <span :class="'update-status status-' + getStatus(step)">
+                  {{getStatus(step)}}
+                </span>
               </div>
             </li>
           </ul>
@@ -163,6 +167,9 @@ export default {
         })
       }
     },
+    hasUiUpdate() {
+      return this.updateData.version != '4.0.0'
+    }
   },
   created() {
     window.addEventListener('beforeunload', (event) => {