Skip to content

Commit

Permalink
Merge branch 'neomjs:dev' into gp-mods
Browse files Browse the repository at this point in the history
  • Loading branch information
gplanansky committed Dec 19, 2023
2 parents 27de5e8 + b371b5a commit d69d60c
Show file tree
Hide file tree
Showing 117 changed files with 3,247 additions and 1,159 deletions.
9 changes: 3 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,10 @@
!/apps/form/neo-config.json
!/apps/krausest/index.html
!/apps/krausest/**/*.mjs
!/apps/learnneo/neo-config.json
!/apps/learnneo/index.html
!/apps/learnneo/**/*.mjs
!/apps/krausest/neo-config.json
!/apps/newwebsite/index.html
!/apps/newwebsite/**/*.mjs
!/apps/newwebsite/neo-config.json
!/apps/portal/neo-config.json
!/apps/portal/index.html
!/apps/portal/**/*.mjs
!/apps/realworld/index.html
!/apps/realworld/**/*.mjs
!/apps/realworld/neo-config.json
Expand Down
4 changes: 2 additions & 2 deletions apps/ServiceWorker.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ class ServiceWorker extends ServiceBase {
*/
singleton: true,
/**
* @member {String} version='6.10.3'
* @member {String} version='6.10.10'
*/
version: '6.10.3'
version: '6.10.10'
}

/**
Expand Down
6 changes: 5 additions & 1 deletion apps/form/Overwrites.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@ Neo.overwrites = {
Neo: {
form: {
field: {
CheckBox: {
useAlertState_: true
},
Text: {
labelPosition_ : 'inline',
showOptionalText_: true
showOptionalText_: true,
useAlertState_ : true
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions apps/form/model/SideNav.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ class SideNav extends Model {
fields: [{
name: 'cardIndex',
type: 'Integer'
}, {
name: 'formState',
type: 'String'
}, {
name: 'id',
type: 'String'
}, {
name: 'isHeader',
type: 'Boolean'
}, {
name: 'isValid',
type: 'Boolean'
}, {
name: 'name',
type: 'String'
Expand Down
11 changes: 8 additions & 3 deletions apps/form/view/SideNavList.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,19 @@ class SideNavList extends List {
getIconCls(record) {
let cls = ['neo-list-icon'];

if (record.isValid === true) {
if (record.formState === 'valid') {
return [...cls, 'neo-color-green', 'far', 'fa-circle-check'];
}

if (record.isValid === false) {
if (record.formState === 'invalid') {
return [...cls, 'neo-color-red', 'far', 'fa-circle-xmark'];
}

if (record.formState === 'inProgress') {
return [...cls, 'neo-color-blue', 'fas', 'fa-circle-half-stroke'];
}

// clean
return [...cls, 'neo-color-blue', 'far', 'fa-circle'];
}

Expand All @@ -76,7 +81,7 @@ class SideNavList extends List {

this.store.items.forEach(record => {
if (!record.isHeader) {
maxIndex++;
maxIndex++
}
});

Expand Down
13 changes: 6 additions & 7 deletions apps/form/view/ViewportController.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ class ViewportController extends Component {
async onValidateAllPagesButtonClick(data) {
let me = this,
form = me.getReference('main-form'),
isValid = await form.validate(),
formState = await form.getFormState(),
formValues = await form.getValues();

console.log('All pages', {isValid, formValues});
console.log('All pages', {formState, formValues});

await me.updateRecordValidityState()
}
Expand All @@ -36,7 +36,6 @@ class ViewportController extends Component {
activeCard = me.getReference('pages-container').items[activeIndex],
formValues = await activeCard.getValues();

await activeCard.validate();
await me.updateRecordValidityState(activeIndex)

console.log(`Current page: ${activeIndex + 1}`, formValues);
Expand All @@ -55,19 +54,19 @@ class ViewportController extends Component {
store = model.getStore('sideNav'),
i = 0,
len = pagesContainer.items.length,
isValid, listIndex, page;
formState, listIndex, page;

if (Neo.isNumber(pageIndex)) {
i = pageIndex;
len = pageIndex + 1;
len = pageIndex + 1
}

for (; i < len; i++) {
page = pagesContainer.items[i];
listIndex = sideNav.getActiveIndex(i);
isValid = await page.isValid();
formState = await page.getFormState();

store.getAt(listIndex).isValid = isValid;
store.getAt(listIndex).formState = formState
}
}
}
Expand Down
6 changes: 0 additions & 6 deletions apps/learnneo/app.mjs

This file was deleted.

21 changes: 0 additions & 21 deletions apps/learnneo/index.html

This file was deleted.

52 changes: 0 additions & 52 deletions apps/learnneo/view/Viewport.mjs

This file was deleted.

19 changes: 0 additions & 19 deletions apps/learnneo/view/ViewportController.mjs

This file was deleted.

47 changes: 0 additions & 47 deletions apps/learnneo/view/home/HeaderToolbar.mjs

This file was deleted.

6 changes: 0 additions & 6 deletions apps/newwebsite/app.mjs

This file was deleted.

13 changes: 0 additions & 13 deletions apps/newwebsite/index.html

This file was deleted.

7 changes: 0 additions & 7 deletions apps/newwebsite/neo-config.json

This file was deleted.

21 changes: 21 additions & 0 deletions apps/portal/Overwrites.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
Neo.overwrites = {
Neo: {
button: {
Base: {
editRoute: false
}
},
form: {
field: {
Base: {
delayable: {
fireChangeEvent : null,
fireUserChangeEvent: null
}
}
}
}
}
}

export default Neo.overwrites;
7 changes: 7 additions & 0 deletions apps/portal/app.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import Overwrites from './Overwrites.mjs';
import Viewport from './view/Viewport.mjs';

export const onStart = () => Neo.app({
mainView: Viewport,
name : 'Portal'
})
Loading

0 comments on commit d69d60c

Please sign in to comment.