@magic-xpa/cli 4.1200.0-dev4120.99 → 4.1200.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/package.json +1 -1
  2. package/src/schematics/magic-utils/env.js +3 -2
  3. package/src/schematics/magic-utils/env.js.map +1 -1
  4. package/src/schematics/magic-utils/env.ts +3 -2
  5. package/src/schematics/mg-add/files/src/app/magic/magic.gen.lib.module.ts +2 -2
  6. package/templates/angular/src/app.module.ts +2 -2
  7. package/templates/component/view.component.ts +11 -1
  8. package/templates/themes/basicHiddenHTML/table.ejs +1 -1
  9. package/templates/themes/material/combobox.ejs +15 -0
  10. package/templates/themes/table/HTMLTable/table.ejs +1 -1
  11. package/templates/themes/table/repeatable/table.ejs +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@magic-xpa/cli",
3
- "version": "4.1200.0-dev4120.99",
3
+ "version": "4.1200.0",
4
4
  "license": "SEE LICENSE IN EULA.pdf",
5
5
  "description": "Magic CLI for MagicWeb applications",
6
6
  "keywords": [
package/src/schematics/magic-utils/env.js CHANGED
@@ -23,10 +23,11 @@ exports.dependencies = [
23
23
  { name: "@angular/animations", version: '^19.1.3' },
24
24
  { name: "font-awesome", version: '^4.7.0' },
25
25
  { name: "hammerjs", version: '^2.0.8' },
26
- { name: "ngx-infinite-scroll", version: '^17.0.0' },
26
+ { name: "ngx-infinite-scroll", version: '^19.0.0' },
27
27
  { name: "ng-dynamic-component", version: '~10.7.0' },
28
- { name: "ngx-currency", version: "^17.0.0" },
28
+ { name: "ngx-currency", version: "^19.0.0" },
29
29
  { name: "ngx-mask", version: "^13.1.15" },
30
+ { name: "crypto-js", version: "^4.2.0" },
30
31
  // Time masking dependencies (hh:mm, hh:mm:ss, hh:mm:ss:mss)
31
32
  { name: "@maskito/angular", version: "^1.4.0" },
32
33
  { name: "@maskito/core", version: "^1.4.0" },
package/src/schematics/magic-utils/env.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"env.js","sourceRoot":"","sources":["env.ts"],"names":[],"mappings":";;;AAKa,QAAA,YAAY,GAAW,gBAAgB,CAAC;AACxC,QAAA,oBAAoB,GAAG,oBAAoB,CAAC;AAC5C,QAAA,mBAAmB,GAAI,kBAAkB,CAAC;AAC1C,QAAA,UAAU,GAAa,OAAO,CAAC;AAC/B,QAAA,gBAAgB,GAAO,+BAA+B,CAAC;AACvD,QAAA,2BAA2B,GAAI,oBAAoB,CAAC;AACpD,QAAA,aAAa,GAAI,KAAK,oBAAY,gBAAgB,CAAC;AACnD,QAAA,WAAW,GAAM,KAAK,oBAAY,cAAc,CAAC;AAE9D,MAAa,aAAa;IACxB,YAAY,OAAc,EAAE,UAAiB;QAC3C,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC;QACpB,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC;IAC5B,CAAC;CAGF;AAPD,sCAOC;AAEU,QAAA,YAAY,GAAG;IAExB,wBAAwB;IACxB,EAAC,IAAI,EAAE,mBAAmB,EAAI,OAAO,EAAE,SAAS,EAAC;IACjD,EAAC,IAAI,EAAE,cAAc,EAAS,OAAO,EAAE,SAAS,EAAC;IACjD,EAAC,IAAI,EAAE,qBAAqB,EAAE,OAAO,EAAE,SAAS,EAAC;IACjD,EAAC,IAAI,EAAE,cAAc,EAAS,OAAO,EAAE,QAAQ,EAAC;IAChD,EAAC,IAAI,EAAE,UAAU,EAAa,OAAO,EAAE,QAAQ,EAAC;IAEhD,EAAC,IAAI,EAAE,qBAAqB,EAAG,OAAO,EAAE,SAAS,EAAC;IAClD,EAAC,IAAI,EAAE,sBAAsB,EAAE,OAAO,EAAE,SAAS,EAAC;IAClD,EAAC,IAAI,EAAE,cAAc,EAAU,OAAO,EAAE,SAAS,EAAC;IAClD,EAAC,IAAI,EAAE,UAAU,EAAc,OAAO,EAAE,UAAU,EAAC;IAEnD,4DAA4D;IAC5D,EAAC,IAAI,EAAE,kBAAkB,EAAO,OAAO,EAAE,QAAQ,EAAC;IAClD,EAAC,IAAI,EAAE,eAAe,EAAU,OAAO,EAAE,QAAQ,EAAC;IAClD,EAAC,IAAI,EAAE,cAAc,EAAW,OAAO,EAAE,QAAQ,EAAC;CAEnD,CAAC;AAEW,QAAA,eAAe,GAAG;IAC7B,EAAC,IAAI,EAAE,sBAAsB,EAAE,OAAO,EAAE,SAAS,EAAC;CACnD,CAAC;AACW,QAAA,GAAG,GAAU,EAAS,CAAC","sourcesContent":["// TODO(PK): hard-code for now, will query npm repo\n// to get this info in the future\nimport { MagicMetadata } from \"./metadata.class\";\nimport { IEnv } from \"../../types/interfaces/env.interface\";\n\nexport const METADATA_DIR = `magic-metadata`;\nexport const GEN_COMPONENTS_ARRAY = 'magicGenComponents';\nexport const GEN_COMPONENTS_HASH = 'magicGenCmpsHash';\nexport const GEN_FOLDER = 'magic';\nexport const MAGIC_CLI_FOLDER = './node_modules/@magic-xpa/cli';\nexport const GEN_LAZY_LOAD_MODULES_ARRAY = 'LazyLoadModulesMap';\nexport const manifest_path = `./${METADATA_DIR}/manifest.json`;\nexport const config_path = `./${METADATA_DIR}/config.json`;\n\nexport class Idependencies {\n constructor(setName:string, setVersion:string){\n this.name = setName;\n this.version = setVersion;\n }\n name:string;\n version:string;\n}\n\nexport var dependencies = [\n\n // material dependencies\n {name: \"@angular/material\" , version: '^19.1.1'},\n {name: \"@angular/cdk\" , version: '^19.1.1'},\n {name: \"@angular/animations\", version: '^19.1.3'},\n {name: \"font-awesome\" , version: '^4.7.0'},\n {name: \"hammerjs\" , version: '^2.0.8'},\n\n {name: \"ngx-infinite-scroll\" , version: '^17.0.0'},\n {name: \"ng-dynamic-component\", version: '~10.7.0'},\n {name: \"ngx-currency\" , version: \"^17.0.0\"},\n {name: \"ngx-mask\" , version: \"^13.1.15\"},\n\n // Time masking dependencies (hh:mm, hh:mm:ss, hh:mm:ss:mss)\n {name: \"@maskito/angular\" , version: \"^1.4.0\"},\n {name: \"@maskito/core\" , version: \"^1.4.0\"},\n {name: \"@maskito/kit\" , version: \"^1.4.0\"}\n\n];\n\nexport const devDependencies = [\n {name: \"@types/stacktrace-js\", version: '^0.0.32'}\n];\nexport const env : IEnv = {} as any;\n\n"]}
1
+ {"version":3,"file":"env.js","sourceRoot":"","sources":["env.ts"],"names":[],"mappings":";;;AAKa,QAAA,YAAY,GAAW,gBAAgB,CAAC;AACxC,QAAA,oBAAoB,GAAG,oBAAoB,CAAC;AAC5C,QAAA,mBAAmB,GAAI,kBAAkB,CAAC;AAC1C,QAAA,UAAU,GAAa,OAAO,CAAC;AAC/B,QAAA,gBAAgB,GAAO,+BAA+B,CAAC;AACvD,QAAA,2BAA2B,GAAI,oBAAoB,CAAC;AACpD,QAAA,aAAa,GAAI,KAAK,oBAAY,gBAAgB,CAAC;AACnD,QAAA,WAAW,GAAM,KAAK,oBAAY,cAAc,CAAC;AAE9D,MAAa,aAAa;IACxB,YAAY,OAAc,EAAE,UAAiB;QAC3C,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC;QACpB,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC;IAC5B,CAAC;CAGF;AAPD,sCAOC;AAEU,QAAA,YAAY,GAAG;IAExB,wBAAwB;IACxB,EAAC,IAAI,EAAE,mBAAmB,EAAI,OAAO,EAAE,SAAS,EAAC;IACjD,EAAC,IAAI,EAAE,cAAc,EAAS,OAAO,EAAE,SAAS,EAAC;IACjD,EAAC,IAAI,EAAE,qBAAqB,EAAE,OAAO,EAAE,SAAS,EAAC;IACjD,EAAC,IAAI,EAAE,cAAc,EAAS,OAAO,EAAE,QAAQ,EAAC;IAChD,EAAC,IAAI,EAAE,UAAU,EAAa,OAAO,EAAE,QAAQ,EAAC;IAEhD,EAAC,IAAI,EAAE,qBAAqB,EAAG,OAAO,EAAE,SAAS,EAAC;IAClD,EAAC,IAAI,EAAE,sBAAsB,EAAE,OAAO,EAAE,SAAS,EAAC;IAClD,EAAC,IAAI,EAAE,cAAc,EAAU,OAAO,EAAE,SAAS,EAAC;IAClD,EAAC,IAAI,EAAE,UAAU,EAAc,OAAO,EAAE,UAAU,EAAC;IACnD,EAAC,IAAI,EAAE,WAAW,EAAa,OAAO,EAAE,QAAQ,EAAC;IAEjD,4DAA4D;IAC5D,EAAC,IAAI,EAAE,kBAAkB,EAAO,OAAO,EAAE,QAAQ,EAAC;IAClD,EAAC,IAAI,EAAE,eAAe,EAAU,OAAO,EAAE,QAAQ,EAAC;IAClD,EAAC,IAAI,EAAE,cAAc,EAAW,OAAO,EAAE,QAAQ,EAAC;CAEnD,CAAC;AAEW,QAAA,eAAe,GAAG;IAC7B,EAAC,IAAI,EAAE,sBAAsB,EAAE,OAAO,EAAE,SAAS,EAAC;CACnD,CAAC;AACW,QAAA,GAAG,GAAU,EAAS,CAAC","sourcesContent":["// TODO(PK): hard-code for now, will query npm repo\n// to get this info in the future\nimport { MagicMetadata } from \"./metadata.class\";\nimport { IEnv } from \"../../types/interfaces/env.interface\";\n\nexport const METADATA_DIR = `magic-metadata`;\nexport const GEN_COMPONENTS_ARRAY = 'magicGenComponents';\nexport const GEN_COMPONENTS_HASH = 'magicGenCmpsHash';\nexport const GEN_FOLDER = 'magic';\nexport const MAGIC_CLI_FOLDER = './node_modules/@magic-xpa/cli';\nexport const GEN_LAZY_LOAD_MODULES_ARRAY = 'LazyLoadModulesMap';\nexport const manifest_path = `./${METADATA_DIR}/manifest.json`;\nexport const config_path = `./${METADATA_DIR}/config.json`;\n\nexport class Idependencies {\n constructor(setName:string, setVersion:string){\n this.name = setName;\n this.version = setVersion;\n }\n name:string;\n version:string;\n}\n\nexport var dependencies = [\n\n // material dependencies\n {name: \"@angular/material\" , version: '^19.1.1'},\n {name: \"@angular/cdk\" , version: '^19.1.1'},\n {name: \"@angular/animations\", version: '^19.1.3'},\n {name: \"font-awesome\" , version: '^4.7.0'},\n {name: \"hammerjs\" , version: '^2.0.8'},\n\n {name: \"ngx-infinite-scroll\" , version: '^19.0.0'},\n {name: \"ng-dynamic-component\", version: '~10.7.0'},\n {name: \"ngx-currency\" , version: \"^19.0.0\"},\n {name: \"ngx-mask\" , version: \"^13.1.15\"},\n {name: \"crypto-js\" , version: \"^4.2.0\"},\n\n // Time masking dependencies (hh:mm, hh:mm:ss, hh:mm:ss:mss)\n {name: \"@maskito/angular\" , version: \"^1.4.0\"},\n {name: \"@maskito/core\" , version: \"^1.4.0\"},\n {name: \"@maskito/kit\" , version: \"^1.4.0\"}\n\n];\n\nexport const devDependencies = [\n {name: \"@types/stacktrace-js\", version: '^0.0.32'}\n];\nexport const env : IEnv = {} as any;\n\n"]}
package/src/schematics/magic-utils/env.ts CHANGED
@@ -30,10 +30,11 @@ export var dependencies = [
30
30
  {name: "font-awesome" , version: '^4.7.0'},
31
31
  {name: "hammerjs" , version: '^2.0.8'},
32
32
 
33
- {name: "ngx-infinite-scroll" , version: '^17.0.0'},
33
+ {name: "ngx-infinite-scroll" , version: '^19.0.0'},
34
34
  {name: "ng-dynamic-component", version: '~10.7.0'},
35
- {name: "ngx-currency" , version: "^17.0.0"},
35
+ {name: "ngx-currency" , version: "^19.0.0"},
36
36
  {name: "ngx-mask" , version: "^13.1.15"},
37
+ {name: "crypto-js" , version: "^4.2.0"},
37
38
 
38
39
  // Time masking dependencies (hh:mm, hh:mm:ss, hh:mm:ss:mss)
39
40
  {name: "@maskito/angular" , version: "^1.4.0"},
package/src/schematics/mg-add/files/src/app/magic/magic.gen.lib.module.ts CHANGED
@@ -5,7 +5,7 @@ import {CommonModule} from "@angular/common";
5
5
 
6
6
 
7
7
  import {DynamicModule} from 'ng-dynamic-component';
8
- import {InfiniteScrollModule} from 'ngx-infinite-scroll';
8
+ import {InfiniteScrollDirective} from 'ngx-infinite-scroll';
9
9
 
10
10
  import {ComponentListMagicService, MagicModule, ExitMagicService} from "@magic-xpa/angular";
11
11
  import {magicGenComponents, magicGenCmpsHash, title} from './component-list.g';
@@ -48,7 +48,7 @@ export const options: Partial<IConfig> | (() => Partial<IConfig>) = {};
48
48
  // Magic Modules
49
49
  MagicModule,
50
50
  DynamicModule,
51
- InfiniteScrollModule,
51
+ InfiniteScrollDirective,
52
52
  NgxCurrencyDirective,
53
53
  NgxMaskModule.forRoot(),
54
54
 
package/templates/angular/src/app.module.ts CHANGED
@@ -6,7 +6,7 @@ import {AppComponent} from './app.component';
6
6
  import {DynamicModule} from 'ng-dynamic-component';
7
7
  import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
8
8
  import {ComponentArray, compHash, title} from './component-list.g';
9
- import {InfiniteScrollModule} from 'ngx-infinite-scroll';
9
+ import {InfiniteScrollDirective} from 'ngx-infinite-scroll';
10
10
  import {
11
11
  MatButtonModule,
12
12
  MatCheckboxModule,
@@ -56,7 +56,7 @@ import {MagicModule,ComponentListMagicService} from '@magic-xpa/angular';
56
56
 
57
57
  // Magic modules
58
58
  MagicModule.forRoot(),
59
- InfiniteScrollModule,
59
+ InfiniteScrollDirective,
60
60
  DynamicModule.withComponents(ComponentArray)
61
61
  ],
62
62
  bootstrap: [AppComponent],
package/templates/component/view.component.ts CHANGED
@@ -63,7 +63,9 @@ export class <%- id %> extends <% if(useMatGrid) { %> BaseMatTableMagicComponen
63
63
  private static readonly width: string = "300px";
64
64
  private static readonly height: string = "300px";
65
65
  private static readonly isCenteredToWindow: boolean = true;
66
- private static readonly shouldCloseOnBackgroundClick = true;
66
+ private static readonly shouldCloseOnBackgroundClick: boolean = true;
67
+ private static readonly isResizable: boolean = true;
68
+ private static readonly isMovable: boolean = true;
67
69
 
68
70
  X() {
69
71
  return <%- id %>.x;
@@ -96,6 +98,14 @@ export class <%- id %> extends <% if(useMatGrid) { %> BaseMatTableMagicComponen
96
98
  ShouldCloseOnBackgroundClick() {
97
99
  return <%- id %>.shouldCloseOnBackgroundClick;
98
100
  }
101
+
102
+ IsResizable() {
103
+ return <%- id %>.isResizable;
104
+ }
105
+
106
+ IsMovable() {
107
+ return <%- id %>.isMovable;
108
+ }
99
109
  <%}-%>
100
110
  <% if(useMatGrid) { -%>
101
111
  override displayedColumns = this.mgdp;
package/templates/themes/basicHiddenHTML/table.ejs CHANGED
@@ -1,7 +1,7 @@
1
1
 
2
2
  <div
3
3
  <%- include('../../attributes/common/base_attributes', {ctrl : ctrl}) %>
4
- infinite-scroll
4
+ infiniteScroll
5
5
  [infiniteScrollDistance]="2"
6
6
  [infiniteScrollThrottle]="500"
7
7
  (scrolled)="tableService.onScrollDown()"
package/templates/themes/material/combobox.ejs CHANGED
@@ -9,6 +9,18 @@
9
9
  <div *ngIf="mg.isRowInRowEditing(row)">
10
10
  <%}%>
11
11
 
12
+ <% if (ctrl.props.editable) { %>
13
+ <editable-combo
14
+ <%- include(`../../attributes/common/control_attributes`, {ctrl : ctrl})%>
15
+ <%- include('../../attributes/common/base/formControlName', {ctrl : ctrl}) %>
16
+ <% if (ctrl.props.must_input && !ctrl.props.must_input.has_exp) { %>
17
+ required
18
+ <% } %>
19
+ placeholder="Type/Select an option"
20
+ >
21
+ </editable-combo>
22
+ <% }else { %>
23
+
12
24
  <mat-form-field <%- include('../../attributes/common/container_attributes', {ctrl : ctrl}) %>>
13
25
  <mat-select
14
26
  <%- include(`../../attributes/common/control_attributes`, {ctrl : ctrl})%>
@@ -26,6 +38,9 @@
26
38
  </mat-option>
27
39
  </mat-select>
28
40
  </mat-form-field>
41
+
42
+ <% } %>
43
+
29
44
  <% if (ctrl.props.must_input || ctrl.props.validator != null) { %>
30
45
  <mgError [magic]=<%- ctrl.props.directive_id %>> </mgError>
31
46
  <% } %>
package/templates/themes/table/HTMLTable/table.ejs CHANGED
@@ -1,7 +1,7 @@
1
1
  <div
2
2
  <%- include('../../../attributes/common/base_attributes', {ctrl : ctrl}) %>
3
3
  <% if(ctrl.props.scroll_bar) {%>
4
- infinite-scroll
4
+ infiniteScroll
5
5
  [infiniteScrollDistance]="2"
6
6
  [infiniteScrollThrottle]="500"
7
7
  (scrolled)="tableService.onScrollDown()"
package/templates/themes/table/repeatable/table.ejs CHANGED
@@ -2,7 +2,7 @@
2
2
  <div
3
3
  <%- include('../../../attributes/common/base_attributes', {ctrl : ctrl}) %>
4
4
  <% if(ctrl.props.scroll_bar) {%>
5
- infinite-scroll
5
+ infiniteScroll
6
6
  [infiniteScrollDistance]="2"
7
7
  [infiniteScrollThrottle]="500"
8
8
  (scrolled)="tableService.onScrollDown()"