Skip to content

Commit ab1d6ab

Browse files
committed
Merged master.
2 parents 6745519 + b92d3b5 commit ab1d6ab

File tree

321 files changed

+20204
-12891
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

321 files changed

+20204
-12891
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
.history/
22
.vs/
33
.vscode/
4+
.DS_Store
45
dist/
56
node_modules/
67
src/config.design.json
78
src/config.publish.json
8-
src/config.runtime.json
9+
src/config.runtime.json
10+

.pipeline/migrate.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: CD-ApiMDeveloperPortal-Migration-Pipeline
2+
3+
trigger: none
4+
5+
variables:
6+
- name: poolName
7+
value: "agentpoolName"
8+
9+
jobs:
10+
11+
# All tasks on APIM Developer portal pipeline
12+
- job: Migrate_APIM_Developer_Portal
13+
displayName: Migrate APIM Developer portal from one APIM instance to another APIM instance Migration
14+
pool:
15+
name: $(poolName)
16+
timeoutInMinutes: 90
17+
steps:
18+
- task: Npm@1
19+
displayName: Npm Install command
20+
inputs:
21+
command: "install"
22+
23+
- pwsh: |
24+
node ./migrate --sourceSubscriptionId "$(sourceSubscriptionId)" --sourceResourceGroupName "$(sourceResourceGroupName)" --sourceServiceName "$(sourceServiceName)" --destServiceName "$(destServiceName)" --destSubscriptionId "$(destSubscriptionId)" --destResourceGroupName "$(destResourceGroupName)" --sourceTenantId "$(sourceAzureTenantId)" --sourceServicePrincipal "$(sourceServicePrincipal)" --sourceSecret "$(sourceServicePrincipalSecret)" --destTenantId "$(sourceAzureTenantId)" --destServicePrincipal "$(destServicePrincipal)" --destSecret "$(destServicePrincipalSecret)"
25+
workingDirectory: "$(System.DefaultWorkingDirectory)/scripts.v3"
26+
displayName: Run Migrate cmd from $(sourceServiceName) to $(destinationServiceName)
27+
28+
- pwsh: |
29+
node ./updatecontenturl --existingEnvUrls "$(existingEnvUrls)" --destEnvUrls "$(destEnvUrls)" --destServiceName "$(destinationServiceName)" --destSubscriptionId "$(destSubscriptionId)" --destResourceGroupName "$(destResourceGroupName)" --destTenantId "$(destAzureTenantId)" --destServicePrincipal "$(destServicePrincipal)" --destSecret "$(destServicePrincipalSecret)"
30+
workingDirectory: '$(System.DefaultWorkingDirectory)/scripts.v3'
31+
displayName: Update urls for $(destinationServiceName)

.pipeline/readme.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Create your pipeline
2+
In your Azure DevOps project pipelines section select new pipeline.
3+
4+
Select your source code provider and repository in the first two tabs and in the Configure steps above. Scroll down to the bottom of the page and select Existing Azure Pipelines YAML file:
5+
6+
![create-pipeline.PNG](/.pipeline/readme/create-pipeline.png)
7+
8+
Then select the [migrate.yml](/.pipeline/migrate.yml) file you previously added to the repository:
9+
10+
![select-existing.PNG](/.pipeline/readme/select-existing-yaml.png)
11+
12+
In the Review tab, select the Variables button and create the variables with the values defined in the Pipeline parameters table. Make sure you check the Keep this value secret option for sensitive parameters.
13+
14+
![variables.PNG](/.pipeline/readme/variables.png)
15+
16+
Then select Run. This saves and executes your pipeline for the fist time, seen below:
17+
18+
# Appendix: Pipeline Variables
19+
20+
| Variable Name | Value Description |
21+
|--|--|
22+
| sourceSubscriptionId | Source APIM service resource subscription ID |
23+
| sourceResourceGroupName | Source APIM service resource group name |
24+
| sourceServiceName | Source APIM service name |
25+
| destServiceName | Destination APIM service name |
26+
| destSubscriptionId | Destination APIM service resource subscription ID |
27+
| destResourceGroupName | Destination APIM service resource group name |
28+
| sourceTenantId | Source Azure tenant ID |
29+
| sourceServicePrincipal | Source Azure service principal |
30+
| sourceServicePrincipalSecret | Source Azure service principal secret |
31+
| destTenantId | Destination Azure tenant ID |
32+
| destServicePrincipal | Destination Azure service principal|
33+
| destServicePrincipalSecret | Destination Azure service principal secret |
34+
| existingEnvUrls | Existing environment URLs (URLs used in the developer portal from source APIM to replace, if we have multiple urls then comma separated values to be given.) |
35+
| destEnvUrls | Destination environment urls (urls used in the developer portal from destination APIM to be replaced with - if we have multiple urls then comma separated values to be given in same order of source.) |
40.5 KB
Loading
26 KB
Loading

.pipeline/readme/variables.png

20 KB
Loading

community/widgets/document-details/documentDetailsHandlers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export class DocumentDetailsHandlers implements IWidgetHandler {
99
name: widgetName,
1010
displayName: widgetDisplayName,
1111
category: widgetCategory,
12-
iconClass: "paperbits-puzzle-10",
12+
iconClass: "widget-icon widget-icon-component",
1313
requires: ["html"],
1414
createModel: async () => {
1515
const model = new DocumentDetailsModel();

community/widgets/document-details/ko/documentDetailsViewModelBinder.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Bag } from "@paperbits/common";
22
import { EventManager } from "@paperbits/common/events";
3-
import { IWidgetBinding } from "@paperbits/common/editing";
3+
import { ComponentFlow, IWidgetBinding } from "@paperbits/common/editing";
44
import { ViewModelBinder } from "@paperbits/common/widgets";
55
import { DocumentDetailsViewModel } from "./documentDetailsViewModel";
66
import { widgetName, widgetDisplayName, widgetEditorSelector } from "../constants";
@@ -23,7 +23,7 @@ export class DocumentDetailsViewModelBinder implements ViewModelBinder<DocumentD
2323
displayName: widgetDisplayName,
2424
readonly: bindingContext?.readonly,
2525
model: model,
26-
flow: "block",
26+
flow: ComponentFlow.Block,
2727
editor: widgetEditorSelector,
2828
draggable: true,
2929
applyChanges: async () => {

examples/publisher/azure-function/publish/index.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import { CorePublishModule } from "@paperbits/core/core.publish.module";
88
import { ApimPublishModule } from "../../../../src/apim.publish.module";
99
import { StylePublishModule } from "@paperbits/styles/styles.publish.module";
1010
import { ProseMirrorModule } from "@paperbits/prosemirror/prosemirror.module";
11-
import { StaticSettingsProvider } from "../../../../src/configuration/staticSettingsProvider";
11+
import { ConsoleLogger } from "@paperbits/common/logging";
12+
import { StaticSettingsProvider } from "../../../../src/components/staticSettingsProvider";
1213

1314

1415
export async function publish(): Promise<void> {
@@ -31,7 +32,8 @@ export async function publish(): Promise<void> {
3132
});
3233

3334
/* Storage where the website get published */
34-
const outputBlobStorage = new AzureBlobStorage(outputSettingsProvider);
35+
const logger = new ConsoleLogger();
36+
const outputBlobStorage = new AzureBlobStorage(outputSettingsProvider, logger);
3537

3638
const injector = new InversifyInjector();
3739
injector.bindModule(new CoreModule());

examples/widgets/conference-session/conferenceSessionHandlers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export class ConferenceSessionHandlers implements IWidgetHandler {
99
name: widgetName,
1010
displayName: widgetDisplayName,
1111
category: widgetCategory,
12-
iconClass: "paperbits-puzzle-10",
12+
iconClass: "widget-icon widget-icon-component",
1313
requires: [],
1414
createModel: async () => {
1515
const model = new ConferenceSessionModel();

0 commit comments

Comments
 (0)