Commit f0ec8b13 authored by Mike Greiling's avatar Mike Greiling

Merge branch 'submit-license-policy-button' into 'master'

Submit license policy button

See merge request gitlab-org/gitlab!36871
parents d34fd321 8aec9de8
<script> <script>
import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
import { GlButton } from '@gitlab/ui'; import { GlButton } from '@gitlab/ui';
import LoadingButton from '~/vue_shared/components/loading_button.vue';
import { LICENSE_APPROVAL_STATUS } from '../constants'; import { LICENSE_APPROVAL_STATUS } from '../constants';
import AddLicenseFormDropdown from './add_license_form_dropdown.vue'; import AddLicenseFormDropdown from './add_license_form_dropdown.vue';
import { s__ } from '~/locale'; import { s__ } from '~/locale';
...@@ -11,7 +10,6 @@ export default { ...@@ -11,7 +10,6 @@ export default {
components: { components: {
AddLicenseFormDropdown, AddLicenseFormDropdown,
GlButton, GlButton,
LoadingButton,
}, },
mixins: [glFeatureFlagsMixin()], mixins: [glFeatureFlagsMixin()],
LICENSE_APPROVAL_STATUS, LICENSE_APPROVAL_STATUS,
...@@ -110,17 +108,21 @@ export default { ...@@ -110,17 +108,21 @@ export default {
</div> </div>
</div> </div>
</div> </div>
<loading-button <div class="gl-display-flex">
class="js-submit" <gl-button
:disabled="submitDisabled" class="js-submit"
:loading="loading" :disabled="submitDisabled"
container-class="btn btn-success btn-align-content d-inline-flex" :loading="loading"
:label="s__('LicenseCompliance|Submit')" category="primary"
data-qa-selector="add_license_submit_button" variant="success"
@click="addLicense" data-qa-selector="add_license_submit_button"
/> @click="addLicense"
<gl-button class="js-cancel" :disabled="loading" @click="closeForm"> >
{{ s__('LicenseCompliance|Cancel') }} {{ __('Submit') }}
</gl-button> </gl-button>
<gl-button class="js-cancel ml-2" :disabled="loading" @click="closeForm">
{{ __('Cancel') }}
</gl-button>
</div>
</div> </div>
</template> </template>
...@@ -13836,9 +13836,6 @@ msgstr "" ...@@ -13836,9 +13836,6 @@ msgstr ""
msgid "LicenseCompliance|Allowed" msgid "LicenseCompliance|Allowed"
msgstr "" msgstr ""
msgid "LicenseCompliance|Cancel"
msgstr ""
msgid "LicenseCompliance|Denied" msgid "LicenseCompliance|Denied"
msgstr "" msgstr ""
...@@ -13911,9 +13908,6 @@ msgstr "" ...@@ -13911,9 +13908,6 @@ msgstr ""
msgid "LicenseCompliance|Remove license?" msgid "LicenseCompliance|Remove license?"
msgstr "" msgstr ""
msgid "LicenseCompliance|Submit"
msgstr ""
msgid "LicenseCompliance|There are currently no approved or blacklisted licenses in this project." msgid "LicenseCompliance|There are currently no approved or blacklisted licenses in this project."
msgstr "" msgstr ""
...@@ -22753,6 +22747,9 @@ msgstr "" ...@@ -22753,6 +22747,9 @@ msgstr ""
msgid "Subkeys" msgid "Subkeys"
msgstr "" msgstr ""
msgid "Submit"
msgstr ""
msgid "Submit %{humanized_resource_name}" msgid "Submit %{humanized_resource_name}"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment