Merge branch 'master' into feat-remove-event

Author: quangtuanitmo18

.env.sample

@@ -8,9 +8,6 @@ VITE_API_AUTH_GOOGLE=http://localhost:3000/auth/google
 # Frontend errors tracking Integraton Token
 VITE_HAWK_TOKEN=
 
-# Public Id for Cloudpayments account
-VITE_CLOUDPAYMENTS_PUBLIC_ID=test_api_00000000000000000000001
-
 # Id of free plan
 VITE_FREE_PLAN_ID=5f47f031ff71510040f433c1
 

.github/workflows/build-and-push-docker-image.yml

@@ -43,7 +43,6 @@ jobs:
         with:
           envkey_VITE_HAWK_TOKEN: ${{ secrets.HAWK_TOKEN_PROD }}
           envkey_VITE_AMPLITUDE_TOKEN: ${{ secrets.AMPLITUDE_TOKEN_PROD }}
-          envkey_VITE_CLOUDPAYMENTS_PUBLIC_ID: ${{ secrets.CP_PUBLIC_ID_STAGE }}
           envkey_VITE_API_ENDPOINT: "https://api-staging.hawk.so"
           envkey_VITE_FREE_PLAN_ID: ${{ secrets.FREE_PLAN_ID }}
           envkey_VITE_SSO_SP_ENTITY_ID: ${{ secrets.SSO_SP_ENTITY_ID_STAGE }}
@@ -58,21 +57,21 @@ jobs:
         with:
           envkey_VITE_HAWK_TOKEN: ${{ secrets.HAWK_TOKEN_PROD }}
           envkey_VITE_AMPLITUDE_TOKEN: ${{ secrets.AMPLITUDE_TOKEN_PROD }}
-          envkey_VITE_CLOUDPAYMENTS_PUBLIC_ID: ${{ secrets.CP_PUBLIC_ID_PROD }}
           envkey_VITE_API_ENDPOINT: "https://api.hawk.so"
           envkey_VITE_FREE_PLAN_ID: ${{ secrets.FREE_PLAN_ID }}
           envkey_VITE_SSO_SP_ENTITY_ID: ${{ secrets.SSO_SP_ENTITY_ID }}
+          # envkey_VITE_CLOUDPAYMENTS_PUBLIC_ID: ${{ secrets.CP_PUBLIC_ID_PROD }}
 
       - name: Make prod-ru envfile
         if: github.ref_name == 'prod-ru'
         uses: SpicyPizza/create-envfile@v1
         with:
           envkey_VITE_HAWK_TOKEN: ${{ secrets.HAWK_TOKEN_PROD }}
           envkey_VITE_AMPLITUDE_TOKEN: ${{ secrets.AMPLITUDE_TOKEN_PROD }}
-          envkey_VITE_CLOUDPAYMENTS_PUBLIC_ID: ${{ secrets.CP_PUBLIC_ID_PROD }}
           envkey_VITE_API_ENDPOINT: "https://api.hawk-tracker.ru"
           envkey_VITE_FREE_PLAN_ID: ${{ secrets.FREE_PLAN_ID }}
           envkey_VITE_SSO_SP_ENTITY_ID: ${{ secrets.SSO_SP_ENTITY_ID }}
+          # envkey_VITE_CLOUDPAYMENTS_PUBLIC_ID: ${{ secrets.CP_PUBLIC_ID_PROD }}
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hawk.so",
-  "version": "1.1.4",
+  "version": "1.1.7",
   "private": true,
   "scripts": {
     "dev": "vite",
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "@codexteam/ui": "0.2.0-rc.4",
-    "@hawk.so/javascript": "3.2.15",
+    "@hawk.so/javascript": "3.2.21",
     "@hawk.so/types": "^0.5.9",
     "axios": "^1.12.2",
     "codex-notifier": "^1.1.2",

src/api/billing/queries.ts

@@ -81,6 +81,7 @@ export const QUERY_COMPOSE_PAYMENT = `
       currency
       checksum
       nextPaymentDate
+      cloudPaymentsPublicId
     }
   }
 `;

src/api/events/index.ts

@@ -53,14 +53,16 @@ export async function getEvent(projectId: string, eventId: string, originalEvent
  * @param filters - filters for daily events
  * @param search - search string for daily events
  * @param release - release identifier to filter events
+ * @param assignee - user id to filter events by assignee
  */
 export async function fetchDailyEventsPortion(
   projectId: string,
   nextCursor: DailyEventsCursor | null = null,
   sort = EventsSortOrder.ByDate,
   filters: EventsFilters = {},
   search = '',
-  release?: string
+  release?: string,
+  assignee?: string
 ): Promise<DailyEventsPortion> {
   const response = await api.call(QUERY_PROJECT_DAILY_EVENTS, {
     projectId,
@@ -69,6 +71,7 @@ export async function fetchDailyEventsPortion(
     filters,
     search,
     release,
+    assignee,
   }, undefined, {
     /**
      * This request calls on the app start, so we don't want to break app if something goes wrong

src/api/events/queries.ts

@@ -24,9 +24,10 @@ export const QUERY_PROJECT_DAILY_EVENTS = `
     $filters: EventsFiltersInput
     $search: String
     $release: String
+    $assignee: ID
   ) {
     project(projectId: $projectId) {
-      dailyEventsPortion(sort: $sort, filters: $filters, search: $search, release: $release, nextCursor: $cursor) {
+      dailyEventsPortion(sort: $sort, filters: $filters, search: $search, release: $release, assignee: $assignee, nextCursor: $cursor) {
         nextCursor {
           groupingTimestampBoundary
           sortValueBoundary

src/components/aside/ProjectsMenuItem.vue

@@ -37,7 +37,7 @@
       </div>
     </div>
     <Badge
-      v-if="project.unreadCount > 0"
+      v-if="project.unreadCount > 0 && project.id !== currentProjectId"
       :content="project.unreadCount"
       class="project-menu-item__events-number"
     />

src/components/forms/SearchField.vue

@@ -7,14 +7,17 @@
       class="form-search-field__search-icon"
       symbol="search"
     />
-    <input
-      ref="input"
-      class="form-search-field__input"
-      type="text"
-      :placeholder="placeholderText"
-      :value="modelValue"
-      @input="onChange"
-    >
+    <div class="form-search-field__input-wrap">
+      <input
+        ref="input"
+        class="form-search-field__input"
+        type="text"
+        :placeholder="placeholderText"
+        :value="modelValue"
+        @input="onChange"
+      >
+    </div>
+    <slot name="suffix" />
     <div
       v-show="inputValue"
       class="form-search-field__clear-icon-wrapper"
@@ -145,13 +148,20 @@ export default {
 
     }
 
+    &__input-wrap {
+      flex: 1;
+      min-width: 0;
+    }
+
     &__search-icon {
+      flex-shrink: 0;
       width: 14px;
       height: 14px;
       color: var(--color-text-second);
     }
 
     &__clear-icon-wrapper {
+      flex-shrink: 0;
       display: flex;
       align-items: center;
       justify-content: center;

src/components/modals/ChooseTariffPlanPopup.vue

@@ -144,6 +144,20 @@ export default defineComponent({
      */
     async onContinue(): Promise<void> {
       if (this.selectedPlan.monthlyCharge === 0) {
+        /**
+         * Disable free plan reset:
+         * if workspace is already on free plan, do not allow switching to free again
+         */
+        if (this.workspace.plan.monthlyCharge === 0) {
+          notifier.show({
+            message: this.$t('workspaces.chooseTariffPlanDialog.freeResetNotAllowed') as string,
+            style: 'error',
+            time: 5000,
+          });
+
+          return;
+        }
+
         this.$confirm.open({
           actionType: ActionType.SUBMIT,
           description: this.$t('workspaces.chooseTariffPlanDialog.confirmSetToFreePlanDescription').toString(),

src/components/modals/PaymentDetailsDialog.vue

@@ -611,7 +611,7 @@ export default defineComponent({
 
       widget.pay(method,
         {
-          publicId: import.meta.env.VITE_CLOUDPAYMENTS_PUBLIC_ID,
+          publicId: data.cloudPaymentsPublicId,
           description: this.$t(titleKey, {
             tariffPlanName: this.plan.name,
             workspaceName: this.workspace.name,