Merge pull request 'Fix offer fulfillment detection + consistencies between ClaimView and ConfirmGiftView' (#167) from claimview-fullfills-offer into master

Reviewed-on: trent_larson/crowd-funder-for-time-pwa#167

src/libs/endorserServer.ts

@@ -1313,6 +1313,28 @@ export const capitalizeAndInsertSpacesBeforeCaps = (text: string) => {
     : text[0].toUpperCase() + text.substr(1).replace(/([A-Z])/g, " $1");
 };
 
+/**
+ * Formats type string for display by adding spaces before capitals
+ * and optionally adds an appropriate article prefix (a/an)
+ *
+ * @param text - Text to format
+ * @returns Formatted string with article prefix
+ */
+export const capitalizeAndInsertSpacesBeforeCapsWithAPrefix = (
+  text: string,
+): string => {
+  const word = capitalizeAndInsertSpacesBeforeCaps(text);
+  if (word) {
+    // if the word starts with a vowel, use "an" instead of "a"
+    const firstLetter = word[0].toLowerCase();
+    const vowels = ["a", "e", "i", "o", "u"];
+    const particle = vowels.includes(firstLetter) ? "an" : "a";
+    return particle + " " + word;
+  } else {
+    return "";
+  }
+};
+
 /**
  return readable summary of claim, or something generic
 

src/libs/util.ts

@@ -160,6 +160,41 @@ export const isGiveAction = (
   return isGiveClaimType(veriClaim.claimType);
 };
 
+export interface OfferFulfillment {
+  offerHandleId: string;
+  offerType: string;
+}
+
+/**
+ * Extract offer fulfillment information from the fulfills field
+ * Handles both array and single object cases
+ */
+export const extractOfferFulfillment = (fulfills: any): OfferFulfillment | null => {
+  if (!fulfills) {
+    return null;
+  }
+  
+  // Handle both array and single object cases
+  let offerFulfill = null;
+  
+  if (Array.isArray(fulfills)) {
+    // Find the Offer in the fulfills array
+    offerFulfill = fulfills.find((item) => item["@type"] === "Offer");
+  } else if (fulfills["@type"] === "Offer") {
+    // fulfills is a single Offer object
+    offerFulfill = fulfills;
+  }
+  
+  if (offerFulfill) {
+    return {
+      offerHandleId: offerFulfill.identifier,
+      offerType: offerFulfill["@type"],
+    };
+  }
+  
+  return null;
+};
+
 export const shortDid = (did: string) => {
   if (did.startsWith("did:peer:")) {
     return (

src/views/ClaimView.vue

@@ -24,7 +24,9 @@
           <div class="flex columns-3">
             <h2 class="text-md font-bold w-full">
               {{
-                capitalizeAndInsertSpacesBeforeCaps(veriClaim.claimType || "")
+                serverUtil.capitalizeAndInsertSpacesBeforeCaps(
+                  veriClaim.claimType || "",
+                )
               }}
               <button
                 v-if="canEditClaim"
@@ -106,77 +108,91 @@
             </div>
 
             <!-- Fullfills Links -->
-
+            <div class="mt-4 empty:hidden">
-            <!-- fullfills links for a give -->
+              <!-- fullfills links for a give -->
-            <div v-if="detailsForGive?.fulfillsPlanHandleId" class="mt-4">
+              <div v-if="detailsForGive?.fulfillsPlanHandleId">
-              <router-link
+                <router-link
-                :to="
+                  :to="
-                  '/project/' +
+                    '/project/' +
-                  encodeURIComponent(detailsForGive?.fulfillsPlanHandleId)
+                    encodeURIComponent(detailsForGive?.fulfillsPlanHandleId)
-                "
+                  "
-                class="text-blue-500 mt-2"
+                  class="text-blue-500 mt-2"
-              >
-                Fulfills a bigger plan...
-              </router-link>
-            </div>
-            <!-- if there's another, it's probably fulfilling an offer, too -->
-            <div
-              v-if="
-                detailsForGive?.fulfillsType &&
-                detailsForGive?.fulfillsType !== 'PlanAction' &&
-                detailsForGive?.fulfillsHandleId
-              "
-            >
-              <!-- router-link to /claim/ only changes URL path -->
-              <a
-                class="text-blue-500 mt-4 cursor-pointer"
-                @click="
-                  showDifferentClaimPage(detailsForGive?.fulfillsHandleId)
-                "
-              >
-                Fulfills
-                {{
-                  capitalizeAndInsertSpacesBeforeCaps(
-                    detailsForGive.fulfillsType,
-                  )
-                }}...
-              </a>
-            </div>
-
-            <!-- fullfills links for an offer -->
-            <div v-if="detailsForOffer?.fulfillsPlanHandleId">
-              <router-link
-                :to="
-                  '/project/' +
-                  encodeURIComponent(detailsForOffer?.fulfillsPlanHandleId)
-                "
-                class="text-blue-500 mt-4"
-              >
-                Offered to a bigger plan...
-              </router-link>
-            </div>
-
-            <!-- Providers -->
-            <div v-if="providersForGive?.length > 0" class="mt-4">
-              <span>Other assistance provided by:</span>
-              <ul class="ml-4">
-                <li
-                  v-for="provider of providersForGive"
-                  :key="provider.identifier"
-                  class="list-disc ml-4"
                 >
-                  <div class="flex gap-4">
+                  This fulfills a bigger plan
-                    <div class="grow overflow-hidden">
+                  <font-awesome
-                      <a
+                    icon="arrow-up-right-from-square"
-                        class="text-blue-500 mt-4 cursor-pointer"
+                    class="fa-fw"
-                        @click="handleProviderClick(provider)"
+                  />
-                      >
+                </router-link>
-                        an activity...
+              </div>
-                      </a>
+
+              <!-- Show offer fulfillment if this give fulfills an offer -->
+              <div v-if="detailsForGiveOfferFulfillment?.offerHandleId">
+                <!-- router-link to /claim/ only changes URL path -->
+                <a
+                  class="text-blue-500 mt-4 cursor-pointer"
+                  @click="
+                    showDifferentClaimPage(
+                      detailsForGiveOfferFulfillment.offerHandleId,
+                    )
+                  "
+                >
+                  This fulfills
+                  {{
+                    serverUtil.capitalizeAndInsertSpacesBeforeCapsWithAPrefix(
+                      detailsForGiveOfferFulfillment.offerType || "Offer",
+                    )
+                  }}
+                  <font-awesome
+                    icon="arrow-up-right-from-square"
+                    class="fa-fw"
+                  />
+                </a>
+              </div>
+
+              <!-- fullfills links for an offer -->
+              <div v-if="detailsForOffer?.fulfillsPlanHandleId">
+                <router-link
+                  :to="
+                    '/project/' +
+                    encodeURIComponent(detailsForOffer?.fulfillsPlanHandleId)
+                  "
+                  class="text-blue-500 mt-4"
+                >
+                  Offered to a bigger plan
+                  <font-awesome
+                    icon="arrow-up-right-from-square"
+                    class="fa-fw"
+                  />
+                </router-link>
+              </div>
+
+              <!-- Providers -->
+              <div v-if="providersForGive?.length > 0">
+                <span>Other assistance provided by:</span>
+                <ul class="ml-4">
+                  <li
+                    v-for="provider of providersForGive"
+                    :key="provider.identifier"
+                    class="list-disc ml-4"
+                  >
+                    <div class="flex gap-4">
+                      <div class="grow overflow-hidden">
+                        <a
+                          class="text-blue-500 mt-4 cursor-pointer"
+                          @click="handleProviderClick(provider)"
+                        >
+                          an activity
+                          <font-awesome
+                            icon="arrow-up-right-from-square"
+                            class="fa-fw"
+                          />
+                        </a>
+                      </div>
                     </div>
-                  </div>
+                  </li>
-                </li>
+                </ul>
-              </ul>
+              </div>
             </div>
           </div>
         </div>
@@ -556,6 +572,17 @@ export default class ClaimView extends Vue {
     fulfillsPlanHandleId?: string;
     fulfillsType?: string;
     fulfillsHandleId?: string;
+    fullClaim?: {
+      fulfills?: Array<{
+        "@type": string;
+        identifier?: string;
+      }>;
+    };
+  } | null = null;
+  // Additional offer information extracted from the fulfills array
+  detailsForGiveOfferFulfillment: {
+    offerHandleId?: string;
+    offerType?: string;
   } | null = null;
   detailsForOffer: { fulfillsPlanHandleId?: string } | null = null;
   // Project information for fulfillsPlanHandleId
@@ -689,6 +716,7 @@ export default class ClaimView extends Vue {
     this.confsVisibleToIdList = [];
     this.detailsForGive = null;
     this.detailsForOffer = null;
+    this.detailsForGiveOfferFulfillment = null;
     this.projectInfo = null;
     this.fullClaim = null;
     this.fullClaimDump = "";
@@ -701,6 +729,15 @@ export default class ClaimView extends Vue {
     this.veriClaimDidsVisible = {};
   }
 
+  /**
+   * Extract offer fulfillment information from the fulfills array
+   */
+  extractOfferFulfillment() {
+    this.detailsForGiveOfferFulfillment = libsUtil.extractOfferFulfillment(
+      this.detailsForGive?.fullClaim?.fulfills
+    );
+  }
+
   // =================================================
   // UTILITY METHODS
   // =================================================
@@ -758,13 +795,6 @@ export default class ClaimView extends Vue {
     this.canShare = !!navigator.share;
   }
 
-  // insert a space before any capital letters except the initial letter
-  // (and capitalize initial letter, just in case)
-  capitalizeAndInsertSpacesBeforeCaps(text: string): string {
-    if (!text) return "";
-    return text[0].toUpperCase() + text.substr(1).replace(/([A-Z])/g, " $1");
-  }
-
   totalConfirmers() {
     return (
       this.numConfsNotVisible +
@@ -821,6 +851,8 @@ export default class ClaimView extends Vue {
         });
         if (giveResp.status === 200 && giveResp.data.data?.length > 0) {
           this.detailsForGive = giveResp.data.data[0];
+          // Extract offer information from the fulfills array
+          this.extractOfferFulfillment();
         } else {
           await this.$logError(
             "Error getting detailed give info: " + JSON.stringify(giveResp),

src/views/ConfirmGiftView.vue

@@ -96,50 +96,50 @@
               </div>
 
               <!-- Fullfills Links -->
+              <div class="mt-4">
+                <!-- fullfills links for a give -->
+                <div v-if="giveDetails?.fulfillsPlanHandleId">
+                  <router-link
+                    :to="
+                      '/project/' +
+                      encodeURIComponent(
+                        giveDetails?.fulfillsPlanHandleId || '',
+                      )
+                    "
+                    class="text-blue-500 mt-2 cursor-pointer"
+                  >
+                    This fulfills a bigger plan
+                    <font-awesome
+                      icon="arrow-up-right-from-square"
+                      class="fa-fw"
+                    />
+                  </router-link>
+                </div>
 
-              <!-- fullfills links for a give -->
+                <!-- Show offer fulfillment if this give fulfills an offer -->
-              <div v-if="giveDetails?.fulfillsPlanHandleId" class="mt-2">
+                <div v-if="giveDetailsOfferFulfillment?.offerHandleId">
-                <router-link
+                  <!-- router-link to /claim/ only changes URL path -->
-                  :to="
+                  <router-link
-                    '/project/' +
+                    :to="
-                    encodeURIComponent(giveDetails?.fulfillsPlanHandleId || '')
+                      '/claim/' +
-                  "
+                      encodeURIComponent(
-                  class="text-blue-500 mt-2 cursor-pointer"
+                        giveDetailsOfferFulfillment.offerHandleId || '',
-                >
+                      )
-                  This fulfills a bigger plan
+                    "
-                  <font-awesome
+                    class="text-blue-500 mt-2 cursor-pointer"
-                    icon="arrow-up-right-from-square"
+                  >
-                    class="fa-fw"
+                    This fulfills
-                  />
+                    {{
-                </router-link>
+                      serverUtil.capitalizeAndInsertSpacesBeforeCapsWithAPrefix(
-              </div>
+                        giveDetailsOfferFulfillment.offerType || "Offer",
-              <!-- if there's another, it's probably fulfilling an offer, too -->
+                      )
-              <div
+                    }}
-                v-if="
+                    <font-awesome
-                  giveDetails?.fulfillsType &&
+                      icon="arrow-up-right-from-square"
-                  giveDetails?.fulfillsType !== 'PlanAction' &&
+                      class="fa-fw"
-                  giveDetails?.fulfillsHandleId
+                    />
-                "
+                  </router-link>
-              >
+                </div>
-                <!-- router-link to /claim/ only changes URL path -->
-                <router-link
-                  :to="
-                    '/claim/' +
-                    encodeURIComponent(giveDetails?.fulfillsHandleId || '')
-                  "
-                  class="text-blue-500 mt-2 cursor-pointer"
-                >
-                  This fulfills
-                  {{
-                    capitalizeAndInsertSpacesBeforeCapsWithAPrefix(
-                      giveDetails?.fulfillsType || "",
-                    )
-                  }}
-                  <font-awesome
-                    icon="arrow-up-right-from-square"
-                    class="fa-fw"
-                  />
-                </router-link>
               </div>
             </div>
           </div>
@@ -493,6 +493,11 @@ export default class ConfirmGiftView extends Vue {
   confsVisibleErrorMessage = "";
   confsVisibleToIdList: string[] = []; // list of DIDs that can see any confirmer
   giveDetails?: GiveSummaryRecord;
+  // Additional offer information extracted from the fulfills array
+  giveDetailsOfferFulfillment: {
+    offerHandleId?: string;
+    offerType?: string;
+  } | null = null;
   giverName = "";
   issuerName = "";
   isLoading = false;
@@ -648,6 +653,8 @@ export default class ConfirmGiftView extends Vue {
 
       if (resp.status === 200) {
         this.giveDetails = resp.data.data[0];
+        // Extract offer information from the fulfills array
+        this.extractOfferFulfillment();
       } else {
         throw new Error("Error getting detailed give info: " + resp.status);
       }
@@ -707,6 +714,15 @@ export default class ConfirmGiftView extends Vue {
     }
   }
 
+  /**
+   * Extract offer fulfillment information from the fulfills array
+   */
+  private extractOfferFulfillment() {
+    this.giveDetailsOfferFulfillment = libsUtil.extractOfferFulfillment(
+      this.giveDetails?.fullClaim?.fulfills
+    );
+  }
+
   /**
    * Fetches confirmer information for the claim
    */
@@ -849,27 +865,6 @@ export default class ConfirmGiftView extends Vue {
     );
   }
 
-  /**
-   * Formats type string for display by adding spaces before capitals
-   * Optionally adds a prefix
-   *
-   * @param text - Text to format
-   * @param prefix - Optional prefix to add
-   * @returns Formatted string
-   */
-  capitalizeAndInsertSpacesBeforeCapsWithAPrefix(text: string): string {
-    const word = this.capitalizeAndInsertSpacesBeforeCaps(text);
-    if (word) {
-      // if the word starts with a vowel, use "an" instead of "a"
-      const firstLetter = word[0].toLowerCase();
-      const vowels = ["a", "e", "i", "o", "u"];
-      const particle = vowels.includes(firstLetter) ? "an" : "a";
-      return particle + " " + word;
-    } else {
-      return "";
-    }
-  }
-
   /**
    * Initiates sharing of claim information
    * Handles share functionality based on platform capabilities
@@ -894,11 +889,5 @@ export default class ConfirmGiftView extends Vue {
     this.veriClaim = serverUtil.BLANK_GENERIC_SERVER_RECORD;
     this.veriClaimDump = "";
   }
-
-  capitalizeAndInsertSpacesBeforeCaps(text: string) {
-    return !text
-      ? ""
-      : text[0].toUpperCase() + text.substr(1).replace(/([A-Z])/g, " $1");
-  }
 }
 </script>