Merge branch 'development' into fix-7761

Author: maze-runnar

app/components/modals/confirm-modal.js

@@ -7,6 +7,12 @@ export default ModalBase.extend({
   },
 
   actions: {
+    savePublicName() {
+      this.authManager.currentUser.save();
+      this.confirm.pendingPromise?.resolve();
+      this.set('isOpen', false);
+    },
+
     deny() {
       if (this.confirm.pendingPromise.reject) {
         this.confirm.pendingPromise.reject();

app/helpers/confirm.js

@@ -15,6 +15,11 @@ export default Helper.extend({
           .then(() => {
             params[1](...arguments);
           });
+      } else if (params[1] === 'publicName') {
+        confirm.prompt(params[0], { 'publicName': true })
+          .then(() => {
+            params[1](...arguments);
+          });
       } else if (params.length >= 6) {
         confirm.prompt('Are You Sure?', { 'denyText': params[2], 'approveText': params[3], 'denyColor': params[4], 'approveColor': params[5], 'extra': params[0] })
           .then(() => {

app/routes/index.js

@@ -171,6 +171,7 @@ export default class IndexRoute extends Route {
       }
     ];
 
+
     return hash({
       filteredEvents: this.store.query('event', {
         upcoming     : true,
@@ -196,6 +197,20 @@ export default class IndexRoute extends Route {
         'page[size]' : 6
       })
     });
+
+  }
+
+  async afterModel() {
+    const prevRoute = this.session.currentRouteName;
+    setTimeout(() => {
+      if (this.session.isAuthenticated && this.session.currentRouteName === 'index' && prevRoute === 'login' && !this.authManager.currentUser.publicName) {
+        try {
+          this.confirm.prompt(this.l10n.t('You have not set a Public Profile Name yet. A public name is displayed on user profiles and video sessions instead of a fantasy name. You can change it later on your account page. Please set your public name now.'), { 'publicName': true });
+        } catch {
+          console.warn('User public profile name not set.');
+        }
+      }
+    }, 2000);
   }
 
   setupController(controller, model) {

app/templates/components/forms/user-profile-form.hbs

@@ -48,7 +48,7 @@
           <UiPopup
             @tagName="i"
             @class="info circle icon"
-            @content={{'Public profile name, if set, is displayed to other users on profiles and video sessions instead of real name.'}} />
+            @content={{'Public profile name, if set, is displayed to other users on profiles and video sessions instead of a fantasy name.'}} />
         </label>
         <Input
           @type="text"

app/templates/components/modals/confirm-modal.hbs

@@ -6,19 +6,35 @@
     {{sanitize this.confirm.options.extra}}
   </div>
 {{/if}}
-<div class="actions">
-  {{#if this.confirm.options.infoModal}}
-    <button type="button" class="ui blue button" {{action 'deny'}}>
-      {{t 'Ok'}}
+{{#if this.confirm.options.publicName}}
+  <div class="content">
+    <div class="field ui fluid input">
+      <Input type="text" @id="public_name" placeholder={{t "Public Profile Name"}}  @value={{this.authManager.currentUser.publicName}}/>
+    </div>
+  </div>
+  <div class="actions">
+    <button type="button" class="ui green button" {{action 'savePublicName'}}>
+      {{t 'Save'}}
     </button>
-  {{else}}
-    {{#unless this.confirm.options.hideDeny}}
-      <button type="button" class="ui {{if this.confirm.options.denyText this.confirm.options.denyColor 'black'}} button" {{action 'deny'}}>
-        {{if this.confirm.options.denyText this.confirm.options.denyText (t 'No')}}
-      </button>
-    {{/unless}}
-    <button type="button" class="ui {{if this.confirm.options.denyText this.confirm.options.approveColor 'green'}} button" {{action 'confirm'}}>
-      {{if this.confirm.options.approveText this.confirm.options.approveText (t 'Yes')}}
+    <button type="button" class="ui black button" {{action 'deny'}}>
+      {{t 'Cancel'}}
     </button>
-  {{/if}}
-</div>
+  </div>
+{{else}}
+  <div class="actions">
+    {{#if this.confirm.options.infoModal}}
+      <button type="button" class="ui blue button" {{action 'deny'}}>
+        {{t 'Ok'}}
+      </button>
+    {{else}}
+      {{#unless this.confirm.options.hideDeny}}
+        <button type="button" class="ui {{if this.confirm.options.denyText this.confirm.options.denyColor 'black'}} button" {{action 'deny'}}>
+          {{if this.confirm.options.denyText this.confirm.options.denyText (t 'No')}}
+        </button>
+      {{/unless}}
+      <button type="button" class="ui {{if this.confirm.options.denyText this.confirm.options.approveColor 'green'}} button" {{action 'confirm'}}>
+        {{if this.confirm.options.approveText this.confirm.options.approveText (t 'Yes')}}
+      </button>
+    {{/if}}
+  </div>
+{{/if}}

package.json

@@ -28,18 +28,18 @@
     ]
   },
   "devDependencies": {
-    "@babel/core": "^7.15.5",
+    "@babel/core": "^7.15.8",
     "@babel/plugin-proposal-object-rest-spread": "^7.15.6",
     "@babel/plugin-transform-block-scoping": "^7.15.3",
     "@ember/jquery": "^2.0.0",
     "@ember/optional-features": "^2.0.0",
-    "@ember/render-modifiers": "^1.0.2",
+    "@ember/render-modifiers": "^2.0.0",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
     "@open-event/theme": "^0.2.2",
-    "@sentry/browser": "^6.13.2",
-    "@sentry/integrations": "^6.13.2",
-    "@sentry/tracing": "^6.13.2",
+    "@sentry/browser": "^6.13.3",
+    "@sentry/integrations": "^6.13.3",
+    "@sentry/tracing": "^6.13.3",
     "@types/ember": "^3.16.5",
     "@types/ember-data": "^3.16.15",
     "@types/ember-data__model": "^3.16.1",
@@ -128,7 +128,7 @@
     "ember-resolver": "^8.0.3",
     "ember-route-action-helper": "^2.0.8",
     "ember-router-scroll": "^3.3.7",
-    "ember-simple-auth": "^4.0.1",
+    "ember-simple-auth": "^4.0.2",
     "ember-simple-auth-token": "^5.2.2",
     "ember-source": "3.20.3",
     "ember-table": "^2.2.3",
@@ -145,7 +145,7 @@
     "leaflet": "^1.6.0",
     "loader.js": "^4.7.0",
     "lodash-es": "^4.17.21",
-    "mini-css-extract-plugin": "^2.3.0",
+    "mini-css-extract-plugin": "^2.4.2",
     "moment-timezone": "^0.5.31",
     "npm-run-all": "^4.1.5",
     "object-to-formdata": "^4.1.0",