[CLD-6678] Various improvements for IP filtering feature (#25485)
* Add GetInstallation function, allow IP Filtering page to fetch installation state, other fixes for IP filter feature * Fix pipelines * Run make build-templates * Fixing i18n * Fix openapi docs * Fix openapi docs again * make build-templates * Update test to ensure that spinner is removed after installation becomes stable * Fix types, style * update openapi because I can't validate locally... * Updates according to Matt's feedback * Add a limit to number of times installation is requested before an error is displayed * Make button disable immediately * Updates based on PR feedback * A couple missed occurrences of whitespace * Grammar fix in failed to fetch error --------- Co-authored-by: Gabe Jackson <3694686+gabrieljackson@users.noreply.github.com> Co-authored-by: Mattermost Build <build@mattermost.com>
Этот коммит содержится в:
@@ -367,7 +367,7 @@
|
||||
<tbody>
|
||||
<tr>
|
||||
<td style="width:132px;">
|
||||
<img alt height="21" src="{{.Props.SiteURL}}/static/images/logo_email_dark.png" style="border:0;display:block;outline:none;text-decoration:none;height:21.76px;width:100%;font-size:13px;" width="132">
|
||||
<img alt height="21" src="{{.Props.PortalURL}}/static/images/logo_email_dark.png" style="border:0;display:block;outline:none;text-decoration:none;height:21.76px;width:100%;font-size:13px;" width="132">
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
@@ -441,7 +441,7 @@
|
||||
<tbody>
|
||||
<tr>
|
||||
<td style="width:312px;">
|
||||
<img alt height="auto" src="{{.Props.SiteURL}}/static/images/forgot_password_illustration.png" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="312">
|
||||
<img alt height="auto" src="{{.Props.PortalURL}}/static/images/forgot_password_illustration.png" style="border:0;display:block;outline:none;text-decoration:none;height:auto;width:100%;font-size:13px;" width="312">
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
@@ -4,32 +4,35 @@
|
||||
</mj-head>
|
||||
<mj-body css-class="emailBody" background-color="#FFFFFF">
|
||||
<mj-wrapper mj-class="email">
|
||||
<mj-include path="./partials/logo.mjml" />
|
||||
<mj-section padding="0px 0px 40px 0px">
|
||||
<mj-column>
|
||||
<mj-image mj-class="logo" src="{{.Props.PortalURL}}/static/images/logo_email_dark.png" />
|
||||
</mj-column>
|
||||
</mj-section>
|
||||
<mj-include path="./partials/header.mjml" />
|
||||
<mj-section padding="0px">
|
||||
<mj-column>
|
||||
<mj-image src="{{.Props.SiteURL}}/static/images/forgot_password_illustration.png" width="312px"
|
||||
padding="0px" />
|
||||
<mj-image src="{{.Props.PortalURL}}/static/images/forgot_password_illustration.png" width="312px" padding="0px" />
|
||||
</mj-column>
|
||||
</mj-section>
|
||||
<mj-section padding="40px 0px 40px 0px">
|
||||
<mj-column>
|
||||
<mj-text padding-bottom="9px" css-class="footerTitle" padding="0px">
|
||||
{{.Props.TroubleAccessingTitle}}
|
||||
{{.Props.TroubleAccessingTitle}}
|
||||
</mj-text>
|
||||
<mj-raw>{{if .Props.ActorEmail}}</mj-raw>
|
||||
<mj-button padding-top="0px" padding-bottom="1px" font-size="14px" line-height="20px" background-color="transparent" color="#1C58D9" href="mailto:{{.Props.ActorEmail}}">
|
||||
{{.Props.SendAnEmailTo}}
|
||||
</mj-button>
|
||||
<mj-divider padding="0" css-class="divider" width="313px" border-width="1px" border-color="#3F4350"/>
|
||||
<mj-divider padding="0" css-class="divider" width="313px" border-width="1px" border-color="#3F4350" />
|
||||
<mj-raw>{{end}}</mj-raw>
|
||||
<mj-raw>{{ if .Props.LogInToCustomerPortal}}</mj-raw>
|
||||
<mj-button padding-top="6px" padding-bottom="1px" font-size="14px" line-height="20px" background-color="transparent" color="#1C58D9" href="{{.Props.PortalURL}}/console/cloud/ip-filtering">
|
||||
<mj-button padding-top="6px" padding-bottom="1px" font-size="14px" line-height="20px" background-color="transparent" color="#1C58D9" href="{{.Props.PortalURL}}/console/cloud/ip-filtering">
|
||||
{{.Props.LogInToCustomerPortal}}
|
||||
</mj-button>
|
||||
<mj-divider padding="0px" css-class="divider" width="313px" border-width="1px" border-color="#3F4350"/>
|
||||
<mj-divider padding="0px" css-class="divider" width="313px" border-width="1px" border-color="#3F4350" />
|
||||
<mj-raw>{{end}}</mj-raw>
|
||||
<mj-button padding-top="6px" font-size="14px" line-height="20px" background-color="transparent" color="#1C58D9" href="mailto:{{.Props.SupportEmail}}">
|
||||
<mj-button padding-top="6px" font-size="14px" line-height="20px" background-color="transparent" color="#1C58D9" href="mailto:{{.Props.SupportEmail}}">
|
||||
{{.Props.ContactSupport}}
|
||||
</mj-button>
|
||||
</mj-column>
|
||||
|
||||
Ссылка в новой задаче
Block a user