Skip to content

Commit 158cbf8

Browse files
committed
added code-url to fetch directly
1 parent 54fa5ac commit 158cbf8

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

src/components/Editor.vue

+7-1
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@
264264
</template>
265265

266266
<script>
267-
import { getProjectsList, getProjectFromGitHub, getProjectFromLiveDir, getRobotFrameworkVersions } from 'Code'
267+
import { getProject, getProjectsList, getProjectFromGitHub, getProjectFromLiveDir, getRobotFrameworkVersions } from 'Code'
268268
import { scrollToPosition } from 'Js/scroll.js'
269269
import { runRobot } from 'Code/pyodide.js'
270270
import { getTestCaseRanges, addLibrary } from 'Code/editorConfig.js'
@@ -404,6 +404,10 @@ export default {
404404
const project = await getProjectFromGitHub(ghURL)
405405
this.setProject(project, 'Custom code')
406406
},
407+
async setProjectFromUrl(url) {
408+
const project = await getProject(url)
409+
this.setProject(project, 'Custom code')
410+
},
407411
async setProjectsFromURL(codeProject) {
408412
const strProj = LZString.decompressFromEncodedURIComponent(codeProject)
409413
const project = JSON.parse(strProj)
@@ -661,6 +665,8 @@ export default {
661665
} else if (urlParams.get('example')) {
662666
const project = list.find(({ name }) => name === urlParams.get('example'))
663667
this.setProjectFromConfig(project)
668+
} else if (urlParams.get('code-url')) {
669+
this.setProjectFromUrl(urlParams.get('code-url'))
664670
} else {
665671
this.setProjectFromConfig(list[0], null, null, true)
666672
}

src/components/EmbeddedEditor.vue

+9-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
</template>
149149

150150
<script>
151-
import { getProjectsList, getProjectFromGitHub, getProjectFromLiveDir, getRobotFrameworkVersions } from 'Code'
151+
import { getProject, getProjectsList, getProjectFromGitHub, getProjectFromLiveDir, getRobotFrameworkVersions } from 'Code'
152152
import { runRobot } from 'Code/pyodide.js'
153153
import { getTestCaseRanges, addLibrary } from 'Code/editorConfig.js'
154154
import * as monaco from 'monaco-editor/esm/vs/editor/editor.api'
@@ -273,6 +273,10 @@ export default {
273273
const project = await getProjectFromGitHub(ghURL)
274274
this.setProject(project, 'Custom code')
275275
},
276+
async setProjectFromUrl(url) {
277+
const project = await getProject(url)
278+
this.setProject(project, 'Custom code')
279+
},
276280
async setProjectsFromURL(codeProject) {
277281
const strProj = LZString.decompressFromEncodedURIComponent(codeProject)
278282
const project = JSON.parse(strProj)
@@ -348,6 +352,8 @@ export default {
348352
} else if (urlParams.get('example')) {
349353
const project = list.find(({ name }) => name === urlParams.get('example'))
350354
this.setProjectFromConfig(project)
355+
} else if (urlParams.get('code-url')) {
356+
this.setProjectFromUrl(urlParams.get('code-url'))
351357
} else {
352358
this.setProjectFromConfig(list[0], null, null, true)
353359
}
@@ -545,6 +551,8 @@ export default {
545551
} else if (urlParams.get('example')) {
546552
const project = list.find(({ name }) => name === urlParams.get('example'))
547553
this.setProjectFromConfig(project)
554+
} else if (urlParams.get('code-url')) {
555+
this.setProjectFromUrl(urlParams.get('code-url'))
548556
} else {
549557
this.setProjectFromConfig(list[0], null, null, true)
550558
}

src/js/code/index.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,11 @@ const getProjectFromGitHub = async(ghURL) => {
2424

2525
const getProjectFromLiveDir = async(projectDir) => {
2626
const projectUrl = `${baseURL}/${projectDir}`
27-
return getProject(projectUrl)
27+
return await getProject(projectUrl)
2828
}
2929

3030
const getProject = async(projectUrl) => {
3131
console.log(`Loading data from ${projectUrl}`)
32-
// const configFile = await fetch(`${projectUrl}/config.json?token=${Date.now()}`)
3332
const configFile = await fetch(`${projectUrl}/config.json`)
3433
.then(response => response.json())
3534
const project = { name: configFile.name, files: [], description: '' }
@@ -49,7 +48,6 @@ const getProject = async(projectUrl) => {
4948
}
5049
for (const file of configFile.files) {
5150
const { fileName, hidden } = file
52-
// const content = await fetch(`${projectUrl}/${fileName}?token=${Date.now()}`)
5351
const content = await fetch(`${projectUrl}/${fileName}`)
5452
.then(response => response.text())
5553
project.files.push({

0 commit comments

Comments
 (0)