@icvdeveloper/common-module 1.1.7 → 1.2.0

package/CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## 1.2.0 - 2023-12-04
+
 ## 1.1.7 - 2023-11-15
 
 ## 1.1.6 - 2023-11-14

package/dist/module.json

@@ -1,5 +1,5 @@
 {
   "name": "v3plus-common-module",
   "configKey": "v3plusCommonModule",
-  "version": "1.1.7"
+  "version": "1.2.0"
 }

package/dist/runtime/components/auth/Ucc.vue

@@ -89,8 +89,7 @@ onMounted(() => {
     </div>
     <!-- V3 email login form -->
     <div id="uccEmailForm"
-      class="ucc-form-container ucc-widgets-events"
-      :class="(conference.state == 'live' || conference.state == 'archive') ? 'block' : 'hidden'"
+      class="ucc-form-container ucc-widgets-events block"
       style="padding-bottom: 0px"
     >
       <div>

package/dist/runtime/composables/useAgenda.mjs

@@ -129,7 +129,7 @@ export const useAgenda = (conference) => {
     return classes;
   };
   onBeforeMount(() => {
-    if (!affiliateStore.hasFetchedAffilites(conference.value.id)) {
+    if (!conference.value.hasOwnProperty("affiliates")) {
       affiliateStore.getAffiliates(conference.value.id);
     }
     if (selectedDay.value === null) {

package/dist/runtime/composables/useUcc.mjs

@@ -76,7 +76,7 @@ export const useUcc = () => {
     if (window.uccMixin.conference.state == "live") {
       router.push(window.uccMixin.webcastUrl);
     } else if (window.uccMixin.conference.state == "archive") {
-      window.location.reload();
+      toggleEmailFormDisplay(false);
     }
   };
   const uccShowEventSignUp = (email) => {

package/dist/runtime/plugin.mjs

@@ -46,11 +46,11 @@ export default defineNuxtPlugin((nuxtApp) => {
         // wait for portal config request to complete, then fetch conferences
         await conferencesStore.getConferences().then(() => NProgress.inc()),
         // wait for get conferences to complete, then get current conference data.
-        await conferencesStore.getCurrentConference().then(() => NProgress.inc())
+        await conferencesStore.getCurrentConference(true).then(() => NProgress.inc())
       ]);
     }
     if (to.name.includes("events-id") && to.params.id) {
-      await conferencesStore.getSelectedConference(to.params.id).then(() => {
+      await conferencesStore.getSelectedConference(to.params.id, false).then(() => {
         if (conferencesStore.selectedConference) {
           docTitle = `${conferencesStore.selectedConference.name}`;
           if (to.name.includes("webcast-channelid")) {

package/dist/runtime/store/affiliates.d.ts

@@ -8,5 +8,10 @@ export declare const useAffiliatesStore: import("pinia").StoreDefinition<"affili
     getConferenceAffiliates: (state: AffiliatesState) => (conferenceId: number) => Sponsor[];
 }, {
     getAffiliates(conferenceId: number): Promise<unknown>;
+    /**
+     * no longer in use by nejm-template
+     * replaced with conference.value.hasOwnProperty('affiliates')
+     * keeping for possible future use by other templates
+     */
     hasFetchedAffilites(conferenceId: number): boolean;
 }>;

package/dist/runtime/store/affiliates.mjs

@@ -28,6 +28,11 @@ export const useAffiliatesStore = defineStore("affiliates", {
         });
       });
     },
+    /**
+     * no longer in use by nejm-template
+     * replaced with conference.value.hasOwnProperty('affiliates')
+     * keeping for possible future use by other templates
+     */
     hasFetchedAffilites(conferenceId) {
       return Object.keys(this.affiliates).includes(String(conferenceId));
     }

package/dist/runtime/store/auth.mjs

@@ -33,10 +33,10 @@ export const useAuthStore = defineStore("auth", {
       return new Promise((resolve, reject) => {
         const request = useApi();
         request(`users/email/${data.email}?with=token`).then((response) => {
-          let mergedUser = merge(data, response);
+          const mergedUser = merge(data, response);
           this.user = mergedUser;
-          const { selectedConference, getSelectedConference } = useConferencesStore();
-          getSelectedConference(selectedConference.id);
+          const { updateConferencesAccess } = useConferencesStore();
+          updateConferencesAccess(this.user.conferences);
           resolve(response);
         }).catch((error) => {
           reject(error);
@@ -56,7 +56,7 @@ export const useAuthStore = defineStore("auth", {
           this.user = response;
           const conferencesStore = useConferencesStore();
           conferencesStore.getConferences().then(() => {
-            conferencesStore.getCurrentConference();
+            conferencesStore.getCurrentConference(true);
           });
           resolve(response);
         }).catch((error) => {
@@ -69,7 +69,7 @@ export const useAuthStore = defineStore("auth", {
         this.user = null;
         const conferencesStore = useConferencesStore();
         conferencesStore.getConferences().then(() => {
-          conferencesStore.getCurrentConference();
+          conferencesStore.getCurrentConference(true);
         });
         resolve();
       });

package/dist/runtime/store/conferences.d.ts

@@ -9,6 +9,7 @@ export declare const useConferencesStore: import("pinia").StoreDefinition<"confe
     pastEvents: (state: ConferencesState) => Conference[];
 }, {
     getConferences(): Promise<Conference[]>;
-    getSelectedConference(id: number): Promise<Conference>;
-    getCurrentConference(): Promise<Conference>;
+    getSelectedConference(id: number, skipDetails?: boolean): Promise<Conference>;
+    getCurrentConference(skipDetails?: boolean): Promise<Conference>;
+    updateConferencesAccess(userConferences: any): void;
 }>;

package/dist/runtime/store/conferences.mjs

@@ -1,5 +1,5 @@
 import { defineStore } from "pinia";
-import { findLast } from "lodash-es";
+import { findLast, find } from "lodash-es";
 import { useApi } from "../composables/useApi.mjs";
 import { ConferenceState } from "../models/conference.mjs";
 import { useTemplateConfigsStore } from "./templateConfigs.mjs";
@@ -38,8 +38,16 @@ export const useConferencesStore = defineStore("conferences", {
         });
       });
     },
-    getSelectedConference(id) {
+    getSelectedConference(id, skipDetails) {
       return new Promise((resolve, reject) => {
+        if (skipDetails === true) {
+          const selConference = find(this.conferenceList, { id });
+          if (selConference !== void 0) {
+            this.selectedConference = selConference;
+            resolve(this.selectedConference);
+            return;
+          }
+        }
         const request = useApi();
         request(`conferences/${id}?with=${conferenceDetailsQueryString()}`).then((response) => {
           this.selectedConference = response.data;
@@ -49,7 +57,7 @@ export const useConferencesStore = defineStore("conferences", {
         });
       });
     },
-    getCurrentConference() {
+    getCurrentConference(skipDetails) {
       return new Promise((resolve, reject) => {
         const request = useApi();
         let conference = null;
@@ -71,22 +79,34 @@ export const useConferencesStore = defineStore("conferences", {
         }
         if (!conference) {
           reject(new Error("could not determine current conference."));
+          return;
         }
-        request(
-          `conferences/${conference.id}?with=${conferenceDetailsQueryString()}`
-        ).then((response) => {
-          const {
-            data: { template_config, ...data }
-          } = response;
-          if (template_config) {
-            const templateConfigsStore = useTemplateConfigsStore();
-            templateConfigsStore.setCurrentConferenceConfig(
-              template_config.config
-            );
-          }
-          this.currentConference = data;
+        if (skipDetails === true) {
+          this.currentConference = conference;
           resolve(this.currentConference);
-        });
+        } else {
+          request(
+            `conferences/${conference.id}?with=${conferenceDetailsQueryString()}`
+          ).then((response) => {
+            const {
+              data: { template_config, ...data }
+            } = response;
+            if (template_config) {
+              const templateConfigsStore = useTemplateConfigsStore();
+              templateConfigsStore.setCurrentConferenceConfig(
+                template_config.config
+              );
+            }
+            this.currentConference = data;
+            resolve(this.currentConference);
+          });
+        }
+      });
+    },
+    updateConferencesAccess(userConferences) {
+      userConferences.forEach((userConf) => {
+        const conf = find(this.conferenceList, { id: userConf.id });
+        conf.access = true;
       });
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@icvdeveloper/common-module",
-  "version": "1.1.7",
+  "version": "1.2.0",
   "license": "MIT",
   "type": "module",
   "exports": {