Merge branch 'main' into 30515-create-basic-relationship-field-struct…

…ure-for-edit-contentlet

core-web/libs/edit-content/src/lib/fields/dot-edit-content-file-field/components/dot-select-existing-file/dot-select-existing-file.component.ts

@@ -76,6 +76,7 @@ export class DotSelectExistingFileComponent implements OnInit {
         const data = this.#dialogConfig?.data as DialogData;
         const inputType = data?.inputType === INPUT_TYPES.Image ? ['image'] : [];
         this.store.setMimeTypes(inputType);
+        this.store.loadContent();
     }
 
     /**

core-web/libs/edit-content/src/lib/fields/dot-edit-content-file-field/components/dot-select-existing-file/store/select-existing-file.store.ts

@@ -207,7 +207,6 @@ export const SelectExisingFileStore = signalStore(
     withHooks((store) => ({
         onInit: () => {
             store.loadFolders();
-            store.loadContent();
         }
     }))
 );

core-web/libs/sdk/analytics/.eslintrc.json

@@ -0,0 +1,25 @@
+{
+    "extends": ["../../../.eslintrc.base.json"],
+    "ignorePatterns": ["!**/*"],
+    "overrides": [
+        {
+            "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+            "rules": {}
+        },
+        {
+            "files": ["*.ts", "*.tsx"],
+            "rules": {}
+        },
+        {
+            "files": ["*.js", "*.jsx"],
+            "rules": {}
+        },
+        {
+            "files": ["*.json"],
+            "parser": "jsonc-eslint-parser",
+            "rules": {
+                "@nx/dependency-checks": "error"
+            }
+        }
+    ]
+}

core-web/libs/sdk/analytics/.swcrc

@@ -0,0 +1,29 @@
+{
+    "jsc": {
+        "target": "es2017",
+        "parser": {
+            "syntax": "typescript",
+            "decorators": true,
+            "dynamicImport": true
+        },
+        "transform": {
+            "decoratorMetadata": true,
+            "legacyDecorator": true
+        },
+        "keepClassNames": true,
+        "externalHelpers": true,
+        "loose": true
+    },
+    "module": {
+        "type": "es6"
+    },
+    "sourceMaps": true,
+    "exclude": [
+        "jest.config.ts",
+        ".*\\.spec.tsx?$",
+        ".*\\.test.tsx?$",
+        "./src/jest-setup.ts$",
+        "./**/jest-setup.ts$",
+        ".*.js$"
+    ]
+}

core-web/libs/sdk/analytics/README.md

@@ -0,0 +1,91 @@
+# @dotcms/analytics
+
+`@dotcms/analytics` is the official dotCMS JavaScript library for Content Analytics that helps track events and analytics in your webapps. Currently available as an IIFE (Immediately Invoked Function Expression) module for direct browser usage.
+
+## Features
+
+-   **Simple Browser Integration**: Easy to implement via script tags using IIFE implementation
+-   **Event Tracking**: Simple API to track custom events with additional properties
+-   **Automatic PageView**: Option to automatically track page views
+-   **Debug Mode**: Optional debug logging for development
+
+## Installation
+
+Include the script in your HTML page:
+
+```html
+<script src="analytics.iife.js"></script>
+```
+
+## Configuration
+
+The script can be configured using data attributes:
+
+-   **data-analytics-server**: URL of the server where events will be sent. If not provided, it defaults to the current location (window.location.href).
+-   **data-analytics-debug**: Presence of this attribute enables debug logging (no value needed)
+-   **data-analytics-auto-page-view**: Presence of this attribute enables automatic page view tracking (no value needed)
+-   **data-analytics-key**: Required. API key for authentication with the analytics server. This key is provided by the DotCMS Analytics app.
+
+## Usage
+
+### Automatic PageView Tracking
+
+When `data-analytics-auto-page-view` is enabled, the library will automatically send a page view event to dotCMS when the page loads. If this attribute is not present, you'll need to manually track page views and other events using the tracking API.
+
+```html
+<!-- Automatic page view tracking enabled & debug logging enabled -->
+<script
+    src="ca.min.js"
+    data-analytics-server="http://localhost:8080"
+    data-analytics-key="dev-key-123"
+    data-analytics-auto-page-view
+    data-analytics-debug></script>
+
+<!-- Without automatic tracking - events must be sent manually -->
+<script
+    src="ca.min.js"
+    data-analytics-server="http://localhost:8080"
+    data-analytics-debug
+    data-analytics-key="dev-key-123"></script>
+```
+
+## Roadmap
+
+The following features are planned for future releases:
+
+1. **Manual Event Tracking**
+
+    - Manual track events support for IIFE implementation
+
+2. **Headless Support**
+
+    - React integration for event tracking
+    - Next.js integration for event tracking
+    - Angular integration for event tracking
+
+## Contributing
+
+GitHub pull requests are the preferred method to contribute code to dotCMS. Before any pull requests can be accepted, an automated tool will ask you to agree to the [dotCMS Contributor's Agreement](https://gist.github.com/wezell/85ef45298c48494b90d92755b583acb3).
+
+## Licensing
+
+dotCMS comes in multiple editions and as such is dual licensed. The dotCMS Community Edition is licensed under the GPL 3.0 and is freely available for download, customization and deployment for use within organizations of all stripes. dotCMS Enterprise Editions (EE) adds a number of enterprise features and is available via a supported, indemnified commercial license from dotCMS. For the differences between the editions, see [the feature page](http://dotcms.com/cms-platform/features).
+
+## Support
+
+If you need help or have any questions, please [open an issue](https://github.com/dotCMS/core/issues/new/choose) in the GitHub repository.
+
+## Documentation
+
+Always refer to the official [DotCMS documentation](https://www.dotcms.com/docs/latest/) for comprehensive guides and API references.
+
+## Getting Help
+
+| Source          | Location                                                            |
+| --------------- | ------------------------------------------------------------------- |
+| Installation    | [Installation](https://dotcms.com/docs/latest/installation)         |
+| Documentation   | [Documentation](https://dotcms.com/docs/latest/table-of-contents)   |
+| Videos          | [Helpful Videos](http://dotcms.com/videos/)                         |
+| Forums/Listserv | [via Google Groups](https://groups.google.com/forum/#!forum/dotCMS) |
+| Twitter         | @dotCMS                                                             |
+| Main Site       | [dotCMS.com](https://dotcms.com/)                                   |

core-web/libs/sdk/analytics/jest.config.ts

@@ -0,0 +1,28 @@
+/* eslint-disable */
+import { readFileSync } from 'fs';
+
+// Reading the SWC compilation config and remove the "exclude"
+// for the test files to be compiled by SWC
+const { exclude: _, ...swcJestConfig } = JSON.parse(readFileSync(`${__dirname}/.swcrc`, 'utf-8'));
+
+// disable .swcrc look-up by SWC core because we're passing in swcJestConfig ourselves.
+// If we do not disable this, SWC Core will read .swcrc and won't transform our test files due to "exclude"
+if (swcJestConfig.swcrc === undefined) {
+    swcJestConfig.swcrc = false;
+}
+
+// Uncomment if using global setup/teardown files being transformed via swc
+// https://nx.dev/nx-api/jest/documents/overview#global-setupteardown-with-nx-libraries
+// jest needs EsModule Interop to find the default exported setup/teardown functions
+// swcJestConfig.module.noInterop = false;
+
+export default {
+    displayName: 'analytics',
+    preset: '../../../jest.preset.js',
+    transform: {
+        '^.+\\.[tj]s$': ['@swc/jest', swcJestConfig]
+    },
+    moduleFileExtensions: ['ts', 'js', 'html'],
+    testEnvironment: 'jsdom',
+    coverageDirectory: '../../../coverage/libs/sdk/analytics'
+};

core-web/libs/sdk/analytics/package.json

@@ -0,0 +1,28 @@
+{
+    "name": "@dotcms/analytics",
+    "version": "0.0.1-alpha.38",
+    "description": "Official JavaScript library for Content Analytics with DotCMS.",
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/dotCMS/core.git#main"
+    },
+    "keywords": [
+        "dotCMS",
+        "CMS",
+        "Content Management",
+        "Analytics",
+        "Tracking"
+    ],
+    "author": "dotcms <[email protected]>",
+    "license": "MIT",
+    "bugs": {
+        "url": "https://github.com/dotCMS/core/issues"
+    },
+    "homepage": "https://github.com/dotCMS/core/tree/main/core-web/libs/sdk/analytics/README.md",
+    "peerDependencies": {
+        "analytics": "^0.8.14",
+        "vite": "^5.0.0"
+    },
+    "main": "./index.cjs.js",
+    "module": "./index.esm.js"
+}

core-web/libs/sdk/analytics/project.json

@@ -0,0 +1,43 @@
+{
+    "name": "analytics",
+    "$schema": "../../../node_modules/nx/schemas/project-schema.json",
+    "sourceRoot": "libs/sdk/analytics/src",
+    "projectType": "library",
+    "targets": {
+        "build": {
+            "executor": "@nx/rollup:rollup",
+            "outputs": ["{options.outputPath}"],
+            "options": {
+                "outputPath": "dist/libs/sdk/analytics",
+                "main": "libs/sdk/analytics/src/index.ts",
+                "tsConfig": "libs/sdk/analytics/tsconfig.lib.json",
+                "project": "libs/sdk/analytics/package.json",
+                "compiler": "swc",
+                "format": ["esm", "cjs"]
+            }
+        },
+        "build:standalone": {
+            "executor": "@nx/vite:build",
+            "outputs": ["{options.outputPath}"],
+            "options": {
+                "outputPath": "../../core/dotCMS/src/main/resources/ca/html",
+                "main": "libs/sdk/analytics/src/lib/standalone.ts",
+                "tsConfig": "libs/sdk/analytics/tsconfig.lib.json",
+                "project": "libs/sdk/analytics/package.json"
+            }
+        },
+        "nx-release-publish": {
+            "options": {
+                "packageRoot": "dist/{projectRoot}"
+            }
+        },
+        "test": {
+            "executor": "@nx/jest:jest",
+            "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+            "options": {
+                "jestConfig": "libs/sdk/analytics/jest.config.ts"
+            }
+        }
+    },
+    "tags": ["type:lib", "scope:sdk", "feature:analytics"]
+}

core-web/libs/sdk/analytics/src/index.ts

@@ -0,0 +1 @@
+export * from './lib/analytics';

core-web/libs/sdk/analytics/src/lib/analytics.spec.ts

@@ -0,0 +1,92 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+import Analytics from 'analytics';
+
+import { DotAnalytics } from './analytics';
+import { dotAnalyticsPlugin } from './plugin/dot-analytics.plugin';
+
+// Mock the analytics library
+jest.mock('analytics');
+jest.mock('./plugin/dot-analytics.plugin');
+
+describe('DotAnalytics', () => {
+    const mockConfig = {
+        debug: false,
+        server: 'http://test.com',
+        key: 'test-key',
+        autoPageView: false
+    };
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        // Reset singleton instance between tests
+        (DotAnalytics as any).instance = null;
+    });
+
+    describe('getInstance', () => {
+        it('should create single instance', () => {
+            const instance1 = DotAnalytics.getInstance(mockConfig);
+            const instance2 = DotAnalytics.getInstance(mockConfig);
+
+            expect(instance1).toBe(instance2);
+        });
+
+        it('should maintain same instance even with different config', () => {
+            const instance1 = DotAnalytics.getInstance(mockConfig);
+            const instance2 = DotAnalytics.getInstance({ ...mockConfig, debug: true });
+
+            expect(instance1).toBe(instance2);
+        });
+    });
+
+    describe('ready', () => {
+        it('should initialize analytics with correct config', async () => {
+            const instance = DotAnalytics.getInstance(mockConfig);
+            const mockAnalytics = {};
+            (Analytics as jest.Mock).mockReturnValue(mockAnalytics);
+            (dotAnalyticsPlugin as jest.Mock).mockReturnValue({ name: 'mock-plugin' });
+
+            await instance.ready();
+
+            expect(Analytics).toHaveBeenCalledWith({
+                app: 'dotAnalytics',
+                debug: false,
+                plugins: [{ name: 'mock-plugin' }]
+            });
+            expect(dotAnalyticsPlugin).toHaveBeenCalledWith(mockConfig);
+        });
+
+        it('should only initialize once', async () => {
+            const instance = DotAnalytics.getInstance(mockConfig);
+
+            await instance.ready();
+            await instance.ready();
+
+            expect(Analytics).toHaveBeenCalledTimes(1);
+        });
+
+        it('should throw error if initialization fails', async () => {
+            const instance = DotAnalytics.getInstance(mockConfig);
+            const error = new Error('Init failed');
+            (Analytics as jest.Mock).mockImplementation(() => {
+                throw error;
+            });
+
+            // eslint-disable-next-line @typescript-eslint/no-empty-function
+            const consoleErrorMock = jest.spyOn(console, 'error').mockImplementation(() => {});
+
+            try {
+                await instance.ready();
+            } catch (e) {
+                expect(e).toEqual(error);
+                expect(console.error).toHaveBeenCalledWith(
+                    'Failed to initialize DotAnalytics:',
+                    error
+                );
+            }
+
+            // Restore console.error
+            consoleErrorMock.mockRestore();
+        });
+    });
+});