Browse Source

fix(hybridcloud) Inline jira glance assets (#60748)

In a split silo environment the jira issue glance follows the following
network path:

Jira -> Control -> Region

With Control proxying the request to the region. We don't currently have
asset bundle metadata deployed to regions as they shouldn't be
generating much HTML. However, Jira is special.

To avoid having to maintain additional deployment tooling we can inline
the jira CSS and make one small adjustment to replace the generated icon
with a simple text graphic.

I've also fixed a small hover issue in the config view.

Refs HC-968
Mark Story 1 year ago
parent
commit
1535822eab

File diff suppressed because it is too large
+ 0 - 0
src/sentry/static/sentry/vendor/aui-prototyping.9.1.5.js


+ 4 - 8
src/sentry/templates/sentry/integrations/jira-config.html

@@ -2,14 +2,8 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-  {% script src=ac_js_src %}{% endscript %}
-  {% asset_url 'sentry' 'vendor/jquery.2.2.4.min.js' as jquery_url %}
-  {% script src=jquery_url %}{% endscript %}
-
-  {% asset_url 'sentry' 'vendor/aui-prototyping.9.1.5.js' as aui_js_url %}
-  {% script src=aui_js_url %}{% endscript %}
-  <link rel="stylesheet" href="{% asset_url 'sentry' 'vendor/aui-prototyping.9.1.5.css' %}" media="all">
   <style>
+    {% include 'sentry/integrations/jira/aui-prototyping.9.1.5.css' %}
     :root {
       --gray500: #C6BECF;
       --gray800: #302839;
@@ -47,6 +41,9 @@
       float: right;
       font-size: 14px;
     }
+    .button:hover {
+      color: white;
+    }
     h1,
     h3,
     p{
@@ -70,7 +67,6 @@
       font-size: 18px;
       margin-bottom: 24px;
     }
-
   </style>
 </head>
 <body>

+ 17 - 12
src/sentry/templates/sentry/integrations/jira-issue.html

@@ -3,23 +3,28 @@
 {% load sentry_assets %}
 <html lang="en">
   <head>
-    {% script src=ac_js_src %}{% endscript %}
-    {% asset_url 'sentry' 'vendor/jquery.2.2.4.min.js' as jquery_url %}
-    {% script src=jquery_url %}{% endscript %}
-    {% asset_url 'sentry' 'vendor/aui-prototyping.9.1.5.js' as aui_js_url %}
-    {% script src=aui_js_url %}{% endscript %}
-    <link
-      rel="stylesheet"
-      href="{% asset_url 'sentry' 'vendor/aui-prototyping.9.1.5.css' %}"
-      media="all"
-    />
     <style>
+      {% include 'sentry/integrations/jira/aui-prototyping.9.1.5.css' %}
       body {
         background: transparent;
       }
       .container {
         padding: 30px;
       }
+      .aui-message::after {
+        font-family: arial, sans-serif;
+        content: 'i';
+        font-size: 13px;
+        line-height: 16px;
+        width: 16px;
+        height: 16px;
+        text-align: center;
+        border-radius: 50%;
+
+        color: #fff;
+        font-weight: bold;
+        background: var(--aui-message-info-icon-color);
+      }
     </style>
   </head>
   <body>
@@ -61,13 +66,13 @@
         <div class="aui-group">
           <div class="aui-item" >
             <span>{% trans "Last 24 hours:" %}</span>
-            <aui-badge>{{ group.stats_24hr }}</aui-badge>
+            <span class="aui-badge">{{ group.stats_24hr }}</span>
           </div>
         </div>
         <div class="aui-group">
           <div class="aui-item">
             <span>{% trans "Last 14 days:" %}</span>
-            <aui-badge>{{ group.stats_14d }}</aui-badge>
+            <span class="aui-badge">{{ group.stats_14d }}</span>
           </div>
         </div>
       </div>

File diff suppressed because it is too large
+ 0 - 0
src/sentry/templates/sentry/integrations/jira/aui-prototyping.9.1.5.css


Some files were not shown because too many files changed in this diff