From 13d3b687d2adc6085307a60657f2ba07e1994f54 Mon Sep 17 00:00:00 2001
From: Eugen Ciur <eugen@papermerge.com>
Date: Thu, 13 Jan 2022 21:23:13 +0100
Subject: [PATCH] upgrade to emberjs 4.1
---
.github/workflows/ci.yml | 45 -----------------------------
app/components/modal/new_folder.hbs | 1 +
app/components/modal/new_folder.js | 2 +-
app/controllers/login.js | 5 ++--
app/routes/authenticated/index.js | 5 ++--
app/services/requests.js | 2 +-
app/utils/index.js | 6 ----
config/environment.js | 2 +-
package-lock.json | 41 ++++++++++++++++++++++++++
package.json | 1 +
10 files changed, 52 insertions(+), 58 deletions(-)
delete mode 100644 .github/workflows/ci.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
deleted file mode 100644
index 06541de..0000000
--- a/.github/workflows/ci.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: CI
-
-on:
- push:
- branches:
- - main
- - master
- pull_request: {}
-
-concurrency:
- group: ci-${{ github.head_ref || github.ref }}
- cancel-in-progress: true
-
-jobs:
- lint:
- name: "Lint"
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout@v2
- - name: Install Node
- uses: actions/setup-node@v2
- with:
- node-version: 12.x
- cache: npm
- - name: Install Dependencies
- run: npm ci
- - name: Lint
- run: npm run lint
-
- test:
- name: "Test"
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout@v2
- - name: Install Node
- uses: actions/setup-node@v2
- with:
- node-version: 12.x
- cache: npm
- - name: Install Dependencies
- run: npm ci
- - name: Run Tests
- run: npm test
diff --git a/app/components/modal/new_folder.hbs b/app/components/modal/new_folder.hbs
index 281d0cf..12464b4 100644
--- a/app/components/modal/new_folder.hbs
+++ b/app/components/modal/new_folder.hbs
@@ -5,6 +5,7 @@
@onClose={{@onClose}}
@onSubmit={{this.onSubmit}}
@onCancel={{this.onCancel}}
+ {{on-key 'Enter' this.onSubmit}}
...attributes
>
<label for="folder-title" class="form-label">Folder title:</label>
diff --git a/app/components/modal/new_folder.js b/app/components/modal/new_folder.js
index 3645052..e4359b8 100644
--- a/app/components/modal/new_folder.js
+++ b/app/components/modal/new_folder.js
@@ -1,7 +1,7 @@
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';
import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
export default class NewFolderComponent extends Component {
diff --git a/app/controllers/login.js b/app/controllers/login.js
index bca9016..f96ddeb 100644
--- a/app/controllers/login.js
+++ b/app/controllers/login.js
@@ -1,5 +1,5 @@
import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
import { action } from '@ember/object';
import { tracked } from '@glimmer/tracking';
@@ -7,6 +7,7 @@ import { tracked } from '@glimmer/tracking';
export default class LoginController extends Controller {
@tracked errorMessage;
@service session;
+ @service router;
@action
async authenticate(username, password) {
@@ -22,7 +23,7 @@ export default class LoginController extends Controller {
if (this.session.isAuthenticated) {
// What to do with all this success?
- this.transitionToRoute('authenticated.index');
+ this.router.transitionTo('authenticated.index');
}
}
}
diff --git a/app/routes/authenticated/index.js b/app/routes/authenticated/index.js
index e763300..f7931f5 100644
--- a/app/routes/authenticated/index.js
+++ b/app/routes/authenticated/index.js
@@ -1,10 +1,11 @@
import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
export default class IndexRoute extends Route {
@service store;
@service session;
+ @service router;
@service currentUser;
async beforeModel(transition) {
@@ -14,7 +15,7 @@ export default class IndexRoute extends Route {
this.session.requireAuthentication(transition, 'login');
await this.currentUser.loadCurrentUser();
this.currentUser.user.getHomeFolder().then((home_folder) => {
- that.replaceWith("authenticated.nodes", home_folder.id);
+ that.router.replaceWith("authenticated.nodes", home_folder.id);
});
}
diff --git a/app/services/requests.js b/app/services/requests.js
index 64e23d2..6ac3589 100644
--- a/app/services/requests.js
+++ b/app/services/requests.js
@@ -1,7 +1,7 @@
import Service from '@ember/service';
// eslint-disable-next-line ember/no-computed-properties-in-native-classes
import { computed } from '@ember/object';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
import { base_url } from 'papermerge/utils';
diff --git a/app/utils/index.js b/app/utils/index.js
index 8d86c31..c86c1f5 100644
--- a/app/utils/index.js
+++ b/app/utils/index.js
@@ -97,25 +97,19 @@ function ws_base_url() {
base = `wss://${window.location.host}`;
}
- console.log(`base=${base}`);
-
if (!ENV.APP.WS_HOST) {
if (!ENV.APP.WS_NAMESPACE) {
- console.log(`ws_base_url() = ${base}`);
return base;
}
- console.log(`ws_base_url() = ${base}/${ENV.APP.WS_NAMESPACE}`);
return `${base}/${ENV.APP.WS_NAMESPACE}`;
}
if (!ENV.APP.WS_NAMESPACE) {
- console.log(`ws_base_url() = ${ENV.APP.WS_HOST}`);
return `${ENV.APP.WS_HOST}`;
}
- console.log(`ws_base_url() = ${ENV.APP.WS_HOST}/${ENV.APP.WS_NAMESPACE}`);
return `${ENV.APP.WS_HOST}/${ENV.APP.WS_NAMESPACE}`;
}
diff --git a/config/environment.js b/config/environment.js
index dc50d2d..be4e8a2 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -5,7 +5,7 @@ module.exports = function (environment) {
modulePrefix: 'papermerge',
environment,
rootURL: '/',
- locationType: 'auto',
+ locationType: 'history',
EmberENV: {
FEATURES: {
// Here you can enable experimental features on an ember canary build
diff --git a/package-lock.json b/package-lock.json
index 1c1b9d7..8b9f7c0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15066,6 +15066,18 @@
"ember-cli-babel": "^7.26.5"
}
},
+ "ember-keyboard": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/ember-keyboard/-/ember-keyboard-7.0.0.tgz",
+ "integrity": "sha512-NuFZqIU1SahX0dFWqBJ8rD30cQF92RbuVPwbHTYU0SJFhVltYen6G66b3u2PkshK/WpdGHDL8XS+hZvpsoP2DA==",
+ "dev": true,
+ "requires": {
+ "ember-cli-babel": "^7.26.6",
+ "ember-cli-htmlbars": "^6.0.1",
+ "ember-modifier": "^2.1.2 || ^3.0.0",
+ "ember-modifier-manager-polyfill": "^1.2.0"
+ }
+ },
"ember-load-initializers": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ember-load-initializers/-/ember-load-initializers-2.1.2.tgz",
@@ -15336,6 +15348,35 @@
}
}
},
+ "ember-modifier-manager-polyfill": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/ember-modifier-manager-polyfill/-/ember-modifier-manager-polyfill-1.2.0.tgz",
+ "integrity": "sha512-bnaKF1LLKMkBNeDoetvIJ4vhwRPKIIumWr6dbVuW6W6p4QV8ZiO+GdF8J7mxDNlog9CeL9Z/7wam4YS86G8BYA==",
+ "dev": true,
+ "requires": {
+ "ember-cli-babel": "^7.10.0",
+ "ember-cli-version-checker": "^2.1.2",
+ "ember-compatibility-helpers": "^1.2.0"
+ },
+ "dependencies": {
+ "ember-cli-version-checker": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-2.2.0.tgz",
+ "integrity": "sha512-G+KtYIVlSOWGcNaTFHk76xR4GdzDLzAS4uxZUKdASuFX0KJE43C6DaqL+y3VTpUFLI2FIkAS6HZ4I1YBi+S3hg==",
+ "dev": true,
+ "requires": {
+ "resolve": "^1.3.3",
+ "semver": "^5.3.0"
+ }
+ },
+ "semver": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "dev": true
+ }
+ }
+ },
"ember-page-title": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/ember-page-title/-/ember-page-title-7.0.0.tgz",
diff --git a/package.json b/package.json
index 9facb3a..251405e 100644
--- a/package.json
+++ b/package.json
@@ -57,6 +57,7 @@
"ember-simple-auth": "^4.1.1",
"ember-source": "^4.1.0",
"ember-template-lint": "^3.16.0",
+ "ember-keyboard": "^7.0.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-ember": "^10.5.8",
--
GitLab