@reldens/cms 0.16.0 → 0.19.0

package/README.md

@@ -157,18 +157,18 @@ Templates support dynamic content blocks, entity rendering, and collections with
 ```html
 <!-- Loop through records with full template rendering -->
 <collection name="cmsBlocks" filters="{status: 'active'}">
-  <div class="block">
-    <h3>{{row.title}}</h3>
-    <div class="content">{{row.content}}</div>
-  </div>
+    <div class="block">
+        <h3>{{row.title}}</h3>
+        <div class="content">{{row.content}}</div>
+    </div>
 </collection>
 
 <collection name="articles" filters="{category: 'technology'}">
-  <div class="article">
-    <h4>{{row.title}}</h4>
-    <p>{{row.summary}}</p>
-    <img src="{{row.featured_image}}" alt="{{row.title}}">
-  </div>
+    <div class="article">
+        <h4>{{row.title}}</h4>
+        <p>{{row.summary}}</p>
+        <img src="{{row.featured_image}}" alt="{{row.title}}">
+    </div>
 </collection>
 
 <!-- With pagination and sorting -->
@@ -178,8 +178,91 @@ Templates support dynamic content blocks, entity rendering, and collections with
     <p>{{row.summary}}</p>
   </div>
 </collection>
+
+<!-- Paginated collections with navigation -->
+<collection name="articles" 
+    filters="{featured: true}" 
+    data="{limit: 10, sortBy: 'created_at', sortDirection: 'desc'}" 
+    pagination="articles-1" 
+    container="pagedCollection"
+    prevPages="2" 
+    nextPages="2">
+    <div class="article-card">
+        <h4>{{row.title}}</h4>
+        <p>{{row.summary}}</p>
+        <span class="date">{{row.created_at}}</span>
+    </div>
+</collection>
+
+<!-- Multiple paginated collections on the same page -->
+<collection name="news" 
+    filters="{category: 'technology'}" 
+    data="{limit: 5, sortBy: 'published_at'}" 
+    pagination="news-tech" 
+    container="customPager">
+    <article>{{row.title}}</article>
+</collection>
+
+<collection name="events" 
+    filters="{upcoming: true}" 
+    data="{limit: 8}" 
+    pagination="events-upcoming"
+    prevPages="3"
+    nextPages="1">
+    <div class="event">{{row.title}} - {{row.date}}</div>
+</collection>
+```
+
+**Pagination Attributes:**
+- `pagination="collection-id"` - Enables pagination with unique identifier
+- `container="templateName"` - Custom pagination template (defaults to "pagedCollection")
+- `prevPages="2"` - Number of previous page links to show (default: 2)
+- `nextPages="2"` - Number of next page links to show (default: 2)
+
+**Pagination URL Parameters:**
+Pagination state is managed via URL query parameters:
+```
+/articles?articles-1-key={"page":2,"limit":10,"sortBy":"created_at","sortDirection":"desc"}
+/news?news-tech-key={"page":3,"limit":5,"category":"technology"}
+```
+
+**Custom Pagination Template:**
+Create `templates/partials/pagedCollection.html`:
+```html
+<div class="row paginated-contents">
+    <div class="collection-content col-lg-12 mt-2 mb-2">
+        {{&collectionContentForCurrentPage}}
+    </div>
+    <div class="pagination col-lg-12 mt-2 mb-2">
+        <ul class="pagination-list">
+            {{#prevPageUrl}}
+                <li><a href="{{prevPageUrl}}" class="page-link">{{&prevPageLabel}}</a></li>
+            {{/prevPageUrl}}
+            {{#prevPages}}
+                <li><a href="{{pageUrl}}" class="page-link">{{&pageLabel}}</a></li>
+            {{/prevPages}}
+            <li class="current">{{&currentPage}}</li>
+            {{#nextPages}}
+                <li><a href="{{pageUrl}}" class="page-link">{{&pageLabel}}</a></li>
+            {{/nextPages}}
+            {{#nextPageUrl}}
+                <li><a href="{{nextPageUrl}}" class="page-link">{{&nextPageLabel}}</a></li>
+            {{/nextPageUrl}}
+        </ul>
+    </div>
+</div>
 ```
 
+**Available Pagination Template Variables:**
+- `{{&collectionContentForCurrentPage}}` - Rendered collection items for current page
+- `{{currentPage}}` - Current page number
+- `{{totalPages}}` - Total number of pages
+- `{{totalRecords}}` - Total number of records
+- `{{prevPageUrl}}` / `{{nextPageUrl}}` - Previous/next page URLs
+- `{{&prevPageLabel}}` / `{{&nextPageLabel}}` - Previous/next link labels ("Previous"/"Next")
+- `{{#prevPages}}` / `{{#nextPages}}` - Arrays of page objects with `pageUrl` and `pageLabel`
+- `{{hasNextPage}}` / `{{hasPrevPage}}` - Boolean flags for navigation availability
+
 **Custom Partials with Variables:**
 
 *New HTML-style partial tags:*

package/admin/reldens-admin-client.css

@@ -817,6 +817,18 @@
         }
     }
 
+    .extra-actions {
+        display: flex;
+        width: 100%;
+        justify-content: end;
+        margin: 1rem 0;
+    }
+
+    .cache-clean-form {
+        display: block;
+        text-align: center;
+    }
+
     & .extra-content-container, .default-room-container {
         display: flex;
         flex-direction: column;
@@ -836,4 +848,47 @@
         overflow: auto;
     }
 
+    .cache-confirm-dialog {
+        border: none;
+        border-radius: 8px;
+        padding: 0;
+        max-width: 500px;
+        width: 90%;
+        box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+    }
+
+    .cache-confirm-dialog::backdrop {
+        background-color: rgba(0, 0, 0, 0.5);
+    }
+
+    .cache-dialog-content {
+        padding: 1rem;
+    }
+
+    .cache-dialog-content h5 {
+        margin: 0 0 1rem 0;
+        font-size: 18px;
+        color: var(--darkGrey);
+    }
+
+    .cache-dialog-content p {
+        margin: 0 0 1rem 0;
+        color: var(--darkGrey);
+    }
+
+    .cache-warning {
+        padding: 1rem;
+        background-color: #fff3cd;
+        border: 1px solid #ffeaa7;
+        border-radius: 4px;
+        color: #856404;
+        margin-bottom: 1rem;
+    }
+
+    .cache-dialog-actions {
+        display: flex;
+        justify-content: flex-end;
+        gap: 1rem;
+    }
+
 }

package/admin/reldens-admin-client.js

@@ -276,4 +276,28 @@ window.addEventListener('DOMContentLoaded', () => {
         }
     }
 
+    // cache clear all functionality:
+    let cacheClearAllButton = document.querySelector('.cache-clear-all-button');
+    let cacheConfirmDialog = document.querySelector('.cache-confirm-dialog');
+    let cacheDialogCancel = document.querySelector('.cache-dialog-cancel');
+    let cacheClearForm = document.querySelector('.cache-clear-form');
+    if(cacheClearAllButton && cacheConfirmDialog){
+        cacheClearAllButton.addEventListener('click', () => {
+            cacheConfirmDialog.showModal();
+        });
+    }
+    if(cacheDialogCancel && cacheConfirmDialog){
+        cacheDialogCancel.addEventListener('click', () => {
+            cacheConfirmDialog.close();
+        });
+    }
+    if(cacheClearForm){
+        cacheClearForm.addEventListener('submit', (event) => {
+            let submitButton = cacheClearForm.querySelector('button[type="submit"]');
+            if(submitButton){
+                submitButton.disabled = true;
+            }
+        });
+    }
+
 });

package/admin/templates/cache-clean-button.html

@@ -0,0 +1,4 @@
+<form class="cache-clean-form" method="POST" action="{{&cacheCleanRoute}}">
+    <input type="hidden" name="routeId" value="{{routeId}}"/>
+    <button class="button button-warning cache-clean-btn" type="submit">{{&buttonText}}</button>
+</form>

package/admin/templates/clear-all-cache-button.html

@@ -0,0 +1,18 @@
+<button type="button" class="button button-warning cache-clear-all-button">
+    {{buttonText}}
+</button>
+<dialog class="cache-confirm-dialog">
+    <div class="cache-dialog-content">
+        <h5>{{confirmTitle}}</h5>
+        <p>{{confirmMessage}}</p>
+        <div class="alert cache-warning">
+            <strong>{{warningText}}</strong> {{warningMessage}}
+        </div>
+        <div class="cache-dialog-actions">
+            <button type="button" class="button button-secondary cache-dialog-cancel">{{cancelText}}</button>
+            <form method="post" action="{{clearAllCacheRoute}}" class="cache-clear-form">
+                <button type="submit" class="button button-danger">{{confirmText}}</button>
+            </form>
+        </div>
+    </div>
+</dialog>

package/admin/templates/fields/view/textarea.html

@@ -1 +1 @@
-<textarea name="{{&fieldName}}" id="{{&fieldName}}" disabled="disabled">{{&fieldValue}}</textarea>
+<textarea name="{{&fieldName}}" id="{{&fieldName}}" disabled="disabled">{{fieldValue}}</textarea>

package/bin/reldens-cms-generate-entities.js

@@ -7,7 +7,7 @@
  */
 
 const { Manager } = require('../index');
-const { Logger } = require('@reldens/utils');
+const { Logger, sc } = require('@reldens/utils');
 const { FileHandler } = require('@reldens/server-utils');
 const readline = require('readline');
 
@@ -18,22 +18,84 @@ class CmsEntitiesGenerator
     {
         this.args = process.argv.slice(2);
         this.projectRoot = process.cwd();
-        this.isOverride = this.args.includes('--override');
-        this.prismaClientPath = this.extractArgument('--prisma-client');
-        this.driver = this.extractArgument('--driver') || process.env.RELDENS_STORAGE_DRIVER || 'prisma';
+        this.config = {};
+        this.parseArguments();
     }
 
-    extractArgument(argumentName)
+    parseArguments()
     {
-        let argIndex = this.args.indexOf(argumentName);
-        if(-1 === argIndex || argIndex + 1 >= this.args.length){
-            return null;
+        for(let i = 0; i < this.args.length; i++){
+            let arg = this.args[i];
+            if(!arg.startsWith('--')){
+                continue;
+            }
+            let equalIndex = arg.indexOf('=');
+            if(-1 === equalIndex){
+                let flag = arg.substring(2);
+                if('override' === flag || 'dry-prisma' === flag || 'help' === flag || 'h' === flag){
+                    this.config[flag] = true;
+                }
+                continue;
+            }
+            let key = arg.substring(2, equalIndex);
+            let value = arg.substring(equalIndex + 1);
+            this.config[key] = value;
         }
-        return this.args[argIndex + 1];
+    }
+
+    shouldShowHelp()
+    {
+        return 0 === this.args.length || sc.get(this.config, 'help', false) || sc.get(this.config, 'h', false);
+    }
+
+    showHelp()
+    {
+        Logger.info('');
+        Logger.info('Reldens CMS Entities Generator');
+        Logger.info('==============================');
+        Logger.info('');
+        Logger.info('Usage: npx reldens-cms-generate-entities [options]');
+        Logger.info('');
+        Logger.info('Options:');
+        Logger.info('  --prisma-client=[path]           Path to Prisma client (e.g., ./prisma/client)');
+        Logger.info('  --driver=[driver]                Storage driver (default: prisma)');
+        Logger.info('  --override                       Force regeneration and overwrite existing files');
+        Logger.info('  --dry-prisma                     Skip Prisma schema generation');
+        Logger.info('  --help, -h                       Show this help message');
+        Logger.info('');
+        Logger.info('Examples:');
+        Logger.info('  npx reldens-cms-generate-entities --prisma-client=./prisma/client --driver=prisma');
+        Logger.info('  npx reldens-cms-generate-entities --override --dry-prisma');
+        Logger.info('  npx reldens-cms-generate-entities --help');
+        Logger.info('');
+    }
+
+    get isOverride()
+    {
+        return sc.get(this.config, 'override', false);
+    }
+
+    get isDryPrisma()
+    {
+        return sc.get(this.config, 'dry-prisma', false);
+    }
+
+    get prismaClientPath()
+    {
+        return sc.get(this.config, 'prisma-client', null);
+    }
+
+    get driver()
+    {
+        return sc.get(this.config, 'driver', process.env.RELDENS_STORAGE_DRIVER || 'prisma');
     }
 
     async run()
     {
+        if(this.shouldShowHelp()){
+            this.showHelp();
+            return true;
+        }
         if(this.isOverride){
             let confirmed = await this.confirmOverride();
             if(!confirmed){
@@ -41,6 +103,9 @@ class CmsEntitiesGenerator
                 return false;
             }
         }
+        if(this.isDryPrisma){
+            Logger.info('Running in dry-prisma mode - skipping Prisma schema generation.');
+        }
         let managerConfig = {projectRoot: this.projectRoot};
         if('prisma' === this.driver){
             let prismaClient = await this.loadPrismaClient();
@@ -55,7 +120,7 @@ class CmsEntitiesGenerator
         }
         Logger.debug('Reldens CMS Manager instance created for entities generation.');
         await manager.initializeDataServer();
-        let success = await manager.installer.generateEntities(manager.dataServer, this.isOverride, false);
+        let success = await manager.installer.generateEntities(manager.dataServer, this.isOverride, false, this.isDryPrisma);
         if(!success){
             Logger.error('Entities generation failed.');
             return false;
@@ -68,24 +133,26 @@ class CmsEntitiesGenerator
     {
         let clientPath = this.prismaClientPath;
         if(!clientPath){
-            clientPath = FileHandler.joinPaths(process.cwd(), 'generated-entities', 'prisma');
+            return false;
         }
-        if(!FileHandler.exists(clientPath)){
-            Logger.error('Prisma client not found at: '+clientPath);
-            Logger.error('Please ensure the client exists or specify a custom path with --prisma-client');
+        let resolvedPath = clientPath.startsWith('./') 
+            ? FileHandler.joinPaths(process.cwd(), clientPath.substring(2))
+            : clientPath;
+        if(!FileHandler.exists(resolvedPath)){
+            Logger.error('Prisma client not found at: '+resolvedPath);
             return false;
         }
         try {
-            let PrismaClientModule = require(clientPath);
+            let PrismaClientModule = require(resolvedPath);
             let PrismaClient = PrismaClientModule.PrismaClient || PrismaClientModule.default?.PrismaClient;
             if(!PrismaClient){
-                Logger.error('PrismaClient not found in module: '+clientPath);
+                Logger.error('PrismaClient not found in module: '+resolvedPath);
                 return false;
             }
-            Logger.debug('Prisma client loaded from: '+clientPath);
+            Logger.debug('Prisma client loaded from: '+resolvedPath);
             return new PrismaClient();
         } catch (error) {
-            Logger.error('Failed to load Prisma client from '+clientPath+': '+error.message);
+            Logger.error('Failed to load Prisma client from '+resolvedPath+': '+error.message);
             return false;
         }
     }

package/bin/reldens-cms.js

@@ -2,7 +2,7 @@
 
 /**
  *
- * Reldens - CMS - CLI Installer
+ * Reldens - CMS - CLI
  *
  */
 
@@ -21,10 +21,10 @@ if(FileHandler.exists(indexPath)){
 
 let managerConfig = {projectRoot};
 let entitiesPath = FileHandler.joinPaths(
-    projectRoot, 
-    'generated-entities', 
-    'models', 
-    'prisma', 
+    projectRoot,
+    'generated-entities',
+    'models',
+    'prisma',
     'registered-models-prisma.js'
 );
 
@@ -48,4 +48,4 @@ manager.start().then((result) => {
 }).catch((error) => {
     Logger.critical('Failed to start CMS:', error);
     process.exit();
-});
+});