Added ability to change uri manually

src/controllers/aliases.js

@@ -13,7 +13,7 @@ class Aliases {
    * @returns {Promise<Alias>}
    */
   static async get(aliasName) {
-    const alias = await Alias.get(aliasName.slice(1));
+    const alias = await Alias.get(aliasName);
 
     if (!alias.id) {
       throw new Error('Entity with given alias does not exist');

src/controllers/pages.js

@@ -117,13 +117,15 @@ class Pages {
     if (!page._id) {
       throw new Error('Page with given id does not exist');
     }
-    const oldAlias = page.uri;
+    const previousUri = page.uri;
 
     page.data = data;
+
     const pagePromise = page.save();
     const updatedPage = await pagePromise;
 
-    Alias.markAsDeprecated(oldAlias);
+    if (updatedPage.uri !== previousUri) {
+      Alias.markAsDeprecated(previousUri);
 
       const alias = new Alias({
         id: updatedPage._id,
@@ -132,6 +134,8 @@ class Pages {
       });
 
       alias.save();
+    }
+
     return pagePromise;
   }
 

src/frontend/js/modules/writing.js

@@ -27,7 +27,8 @@ export default class Writing {
     this.nodes = {
       editorWrapper: null,
       saveButton: null,
-      parentIdSelector: null
+      parentIdSelector: null,
+      uriInput: null
     };
   }
 
@@ -61,6 +62,7 @@ export default class Writing {
       this.saveButtonClicked();
     });
     this.nodes.parentIdSelector = moduleEl.querySelector('[name="parent"]');
+    this.nodes.uriInput = moduleEl.querySelector('[name="uri-input"]');
   };
 
   /**
@@ -91,6 +93,7 @@ export default class Writing {
 
     return {
       parent: this.nodes.parentIdSelector.value,
+      uri: this.nodes.uriInput ? this.nodes.uriInput.value : '',
       body: editorData
     };
   }

src/frontend/styles/components/writing.pcss

@@ -18,3 +18,13 @@
     color: var(--color-text-second);
   }
 }
+
+.uri-input {
+  border: 1px solid rgba(201, 201, 204, 0.48);
+  box-shadow: inset 0 1px 2px 0 rgba(35, 44, 72, 0.06);
+  border-radius: 3px;
+  padding: 10px 12px;
+  outline: none;
+  width: 100%;
+  box-sizing: border-box;
+}

src/frontend/styles/vars.pcss

@@ -3,6 +3,7 @@
   --color-text-second: #7B7E89;
   --color-line-gray: #E8E8EB;
   --color-link-active: #388AE5;
+  --color-gray-border: rgba(201, 201, 204, 0.48);
 
   /**
    * Site layout sizes

src/models/alias.js

@@ -26,7 +26,11 @@ class Alias {
    */
   static async get(aliasName) {
     const hash = md5(aliasName);
-    const data = await aliasesDb.findOne({hash});
+    let data = await aliasesDb.findOne({hash: hash, deprecated: false});
+
+    if (!data) {
+      data = await aliasesDb.findOne({hash: hash});
+    }
 
     return new Alias(data);
   }

src/models/page.js

@@ -148,11 +148,11 @@ class Page {
    * @returns {Promise<Page>}
    */
   async save() {
-    let newUri = translateString(this.title.toLowerCase()).split(' ').join('-');
+    let newUri = this.uri;
     let pageWithSameUri = await Page.getByUri(newUri);
     let pageWithSameUriCount = 0;
 
-    while (pageWithSameUri._id) {
+    while (pageWithSameUri._id && pageWithSameUri._id !== this._id) {
       pageWithSameUriCount++;
       pageWithSameUri = await Page.getByUri(newUri + `-${pageWithSameUriCount}`);
     }

src/routes/aliases.js

@@ -11,8 +11,7 @@ const aliasTypes = require('../constants/aliasTypes');
  */
 router.get('*', async (req, res) => {
   try {
-    console.log('url ', req.originalUrl);
+    const alias = await Aliases.get(req.originalUrl.slice(1));
-    const alias = await Aliases.get(req.originalUrl);
 
     switch (alias.type) {
       case aliasTypes.PAGE: {

src/routes/api/pages.js

@@ -76,8 +76,8 @@ router.post('/page/:id', multer.any(), async (req, res) => {
   const {id} = req.params;
 
   try {
-    const {title, body, parent} = req.body;
+    const {title, body, parent, uri} = req.body;
-    const page = await Pages.update(id, {title, body, parent});
+    const page = await Pages.update(id, {title, body, parent, uri});
 
     res.json({
       success: true,

src/views/pages/form.twig

@@ -23,7 +23,7 @@
           <option value="0">Root</option>
           {% for _page in pagesAvailable %}
             {% if _page._id != currentPageId %}
-              <option value="{{ _page._id }}" {{ page is not empty and page._parent == _page._id ? 'selected' : ''}}>
+              <option value="{{ _page._id }}" {{ page is not empty and page._parent == _page._id ? 'selected' : '' }}>
                 {{ _page.title }}
               </option>
             {% endif %}
@@ -34,5 +34,10 @@
         Save
       </span>
     </header>
+    {% if page is not empty %}
+      <main>
+        <input type="text" class="uri-input" name="uri-input" placeholder="Uri(Optional)" value="{{ page.uri }}">
+      </main>
+    {% endif %}
   </section>
 {% endblock %}