@7365admin1/layer-common 3.0.28 → 3.0.30-staging.1

package/.github/workflows/publish-staging.yml

@@ -0,0 +1,36 @@
+name: Publish Staging
+on:
+  push:
+    branches:
+      - staging
+
+concurrency: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20.x
+          cache: "yarn"
+          cache-dependency-path: yarn.lock
+
+      - run: yarn install --immutable
+
+      - run: yarn build
+
+      - name: Create .npmrc for publishing
+        run: |
+          echo '//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}' > ~/.npmrc
+
+      - name: Set staging prerelease version
+        run: |
+          BASE=$(node -p "const [x,y,z]=require('./package.json').version.split('-')[0].split('.'); [x,y,+z+1].join('.')")
+          npm version "$BASE-staging.${{ github.run_number }}" --no-git-tag-version
+          node -p "'Publishing ' + require('./package.json').version"
+
+      - name: Publish to npm with staging tag
+        run: npm publish --tag staging --registry https://registry.npmjs.org

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 3.0.29
+
+### Patch Changes
+
+- a71f9c4: Update Package Version
+
 ## 3.0.28
 
 ### Patch Changes

package/components/AccessCardDetailsDialog.vue

@@ -60,19 +60,31 @@
             </div>
           </div>
 
-          <!-- Visitor Credentials -->
+          <div v-if="details.userType">
+            <div class="text-caption text-grey">User Type</div>
+            <div class="text-body-2 font-weight-medium">{{ details.userType }}</div>
+          </div>
+
+          <!-- Visitor / Resident Credentials -->
           <template v-if="details.userCred">
             <v-divider />
-            <div class="text-caption font-weight-bold text-grey-darken-2 text-uppercase">Visitor Information</div>
+            <div class="text-caption font-weight-bold text-grey-darken-2 text-uppercase">
+              {{ details.userType ?? "Visitor Information" }}
+            </div>
+
+            <div v-if="details.userCred.email">
+              <div class="text-caption text-grey">Email</div>
+              <div class="text-body-2 font-weight-medium">{{ details.userCred.email }}</div>
+            </div>
 
-            <div>
+            <div v-if="details.userCred.nric">
               <div class="text-caption text-grey">NRIC</div>
-              <div class="text-body-2 font-weight-medium">{{ details.userCred.nric ?? "N/A" }}</div>
+              <div class="text-body-2 font-weight-medium">{{ details.userCred.nric }}</div>
             </div>
 
-            <div>
+            <div v-if="details.userCred.contact">
               <div class="text-caption text-grey">Contact</div>
-              <div class="text-body-2 font-weight-medium">{{ details.userCred.contact ?? "N/A" }}</div>
+              <div class="text-body-2 font-weight-medium">{{ details.userCred.contact }}</div>
             </div>
 
             <div v-if="details.userCred.company">
@@ -125,7 +137,7 @@
                 <div class="d-flex flex-column align-center" style="width: 20px; flex-shrink: 0;">
                   <div
                     class="timeline-dot rounded-circle mt-1"
-                    :class="entry.visitorId ? 'bg-blue' : 'bg-orange'"
+                    :class="(entry.type === 'assigned' || entry.visitorId) ? 'bg-blue' : 'bg-orange'"
                   />
                   <div
                     v-if="idx < sortedHistory.length - 1"
@@ -139,20 +151,21 @@
                     <v-chip
                       size="x-small"
                       variant="tonal"
-                      :color="entry.visitorId ? 'blue' : 'orange'"
-                      :prepend-icon="entry.visitorId ? 'mdi-account-arrow-right' : 'mdi-arrow-u-left-top'"
+                      :color="(entry.type === 'assigned' || entry.visitorId) ? 'blue' : 'orange'"
+                      :prepend-icon="(entry.type === 'assigned' || entry.visitorId) ? 'mdi-account-arrow-right' : 'mdi-arrow-u-left-top'"
                     >
-                      {{ entry.visitorId ? "Assigned" : "Returned" }}
+                      {{ (entry.type === 'assigned' || entry.visitorId) ? "Assigned" : "Returned" }}
                     </v-chip>
                     <span class="text-caption text-grey">{{ formatDate(entry.createdAt) }}</span>
                   </div>
 
                   <!-- Assignment entry -->
-                  <template v-if="entry.visitorId">
+                  <template v-if="entry.type === 'assigned' || entry.visitorId">
                     <div class="text-body-2 font-weight-medium">{{ entry.name ?? "N/A" }}</div>
                     <div class="text-caption text-grey-darken-1">
                       <span v-if="entry.nric">NRIC: {{ entry.nric }}</span>
                       <span v-if="entry.contact" class="ml-2">· {{ entry.contact }}</span>
+                      <span v-if="entry.email && !entry.nric && !entry.contact">{{ entry.email }}</span>
                     </div>
                     <div class="text-caption text-grey-darken-1">
                       <span v-if="entry.company">{{ entry.company }}</span>

package/components/AccessCardPreviewDialog.vue

@@ -536,6 +536,7 @@ async function confirmAssign() {
       unit: props.unit._id,
       type: selectedCardType.value,
       acm_url: encryptedAcmUrl.value,
+      id: props.selectedCardInUnit?._id,
     });
     emit("assign-to-person", {
       card: props.selectedCardInUnit,