yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v8/feature/mb-embed' into v8/feature/mb-embed

Browse Source
This commit is contained in:
Bjarke Berg
2019-10-31 12:32:51 +01:00
parent 1436441f78 9e3d2c9ed9
commit bf16a5936e
11 changed files with 35 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/Umbraco.Web.UI/App_Plugins/UmbModelsBuilder/modelsbuilder.controller.js
View File

@@ -1,38 +0,0 @@
function modelsBuilderController($scope, $http, umbRequestHelper, modelsBuilderResource) {
var vm = this;
vm.reload = reload;
vm.generate = generate;
vm.dashboard = null;
function generate() {
vm.generating = true;
umbRequestHelper.resourcePromise(
$http.post(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "BuildModels")),
'Failed to generate.')
.then(function (result) {
vm.generating = false;
vm.dashboard = result;
});
}
function reload() {
vm.loading = true;
modelsBuilderResource.getDashboard().then(function (result) {
vm.dashboard = result;
vm.loading = false;
});
}
function init() {
vm.loading = true;
modelsBuilderResource.getDashboard().then(function (result) {
vm.dashboard = result;
vm.loading = false;
});
}
init();
}
angular.module("umbraco").controller("Umbraco.Dashboard.ModelsBuilderController", modelsBuilderController);

44
src/Umbraco.Web.UI/App_Plugins/UmbModelsBuilder/modelsbuilder.html
View File

@@ -1,44 +0,0 @@
<div id="modelsBuilder" ng-controller="Umbraco.Dashboard.ModelsBuilderController as vm">
<umb-box>
<umb-box-content>
<div ng-show="!vm.loading" class="pull-right">
<button type="button" class="btn" ng-click="vm.reload()"><span>Reload</span></button>
</div>
<h3 class="bold">Models Builder</h3>
<umb-load-indicator ng-show="vm.loading"></umb-load-indicator>
<div ng-show="!vm.loading && vm.dashboard">
<div ng-bind-html="vm.dashboard.text"></div>
<div ng-if="vm.dashboard.outOfDateModels">
<p>Models are <strong>out-of-date</strong>.</p>
</div>
<div ng-if="vm.dashboard.canGenerate">
<div ng-if="vm.dashboard.generateCausesRestart">
<p style="color: red; font-weight: bold;">Generating models will restart the application.</p>
</div>
<div ng-show="!vm.generating">
<button type="button" ng-click="vm.generate()" class="btn btn-danger">
<span>Generate models</span>
</button>
</div>
<div class="umb-loader-wrapper" ng-show="vm.generating">
<div class="umb-loader"></div>
</div>
</div>
<div ng-if="vm.dashboard.lastError" style="margin-top: 32px;" ng-show="!vm.generating">
<span style="color: red; font-weight: bold;">Last generation failed with the following error:</span>
<pre style="width: 80%; white-space: pre-line; background: #f8f8f8; padding: 4px; font-size: small;">{{vm.dashboard.lastError}}</pre>
</div>
</div>
</umb-box-content>
</umb-box>
</div>

23
src/Umbraco.Web.UI/App_Plugins/UmbModelsBuilder/modelsbuilder.resource.js
View File

@@ -1,23 +0,0 @@
function modelsBuilderResource($q, $http, umbRequestHelper) {
return {
getModelsOutOfDateStatus: function () {
return umbRequestHelper.resourcePromise(
$http.get(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "GetModelsOutOfDateStatus")),
"Failed to get models out-of-date status");
},
buildModels: function () {
return umbRequestHelper.resourcePromise(
$http.post(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "BuildModels")),
"Failed to build models");
},
getDashboard: function () {
return umbRequestHelper.resourcePromise(
$http.get(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "GetDashboard")),
"Failed to get dashboard");
}
};
}
angular.module("umbraco.resources").factory("modelsBuilderResource", modelsBuilderResource);

18
src/Umbraco.Web.UI/App_Plugins/UmbModelsBuilder/package.manifest
View File

@@ -1,18 +0,0 @@
{
// array of files we want to inject into the application
"javascript": [
"~/App_Plugins/ModelsBuilder/modelsbuilder.controller.js",
"~/App_Plugins/ModelsBuilder/modelsbuilder.resource.js"
],
// models builder dashboard
"dashboards": [
{
"alias": "settingsModelsBuilder",
"name": "Models Builder",
"view": "/App_Plugins/ModelsBuilder/modelsbuilder.html",
"sections": [ "settings" ],
"weight": 40
}
]
}

5
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -80,6 +80,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
<Folder Include="App_Plugins" />
<Folder Include="Views\MacroPartials\" />
</ItemGroup>
<ItemGroup>
@@ -144,9 +145,6 @@
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
<Content Include="App_Plugins\UmbModelsBuilder\modelsbuilder.controller.js" />
<Content Include="App_Plugins\UmbModelsBuilder\modelsbuilder.html" />
<Content Include="App_Plugins\UmbModelsBuilder\modelsbuilder.resource.js" />
<Content Include="Config\grid.editors.config.js" />
<Content Include="Config\Lang\cs-CZ.user.xml" />
<Content Include="Config\Lang\da-DK.user.xml" />
@@ -172,7 +170,6 @@
<Content Include="Umbraco\Config\Lang\zh_tw.xml" />
<Content Include="Config\Splashes\noNodes.aspx" />
<Content Include="Umbraco\Install\Views\Web.config" />
<Content Include="App_Plugins\UmbModelsBuilder\package.manifest" />
<None Include="Config\ClientDependency.Release.config">
<DependentUpon>ClientDependency.config</DependentUpon>
<SubType>Designer</SubType>