Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Plugin improvements #808

Merged
merged 21 commits into from
Mar 5, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
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
13 changes: 11 additions & 2 deletions cli/make-plugin-data.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,23 @@ for (const pluginKey of fs.readdirSync(pluginDir)) {
const data = {
name: null
};
plugins.data[pluginKey] = data;

const pluginJsonPath = path.join(pluginPath, `plugin.json`);
if (fs.existsSync(pluginJsonPath)) {
const pluginJson = require(pluginJsonPath);

data.name = pluginJson.name;

if (pluginJson.previousVersions) {
Object.entries(pluginJson.previousVersions).forEach(([key, name]) => {
plugins.data[key] = {
name,
outdated: true,
newPlugin: pluginKey
};
});
}
}
else {
console.error(`Plugin ${pluginKey} does not contain a plugin.json file.`);
Expand Down Expand Up @@ -74,8 +85,6 @@ for (const pluginKey of fs.readdirSync(pluginDir)) {
process.exit(1);
}
}

plugins.data[pluginKey] = data;
}

const filename = path.join(pluginDir, `plugins.json`);
Expand Down
6 changes: 6 additions & 0 deletions schemas/plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@
"name": {
"type": "string"
},
"previousVersions": {
"type": "object",
"additionalProperties": {
"type": "string"
}
},
"description": { "$ref": "#/definitions/htmlStringLines" },
"links": {
"type": "object",
Expand Down
10 changes: 8 additions & 2 deletions tests/fixture-valid.js
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,14 @@ function checkFixture(manKey, fixKey, fixtureJson, uniqueValues = null) {
result.errors.push(`meta.lastModifyDate is earlier than meta.createDate.`);
}

if (meta.importPlugin && !plugins.importPlugins.includes(meta.importPlugin)) {
result.errors.push(`Unknown import plugin ${meta.importPlugin}`);
if (meta.importPlugin) {
const pluginData = plugins.data[meta.importPlugin];
const isImportPlugin = plugins.importPlugins.includes(meta.importPlugin);
const isOutdatedImportPlugin = pluginData && pluginData.outdated && plugins.importPlugins.includes(pluginData.newPlugin);

if (!(isImportPlugin || isOutdatedImportPlugin)) {
result.errors.push(`Unknown import plugin ${meta.importPlugin}`);
}
}
}

Expand Down
5 changes: 5 additions & 0 deletions ui/pages/about/plugins/_plugin.vue
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,11 @@ export default {
async asyncData({ params, query, app, redirect }) {
const pluginKey = decodeURIComponent(params.plugin);

if (plugins.data[pluginKey].outdated) {
redirect(301, `/about/plugins/${plugins.data[pluginKey].newPlugin}`);
return {};
}

const pluginData = await app.$axios.$get(`/about/plugins/${pluginKey}.json`);

const fileLocationOSes = `fileLocations` in pluginData ? Object.keys(pluginData.fileLocations).filter(
Expand Down