Merge branch 'master' of github.com:SoftwareBrothers/admin-bro

senlion-web · Sep 3, 2020 · 8132b6d · 8132b6d
2 parents 10ce2dc + 4efb147
commit 8132b6d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "admin-bro",
-  "version": "3.2.3",
+  "version": "3.2.4",
   "description": "Admin panel for apps written in node.js",
   "main": "index.js",
   "types": "index.d.ts",

diff --git a/src/admin-bro.ts b/src/admin-bro.ts
@@ -309,9 +309,10 @@ class AdminBro {
    * AdminBro.bundle('./path/to/new-sidebar/component', 'SidebarFooter')
    */
   public static bundle(src: string, componentName?: OverridableComponent): string {
+    const nextId = Object.keys(global.UserComponents || {}).length + 1
     const extensions = ['.jsx', '.js', '.ts', '.tsx']
     let filePath = ''
-    const componentId = componentName || _.uniqueId('Component')
+    const componentId = componentName || `Component${nextId}`
     if (src[0] === '/') {
       filePath = src
     } else {

diff --git a/src/backend/adapters/base-resource.ts b/src/backend/adapters/base-resource.ts
@@ -177,7 +177,7 @@ class BaseResource {
    * Finds one Record in the Resource by its id
    *
    * @param  {String} id      uniq id of the Resource Record
-   * @return {Promise<BaseRecord>}   record
+   * @return {Promise<BaseRecord> | null}   record
    * @abstract
    */
   async findOne(id: string): Promise<BaseRecord | null> {