@dignite-ng/expand.cms 2.0.0-rc.1 → 2.0.0-rc.10

package/config/ng-package.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "../../../node_modules/ng-packagr/ng-entrypoint.schema.json",
+  "lib": {
+    "entryFile": "src/public-api.ts"
+  }
+}

package/config/src/cms-config.module.ts

@@ -0,0 +1,13 @@
+import { ModuleWithProviders, NgModule } from '@angular/core';
+import { CMS_ROUTE_PROVIDERS } from './providers/route.provider';
+import { Regionalization_Management_Setting_ROUTE_PROVIDERS } from '@dignite-ng/expand.regionalization-management/config';
+
+@NgModule()
+export class CmsConfigModule {
+  static forRoot(): ModuleWithProviders<CmsConfigModule> {
+    return {
+      ngModule: CmsConfigModule,
+      providers: [CMS_ROUTE_PROVIDERS,Regionalization_Management_Setting_ROUTE_PROVIDERS],
+    };
+  }
+}

package/config/{enums/index.d.ts → src/enums/index.ts}

@@ -1 +1 @@
-export * from './route-names';
+export * from './route-names';

package/config/src/enums/route-names.ts

@@ -0,0 +1,7 @@
+export  enum eCmsRouteNames {
+  Cms = 'Cms::Menu:Cms',
+  Entries = 'Cms::FormControl:Entry',
+  Settings = "Cms::Menu:Settings",
+  Fields = "Cms::Fields",
+  Sections = "Cms::Sections",
+}

package/config/{providers/index.d.ts → src/providers/index.ts}

@@ -1 +1 @@
-export * from './route.provider';
+export * from './route.provider';

package/config/src/providers/route.provider.ts

@@ -0,0 +1,68 @@
+import { eLayoutType, RoutesService } from '@abp/ng.core';
+import { APP_INITIALIZER } from '@angular/core';
+import { eCmsRouteNames } from '../enums/route-names';
+import { SettingTabsService } from '@abp/ng.setting-management/config';
+
+
+
+
+
+export const CMS_ROUTE_PROVIDERS = [
+  {
+    provide: APP_INITIALIZER,
+    useFactory: configureRoutes,
+    deps: [RoutesService, SettingTabsService],
+    multi: true,
+  },
+];
+
+
+export function configureRoutes(routesService: RoutesService, settingTabs: SettingTabsService) {
+  return () => {
+    routesService.add([
+      {
+        path: '/cms',
+        name: eCmsRouteNames.Cms,
+        iconClass: 'bi-archive-fill',
+        layout: eLayoutType.application,
+        requiredPolicy: 'CmsAdmin.Entry || CmsAdmin.Field || CmsAdmin.Site || CmsAdmin.Section',
+      },
+      {
+        path: '/cms/admin/entries',
+        name: eCmsRouteNames.Entries,
+        parentName: eCmsRouteNames.Cms,
+        iconClass: 'bi-file-earmark-text-fill',
+        layout: eLayoutType.application,
+        requiredPolicy: 'CmsAdmin.Entry',
+      },
+      {
+        path: '',
+        name: eCmsRouteNames.Settings,
+        parentName: eCmsRouteNames.Cms,
+        iconClass: 'fas fa fa-cog',
+        layout: eLayoutType.application,
+        requiredPolicy: 'CmsAdmin.Field  || CmsAdmin.Section',
+      },
+      {
+        path: '/cms/admin/fields',
+        name: eCmsRouteNames.Fields,
+        parentName: eCmsRouteNames.Settings,
+        iconClass: 'bi-file-earmark-text-fill',
+        layout: eLayoutType.application,
+        order: 1,
+        requiredPolicy: 'CmsAdmin.Field',
+      },
+      {
+        path: '/cms/admin/sections',
+        name: eCmsRouteNames.Sections,
+        parentName: eCmsRouteNames.Settings,
+        iconClass: 'bi bi-menu-button-wide-fill',
+        layout: eLayoutType.application,
+        order: 3,
+        requiredPolicy: 'CmsAdmin.Section',
+      },
+      
+
+    ]);
+  };
+}

package/config/{public-api.d.ts → src/public-api.ts}

@@ -1,3 +1,3 @@
-export * from './enums';
-export * from './cms-config.module';
-export * from './providers';
+export * from './enums';
+export * from './cms-config.module';
+export * from './providers';

package/ng-package.json

@@ -0,0 +1,10 @@
+{
+  "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
+  "dest": "../../dist/cms",
+  "lib": {
+    "entryFile": "src/public-api.ts"
+  },
+  "allowedNonPeerDependencies": [
+    "pinyin-pro"
+  ]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dignite-ng/expand.cms",
-  "version": "2.0.0-rc.01",
+  "version": "2.0.0-rc.10",
   "peerDependencies": {
     "@angular/common": "~18.1.0",
     "@angular/core": "~18.1.0"
@@ -9,29 +9,14 @@
     "pinyin-pro": "^3.19.6",
     "tslib": "^2.3.0"
   },
-  "allowedNonPeerDependencies": true,
+  "allowedNonPeerDependencies":true,
   "sideEffects": false,
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
-  },
-  "module": "fesm2022/dignite-ng-expand.cms.mjs",
-  "typings": "index.d.ts",
-  "exports": {
-    "./package.json": {
-      "default": "./package.json"
-    },
-    ".": {
-      "types": "./index.d.ts",
-      "esm2022": "./esm2022/dignite-ng-expand.cms.mjs",
-      "esm": "./esm2022/dignite-ng-expand.cms.mjs",
-      "default": "./fesm2022/dignite-ng-expand.cms.mjs"
-    },
-    "./config": {
-      "types": "./config/index.d.ts",
-      "esm2022": "./esm2022/config/dignite-ng-expand.cms-config.mjs",
-      "esm": "./esm2022/config/dignite-ng-expand.cms-config.mjs",
-      "default": "./fesm2022/dignite-ng-expand.cms-config.mjs"
-    }
   }
-}
+}
+
+
+
+

package/src/lib/cms-routing.module.ts

@@ -0,0 +1,102 @@
+import {  NgModule} from '@angular/core';
+import { Routes, RouterModule} from '@angular/router';
+import {
+  CreateComponent,
+  CreateFieldComponent,
+  CreateOrEditComponent,
+  EditComponent,
+  EditFieldComponent,
+  EntriesComponent,
+  FieldsComponent,
+  SectionsComponent,
+} from './components';
+import {
+  AuthGuard,
+  PermissionGuard,
+} from '@abp/ng.core';
+import { appentStyle } from './services/appent-content';
+import { Extensions_Props_Action_Token_Resolver } from './resolvers/extensions-props-action-token.resolver';
+
+const routes: Routes = [
+  {
+    path: 'admin',
+    canActivate: [AuthGuard, PermissionGuard],
+    resolve: [Extensions_Props_Action_Token_Resolver, appentStyle],
+    children: [
+      { 
+        path: 'entries',
+
+        children: [
+          {
+            path: '',
+            component: EntriesComponent,
+            data: { keep: true }
+          },
+          {
+            path: 'create',
+            component: CreateComponent,
+          },
+          {
+            path: ':entrieId/edit',
+            component: EditComponent,
+          },
+        ],
+      },
+      {
+        path: '',
+        children: [
+          {
+            path: 'fields',
+            children: [
+              {
+                path: '',
+                component: FieldsComponent,
+                data: { keep: true }
+              },
+              {
+                path: 'create',
+                component: CreateFieldComponent,
+              },
+              {
+                path: ':id/edit',
+                component: EditFieldComponent,
+              },
+            ],
+          },
+          {
+            path: 'sections',
+            children: [
+              {
+                path: '',
+                data: { keep: true },
+                component: SectionsComponent,
+              },
+              {
+                path: ':sectionsId/entry-types',
+                children: [
+                  {
+                    path: 'create',
+                    component: CreateOrEditComponent,
+                  },
+                  {
+                    path: ':entryTypesId/edit',
+                    component: CreateOrEditComponent,
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  },
+ 
+];
+
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class CmsRoutingModule {
+}

package/src/lib/cms.module.ts

@@ -0,0 +1,113 @@
+import { NgModule, NgModuleFactory, ModuleWithProviders } from '@angular/core';
+import { CoreModule, LazyModuleFactory } from '@abp/ng.core';
+import { ThemeSharedModule } from '@abp/ng.theme.shared';
+import { CmsRoutingModule } from './cms-routing.module';
+import {
+  CreateComponent,
+  CreateFieldComponent,
+  CreateOrEditComponent,
+  CreateOrEditEntriesComponent,
+  CreateOrEditFieldComponent,
+  EditComponent,
+  EditFieldComponent,
+  EntriesComponent,
+  FieldGroupComponent,
+  FieldsComponent,
+  SectionsComponent,
+  MatrixConfigComponent,
+  MatrixControlComponent,
+  TableConfigComponent,
+  TableControlComponent,
+  EntryConfigComponent,
+  EntryControlComponent,
+  cmsFieldControlGroup
+} from './components';
+import {
+  NgbDropdownModule,
+  NgbNavModule,
+  NgbAccordionModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import { PageModule } from '@abp/ng.components/page';
+import { NzSelectModule } from 'ng-zorro-antd/select';
+import { DynamicFormModule } from '@dignite-ng/expand.dynamic-form';
+import { Toolbar_Action_Contributors, Entity_Action_Contributors, Entity_Props_Contributors } from './resolvers/extensions-props-action-token.resolver';
+import { ExtensibleModule } from '@abp/ng.components/extensible';
+import { CreateOrEditSectionsModalComponent } from './components/admin/sections/create-or-edit-sections-modal.component';
+import {DragDropModule} from '@angular/cdk/drag-drop';
+import { NgxDatatableModule } from '@swimlane/ngx-datatable';
+// import { AdvancedEntityFiltersModule, CommercialUiModule } from '@volo/abp.commercial.ng.ui';
+
+@NgModule({
+  declarations: [
+    EntriesComponent,
+    FieldsComponent,
+    SectionsComponent,
+    FieldGroupComponent,
+    CreateFieldComponent,
+    EditFieldComponent,
+    CreateOrEditFieldComponent,
+    CreateOrEditComponent,
+    CreateComponent,
+    EditComponent,
+    CreateOrEditEntriesComponent,
+    TableConfigComponent,
+    TableControlComponent,
+    MatrixConfigComponent,
+    MatrixControlComponent,
+    EntryConfigComponent,
+    EntryControlComponent,
+    CreateOrEditSectionsModalComponent,
+  ],
+  imports: [
+    CoreModule,
+    ThemeSharedModule,
+    CmsRoutingModule,
+    NgbNavModule,
+    NgbAccordionModule,
+    NgbDropdownModule,
+    PageModule,
+    NzSelectModule,
+    DynamicFormModule,
+    ExtensibleModule,
+    DragDropModule,
+    NgxDatatableModule,
+    // CommercialUiModule,
+  ],
+  exports: [
+    TableConfigComponent,
+    TableControlComponent,
+    MatrixConfigComponent,
+    MatrixControlComponent,
+    EntryConfigComponent,
+    EntryControlComponent,
+  ],
+  providers: [
+    
+  ],
+
+})
+export class CmsModule {
+
+  static forChild(options: any = {}): ModuleWithProviders<CmsModule> {
+    return {
+      ngModule: CmsModule,
+      providers: [
+        {
+          provide: Toolbar_Action_Contributors,
+          useValue: options.toolbarActionContributors,
+        },
+        {
+          provide: Entity_Action_Contributors,
+          useValue: options.entityActionContributors,
+        },
+        {
+          provide: Entity_Props_Contributors,
+          useValue: options.entityPropContributors,
+        },
+      ],
+    };
+  }
+  static forLazy(options: any = {}): NgModuleFactory<CmsModule> {
+    return new LazyModuleFactory(CmsModule.forChild(options));
+  }
+}

package/src/lib/components/admin/entries/create-or-edit-entries.component.html

@@ -0,0 +1,137 @@
+<form [formGroup]="formEntity">
+    <div class="row">
+        <div class="col-md-8">
+            <div class="card">
+                <div class="card-body">
+                    <div class="mb-3">
+                        <div class="form-label">{{'Cms::Title' | abpLocalization}}</div>
+                        <input type="text" class="form-control" formControlName="title"
+                            (blur)="setTitleToSlugBlur($event)">
+                    </div>
+                    <ng-container *ngIf="isLoad">
+                        <ng-container *ngFor="let item of showEntryType?.fieldTabs;let i =index">
+                            <ng-container *ngFor="let el of item.fields;let i1 =index">
+                                <ng-container *ngIf="el&&formEntity">
+                                    <df-dynamic [fields]="el"
+                                        [selected]="entryInfo ? entryInfo.extraProperties[el.field.name] : ''"
+                                        [parentFiledName]="'extraProperties'"
+                                        [culture]="cultureInput.value"  [entity]="formEntity"></df-dynamic>
+                                </ng-container>
+                            </ng-container>
+                        </ng-container>
+                    </ng-container>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-4">
+            <div class="card">
+                <div class="card-body">
+                    <div class="mb-3">
+                        <div class="form-label">{{'Cms::Slug' | abpLocalization}}</div>
+                        <input type="text" class="form-control" formControlName="slug">
+                    </div>
+                    <div class="mb-3">
+                        <div class="form-label">{{'AbpUi::Languages' | abpLocalization}}</div>
+                        <select class="form-select form-select-multiple" formControlName="culture">
+                            <ng-container *ngFor="let item of languagesList;let i =index">
+                                <option [value]="item.cultureName">{{item.displayName}}</option>
+                            </ng-container>
+                        </select>
+                        <div class="text-danger" *ngIf="cultureInput.dirty">
+                            {{cultureInput?.errors?.repetition}}
+                        </div>
+                    </div>
+                    <div class="mb-3" *ngIf="sectionInfo.type===1">
+                        <label class="form-label" for="parentId">{{'Cms::ParentEntry' | abpLocalization}}</label>
+                        <select class="form-select " formControlName="parentId">
+                            <option value=""></option>
+                            <ng-container *ngFor="let item of entryList;let i =index">
+                                <option [value]="item.id">{{item.title}}</option>
+                                <ng-container *ngFor="let el of item.children">
+                                    <ng-container *ngTemplateOutlet="childTemplate; context: {
+                                        $implicit: {
+                                        value: el,
+                                        }
+                                    }"></ng-container>
+                                    <ng-template #childTemplate let-data>
+                                        <option [value]="data.value.id">
+                                            <ng-container *ngFor="let item of data.value.layer">--</ng-container>
+                                            {{data.value.title}}
+                                        </option>
+                                        <ng-container *ngFor="let el of data.value.children">
+                                            <ng-container *ngTemplateOutlet="childTemplate; context: {
+                                                $implicit: {
+                                                value: el,
+                                                }
+                                            }"></ng-container>
+                                        </ng-container>
+                                    </ng-template>
+                                </ng-container>
+                            </ng-container>
+                        </select>
+                    </div>
+                    <div class="mb-3">
+                        <label class="form-label" for="publishTime">{{'Cms::PublishTime' | abpLocalization}}</label>
+                        <input type="datetime-local" class="form-control" step="1" formControlName="publishTime">
+                    </div>
+                    <div class="mb-3" *ngIf="isEdit">
+                        <label class="form-label" for="Version">{{'Cms::Version' | abpLocalization}}</label>
+                        <ul class="list-group">
+                            <ng-container *ngFor="let item of AllVersionsList">
+                                <li
+                                    class="list-group-item flex-between d-flex align-items-center justify-content-between">
+                                    <div>
+                                        {{item.initialVersionId?(item.creationTime| date: 'YYYY/MM/dd HH:mm:s'):('Cms::InitialVersion' | abpLocalization)}}
+                                        <span class="badge text-bg-success ms-1"
+                                            *ngIf="item.isActivatedVersion">{{'Cms::IsActive' | abpLocalization}}</span>
+                                        <span class="badge text-bg-primary ms-1"
+                                            *ngIf="item.id === entryVersionId">{{'Cms::Editing' |
+                                            abpLocalization}}</span>
+                                    </div>
+                                    <div>
+                                        <div ngbDropdown class="d-inline-block">
+                                            <button type="button" class="btn btn-link-primary p-2 "
+                                                style="line-height: 0;" id="dropdownBasic1" ngbDropdownToggle>
+                                            </button>
+                                            <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
+                                                <button ngbDropdownItem type="button" *ngIf="!item.isActivatedVersion"
+                                                    (click)="ActivatedVersion(item.id)">
+                                                    <i class="fas fa-check me-1"></i>{{'Cms::IsActive' |
+                                                    abpLocalization}}
+                                                </button>
+                                                <button ngbDropdownItem type="button"
+                                                    routerLink="/cms/admin/entries/create"
+                                                    [queryParams]="{entryVersionId:item.id}">
+                                                    <i class="fas fa-plus me-1"></i>{{'Cms::NewVersion' |
+                                                    abpLocalization}}
+                                                </button>
+                                                <button ngbDropdownItem type="button" (click.stop)="toEditUrl(item.id)"
+                                                    *ngIf="item.id !== entryVersionId">
+                                                    <i class="fas fa-edit me-1"></i>{{'AbpUi::Edit' | abpLocalization}}
+                                                </button>
+                                                <button ngbDropdownItem type="button"
+                                                    (click.stop)="delectVersion(item.id)"
+                                                    *ngIf="item.initialVersionId&&!item.isActivatedVersion&&item.id !== entryVersionId">
+                                                    <i class="fas fa-trash me-1"></i>{{'AbpUi::Delete' |
+                                                    abpLocalization}}
+                                                </button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </li>
+                            </ng-container>
+                        </ul>
+                    </div>
+                    <div class="mb-3" *ngIf="entryInfo">
+                        <label class="form-label" for="versionNotes">{{'Cms::RevisionNotes' | abpLocalization}}</label>
+                        <textarea class="form-control" formControlName="versionNotes" rows="3"></textarea>
+                    </div>
+
+
+
+                </div>
+            </div>
+        </div>
+    </div>
+    <button type="submit" style="display: none;" #submitclick></button>
+</form>

package/src/lib/components/admin/entries/create-or-edit-entries.component.spec.ts

@@ -0,0 +1,21 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CreateOrEditEntriesComponent } from './create-or-edit-entries.component';
+
+describe('CreateOrEditEntriesComponent', () => {
+  let component: CreateOrEditEntriesComponent;
+  let fixture: ComponentFixture<CreateOrEditEntriesComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [CreateOrEditEntriesComponent]
+    });
+    fixture = TestBed.createComponent(CreateOrEditEntriesComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});