Merge branch 'build-improvement' of ssh://173.199.124.46:222/trent_larson/crowd-funder-for-time-pwa into build-improvement

src/components/EntitySelectionStep.vue

@@ -136,6 +136,20 @@ export default class EntitySelectionStep extends Vue {
   @Prop()
   receiver?: EntityData | null;
 
+  /** Form field values to preserve when navigating to "Show All" */
+  @Prop({ default: "" })
+  description!: string;
+
+  @Prop({ default: "0" })
+  amountInput!: string;
+
+  @Prop({ default: "HUR" })
+  unitCode!: string;
+
+  /** Offer ID for context when fulfilling an offer */
+  @Prop({ default: "" })
+  offerId!: string;
+
   /** Notification function from parent component */
   @Prop()
   notify?: (notification: NotificationIface, timeout?: number) => void;
@@ -228,6 +242,11 @@ export default class EntitySelectionStep extends Vue {
       stepType: this.stepType,
       giverEntityType: this.giverEntityType,
       recipientEntityType: this.recipientEntityType,
+      // Form field values to preserve
+      description: this.description,
+      amountInput: this.amountInput,
+      unitCode: this.unitCode,
+      offerId: this.offerId,
       ...(this.stepType === "giver"
         ? {
             recipientProjectId: this.toProjectId || "",

src/components/GiftedDialog.vue

@@ -18,6 +18,10 @@
         :to-project-id="toProjectId"
         :giver="giver"
         :receiver="receiver"
+        :description="description"
+        :amount-input="amountInput"
+        :unit-code="unitCode"
+        :offer-id="offerId"
         :notify="$notify"
         @entity-selected="handleEntitySelected"
         @cancel="cancel"
@@ -230,6 +234,7 @@ export default class GiftedDialog extends Vue {
     this.giver = giver;
     this.receiver = receiver;
     this.offerId = offerId || "";
+    console.log("offerId", this.offerId);
     this.prompt = prompt || "";
     this.description = description || "";
     this.amountInput = amountInput || "0";

src/views/ClaimView.vue

@@ -199,7 +199,14 @@
         />
       </button>
     </div>
-    <GiftedDialog ref="customGiveDialog" />
+    <GiftedDialog
+      ref="customGiveDialog"
+      :to-project-id="
+        detailsForGive?.fulfillsPlanHandleId ||
+        detailsForOffer?.fulfillsPlanHandleId ||
+        ''
+      "
+    />
 
     <div v-if="libsUtil.isGiveAction(veriClaim)">
       <div class="flex columns-3">
@@ -549,6 +556,12 @@ export default class ClaimView extends Vue {
     fulfillsHandleId?: string;
   } | null = null;
   detailsForOffer: { fulfillsPlanHandleId?: string } | null = null;
+  // Project information for fulfillsPlanHandleId
+  projectInfo: {
+    name: string;
+    imageUrl?: string;
+    issuer: string;
+  } | null = null;
   fullClaim = null;
   fullClaimDump = "";
   fullClaimMessage = "";
@@ -674,6 +687,7 @@ export default class ClaimView extends Vue {
     this.confsVisibleToIdList = [];
     this.detailsForGive = null;
     this.detailsForOffer = null;
+    this.projectInfo = null;
     this.fullClaim = null;
     this.fullClaimDump = "";
     this.fullClaimMessage = "";
@@ -851,6 +865,14 @@ export default class ClaimView extends Vue {
         }
       }
 
+      // Load project information if there's a fulfillsPlanHandleId
+      const planHandleId =
+        this.detailsForGive?.fulfillsPlanHandleId ||
+        this.detailsForOffer?.fulfillsPlanHandleId;
+      if (planHandleId) {
+        await this.loadProjectInfo(planHandleId, userDid);
+      }
+
       // retrieve the list of confirmers
       const confirmerInfo = await libsUtil.retrieveConfirmerIdList(
         this.apiServer,
@@ -878,6 +900,33 @@ export default class ClaimView extends Vue {
     }
   }
 
+  async loadProjectInfo(planHandleId: string, userDid: string) {
+    const url =
+      this.apiServer +
+      "/api/claim/byHandle/" +
+      encodeURIComponent(planHandleId);
+    const headers = await serverUtil.getHeaders(userDid);
+
+    try {
+      const resp = await this.axios.get(url, { headers });
+      if (resp.status === 200) {
+        this.projectInfo = {
+          name: resp.data.claim?.name || "(no name)",
+          imageUrl: resp.data.claim?.image,
+          issuer: resp.data.issuer,
+        };
+      } else {
+        await this.$logError(
+          "Error getting project info: " + JSON.stringify(resp),
+        );
+      }
+    } catch (error: unknown) {
+      await this.$logError(
+        "Error retrieving project info: " + JSON.stringify(error),
+      );
+    }
+  }
+
   async showFullClaim(claimId: string) {
     const url =
       this.apiServer + "/api/claim/full/" + encodeURIComponent(claimId);
@@ -997,10 +1046,37 @@ export default class ClaimView extends Vue {
         this.veriClaim as GenericCredWrapper<OfferClaim>,
       ),
     };
+
+    // Use project info as recipient if available, otherwise use undefined
+    const recipient = this.projectInfo
+      ? {
+          did:
+            this.detailsForGive?.fulfillsPlanHandleId ||
+            this.detailsForOffer?.fulfillsPlanHandleId,
+          name: this.projectInfo.name,
+          handleId:
+            this.detailsForGive?.fulfillsPlanHandleId ||
+            this.detailsForOffer?.fulfillsPlanHandleId,
+          image: this.projectInfo.imageUrl,
+        }
+      : undefined;
+
+    // Extract offer information from the claim
+    const offerClaim = this.veriClaim.claim as OfferClaim;
+    const description =
+      offerClaim.itemOffered?.description || offerClaim.description;
+    const amount =
+      offerClaim.includesObject?.amountOfThisGood?.toString() || "0";
+    const unitCode = offerClaim.includesObject?.unitCode || "HUR";
+
     (this.$refs.customGiveDialog as GiftedDialog).open(
       giver,
-      undefined,
+      recipient,
       this.veriClaim.handleId,
+      undefined, // prompt
+      description,
+      amount,
+      unitCode,
     );
   }
 

src/views/ContactGiftingView.vue

@@ -102,9 +102,11 @@ export default class ContactGiftingView extends Vue {
   activeDid = "";
   allContacts: Array<Contact> = [];
   apiServer = "";
-  description = "";
   projectId = "";
   prompt = "";
+  description = "";
+  amountInput = "0";
+  unitCode = "HUR";
   recipientProjectName = "";
   recipientProjectImage = "";
   recipientProjectHandleId = "";
@@ -123,6 +125,7 @@ export default class ContactGiftingView extends Vue {
   toProjectId = "";
   showProjects = false;
   isFromProjectView = false;
+  offerId = "";
 
   async created() {
     this.notify = createNotifyHelpers(this.$notify);
@@ -143,6 +146,9 @@ export default class ContactGiftingView extends Vue {
       this.recipientProjectHandleId =
         (this.$route.query["recipientProjectHandleId"] as string) || "";
       this.prompt = (this.$route.query["prompt"] as string) ?? this.prompt;
+      this.description = (this.$route.query["description"] as string) || "";
+      this.amountInput = (this.$route.query["amountInput"] as string) || "0";
+      this.unitCode = (this.$route.query["unitCode"] as string) || "HUR";
 
       // Read new context parameters
       this.stepType = (this.$route.query["stepType"] as string) || "giver";
@@ -168,6 +174,7 @@ export default class ContactGiftingView extends Vue {
         (this.$route.query["showProjects"] as string) === "true";
       this.isFromProjectView =
         (this.$route.query["isFromProjectView"] as string) === "true";
+      this.offerId = (this.$route.query["offerId"] as string) || "";
 
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
@@ -182,7 +189,7 @@ export default class ContactGiftingView extends Vue {
 
   openDialog(contact?: GiverReceiverInputInfo | "Unnamed") {
     if (contact === "Unnamed") {
-      // Special case: Pass undefined to trigger Step 1, but with "Unnamed" pre-selected
+      // Special case: Handle "Unnamed" contacts for both givers and recipients
       let recipient: GiverReceiverInputInfo;
       let giver: GiverReceiverInputInfo | undefined;
 
@@ -224,11 +231,19 @@ export default class ContactGiftingView extends Vue {
       (this.$refs.giftedDialog as GiftedDialog).open(
         giver,
         recipient,
-        undefined,
+        this.offerId,
         this.prompt,
+        this.description,
+        this.amountInput,
+        this.unitCode,
       );
-      // Immediately select "Unnamed" and move to Step 2
-      (this.$refs.giftedDialog as GiftedDialog).selectGiver();
+
+      // Immediately select "Unnamed" and move to Step 2 based on stepType
+      if (this.stepType === "giver") {
+        (this.$refs.giftedDialog as GiftedDialog).selectGiver();
+      } else {
+        (this.$refs.giftedDialog as GiftedDialog).selectRecipient();
+      }
     } else {
       // Regular case: contact is a GiverReceiverInputInfo
       let giver: GiverReceiverInputInfo;
@@ -274,8 +289,11 @@ export default class ContactGiftingView extends Vue {
       (this.$refs.giftedDialog as GiftedDialog).open(
         giver,
         recipient,
-        undefined,
+        this.offerId,
         this.prompt,
+        this.description,
+        this.amountInput,
+        this.unitCode,
       );
     }
   }