Fix modal generate csr

Issue: SILABMC-181

1 files changed, 82 insertions, 85 deletions

diff --git a/src/views/SecurityAndAccess/Certificates/ModalGenerateCsr.vue b/src/views/SecurityAndAccess/Certificates/ModalGenerateCsr.vue
index d76f9fe1..a880980c 100644
--- a/src/views/SecurityAndAccess/Certificates/ModalGenerateCsr.vue
+++ b/src/views/SecurityAndAccess/Certificates/ModalGenerateCsr.vue
@@ -3,7 +3,6 @@
     <b-modal
       id="generate-csr"
       ref="modal"
-      size="lg"
       no-stacking
       :title="$t('pageCertificates.modal.generateACertificateSigningRequest')"
       @ok="onOkGenerateCsrModal"
@@ -13,7 +12,88 @@
       <b-form id="generate-csr-form" novalidate @submit.prevent="handleSubmit">
         <b-container fluid>
           <b-row>
-            <b-col lg="9">
+            <b-col lg="12">
+              <b-row>
+                <b-col lg="12">
+                  <p class="col-form-label">
+                    {{ $t('pageCertificates.modal.privateKey') }}
+                  </p>
+                  <b-form-group
+                    :label="$t('pageCertificates.modal.keyPairAlgorithm')"
+                    label-for="key-pair-algorithm"
+                  >
+                    <b-form-select
+                      id="key-pair-algorithm"
+                      v-model="form.keyPairAlgorithm"
+                      data-test-id="modalGenerateCsr-select-keyPairAlgorithm"
+                      :options="keyPairAlgorithmOptions"
+                      :state="getValidationState($v.form.keyPairAlgorithm)"
+                      @input="$v.form.keyPairAlgorithm.$touch()"
+                    >
+                      <template #first>
+                        <b-form-select-option :value="null" disabled>
+                          {{ $t('global.form.selectAnOption') }}
+                        </b-form-select-option>
+                      </template>
+                    </b-form-select>
+                    <b-form-invalid-feedback role="alert">
+                      {{ $t('global.form.fieldRequired') }}
+                    </b-form-invalid-feedback>
+                  </b-form-group>
+                </b-col>
+              </b-row>
+              <b-row>
+                <b-col lg="12">
+                  <template v-if="$v.form.keyPairAlgorithm.$model === 'EC'">
+                    <b-form-group
+                      :label="$t('pageCertificates.modal.keyCurveId')"
+                      label-for="key-curve-id"
+                    >
+                      <b-form-select
+                        id="key-curve-id"
+                        v-model="form.keyCurveId"
+                        data-test-id="modalGenerateCsr-select-keyCurveId"
+                        :options="keyCurveIdOptions"
+                        :state="getValidationState($v.form.keyCurveId)"
+                        @input="$v.form.keyCurveId.$touch()"
+                      >
+                        <template #first>
+                          <b-form-select-option :value="null" disabled>
+                            {{ $t('global.form.selectAnOption') }}
+                          </b-form-select-option>
+                        </template>
+                      </b-form-select>
+                      <b-form-invalid-feedback role="alert">
+                        {{ $t('global.form.fieldRequired') }}
+                      </b-form-invalid-feedback>
+                    </b-form-group>
+                  </template>
+                  <template v-if="$v.form.keyPairAlgorithm.$model === 'RSA'">
+                    <b-form-group
+                      :label="$t('pageCertificates.modal.keyBitLength')"
+                      label-for="key-bit-length"
+                    >
+                      <b-form-select
+                        id="key-bit-length"
+                        v-model="form.keyBitLength"
+                        data-test-id="modalGenerateCsr-select-keyBitLength"
+                        :options="keyBitLengthOptions"
+                        :state="getValidationState($v.form.keyBitLength)"
+                        @input="$v.form.keyBitLength.$touch()"
+                      >
+                        <template #first>
+                          <b-form-select-option :value="null" disabled>
+                            {{ $t('global.form.selectAnOption') }}
+                          </b-form-select-option>
+                        </template>
+                      </b-form-select>
+                      <b-form-invalid-feedback role="alert">
+                        {{ $t('global.form.fieldRequired') }}
+                      </b-form-invalid-feedback>
+                    </b-form-group>
+                  </template>
+                </b-col>
+              </b-row>
               <b-row>
                 <b-col lg="6">
                   <b-form-group
@@ -241,89 +321,6 @@
                 </b-col>
               </b-row>
             </b-col>
-            <b-col lg="3">
-              <b-row>
-                <b-col lg="12">
-                  <p class="col-form-label">
-                    {{ $t('pageCertificates.modal.privateKey') }}
-                  </p>
-                  <b-form-group
-                    :label="$t('pageCertificates.modal.keyPairAlgorithm')"
-                    label-for="key-pair-algorithm"
-                  >
-                    <b-form-select
-                      id="key-pair-algorithm"
-                      v-model="form.keyPairAlgorithm"
-                      data-test-id="modalGenerateCsr-select-keyPairAlgorithm"
-                      :options="keyPairAlgorithmOptions"
-                      :state="getValidationState($v.form.keyPairAlgorithm)"
-                      @input="$v.form.keyPairAlgorithm.$touch()"
-                    >
-                      <template #first>
-                        <b-form-select-option :value="null" disabled>
-                          {{ $t('global.form.selectAnOption') }}
-                        </b-form-select-option>
-                      </template>
-                    </b-form-select>
-                    <b-form-invalid-feedback role="alert">
-                      {{ $t('global.form.fieldRequired') }}
-                    </b-form-invalid-feedback>
-                  </b-form-group>
-                </b-col>
-              </b-row>
-              <b-row>
-                <b-col lg="12">
-                  <template v-if="$v.form.keyPairAlgorithm.$model === 'EC'">
-                    <b-form-group
-                      :label="$t('pageCertificates.modal.keyCurveId')"
-                      label-for="key-curve-id"
-                    >
-                      <b-form-select
-                        id="key-curve-id"
-                        v-model="form.keyCurveId"
-                        data-test-id="modalGenerateCsr-select-keyCurveId"
-                        :options="keyCurveIdOptions"
-                        :state="getValidationState($v.form.keyCurveId)"
-                        @input="$v.form.keyCurveId.$touch()"
-                      >
-                        <template #first>
-                          <b-form-select-option :value="null" disabled>
-                            {{ $t('global.form.selectAnOption') }}
-                          </b-form-select-option>
-                        </template>
-                      </b-form-select>
-                      <b-form-invalid-feedback role="alert">
-                        {{ $t('global.form.fieldRequired') }}
-                      </b-form-invalid-feedback>
-                    </b-form-group>
-                  </template>
-                  <template v-if="$v.form.keyPairAlgorithm.$model === 'RSA'">
-                    <b-form-group
-                      :label="$t('pageCertificates.modal.keyBitLength')"
-                      label-for="key-bit-length"
-                    >
-                      <b-form-select
-                        id="key-bit-length"
-                        v-model="form.keyBitLength"
-                        data-test-id="modalGenerateCsr-select-keyBitLength"
-                        :options="keyBitLengthOptions"
-                        :state="getValidationState($v.form.keyBitLength)"
-                        @input="$v.form.keyBitLength.$touch()"
-                      >
-                        <template #first>
-                          <b-form-select-option :value="null" disabled>
-                            {{ $t('global.form.selectAnOption') }}
-                          </b-form-select-option>
-                        </template>
-                      </b-form-select>
-                      <b-form-invalid-feedback role="alert">
-                        {{ $t('global.form.fieldRequired') }}
-                      </b-form-invalid-feedback>
-                    </b-form-group>
-                  </template>
-                </b-col>
-              </b-row>
-            </b-col>
           </b-row>
         </b-container>
       </b-form>