Skip to content
This repository has been archived by the owner on Oct 17, 2024. It is now read-only.

Consult latest ruleset endpoint #110

Merged
merged 12 commits into from
May 2, 2019
Merged

Consult latest ruleset endpoint #110

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
99e6f59
check-in broken state to work on it elsfewhere
tealeg Apr 17, 2019
84fb76d
Test that a single ruleset is returned in line with the spec
tealeg Apr 17, 2019
5b9d084
Modify LatestResult view to use ruleset latest backend
tealeg Apr 18, 2019
8de815b
Define backend handler for getting the default ruleset version
tealeg Apr 18, 2019
08a11cb
Remove debugging log
tealeg Apr 29, 2019
a8d403d
Make handler test robust to unstable param / rule ordering
tealeg Apr 30, 2019
e4ce585
Update node-sass
tealeg May 2, 2019
eecaf1c
Resolve hoopy package
tealeg May 2, 2019
c424e28
Merge branch 'consult-latest-ruleset-endpoint' of github.com:heetch/r…
tealeg May 2, 2019
8cae9f8
Make test stable without sortingc
tealeg May 2, 2019
ad1b6c7
Fix typo in yarn.lock
tealeg May 2, 2019
9812054
Remove extraneous whitespace
tealeg May 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 69 additions & 10 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions store/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ type ListOptions struct {

// RulesetEntry holds a ruleset and its metadata.
type RulesetEntry struct {
Path string
Version string
Ruleset *regula.Ruleset
Signature *regula.Signature
Versions []string
Path string `json:"path"`
Version string `json:"version"`
Ruleset *regula.Ruleset `json:"rules"`
Signature *regula.Signature `json:"signature"`
Versions []string `json:"versions"`
}

// RulesetEntries holds a list of ruleset entries.
Expand Down
54 changes: 23 additions & 31 deletions ui/app/src/views/LatestRuleset/LatestRuleset.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
<v-toolbar color="grey" dark>
<v-toolbar-title>Parameters</v-toolbar-title>
</v-toolbar>
<v-card class="height-card scroll">
<v-card class="height-card scroll"
v-if="typeof(ruleset.signature) != 'undefined'"
tealeg marked this conversation as resolved.
Show resolved Hide resolved
>
<v-card-text
v-for="param in ruleset.signature.params"
:key="param.name"
Expand All @@ -19,7 +21,9 @@
<v-toolbar color="grey" dark>
<v-toolbar-title>Return type</v-toolbar-title>
</v-toolbar>
<v-card class="height-card">
<v-card class="height-card"
v-if="typeof(ruleset.signature) != 'undefined'"
>
<v-card-text>{{ruleset.signature.returnType}}</v-card-text>
</v-card>
</v-flex>
Expand Down Expand Up @@ -49,8 +53,8 @@
</template>

<script>
// import axios from 'axios';
import { Ruleset, Rule, Signature, Param } from '../NewRuleset/ruleset';
import axios from 'axios';
// import { Ruleset, Rule, Signature, Param } from '../NewRuleset/ruleset';
import Rules from '../NewRuleset/Rules.vue';

export default {
Expand All @@ -64,34 +68,22 @@ export default {
},
},

data() {
return {
ruleset: new Ruleset({
path: this.path,
signature: new Signature('string', [
new Param('foo', 'string'),
new Param('bar', 'int64'),
new Param('baz', 'float64'),
new Param('baz1', 'float64'),
new Param('baz2', 'float64'),
new Param('baz3', 'float64'),
new Param('baz4', 'float64'),
]),
data: () => ({
ruleset: {},
}),

mounted() {
this.fetchRuleset();
},

rules: [
new Rule(
`(and
(eq 1 1)
(eq 2 2)
)`,
'wesh',
),
new Rule('#true', 'bien'),
],
version: 'abc123',
versions: ['def123', 'ghi123', 'xyz123'],
}),
};
methods: {
fetchRuleset() {
const uri = '/ui/i/rulesets/' + this.path;
return axios
.get(uri)
.then(({ data = {} }) => { this.ruleset = data; })
.catch(error => error);
},
},
};
</script>
Expand Down
Loading