@cocreate/crud-server 1.26.0 → 1.28.0

package/.github/workflows/automated.yml

@@ -1,83 +1,70 @@
-name: Automated Deployment
-"on":
-    push:
-        branches:
-            - master
-jobs:
-    about:
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v3
-            - name: setup nodejs
-              uses: actions/setup-node@v3
-              with:
-                  node-version: 16
-            - name: Jaid/action-sync-node-meta
-              uses: jaid/action-sync-node-meta@v1.4.0
-              with:
-                  direction: overwrite-github
-                  githubToken: "${{ secrets.GITHUB }}"
-    release:
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v3
-            - name: setup nodejs
-              uses: actions/setup-node@v3
-              with:
-                  node-version: 14
-            - name: Semantic Release
-              uses: cycjimmy/semantic-release-action@v3
-              id: semantic
-              with:
-                  extra_plugins: |
-                      @semantic-release/changelog
-                      @semantic-release/git
-                      @semantic-release/github
-              env:
-                  GITHUB_TOKEN: "${{ secrets.GITHUB }}"
-                  NPM_TOKEN: "${{ secrets.NPM_TOKEN }}"
-        outputs:
-            new_release_published: "${{ steps.semantic.outputs.new_release_published }}"
-            new_release_version: "${{ steps.semantic.outputs.new_release_version }}"
-
-    upload:
-      runs-on: ubuntu-latest
-
-      steps:
-        - name: Checkout
-          uses: actions/checkout@v3
-
-        - name: Setup Node.js
-          uses: actions/setup-node@v3
-          with:
-            node-version: 16
-
-        - name: Get Environment Variables
-          run: |
-            echo "organization_id=${{ secrets.COCREATE_ORGANIZATION_ID }}" >> $GITHUB_ENV
-            echo "key=${{ secrets.COCREATE_KEY }}" >> $GITHUB_ENV
-            echo "host=${{ secrets.COCREATE_HOST }}" >> $GITHUB_ENV
-
-        - name: Install @cocreate/cli
-          run: npm install -g @cocreate/cli
-
-        - name: CoCreate CLI Upload
-          run: coc upload
-
-    # docs:
-    #     runs-on: ubuntu-latest
-    #     steps:
-    #         - name: Checkout
-    #           uses: actions/checkout@v3
-    #         - name: setup nodejs
-    #           uses: actions/setup-node@v3
-    #           with:
-    #               node-version: 16
-    #         - name: update documentation
-    #           uses: CoCreate-app/CoCreate-docs@master
-    #           env:
-    #             organization_id: ${{ secrets.COCREATE_ORGANIZATION_ID }}
-    #             key: ${{ secrets.COCREATE_KEY }}
-    #             host: ${{ secrets.COCREATE_HOST }}
+name: Automated Workflow
+on:
+  push:
+    branches:
+      - master
+jobs:
+  about:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+      - name: Jaid/action-sync-node-meta
+        uses: jaid/action-sync-node-meta@v1.4.0
+        with:
+          direction: overwrite-github
+          githubToken: "${{ secrets.GITHUB }}"
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 14
+      - name: Semantic Release
+        uses: cycjimmy/semantic-release-action@v3
+        id: semantic
+        with:
+          extra_plugins: |
+            @semantic-release/changelog
+            @semantic-release/git
+            @semantic-release/github
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB }}"
+          NPM_TOKEN: "${{ secrets.NPM_TOKEN }}"
+    outputs:
+      new_release_published: "${{ steps.semantic.outputs.new_release_published }}"
+      new_release_version: "${{ steps.semantic.outputs.new_release_version }}"
+  upload:
+    runs-on: ubuntu-latest
+    needs: release
+    if: needs.release.outputs.new_release_published == 'true'
+    env:
+      VERSION: "${{ needs.release.outputs.new_release_version }}"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+      - name: Set npm registry auth
+        run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
+      - name: Install dependencies
+        run: yarn install
+      - name: Build
+        run: yarn build
+      - name: Set Environment Variables
+        run: |
+          echo "organization_id=${{ secrets.COCREATE_ORGANIZATION_ID }}" >> $GITHUB_ENV
+          echo "key=${{ secrets.COCREATE_KEY }}" >> $GITHUB_ENV
+          echo "host=${{ secrets.COCREATE_HOST }}" >> $GITHUB_ENV
+      - name: CoCreate Upload
+        run: coc upload
+

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+# [1.28.0](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.27.0...v1.28.0) (2023-08-21)
+
+
+### Features
+
+* Update cocreate dependencies for the latest features and bug fixes ([2bd1716](https://github.com/CoCreate-app/CoCreate-crud-server/commit/2bd171618046d5e31f74442b45cc381278228096))
+
+# [1.27.0](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.26.0...v1.27.0) (2023-08-21)
+
+
+### Bug Fixes
+
+* /dist/CoCreate.js updated to https://CoCreate.app/dist/CoCreate.js ([1f82f69](https://github.com/CoCreate-app/CoCreate-crud-server/commit/1f82f6921aa6dc39410263eea7e4ee4b535d7039))
+* replace cdn with /dist ([7ad2004](https://github.com/CoCreate-app/CoCreate-crud-server/commit/7ad20046820f19a12917edd13b379da652ac391b))
+* update file uploader ([f6000d9](https://github.com/CoCreate-app/CoCreate-crud-server/commit/f6000d9e0ed2569d35d8cd7f81b7dece04446c25))
+
+
+### Features
+
+* handling stats from multiple storages. ([5d06d16](https://github.com/CoCreate-app/CoCreate-crud-server/commit/5d06d169ce12ed4000e529f54fc3404380997f57))
+
 # [1.26.0](https://github.com/CoCreate-app/CoCreate-crud-server/compare/v1.25.0...v1.26.0) (2023-08-17)
 
 

package/docs/index.html

@@ -216,14 +216,8 @@
                 </div>
             </div>
         </div>
-        <script>
-            var CoCreateConfig = {
-                key: "2061acef-0451-4545-f754-60cf8160",
-                organization_id: "5ff747727005da1c272740ab",
-            };
-        </script>
 
         <!--CoCreateJS-->
-        <script src="https://cdn.cocreate.app/latest/CoCreate.min.js"></script>
+        <script src="https://CoCreate.app/dist/CoCreate.js"></script>
     </body>
 </html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/crud-server",
-  "version": "1.26.0",
+  "version": "1.28.0",
   "description": "CoCreate-crud-server",
   "keywords": [
     "cocreate-crud",
@@ -40,8 +40,8 @@
   },
   "homepage": "https://cocreate.app/docs/CoCreate-crud-server",
   "dependencies": {
-    "@cocreate/config": "^1.2.0",
-    "@cocreate/utils": "^1.22.0",
+    "@cocreate/config": "^1.4.0",
+    "@cocreate/utils": "^1.23.1",
     "csvtojson": "^2.0.10",
     "json-2-csv": "^3.10.3"
   }

package/src/index.js

@@ -27,19 +27,19 @@ class CoCreateCrudServer {
             }
         })
 
-        let dbUrl
+        let storageUrl
         if (this.config.storage) {
             if (typeof this.config.storage === 'string')
                 this.config.storage = JSON.parse(this.config.storage)
             let defaultStorage = Object.keys(this.config.storage)
-            dbUrl = this.config.storage[defaultStorage[0]].url
+            storageUrl = this.config.storage[defaultStorage[0]].url
         }
 
         if (!this.config.organization_id)
             console.log('Could not find the organization_id')
-        if (!dbUrl)
+        if (!storageUrl)
             console.log('Could not find a url in your storage object')
-        if (!dbUrl && !this.config.organization_id)
+        if (!storageUrl && !this.config.organization_id)
             process.exit()
 
         if (this.wsManager) {
@@ -82,15 +82,15 @@ class CoCreateCrudServer {
 
 
 
-                let storage = this.storages.get(data.organization_id)
-                if (storage === false)
+                let storages = this.storages.get(data.organization_id)
+                if (storages === false)
                     return resolve({ storage: false, error: 'A storage or database could not be found' })
 
-                if (!storage) {
+                if (!storages) {
                     if (data.organization_id === this.config.organization_id) {
-                        storage = this.config.storage
-                        if (storage)
-                            this.storages.set(data.organization_id, storage)
+                        storages = this.config.storage
+                        if (storages)
+                            this.storages.set(data.organization_id, storages)
                     } else {
                         let organization = await this.send({
                             method: 'read.object',
@@ -102,8 +102,8 @@ class CoCreateCrudServer {
                         if (organization && organization.object && organization.object[0])
                             organization = organization.object[0]
                         if (organization && organization.storage) {
-                            storage = organization.storage
-                            this.storages.set(data.organization_id, storage)
+                            storages = organization.storage
+                            this.storages.set(data.organization_id, storages)
                         } else {
                             this.storages.set(data.organization_id, false)
                             if (organization)
@@ -117,6 +117,7 @@ class CoCreateCrudServer {
                 if (!data['timeStamp'])
                     data['timeStamp'] = new Date().toISOString()
 
+                // TODO: manage error handling if if no method defined
                 if (data.method.startsWith('update') && data.upsert != false)
                     data.upsert = true
 
@@ -157,23 +158,26 @@ class CoCreateCrudServer {
                 }
 
                 if (!data.storage || !data.storage.length) {
-                    data.storage = [Object.keys(storage)[0]]
+                    data.storage = [Object.keys(storages)[0]]
                 } else if (!Array.isArray(data.storage))
                     data.storage = [data.storage]
 
                 for (let i = 0; i < data.storage.length; i++) {
-                    if (storage && storage[data.storage[i]]) {
-                        let db = storage[data.storage[i]]
-
-                        if (db.provider && this.databases[db.provider]) {
-                            if (!Array.isArray(db.url))
-                                db.url = [db.url]
-                            for (let i = 0; i < db.url.length; i++) {
-                                data['dbUrl'] = db.url[i]
-                                data = await this.databases[db.provider][action](data)
+                    if (storages && storages[data.storage[i]]) {
+                        let storage = storages[data.storage[i]]
+
+                        if (storage.provider && this.databases[storage.provider]) {
+                            if (!Array.isArray(storage.url))
+                                storage.url = [storage.url]
+                            for (let i = 0; i < storage.url.length; i++) {
+                                data['storageName'] = data.storage[i]
+                                data['storageUrl'] = storage.url[i]
+                                data = await this.databases[storage.provider][action](data)
                             }
 
                             if (data.filter) {
+                                if (!data.type)
+                                    data.type = data.method.split('.').pop()
                                 if (data.filter.sort && data.filter.sort.length)
                                     data[data.type] = sortData(array, data.filter.sort)
                                 if (data.filter.index && data.filter.limit) {
@@ -186,7 +190,9 @@ class CoCreateCrudServer {
                     }
                 }
 
-                delete data.dbUrl
+                delete data.storageUrl
+                delete data.storageName
+
                 if (socket) {
                     if (data.organization_id === this.config.organization_id && socket.config.organization_id !== data.organization_id) {
                         this.wsManager.broadcast({