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

File structure changes and fixes #7

Merged
merged 5 commits into from Mar 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions Gemfile.lock
Expand Up @@ -34,6 +34,7 @@ GEM

PLATFORMS
arm64-darwin-21
x86_64-linux

DEPENDENCIES
rubocop-discourse
Expand Down
Expand Up @@ -15,13 +15,20 @@ export default Component.extend({
"plugin.status.branch",
"discourse.branch"
)
detailDescription(pluginName, pluginStatus, pluginLastStatusAt, pluginStatusChangedAt, pluginBranch, discourseBranch) {
detailDescription(
pluginName,
pluginStatus,
pluginLastStatusAt,
pluginStatusChangedAt,
pluginBranch,
discourseBranch
) {
return I18n.t(`plugin_manager.plugin.status.${pluginStatus}.description`, {
plugin_name: pluginName,
plugin_branch: pluginBranch,
discourse_branch: discourseBranch,
plugin_last_status_at: moment(pluginLastStatusAt).fromNow(),
plugin_status_changed_at: moment(pluginStatusChangedAt).fromNow()
plugin_status_changed_at: moment(pluginStatusChangedAt).fromNow(),
});
},

Expand Down
Expand Up @@ -2,7 +2,6 @@ import Plugin from "../models/plugin";
import Discourse from "../models/discourse";
import { withPluginApi } from "discourse/lib/plugin-api";
import discourseComputed from "discourse-common/utils/decorators";
import I18n from "I18n";

import EverythingSectionLink from "discourse/lib/sidebar/common/community-section/everything-section-link";
import AdminSectionLink from "discourse/lib/sidebar/user/community-section/admin-section-link";
Expand All @@ -14,8 +13,6 @@ export default {
name: "plugin-manager",
initialize(container) {
const messageBus = container.lookup("service:message-bus");
const site = container.lookup("service:site");
const siteSettings = container.lookup("service:site-settings");

messageBus.subscribe(
"/plugin-manager/status-updated",
Expand Down Expand Up @@ -81,7 +78,7 @@ export default {
PluginStatusSectionLink,
AdminSectionLink,
];
}
},
});

api.modifyClass("component:sidebar/anonymous/community-section", {
Expand All @@ -90,9 +87,9 @@ export default {
EverythingSectionLink,
DocumentationSectionLink,
SupportSectionLink,
PluginStatusSectionLink
PluginStatusSectionLink,
];
}
},
});
});
},
Expand Down
@@ -1,13 +1,14 @@
import I18n from "I18n";
import { helperContext } from "discourse-common/lib/helpers";
import BaseSectionLink from "discourse/lib/sidebar/base-community-section-link";
import Category from "discourse/models/category";

export default class DocumentationSectionLink extends BaseSectionLink {
constructor() {
super(...arguments)
super(...arguments);
const { site, siteSettings } = helperContext();
const categoryId = Number(siteSettings.plugin_manager_documentation_category);
const categoryId = Number(
siteSettings.plugin_manager_documentation_category
);
this.category = site.categories.find((c) => c.id === categoryId);
}

Expand Down
Expand Up @@ -26,4 +26,4 @@ export default class PluginStatusSectionLink extends BaseSectionLink {
get prefixValue() {
return "plug";
}
}
}
@@ -1,11 +1,10 @@
import I18n from "I18n";
import { helperContext } from "discourse-common/lib/helpers";
import BaseSectionLink from "discourse/lib/sidebar/base-community-section-link";
import Category from "discourse/models/category";

export default class DocumentationSectionLink extends BaseSectionLink {
constructor() {
super(...arguments)
super(...arguments);
const { site, siteSettings } = helperContext();
const categoryId = Number(siteSettings.plugin_manager_support_category);
this.category = site.categories.find((c) => c.id === categoryId);
Expand All @@ -20,7 +19,7 @@ export default class DocumentationSectionLink extends BaseSectionLink {
}

get model() {
return `${Category.slugFor(this.category)}/${this.category?.id}` ;
return `${Category.slugFor(this.category)}/${this.category?.id}`;
}

get title() {
Expand All @@ -38,4 +37,4 @@ export default class DocumentationSectionLink extends BaseSectionLink {
get prefixValue() {
return "far-life-ring";
}
}
}
5 changes: 0 additions & 5 deletions plugin.rb
Expand Up @@ -65,11 +65,6 @@

if Rails.env.development?
PluginManager::Plugin.update_local_plugins
elsif
unless Rails.env.test?
PluginManager::Plugin.update_plugins
PluginManager::Plugin.update_test_statuses
end
end

user_key_suffix = 'plugin-registrations'
Expand Down
Empty file.
27 changes: 0 additions & 27 deletions templates/plugin_manager.template.yml

This file was deleted.