Skip to content

Commit c278e77

Browse files
authored
Merge branch 'master' into feature/gh-19898
2 parents b0be04d + 24d817e commit c278e77

File tree

10 files changed

+142
-145
lines changed

10 files changed

+142
-145
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
/sources/academy/ @honzajavorek
99

1010
# OpenAPI spec
11-
/apify-api/ @netmilk @janbuchar @fnesveda
11+
/apify-api/ @janbuchar @fnesveda

apify-api/openapi/paths/actor-builds/actor-builds@{buildId}@openapi.json.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,9 @@ get:
3737
application/json:
3838
schema:
3939
$ref: '../../components/schemas/actor-builds/GetOpenApiResponse.yaml'
40+
x-js-parent: BuildClient
41+
x-js-name: getOpenApiDefinition
42+
x-js-doc-url: https://docs.apify.com/api/client/js/reference/class/BuildClient#getOpenApiDefinition
43+
x-py-parent: BuildClient
44+
x-py-name: get_open_api_definition
45+
x-py-doc-url: https://docs.apify.com/api/client/python/reference/class/BuildClient#get_open_api_definition

apify-api/openapi/paths/actors/acts@{actorId}@builds@default.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,3 +74,9 @@ get:
7474
inputSchema: '{\n \"title\": \"Schema for ... }'
7575
readme: '# Magic Actor\nThis Actor is magic.'
7676
buildNumber: 0.1.1
77+
x-js-parent: ActorClient
78+
x-js-name: defaultBuild
79+
x-js-doc-url: https://docs.apify.com/api/client/js/reference/class/ActorClient#defaultBuild
80+
x-py-parent: ActorClient
81+
x-py-name: default_build
82+
x-py-doc-url: https://docs.apify.com/api/client/python/reference/class/ActorClient#default_build

nginx.conf

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -446,18 +446,45 @@ server {
446446

447447
server {
448448
listen 0.0.0.0:8080;
449-
449+
resolver 172.20.0.10;
450450
server_name ~^(?<subdomain>[^.]+)\.preview\.docs\.apify\.com$;
451451

452+
# add trailing slashes to the root of GH pages docs
453+
rewrite ^/api/client/js$ /api/client/js/ redirect;
454+
rewrite ^/api/client/python$ /api/client/python/ redirect;
455+
rewrite ^/sdk/js$ /sdk/js/ redirect;
456+
rewrite ^/sdk/python$ /sdk/python/ redirect;
457+
rewrite ^/cli$ /cli/ redirect;
458+
459+
location ~ ^/api/client/js/(.*)$ {
460+
proxy_pass https://apify.github.io/apify-client-js/$1;
461+
}
462+
location ~ ^/api/client/python/(.*)$ {
463+
proxy_pass https://apify.github.io/apify-client-python/$1;
464+
}
465+
location ~ ^/sdk/js/(.*)$ {
466+
proxy_pass https://apify.github.io/apify-sdk-js/$1;
467+
}
468+
location ~ ^/sdk/python/(.*)$ {
469+
proxy_pass https://apify.github.io/apify-sdk-python/$1;
470+
}
471+
location ~ ^/cli/(.*)$ {
472+
proxy_pass https://apify.github.io/apify-cli/$1;
473+
}
474+
475+
location = / {
476+
proxy_pass https://s3.amazonaws.com/apify-docs-preview/$subdomain/index.html;
477+
}
452478
location ~ ^/(.*)/$ {
453479
proxy_pass https://s3.amazonaws.com/apify-docs-preview/$subdomain/$1/index.html;
454480
}
455-
456-
location ~ ^/(.*[^./])$ {
481+
location ~ ^/([^.]+)$ {
457482
proxy_pass https://s3.amazonaws.com/apify-docs-preview/$subdomain/$1.html;
458483
}
459-
484+
location ~ ^/(.*)$ {
485+
proxy_pass https://s3.amazonaws.com/apify-docs-preview/$subdomain/$1;
486+
}
460487
location / {
461-
proxy_pass https://s3.amazonaws.com/apify-docs-preview/$subdomain/;
488+
proxy_pass https://s3.amazonaws.com/apify-docs-preview/$subdomain$uri;
462489
}
463-
}
490+
}

sources/platform/actors/development/actor_definition/input_schema/specification.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,11 +223,19 @@ The `anyDate` property renders a date picker that accepts both absolute and rela
223223

224224
![Apify Actor input schema - country input](./images/input-schema-date-both.png)
225225

226+
The `fileupload` editor enables users to specify a file as input. The input is passed to the Actor as a string. It is the Actor author's responsibility to interpret this string, including validating its existence and format.
227+
228+
![Apify Actor input schema - fileupload input](./images/input-schema-fileupload-input.png)
229+
230+
The user provides either a URL or uploads the file to a key-value store (existing or new).
231+
232+
![Apify Actor input schema - fileupload input options](./images/input-schema-fileupload-modal.png)
233+
226234
Properties:
227235

228236
| Property | Value | Required | Description |
229237
|--------------|------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
230-
| `editor` | One of <ul><li>`textfield`</li><li>`textarea`</li><li>`javascript`</li><li>`python`</li><li>`select`</li><li>`datepicker`</li><li>`hidden`</li></ul> | Yes | Visual editor used for <br/>the input field. |
238+
| `editor` | One of <ul><li>`textfield`</li><li>`textarea`</li><li>`javascript`</li><li>`python`</li><li>`select`</li><li>`datepicker`</li><li>`fileupload`</li><li>`hidden`</li></ul> | Yes | Visual editor used for <br/>the input field. |
231239
| `pattern` | String | No | Regular expression that will be <br/>used to validate the input. <br/> If validation fails, <br/>the Actor will not run. |
232240
| `minLength` | Integer | No | Minimum length of the string. |
233241
| `maxLength` | Integer | No | Maximum length of the string. |
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)