DEV: Update CI workflows (#61)

* DEV: Update CI workflows * DEV: Fix template linting issues Co-authored-by: CvX <[email protected]> Co-authored-by: Jarek Radosz <[email protected]>
2021-02-11 10:42:26 +00:00
parent 6beefdb49d
commit 2e15402cf4
11 changed files with 197 additions and 180 deletions
@@ -1,4 +1,4 @@
 {{#d-modal-body id="chat_integration_error_modal"}}
-    <h4>{{i18n model.error_key}}</h4>
-    <pre>{{model.error_info}}</pre>
-{{/d-modal-body}}
+  <h4>{{i18n model.error_key}}</h4>
+  <pre>{{model.error_info}}</pre>
+{{/d-modal-body}}
@@ -2,54 +2,58 @@
  <div>
    <form {{action "save" on="submit"}}>
      <table>
-
-        <tr class="input">
-          <td class="label"><label for='provider'>{{i18n "chat_integration.edit_channel_modal.provider"}}</label></td>
-          <td>
-            {{i18n (concat 'chat_integration.provider.' model.channel.provider '.title')}}
-          </td>
-        </tr>
-        <tr class="chat-instructions">
-          <td></td>
-          <td></td>
-        </tr>
-
-        {{#each model.provider.channel_parameters as |param|}}
+        <tbody>
          <tr class="input">
-            <td class="label"><label for='param-{{param.key}}'>{{i18n (concat 'chat_integration.provider.' model.channel.provider '.param.' param.key '.title')}}</label></td>
+            <td class="label"><label for="provider">{{i18n "chat_integration.edit_channel_modal.provider"}}</label></td>
            <td>
-              {{text-field
-                name=(concat 'param-' param.key)
-                value=(mut (get model.channel.data param.key))
-                }}
-
-              &nbsp;
-              {{#if (get model.channel.data param.key)}}
-                {{input-tip validation=(get paramValidation param.key)}}
-              {{/if}}
+              {{i18n (concat "chat_integration.provider." model.channel.provider ".title")}}
            </td>
          </tr>
+
          <tr class="chat-instructions">
            <td></td>
-            <td><label>{{i18n (concat 'chat_integration.provider.' model.channel.provider '.param.' param.key '.help')}}</label></td>
+            <td></td>
          </tr>
-        {{/each}}
-      </table>

+          {{#each model.provider.channel_parameters as |param|}}
+            <tr class="input">
+              <td class="label"><label for="param-{{param.key}}">{{i18n (concat "chat_integration.provider." model.channel.provider ".param." param.key ".title")}}</label></td>
+              <td>
+                {{text-field
+                  name=(concat "param-" param.key)
+                  value=(mut (get model.channel.data param.key))
+                }}
+
+                &nbsp;
+                {{#if (get model.channel.data param.key)}}
+                  {{input-tip validation=(get paramValidation param.key)}}
+                {{/if}}
+              </td>
+            </tr>
+
+            <tr class="chat-instructions">
+              <td></td>
+              <td><label>{{i18n (concat "chat_integration.provider." model.channel.provider ".param." param.key ".help")}}</label></td>
+            </tr>
+          {{/each}}
+        </tbody>
+      </table>
    </form>
  </div>
 {{/d-modal-body}}

 <div class="modal-footer">
  {{d-button id="save-channel"
-      class='btn-primary btn-large'
-      action="save"
-      title="chat_integration.edit_channel_modal.save"
-      label="chat_integration.edit_channel_modal.save"
-      disabled=saveDisabled}}
+    class="btn-primary btn-large"
+    action="save"
+    title="chat_integration.edit_channel_modal.save"
+    label="chat_integration.edit_channel_modal.save"
+    disabled=saveDisabled
+  }}

  {{d-button class="btn-large"
-      action="cancel"
-      title="chat_integration.edit_channel_modal.cancel"
-      label="chat_integration.edit_channel_modal.cancel"}}
+    action="cancel"
+    title="chat_integration.edit_channel_modal.cancel"
+    label="chat_integration.edit_channel_modal.cancel"
+  }}
 </div>
@@ -2,110 +2,119 @@
  <div>
    <form {{action "save" on="submit"}}>
      <table>
-
-        <tr class="input">
-          <td class="label"><label for='provider'>{{i18n "chat_integration.edit_rule_modal.provider"}}</label></td>
-          <td>
-            {{i18n (concat 'chat_integration.provider.' model.channel.provider '.title')}}
-          </td>
-        </tr>
-        <tr class="chat-instructions">
-          <td></td>
-          <td></td>
-        </tr>
-
-        <tr class="input">
-          <td class="label"><label for='channel'>{{i18n "chat_integration.edit_rule_modal.channel"}}</label></td>
-          <td>
-            {{channel-data provider=model.provider channel=model.channel}}
-          </td>
-        </tr>
-        <tr class="chat-instructions">
-          <td></td>
-          <td></td>
-        </tr>
-
-        <tr class="input">
-          <td class="label"><label for='filter'>{{i18n "chat_integration.edit_rule_modal.type"}}</label></td>
-          <td>
-            {{combo-box name="type" content=model.rule.available_types value=model.rule.type}}
-          </td>
-        </tr>
-        <tr class="chat-instructions">
-          <td></td>
-          <td><label>{{i18n 'chat_integration.edit_rule_modal.instructions.type'}}</label></td>
-        </tr>
-
-        <tr class="input">
-          <td class="label"><label for='filter'>{{i18n "chat_integration.edit_rule_modal.filter"}}</label></td>
-          <td>
-            {{combo-box name="filter" content=model.rule.available_filters value=model.rule.filter}}
-          </td>
-        </tr>
-        <tr class="chat-instructions">
-          <td></td>
-          <td><label>{{i18n 'chat_integration.edit_rule_modal.instructions.filter'}}</label></td>
-        </tr>
-
-        {{#if showCategory}}
+        <tbody>
          <tr class="input">
-            <td class="label"><label for='category'>{{i18n "chat_integration.edit_rule_modal.category"}}</label></td>
+            <td class="label"><label for="provider">{{i18n "chat_integration.edit_rule_modal.provider"}}</label></td>
            <td>
-              {{category-chooser
-                name="category"
-                value=model.rule.category_id
-                rootNoneLabel="chat_integration.all_categories"
-                rootNone=true
-                overrideWidths=false}}
+              {{i18n (concat "chat_integration.provider." model.channel.provider ".title")}}
            </td>
          </tr>
+
          <tr class="chat-instructions">
            <td></td>
-            <td><label>{{i18n 'chat_integration.edit_rule_modal.instructions.category'}}</label></td>
+            <td></td>
          </tr>
-        {{else}}
+
          <tr class="input">
-            <td class="label"><label for='group'>{{i18n "chat_integration.edit_rule_modal.group"}}</label></td>
+            <td class="label"><label for="channel">{{i18n "chat_integration.edit_rule_modal.channel"}}</label></td>
            <td>
-              {{combo-box content=model.groups valueAttribute="id" value=model.rule.group_id none="chat_integration.choose_group"}}
+              {{channel-data provider=model.provider channel=model.channel}}
            </td>
          </tr>
+
          <tr class="chat-instructions">
            <td></td>
-            <td><label>{{i18n 'chat_integration.edit_rule_modal.instructions.group'}}</label></td>
+            <td></td>
          </tr>
-        {{/if}}

-        {{#if siteSettings.tagging_enabled}}
          <tr class="input">
-            <td class="label"><label for='tags'>{{i18n "chat_integration.edit_rule_modal.tags"}}</label></td>
+            <td class="label"><label for="filter">{{i18n "chat_integration.edit_rule_modal.type"}}</label></td>
            <td>
-              {{tag-chooser placeholderKey="chat_integration.all_tags" name="tags" tags=model.rule.tags everyTag=true }}
+              {{combo-box name="type" content=model.rule.available_types value=model.rule.type}}
            </td>
          </tr>
+
          <tr class="chat-instructions">
            <td></td>
-            <td><label>{{i18n 'chat_integration.edit_rule_modal.instructions.tags'}}</label></td>
+            <td><label>{{i18n "chat_integration.edit_rule_modal.instructions.type"}}</label></td>
          </tr>
-        {{/if}}

+          <tr class="input">
+            <td class="label"><label for="filter">{{i18n "chat_integration.edit_rule_modal.filter"}}</label></td>
+            <td>
+              {{combo-box name="filter" content=model.rule.available_filters value=model.rule.filter}}
+            </td>
+          </tr>
+
+          <tr class="chat-instructions">
+            <td></td>
+            <td><label>{{i18n "chat_integration.edit_rule_modal.instructions.filter"}}</label></td>
+          </tr>
+
+          {{#if showCategory}}
+            <tr class="input">
+              <td class="label"><label for="category">{{i18n "chat_integration.edit_rule_modal.category"}}</label></td>
+              <td>
+                {{category-chooser
+                  name="category"
+                  value=model.rule.category_id
+                  rootNoneLabel="chat_integration.all_categories"
+                  rootNone=true
+                  overrideWidths=false
+                }}
+              </td>
+            </tr>
+
+            <tr class="chat-instructions">
+              <td></td>
+              <td><label>{{i18n "chat_integration.edit_rule_modal.instructions.category"}}</label></td>
+            </tr>
+          {{else}}
+            <tr class="input">
+              <td class="label"><label for="group">{{i18n "chat_integration.edit_rule_modal.group"}}</label></td>
+              <td>
+                {{combo-box content=model.groups valueAttribute="id" value=model.rule.group_id none="chat_integration.choose_group"}}
+              </td>
+            </tr>
+
+            <tr class="chat-instructions">
+              <td></td>
+              <td><label>{{i18n "chat_integration.edit_rule_modal.instructions.group"}}</label></td>
+            </tr>
+          {{/if}}
+
+          {{#if siteSettings.tagging_enabled}}
+            <tr class="input">
+              <td class="label"><label for="tags">{{i18n "chat_integration.edit_rule_modal.tags"}}</label></td>
+              <td>
+                {{tag-chooser placeholderKey="chat_integration.all_tags" name="tags" tags=model.rule.tags everyTag=true }}
+              </td>
+            </tr>
+
+            <tr class="chat-instructions">
+              <td></td>
+              <td><label>{{i18n "chat_integration.edit_rule_modal.instructions.tags"}}</label></td>
+            </tr>
+          {{/if}}
+        </tbody>
      </table>
-
    </form>
  </div>
 {{/d-modal-body}}

 <div class="modal-footer">
  {{d-button id="save-rule"
-    class='btn-primary btn-large'
+    class="btn-primary btn-large"
    action="save"
    actionParam=model.rule
    title="chat_integration.edit_rule_modal.save"
    label="chat_integration.edit_rule_modal.save"
-    disabled=saveDisabled}}
+    disabled=saveDisabled
+  }}

  {{d-button class="btn-large"
-      action=(route-action "closeModal")
-      title="chat_integration.edit_rule_modal.cancel"
-      label="chat_integration.edit_rule_modal.cancel"}}
+    action=(route-action "closeModal")
+    title="chat_integration.edit_rule_modal.cancel"
+    label="chat_integration.edit_rule_modal.cancel"
+  }}
 </div>
@@ -2,12 +2,14 @@
  <div>
    <form {{action "send" on="submit"}}>
      <table>
-        <tr class="input">
-          <td class="label"><label for='channel'>{{i18n "chat_integration.test_modal.topic"}}</label></td>
-          <td>
-            {{choose-topic selectedTopicId=model.topic_id}}
-          </td>
-        </tr>
+        <tbody>
+          <tr class="input">
+            <td class="label"><label for="channel">{{i18n "chat_integration.test_modal.topic"}}</label></td>
+            <td>
+              {{choose-topic selectedTopicId=model.topic_id}}
+            </td>
+          </tr>
+        </tbody>
      </table>
    </form>
  </div>
@@ -17,16 +19,18 @@
  {{#conditional-loading-spinner condition=loading}}
    {{d-button
      id="send-test"
-      class='btn-primary btn-large'
+      class="btn-primary btn-large"
      action=(action "send")
      title="chat_integration.test_modal.send"
      label="chat_integration.test_modal.send"
-      disabled=sendDisabled}}
+      disabled=sendDisabled
+    }}

    {{d-button
      class="btn-large"
      action=(route-action "closeModal")
      title="chat_integration.test_modal.close"
-      label="chat_integration.test_modal.close"}}
+      label="chat_integration.test_modal.close"
+    }}
  {{/conditional-loading-spinner}}
 </div>