bfg-common 1.5.656 → 1.5.657

package/components/common/layout/theHeader/userMenu/modals/preferences/PreferencesOld.vue

@@ -1,141 +1,144 @@
-<template>
-  <atoms-modal
-    :title="localization.common.preferences"
-    :modal-loading="isLoading || props.securityLoader"
-    test-id="user-preferences-modal"
-    width="580px"
-    height="345px"
-    show
-    @hide="onHide"
-  >
-    <template #modalBody>
-      <atoms-nav-bar
-        v-model="selectedTab"
-        :items="tabsItems"
-        test-id="user-preferences-nav-bar"
-      />
-
-      <common-layout-the-header-user-menu-modals-preferences-time-format
-        v-if="selectedTab === 'time-tab'"
-        :new-view="props.newView"
-        :time-format="props.timeFormat"
-        @update-time-format="emits('update-time-format', $event)"
-      />
-
-      <common-layout-the-header-user-menu-modals-preferences-change-language
-        v-if="selectedTab === 'language-tab'"
-        :new-view="props.newView"
-        :selected-type="props.selectedLanguageType"
-        :selected-language="props.selectedLanguage"
-        @update-language="emits('update-language', $event)"
-        @update-is-browser="emits('update-is-browser', $event)"
-      />
-
-      <common-layout-the-header-user-menu-modals-preferences-inventory
-        v-if="selectedTab === 'inventory-tab' && isSphere"
-        :new-view="props.newView"
-        :vm-cluster="props.vmCluster"
-        @update-vm-clusters="emits('update-vm-clusters', $event)"
-      />
-
-      <common-layout-the-header-user-menu-modals-preferences-default-console
-        v-if="selectedTab === 'console-tab' && isSphere"
-        :new-view="props.newView"
-        :remote-console="props.remoteConsole"
-        @update-remote-console="emits('update-remote-console', $event)"
-      />
-
-      <common-layout-the-header-user-menu-modals-preferences-security
-        v-if="selectedTab === 'security-tab'"
-        v-model:security="security"
-        :recovery-codes="props.recoveryCodes"
-      />
-
-      <common-layout-the-header-user-menu-modals-preferences-view
-        v-if="selectedTab === 'view-tab'"
-        :new-view="props.newView"
-        :new-view-local="props.newViewLocal"
-        @update-is-new-view="emits('update-is-new-view', $event)"
-      />
-    </template>
-
-    <template #modalFooter>
-      <button
-        id="user-preferences-cancel-button"
-        data-id="user-preferences-cancel-button"
-        class="btn btn-outline"
-        @click="onHide"
-      >
-        {{ localization.common.cancel }}
-      </button>
-      <button
-        id="user-preferences-apply-button"
-        data-id="user-preferences-apply-button"
-        class="btn btn-primary"
-        @click="onSubmit"
-      >
-        {{ localization.common.save }}
-      </button>
-    </template>
-  </atoms-modal>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_LangValue, UI_T_Project } from '~/lib/models/types'
-import type { UI_T_UserPreferenceTab } from '~/components/common/layout/theHeader/userMenu/modals/preferences/lib/models/types'
-import type { UI_T_TimeValue } from '~/components/common/layout/theHeader/userMenu/modals/preferences/timeFormat/lib/models/types'
-import { preferencesTabs } from '~/components/common/layout/theHeader/userMenu/modals/preferences/lib/config/preferencesTabs'
-
-const security = defineModel<boolean>('security')
-
-const props = defineProps<{
-  project: UI_T_Project
-  timeFormat: UI_T_TimeValue
-  selectedLanguage: UI_T_LangValue
-  selectedLanguageType: UI_T_LangValue
-  newView: boolean
-  newViewLocal: boolean
-  remoteConsole: string
-  vmCluster: boolean
-  securityLoader?: boolean // для Сферы
-  recoveryCodes?: string[] // для Сферы
-}>()
-const emits = defineEmits<{
-  (event: 'hide'): void
-  (event: 'update-time-format', value: UI_T_TimeValue): void
-  (event: 'update-language', value: string): void
-  (event: 'update-is-browser', value: string): void
-  (event: 'update-is-new-view', value: boolean): void
-  (event: 'update-remote-console', value: string): void
-  (event: 'update-vm-clusters', value: boolean): void
-  (event: 'submit'): void
-}>()
-
-// const { $store }: any = useNuxtApp()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const isLoading = ref<boolean>(false)
-
-const isSphere = ref<boolean>(props.project === 'sphere')
-const selectedTab = ref<UI_T_UserPreferenceTab>('time-tab')
-
-const tabsItems = computed<UI_I_CollapseNavItem[]>(() =>
-  preferencesTabs(localization.value, props.project)
-)
-
-const onSubmit = (): void => {
-  isLoading.value = true
-  emits('submit')
-}
-
-const onHide = (): void => {
-  emits('hide')
-
-  if (isSphere.value) {
-    selectedTab.value = 'time-tab'
-  }
-}
-</script>
+<template>
+  <atoms-modal
+    :title="localization.common.preferences"
+    :modal-loading="isLoading || props.securityLoader"
+    test-id="user-preferences-modal"
+    width="580px"
+    height="420px"
+    show
+    @hide="onHide"
+  >
+    <template #modalBody>
+      <atoms-nav-bar
+        v-model="selectedTab"
+        :items="tabsItems"
+        test-id="user-preferences-nav-bar"
+      />
+
+      <common-layout-the-header-user-menu-modals-preferences-time-format
+        v-if="selectedTab === 'time-tab'"
+        :new-view="props.newView"
+        :time-format="props.timeFormat"
+        @update-time-format="emits('update-time-format', $event)"
+      />
+
+      <common-layout-the-header-user-menu-modals-preferences-change-language
+        v-if="selectedTab === 'language-tab'"
+        :new-view="props.newView"
+        :selected-type="props.selectedLanguageType"
+        :selected-language="props.selectedLanguage"
+        @update-language="emits('update-language', $event)"
+        @update-is-browser="emits('update-is-browser', $event)"
+      />
+
+      <common-layout-the-header-user-menu-modals-preferences-inventory
+        v-if="selectedTab === 'inventory-tab' && isSphere"
+        :new-view="props.newView"
+        :vm-cluster="props.vmCluster"
+        @update-vm-clusters="emits('update-vm-clusters', $event)"
+      />
+
+      <common-layout-the-header-user-menu-modals-preferences-default-console
+        v-if="selectedTab === 'console-tab' && isSphere"
+        :new-view="props.newView"
+        :remote-console="props.remoteConsole"
+        @update-remote-console="emits('update-remote-console', $event)"
+      />
+
+      <common-layout-the-header-user-menu-modals-preferences-security
+        v-if="selectedTab === 'security-tab'"
+        v-model:security="security"
+        :recovery="props.recovery"
+        @confirm="emits('security-confirm', $event)"
+      />
+
+      <common-layout-the-header-user-menu-modals-preferences-view
+        v-if="selectedTab === 'view-tab'"
+        :new-view="props.newView"
+        :new-view-local="props.newViewLocal"
+        @update-is-new-view="emits('update-is-new-view', $event)"
+      />
+    </template>
+
+    <template #modalFooter>
+      <button
+        id="user-preferences-cancel-button"
+        data-id="user-preferences-cancel-button"
+        class="btn btn-outline"
+        @click="onHide"
+      >
+        {{ localization.common.cancel }}
+      </button>
+      <button
+        id="user-preferences-apply-button"
+        data-id="user-preferences-apply-button"
+        class="btn btn-primary"
+        @click="onSubmit"
+      >
+        {{ localization.common.save }}
+      </button>
+    </template>
+  </atoms-modal>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_LangValue, UI_T_Project } from '~/lib/models/types'
+import type { UI_T_UserPreferenceTab } from '~/components/common/layout/theHeader/userMenu/modals/preferences/lib/models/types'
+import type { UI_T_TimeValue } from '~/components/common/layout/theHeader/userMenu/modals/preferences/timeFormat/lib/models/types'
+import type { UI_I_Recovery } from '~/components/common/layout/theHeader/userMenu/modals/preferences/security/lib/models/interfaces'
+import { preferencesTabs } from '~/components/common/layout/theHeader/userMenu/modals/preferences/lib/config/preferencesTabs'
+
+const security = defineModel<boolean>('security')
+
+const props = defineProps<{
+  project: UI_T_Project
+  timeFormat: UI_T_TimeValue
+  selectedLanguage: UI_T_LangValue
+  selectedLanguageType: UI_T_LangValue
+  newView: boolean
+  newViewLocal: boolean
+  remoteConsole: string
+  vmCluster: boolean
+  securityLoader: boolean // для Сферы
+  recovery: UI_I_Recovery | null // для Сферы
+}>()
+const emits = defineEmits<{
+  (event: 'hide'): void
+  (event: 'update-time-format', value: UI_T_TimeValue): void
+  (event: 'update-language', value: string): void
+  (event: 'update-is-browser', value: string): void
+  (event: 'update-is-new-view', value: boolean): void
+  (event: 'update-remote-console', value: string): void
+  (event: 'update-vm-clusters', value: boolean): void
+  (event: 'security-confirm', value: boolean): void
+  (event: 'submit'): void
+}>()
+
+// const { $store }: any = useNuxtApp()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const isLoading = ref<boolean>(false)
+
+const isSphere = ref<boolean>(props.project === 'sphere')
+const selectedTab = ref<UI_T_UserPreferenceTab>('time-tab')
+
+const tabsItems = computed<UI_I_CollapseNavItem[]>(() =>
+  preferencesTabs(localization.value, props.project)
+)
+
+const onSubmit = (): void => {
+  isLoading.value = true
+  emits('submit')
+}
+
+const onHide = (): void => {
+  emits('hide')
+
+  if (isSphere.value) {
+    selectedTab.value = 'time-tab'
+  }
+}
+</script>

package/components/common/layout/theHeader/userMenu/modals/preferences/lib/models/types.ts

@@ -1,7 +1,7 @@
-export type UI_T_UserPreferenceTab =
-  | 'time-tab'
-  | 'language-tab'
-  | 'console-tab'
-  | 'inventory-tab'
-  | 'security-tab'
-  | 'view-tab'
+export type UI_T_UserPreferenceTab =
+  | 'time-tab'
+  | 'language-tab'
+  | 'console-tab'
+  | 'inventory-tab'
+  | 'security-tab'
+  | 'view-tab'

package/components/common/layout/theHeader/userMenu/modals/preferences/security/Old.vue

@@ -1,120 +1,210 @@
-<template>
-  <form id="security-form" class="compact">
-    <div class="description">
-      {{ localization.myPreferences.twoFactorAuthentication }}
-    </div>
-
-    <div class="flex-align-center">
-      <label for="security">{{
-        localization.myPreferences.securityLabel
-      }}</label>
-      <input id="security" v-model="security" type="checkbox" class="switch" />
-    </div>
-
-    <div v-if="props.recoveryCodes.length" class="recovery-codes">
-<!--      TODO-->
-      <label>Recovery codes:</label>
-      <ul class="recovery-codes-list">
-        <li
-          v-for="item in props.recoveryCodes"
-          :key="item"
-          class="recovery-codes-list-item"
-        >
-          {{ item }}
-        </li>
-      </ul>
-    </div>
-  </form>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-const props = defineProps<{
-  recoveryCodes: string[]
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const security = defineModel<boolean>('security')
-</script>
-
-<style lang="scss" scoped>
-.description {
-  margin-bottom: 10px;
-}
-
-.recovery-codes {
-  display: flex;
-  margin-top: 10px;
-
-  .recovery-codes-list-item {
-    font-size: 12px;
-  }
-}
-
-label {
-  margin-right: 6px;
-}
-
-// TODO повторяется в ../view, необходимо вынести глобально
-input[type='checkbox'] {
-  --active: var(--checkbox-value-active-color);
-  --active-inner: var(--checkbox-mark-color);
-  --border: var(--checkbox-mark-color);
-  --background: var(--checkbox-mark-background-color);
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  height: 20px;
-  outline: none;
-  display: inline-block;
-  vertical-align: top;
-  position: relative;
-  margin: 0;
-  cursor: pointer;
-  border: 1px solid var(--bc, var(--border));
-  background: var(--b, var(--background));
-  transition: background 0.3s, border-color 0.3s, box-shadow 0.2s;
-  &:after {
-    content: '';
-    display: block;
-    left: 0;
-    top: 0;
-    position: absolute;
-    transition: transform var(--d-t, 0.3s) var(--d-t-e, ease),
-      opacity var(--d-o, 0.2s);
-  }
-  &:checked {
-    --b: var(--active);
-    --bc: var(--active);
-    --d-o: 0.3s;
-    --d-t: 0.6s;
-    --d-t-e: cubic-bezier(0.2, 0.85, 0.32, 1.2);
-  }
-}
-input[type='checkbox'] {
-  &.switch {
-    width: 35px;
-    border-radius: 11px;
-    &:after {
-      left: 2px;
-      top: 2px;
-      bottom: 2px;
-      border-radius: 50%;
-      width: 14px;
-      height: 14px;
-      border: 1px solid var(--bc, var(--border));
-      background: var(--ab, var(--border));
-      transform: translateX(var(--x, 0));
-    }
-    &:checked {
-      --ab: var(--active-inner);
-      --x: 14px;
-    }
-    &:disabled {
-      cursor: not-allowed;
-      opacity: 0.5;
-    }
-  }
-}
-</style>
+<template>
+  <form id="security-form" class="compact" @submit.prevent>
+    <div class="description">
+      {{ localization.myPreferences.twoFactorAuthentication }}
+    </div>
+
+    <div class="flex-align-center">
+      <label for="security">{{
+        localization.myPreferences.securityLabel
+      }}</label>
+      <input id="security" v-model="security" type="checkbox" class="switch" />
+    </div>
+
+    <div
+      v-if="
+        props.recovery && security && !initialSecurity && !otpEnabledSuccess
+      "
+      class="recovery-codes-wrap"
+    >
+      <p>
+        {{ localization.myPreferences.enterOtpForEnabled }}
+      </p>
+
+      <div class="recovery-codes">
+        <common-qrcode :qr-code-url="props.recovery.qr_code_url" />
+
+        <span>{{ localization.common.or }}</span>
+
+        <ul class="recovery-codes-list">
+          <li
+            v-for="item in props.recovery.recovery_codes"
+            :key="item"
+            class="recovery-codes-list-item"
+          >
+            {{ item }}
+          </li>
+        </ul>
+      </div>
+      <section class="form-block">
+        <div class="form-group">
+          <label for="otp">{{ localization.myPreferences.enterOtpForEnabled }}</label>
+          <input id="otp" v-model="otp" type="text" />
+          <button class="btn btn-sm btn-primary" @click="onConfirm">
+            {{ localization.common.confirm }}
+          </button>
+          <atoms-loader v-if="isOtpLoading" test-id="2fa-enabled-loader" />
+        </div>
+      </section>
+    </div>
+
+    <div v-if="!security && initialSecurity && !otpDisabledSuccess">
+      <section class="form-block">
+        <div class="form-group">
+          <label for="otp"
+            >{{ localization.myPreferences.enterOtpForDisabled }}</label
+          >
+          <input id="otp" v-model="otp" type="text" />
+          <button class="btn btn-sm btn-primary" @click="onDisabled">
+            {{ localization.common.confirm }}
+          </button>
+          <atoms-loader v-if="isOtpLoading" test-id="2fa-disabled-loader"/>
+        </div>
+      </section>
+    </div>
+  </form>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_Recovery } from '~/components/common/layout/theHeader/userMenu/modals/preferences/security/lib/models/interfaces'
+
+const security = defineModel<boolean>('security')
+
+const props = defineProps<{
+  recovery?: UI_I_Recovery
+}>()
+const emits = defineEmits<{
+  (event: 'confirm', value: boolean): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const initialSecurity = ref<boolean>(security.value || false)
+
+// TODO refactoring and move to Sphere
+const otp = ref<string>('')
+const isOtpLoading = ref<boolean>(false)
+
+const otpEnabledSuccess = ref<boolean>(false)
+const onConfirm = async (): Promise<void> => {
+  isOtpLoading.value = true
+  const { data } = await useMyFetch<any, any>('ui/auth/2fa/confirm', {
+    method: 'POST',
+    body: {
+      otp: otp.value,
+    },
+  })
+  if (data.value) {
+    otpEnabledSuccess.value = true
+    otpDisabledSuccess.value = false
+    emits('confirm', true)
+  }
+  isOtpLoading.value = false
+}
+
+const otpDisabledSuccess = ref<boolean>(false)
+const onDisabled = async (): Promise<void> => {
+  isOtpLoading.value = true
+  const { data } = await useMyFetch<any, I_ErrorResponse>(
+    'ui/auth/2fa/disable',
+    {
+      method: 'POST',
+      body: {
+        otp: otp.value,
+      },
+    }
+  )
+  if (data.value) {
+    otpDisabledSuccess.value = true
+    otpEnabledSuccess.value = false
+    emits('confirm', false)
+  }
+  isOtpLoading.value = false
+}
+</script>
+
+<style lang="scss" scoped>
+.description {
+  margin-bottom: 10px;
+}
+
+.recovery-codes-wrap {
+  margin: 10px 0;
+
+  .recovery-codes {
+    display: flex;
+    align-items: center;
+    justify-content: space-evenly;
+
+    .recovery-codes-list-item {
+      font-size: 12px;
+    }
+  }
+}
+
+label {
+  margin-right: 6px;
+}
+
+// TODO повторяется в ../view, необходимо вынести глобально
+input[type='checkbox'] {
+  --active: var(--checkbox-value-active-color);
+  --active-inner: var(--checkbox-mark-color);
+  --border: var(--checkbox-mark-color);
+  --background: var(--checkbox-mark-background-color);
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  height: 20px;
+  outline: none;
+  display: inline-block;
+  vertical-align: top;
+  position: relative;
+  margin: 0;
+  cursor: pointer;
+  border: 1px solid var(--bc, var(--border));
+  background: var(--b, var(--background));
+  transition: background 0.3s, border-color 0.3s, box-shadow 0.2s;
+  &:after {
+    content: '';
+    display: block;
+    left: 0;
+    top: 0;
+    position: absolute;
+    transition: transform var(--d-t, 0.3s) var(--d-t-e, ease),
+      opacity var(--d-o, 0.2s);
+  }
+  &:checked {
+    --b: var(--active);
+    --bc: var(--active);
+    --d-o: 0.3s;
+    --d-t: 0.6s;
+    --d-t-e: cubic-bezier(0.2, 0.85, 0.32, 1.2);
+  }
+}
+input[type='checkbox'] {
+  &.switch {
+    width: 35px;
+    border-radius: 11px;
+    &:after {
+      left: 2px;
+      top: 2px;
+      bottom: 2px;
+      border-radius: 50%;
+      width: 14px;
+      height: 14px;
+      border: 1px solid var(--bc, var(--border));
+      background: var(--ab, var(--border));
+      transform: translateX(var(--x, 0));
+    }
+    &:checked {
+      --ab: var(--active-inner);
+      --x: 14px;
+    }
+    &:disabled {
+      cursor: not-allowed;
+      opacity: 0.5;
+    }
+  }
+}
+</style>