changes for 0.2.7

This commit is contained in:
Matt Hill
2020-12-03 09:16:38 -07:00
committed by Keagan McClelland
parent 2b4c456c5d
commit ab6aadc3b4
9 changed files with 1204 additions and 852 deletions

View File

@@ -1,5 +1,5 @@
import {
ValueSpec, ConfigSpec, UniqueBy, ValueSpecOf, ValueType
ValueSpec, ConfigSpec, UniqueBy, ValueSpecOf, ValueType, ValueSpecObject
} from './config-types'
import * as pointer from 'json-pointer'
import * as handlebars from 'handlebars'
@@ -226,11 +226,11 @@ export class ConfigCursor<T extends ValueType> {
for (let idx in cfg) {
let cursor = this.seekNext(idx)
if (cursor.checkInvalid()) {
return `Item #${idx + 1} is invalid. ${cursor.checkInvalid()}`
return `Item #${Number(idx) + 1} is invalid. ${cursor.checkInvalid()}.`
}
for (let idx2 in cfg) {
if (idx !== idx2 && cursor.equals(this.seekNext(idx2))) {
return `Item #${idx + 1} is not unique.`
return `Item #${Number(idx) + 1} is not unique. ${(cursor.cachedSpec as ValueSpecObject).uniqueBy} must be unique.`
}
}
}

View File

@@ -39,7 +39,7 @@ const routes: Routes = [
imports: [
RouterModule.forRoot(routes, {
preloadingStrategy: PreloadAllModules,
initialNavigation: false,
initialNavigation: 'disabled',
useHash: true,
}),
],

View File

@@ -128,7 +128,7 @@
<ion-infinite-scroll-content loadingSpinner="lines"></ion-infinite-scroll-content>
</ion-content>
<ion-input></ion-input>
<ion-input type="password">getdots</ion-input>
<ion-input type="password" value="getdots"></ion-input>
<ion-item></ion-item>
<ion-item-divider></ion-item-divider>
<ion-item-group></ion-item-group>

View File

@@ -29,7 +29,12 @@
</ion-label>
</ion-item>
<ion-item-group>
<ion-item-group *ngIf="($hasMetrics$ | async) === true">
<ion-item *ngIf="app.status !== 'RUNNING'" class="ion-margin-bottom">
<ion-label class="ion-text-wrap">
<p><ion-text color="warning">{{ app.title }} is not running. Properties could be innacurate.</ion-text></p>
</ion-label>
</ion-item>
<div *ngFor="let keyval of $metrics$ | async | keyvalue: asIsOrder">
<!-- object -->
<ion-item button detail="false" *ngIf="keyval.value.type === 'object'" (click)="goToNested(keyval.key)">

View File

@@ -389,7 +389,7 @@ const mockApiNotifications: ReqRes.GetNotificationsRes = [
const mockApiServer: () => ReqRes.GetServerRes = () => ({
serverId: 'start9-mockxyzab',
name: 'Embassy:12345678',
versionInstalled: '0.2.6',
versionInstalled: '0.2.7',
status: ServerStatus.RUNNING,
alternativeRegistryUrl: 'beta-registry.start9labs.com',
specs: {
@@ -420,7 +420,7 @@ const mockApiServer: () => ReqRes.GetServerRes = () => ({
})
const mockVersionLatest: ReqRes.GetVersionLatestRes = {
versionLatest: '0.2.6',
versionLatest: '0.2.7',
canUpdate: true,
}
@@ -664,7 +664,7 @@ const mockApiAppConfig: ReqRes.GetAppConfigRes = {
},
{
'firstName': 'Admin2',
'lastName': 'User2',
'lastName': 'User',
'age': 40,
},
],
@@ -1038,26 +1038,26 @@ const mockApiAppConfig: ReqRes.GetAppConfigRes = {
},
// actual config
config: {
testnet: undefined,
objectList: undefined,
unionList: undefined,
randomEnum: 'option1',
favoriteNumber: 8,
secondaryNumbers: undefined,
rpcsettings: {
laws: null,
rpcpass: null,
rpcuser: '123',
rulemakers: [],
},
advanced: {
notifications: ['call'],
},
bitcoinNode: undefined,
port: 5959,
maxconnections: null,
rpcallowip: undefined,
rpcauth: ['matt: 8273gr8qwoidm1uid91jeh8y23gdio1kskmwejkdnm'],
// testnet: undefined,
// objectList: undefined,
// unionList: undefined,
// randomEnum: 'option1',
// favoriteNumber: 8,
// secondaryNumbers: undefined,
// rpcsettings: {
// laws: null,
// rpcpass: null,
// rpcuser: '123',
// rulemakers: [],
// },
// advanced: {
// notifications: ['call'],
// },
// bitcoinNode: undefined,
// port: 5959,
// maxconnections: null,
// rpcallowip: undefined,
// rpcauth: ['matt: 8273gr8qwoidm1uid91jeh8y23gdio1kskmwejkdnm'],
},
rules: [],
}

View File

@@ -263,14 +263,6 @@ ion-avatar {
--padding-start: 10px;
}
// .divider {
// margin-top: 15px;
// color: var(--ion-color-medium);
// font-size: medium;
// padding-left: 10px;
// font-weight: unset;
// }
ion-item-divider {
margin-top: 15px;
color: var(--ion-color-medium);