Remove required webhook_url & fix ms_teams

johnsusek · Jun 13, 2023 · 23fa780 · 23fa780
1 parent d4fc6d1
commit 23fa780
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 13 deletions.
diff --git a/src/components/config/alert/ConfigAlertAlerta.vue b/src/components/config/alert/ConfigAlertAlerta.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form-item label="API URL" prop="alertaApiUrl" required>
+    <el-form-item label="API URL" prop="alertaApiUrl">
       <el-input id="alertaApiUrl" v-model="alertaApiUrl" :disabled="viewOnly" />
       <label>API server URL.</label>
     </el-form-item>

diff --git a/src/components/config/alert/ConfigAlertDiscord.vue b/src/components/config/alert/ConfigAlertDiscord.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <praeco-form-item label="WebhookURL" prop="discordWebhookUrl" required>
+    <praeco-form-item label="WebhookURL" prop="discordWebhookUrl">
       <el-input id="discordWebhookUrl" v-model="discordWebhookUrl" :disabled="viewOnly" />
       <label>The webhook URL.</label>
     </praeco-form-item>

diff --git a/src/components/config/alert/ConfigAlertGitter.vue b/src/components/config/alert/ConfigAlertGitter.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <praeco-form-item label="Webhook URL" prop="gitterWebhookUrl" required>
+    <praeco-form-item label="Webhook URL" prop="gitterWebhookUrl">
       <el-input id="gitterWebhookUrl" v-model="gitterWebhookUrl" :disabled="viewOnly" />
       <label>
         The webhook URL that includes your auth data and the ID of the channel (room) you want to post to.

diff --git a/src/components/config/alert/ConfigAlertGoogleChat.vue b/src/components/config/alert/ConfigAlertGoogleChat.vue
@@ -22,8 +22,7 @@
             :prop="'googleChatWebhookUrl.' + index"
             :disabled="viewOnly"
             class="el-form-item-list"
-            label=""
-            required>
+            label="">
             <el-row :gutter="5" type="flex" justify="space-between">
               <el-col :span="20">
                 <el-input

diff --git a/src/components/config/alert/ConfigAlertHttpPost.vue b/src/components/config/alert/ConfigAlertHttpPost.vue
@@ -22,8 +22,7 @@
             :prop="'httpPostUrl.' + index"
             :disabled="viewOnly"
             class="el-form-item-list"
-            label=""
-            required>
+            label="">
             <el-row :gutter="5" type="flex" justify="space-between">
               <el-col :span="20">
                 <el-input

diff --git a/src/components/config/alert/ConfigAlertHttpPost2.vue b/src/components/config/alert/ConfigAlertHttpPost2.vue
@@ -22,8 +22,7 @@
             :prop="'httpPost2Url.' + index"
             :disabled="viewOnly"
             class="el-form-item-list"
-            label=""
-            required>
+            label="">
             <el-row :gutter="5" type="flex" justify="space-between">
               <el-col :span="20">
                 <el-input

diff --git a/src/components/config/alert/ConfigAlertMsTeams.vue b/src/components/config/alert/ConfigAlertMsTeams.vue
@@ -22,8 +22,7 @@
             :prop="'msTeamsWebhookUrl.' + index"
             :disabled="viewOnly"
             class="el-form-item-list"
-            label=""
-            required>
+            label="">
             <el-row :gutter="5" type="flex" justify="space-between">
               <el-col :span="20">
                 <el-input

diff --git a/src/components/config/alert/ConfigAlertPagerTree.vue b/src/components/config/alert/ConfigAlertPagerTree.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <praeco-form-item label="Integration URL" prop="pagertreeIntegrationUrl" required>
+    <praeco-form-item label="Integration URL" prop="pagertreeIntegrationUrl">
       <el-input id="pagertreeIntegrationUrl" v-model="pagertreeIntegrationUrl" :disabled="viewOnly" />
       <label>URL generated by PagerTree for the integration.</label>
     </praeco-form-item>

diff --git a/src/store/config/index.js b/src/store/config/index.js
@@ -1061,7 +1061,9 @@ export default {
           commit('alert/UPDATE_MS_TEAMS_WEBHOOK_URL', config.ms_teams_webhook_url);
         }
 
-        commit('alert/UPDATE_MS_TEAMS_THEME_COLOR', config.ms_teams_theme_color);
+        if (config.ms_teams_theme_color) {
+          commit('alert/UPDATE_MS_TEAMS_THEME_COLOR', config.ms_teams_theme_color);
+        }
         commit('alert/UPDATE_MS_TEAMS_ALERT_SUMMARY', config.ms_teams_alert_summary);
         commit('alert/UPDATE_MS_TEAMS_ALERT_FIXED_WIDTH', config.ms_teams_alert_fixed_width);
         commit('alert/UPDATE_MS_TEAMS_PROXY', config.ms_teams_proxy);