From 5e5d4112cde551c5cb23df8ed0a7e04d0ed40a5e Mon Sep 17 00:00:00 2001
From: olaszakos <olaszakos@gmail.com>
Date: Wed, 15 Jan 2025 15:52:50 +0100
Subject: [PATCH 1/2] feat(wallet): requesters can cancel their requests

---
 .../requests/OpenRequestOverlay.vue           |  1 +
 .../requests/PolicyRuleResultView.vue         |  4 +-
 .../requests/RequestDetailView.spec.ts        | 90 +++++++++++++++++++
 .../components/requests/RequestDetailView.vue | 20 ++++-
 .../components/requests/RequestDialog.spec.ts | 29 ++++++
 .../src/components/requests/RequestDialog.vue | 57 +++++++++---
 apps/wallet/src/locales/en.locale.ts          |  1 +
 apps/wallet/src/locales/fr.locale.ts          |  1 +
 apps/wallet/src/locales/pt.locale.ts          |  1 +
 apps/wallet/src/services/station.service.ts   | 11 +++
 10 files changed, 202 insertions(+), 13 deletions(-)

diff --git a/apps/wallet/src/components/requests/OpenRequestOverlay.vue b/apps/wallet/src/components/requests/OpenRequestOverlay.vue
index e54d8e645..fe20c8704 100644
--- a/apps/wallet/src/components/requests/OpenRequestOverlay.vue
+++ b/apps/wallet/src/components/requests/OpenRequestOverlay.vue
@@ -4,6 +4,7 @@
     v-model:open="open"
     :request-id="requestId"
     @approved="open = false"
+    @cancelled="open = false"
     @request-changed="updateRequestId"
   />
 </template>
diff --git a/apps/wallet/src/components/requests/PolicyRuleResultView.vue b/apps/wallet/src/components/requests/PolicyRuleResultView.vue
index 86a86f013..76d18f733 100644
--- a/apps/wallet/src/components/requests/PolicyRuleResultView.vue
+++ b/apps/wallet/src/components/requests/PolicyRuleResultView.vue
@@ -180,11 +180,13 @@ function getApprovalSummary(approverIds: string[], status: EvaluationStatus): st
       n: approvals,
       m: rejections,
     });
-  } else {
+  } else if (variantIs(status, 'Pending')) {
     append = i18n.t('requests.evaluation.approval_summary_pending', {
       n: approvals,
       m: rejections,
     });
+  } else {
+    unreachable(status);
   }
 
   return append;
diff --git a/apps/wallet/src/components/requests/RequestDetailView.spec.ts b/apps/wallet/src/components/requests/RequestDetailView.spec.ts
index a6dc9a6eb..564920a51 100644
--- a/apps/wallet/src/components/requests/RequestDetailView.spec.ts
+++ b/apps/wallet/src/components/requests/RequestDetailView.spec.ts
@@ -2,6 +2,8 @@ import { describe, expect, it } from 'vitest';
 import { mount } from '~/test.utils';
 import RequestDetailView from './RequestDetailView.vue';
 import { variantIs } from '~/utils/helper.utils';
+import { useStationStore } from '~/stores/station.store';
+import { flushPromises } from '@vue/test-utils';
 
 type RequestDetailViewProps = InstanceType<typeof RequestDetailView>['$props'];
 
@@ -192,6 +194,52 @@ const failedProps: RequestDetailViewProps = {
   },
 };
 
+const cancelledProps: RequestDetailViewProps = {
+  details: {
+    can_approve: false,
+    requester_name: 'requester',
+    approvers: [
+      { id: 'approver-1-id', name: '' },
+      { id: 'approver-2-id', name: '' },
+    ],
+  },
+  request: {
+    status: { Cancelled: { reason: ['cancellation reason'] } },
+    approvals: [
+      {
+        approver_id: 'approver-1-id',
+        status: { Approved: null },
+        decided_at: '',
+        status_reason: [],
+      },
+      {
+        approver_id: 'approver-2-id',
+        status: { Rejected: null },
+        decided_at: '',
+        status_reason: ['Test comment'],
+      },
+    ],
+    operation: {
+      AddUser: {
+        user: [],
+        input: {
+          groups: [],
+          identities: [],
+          name: 'test',
+          status: { Active: null },
+        },
+      },
+    },
+    created_at: '',
+    id: '',
+    execution_plan: { Immediate: null },
+    expiration_dt: '',
+    requested_by: 'approver-1-id',
+    summary: [],
+    title: '',
+  },
+};
+
 describe('RequestDetailView', () => {
   it('renders properly', () => {
     const wrapper = mount(RequestDetailView, {
@@ -312,4 +360,46 @@ describe('RequestDetailView', () => {
 
     expect(wrapper.find('[data-test-id="request-acceptance-rules"]').exists()).toBeTruthy();
   });
+
+  it('shows a cancel button for cancellable requests', async () => {
+    const wrapper = mount(RequestDetailView, {
+      props: pendingProps,
+    });
+    const station = useStationStore();
+    station.$patch({
+      user: { id: 'requester-id' },
+    });
+    await flushPromises();
+    expect(wrapper.find('[data-test-id="request-details-cancel"]').exists()).toBeTruthy();
+
+    await wrapper.find('[data-test-id="request-details-cancel"]').trigger('click');
+    expect(wrapper.emitted().cancel).toBeTruthy();
+  });
+
+  it("shows doesn't show cancel button for cancelled requests", async () => {
+    const wrapper = mount(RequestDetailView, {
+      props: cancelledProps,
+    });
+    const station = useStationStore();
+    station.$patch({
+      user: { id: 'requester-id' },
+    });
+
+    await flushPromises();
+
+    expect(wrapper.find('[data-test-id="request-details-cancel"]').exists()).toBeFalsy();
+  });
+
+  it("shows doesn't show cancel button for non-requester", async () => {
+    const wrapper = mount(RequestDetailView, {
+      props: pendingProps,
+    });
+    const station = useStationStore();
+    station.$patch({
+      user: { id: 'not-requester-id' },
+    });
+
+    await flushPromises();
+    expect(wrapper.find('[data-test-id="request-details-cancel"]').exists()).toBeFalsy();
+  });
 });
diff --git a/apps/wallet/src/components/requests/RequestDetailView.vue b/apps/wallet/src/components/requests/RequestDetailView.vue
index 36579a216..1e271758a 100644
--- a/apps/wallet/src/components/requests/RequestDetailView.vue
+++ b/apps/wallet/src/components/requests/RequestDetailView.vue
@@ -73,7 +73,7 @@
         hide-details
         rows="1"
         auto-grow
-        :readonly="props.loading || !props.details.can_approve"
+        :readonly="props.loading || (!props.details.can_approve && !canCancel)"
       />
     </VCardText>
 
@@ -173,6 +173,17 @@
         :class="{ 'mt-8': props.details.can_approve }"
       />
       <div class="d-flex flex-column flex-md-row ga-1 justify-end flex-grow-1 w-100 w-md-auto">
+        <VBtn
+          v-if="canCancel"
+          data-test-id="request-details-cancel"
+          variant="plain"
+          class="ma-0"
+          :disabled="props.loading"
+          @click="$emit('cancel', reasonOrUndefined)"
+        >
+          {{ $t('terms.cancel_request') }}
+        </VBtn>
+
         <template v-if="props.details.can_approve">
           <VBtn
             data-test-id="request-details-reject"
@@ -261,8 +272,10 @@ import TransferOperation from './operations/TransferOperation.vue';
 import UnsupportedOperation from './operations/UnsupportedOperation.vue';
 import EditAssetOperation from './operations/EditAssetOperation.vue';
 import RemoveAssetOperation from './operations/RemoveAssetOperation.vue';
+import { useStationStore } from '~/stores/station.store';
 
 const i18n = useI18n();
+const store = useStationStore();
 
 const props = withDefaults(
   defineProps<{
@@ -315,6 +328,7 @@ const componentsMap: {
 defineEmits<{
   (event: 'approve', reason?: string): void;
   (event: 'reject', reason?: string): void;
+  (event: 'cancel', reason?: string): void;
 }>();
 
 const detailView = computed<{
@@ -341,6 +355,10 @@ const detailView = computed<{
     : null;
 });
 
+const canCancel = computed(() => {
+  return props.request.requested_by === store.user.id && variantIs(props.request.status, 'Created');
+});
+
 const requestType = computed(() => {
   const keys = Object.keys(componentsMap) as KeysOfUnion<RequestOperation>[];
   for (const key of keys) {
diff --git a/apps/wallet/src/components/requests/RequestDialog.spec.ts b/apps/wallet/src/components/requests/RequestDialog.spec.ts
index 2626b61e2..100239e4f 100644
--- a/apps/wallet/src/components/requests/RequestDialog.spec.ts
+++ b/apps/wallet/src/components/requests/RequestDialog.spec.ts
@@ -12,6 +12,7 @@ import { services } from '~/plugins/services.plugin';
 import { mount } from '~/test.utils';
 import { ExtractOk } from '~/types/helper.types';
 import RequestDialog from './RequestDialog.vue';
+import RequestDetailView from './RequestDetailView.vue';
 
 const mockAsset: Asset = {
   blockchain: 'icp',
@@ -265,4 +266,32 @@ describe('RequestDialog', () => {
 
     vi.restoreAllMocks();
   });
+
+  it('cancels the request when the cancel button is clicked', async () => {
+    vi.spyOn(services().station, 'getRequest').mockResolvedValueOnce(approvableRequestResponse);
+    vi.spyOn(services().station, 'cancelRequest').mockResolvedValueOnce(
+      approvableRequestResponse.request,
+    );
+
+    const wrapper = mount(RequestDialog, {
+      props: {
+        requestId: '123',
+        open: true,
+      },
+    });
+
+    await flushPromises();
+
+    const detailView = wrapper.findComponent(RequestDetailView);
+
+    expect(detailView.exists()).toBeTruthy();
+
+    detailView.vm.$emit('cancel');
+
+    expect(services().station.cancelRequest).toHaveBeenCalledWith({
+      request_id: '123',
+      reason: [],
+    });
+    vi.restoreAllMocks();
+  });
 });
diff --git a/apps/wallet/src/components/requests/RequestDialog.vue b/apps/wallet/src/components/requests/RequestDialog.vue
index d258cef83..5578c1938 100644
--- a/apps/wallet/src/components/requests/RequestDialog.vue
+++ b/apps/wallet/src/components/requests/RequestDialog.vue
@@ -1,7 +1,7 @@
 <template>
   <VDialog
     v-model="openModel"
-    :persistent="loading || approving"
+    :persistent="loading || working"
     transition="dialog-bottom-transition"
     :max-width="props.dialogMaxWidth.value"
   >
@@ -31,11 +31,12 @@
           approvers: data.additionalInfo.approvers,
           evaluationResult: data.additionalInfo.evaluation_result[0],
         }"
-        :loading="approving || loading"
+        :loading="working || loading"
         @closed="openModel = false"
         @opened="openModel = true"
         @approve="reason => onApproval(RequestApprovalStatusEnum.Approved, reason)"
         @reject="reason => onApproval(RequestApprovalStatusEnum.Rejected, reason)"
+        @cancel="reason => onCancel(reason)"
       >
         <template #top-actions>
           <VSwitch
@@ -46,13 +47,13 @@
             class="flex-0-1"
             :hide-details="true"
             color="primary"
-            :disabled="approving"
+            :disabled="working"
           />
-          <VBtn :disabled="approving" :icon="mdiLinkVariant" @click="copyRequestUrl" />
-          <VBtn :disabled="approving" :icon="mdiClose" @click="openModel = false" />
+          <VBtn :disabled="working" :icon="mdiLinkVariant" @click="copyRequestUrl" />
+          <VBtn :disabled="working" :icon="mdiClose" @click="openModel = false" />
         </template>
         <template v-if="loadNext" #bottom-actions>
-          <VBtn variant="plain" :disabled="approving" class="ma-0" @click="skip">
+          <VBtn variant="plain" :disabled="working" class="ma-0" @click="skip">
             {{ $t('terms.skip') }}
           </VBtn>
         </template>
@@ -122,13 +123,14 @@ const props = toRefs(input);
 const emit = defineEmits<{
   (event: 'update:open', payload: boolean): void;
   (event: 'approved'): void;
+  (event: 'cancelled'): void;
   (event: 'closed'): void;
   (event: 'opened'): void;
   (event: 'request-changed', payload: UUID): void;
 }>();
 const currentRequestId = ref<UUID | null>(props.requestId.value);
 const preloadedData = ref<DataType | null>(null);
-const approving = ref(false);
+const working = ref(false);
 const loading = ref(false);
 const skippedRequestIds = ref<UUID[]>([]);
 
@@ -199,7 +201,7 @@ const loadRequest = async (): Promise<DataType> => {
 };
 
 const skip = async (): Promise<void> => {
-  approving.value = true;
+  working.value = true;
   skippedRequestIds.value.push(currentRequestId.value!);
 
   preloadedData.value = await loadNextRequest();
@@ -211,7 +213,7 @@ const skip = async (): Promise<void> => {
     currentRequestId.value = null;
   }
 
-  approving.value = false;
+  working.value = false;
 };
 
 const onRequestLoaded = (data: Awaited<ReturnType<typeof loadRequest>>): void => {
@@ -240,7 +242,7 @@ const onApproval = async (decision: RequestApprovalStatusEnum, reason?: string):
     return;
   }
 
-  approving.value = true;
+  working.value = true;
 
   return station.service
     .submitRequestApproval({
@@ -279,7 +281,40 @@ const onApproval = async (decision: RequestApprovalStatusEnum, reason?: string):
       });
     })
     .finally(() => {
-      approving.value = false;
+      working.value = false;
+    });
+};
+
+const onCancel = async (reason?: string): Promise<void> => {
+  if (currentRequestId.value === null) {
+    return;
+  }
+
+  working.value = true;
+
+  return station.service
+    .cancelRequest({
+      request_id: currentRequestId.value,
+      reason: reason && reason.length ? [reason] : [],
+    })
+    .then(async () => {
+      app.sendNotification({
+        type: 'success',
+        message: i18n.t('app.action_save_success'),
+      });
+      emit('cancelled');
+      openModel.value = false;
+    })
+    .catch(err => {
+      logger.error(`Failed to cancel request:`, err);
+
+      app.sendNotification({
+        type: 'error',
+        message: i18n.t('app.action_save_failed'),
+      });
+    })
+    .finally(() => {
+      working.value = false;
     });
 };
 
diff --git a/apps/wallet/src/locales/en.locale.ts b/apps/wallet/src/locales/en.locale.ts
index f7dd91277..22addd516 100644
--- a/apps/wallet/src/locales/en.locale.ts
+++ b/apps/wallet/src/locales/en.locale.ts
@@ -711,6 +711,7 @@ export default {
     see_all: 'See All',
     requests: 'Requests',
     cancel: 'Cancel',
+    cancel_request: 'Cancel Request',
     checksum: 'Checksum',
     module_checksum: 'Module Checksum',
     rejected: 'Rejected',
diff --git a/apps/wallet/src/locales/fr.locale.ts b/apps/wallet/src/locales/fr.locale.ts
index dc2b6cf91..bbefcf76d 100644
--- a/apps/wallet/src/locales/fr.locale.ts
+++ b/apps/wallet/src/locales/fr.locale.ts
@@ -719,6 +719,7 @@ export default {
     save: 'Sauvegarder',
     see_all: 'Voir Tout',
     cancel: 'Annuler',
+    cancel_request: 'Annuler la demande',
     checksum: 'Checksum',
     module_checksum: 'Checksum du Module',
     rejected: 'Rejetté',
diff --git a/apps/wallet/src/locales/pt.locale.ts b/apps/wallet/src/locales/pt.locale.ts
index eeacb5956..d40397c8d 100644
--- a/apps/wallet/src/locales/pt.locale.ts
+++ b/apps/wallet/src/locales/pt.locale.ts
@@ -708,6 +708,7 @@ export default {
     approved: 'Aprovado',
     confirm: 'Confirmar',
     cancel: 'Cancelar',
+    cancel_request: 'Cancelar pedido',
     see_all: 'Ver todos',
     min: 'Mínimo',
     rule: 'Regra',
diff --git a/apps/wallet/src/services/station.service.ts b/apps/wallet/src/services/station.service.ts
index 9feaf1062..df7c66e06 100644
--- a/apps/wallet/src/services/station.service.ts
+++ b/apps/wallet/src/services/station.service.ts
@@ -10,6 +10,7 @@ import {
   AddRequestPolicyOperationInput,
   AddUserGroupOperationInput,
   AddUserOperationInput,
+  CancelRequestInput,
   CanisterMethod,
   CanisterSnapshotsResult,
   CanisterStatusResult,
@@ -524,6 +525,16 @@ export class StationService {
     return result.Ok.request;
   }
 
+  async cancelRequest(input: CancelRequestInput): Promise<Request> {
+    const result = await this.actor.cancel_request(input);
+
+    if (variantIs(result, 'Err')) {
+      throw result.Err;
+    }
+
+    return result.Ok.request;
+  }
+
   async getRequest(
     input: GetRequestInput,
     verifiedCall = false,

From 17d2bcd147bd809098975b834bc064a35c31592f Mon Sep 17 00:00:00 2001
From: olaszakos <olaszakos@gmail.com>
Date: Wed, 15 Jan 2025 15:58:13 +0100
Subject: [PATCH 2/2] fix test name

---
 apps/wallet/src/components/requests/RequestDetailView.spec.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/wallet/src/components/requests/RequestDetailView.spec.ts b/apps/wallet/src/components/requests/RequestDetailView.spec.ts
index 564920a51..82c1a57da 100644
--- a/apps/wallet/src/components/requests/RequestDetailView.spec.ts
+++ b/apps/wallet/src/components/requests/RequestDetailView.spec.ts
@@ -376,7 +376,7 @@ describe('RequestDetailView', () => {
     expect(wrapper.emitted().cancel).toBeTruthy();
   });
 
-  it("shows doesn't show cancel button for cancelled requests", async () => {
+  it("doesn't show cancel button for cancelled requests", async () => {
     const wrapper = mount(RequestDetailView, {
       props: cancelledProps,
     });
@@ -390,7 +390,7 @@ describe('RequestDetailView', () => {
     expect(wrapper.find('[data-test-id="request-details-cancel"]').exists()).toBeFalsy();
   });
 
-  it("shows doesn't show cancel button for non-requester", async () => {
+  it("doesn't show cancel button for non-requester", async () => {
     const wrapper = mount(RequestDetailView, {
       props: pendingProps,
     });