qortal.link/qortal-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Speed and clean up

Browse Source
This commit is contained in:
AlphaX-Projects 2022-03-18 02:53:59 -07:00 committed by GitHub
parent 8ca7d66145
commit 7684f45fa0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 50 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qortal-ui-plugins/plugins/core/qdn/browser/browser.src.js
View File

@ -3,11 +3,7 @@ import { render } from 'lit/html.js'
import { Epml } from '../../../../epml' import { Epml } from '../../../../epml'
import '@material/mwc-button' import '@material/mwc-button'
import '@material/mwc-textfield' import '@material/mwc-icon'
import '@material/mwc-select'
import '@material/mwc-list/mwc-list-item.js'
import '@material/mwc-slider'
import '@polymer/paper-progress/paper-progress.js'
const parentEpml = new Epml({ type: 'WINDOW', source: window.parent }) const parentEpml = new Epml({ type: 'WINDOW', source: window.parent })
@ -441,14 +437,6 @@ class WebBrowser extends LitElement {
return ret return ret
} }
// Helper Functions (Re-Used in Most part of the UI )
textColor(color) {
return color == 'light' ? 'rgba(255,255,255,0.7)' : 'rgba(0,0,0,0.87)'
}
_textMenu(event) { _textMenu(event) {
const getSelectedText = () => { const getSelectedText = () => {
var text = '' var text = ''
@ -464,13 +452,10 @@ class WebBrowser extends LitElement {
let selectedText = getSelectedText() let selectedText = getSelectedText()
if (selectedText && typeof selectedText === 'string') { if (selectedText && typeof selectedText === 'string') {
let _eve = { pageX: event.pageX, pageY: event.pageY, clientX: event.clientX, clientY: event.clientY } let _eve = { pageX: event.pageX, pageY: event.pageY, clientX: event.clientX, clientY: event.clientY }
let textMenuObject = { selectedText: selectedText, eventObject: _eve, isFrame: true } let textMenuObject = { selectedText: selectedText, eventObject: _eve, isFrame: true }
parentEpml.request('openCopyTextMenu', textMenuObject) parentEpml.request('openCopyTextMenu', textMenuObject)
} }
} }
checkSelectedTextAndShowMenu() checkSelectedTextAndShowMenu()
} }

7
qortal-ui-plugins/plugins/core/qdn/data-management/data-management.src.js
View File

@ -619,11 +619,6 @@ class DataManagement extends LitElement {
return ret return ret
} }
textColor(color) {
return color == 'light' ? 'rgba(255,255,255,0.7)' : 'rgba(0,0,0,0.87)'
}
_textMenu(event) { _textMenu(event) {
const getSelectedText = () => { const getSelectedText = () => {
var text = '' var text = ''
@ -639,9 +634,7 @@ class DataManagement extends LitElement {
let selectedText = getSelectedText() let selectedText = getSelectedText()
if (selectedText && typeof selectedText === 'string') { if (selectedText && typeof selectedText === 'string') {
let _eve = { pageX: event.pageX, pageY: event.pageY, clientX: event.clientX, clientY: event.clientY } let _eve = { pageX: event.pageX, pageY: event.pageY, clientX: event.clientX, clientY: event.clientY }
let textMenuObject = { selectedText: selectedText, eventObject: _eve, isFrame: true } let textMenuObject = { selectedText: selectedText, eventObject: _eve, isFrame: true }
parentEpml.request('openCopyTextMenu', textMenuObject) parentEpml.request('openCopyTextMenu', textMenuObject)
} }
} }

2
qortal-ui-plugins/plugins/core/qdn/publish/publish.src.js
View File

@ -556,9 +556,7 @@ class PublishData extends LitElement {
let selectedText = getSelectedText() let selectedText = getSelectedText()
if (selectedText && typeof selectedText === 'string') { if (selectedText && typeof selectedText === 'string') {
let _eve = { pageX: event.pageX, pageY: event.pageY, clientX: event.clientX, clientY: event.clientY } let _eve = { pageX: event.pageX, pageY: event.pageY, clientX: event.clientX, clientY: event.clientY }
let textMenuObject = { selectedText: selectedText, eventObject: _eve, isFrame: true } let textMenuObject = { selectedText: selectedText, eventObject: _eve, isFrame: true }
parentEpml.request('openCopyTextMenu', textMenuObject) parentEpml.request('openCopyTextMenu', textMenuObject)
} }
} }

195
qortal-ui-plugins/plugins/core/qdn/websites.src.js
View File

@ -29,14 +29,8 @@ class Websites extends LitElement {
selectedAddress: { type: Object }, selectedAddress: { type: Object },
searchName: { type: String }, searchName: { type: String },
searchResources: { type: Array }, searchResources: { type: Array },
searchFollowedNames: { type: Array }, followedResources: { type: Array },
searchBlockedNames: { type: Array }, blockedResources: { type: Array },
webResources: { type: Array },
webFollowedNames: { type: Array },
webBlockedNames: { type: Array },
blockResources: { type: Array },
blockFollowedNames: { type: Array },
blockBlockedNames: { type: Array },
theme: { type: String, reflect: true } theme: { type: String, reflect: true }
} }
} }
@ -231,14 +225,8 @@ class Websites extends LitElement {
this.isLoading = false this.isLoading = false
this.searchName = '' this.searchName = ''
this.searchResources = [] this.searchResources = []
this.searchFollowedNames = [] this.followedResources = []
this.searchBlockedNames = [] this.blockedResources = []
this.webResources = []
this.webFollowedNames = []
this.webBlockedNames = []
this.blockResources = []
this.blockFollowedNames = []
this.blockBlockedNames = []
this.theme = localStorage.getItem('qortalTheme') ? localStorage.getItem('qortalTheme') : 'light' this.theme = localStorage.getItem('qortalTheme') ? localStorage.getItem('qortalTheme') : 'light'
} }
@ -331,7 +319,7 @@ class Websites extends LitElement {
</div> </div>
<div class="divCard"> <div class="divCard">
<h3 style="margin: 0; margin-bottom: 1em; text-align: center;">Followed Websites</h3> <h3 style="margin: 0; margin-bottom: 1em; text-align: center;">Followed Websites</h3>
<vaadin-grid theme="wrap-cell-content" id="webResourcesGrid" ?hidden="${this.isEmptyArray(this.webResources)}" .items="${this.webResources}" aria-label="Followed Websites" all-rows-visible> <vaadin-grid theme="wrap-cell-content" id="followedResourcesGrid" ?hidden="${this.isEmptyArray(this.followedResources)}" .items="${this.followedResources}" aria-label="Followed Websites" all-rows-visible>
<vaadin-grid-column width="7rem" flex-grow="0" header="Avatar" .renderer=${(root, column, data) => { <vaadin-grid-column width="7rem" flex-grow="0" header="Avatar" .renderer=${(root, column, data) => {
render(html`${this.renderAvatar(data.item)}`, root) render(html`${this.renderAvatar(data.item)}`, root)
}}> }}>
@ -353,10 +341,10 @@ class Websites extends LitElement {
}}> }}>
</vaadin-grid-column> </vaadin-grid-column>
</vaadin-grid> </vaadin-grid>
${this.webResources == null ? html` ${this.followedResources == null ? html`
Loading... Loading...
`: ''} `: ''}
${this.isEmptyArray(this.webResources) ? html` ${this.isEmptyArray(this.followedResources) ? html`
<span style="color: var(--black);">You aren't following any websites</span> <span style="color: var(--black);">You aren't following any websites</span>
`: ''} `: ''}
</div> </div>
@ -369,7 +357,7 @@ class Websites extends LitElement {
</div> </div>
<div class="divCard"> <div class="divCard">
<h3 style="margin: 0; margin-bottom: 1em; text-align: center;">Blocked Websites</h3> <h3 style="margin: 0; margin-bottom: 1em; text-align: center;">Blocked Websites</h3>
<vaadin-grid theme="wrap-cell-content" id="blockResourcesGrid" ?hidden="${this.isEmptyArray(this.blockResources)}" .items="${this.blockResources}" aria-label="Followed Websites" all-rows-visible> <vaadin-grid theme="wrap-cell-content" id="blockedResourcesGrid" ?hidden="${this.isEmptyArray(this.blockedResources)}" .items="${this.blockedResources}" aria-label="Blocked Websites" all-rows-visible>
<vaadin-grid-column width="7rem" flex-grow="0" header="Avatar" .renderer=${(root, column, data) => { <vaadin-grid-column width="7rem" flex-grow="0" header="Avatar" .renderer=${(root, column, data) => {
render(html`${this.renderAvatar(data.item)}`, root) render(html`${this.renderAvatar(data.item)}`, root)
}}> }}>
@ -391,10 +379,10 @@ class Websites extends LitElement {
}}> }}>
</vaadin-grid-column> </vaadin-grid-column>
</vaadin-grid> </vaadin-grid>
${this.blockResources == null ? html` ${this.blockedResources == null ? html`
Loading... Loading...
`: ''} `: ''}
${this.isEmptyArray(this.blockResources) ? html` ${this.isEmptyArray(this.blockedResources) ? html`
<span style="color: var(--black);">You have not blocked any websites</span> <span style="color: var(--black);">You have not blocked any websites</span>
`: ''} `: ''}
</div> </div>
@ -437,60 +425,6 @@ class Websites extends LitElement {
setTimeout(getBlockedNames, 600000) setTimeout(getBlockedNames, 600000)
} }
const getWebFollowedNames = async () => {
let webFollowedNames = await parentEpml.request('apiCall', {
url: `/lists/followedNames?apiKey=${this.getApiKey()}`
})
this.webFollowedNames = webFollowedNames
setTimeout(getWebFollowedNames, 600000)
}
const getWebBlockedNames = async () => {
let webBlockedNames = await parentEpml.request('apiCall', {
url: `/lists/blockedNames?apiKey=${this.getApiKey()}`
})
this.webBlockedNames = webBlockedNames
setTimeout(getWebBlockedNames, 600000)
}
const getBlockFollowedNames = async () => {
let blockFollowedNames = await parentEpml.request('apiCall', {
url: `/lists/followedNames?apiKey=${this.getApiKey()}`
})
this.blockFollowedNames = blockFollowedNames
setTimeout(getBlockFollowedNames, 600000)
}
const getBlockBlockedNames = async () => {
let blockBlockedNames = await parentEpml.request('apiCall', {
url: `/lists/blockedNames?apiKey=${this.getApiKey()}`
})
this.blockBlockedNames = blockBlockedNames
setTimeout(getBlockBlockedNames, 600000)
}
const getSearchFollowedNames = async () => {
let searchFollowedNames = await parentEpml.request('apiCall', {
url: `/lists/followedNames?apiKey=${this.getApiKey()}`
})
this.searchFollowedNames = searchFollowedNames
setTimeout(getSearchFollowedNames, 600000)
}
const getSearchBlockedNames = async () => {
let searchBlockedNames = await parentEpml.request('apiCall', {
url: `/lists/blockedNames?apiKey=${this.getApiKey()}`
})
this.searchBlockedNames = searchBlockedNames
setTimeout(getSearchBlockedNames, 600000)
}
const getRelayMode = async () => { const getRelayMode = async () => {
let relayMode = await parentEpml.request('apiCall', { let relayMode = await parentEpml.request('apiCall', {
url: `/arbitrary/relaymode?apiKey=${this.getApiKey()}` url: `/arbitrary/relaymode?apiKey=${this.getApiKey()}`
@ -526,21 +460,10 @@ class Websites extends LitElement {
}) })
parentEpml.subscribe('config', c => { parentEpml.subscribe('config', c => {
if (!configLoaded) { if (!configLoaded) {
setTimeout(this.getArbitraryResources, 1)
setTimeout(this.getFollowedWebsites, 1)
setTimeout(this.getBlockedWebsites, 1)
setTimeout(getFollowedNames, 1) setTimeout(getFollowedNames, 1)
setTimeout(getBlockedNames, 1) setTimeout(getBlockedNames, 1)
setTimeout(getWebFollowedNames, 1)
setTimeout(getWebBlockedNames, 1)
setTimeout(getBlockFollowedNames, 1)
setTimeout(getBlockBlockedNames, 1)
setTimeout(getSearchFollowedNames, 1)
setTimeout(getSearchBlockedNames, 1)
setTimeout(getRelayMode, 1) setTimeout(getRelayMode, 1)
setInterval(this.getArbitraryResources, 600000) setInterval(this.getArbitraryResources, 600000)
setInterval(this.getFollowedWebsites, 600000)
setInterval(this.getBlockedWebsites, 600000)
configLoaded = true configLoaded = true
} }
this.config = JSON.parse(c) this.config = JSON.parse(c)
@ -586,20 +509,37 @@ class Websites extends LitElement {
} }
getArbitraryResources = async () => { getArbitraryResources = async () => {
const myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node];
const nodeUrl = myNode.protocol + '://' + myNode.domain + ':' + myNode.port
const followedNamesUrl = `${nodeUrl}/lists/followedNames?apiKey=${this.getApiKey()}`
const blockedNamesUrl = `${nodeUrl}/lists/blockedNames?apiKey=${this.getApiKey()}`
const resources = await parentEpml.request('apiCall', { const resources = await parentEpml.request('apiCall', {
url: `/arbitrary/resources?service=${this.service}&default=true&limit=0&reverse=false&includestatus=false&includemetadata=false` url: `/arbitrary/resources?service=${this.service}&default=true&limit=0&reverse=false&includestatus=true&includemetadata=true`
}) })
this.resources = resources this.resources = resources
const followedResponse = await fetch(followedNamesUrl)
const followednames = await followedResponse.json()
let followedres = resources.filter((elm) => followednames.includes(elm.name))
this.followedResources = followedres
const blockedResponse = await fetch(blockedNamesUrl)
const blockednames = await blockedResponse.json()
let blockedres = resources.filter((elm) => blockednames.includes(elm.name))
this.blockedResources = blockedres
} }
async getData(offset) { async getData(offset) {
const myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node] const myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node]
const nodeUrl = myNode.protocol + '://' + myNode.domain + ':' + myNode.port const nodeUrl = myNode.protocol + '://' + myNode.domain + ':' + myNode.port
let jsonUrl = `${nodeUrl}/arbitrary/resources?service=WEBSITE&default=true&limit=20&offset=${offset}&reverse=false&includestatus=true&includemetadata=true` let jsonOffsetUrl = `${nodeUrl}/arbitrary/resources?service=WEBSITE&default=true&limit=20&offset=${offset}&reverse=false&includestatus=true&includemetadata=true`
const jsonRes = await fetch(jsonUrl)
const jsonData = await jsonRes.json()
this.pageRes = jsonData const jsonOffsetRes = await fetch(jsonOffsetUrl)
const jsonOffsetData = await jsonOffsetRes.json()
this.pageRes = jsonOffsetData
} }
async updateItemsFromPage(page) { async updateItemsFromPage(page) {
@ -687,8 +627,8 @@ class Websites extends LitElement {
} }
async showWebsites() { async showWebsites() {
await this.getArbitraryResources()
await this.getData(0) await this.getData(0)
await this.getArbitraryResources()
await this.getResourcesGrid() await this.getResourcesGrid()
await this.updateItemsFromPage(1, true) await this.updateItemsFromPage(1, true)
} }
@ -697,40 +637,6 @@ class Websites extends LitElement {
this.searchResult() this.searchResult()
} }
getFollowedWebsites = async () => {
let data = [];
const myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node];
const nodeUrl = myNode.protocol + '://' + myNode.domain + ':' + myNode.port;
const namesUrl = `${nodeUrl}/lists/followedNames?apiKey=${this.getApiKey()}`;
const jsonUrl = `${nodeUrl}/arbitrary/resources?service=WEBSITE&default=true&limit=0&reverse=false&includestatus=true&includemetadata=true`;
const jsonRes = await fetch(jsonUrl);
const jsonData = await jsonRes.json();
const response = await fetch(namesUrl);
const names = await response.json();
let webres = jsonData.filter((elm) => names.includes(elm.name));
this.webResources = webres;
}
getBlockedWebsites = async () => {
let data = [];
const myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node];
const nodeUrl = myNode.protocol + '://' + myNode.domain + ':' + myNode.port;
const blockedNamesUrl = `${nodeUrl}/lists/blockedNames?apiKey=${this.getApiKey()}`;
const blockedJsonUrl = `${nodeUrl}/arbitrary/resources?service=WEBSITE&default=true&limit=0&reverse=false&includestatus=true&includemetadata=true`;
const blockedJsonRes = await fetch(blockedJsonUrl);
const blockedJsonData = await blockedJsonRes.json();
const blockedResponse = await fetch(blockedNamesUrl);
const blockednames = await blockedResponse.json();
let blockedres = blockedJsonData.filter((elm) => blockednames.includes(elm.name));
this.blockResources = blockedres;
}
async searchResult() { async searchResult() {
let searchName = this.shadowRoot.getElementById('searchName').value let searchName = this.shadowRoot.getElementById('searchName').value
if (searchName.length === 0) { if (searchName.length === 0) {
@ -798,14 +704,16 @@ class Websites extends LitElement {
// Successfully followed - add to local list // Successfully followed - add to local list
// Remove it first by filtering the list - doing it this way ensures the UI updates // Remove it first by filtering the list - doing it this way ensures the UI updates
// immediately, as apposed to only adding if it doesn't already exist // immediately, as apposed to only adding if it doesn't already exist
this.followedNames = this.followedNames.filter(item => item != name); this.followedNames = this.followedNames.filter(item => item != name)
this.followedNames.push(name) this.followedNames.push(name)
this.getArbitraryResources()
window.location.reload()
} }
else { else {
parentEpml.request('showSnackBar', 'Error occurred when trying to follow this registered name. Please try again') parentEpml.request('showSnackBar', 'Error occurred when trying to follow this registered name. Please try again')
} }
return ret return ret
this.displayTabContent('followed')
} }
async unfollowName(websiteObj) { async unfollowName(websiteObj) {
@ -826,13 +734,15 @@ class Websites extends LitElement {
if (ret === true) { if (ret === true) {
// Successfully unfollowed - remove from local list // Successfully unfollowed - remove from local list
this.followedNames = this.followedNames.filter(item => item != name); this.followedNames = this.followedNames.filter(item => item != name)
this.getArbitraryResources()
window.location.reload()
} }
else { else {
parentEpml.request('showSnackBar', 'Error occurred when trying to unfollow this registered name. Please try again') parentEpml.request('showSnackBar', 'Error occurred when trying to unfollow this registered name. Please try again')
} }
return ret return ret
this.displayTabContent('followed')
} }
async blockName(websiteObj) { async blockName(websiteObj) {
@ -855,14 +765,16 @@ class Websites extends LitElement {
// Successfully blocked - add to local list // Successfully blocked - add to local list
// Remove it first by filtering the list - doing it this way ensures the UI updates // Remove it first by filtering the list - doing it this way ensures the UI updates
// immediately, as apposed to only adding if it doesn't already exist // immediately, as apposed to only adding if it doesn't already exist
this.blockedNames = this.blockedNames.filter(item => item != name); this.blockedNames = this.blockedNames.filter(item => item != name)
this.blockedNames.push(name) this.blockedNames.push(name)
this.getArbitraryResources()
window.location.reload()
} }
else { else {
parentEpml.request('showSnackBar', 'Error occurred when trying to block this registered name. Please try again') parentEpml.request('showSnackBar', 'Error occurred when trying to block this registered name. Please try again')
} }
return ret return ret
this.displayTabContent('blocked')
} }
async unblockName(websiteObj) { async unblockName(websiteObj) {
@ -883,23 +795,15 @@ class Websites extends LitElement {
if (ret === true) { if (ret === true) {
// Successfully unblocked - remove from local list // Successfully unblocked - remove from local list
this.blockedNames = this.blockedNames.filter(item => item != name); this.blockedNames = this.blockedNames.filter(item => item != name)
this.getArbitraryResources()
window.location.reload()
} }
else { else {
parentEpml.request('showSnackBar', 'Error occurred when trying to unblock this registered name. Please try again') parentEpml.request('showSnackBar', 'Error occurred when trying to unblock this registered name. Please try again')
} }
return ret return ret
} this.displayTabContent('blocked')
renderRole(groupObj) {
if (groupObj.owner === this.selectedAddress.address) {
return "Owner"
} else if (groupObj.isAdmin === true) {
return "Admin"
} else {
return "Member"
}
} }
renderInfo(websiteObj) { renderInfo(websiteObj) {
@ -995,7 +899,6 @@ class Websites extends LitElement {
} }
_textMenu(event) { _textMenu(event) {
const getSelectedText = () => { const getSelectedText = () => {
var text = ""; var text = "";
if (typeof window.getSelection != "undefined") { if (typeof window.getSelection != "undefined") {