Merge branch 'Sprint/2020-10' into 'master'

Sprint/2020-10

See merge request coscine/app/usermanagement!31

package.json

@@ -12,16 +12,16 @@
     "test:unit": "vue-cli-service test:unit"
   },
   "dependencies": {
-    "@coscine/api-connection": "^1.13.0",
-    "@coscine/app-util": "^1.3.2",
-    "@types/jquery": "^3.3.35",
+    "@coscine/api-connection": "^1.15.0",
+    "@coscine/app-util": "^1.4.0",
+    "@types/jquery": "^3.3.38",
     "@types/vue-select": "^2.5.0",
-    "bootstrap-vue": "^2.12.0",
-    "jquery": "^3.5.0",
+    "bootstrap-vue": "^2.15.0",
+    "jquery": "^3.5.1",
     "vue": "^2.6.11",
-    "vue-i18n": "^8.17.3",
+    "vue-i18n": "^8.18.2",
     "vue-runtime-helpers": "^1.1.2",
-    "vue-select": "^3.10.1"
+    "vue-select": "^3.10.3"
   },
   "devDependencies": {
     "@semantic-release/commit-analyzer": "^8.0.1",
@@ -31,15 +31,15 @@
     "@semantic-release/release-notes-generator": "^9.0.1",
     "@types/chai": "^4.2.11",
     "@types/mocha": "^7.0.2",
-    "@vue/cli-plugin-babel": "^4.3.1",
-    "@vue/cli-plugin-typescript": "^4.3.1",
-    "@vue/cli-plugin-unit-mocha": "^4.3.1",
-    "@vue/cli-service": "^4.3.1",
-    "@vue/test-utils": "1.0.0-beta.33",
+    "@vue/cli-plugin-babel": "^4.4.4",
+    "@vue/cli-plugin-typescript": "^4.4.4",
+    "@vue/cli-plugin-unit-mocha": "^4.4.4",
+    "@vue/cli-service": "^4.4.4",
+    "@vue/test-utils": "1.0.3",
     "chai": "^4.2.0",
-    "typescript": "^3.8.3",
+    "typescript": "^3.9.5",
     "vue-template-compiler": "^2.6.11",
-    "semantic-release": "^17.0.7",
+    "semantic-release": "^17.0.8",
     "@hutson/semantic-delivery-gitlab": "^9.1.0"
   },
   "repository": {

src/components/UserManagement.vue

@@ -131,7 +131,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import { RoleApi, UserApi, ProjectRoleApi, ProjectApi, defaultOnCatch } from '@coscine/api-connection';
+import { RoleApi, UserApi, ProjectRoleApi, ProjectApi } from '@coscine/api-connection';
 import { LanguageUtil } from '@coscine/app-util';
 import vSelect from 'vue-select';
 import 'vue-select/dist/vue-select.css';
@@ -276,7 +276,6 @@ export default Vue.extend({
           },
           (error: any) => {
             loading(false);
-            defaultOnCatch(error);
           },
         );
       }
@@ -306,9 +305,7 @@ export default Vue.extend({
           }
           this.isBusy = false;
           this.filteredRows = this.projectRoles.length;
-        },
-        defaultOnCatch,
-      );
+        });
     },
     setRole(projectRole: {
       projectId: string,
@@ -396,8 +393,7 @@ export default Vue.extend({
         this.candidateForDeletion.role.id,
         (response: any) => {
           this.getProjectRoles();
-          this.makeToast(text, this.$t('userManagement').toString()); },
-        defaultOnCatch);
+          this.makeToast(text, this.$t('userManagement').toString()); });
     },
     filterMock(option: any, label: any, search: string) {
       return search.length > 0;

src/coscine.d.ts

+declare var coscine: {
+    i18n: {
+        usermanagement: {},
+    },
+};
 declare var _spPageContextInfo: any;
\ No newline at end of file

src/locale/de.ts

-export default {
-    back: 'Zurück',
-    changeRole: 'Rolle ändern',
-    deleteUser: 'Entfernen',
-    noUserOptions: 'Kein Nutzer gefunden.',
-    setRole: 'Nutzer hinzufügen',
-    createUsersMenu: 'Nutzer Menü öffnen',
-    save: 'Speichern',
-    user: 'Nutzer',
-    role: 'Rolle',
-    loading: 'Laden...',
-    typeToSearch: 'Zur Suche tippen',
-    clear: 'Leeren',
-    perPage: 'Pro Seite',
-    searchUserPlaceholder: 'Nutzer suchen...',
-    alreadyGotRole: '(bereits Teilnehmer)',
-    selectRolePlaceholder: 'Rolle auswählen',
-    firstName: 'Vorname',
-    lastName: 'Nachname',
-    email: 'E-Mail',
-    actions: 'Aktionen',
-    userManagement: 'Nutzerverwaltung',
-    pleaseTypeSomething: 'Bitte geben Sie einen Namen ein.',
-    deleteUser1: 'Sind Sie sicher, dass Sie den Benutzer ',
-    deleteUser2: ' aus dem Projekt ',
-    deleteUser3: ' entfernen möchten?',
-    deleteUserTitle: 'Benutzer löschen',
-    delete: 'Löschen',
-    cancel: 'Abbrechen',
-    emptyTableText: 'Keine Nutzer gefunden.',
-    emptyFilterText: 'Keine Nutzer gefunden die mit Ihrer Anfrage übereinstimmen.',
-    addedUser1: '',
-    addedUser2: ' als ',
-    addedUser3: ' zu ',
-    addedUser4: ' hinzugefügt',
-    removedUser1: '',
-    removedUser2: ' von ',
-    removedUser3: ' gelöscht',
-    changedRole1: '',
-    changedRole2: ' ist nun ',
-    changedRole3: ' in ',
-};

src/locale/en.ts

-export default {
-    back: 'Back',
-    changeRole: 'Change role',
-    deleteUser: 'Delete',
-    noUserOptions: 'No user found.',
-    setRole: 'Add user',
-    createUsersMenu: 'Open user menu',
-    save: 'Save',
-    user: 'User',
-    role: 'Role',
-    loading: 'Loading...',
-    typeToSearch: 'Type to Search',
-    clear: 'Clear',
-    perPage: 'Per page',
-    searchUserPlaceholder: 'Search a user...',
-    alreadyGotRole: '(Already added)',
-    selectRolePlaceholder: 'Select Role',
-    firstName: 'First Name',
-    lastName: 'Last Name',
-    email: 'Email',
-    actions: 'Actions',
-    userManagement: 'User Management',
-    pleaseTypeSomething: 'Please enter a name.',
-    deleteUser1: 'Are you sure you want to remove ',
-    deleteUser2: ' from the project ',
-    deleteUser3: '?',
-    deleteUserTitle: 'Delete User',
-    delete: 'Delete',
-    cancel: 'Cancel',
-    emptyTableText: 'No user found.',
-    emptyFilterText: 'No user found matching your request.',
-    addedUser1: 'Added ',
-    addedUser2: ' to ',
-    addedUser3: ' as ',
-    addedUser4: '',
-    removedUser1: 'Removed ',
-    removedUser2: ' from ',
-    removedUser3: '',
-    changedRole1: 'Changed ',
-    changedRole2: ' in ',
-    changedRole3: ' to ',
-};

src/locale/locales.ts

-import de from './de';
-import en from './en';
-
-export default {
-    de,
-    en,
-};

src/main.ts

@@ -2,7 +2,6 @@ import jQuery from 'jquery';
 import BootstrapVue from 'bootstrap-vue';
 import Vue from 'vue';
 import UserManagementApp from './UserManagementApp.vue';
-import locales from './locale/locales';
 import VueI18n from 'vue-i18n';
 import { LanguageUtil } from '@coscine/app-util';
 
@@ -17,8 +16,8 @@ Vue.use(VueI18n);
 
 jQuery(() => {
     const i18n = new VueI18n({
-      locale: LanguageUtil.getLanguage(), // set locale
-      messages: locales, // set locale messages
+      locale: LanguageUtil.getLanguage(),
+      messages: coscine.i18n.usermanagement,
       silentFallbackWarn: true,
     });