ilja_space/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Undo some changes to fix the build, move svg-check into generateLayerOverview as to move fs out of the dependency tree for the webpage

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-01-17 01:00:43 +01:00
parent 39cc043f8b
commit e9004a2190
7 changed files with 543 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Logic/Tags/TagUtils.ts
View file

@ -7,7 +7,6 @@ import { RegexTag } from "./RegexTag"
import SubstitutingTag from "./SubstitutingTag"
import { Or } from "./Or"
import { TagConfigJson } from "../../Models/ThemeConfig/Json/TagConfigJson"
// import { isRegExp } from "util"
import * as key_counts from "../../assets/key_totals.json"
type Tags = Record<string, string>
@ -94,14 +93,13 @@ export class TagUtils {
if (allowRegex && tagsFilter instanceof RegexTag) {
const key = tagsFilter.key
// TODO: Fixme
// if (isRegExp(key)) {
// console.error(
// "Invalid type to flatten the multiAnswer: key is a regex too",
// tagsFilter
// )
// throw "Invalid type to FlattenMultiAnswer"
// }
if (typeof key !== "string") {
console.error(
"Invalid type to flatten the multiAnswer: key is a regex too",
tagsFilter
)
throw "Invalid type to FlattenMultiAnswer"
}
const keystr = <string>key
if (keyValues[keystr] === undefined) {
keyValues[keystr] = []

104
Logic/Web/MangroveReviews.ts
View file

@ -1,4 +1,4 @@
// import * as mangrove from "mangrove-reviews"
import * as mangrove from "mangrove-reviews"
import { UIEventSource } from "../UIEventSource"
import { Review } from "./Review"
import { Utils } from "../../Utils"
@ -15,13 +15,13 @@ export class MangroveIdentity {
if (str === "") {
return
}
// mangrove.jwkToKeypair(JSON.parse(str)).then((keypair) => {
// self.keypair = keypair
// mangrove.publicToPem(keypair.publicKey).then((pem) => {
// console.log("Identity loaded")
// self.kid.setData(pem)
// })
// })
mangrove.jwkToKeypair(JSON.parse(str)).then((keypair) => {
self.keypair = keypair
mangrove.publicToPem(keypair.publicKey).then((pem) => {
console.log("Identity loaded")
self.kid.setData(pem)
})
})
})
try {
if (!Utils.runningFromConsole && (mangroveIdentity.data ?? "") === "") {
@ -42,12 +42,12 @@ export class MangroveIdentity {
throw "Identity already defined - not creating a new one"
}
const self = this
// mangrove.generateKeypair().then((keypair) => {
// self.keypair = keypair
// mangrove.keypairToJwk(keypair).then((jwk) => {
// self._mangroveIdentity.setData(JSON.stringify(jwk))
// })
// })
mangrove.generateKeypair().then((keypair) => {
self.keypair = keypair
mangrove.keypairToJwk(keypair).then((jwk) => {
self._mangroveIdentity.setData(JSON.stringify(jwk))
})
})
}
}
@ -127,39 +127,39 @@ export default class MangroveReviews {
this._lastUpdate = new Date()
const self = this
// mangrove
// .getReviews({ sub: this.GetSubjectUri() })
// .then((data) => {
// const reviews = []
// const reviewsByUser = []
// for (const review of data.reviews) {
// const r = review.payload
mangrove
.getReviews({ sub: this.GetSubjectUri() })
.then((data) => {
const reviews = []
const reviewsByUser = []
for (const review of data.reviews) {
const r = review.payload
// console.log(
// "PublicKey is ",
// self._mangroveIdentity.kid.data,
// "reviews.kid is",
// review.kid
// )
// const byUser = self._mangroveIdentity.kid.map(
// (data) => data === review.signature
// )
// const rev: Review = {
// made_by_user: byUser,
// date: new Date(r.iat * 1000),
// comment: r.opinion,
// author: r.metadata.nickname,
// affiliated: r.metadata.is_affiliated,
// rating: r.rating, // percentage points
// }
console.log(
"PublicKey is ",
self._mangroveIdentity.kid.data,
"reviews.kid is",
review.kid
)
const byUser = self._mangroveIdentity.kid.map(
(data) => data === review.signature
)
const rev: Review = {
made_by_user: byUser,
date: new Date(r.iat * 1000),
comment: r.opinion,
author: r.metadata.nickname,
affiliated: r.metadata.is_affiliated,
rating: r.rating, // percentage points
}
// ;(rev.made_by_user ? reviewsByUser : reviews).push(rev)
// }
// self._reviews.setData(reviewsByUser.concat(reviews))
// })
// .catch((e) => {
// console.error("Could not download review for ", e)
// })
;(rev.made_by_user ? reviewsByUser : reviews).push(rev)
}
self._reviews.setData(reviewsByUser.concat(reviews))
})
.catch((e) => {
console.error("Could not download review for ", e)
})
return this._reviews
}
@ -192,13 +192,13 @@ export default class MangroveReviews {
this._reviews.ping()
}
} else {
// mangrove.signAndSubmitReview(this._mangroveIdentity.keypair, payload).then(() => {
// if (callback) {
// callback()
// }
// this._reviews.data.push(r)
// this._reviews.ping()
// })
mangrove.signAndSubmitReview(this._mangroveIdentity.keypair, payload).then(() => {
if (callback) {
callback()
}
this._reviews.data.push(r)
this._reviews.ping()
})
}
}
}