From 1a6b9ed5b734927a29d78dafa6dc64c98008fef6 Mon Sep 17 00:00:00 2001
From: Mateusz Szczygiel <mateusz.szczygiel@allegro.com>
Date: Wed, 21 Aug 2024 09:26:50 +0200
Subject: [PATCH 1/6] Make filtered message receiver always returning a message

---
 .../composables/topic/use-form-topic/types.ts |  3 +-
 .../topic/use-form-topic/useFormTopic.ts      |  5 ++-
 hermes-console/src/dummy/topic-form.ts        |  3 +-
 .../src/i18n/en-US/subscription-form.ts       |  4 ++
 hermes-console/src/i18n/en-US/topic-form.ts   |  4 ++
 .../subscription-form/SubscriptionForm.vue    | 12 +++++-
 .../src/views/topic/topic-form/TopicForm.vue  | 42 ++++++++++++++++---
 hermes-management/build.gradle                |  8 ++--
 8 files changed, 67 insertions(+), 14 deletions(-)

diff --git a/hermes-console/src/composables/topic/use-form-topic/types.ts b/hermes-console/src/composables/topic/use-form-topic/types.ts
index 57c27946ad..10b6cdb388 100644
--- a/hermes-console/src/composables/topic/use-form-topic/types.ts
+++ b/hermes-console/src/composables/topic/use-form-topic/types.ts
@@ -50,7 +50,8 @@ export interface FormValidators {
   ownerSource: FieldValidator<string>[];
   owner: FieldValidator<any>[];
   contentType: FieldValidator<string>[];
-  retentionTimeDuration: FieldValidator<number>[];
+  retentionTimeDurationHours: FieldValidator<number>[];
+  retentionTimeDurationDays: FieldValidator<number>[];
   maxMessageSize: FieldValidator<number>[];
   offlineRetentionTime: FieldValidator<number>[];
   ack: FieldValidator<string>[];
diff --git a/hermes-console/src/composables/topic/use-form-topic/useFormTopic.ts b/hermes-console/src/composables/topic/use-form-topic/useFormTopic.ts
index f5ac01b391..4490d20725 100644
--- a/hermes-console/src/composables/topic/use-form-topic/useFormTopic.ts
+++ b/hermes-console/src/composables/topic/use-form-topic/useFormTopic.ts
@@ -38,9 +38,10 @@ function formValidators(): FormValidators {
     ownerSource: [required()],
     owner: [required()],
     contentType: [required()],
-    retentionTimeDuration: [required(), min(0), max(7)],
+    retentionTimeDurationDays: [required(), min(1), max(7)],
+    retentionTimeDurationHours: [required(), min(1), max(24)],
     maxMessageSize: [required(), min(0)],
-    offlineRetentionTime: [required(), min(0)],
+    offlineRetentionTime: [required(), min(1)],
     ack: [required()],
   };
 }
diff --git a/hermes-console/src/dummy/topic-form.ts b/hermes-console/src/dummy/topic-form.ts
index aeca54e7c9..379ac947be 100644
--- a/hermes-console/src/dummy/topic-form.ts
+++ b/hermes-console/src/dummy/topic-form.ts
@@ -43,7 +43,8 @@ export const dummyTopicFormValidator = {
   ownerSource: [required()],
   owner: [required()],
   contentType: [required()],
-  retentionTimeDuration: [required(), min(0), max(7)],
+  retentionTimeDurationDays: [required(), min(0), max(7)],
+  retentionTimeDurationHours: [required(), min(0), max(7)],
   maxMessageSize: [required(), min(0)],
   offlineRetentionTime: [required(), min(0)],
   ack: [required()],
diff --git a/hermes-console/src/i18n/en-US/subscription-form.ts b/hermes-console/src/i18n/en-US/subscription-form.ts
index 32dd4d3d5e..4fb6dcce83 100644
--- a/hermes-console/src/i18n/en-US/subscription-form.ts
+++ b/hermes-console/src/i18n/en-US/subscription-form.ts
@@ -118,6 +118,10 @@ const messages = {
       title: 'Warning: Tracking all messages enabled',
       text: 'Please chose this option only when necessary. Mainly this is for debugging problems with subscription. Remember to disable this mode after the problem is solved.',
     },
+    adminForm: {
+      title: 'Warning: Admin form enabled.',
+      text: 'New fields in the form have been revealed (they are highlighted). The form will be submitted regardless of the validation of the fields.',
+    },
   },
   actions: {
     create: 'Create subscription',
diff --git a/hermes-console/src/i18n/en-US/topic-form.ts b/hermes-console/src/i18n/en-US/topic-form.ts
index a857db23fc..e521e483ce 100644
--- a/hermes-console/src/i18n/en-US/topic-form.ts
+++ b/hermes-console/src/i18n/en-US/topic-form.ts
@@ -56,6 +56,10 @@ const messages = {
       title: 'Warning: Tracking all messages enabled',
       text: 'Please chose this option only when necessary. Mainly this is for debugging problems with subscription. Remember to disable this mode after the problem is solved.',
     },
+    adminForm: {
+      title: 'Warning: Admin form enabled.',
+      text: 'New fields in the form have been revealed (they are highlighted). The form will be submitted regardless of the validation of the fields.',
+    },
   },
   info: {
     avro: {
diff --git a/hermes-console/src/views/subscription/subscription-form/SubscriptionForm.vue b/hermes-console/src/views/subscription/subscription-form/SubscriptionForm.vue
index b13a5f342c..d2891a6b43 100644
--- a/hermes-console/src/views/subscription/subscription-form/SubscriptionForm.vue
+++ b/hermes-console/src/views/subscription/subscription-form/SubscriptionForm.vue
@@ -1,11 +1,13 @@
 <script setup lang="ts">
   import { computed, ref } from 'vue';
+  import { isAdmin } from '@/utils/roles-util';
   import { useAppConfigStore } from '@/store/app-config/useAppConfigStore';
   import { useCreateSubscription } from '@/composables/subscription/use-create-subscription/useCreateSubscription';
   import { useEditSubscription } from '@/composables/subscription/use-edit-subscription/useEditSubscription';
   import { useGlobalI18n } from '@/i18n';
   import { useImportSubscription } from '@/composables/subscription/use-import-subscription/useImportSubscription';
   import { useNotificationsStore } from '@/store/app-notifications/useAppNotifications';
+  import { useRoles } from '@/composables/roles/use-roles/useRoles';
   import ConsoleAlert from '@/components/console-alert/ConsoleAlert.vue';
   import SelectField from '@/components/select-field/SelectField.vue';
   import SubscriptionHeaderFilters from '@/views/subscription/subscription-form/subscription-header-filters/SubscriptionHeaderFilters.vue';
@@ -39,6 +41,7 @@
       ? useCreateSubscription(props.topic)
       : useEditSubscription(props.topic, props.subscription!!);
   const { importFormData } = useImportSubscription();
+  const roles = useRoles(null, null)?.roles;
   const showHighRequestTimeoutAlert = computed(
     () =>
       form.value.subscriptionPolicy.requestTimeout >=
@@ -69,7 +72,7 @@
   }
 
   async function submit() {
-    if (isFormValid.value) {
+    if (isFormValid.value || isAdmin(roles?.value)) {
       const isOperationSucceeded = await createOrUpdateSubscription();
       if (isOperationSucceeded) {
         emit('created', form.value.name);
@@ -85,6 +88,13 @@
 </script>
 
 <template>
+  <console-alert
+    v-if="isAdmin(roles)"
+    :title="$t('subscriptionForm.warnings.adminForm.title')"
+    :text="$t('subscriptionForm.warnings.adminForm.text')"
+    type="warning"
+    class="mb-4"
+  />
   <v-file-input
     v-if="operation === 'add'"
     :label="$t('subscriptionForm.actions.import')"
diff --git a/hermes-console/src/views/topic/topic-form/TopicForm.vue b/hermes-console/src/views/topic/topic-form/TopicForm.vue
index 6359edad8d..787abfc564 100644
--- a/hermes-console/src/views/topic/topic-form/TopicForm.vue
+++ b/hermes-console/src/views/topic/topic-form/TopicForm.vue
@@ -1,16 +1,19 @@
 <script setup lang="ts">
   import { computed, ref } from 'vue';
+  import { isAdmin } from '@/utils/roles-util';
   import { useAppConfigStore } from '@/store/app-config/useAppConfigStore';
   import { useCreateTopic } from '@/composables/topic/use-create-topic/useCreateTopic';
   import { useEditTopic } from '@/composables/topic/use-edit-topic/useEditTopic';
   import { useGlobalI18n } from '@/i18n';
   import { useImportTopic } from '@/composables/topic/use-import-topic/useImportTopic';
   import { useNotificationsStore } from '@/store/app-notifications/useAppNotifications';
+  import { useRoles } from '@/composables/roles/use-roles/useRoles';
   import AceEditor from '@/components/ace-editor/AceEditor.vue';
   import ConsoleAlert from '@/components/console-alert/ConsoleAlert.vue';
   import SelectField from '@/components/select-field/SelectField.vue';
   import TextField from '@/components/text-field/TextField.vue';
-  import type { TopicWithSchema } from '@/api/Topic';
+  import type { SelectFieldOption } from '@/components/select-field/types';
+  import type { TopicWithSchema } from '@/api/topic';
 
   const props = defineProps<{
     topic: TopicWithSchema | null;
@@ -37,6 +40,19 @@
       : useEditTopic(props.topic!!);
   const { importFormData } = useImportTopic();
 
+  const adminContentTypes: SelectFieldOption[] = [
+    {
+      title: 'AVRO',
+      value: 'AVRO',
+    },
+    {
+      title: 'JSON',
+      value: 'JSON',
+    },
+  ];
+
+  const roles = useRoles(null, null)?.roles;
+
   const ownerSelectorPlaceholder = computed(
     () =>
       configStore.loadedConfig.owner.sources.find(
@@ -54,6 +70,16 @@
 
   const isAuthorizationSelected = computed(() => form.value.auth.enabled);
 
+  const durationValidator = computed(() =>
+    form.value.retentionTime.retentionUnit === 'DAYS'
+      ? validators.retentionTimeDurationDays
+      : validators.retentionTimeDurationHours,
+  );
+
+  const allowedContentTypes = computed(() =>
+    isAdmin(roles?.value) ? adminContentTypes : dataSources.contentTypes,
+  );
+
   const isAvroContentTypeSelected = computed(
     () => form.value.contentType === 'AVRO',
   );
@@ -71,7 +97,7 @@
   const showAvroAlert = computed(() => form.value.contentType === 'AVRO');
 
   async function submit() {
-    if (isFormValid.value) {
+    if (isFormValid.value || isAdmin(roles?.value)) {
       const isOperationSucceeded = await createOrUpdateTopic();
       if (isOperationSucceeded) {
         emit('created', form.value.name);
@@ -87,6 +113,13 @@
 </script>
 
 <template>
+  <console-alert
+    v-if="isAdmin(roles)"
+    :title="$t('topicForm.warnings.adminForm.title')"
+    :text="$t('topicForm.warnings.adminForm.text')"
+    type="warning"
+    class="mb-4"
+  />
   <v-file-input
     v-if="operation === 'add'"
     :label="$t('topicForm.actions.import')"
@@ -213,7 +246,7 @@
 
     <text-field
       v-model.number="form.retentionTime.duration"
-      :rules="validators.retentionTimeDuration"
+      :rules="durationValidator"
       type="number"
       :label="$t('topicForm.fields.retentionTime.duration')"
     />
@@ -238,7 +271,7 @@
     <select-field
       v-model="form.contentType"
       :label="$t('topicForm.fields.contentType')"
-      :items="dataSources.contentTypes"
+      :items="allowedContentTypes"
     />
 
     <text-field
@@ -280,7 +313,6 @@
     />
 
     <v-divider />
-
     <!--      text not in i18n because of a problem with escaping characters-->
     <console-alert
       style="white-space: pre"
diff --git a/hermes-management/build.gradle b/hermes-management/build.gradle
index f6b966dbdd..1370341e63 100644
--- a/hermes-management/build.gradle
+++ b/hermes-management/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java-library'
     id 'application'
-    id "com.github.node-gradle.node" version "2.2.4"
+    id "com.github.node-gradle.node" version "7.0.2"
 }
 
 mainClassName = 'pl.allegro.tech.hermes.management.HermesManagement'
@@ -51,9 +51,9 @@ node {
     version = '20.4.0'
     distBaseUrl = 'https://nodejs.org/dist'
     download = true
-    workDir = file("${project.buildDir}/nodejs")
-    npmWorkDir = file("${project.buildDir}/npm")
-    nodeModulesDir = file("${project.rootDir}/hermes-console")
+    workDir.set(file("${project.buildDir}/nodejs"))
+    npmWorkDir.set(file("${project.buildDir}/npm"))
+    nodeProjectDir.set(file("${project.rootDir}/hermes-console"))
 }
 
 yarnSetup.dependsOn(nodeSetup)

From 909b5d4f38b93a4b346a6ff822c85a9307ee49c7 Mon Sep 17 00:00:00 2001
From: Mateusz Szczygiel <mateusz.szczygiel@allegro.com>
Date: Mon, 9 Sep 2024 10:15:40 +0200
Subject: [PATCH 2/6] Added inflight to subscription form

---
 hermes-console/src/api/subscription.ts                |  1 +
 .../use-create-subscription/useCreateSubscription.ts  |  1 +
 .../subscription/use-form-subscription/form-mapper.ts |  3 +++
 .../subscription/use-form-subscription/types.ts       |  2 ++
 .../use-form-subscription/useFormSubscription.ts      |  3 +++
 hermes-console/src/dummy/subscription-form.ts         |  4 ++++
 hermes-console/src/i18n/en-US/subscription-form.ts    |  7 ++++++-
 hermes-console/src/i18n/en-US/topic-form.ts           |  2 +-
 .../subscription-form/SubscriptionForm.spec.ts        |  3 +++
 .../subscription-form/SubscriptionForm.vue            | 11 +++++++++++
 10 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/hermes-console/src/api/subscription.ts b/hermes-console/src/api/subscription.ts
index c5531e3452..3df41b4e79 100644
--- a/hermes-console/src/api/subscription.ts
+++ b/hermes-console/src/api/subscription.ts
@@ -128,6 +128,7 @@ export interface SerialSubscriptionPolicyJson {
   backoffMultiplier: number;
   messageBackoff: number;
   messageTtl: number;
+  inflightSize: number;
   rate: number;
   requestTimeout: number;
   sendingDelay: number;
diff --git a/hermes-console/src/composables/subscription/use-create-subscription/useCreateSubscription.ts b/hermes-console/src/composables/subscription/use-create-subscription/useCreateSubscription.ts
index 813f71ade4..bfd7d9a9d9 100644
--- a/hermes-console/src/composables/subscription/use-create-subscription/useCreateSubscription.ts
+++ b/hermes-console/src/composables/subscription/use-create-subscription/useCreateSubscription.ts
@@ -126,6 +126,7 @@ function initializeForm(
       inflightMessageTTL:
         loadedConfig.value.subscription.defaults.subscriptionPolicy
           .messageTtl || 3600,
+      inflightMessagesCount: 60,
       retryBackoff: 1000,
       retryBackoffMultiplier: 1.0,
       backoffMaxIntervalInSec: 600,
diff --git a/hermes-console/src/composables/subscription/use-form-subscription/form-mapper.ts b/hermes-console/src/composables/subscription/use-form-subscription/form-mapper.ts
index e6d6effaec..f4aa8cfa75 100644
--- a/hermes-console/src/composables/subscription/use-form-subscription/form-mapper.ts
+++ b/hermes-console/src/composables/subscription/use-form-subscription/form-mapper.ts
@@ -76,6 +76,9 @@ function mapSerialSubscriptionPolicy(
     ),
     messageBackoff: parseFloat(String(form.subscriptionPolicy.retryBackoff)),
     messageTtl: parseFloat(String(form.subscriptionPolicy.inflightMessageTTL)),
+    inflightSize: parseFloat(
+      String(form.subscriptionPolicy.inflightMessagesCount),
+    ),
     rate: parseFloat(String(form.subscriptionPolicy.rateLimit!!)),
     requestTimeout: parseFloat(String(form.subscriptionPolicy.requestTimeout)),
     sendingDelay: parseFloat(String(form.subscriptionPolicy.sendingDelay)),
diff --git a/hermes-console/src/composables/subscription/use-form-subscription/types.ts b/hermes-console/src/composables/subscription/use-form-subscription/types.ts
index c678a440b8..3802629183 100644
--- a/hermes-console/src/composables/subscription/use-form-subscription/types.ts
+++ b/hermes-console/src/composables/subscription/use-form-subscription/types.ts
@@ -38,6 +38,7 @@ export interface SubscriptionForm {
 export interface FormSubscriptionPolicy {
   rateLimit: number | null;
   inflightMessageTTL: number;
+  inflightMessagesCount: number | null;
   retryBackoff: number;
   sendingDelay: number;
   retryBackoffMultiplier: number;
@@ -69,6 +70,7 @@ export interface FormValidators {
   requestTimeout: FieldValidator<number>[];
   sendingDelay: FieldValidator<number>[];
   inflightMessageTTL: FieldValidator<number>[];
+  inflightMessagesCount: FieldValidator<number>[];
   retryBackoff: FieldValidator<number>[];
   retryBackoffMultiplier: FieldValidator<number>[];
   backoffMaxIntervalInSec: FieldValidator<number>[];
diff --git a/hermes-console/src/composables/subscription/use-form-subscription/useFormSubscription.ts b/hermes-console/src/composables/subscription/use-form-subscription/useFormSubscription.ts
index 6f4c679ad1..7c3104c694 100644
--- a/hermes-console/src/composables/subscription/use-form-subscription/useFormSubscription.ts
+++ b/hermes-console/src/composables/subscription/use-form-subscription/useFormSubscription.ts
@@ -68,6 +68,7 @@ function formValidators(form: Ref<SubscriptionForm>): FormValidators {
     ],
     sendingDelay: [required(), min(0), max(5000)],
     inflightMessageTTL: [required(), min(0), max(7200)],
+    inflightMessagesCount: [min(1)],
     retryBackoff: [required(), min(0), max(1000000)],
     retryBackoffMultiplier: [required(), min(1), max(10)],
     backoffMaxIntervalInSec: [required(), min(1), max(600)],
@@ -178,6 +179,7 @@ function createEmptyForm(): Ref<SubscriptionForm> {
     subscriptionPolicy: {
       rateLimit: null,
       inflightMessageTTL: 3600,
+      inflightMessagesCount: null,
       retryBackoff: 1000,
       retryBackoffMultiplier: 1.0,
       backoffMaxIntervalInSec: 600,
@@ -222,6 +224,7 @@ export function initializeFullyFilledForm(
           ? subscription.subscriptionPolicy.rate
           : null,
       inflightMessageTTL: subscription.subscriptionPolicy.messageTtl,
+      inflightMessagesCount: subscription.subscriptionPolicy.inflightSize,
       retryBackoff: subscription.subscriptionPolicy.messageBackoff,
       retryBackoffMultiplier:
         subscription.deliveryType === DeliveryType.SERIAL
diff --git a/hermes-console/src/dummy/subscription-form.ts b/hermes-console/src/dummy/subscription-form.ts
index c78e67b274..b73bb37a0f 100644
--- a/hermes-console/src/dummy/subscription-form.ts
+++ b/hermes-console/src/dummy/subscription-form.ts
@@ -18,6 +18,7 @@ export const dummySubscriptionForm = {
   subscriptionPolicy: {
     rateLimit: null,
     inflightMessageTTL: 3600,
+    inflightMessagesCount: null,
     retryBackoff: 1000,
     retryBackoffMultiplier: 1.0,
     backoffMaxIntervalInSec: 600,
@@ -59,6 +60,7 @@ export const dummySubscriptionFormValidator = {
   requestTimeout: [required(), min(0), max(10000)],
   sendingDelay: [required(), min(0), max(5000)],
   inflightMessageTTL: [required(), min(0), max(7200)],
+  inflightMessagesCount: [min(1)],
   retryBackoff: [required(), min(0), max(1000000)],
   retryBackoffMultiplier: [required(), min(1), max(10)],
   backoffMaxIntervalInSec: [required(), min(1), max(600)],
@@ -143,6 +145,7 @@ export const dummyInitializedSubscriptionForm = {
     inflightMessageTTL:
       dummyAppConfig.subscription.defaults.subscriptionPolicy.messageTtl ||
       3600,
+    inflightMessagesCount: 60,
     retryBackoff: 1000,
     retryBackoffMultiplier: 1.0,
     backoffMaxIntervalInSec: 600,
@@ -183,6 +186,7 @@ export const dummyInitializedEditSubscriptionForm = {
   subscriptionPolicy: {
     rateLimit: dummySubscription.subscriptionPolicy.rate,
     inflightMessageTTL: dummySubscription.subscriptionPolicy.messageTtl,
+    inflightMessagesCount: dummySubscription.subscriptionPolicy.inflightSize,
     retryBackoff: dummySubscription.subscriptionPolicy.messageBackoff,
     retryBackoffMultiplier:
       dummySubscription.subscriptionPolicy.backoffMultiplier,
diff --git a/hermes-console/src/i18n/en-US/subscription-form.ts b/hermes-console/src/i18n/en-US/subscription-form.ts
index 4fb6dcce83..92f6548fd9 100644
--- a/hermes-console/src/i18n/en-US/subscription-form.ts
+++ b/hermes-console/src/i18n/en-US/subscription-form.ts
@@ -64,6 +64,11 @@ const messages = {
         'Time when message can be resent to endpoint after failed sending attempts',
       suffix: 'seconds',
     },
+    inflightMessagesCount: {
+      label: 'Inflight messages count',
+      placeholder:
+        'How many messages can be in inflight state at the same time',
+    },
     retryOn4xx: {
       label: 'Retry on http 4xx status',
     },
@@ -120,7 +125,7 @@ const messages = {
     },
     adminForm: {
       title: 'Warning: Admin form enabled.',
-      text: 'New fields in the form have been revealed (they are highlighted). The form will be submitted regardless of the validation of the fields.',
+      text: 'New fields in the form have been revealed (they are are followed by a warning sign). The form will be submitted regardless of the validation of the fields.',
     },
   },
   actions: {
diff --git a/hermes-console/src/i18n/en-US/topic-form.ts b/hermes-console/src/i18n/en-US/topic-form.ts
index e521e483ce..d9d505bd6c 100644
--- a/hermes-console/src/i18n/en-US/topic-form.ts
+++ b/hermes-console/src/i18n/en-US/topic-form.ts
@@ -58,7 +58,7 @@ const messages = {
     },
     adminForm: {
       title: 'Warning: Admin form enabled.',
-      text: 'New fields in the form have been revealed (they are highlighted). The form will be submitted regardless of the validation of the fields.',
+      text: 'New fields in the form have been revealed (they are followed by a warning sign). The form will be submitted regardless of the validation of the fields.',
     },
   },
   info: {
diff --git a/hermes-console/src/views/subscription/subscription-form/SubscriptionForm.spec.ts b/hermes-console/src/views/subscription/subscription-form/SubscriptionForm.spec.ts
index 00d7d911d9..0b2699e309 100644
--- a/hermes-console/src/views/subscription/subscription-form/SubscriptionForm.spec.ts
+++ b/hermes-console/src/views/subscription/subscription-form/SubscriptionForm.spec.ts
@@ -71,6 +71,9 @@ describe('SubscriptionForm', () => {
     expect(
       getAllByText('subscriptionForm.fields.inflightMessageTTL.label')[0],
     ).toBeVisible();
+    expect(
+      getAllByText('subscriptionForm.fields.inflightMessagesCount.label')[0],
+    ).toBeVisible();
     expect(
       getAllByText('subscriptionForm.fields.retryOn4xx.label')[0],
     ).toBeVisible();
diff --git a/hermes-console/src/views/subscription/subscription-form/SubscriptionForm.vue b/hermes-console/src/views/subscription/subscription-form/SubscriptionForm.vue
index d2891a6b43..d30d422230 100644
--- a/hermes-console/src/views/subscription/subscription-form/SubscriptionForm.vue
+++ b/hermes-console/src/views/subscription/subscription-form/SubscriptionForm.vue
@@ -263,6 +263,17 @@
       :suffix="$t('subscriptionForm.fields.inflightMessageTTL.suffix')"
     />
 
+    <text-field
+      v-model="form.subscriptionPolicy.inflightMessagesCount"
+      :rules="validators.inflightMessagesCount"
+      prepend-icon="$warning"
+      type="number"
+      :label="$t('subscriptionForm.fields.inflightMessagesCount.label')"
+      :placeholder="
+        $t('subscriptionForm.fields.inflightMessagesCount.placeholder')
+      "
+    />
+
     <v-divider />
 
     <v-switch

From 5deb421e04093135c52a80403fbb6381b5ce0d31 Mon Sep 17 00:00:00 2001
From: Mateusz Szczygiel <mateusz.szczygiel@allegro.com>
Date: Mon, 9 Sep 2024 10:48:21 +0200
Subject: [PATCH 3/6] Added inflight to subscription form

---
 .../src/views/group-topics/GroupTopicsView.vue           | 1 +
 .../subscription-form/SubscriptionForm.spec.ts           | 3 ---
 .../subscription/subscription-form/SubscriptionForm.vue  | 7 ++++---
 .../subscription-metadata/SubscriptionMetadata.vue       | 1 +
 .../views/topic/subscriptions-list/SubscriptionsList.vue | 1 +
 hermes-console/src/views/topic/topic-form/TopicForm.vue  | 9 ++++-----
 .../src/views/topic/topic-header/TopicHeader.vue         | 1 +
 7 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/hermes-console/src/views/group-topics/GroupTopicsView.vue b/hermes-console/src/views/group-topics/GroupTopicsView.vue
index 9772449af5..e1745eaf15 100644
--- a/hermes-console/src/views/group-topics/GroupTopicsView.vue
+++ b/hermes-console/src/views/group-topics/GroupTopicsView.vue
@@ -143,6 +143,7 @@
                     operation="add"
                     :group="groupId"
                     :topic="null"
+                    :roles="roles"
                     @created="pushToTopic"
                     @cancel="hideTopicForm"
                   />
diff --git a/hermes-console/src/views/subscription/subscription-form/SubscriptionForm.spec.ts b/hermes-console/src/views/subscription/subscription-form/SubscriptionForm.spec.ts
index 0b2699e309..00d7d911d9 100644
--- a/hermes-console/src/views/subscription/subscription-form/SubscriptionForm.spec.ts
+++ b/hermes-console/src/views/subscription/subscription-form/SubscriptionForm.spec.ts
@@ -71,9 +71,6 @@ describe('SubscriptionForm', () => {
     expect(
       getAllByText('subscriptionForm.fields.inflightMessageTTL.label')[0],
     ).toBeVisible();
-    expect(
-      getAllByText('subscriptionForm.fields.inflightMessagesCount.label')[0],
-    ).toBeVisible();
     expect(
       getAllByText('subscriptionForm.fields.retryOn4xx.label')[0],
     ).toBeVisible();
diff --git a/hermes-console/src/views/subscription/subscription-form/SubscriptionForm.vue b/hermes-console/src/views/subscription/subscription-form/SubscriptionForm.vue
index d30d422230..e32a2b57ef 100644
--- a/hermes-console/src/views/subscription/subscription-form/SubscriptionForm.vue
+++ b/hermes-console/src/views/subscription/subscription-form/SubscriptionForm.vue
@@ -7,7 +7,6 @@
   import { useGlobalI18n } from '@/i18n';
   import { useImportSubscription } from '@/composables/subscription/use-import-subscription/useImportSubscription';
   import { useNotificationsStore } from '@/store/app-notifications/useAppNotifications';
-  import { useRoles } from '@/composables/roles/use-roles/useRoles';
   import ConsoleAlert from '@/components/console-alert/ConsoleAlert.vue';
   import SelectField from '@/components/select-field/SelectField.vue';
   import SubscriptionHeaderFilters from '@/views/subscription/subscription-form/subscription-header-filters/SubscriptionHeaderFilters.vue';
@@ -15,12 +14,14 @@
   import SubscriptionPathFiltersDebug from '@/views/subscription/subscription-form/subscription-basic-filters/SubscriptionPathFiltersDebug.vue';
   import TextField from '@/components/text-field/TextField.vue';
   import TooltipIcon from '@/components/tooltip-icon/TooltipIcon.vue';
+  import type { Role } from '@/api/role';
   import type { Subscription } from '@/api/subscription';
 
   const props = defineProps<{
     topic: string;
     subscription: Subscription | null;
     operation: 'add' | 'edit';
+    roles: Role[] | undefined;
   }>();
   const emit = defineEmits<{
     created: [subscription: string];
@@ -41,7 +42,6 @@
       ? useCreateSubscription(props.topic)
       : useEditSubscription(props.topic, props.subscription!!);
   const { importFormData } = useImportSubscription();
-  const roles = useRoles(null, null)?.roles;
   const showHighRequestTimeoutAlert = computed(
     () =>
       form.value.subscriptionPolicy.requestTimeout >=
@@ -72,7 +72,7 @@
   }
 
   async function submit() {
-    if (isFormValid.value || isAdmin(roles?.value)) {
+    if (isFormValid.value || isAdmin(props.roles)) {
       const isOperationSucceeded = await createOrUpdateSubscription();
       if (isOperationSucceeded) {
         emit('created', form.value.name);
@@ -264,6 +264,7 @@
     />
 
     <text-field
+      v-if="isAdmin(roles)"
       v-model="form.subscriptionPolicy.inflightMessagesCount"
       :rules="validators.inflightMessagesCount"
       prepend-icon="$warning"
diff --git a/hermes-console/src/views/subscription/subscription-metadata/SubscriptionMetadata.vue b/hermes-console/src/views/subscription/subscription-metadata/SubscriptionMetadata.vue
index d74866a21c..ed2cd74a6f 100644
--- a/hermes-console/src/views/subscription/subscription-metadata/SubscriptionMetadata.vue
+++ b/hermes-console/src/views/subscription/subscription-metadata/SubscriptionMetadata.vue
@@ -78,6 +78,7 @@
               operation="edit"
               :subscription="subscription"
               :topic="subscription.topicName"
+              :roles="roles"
               @created="refreshPage"
               @cancel="hideSubscriptionForm"
             />
diff --git a/hermes-console/src/views/topic/subscriptions-list/SubscriptionsList.vue b/hermes-console/src/views/topic/subscriptions-list/SubscriptionsList.vue
index 43b4f0b1f2..4cfa56b1a6 100644
--- a/hermes-console/src/views/topic/subscriptions-list/SubscriptionsList.vue
+++ b/hermes-console/src/views/topic/subscriptions-list/SubscriptionsList.vue
@@ -98,6 +98,7 @@
                   operation="add"
                   :subscription="null"
                   :topic="props.topicName"
+                  :roles="roles"
                   @created="pushToSubscription"
                   @cancel="hideSubscriptionForm"
                 />
diff --git a/hermes-console/src/views/topic/topic-form/TopicForm.vue b/hermes-console/src/views/topic/topic-form/TopicForm.vue
index 787abfc564..c87d02391c 100644
--- a/hermes-console/src/views/topic/topic-form/TopicForm.vue
+++ b/hermes-console/src/views/topic/topic-form/TopicForm.vue
@@ -7,11 +7,11 @@
   import { useGlobalI18n } from '@/i18n';
   import { useImportTopic } from '@/composables/topic/use-import-topic/useImportTopic';
   import { useNotificationsStore } from '@/store/app-notifications/useAppNotifications';
-  import { useRoles } from '@/composables/roles/use-roles/useRoles';
   import AceEditor from '@/components/ace-editor/AceEditor.vue';
   import ConsoleAlert from '@/components/console-alert/ConsoleAlert.vue';
   import SelectField from '@/components/select-field/SelectField.vue';
   import TextField from '@/components/text-field/TextField.vue';
+  import type { Role } from '@/api/role';
   import type { SelectFieldOption } from '@/components/select-field/types';
   import type { TopicWithSchema } from '@/api/topic';
 
@@ -19,6 +19,7 @@
     topic: TopicWithSchema | null;
     group: string | null;
     operation: 'add' | 'edit';
+    roles: Role[] | undefined;
   }>();
   const emit = defineEmits<{
     created: [topic: string];
@@ -51,8 +52,6 @@
     },
   ];
 
-  const roles = useRoles(null, null)?.roles;
-
   const ownerSelectorPlaceholder = computed(
     () =>
       configStore.loadedConfig.owner.sources.find(
@@ -77,7 +76,7 @@
   );
 
   const allowedContentTypes = computed(() =>
-    isAdmin(roles?.value) ? adminContentTypes : dataSources.contentTypes,
+    isAdmin(props.roles) ? adminContentTypes : dataSources.contentTypes,
   );
 
   const isAvroContentTypeSelected = computed(
@@ -97,7 +96,7 @@
   const showAvroAlert = computed(() => form.value.contentType === 'AVRO');
 
   async function submit() {
-    if (isFormValid.value || isAdmin(roles?.value)) {
+    if (isFormValid.value || isAdmin(props.roles)) {
       const isOperationSucceeded = await createOrUpdateTopic();
       if (isOperationSucceeded) {
         emit('created', form.value.name);
diff --git a/hermes-console/src/views/topic/topic-header/TopicHeader.vue b/hermes-console/src/views/topic/topic-header/TopicHeader.vue
index 7eeedbbd07..61a3f39f98 100644
--- a/hermes-console/src/views/topic/topic-header/TopicHeader.vue
+++ b/hermes-console/src/views/topic/topic-header/TopicHeader.vue
@@ -91,6 +91,7 @@
               operation="edit"
               :topic="topic"
               :group="null"
+              :roles="roles"
               @created="refreshPage"
               @cancel="hideTopicForm"
             />

From 7a0545291fe5c48eae2aa844f81cfd40cdee1182 Mon Sep 17 00:00:00 2001
From: Mateusz Szczygiel <mateusz.szczygiel@allegro.com>
Date: Mon, 9 Sep 2024 10:49:35 +0200
Subject: [PATCH 4/6] Added inflight to subscription form

---
 .../use-create-subscription/useCreateSubscription.ts            | 2 +-
 hermes-console/src/dummy/subscription-form.ts                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hermes-console/src/composables/subscription/use-create-subscription/useCreateSubscription.ts b/hermes-console/src/composables/subscription/use-create-subscription/useCreateSubscription.ts
index bfd7d9a9d9..832c014aab 100644
--- a/hermes-console/src/composables/subscription/use-create-subscription/useCreateSubscription.ts
+++ b/hermes-console/src/composables/subscription/use-create-subscription/useCreateSubscription.ts
@@ -126,7 +126,7 @@ function initializeForm(
       inflightMessageTTL:
         loadedConfig.value.subscription.defaults.subscriptionPolicy
           .messageTtl || 3600,
-      inflightMessagesCount: 60,
+      inflightMessagesCount: null,
       retryBackoff: 1000,
       retryBackoffMultiplier: 1.0,
       backoffMaxIntervalInSec: 600,
diff --git a/hermes-console/src/dummy/subscription-form.ts b/hermes-console/src/dummy/subscription-form.ts
index b73bb37a0f..ee9f361aa5 100644
--- a/hermes-console/src/dummy/subscription-form.ts
+++ b/hermes-console/src/dummy/subscription-form.ts
@@ -145,7 +145,7 @@ export const dummyInitializedSubscriptionForm = {
     inflightMessageTTL:
       dummyAppConfig.subscription.defaults.subscriptionPolicy.messageTtl ||
       3600,
-    inflightMessagesCount: 60,
+    inflightMessagesCount: null,
     retryBackoff: 1000,
     retryBackoffMultiplier: 1.0,
     backoffMaxIntervalInSec: 600,

From d93066d5f87416abd0e8d2f3b3c2ab76d48e3071 Mon Sep 17 00:00:00 2001
From: Mateusz Szczygiel <mateusz.szczygiel@allegro.com>
Date: Tue, 17 Sep 2024 10:58:22 +0200
Subject: [PATCH 5/6] CR fix

---
 hermes-console/src/dummy/topic-form.ts             | 2 +-
 hermes-console/src/i18n/en-US/subscription-form.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hermes-console/src/dummy/topic-form.ts b/hermes-console/src/dummy/topic-form.ts
index 379ac947be..809c865ee7 100644
--- a/hermes-console/src/dummy/topic-form.ts
+++ b/hermes-console/src/dummy/topic-form.ts
@@ -44,7 +44,7 @@ export const dummyTopicFormValidator = {
   owner: [required()],
   contentType: [required()],
   retentionTimeDurationDays: [required(), min(0), max(7)],
-  retentionTimeDurationHours: [required(), min(0), max(7)],
+  retentionTimeDurationHours: [required(), min(0), max(24)],
   maxMessageSize: [required(), min(0)],
   offlineRetentionTime: [required(), min(0)],
   ack: [required()],
diff --git a/hermes-console/src/i18n/en-US/subscription-form.ts b/hermes-console/src/i18n/en-US/subscription-form.ts
index 92f6548fd9..f16420b02b 100644
--- a/hermes-console/src/i18n/en-US/subscription-form.ts
+++ b/hermes-console/src/i18n/en-US/subscription-form.ts
@@ -125,7 +125,7 @@ const messages = {
     },
     adminForm: {
       title: 'Warning: Admin form enabled.',
-      text: 'New fields in the form have been revealed (they are are followed by a warning sign). The form will be submitted regardless of the validation of the fields.',
+      text: 'New fields in the form have been revealed (they are followed by a warning sign). The form will be submitted regardless of the validation of the fields.',
     },
   },
   actions: {

From b735054425df0ca90d89be57ee3e3d9320cef6d5 Mon Sep 17 00:00:00 2001
From: Mateusz Szczygiel <mateusz.szczygiel@allegro.com>
Date: Fri, 20 Sep 2024 08:01:36 +0200
Subject: [PATCH 6/6] CR fix

---
 hermes-console/src/dummy/topic-form.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hermes-console/src/dummy/topic-form.ts b/hermes-console/src/dummy/topic-form.ts
index 809c865ee7..af21cde489 100644
--- a/hermes-console/src/dummy/topic-form.ts
+++ b/hermes-console/src/dummy/topic-form.ts
@@ -43,8 +43,8 @@ export const dummyTopicFormValidator = {
   ownerSource: [required()],
   owner: [required()],
   contentType: [required()],
-  retentionTimeDurationDays: [required(), min(0), max(7)],
-  retentionTimeDurationHours: [required(), min(0), max(24)],
+  retentionTimeDurationDays: [required(), min(1), max(7)],
+  retentionTimeDurationHours: [required(), min(1), max(24)],
   maxMessageSize: [required(), min(0)],
   offlineRetentionTime: [required(), min(0)],
   ack: [required()],