From 269d00a096cd8f70961b42ede4ff7a05e4a287c3 Mon Sep 17 00:00:00 2001
From: Trent Larson <trent@trentlarson.com>
Date: Fri, 16 Aug 2024 15:58:54 -0600
Subject: [PATCH 1/3] start with offer-edit

---
 src/libs/endorserServer.ts  | 168 +++++++---
 src/views/GiftedDetails.vue |   1 -
 src/views/OfferDetails.vue  | 624 ++++++++++++++++++++++++++++++++++++
 3 files changed, 748 insertions(+), 45 deletions(-)
 create mode 100644 src/views/OfferDetails.vue

diff --git a/src/libs/endorserServer.ts b/src/libs/endorserServer.ts
index d7475a8..619afa1 100644
--- a/src/libs/endorserServer.ts
+++ b/src/libs/endorserServer.ts
@@ -48,7 +48,7 @@ export interface ClaimResult {
 }
 
 export interface GenericVerifiableCredential {
-  "@context"?: string;
+  "@context"?: string; // optional when embedded, eg. in an Agree
   "@type": string;
   [key: string]: any; // eslint-disable-line @typescript-eslint/no-explicit-any
 }
@@ -139,13 +139,13 @@ export interface GiveVerifiableCredential extends GenericVerifiableCredential {
 
 // Note that previous VCs may have additional fields.
 // https://endorser.ch/doc/html/transactions.html#id8
-export interface OfferVerifiableCredential {
-  "@context"?: string; // optional when embedded, eg. in an Agree
+export interface OfferVerifiableCredential extends GenericVerifiableCredential {
+  "@context"?: string; // optional when embedded... though it doesn't make sense to agree to an offer
   "@type": "Offer";
-  description?: string;
+  description?: string; // conditions for the offer
   includesObject?: { amountOfThisGood: number; unitCode: string };
   itemOffered?: {
-    description?: string;
+    description?: string; // description of the item
     isPartOf?: { identifier?: string; lastClaimId?: string; "@type"?: string };
   };
   offeredBy?: { identifier: string };
@@ -155,7 +155,7 @@ export interface OfferVerifiableCredential {
 
 // Note that previous VCs may have additional fields.
 // https://endorser.ch/doc/html/transactions.html#id7
-export interface PlanVerifiableCredential {
+export interface PlanVerifiableCredential extends GenericVerifiableCredential {
   "@context": "https://schema.org";
   "@type": "PlanAction";
   name: string;
@@ -563,6 +563,8 @@ export async function setPlanInCache(
 
 /**
  * Construct GiveAction VC for submission to server
+ *
+ * @param lastClaimId supplied when editing a previous claim
  */
 export function hydrateGive(
   vcClaimOrig?: GiveVerifiableCredential,
@@ -587,6 +589,7 @@ export function hydrateGive(
       };
 
   if (lastClaimId) {
+    // this is an edit
     vcClaim.lastClaimId = lastClaimId;
     delete vcClaim.identifier;
   }
@@ -594,16 +597,17 @@ export function hydrateGive(
   vcClaim.agent = fromDid ? { identifier: fromDid } : undefined;
   vcClaim.recipient = toDid ? { identifier: toDid } : undefined;
   vcClaim.description = description || undefined;
-  vcClaim.object = amount
-    ? { amountOfThisGood: amount, unitCode: unitCode || "HUR" }
-    : undefined;
+  vcClaim.object =
+    amount && !isNaN(amount)
+      ? { amountOfThisGood: amount, unitCode: unitCode || "HUR" }
+      : undefined;
 
   // ensure fulfills is an array
   if (!Array.isArray(vcClaim.fulfills)) {
     vcClaim.fulfills = vcClaim.fulfills ? [vcClaim.fulfills] : [];
   }
   // ... and replace or add each element, ending with Trade or Donate
-  // I realize this doesn't change any elements that are not PlanAction or Offer or Trade/Action.
+  // I realize the following doesn't change any elements that are not PlanAction or Offer or Trade/Action.
   vcClaim.fulfills = vcClaim.fulfills.filter(
     (elem) => elem["@type"] !== "PlanAction",
   );
@@ -639,8 +643,8 @@ export function hydrateGive(
  *
  * @param fromDid may be null
  * @param toDid
- * @param description may be null; should have this or amount
- * @param amount may be null; should have this or description
+ * @param description may be null
+ * @param amount may be null
  */
 export async function createAndSubmitGive(
   axios: Axios,
@@ -667,6 +671,7 @@ export async function createAndSubmitGive(
     fulfillsOfferHandleId,
     isTrade,
     imageUrl,
+    undefined,
   );
   return createAndSubmitClaim(
     vcClaim as GenericVerifiableCredential,
@@ -680,9 +685,9 @@ export async function createAndSubmitGive(
  * For result, see https://api.endorser.ch/api-docs/#/claims/post_api_v2_claim
  *
  * @param fromDid may be null
- * @param toDid
- * @param description may be null; should have this or amount
- * @param amount may be null; should have this or description
+ * @param toDid may be null if project is provided
+ * @param description may be null
+ * @param amount may be null
  */
 export async function editAndSubmitGive(
   axios: Axios,
@@ -720,13 +725,69 @@ export async function editAndSubmitGive(
   );
 }
 
+/**
+ * Construct Offer VC for submission to server
+ *
+ * @param lastClaimId supplied when editing a previous claim
+ */
+export function hydrateOffer(
+  vcClaimOrig?: OfferVerifiableCredential,
+  fromDid?: string,
+  toDid?: string,
+  conditionDescription?: string,
+  amount?: number,
+  unitCode?: string,
+  offeringDescription?: string,
+  fulfillsProjectHandleId?: string,
+  validThrough?: string,
+  lastClaimId?: string,
+): OfferVerifiableCredential {
+  // Remember: replace values or erase if it's null
+
+  const vcClaim: OfferVerifiableCredential = vcClaimOrig
+    ? R.clone(vcClaimOrig)
+    : {
+        "@context": SCHEMA_ORG_CONTEXT,
+        "@type": "Offer",
+      };
+
+  if (lastClaimId) {
+    // this is an edit
+    vcClaim.lastClaimId = lastClaimId;
+    delete vcClaim.identifier;
+  }
+
+  vcClaim.offeredBy = fromDid ? { identifier: fromDid } : undefined;
+  vcClaim.recipient = toDid ? { identifier: toDid } : undefined;
+  vcClaim.description = conditionDescription || undefined;
+
+  vcClaim.includesObject =
+    amount && !isNaN(amount)
+      ? { amountOfThisGood: amount, unitCode: unitCode || "HUR" }
+      : undefined;
+
+  if (offeringDescription || fulfillsProjectHandleId) {
+    vcClaim.itemOffered = vcClaim.itemOffered || {};
+    vcClaim.itemOffered.description = offeringDescription || undefined;
+    if (fulfillsProjectHandleId) {
+      vcClaim.itemOffered.isPartOf = {
+        "@type": "PlanAction",
+        identifier: fulfillsProjectHandleId,
+      };
+    }
+  }
+  vcClaim.validThrough = validThrough || undefined;
+
+  return vcClaim;
+}
+
 /**
  * For result, see https://api.endorser.ch/api-docs/#/claims/post_api_v2_claim
  *
  * @param identity
- * @param description may be null; should have this or amount
- * @param amount may be null; should have this or description
- * @param expirationDate ISO 8601 date string YYYY-MM-DD (may be null)
+ * @param description may be null
+ * @param amount may be null
+ * @param validThrough ISO 8601 date string YYYY-MM-DD (may be null)
  * @param fulfillsProjectHandleId ID of project to which this contributes (may be null)
  */
 export async function createAndSubmitOffer(
@@ -736,35 +797,54 @@ export async function createAndSubmitOffer(
   description?: string,
   amount?: number,
   unitCode?: string,
-  expirationDate?: string,
+  validThrough?: string,
   recipientDid?: string,
   fulfillsProjectHandleId?: string,
 ): Promise<CreateAndSubmitClaimResult> {
-  const vcClaim: OfferVerifiableCredential = {
-    "@context": SCHEMA_ORG_CONTEXT,
-    "@type": "Offer",
-    offeredBy: { identifier: issuerDid },
-    validThrough: expirationDate || undefined,
-  };
-  if (amount) {
-    vcClaim.includesObject = {
-      amountOfThisGood: amount,
-      unitCode: unitCode || "HUR",
-    };
-  }
-  if (description) {
-    vcClaim.itemOffered = { description };
-  }
-  if (recipientDid) {
-    vcClaim.recipient = { identifier: recipientDid };
-  }
-  if (fulfillsProjectHandleId) {
-    vcClaim.itemOffered = vcClaim.itemOffered || {};
-    vcClaim.itemOffered.isPartOf = {
-      "@type": "PlanAction",
-      identifier: fulfillsProjectHandleId,
-    };
-  }
+  const vcClaim = hydrateOffer(
+    undefined,
+    issuerDid,
+    recipientDid,
+    description,
+    amount,
+    unitCode,
+    description,
+    fulfillsProjectHandleId,
+    validThrough,
+    undefined,
+  );
+  return createAndSubmitClaim(
+    vcClaim as OfferVerifiableCredential,
+    issuerDid,
+    apiServer,
+    axios,
+  );
+}
+
+export async function editAndSubmitOffer(
+  axios: Axios,
+  apiServer: string,
+  fullClaim: GenericCredWrapper<OfferVerifiableCredential>,
+  issuerDid: string,
+  description?: string,
+  amount?: number,
+  unitCode?: string,
+  validThrough?: string,
+  recipientDid?: string,
+  fulfillsProjectHandleId?: string,
+): Promise<CreateAndSubmitClaimResult> {
+  const vcClaim = hydrateOffer(
+    fullClaim.claim,
+    issuerDid,
+    recipientDid,
+    description,
+    amount,
+    unitCode,
+    description,
+    fulfillsProjectHandleId,
+    validThrough,
+    fullClaim.id,
+  );
   return createAndSubmitClaim(
     vcClaim as OfferVerifiableCredential,
     issuerDid,
diff --git a/src/views/GiftedDetails.vue b/src/views/GiftedDetails.vue
index 3e1466c..c727bdf 100644
--- a/src/views/GiftedDetails.vue
+++ b/src/views/GiftedDetails.vue
@@ -694,7 +694,6 @@ export default class GiftedDetails extends Vue {
   constructGiveParam() {
     const recipientDid = this.givenToRecipient ? this.recipientDid : undefined;
     const projectId = this.givenToProject ? this.projectId : undefined;
-    // const giveClaim = constructGive(
     const giveClaim = hydrateGive(
       this.prevCredToEdit?.claim as GiveVerifiableCredential,
       this.giverDid,
diff --git a/src/views/OfferDetails.vue b/src/views/OfferDetails.vue
new file mode 100644
index 0000000..f6a1225
--- /dev/null
+++ b/src/views/OfferDetails.vue
@@ -0,0 +1,624 @@
+<template>
+  <QuickNav />
+  <TopMessage />
+
+  <!-- CONTENT -->
+  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
+    <!-- Back -->
+    <div
+      v-if="!hideBackButton"
+      class="text-lg text-center font-light relative px-7"
+    >
+      <h1
+        class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
+        @click="cancelBack()"
+      >
+        <fa icon="chevron-left" class="fa-fw"></fa>
+      </h1>
+    </div>
+
+    <!-- Heading -->
+    <h1 class="text-4xl text-center font-light px-4 mb-4">What Was Offered</h1>
+
+    <h1 class="text-xl font-bold text-center mb-4">
+      <span>From {{ giverName }}</span>
+      <span>
+        to
+        {{
+          offeredToProject
+            ? projectName
+            : offeredToRecipient
+              ? recipientName
+              : "someone unidentified"
+        }}</span
+      >
+    </h1>
+    <textarea
+      class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
+      placeholder="What was offered"
+      v-model="description"
+    />
+    <div class="flex flex-row justify-center">
+      <span
+        class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center text-blue-500 px-2 py-2 w-20"
+        @click="changeUnitCode()"
+      >
+        {{ libsUtil.UNIT_SHORT[unitCode] || unitCode }}
+      </span>
+      <div
+        class="border border-r-0 border-slate-400 bg-slate-200 px-4 py-2"
+        @click="amountInput === '0' ? null : decrement()"
+      >
+        <fa icon="chevron-left" />
+      </div>
+      <input
+        type="number"
+        class="border border-r-0 border-slate-400 px-2 py-2 text-center w-20"
+        v-model="amountInput"
+      />
+      <div
+        class="rounded-r border border-slate-400 bg-slate-200 px-4 py-2"
+        @click="increment()"
+      >
+        <fa icon="chevron-right" />
+      </div>
+    </div>
+
+    <div class="h-7 mt-4 flex">
+      <input
+        v-if="projectId && !offeredToRecipient"
+        type="checkbox"
+        class="h-6 w-6 mr-2"
+        v-model="offeredToProject"
+      />
+      <fa
+        v-else
+        icon="square"
+        class="bg-slate-500 text-slate-500 h-5 w-5 px-0.5 py-0.5 mr-2 rounded"
+        @click="notifyUserOfProject()"
+      />
+      <label class="text-sm mt-1">
+        {{
+          projectId
+            ? "This was given to " + projectName
+            : "No project was chosen"
+        }}
+      </label>
+    </div>
+
+    <div class="h-7 mt-4 flex">
+      <input
+        v-if="recipientDid && !offeredToProject"
+        type="checkbox"
+        class="h-6 w-6 mr-2"
+        v-model="offeredToRecipient"
+      />
+      <fa
+        v-else
+        icon="square"
+        class="bg-slate-500 text-slate-500 h-5 w-5 px-0.5 py-0.5 mr-2 rounded"
+        @click="notifyUserOfRecipient()"
+      />
+      <label class="text-sm mt-1">
+        {{
+          recipientDid
+            ? "This was given to " + recipientName
+            : "No recipient was chosen."
+        }}
+      </label>
+    </div>
+
+    <div class="mt-4 flex">
+      <router-link
+        :to="{
+          name: 'claim-add-raw',
+          query: {
+            claim: constructOfferParam(),
+          },
+        }"
+        class="text-blue-500"
+      >
+        Edit & Submit Raw
+      </router-link>
+    </div>
+
+    <p class="text-center mb-2 mt-6 italic">
+      Sign & Send to publish to the world
+      <fa
+        icon="circle-info"
+        class="pl-2 text-blue-500 cursor-pointer"
+        @click="explainData()"
+      />
+    </p>
+    <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+      <button
+        class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
+        @click="cancel"
+      >
+        Cancel
+      </button>
+    </div>
+  </section>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from "vue-facing-decorator";
+import { Router } from "vue-router";
+
+import QuickNav from "@/components/QuickNav.vue";
+import TopMessage from "@/components/TopMessage.vue";
+import { NotificationIface } from "@/constants/app";
+import { accountsDB, db } from "@/db/index";
+import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import {
+  createAndSubmitOffer,
+  didInfo,
+  editAndSubmitOffer,
+  GenericCredWrapper,
+  getPlanFromCache,
+  hydrateOffer,
+  OfferVerifiableCredential,
+} from "@/libs/endorserServer";
+import * as libsUtil from "@/libs/util";
+import { Contact } from "@/db/tables/contacts";
+
+@Component({
+  components: {
+    QuickNav,
+    TopMessage,
+  },
+})
+export default class OfferDetails extends Vue {
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
+
+  activeDid = "";
+  apiServer = "";
+
+  amountInput = "0";
+  description = "";
+  destinationPathAfter = "";
+  offeredToProject = false;
+  offeredToRecipient = false;
+  giverDid: string | undefined;
+  giverName = "";
+  hideBackButton = false;
+  isTrade = false;
+  message = "";
+  offerId = "";
+  prevCredToEdit?: GenericCredWrapper<OfferVerifiableCredential>;
+  projectId = "";
+  projectName = "a project";
+  recipientDid = "";
+  recipientName = "";
+  unitCode = "HUR";
+  validThroughDate = null;
+
+  libsUtil = libsUtil;
+
+  async mounted() {
+    try {
+      this.prevCredToEdit = (this.$route as Router).query["prevCredToEdit"]
+        ? (JSON.parse(
+            (this.$route as Router).query["prevCredToEdit"],
+          ) as GenericCredWrapper<OfferVerifiableCredential>)
+        : undefined;
+    } catch (error) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Retrieval Error",
+          text: "The previous record isn't available for editing. If you submit, you'll create a new record.",
+        },
+        6000,
+      );
+    }
+
+    const prevAmount = this.prevCredToEdit?.claim?.object?.amountOfThisGood;
+    this.amountInput =
+      (this.$route as Router).query["amountInput"] ||
+      (prevAmount ? String(prevAmount) : "") ||
+      this.amountInput;
+    this.description =
+      (this.$route as Router).query["description"] ||
+      this.prevCredToEdit?.claim?.description ||
+      this.description;
+    this.destinationPathAfter = (this.$route as Router).query[
+      "destinationPathAfter"
+    ];
+    this.giverDid = ((this.$route as Router).query["giverDid"] ||
+      this.prevCredToEdit?.claim?.agent?.identifier ||
+      this.giverDid) as string;
+    this.giverName =
+      ((this.$route as Router).query["giverName"] as string) || "";
+    this.hideBackButton =
+      (this.$route as Router).query["hideBackButton"] === "true";
+    this.message = ((this.$route as Router).query["message"] as string) || "";
+    // find any offer ID
+    const fulfills = this.prevCredToEdit?.claim?.fulfills;
+    const fulfillsArray = Array.isArray(fulfills)
+      ? fulfills
+      : fulfills
+        ? [fulfills]
+        : [];
+    const offer = fulfillsArray.find((rec) => rec["@type"] === "Offer");
+    this.offerId = ((this.$route as Router).query["offerId"] ||
+      offer?.identifier ||
+      this.offerId) as string;
+
+    // find any project ID
+    const project = fulfillsArray.find((rec) => rec["@type"] === "PlanAction");
+    this.projectId = ((this.$route as Router).query["projectId"] ||
+      project?.identifier ||
+      this.projectId) as string;
+
+    this.recipientDid = ((this.$route as Router).query["recipientDid"] ||
+      this.prevCredToEdit?.claim?.recipient?.identifier) as string;
+    this.recipientName =
+      ((this.$route as Router).query["recipientName"] as string) || "";
+    this.unitCode = ((this.$route as Router).query["unitCode"] ||
+      this.prevCredToEdit?.claim?.object?.unitCode ||
+      this.unitCode) as string;
+
+    // this is an endpoint for sharing project info to highlight something given
+    // https://developer.mozilla.org/en-US/docs/Web/Manifest/share_target
+    if ((this.$route as Router).query["shareTitle"]) {
+      this.description =
+        ((this.$route as Router).query["shareTitle"] as string) +
+        (this.description ? "\n" + this.description : "");
+    }
+    if ((this.$route as Router).query["shareText"]) {
+      this.description =
+        (this.description ? this.description + "\n" : "") +
+        ((this.$route as Router).query["shareText"] as string);
+    }
+    if ((this.$route as Router).query["shareUrl"]) {
+      this.imageUrl = (this.$route as Router).query["shareUrl"] as string;
+    }
+
+    try {
+      await db.open();
+      const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
+      this.apiServer = settings?.apiServer || "";
+      this.activeDid = settings?.activeDid || "";
+
+      let allContacts: Contact[] = [];
+      let allMyDids: string[] = [];
+      if (
+        (this.giverDid && !this.giverName) ||
+        (this.recipientDid && !this.recipientName)
+      ) {
+        allContacts = await db.contacts.toArray();
+
+        await accountsDB.open();
+        const allAccounts = await accountsDB.accounts.toArray();
+        allMyDids = allAccounts.map((acc) => acc.did);
+        if (this.giverDid && !this.giverName) {
+          this.giverName = didInfo(
+            this.giverDid,
+            this.activeDid,
+            allMyDids,
+            allContacts,
+          );
+        }
+        if (this.recipientDid && !this.recipientName) {
+          this.recipientName = didInfo(
+            this.recipientDid,
+            this.activeDid,
+            allMyDids,
+            allContacts,
+          );
+        }
+      }
+      this.offeredToProject = !!this.projectId;
+      this.offeredToRecipient = !this.offeredToProject && !!this.recipientDid;
+
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    } catch (err: any) {
+      console.error("Error retrieving settings from database:", err);
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: err.message || "There was an error retrieving your settings.",
+        },
+        -1,
+      );
+    }
+
+    if (this.projectId) {
+      // console.log("Getting project name from cache", this.projectId);
+      const project = await getPlanFromCache(
+        this.projectId,
+        this.axios,
+        this.apiServer,
+        this.activeDid,
+      );
+      this.projectName = project?.name
+        ? "the project: " + project.name
+        : "a project";
+    }
+  }
+
+  changeUnitCode() {
+    const units = Object.keys(this.libsUtil.UNIT_SHORT);
+    const index = units.indexOf(this.unitCode);
+    this.unitCode = units[(index + 1) % units.length];
+  }
+
+  increment() {
+    this.amountInput = `${(parseFloat(this.amountInput) || 0) + 1}`;
+  }
+
+  decrement() {
+    this.amountInput = `${Math.max(
+      0,
+      (parseFloat(this.amountInput) || 1) - 1,
+    )}`;
+  }
+
+  cancel() {
+    if (this.destinationPathAfter) {
+      (this.$router as Router).push({ path: this.destinationPathAfter });
+    } else {
+      (this.$router as Router).back();
+    }
+  }
+
+  cancelBack() {
+    (this.$router as Router).back();
+  }
+
+  async confirm() {
+    if (!this.activeDid) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "You must select an identifier before you can record a offer.",
+        },
+        2000,
+      );
+      return;
+    }
+    if (parseFloat(this.amountInput) < 0) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          text: "You may not send a negative number.",
+          title: "",
+        },
+        2000,
+      );
+      return;
+    }
+    if (!this.description && !parseFloat(this.amountInput)) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: `You must enter a description or some number of ${
+            this.libsUtil.UNIT_LONG[this.unitCode]
+          }.`,
+        },
+        2000,
+      );
+      return;
+    }
+
+    this.$notify(
+      {
+        group: "alert",
+        type: "toast",
+        text: "Recording the give...",
+        title: "",
+      },
+      1000,
+    );
+
+    // this is asynchronous, but we don't need to wait for it to complete
+    await this.recordOffer();
+  }
+
+  notifyUserOfProject() {
+    if (!this.projectId) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "warning",
+          title: "Error",
+          text: "To assign to a project, you must open this dialog through a project.",
+        },
+        3000,
+      );
+    } else {
+      // must be because offeredToRecipient is true
+      this.$notify(
+        {
+          group: "alert",
+          type: "warning",
+          title: "Error",
+          text: "You cannot assign both to a project and to a recipient.",
+        },
+        3000,
+      );
+    }
+  }
+
+  notifyUserOfRecipient() {
+    if (!this.recipientDid) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "warning",
+          title: "Error",
+          text: "To assign to a recipient, you must open this dialog from a contact.",
+        },
+        3000,
+      );
+    } else {
+      // must be because offeredToProject is true
+      this.$notify(
+        {
+          group: "alert",
+          type: "warning",
+          title: "Error",
+          text: "You cannot assign both to a recipient and to a project.",
+        },
+        3000,
+      );
+    }
+  }
+
+  /**
+   *
+   * @param giverDid may be null
+   * @param description may be an empty string
+   * @param amountInput may be 0
+   * @param unitCode may be omitted, defaults to "HUR"
+   */
+  public async recordOffer() {
+    try {
+      const recipientDid = this.offeredToRecipient
+        ? this.recipientDid
+        : undefined;
+      const projectId = this.offeredToProject ? this.projectId : undefined;
+      let result;
+      if (this.prevCredToEdit) {
+        // don't create from a blank one in case some properties were set from a different interface
+        result = await editAndSubmitOffer(
+          this.axios,
+          this.apiServer,
+          this.prevCredToEdit,
+          this.activeDid,
+          this.description,
+          parseFloat(this.amountInput),
+          this.unitCode,
+          this.validThroughDate,
+          recipientDid,
+          projectId,
+        );
+      } else {
+        result = await createAndSubmitOffer(
+          this.axios,
+          this.apiServer,
+          this.activeDid,
+          this.description,
+          parseFloat(this.amountInput),
+          this.unitCode,
+          this.validThroughDate,
+          recipientDid,
+          projectId,
+        );
+      }
+
+      if (result.type === "error" || this.isCreationError(result.response)) {
+        const errorMessage = this.getCreationErrorMessage(result);
+        console.error("Error with give creation result:", result);
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: errorMessage || "There was an error creating the give.",
+          },
+          -1,
+        );
+      } else {
+        this.$notify(
+          {
+            group: "alert",
+            type: "success",
+            title: "Success",
+            text: `That ${this.isTrade ? "trade" : "gift"} was recorded.`,
+          },
+          5000,
+        );
+        localStorage.removeItem("imageUrl");
+        if (this.destinationPathAfter) {
+          (this.$router as Router).push({ path: this.destinationPathAfter });
+        } else {
+          (this.$router as Router).back();
+        }
+      }
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    } catch (error: any) {
+      console.error("Error with give recordation caught:", error);
+      const errorMessage =
+        error.userMessage ||
+        error.response?.data?.error?.message ||
+        "There was an error recording the give.";
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: errorMessage,
+        },
+        -1,
+      );
+    }
+  }
+
+  constructOfferParam() {
+    const recipientDid = this.offeredToRecipient
+      ? this.recipientDid
+      : undefined;
+    const projectId = this.offeredToProject ? this.projectId : undefined;
+    const giveClaim = hydrateOffer(
+      this.prevCredToEdit?.claim as OfferVerifiableCredential,
+      this.activeDid,
+      recipientDid,
+      this.description,
+      parseFloat(this.amountInput),
+      this.unitCode,
+      "",
+      projectId,
+      this.validThroughDate,
+      this.prevCredToEdit?.id as string,
+    );
+    const claimStr = JSON.stringify(giveClaim);
+    return claimStr;
+  }
+
+  // Helper functions for readability
+
+  /**
+   * @param result response "data" from the server
+   * @returns true if the result indicates an error
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  isCreationError(result: any) {
+    return result.status !== 201 || result.data?.error;
+  }
+
+  /**
+   * @param result direct response eg. ErrorResult or SuccessResult (potentially with embedded "data")
+   * @returns best guess at an error message
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  getCreationErrorMessage(result: any) {
+    return (
+      result.error?.userMessage ||
+      result.error?.error ||
+      result.response?.data?.error?.message
+    );
+  }
+
+  explainData() {
+    this.$notify(
+      {
+        group: "alert",
+        type: "success",
+        title: "Data Sharing",
+        text: libsUtil.PRIVACY_MESSAGE,
+      },
+      -1,
+    );
+  }
+}
+</script>
-- 
2.30.2


From a9b12f4d7c219180e212e65f6a9d2ed25064c5bd Mon Sep 17 00:00:00 2001
From: Trent Larson <trent@trentlarson.com>
Date: Sat, 17 Aug 2024 19:59:02 -0600
Subject: [PATCH 2/3] allow editing of an offer

---
 src/components/OfferDialog.vue                |  45 ++---
 src/libs/endorserServer.ts                    |  23 +--
 src/router/index.ts                           |   7 +-
 src/views/ClaimView.vue                       |  56 ++++--
 src/views/ContactsView.vue                    |   9 +-
 ...iftedDetails.vue => GiftedDetailsView.vue} |   6 +-
 src/views/NewEditProjectView.vue              |   2 -
 ...{OfferDetails.vue => OfferDetailsView.vue} | 168 +++++++++---------
 src/views/ProjectViewView.vue                 |   6 +-
 9 files changed, 190 insertions(+), 132 deletions(-)
 rename src/views/{GiftedDetails.vue => GiftedDetailsView.vue} (98%)
 rename src/views/{OfferDetails.vue => OfferDetailsView.vue} (81%)

diff --git a/src/components/OfferDialog.vue b/src/components/OfferDialog.vue
index af48780..f208571 100644
--- a/src/components/OfferDialog.vue
+++ b/src/components/OfferDialog.vue
@@ -36,18 +36,27 @@
           <fa icon="chevron-right" />
         </div>
       </div>
-      <div class="flex flex-row mt-2">
-        <span
-          class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center px-2 py-2"
-        >
-          Expiration
+      <div class="mt-4 flex justify-center">
+        <span>
+          <router-link
+            :to="{
+              name: 'offer-details',
+              query: {
+                amountInput,
+                description,
+                offererDid: activeDid,
+                projectId,
+                projectName,
+                recipientDid,
+                recipientName,
+                unitCode: amountUnitCode,
+              },
+            }"
+            class="text-blue-500"
+          >
+            Conditions, expiration...
+          </router-link>
         </span>
-        <input
-          type="text"
-          class="w-full border border-slate-400 px-2 py-2 rounded-r"
-          :placeholder="datePlaceholder()"
-          v-model="expirationDateInput"
-        />
       </div>
       <p class="text-center mt-6 mb-2 italic">
         Sign & Send to publish to the world
@@ -71,7 +80,6 @@
 </template>
 
 <script lang="ts">
-import { DateTime } from "luxon";
 import { Vue, Component, Prop } from "vue-facing-decorator";
 
 import { NotificationIface } from "@/constants/app";
@@ -84,7 +92,8 @@ import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 export default class OfferDialog extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
 
-  @Prop projectId? = "";
+  @Prop projectId?;
+  @Prop projectName?;
 
   activeDid = "";
   apiServer = "";
@@ -94,13 +103,15 @@ export default class OfferDialog extends Vue {
   description = "";
   expirationDateInput = "";
   recipientDid? = "";
+  recipientName? = "";
   visible = false;
 
   libsUtil = libsUtil;
 
-  async open(recipientDid?: string) {
+  async open(recipientDid?: string, recipientName?: string) {
     try {
       this.recipientDid = recipientDid;
+      this.recipientName = recipientName;
 
       await db.open();
       const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
@@ -146,12 +157,6 @@ export default class OfferDialog extends Vue {
     )}`;
   }
 
-  datePlaceholder() {
-    return (
-      "Date, eg. " + DateTime.now().plus({ month: 1 }).toISO().slice(0, 10)
-    );
-  }
-
   cancel() {
     this.close();
     this.eraseValues();
diff --git a/src/libs/endorserServer.ts b/src/libs/endorserServer.ts
index 619afa1..2df8540 100644
--- a/src/libs/endorserServer.ts
+++ b/src/libs/endorserServer.ts
@@ -62,6 +62,7 @@ export interface GenericCredWrapper<T extends GenericVerifiableCredential> {
   id: string;
   issuedAt: string;
   issuer: string;
+  publicUrls?: Record<string, string>; // only for IDs that want to be public
 }
 export const BLANK_GENERIC_SERVER_RECORD: GenericCredWrapper<GenericVerifiableCredential> =
   {
@@ -734,10 +735,10 @@ export function hydrateOffer(
   vcClaimOrig?: OfferVerifiableCredential,
   fromDid?: string,
   toDid?: string,
-  conditionDescription?: string,
+  itemDescription?: string,
   amount?: number,
   unitCode?: string,
-  offeringDescription?: string,
+  conditionDescription?: string,
   fulfillsProjectHandleId?: string,
   validThrough?: string,
   lastClaimId?: string,
@@ -766,9 +767,9 @@ export function hydrateOffer(
       ? { amountOfThisGood: amount, unitCode: unitCode || "HUR" }
       : undefined;
 
-  if (offeringDescription || fulfillsProjectHandleId) {
+  if (itemDescription || fulfillsProjectHandleId) {
     vcClaim.itemOffered = vcClaim.itemOffered || {};
-    vcClaim.itemOffered.description = offeringDescription || undefined;
+    vcClaim.itemOffered.description = itemDescription || undefined;
     if (fulfillsProjectHandleId) {
       vcClaim.itemOffered.isPartOf = {
         "@type": "PlanAction",
@@ -794,9 +795,10 @@ export async function createAndSubmitOffer(
   axios: Axios,
   apiServer: string,
   issuerDid: string,
-  description?: string,
+  itemDescription: string,
   amount?: number,
   unitCode?: string,
+  conditionDescription?: string,
   validThrough?: string,
   recipientDid?: string,
   fulfillsProjectHandleId?: string,
@@ -805,10 +807,10 @@ export async function createAndSubmitOffer(
     undefined,
     issuerDid,
     recipientDid,
-    description,
+    itemDescription,
     amount,
     unitCode,
-    description,
+    conditionDescription,
     fulfillsProjectHandleId,
     validThrough,
     undefined,
@@ -826,9 +828,10 @@ export async function editAndSubmitOffer(
   apiServer: string,
   fullClaim: GenericCredWrapper<OfferVerifiableCredential>,
   issuerDid: string,
-  description?: string,
+  itemDescription: string,
   amount?: number,
   unitCode?: string,
+  conditionDescription?: string,
   validThrough?: string,
   recipientDid?: string,
   fulfillsProjectHandleId?: string,
@@ -837,10 +840,10 @@ export async function editAndSubmitOffer(
     fullClaim.claim,
     issuerDid,
     recipientDid,
-    description,
+    itemDescription,
     amount,
     unitCode,
-    description,
+    conditionDescription,
     fulfillsProjectHandleId,
     validThrough,
     fullClaim.id,
diff --git a/src/router/index.ts b/src/router/index.ts
index 39901a6..3ca92ce 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -91,7 +91,7 @@ const routes: Array<RouteRecordRaw> = [
   {
     path: "/gifted-details",
     name: "gifted-details",
-    component: () => import("../views/GiftedDetails.vue"),
+    component: () => import("@/views/GiftedDetailsView.vue"),
   },
   {
     path: "/help",
@@ -143,6 +143,11 @@ const routes: Array<RouteRecordRaw> = [
     name: "new-identifier",
     component: () => import("../views/NewIdentifierView.vue"),
   },
+  {
+    path: "/offer-details/:id?",
+    name: "offer-details",
+    component: () => import("../views/OfferDetailsView.vue"),
+  },
   {
     path: "/project/:id?",
     name: "project",
diff --git a/src/views/ClaimView.vue b/src/views/ClaimView.vue
index 419d643..7ec60b5 100644
--- a/src/views/ClaimView.vue
+++ b/src/views/ClaimView.vue
@@ -24,8 +24,9 @@
             {{ capitalizeAndInsertSpacesBeforeCaps(veriClaim.claimType) }}
             <button
               v-if="
-                veriClaim.claimType === 'GiveAction' &&
-                veriClaim.issuer === activeDid
+                ['GiveAction', 'Offer'].includes(
+                  veriClaim.claimType as string,
+                ) && veriClaim.issuer === activeDid
               "
               @click="onClickEditClaim"
               title="Edit"
@@ -402,7 +403,7 @@
       <!-- Keep the dump contents directly between > and < to avoid weird spacing. -->
       <pre
         v-if="showVeriClaimDump"
-        class="text-sm overflow-x-scroll px-4 py-3 bg-slate-100 rounded-md"
+        class="text-sm overflow-x-scroll bg-slate-100 px-4 py-3 rounded-md"
         >{{ veriClaimDump }}</pre
       >
     </div>
@@ -425,7 +426,10 @@
       </button>
     </div>
     <div v-else>
-      <pre>{{ fullClaimDump }}</pre>
+      <pre
+        class="text-sm overflow-x-scroll bg-slate-100 px-4 py-3 rounded-md"
+        >{{ fullClaimDump }}</pre
+      >
     </div>
 
     <a
@@ -843,15 +847,41 @@ export default class ClaimView extends Vue {
   }
 
   onClickEditClaim() {
-    const route = {
-      name: "gifted-details",
-      query: {
-        prevCredToEdit: JSON.stringify(this.veriClaim),
-        destinationPathAfter:
-          "/claim/" + encodeURIComponent(this.veriClaim.handleId),
-      },
-    };
-    (this.$router as Router).push(route);
+    if (this.veriClaim.claimType === "GiveAction") {
+      const route = {
+        name: "gifted-details",
+        query: {
+          prevCredToEdit: JSON.stringify(this.veriClaim),
+          destinationPathAfter:
+            "/claim/" + encodeURIComponent(this.veriClaim.handleId),
+        },
+      };
+      (this.$router as Router).push(route);
+    } else if (this.veriClaim.claimType === "Offer") {
+      const route = {
+        name: "offer-details",
+        query: {
+          prevCredToEdit: JSON.stringify(this.veriClaim),
+          destinationPathAfter:
+            "/claim/" + encodeURIComponent(this.veriClaim.handleId),
+        },
+      };
+      (this.$router as Router).push(route);
+    } else {
+      console.error(
+        "Unrecognized claim type for edit:",
+        this.veriClaim.claimType,
+      );
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "This is an unrecognized claim type.",
+        },
+        3000,
+      );
+    }
   }
 }
 </script>
diff --git a/src/views/ContactsView.vue b/src/views/ContactsView.vue
index c19632c..6d282d9 100644
--- a/src/views/ContactsView.vue
+++ b/src/views/ContactsView.vue
@@ -271,7 +271,7 @@
 
               <button
                 class="text-sm bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-1.5 rounded-md border border-blue-400"
-                @click="openOfferDialog(contact.did)"
+                @click="openOfferDialog(contact.did, contact.name)"
               >
                 Offer
               </button>
@@ -1131,8 +1131,11 @@ export default class ContactsView extends Vue {
     );
   }
 
-  openOfferDialog(recipientDid: string) {
-    (this.$refs.customOfferDialog as OfferDialog).open(recipientDid);
+  openOfferDialog(recipientDid: string, recipientName: string) {
+    (this.$refs.customOfferDialog as OfferDialog).open(
+      recipientDid,
+      recipientName,
+    );
   }
 
   private async onClickCancelName() {
diff --git a/src/views/GiftedDetails.vue b/src/views/GiftedDetailsView.vue
similarity index 98%
rename from src/views/GiftedDetails.vue
rename to src/views/GiftedDetailsView.vue
index c727bdf..dfdb189 100644
--- a/src/views/GiftedDetails.vue
+++ b/src/views/GiftedDetailsView.vue
@@ -269,6 +269,7 @@ export default class GiftedDetails extends Vue {
     this.hideBackButton =
       (this.$route as Router).query["hideBackButton"] === "true";
     this.message = ((this.$route as Router).query["message"] as string) || "";
+
     // find any offer ID
     const fulfills = this.prevCredToEdit?.claim?.fulfills;
     const fulfillsArray = Array.isArray(fulfills)
@@ -351,6 +352,7 @@ export default class GiftedDetails extends Vue {
           );
         }
       }
+      // these should be functions but something's wrong with the syntax in the <> conditional
       this.givenToProject = !!this.projectId;
       this.givenToRecipient = !this.givenToProject && !!this.recipientDid;
 
@@ -549,7 +551,7 @@ export default class GiftedDetails extends Vue {
           group: "alert",
           type: "warning",
           title: "Error",
-          text: "To assign to a project, you must open this dialog through a project.",
+          text: "To assign to a project, you must open this page through a project.",
         },
         3000,
       );
@@ -574,7 +576,7 @@ export default class GiftedDetails extends Vue {
           group: "alert",
           type: "warning",
           title: "Error",
-          text: "To assign to a recipient, you must open this dialog from a contact.",
+          text: "To assign to a recipient, you must open this page from a contact.",
         },
         3000,
       );
diff --git a/src/views/NewEditProjectView.vue b/src/views/NewEditProjectView.vue
index 5c469f0..0e167e1 100644
--- a/src/views/NewEditProjectView.vue
+++ b/src/views/NewEditProjectView.vue
@@ -91,14 +91,12 @@
     <div class="flex mb-4 columns-3 w-full">
       <input
         v-model="startDateInput"
-        placeholder="Start Date"
         type="date"
         class="col-span-1 w-full rounded border border-slate-400 px-3 py-2"
       />
       <input
         :disabled="!startDateInput"
         v-model="startTimeInput"
-        placeholder="Start Time"
         type="time"
         class="col-span-1 w-full rounded border border-slate-400 ml-2 px-3 py-2"
       />
diff --git a/src/views/OfferDetails.vue b/src/views/OfferDetailsView.vue
similarity index 81%
rename from src/views/OfferDetails.vue
rename to src/views/OfferDetailsView.vue
index f6a1225..a733d5d 100644
--- a/src/views/OfferDetails.vue
+++ b/src/views/OfferDetailsView.vue
@@ -21,9 +21,8 @@
     <h1 class="text-4xl text-center font-light px-4 mb-4">What Was Offered</h1>
 
     <h1 class="text-xl font-bold text-center mb-4">
-      <span>From {{ giverName }}</span>
       <span>
-        to
+        Offer to
         {{
           offeredToProject
             ? projectName
@@ -36,7 +35,7 @@
     <textarea
       class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
       placeholder="What was offered"
-      v-model="description"
+      v-model="itemDescription"
     />
     <div class="flex flex-row justify-center">
       <span
@@ -64,6 +63,32 @@
       </div>
     </div>
 
+    <div class="flex flex-row mt-2">
+      <span
+        class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center px-2 py-2"
+      >
+        Conditions
+      </span>
+      <textarea
+        class="w-full border border-slate-400 px-3 py-2 rounded-r"
+        placeholder="Prerequisites, other people to include, etc."
+        v-model="conditionDescription"
+      />
+    </div>
+
+    <div class="flex flex-row mt-2">
+      <span
+        class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center px-2 py-2"
+      >
+        {{ validThroughDateInput ? "" : "No" }}&nbsp;Expiration
+      </span>
+      <input
+        v-model="validThroughDateInput"
+        type="date"
+        class="w-full rounded border border-slate-400 px-3 py-2 rounded-r"
+      />
+    </div>
+
     <div class="h-7 mt-4 flex">
       <input
         v-if="projectId && !offeredToRecipient"
@@ -131,6 +156,12 @@
       />
     </p>
     <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+      <button
+        class="block w-full text-center text-lg font-bold uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md"
+        @click="confirm"
+      >
+        Sign &amp; Send
+      </button>
       <button
         class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
         @click="cancel"
@@ -142,6 +173,7 @@
 </template>
 
 <script lang="ts">
+import { DateTime } from "luxon";
 import { Component, Vue } from "vue-facing-decorator";
 import { Router } from "vue-router";
 
@@ -168,21 +200,20 @@ import { Contact } from "@/db/tables/contacts";
     TopMessage,
   },
 })
-export default class OfferDetails extends Vue {
+export default class OfferDetailsView extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   activeDid = "";
   apiServer = "";
 
   amountInput = "0";
-  description = "";
+  conditionDescription = "";
+  itemDescription = "";
   destinationPathAfter = "";
   offeredToProject = false;
   offeredToRecipient = false;
-  giverDid: string | undefined;
-  giverName = "";
+  offererDid: string | undefined;
   hideBackButton = false;
-  isTrade = false;
   message = "";
   offerId = "";
   prevCredToEdit?: GenericCredWrapper<OfferVerifiableCredential>;
@@ -191,7 +222,7 @@ export default class OfferDetails extends Vue {
   recipientDid = "";
   recipientName = "";
   unitCode = "HUR";
-  validThroughDate = null;
+  validThroughDateInput = "";
 
   libsUtil = libsUtil;
 
@@ -214,67 +245,54 @@ export default class OfferDetails extends Vue {
       );
     }
 
-    const prevAmount = this.prevCredToEdit?.claim?.object?.amountOfThisGood;
+    const prevAmount =
+      this.prevCredToEdit?.claim?.includesObject?.amountOfThisGood;
     this.amountInput =
       (this.$route as Router).query["amountInput"] ||
       (prevAmount ? String(prevAmount) : "") ||
       this.amountInput;
-    this.description =
+    this.unitCode = ((this.$route as Router).query["unitCode"] ||
+      this.prevCredToEdit?.claim?.includesObject?.unitCode ||
+      this.unitCode) as string;
+
+    this.conditionDescription =
+      this.prevCredToEdit?.claim?.description || this.conditionDescription;
+    this.itemDescription =
       (this.$route as Router).query["description"] ||
-      this.prevCredToEdit?.claim?.description ||
-      this.description;
+      this.prevCredToEdit?.claim?.itemOffered?.description ||
+      this.itemDescription;
     this.destinationPathAfter = (this.$route as Router).query[
       "destinationPathAfter"
     ];
-    this.giverDid = ((this.$route as Router).query["giverDid"] ||
+    this.offererDid = ((this.$route as Router).query["offererDid"] ||
       this.prevCredToEdit?.claim?.agent?.identifier ||
-      this.giverDid) as string;
-    this.giverName =
-      ((this.$route as Router).query["giverName"] as string) || "";
+      this.offererDid) as string;
     this.hideBackButton =
       (this.$route as Router).query["hideBackButton"] === "true";
     this.message = ((this.$route as Router).query["message"] as string) || "";
-    // find any offer ID
-    const fulfills = this.prevCredToEdit?.claim?.fulfills;
-    const fulfillsArray = Array.isArray(fulfills)
-      ? fulfills
-      : fulfills
-        ? [fulfills]
-        : [];
-    const offer = fulfillsArray.find((rec) => rec["@type"] === "Offer");
-    this.offerId = ((this.$route as Router).query["offerId"] ||
-      offer?.identifier ||
-      this.offerId) as string;
 
     // find any project ID
-    const project = fulfillsArray.find((rec) => rec["@type"] === "PlanAction");
+    let project;
+    if (
+      this.prevCredToEdit?.claim?.itemOffered?.isPartOf["@type"] ===
+      "PlanAction"
+    ) {
+      project = this.prevCredToEdit?.claim?.itemOffered?.isPartOf;
+    }
     this.projectId = ((this.$route as Router).query["projectId"] ||
       project?.identifier ||
       this.projectId) as string;
+    this.projectName = ((this.$route as Router).query["projectName"] ||
+      project?.name ||
+      this.projectName) as string;
 
     this.recipientDid = ((this.$route as Router).query["recipientDid"] ||
       this.prevCredToEdit?.claim?.recipient?.identifier) as string;
     this.recipientName =
       ((this.$route as Router).query["recipientName"] as string) || "";
-    this.unitCode = ((this.$route as Router).query["unitCode"] ||
-      this.prevCredToEdit?.claim?.object?.unitCode ||
-      this.unitCode) as string;
 
-    // this is an endpoint for sharing project info to highlight something given
-    // https://developer.mozilla.org/en-US/docs/Web/Manifest/share_target
-    if ((this.$route as Router).query["shareTitle"]) {
-      this.description =
-        ((this.$route as Router).query["shareTitle"] as string) +
-        (this.description ? "\n" + this.description : "");
-    }
-    if ((this.$route as Router).query["shareText"]) {
-      this.description =
-        (this.description ? this.description + "\n" : "") +
-        ((this.$route as Router).query["shareText"] as string);
-    }
-    if ((this.$route as Router).query["shareUrl"]) {
-      this.imageUrl = (this.$route as Router).query["shareUrl"] as string;
-    }
+    this.validThroughDateInput =
+      this.prevCredToEdit?.claim?.validThrough || this.validThroughDateInput;
 
     try {
       await db.open();
@@ -284,32 +302,20 @@ export default class OfferDetails extends Vue {
 
       let allContacts: Contact[] = [];
       let allMyDids: string[] = [];
-      if (
-        (this.giverDid && !this.giverName) ||
-        (this.recipientDid && !this.recipientName)
-      ) {
+      if (this.recipientDid && !this.recipientName) {
         allContacts = await db.contacts.toArray();
 
         await accountsDB.open();
         const allAccounts = await accountsDB.accounts.toArray();
         allMyDids = allAccounts.map((acc) => acc.did);
-        if (this.giverDid && !this.giverName) {
-          this.giverName = didInfo(
-            this.giverDid,
-            this.activeDid,
-            allMyDids,
-            allContacts,
-          );
-        }
-        if (this.recipientDid && !this.recipientName) {
-          this.recipientName = didInfo(
-            this.recipientDid,
-            this.activeDid,
-            allMyDids,
-            allContacts,
-          );
-        }
+        this.recipientName = didInfo(
+          this.recipientDid,
+          this.activeDid,
+          allMyDids,
+          allContacts,
+        );
       }
+      // these should be functions but something's wrong with the syntax in the <> conditional
       this.offeredToProject = !!this.projectId;
       this.offeredToRecipient = !this.offeredToProject && !!this.recipientDid;
 
@@ -327,7 +333,7 @@ export default class OfferDetails extends Vue {
       );
     }
 
-    if (this.projectId) {
+    if (this.projectId && !this.projectName) {
       // console.log("Getting project name from cache", this.projectId);
       const project = await getPlanFromCache(
         this.projectId,
@@ -395,7 +401,7 @@ export default class OfferDetails extends Vue {
       );
       return;
     }
-    if (!this.description && !parseFloat(this.amountInput)) {
+    if (!this.itemDescription && !parseFloat(this.amountInput)) {
       this.$notify(
         {
           group: "alert",
@@ -431,7 +437,7 @@ export default class OfferDetails extends Vue {
           group: "alert",
           type: "warning",
           title: "Error",
-          text: "To assign to a project, you must open this dialog through a project.",
+          text: "To assign to a project, you must open this page through a project.",
         },
         3000,
       );
@@ -456,7 +462,7 @@ export default class OfferDetails extends Vue {
           group: "alert",
           type: "warning",
           title: "Error",
-          text: "To assign to a recipient, you must open this dialog from a contact.",
+          text: "To assign to a recipient, you must open this page from a contact.",
         },
         3000,
       );
@@ -476,7 +482,7 @@ export default class OfferDetails extends Vue {
 
   /**
    *
-   * @param giverDid may be null
+   * @param offererDid may be null
    * @param description may be an empty string
    * @param amountInput may be 0
    * @param unitCode may be omitted, defaults to "HUR"
@@ -495,10 +501,11 @@ export default class OfferDetails extends Vue {
           this.apiServer,
           this.prevCredToEdit,
           this.activeDid,
-          this.description,
+          this.itemDescription,
           parseFloat(this.amountInput),
           this.unitCode,
-          this.validThroughDate,
+          this.conditionDescription,
+          this.validThroughDateInput,
           recipientDid,
           projectId,
         );
@@ -507,10 +514,11 @@ export default class OfferDetails extends Vue {
           this.axios,
           this.apiServer,
           this.activeDid,
-          this.description,
+          this.itemDescription,
           parseFloat(this.amountInput),
           this.unitCode,
-          this.validThroughDate,
+          this.conditionDescription,
+          this.validThroughDateInput,
           recipientDid,
           projectId,
         );
@@ -534,7 +542,7 @@ export default class OfferDetails extends Vue {
             group: "alert",
             type: "success",
             title: "Success",
-            text: `That ${this.isTrade ? "trade" : "gift"} was recorded.`,
+            text: `That offer was recorded.`,
           },
           5000,
         );
@@ -573,12 +581,12 @@ export default class OfferDetails extends Vue {
       this.prevCredToEdit?.claim as OfferVerifiableCredential,
       this.activeDid,
       recipientDid,
-      this.description,
+      this.itemDescription,
       parseFloat(this.amountInput),
       this.unitCode,
-      "",
+      this.conditionDescription,
       projectId,
-      this.validThroughDate,
+      this.validThroughDateInput,
       this.prevCredToEdit?.id as string,
     );
     const claimStr = JSON.stringify(giveClaim);
diff --git a/src/views/ProjectViewView.vue b/src/views/ProjectViewView.vue
index 0f4d185..72be8d2 100644
--- a/src/views/ProjectViewView.vue
+++ b/src/views/ProjectViewView.vue
@@ -170,7 +170,11 @@
         </button>
       </div>
     </div>
-    <OfferDialog ref="customOfferDialog" :projectId="this.projectId" />
+    <OfferDialog
+      ref="customOfferDialog"
+      :projectId="this.projectId"
+      :projectName="this.name"
+    />
 
     <div v-if="activeDid && isRegistered">
       <div class="text-center">
-- 
2.30.2


From 1a4052d1a0dd56c1a99a16cc96ee6006dd5b63e3 Mon Sep 17 00:00:00 2001
From: Trent Larson <trent@trentlarson.com>
Date: Sun, 18 Aug 2024 13:48:07 -0600
Subject: [PATCH 3/3] fix tests, add test for offer update

---
 src/components/GiftedDialog.vue         |  2 +-
 src/components/OfferDialog.vue          |  2 +-
 src/views/ClaimView.vue                 |  9 +++---
 src/views/NewEditProjectView.vue        |  2 ++
 src/views/OfferDetailsView.vue          |  3 +-
 test-playwright/50-record-offer.spec.ts | 39 +++++++++++++++++++++----
 6 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/src/components/GiftedDialog.vue b/src/components/GiftedDialog.vue
index 7b9b520..b23400d 100644
--- a/src/components/GiftedDialog.vue
+++ b/src/components/GiftedDialog.vue
@@ -55,7 +55,7 @@
             }"
             class="text-blue-500"
           >
-            Photo & Details ...
+            Photo & more options ...
           </router-link>
         </span>
       </div>
diff --git a/src/components/OfferDialog.vue b/src/components/OfferDialog.vue
index f208571..0d7fab7 100644
--- a/src/components/OfferDialog.vue
+++ b/src/components/OfferDialog.vue
@@ -54,7 +54,7 @@
             }"
             class="text-blue-500"
           >
-            Conditions, expiration...
+            Conditions & more options...
           </router-link>
         </span>
       </div>
diff --git a/src/views/ClaimView.vue b/src/views/ClaimView.vue
index 7ec60b5..8d28050 100644
--- a/src/views/ClaimView.vue
+++ b/src/views/ClaimView.vue
@@ -30,8 +30,9 @@
               "
               @click="onClickEditClaim"
               title="Edit"
+              data-testId="editClaimButton"
             >
-              <fa icon="pen" class="text-sm text-blue-500 ml-2 mb-1"></fa>
+              <fa icon="pen" class="text-sm text-blue-500 ml-2 mb-1" />
             </button>
           </h2>
           <div class="text-sm">
@@ -50,11 +51,11 @@
               </button>
               <span v-show="showIdCopy">Copied ID</span>
             </div>
-            <div>
+            <div data-testId="description">
               <fa icon="message" class="fa-fw text-slate-400" />
               {{
-                veriClaim.claim?.description ||
-                veriClaim.claim?.itemOffered?.description
+                veriClaim.claim?.itemOffered?.description ||
+                veriClaim.claim?.description
               }}
             </div>
             <div>
diff --git a/src/views/NewEditProjectView.vue b/src/views/NewEditProjectView.vue
index 0e167e1..c486135 100644
--- a/src/views/NewEditProjectView.vue
+++ b/src/views/NewEditProjectView.vue
@@ -91,11 +91,13 @@
     <div class="flex mb-4 columns-3 w-full">
       <input
         v-model="startDateInput"
+        placeholder="Start Date"
         type="date"
         class="col-span-1 w-full rounded border border-slate-400 px-3 py-2"
       />
       <input
         :disabled="!startDateInput"
+        placeholder="Start Time"
         v-model="startTimeInput"
         type="time"
         class="col-span-1 w-full rounded border border-slate-400 ml-2 px-3 py-2"
diff --git a/src/views/OfferDetailsView.vue b/src/views/OfferDetailsView.vue
index a733d5d..fc26305 100644
--- a/src/views/OfferDetailsView.vue
+++ b/src/views/OfferDetailsView.vue
@@ -36,6 +36,7 @@
       class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
       placeholder="What was offered"
       v-model="itemDescription"
+      data-testId="itemDescription"
     />
     <div class="flex flex-row justify-center">
       <span
@@ -54,6 +55,7 @@
         type="number"
         class="border border-r-0 border-slate-400 px-2 py-2 text-center w-20"
         v-model="amountInput"
+        data-testId="inputOfferAmount"
       />
       <div
         class="rounded-r border border-slate-400 bg-slate-200 px-4 py-2"
@@ -173,7 +175,6 @@
 </template>
 
 <script lang="ts">
-import { DateTime } from "luxon";
 import { Component, Vue } from "vue-facing-decorator";
 import { Router } from "vue-router";
 
diff --git a/test-playwright/50-record-offer.spec.ts b/test-playwright/50-record-offer.spec.ts
index c3d5aac..671af2d 100644
--- a/test-playwright/50-record-offer.spec.ts
+++ b/test-playwright/50-record-offer.spec.ts
@@ -6,7 +6,7 @@ test('Record an offer', async ({ page }) => {
   const randomString = Math.random().toString(36).substring(2, 8);
   // Standard title prefix
   const finalTitle = `Offering of ${randomString}`;
-  const randomNonZeroNumber = Math.floor(Math.random() * 999) + 1;
+  const randomNonZeroNumber = Math.floor(Math.random() * 998) + 1;
 
   // Create new ID for default user
   await importUser(page);
@@ -22,12 +22,41 @@ test('Record an offer', async ({ page }) => {
   await page.getByRole('button', { name: 'Sign & Send' }).click();
   await expect(page.getByText('That offer was recorded.')).toBeVisible();
 
-  // Refresh home view and check gift
+  // go to the offer and check the values
   await page.goto('./projects');
   await page.locator('li').filter({ hasText: finalTitle }).locator('a').first().click();
   await expect(page.getByRole('heading', { name: 'Verifiable Claim Details' })).toBeVisible();
   await expect(page.getByText(finalTitle, { exact: true })).toBeVisible();
-  const page1Promise = page.waitForEvent('popup');
+  const serverPagePromise = page.waitForEvent('popup');
   await page.getByRole('link', { name: 'View on the Public Server' }).click();
-  const page1 = await page1Promise;
-});
\ No newline at end of file
+  const serverPage = await serverPagePromise;
+  await serverPage.getByText(finalTitle);
+  await serverPage.getByText('did:none:HIDDEN');
+
+  // Now update that offer
+
+  // find the edit page and check the old values again
+  await page.goto('./projects');
+  await page.locator('li').filter({ hasText: finalTitle }).locator('a').first().click();
+  await page.getByTestId('editClaimButton').click();
+  await page.locator('heading', { hasText: 'What was offered' }).isVisible();
+  const itemDesc = await page.getByTestId('itemDescription');
+  await expect(itemDesc).toHaveValue(finalTitle);
+  const amount = await page.getByTestId('inputOfferAmount');
+  await expect(amount).toHaveValue(randomNonZeroNumber.toString());
+  // update the values
+  await itemDesc.fill('Updated ' + finalTitle);
+  await amount.fill(String(randomNonZeroNumber + 1));
+  await page.getByRole('button', { name: 'Sign & Send' }).click();
+
+  // go to the offer claim again and check the updated values
+  await page.goto('./projects');
+  await page.locator('li').filter({ hasText: finalTitle }).locator('a').first().click();
+  const newItemDesc = await page.getByTestId('description');
+  await expect(newItemDesc).toHaveText(finalTitle);
+
+  // go to edit page
+  await page.getByTestId('editClaimButton').click();
+  const newAmount = await page.getByTestId('inputOfferAmount');
+  await expect(newAmount).toHaveValue(randomNonZeroNumber.toString());
+});
-- 
2.30.2