Merge branch 'development' into validate-email-5277

Author: DIVYAM TAYAL

app/components/footer-main.js

@@ -2,11 +2,20 @@ import classic from 'ember-classic-decorator';
 import { classNames, tagName } from '@ember-decorators/component';
 import { action, computed } from '@ember/object';
 import Component from '@ember/component';
+import { filterBy } from '@ember/object/computed';
+import { inject as service } from '@ember/service';
+import { sortBy } from 'lodash-es';
 
 @classic
 @tagName('footer')
 @classNames('ui', 'inverted', 'vertical', 'footer', 'segment')
 export default class FooterMain extends Component {
+
+  @service cache;
+
+  @filterBy('pages', 'place', 'footer')
+  footerPages;
+
   @computed
   get currentLocale() {
     return this.l10n.getLocale();
@@ -17,17 +26,7 @@ export default class FooterMain extends Component {
     this.l10n.switchLanguage(locale);
   }
 
-  didInsertElement() {
-    this.set('eventLocations', this.eventLocations.sortBy('name'));
-
-    const eventTypes = this.eventTypes.sortBy('name').toArray();
-    eventTypes.forEach(eventType => {
-      if (eventType.name === 'Other') {
-        const other = eventType;
-        eventTypes.splice(eventTypes.indexOf(eventType), 1);
-        eventTypes.push(other);
-      }
-    });
-    this.set('eventTypes', eventTypes);
+  async didInsertElement() {
+    this.set('pages', sortBy(await this.cache.findAll('page'), 'index'));
   }
 }

app/components/forms/orders/order-form.js

@@ -54,10 +54,12 @@ export default Component.extend(FormMixin, {
     run.later(() => {
       const currentTime = moment();
       const diff = moment.duration(willExpireAt.diff(currentTime));
-      this.set('getRemainingTime', moment.utc(diff.asMilliseconds()).format('mm:ss'));
       if (diff > 0) {
+        this.set('getRemainingTime', moment.utc(diff.asMilliseconds()).format('mm:ss'));
         this.timer(willExpireAt, orderIdentifier);
       } else {
+        this.set('getRemainingTime', '00:00');
+        this.data.set('status', 'expired');
         this.data.reload();
         this.router.transitionTo('orders.expired', orderIdentifier);
       }

app/components/forms/wizard/attendee-step.js

@@ -17,5 +17,12 @@ export default Component.extend(FormMixin, EventWizardMixin, {
 
   showEditColumn: computed('editableFields.@each', function() {
     return this.editableFields?.some(field => field.isComplex);
-  })
+  }),
+
+  actions: {
+    removeField(field) {
+      this.data.customForms.removeObject(field);
+    }
+  }
 });
+

app/components/forms/wizard/custom-forms/table.hbs

@@ -71,8 +71,7 @@
               <button class="ui compact icon positive circular button" data-tooltip="{{t 'Edit'}}" {{action  @updateField field}}>
                 <i class="pencil icon"></i>
               </button>
-              {{!-- Hiding till implemented --}}
-              <button class="ui compact icon negative circular button hidden-item" data-tooltip="{{t 'Delete'}}">
+              <button class="ui compact icon negative circular button" data-tooltip="{{t 'Delete'}}" {{action (confirm (t "Are you sure you want to delete this?") (action @removeField field))}}>
                 <i class="trash icon"></i>
               </button>
             {{/if}}

app/components/forms/wizard/custom-forms/table.ts

@@ -1,12 +1,12 @@
 import Component from '@glimmer/component';
 
-
 interface CustomForm { isComplex: boolean }
 
 interface Args {
   fields: CustomForm[],
-  updateField: (field: CustomForm) => void
-}
+  removeField: (field: any) => void,
+  updateField: (field: any) => void
+ }
 
 export default class CustomFormTable extends Component<Args> {
   get editColumn(): boolean {

app/controllers/application.js

@@ -20,9 +20,6 @@ export default class ApplicationController extends Controller {
   @filterBy('model.notifications', 'isRead', false)
   unreadNotifications;
 
-  @filterBy('model.pages', 'place', 'footer')
-  footerPages;
-
   getCookieSeen(write) {
     const cookieName = 'seen-cookie-message';
     const cookie = this.cookies.read(cookieName);

app/controllers/events/view/tickets/orders/list.js

@@ -20,14 +20,14 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
         }
       },
       {
-        name            : 'First Name',
-        valuePath       : 'user.firstName',
-        width           : 50
+        name      : 'First Name',
+        valuePath : 'user.firstName',
+        width     : 50
       },
       {
-        name            : 'Last Name',
-        valuePath       : 'user.lastName',
-        width           : 50
+        name      : 'Last Name',
+        valuePath : 'user.lastName',
+        width     : 50
       },
       {
         name            : 'Date and Time',

app/routes/application.js

@@ -4,6 +4,7 @@ import { inject as service } from '@ember/service';
 import Route from '@ember/routing/route';
 import ApplicationRouteMixin from 'ember-simple-auth/mixins/application-route-mixin';
 import { merge, values, isEmpty } from 'lodash-es';
+import { hash } from 'rsvp';
 
 @classic
 export default class ApplicationRoute extends Route.extend(ApplicationRouteMixin) {
@@ -13,6 +14,9 @@ export default class ApplicationRoute extends Route.extend(ApplicationRouteMixin
   @service
   currentUser;
 
+  @service
+  cache;
+
   title(tokens) {
     if (!tokens) {
       tokens = [];
@@ -36,10 +40,10 @@ export default class ApplicationRoute extends Route.extend(ApplicationRouteMixin
   }
 
   async model() {
-    let notificationsPromise = Promise.resolve([]);
+    let notifications = Promise.resolve([]);
     if (this.session.isAuthenticated) {
       try {
-        notificationsPromise = this.authManager.currentUser.query('notifications', {
+        notifications = this.authManager.currentUser.query('notifications', {
           filter: [
             {
               name : 'is-read',
@@ -55,30 +59,15 @@ export default class ApplicationRoute extends Route.extend(ApplicationRouteMixin
       }
     }
 
-    const pagesPromise = this.store.query('page', {
-      sort: 'index'
-    });
-
-    const settingsPromise = this.store.queryRecord('setting', {});
-    const eventTypesPromise = this.store.findAll('event-type');
-    const eventLocationsPromise = this.store.findAll('event-location');
-
-    const [notifications, pages, settings, eventTypes, eventLocations] = await Promise.all([
-      notificationsPromise,
-      pagesPromise,
-      settingsPromise,
-      eventTypesPromise,
-      eventLocationsPromise]);
+    const pages = this.cache.findAll('page');
 
-    return {
+    return hash({
       notifications,
       pages,
-      cookiePolicy     : settings.cookiePolicy,
-      cookiePolicyLink : settings.cookiePolicyLink,
-      socialLinks      : settings,
-      eventTypes,
-      eventLocations
-    };
+      cookiePolicy     : this.settings.cookiePolicy,
+      cookiePolicyLink : this.settings.cookiePolicyLink,
+      socialLinks      : this.settings
+    });
   }
 
   sessionInvalidated() {

app/services/auth-manager.js

@@ -19,6 +19,9 @@ export default class AuthManagerService extends Service {
   @service
   bugTracker;
 
+  @service
+  cache;
+
   @computed('session.data.currentUserFallback.id', 'currentUserModel')
   get currentUser() {
     if (this.currentUserModel) {
@@ -64,6 +67,7 @@ export default class AuthManagerService extends Service {
     this.session.invalidate();
     this.set('currentUserModel', null);
     this.session.set('data.currentUserFallback', null);
+    this.cache.clear();
   }
 
   identify() {

app/services/cache.ts

@@ -0,0 +1,130 @@
+/* eslint-disable no-console, prefer-rest-params */
+import Service, { inject as service } from '@ember/service';
+import DS from 'ember-data';
+
+function pushToStore(store: DS.Store, data: any): any[] | any {
+  const parsed = data?.value;
+  if (Array.isArray(parsed)) {
+    const items = []
+    for (const item of parsed) {
+      store.pushPayload(item);
+      items.push(store.peekRecord(item.data.type, item.data.id));
+    }
+    return items;
+  } else {
+    store.pushPayload(parsed);
+
+    return store.peekRecord(parsed.data.type, parsed.data.id);
+  }
+}
+
+function saveToStorage(key: string, value: any | null) {
+  if (!value) {return}
+  let serialized = null;
+  if (Array.isArray(value.content)) {
+    serialized = value.map((v: any) => v.serialize({ includeId: true }));
+  } else {
+    serialized = value.serialize({ includeId: true });
+  }
+
+  localStorage.setItem(key, JSON.stringify({
+    time  : Date.now(),
+    value : serialized
+  }));
+}
+
+export default class Cache extends Service.extend({
+  // anything which *must* be merged to prototype here
+}) {
+  version = 'v1';
+
+  @service store!: DS.Store;
+
+  get prefix(): string {
+    return 'cache:' + this.version + ':';
+  }
+
+  isExpired(data: { time: number, value: any} | null): boolean {
+    // Item expired after 15 seconds
+    return Boolean(data?.time && (Date.now() - data?.time) > 60 * 1000)
+  }
+
+  async passThrough(key: string, callable: () => any): Promise<any> {
+    const value = await callable();
+    saveToStorage(key, value);
+
+    return value;
+  }
+
+  async cacheData(key: string, callable: () => any): Promise<any | null> {
+    key = this.prefix + key;
+    const stored = localStorage.getItem(key);
+    try {
+      if (stored) {
+        const data = JSON.parse(stored);
+
+        if (!data.time) {
+          // Invalid data structure
+          return this.passThrough(key, callable);
+        }
+
+        const expired = this.isExpired(data);
+        const item = pushToStore(this.store, data);
+
+        if (expired) {
+          // Revalidate resource while serving stale
+          console.info('Item expired. Revalidating...', key);
+          this.passThrough(key, callable);
+        }
+
+        return item;
+      } else {
+        return this.passThrough(key, callable);
+      }
+    } catch (e) {
+      console.error('Error while loading value from cache using key: ' + key, e);
+
+      return callable();
+    }
+  }
+
+  async findAll(model: string, options: any | null): Promise<any> {
+    const saved = await this.cacheData(model, () => this.store.findAll(model, options));
+    if (saved) {return saved;}
+    return this.store.peekAll(model);
+  }
+
+  async queryRecord(key: string, model: string, options: any | null): Promise<any> {
+    const saved = await this.cacheData(key, () => this.store.queryRecord(model, options));
+    if (saved) {return saved;}
+    return this.store.peekRecord(model, 1);
+  }
+
+  clear(): void {
+    for (const key of Object.keys(localStorage)) {
+      if (key.startsWith(this.prefix)) {
+        console.info('Clearing cache entry:', key);
+        localStorage.removeItem(key);
+      }
+    }
+  }
+
+  constructor() {
+    super(...arguments);
+    for (const key of Object.keys(localStorage)) {
+      if (key.startsWith('cache:')) {
+        if (!key.startsWith(this.prefix)) {
+          console.info('Removing previous cache entry:', key);
+          localStorage.removeItem(key);
+        }
+      }
+    }
+  }
+}
+
+// DO NOT DELETE: this is how TypeScript knows how to look up your services.
+declare module '@ember/service' {
+  interface Registry {
+    'cache': Cache;
+  }
+}

app/services/settings.js

@@ -3,6 +3,7 @@ import { observer } from '@ember/object';
 
 export default Service.extend({
 
+  cache       : service(),
   store       : service(),
   session     : service(),
   authManager : service(),
@@ -25,7 +26,7 @@ export default Service.extend({
    * @private
    */
   async _loadSettings() {
-    const settingsModel = await this.store.queryRecord('setting', {});
+    const settingsModel = await this.cache.queryRecord('settings', 'setting', {});
     this.store.modelFor('setting').eachAttribute(attributeName => {
       this.set(attributeName, settingsModel.get(attributeName));
     });

app/templates/application.hbs

@@ -21,7 +21,7 @@
     </div>
 
 
-    <FooterMain @eventTypes={{this.model.eventTypes}} @eventLocations={{this.model.eventLocations}} @socialLinks={{this.model.socialLinks}} @footerPages={{this.footerPages}} />
+    <FooterMain @socialLinks={{this.model.socialLinks}} />
 
   </div>
 </SideBar>

app/templates/components/forms/orders/order-form.hbs

@@ -18,7 +18,7 @@
     </div>
     <div class="ui padded segment">
       <h4 class="ui horizontal divider header">
-        <i class="ticket icon"></i>
+        <i class="dollar icon"></i>
         {{t 'Ticket Buyer'}}
       </h4>
       <div class="field {{if this.buyerHasFirstName 'disabled'}}">

app/templates/components/forms/wizard/attendee-step.hbs

@@ -49,7 +49,9 @@
       <div class="column">
         <Forms::Wizard::CustomForms::Table
           @fields={{this.editableFields}}
-          @updateField={{action (mut this.field)}} />
+          @removeField={{action "removeField"}}
+          @updateField={{action (mut this.field)}} 
+        />
       </div>
     </div>
     <Forms::Wizard::CustomFormInput