diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 50a6f24ba..0bab1ca64 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -10,7 +10,7 @@ jobs: build-and-e2e: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: npm ci - run: npm run bundle - run: npm run e2e diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0de4a3a18..ac93ae372 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,13 +10,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 - name: Cache node modules - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.npm # npm cache files are stored in `~/.npm` on Linux/macOS key: npm-${{ hashFiles('package-lock.json') }} @@ -26,7 +26,7 @@ jobs: - run: npm ci - run: npm run bundle - name: Store bundle artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: bundles path: bundles @@ -47,7 +47,7 @@ jobs: - uses: actions/checkout@v3 - run: npm ci - name: Download bundled artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: bundles path: bundles @@ -85,16 +85,16 @@ jobs: registry-url: 'https://registry.npmjs.org' - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download bundled artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: bundles path: bundles - name: Cache node modules - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.npm # npm cache files are stored in `~/.npm` on Linux/macOS key: npm-${{ hashFiles('package-lock.json') }} diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 40a8978c4..6172d70ec 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -10,7 +10,7 @@ jobs: build-and-unit: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: npm ci - run: npm run bundle - run: npm test diff --git a/README.md b/README.md index cf50122d5..cf1612aba 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# This is a fork of the [Redocly/redoc](https://github.com/Redocly/redoc) project. It will be supported for the Bandwidth Organization only! If you would like to contribute or have any issues with the project, please contribute to the parent project and NOT this repository. +# This is a fork of the [Redocly/redoc](https://github.com/Redocly/redoc) project. It will be supported for the Bandwidth Organization only! If you would like to contribute or have any issues with the project, please contribute to the parent project and NOT this repository diff --git a/demo/openapi.yaml b/demo/openapi.yaml index 90a71831a..d715155e6 100644 --- a/demo/openapi.yaml +++ b/demo/openapi.yaml @@ -40,7 +40,7 @@ info: - version: 1.1.0 + version: 1.0.0 title: Swagger Petstore termsOfService: 'http://swagger.io/terms/' contact: @@ -59,8 +59,6 @@ externalDocs: tags: - name: pet description: Everything about your Pets - - name: Tn Option - description: Everything about your TN Options - name: store description: Access to Petstore orders - name: user @@ -78,7 +76,6 @@ x-tagGroups: tags: - pet - store - - Tn Option - name: User Management tags: - user @@ -116,9 +113,6 @@ paths: summary: Add a new pet to the store description: Add new pet to the store inventory. operationId: addPet - x-badges: - - name: Global - type: global responses: '405': description: Invalid input @@ -166,9 +160,6 @@ paths: summary: Update an existing pet description: '' operationId: updatePet - x-badges: - - name: US Only - type: usonly responses: '400': description: Invalid ID supplied @@ -195,596 +186,6 @@ paths: } requestBody: $ref: '#/components/requestBodies/Pet' - '/accounts/{accountId}/tnoptions/{orderid}/history': - get: - description: Retrieve the history information associated with an order. - operationId: GetOrderHistory - x-badges: - - name: Success - type: success - parameters: - - description: '' - in: path - name: orderid - required: true - schema: - type: string - responses: - '200': - content: - application/xml: - examples: - application/xml: - value: |- - - - - 2020-09-17T08:56:39.607Z - Order has been received by the system. - admin - received - - - 2020-09-17T08:56:39.743Z - Order processing has started. - admin - processing - - - 2020-09-17T08:56:39.820Z - Order is complete. - admin - complete - - - description: >- - The history payload is a set of history records, each of which - contains: - - - -
OrderDateThe date that the order history event happened
StatusThe new state of the TN Option order - RECEIVED, PROCESSING, COMPLETE, PARTIAL, FAILED
NoteA Note or additional information included with the state change
AuthorThe user id that implemented the state change

- '404': - content: - application/xml: {} - description: Not found. The order id does not exist in the system. - summary: Retrieve TN Option order history - tags: - - Tn Option - '/accounts/{accountId}/tnoptions': - get: - description: >- - Retrieve a list of the TN Option orders that are associated with the - account. A maximum of 1,000 orders can be retrieved per request. If no - date range or specific query parameter (marked by * below) is - provided, the order results will be limited to the last two years. - operationId: GetTnOptionOrders - x-badges: - - name: 1st Badge - type: warning - - name: 2nd Badge - type: experimental - parameters: - - description: The status of the TN Option order being searched for. - example: PROCESSING - in: query - name: status - required: false - schema: - items: - type: string - type: array - - description: * A Telephone Number (TN) that is referenced in the order. - example: '9199918388' - in: query - name: tn - required: false - schema: - type: string - - description: >- - * The Customer Order ID is an ID assigned by the account - owner to provide a reference number for the TN Option order. - example: ABCCorp12345 - in: query - name: customerOrderId - required: false - schema: - type: string - - description: >- - For Date-based searches, the starting date of a date range - (inclusive) that will be used to find TN Option Orders that were - modified within the date range. It is in the form yyyy-MM-dd. - example: '2013-10-22' - in: query - name: modifiedDateFrom - required: false - schema: - type: string - - description: >- - For Date-based searches, the ending date of a date range (inclusive) - that will be used to find TN Option Orders that were modified within - the date range. It is in the form yyyy-MM-dd. - example: '2013-10-25' - in: query - name: modifiedDateTo - required: false - schema: - type: string - - description: >- - Checks the order's creation date against this value. Orders that - have a creation date after this date will be included. Format is - yyyy-MM-dd. - example: '2013-10-22' - in: query - name: createdDateFrom - required: false - schema: - type: string - - description: >- - Checks the order's creation date against this value. Orders that - have a creation date before this date will be included. Format is - yyyy-MM-dd. - example: '2013-10-25' - in: query - name: createdDateTo - required: false - schema: - type: string - - description: >- - Checks the order's last modified date against this value. Orders - that have a modification date after this date will be included. - Format is yyyy-MM-dd. - example: '2013-10-25' - in: query - name: lastModifiedAfter - required: false - schema: - type: string - - description: >- - This is the user-name of the user that last modified the TN Option - Order. - example: smckinnon - in: query - name: lastModifiedBy - required: false - schema: - type: string - - description: >- - * This search parameter represents the internal Bandwidth - Dashboard API ID that has been assigned to the TN Option Order. This - parameter is the first few characters of the internal ID - the - entire ID does not need to be specified. - example: ed1c0bed-e2 - in: query - name: orderIdFragment - required: false - schema: - type: string - - description: >- - If set to true, a list of order details will be displayed instead - the summary information. - in: query - name: orderDetails - required: false - schema: - type: boolean - responses: - '200': - content: - application/xml: - examples: - example: - value: |- - - - - 2 - - 14 - 2 - jbm - 2016-01-15T12:01:14.363Z - 2016-01-15T12:01:14.324Z - tn_option - FAILED - ddbdc72e-dc27-490c-904e-d0c11291b095 - - - 14 - 3 - jbm - 2016-01-15T11:22:58.969Z - 2016-01-15T11:22:58.789Z - tn_option - COMPLETE - 409033ee-88ec-43e3-85f3-538f30733963 - - - - - 2 - - 2016-01-15T12:01:14.324Z - 14 - jbm - ddbdc72e-dc27-490c-904e-d0c11291b095 - 2016-01-15T12:01:14.363Z - FAILED - - - 10digit - 10digit - testUser1 - 6042661720 - on - true - on - sip:+12345678901@1.2.3.4:5060 - - 2018551020 - - - - off - false - off - - 2018551025 - - - - - - 5076 - Telephone number is not available. - 2018551025 - - - 5076 - Telephone number is not available. - 2018551020 - - - - - 2016-01-15T11:22:58.789Z - 14 - jbm - 409033ee-88ec-43e3-85f3-538f30733963 - 2016-01-15T11:22:58.969Z - COMPLETE - - - on - - 2174101601 - - - - off - - 2174101602 - - - - systemdefault - - 2174101603 - - - - - - - - description: >- - The descriptive payload for the TN Option Orders query provides a - broad range of information about the TN Option Orders found by the - query, including the data associated with the order, the state of - the order, and details about the order if it was successful. - '404': - content: - application/xml: {} - description: > - Not Found. If any errors are found in the processing of the query - string a 404 will be returned. Note that parameters that are not - recognized are not considered errors, and are just ignored. - summary: Retrieve list TN Option orders - tags: - - Tn Option - post: - description: >- - Create TN Option order to assign line features to the telephone - number.

Attribute description: - operationId: CreateTnOptionOrder - requestBody: - content: - application/xml: - examples: - example: - value: |- - - - TnOptionOrder1 - - - 10digit - 10digit - testUser1 - 6042661720 - on - a1b2c3 - true - on - sip:+12345678901@1.2.3.4:5060 - - M - campaignId010 - asSpecified - - - 2018551020 - - - - off - false - off - - - 6105552502 - 1 - 100 - - - sip:clarkkent@dailyplanet.com - 2 - 100 - - - 192.168.20.21 - 3 - 50 - - - 7075552509 - 3 - 50 - - - myhost.bandwidth.example - 4 - 100 - - asSpecified - - - 2018551025 - - - - true - - 2018551026 - - - - - responses: - '201': - content: - application/xml: - examples: - example: - value: |- - - - - 2016-01-15T12:01:14.324Z - 14 - jbm - ddbdc72e-dc27-490c-904e-d0c11291b095 - 2016-01-15T12:01:14.324Z - RECEIVED - - - 10digit - 10digit - testUser1 - 6042661720 - on - true - on - - 2018551020 - - - - off - false - off - - 2018551025 - - - - - - - description: Created - '400': - content: - application/xml: - examples: - example: - value: |- - - - - 5081 - Number Format 'wrong' is invalid. - - - description: >- - Bad Request A 400 response Indicates that the order could not be - created. Error text and an error code will be provided in the - ErrorList element. - '409': - content: - application/xml: - examples: - example: - value: |- - - - - 5200 - Origination route plan is not enabled for the account. - - - description: >- - Conflict. Error text and an error code will be provided in the - ErrorList element. - summary: Create TN Option order - tags: - - Tn Option - '/accounts/{accountId}/tnoptions/{orderid}': - get: - description: Retrieve information about a TN Option Order with specified ID. - operationId: GetTnOptionOrder - parameters: - - description: '' - in: path - name: orderid - required: true - schema: - type: string - responses: - '200': - content: - application/xml: - examples: - example: - value: |- - - - 2016-01-15T11:22:58.789Z - 14 - jbm - 409033ee-88ec-43e3-85f3-538f30733963 - 2016-01-15T11:22:58.969Z - COMPLETE - - - on - on - - 2174101601 - - - - off - - 2174101602 - - - - systemdefault - sip:+12345678901@1.2.3.4:5060 - - 2174101603 - - - - - - - 2174101601 - SMS is already Enabled or number is in processing. - - - - description: >- - The descriptive payload for the TN Option Orders query provides a - broad range of information about the TN Option Order identified in - the URL. Included amongst the information is: - '404': - content: - application/xml: - examples: - example: - value: |- - - - - The resource does not exist - - - description: Not found. The order id does not exist in the system. - summary: Retrieve TN Option order - tags: - - Tn Option '/pet/{petId}': get: tags: diff --git a/docs/css.md b/docs/css.md index 13739c023..b74f128c8 100644 --- a/docs/css.md +++ b/docs/css.md @@ -10,58 +10,58 @@ Certain components and containers in this project have been given unique classNa ### Operations - - `middle-panel`: top level container for content in the middle panel of an **Operation** - - `right-panel`: top level container for content in the right panel of an **Operation** - - `operation-header`: `

` that contains the **Operation** header/summary - - `operation-description`: container for the **Operation** description +- `middle-panel`: top level container for content in the middle panel of an **Operation** +- `right-panel`: top level container for content in the right panel of an **Operation** +- `operation-header`: `

` that contains the **Operation** header/summary +- `operation-description`: container for the **Operation** description ### Security - - `operation-security`: top level container for the Security/Auth section in an **Operation** - - `security-details`: container for an individual security method in the Security/Auth section +- `operation-security`: top level container for the Security/Auth section in an **Operation** +- `security-details`: container for an individual security method in the Security/Auth section ### Parameters - - `operation-parameters`: container for **Operation** query/path/header/form parameters +- `operation-parameters`: container for **Operation** query/path/header/form parameters ### Requests - - `operation-request-samples`: top level container for the **Request Samples** section in the right panel - - `request-code-sample`: container for the request code samples in the right panel - - `request-payload`: container for the request payload sample in the right panel +- `operation-request-samples`: top level container for the **Request Samples** section in the right panel +- `request-code-sample`: container for the request code samples in the right panel +- `request-payload`: container for the request payload sample in the right panel ### Responses - - `operation-responses`: top level container for the **Responses** section in the middle panel - - `response`: container for individual responses in the **Responses** section - - `response-headers`: `` for response headers for an individual response - - `operation-response-samples`: top level container for the **Response Samples** section in the right panel - - `response-sample`: container for the response payload sample in the right panel +- `operation-responses`: top level container for the **Responses** section in the middle panel +- `response`: container for individual responses in the **Responses** section +- `response-headers`: `` for response headers for an individual response +- `operation-response-samples`: top level container for the **Response Samples** section in the right panel +- `response-sample`: container for the response payload sample in the right panel ### Callbacks - - `callbacks`: top level container for the **Callbacks** section in the middle panel - - `callback`: container for individual callbacks in the **Callbacks** section - - `operation-callback-samples`: top level container for the **Callback Samples** section in the right panel - - `callback-sample`: container for the callback payload sample in the right panel +- `callbacks`: top level container for the **Callbacks** section in the middle panel +- `callback`: container for individual callbacks in the **Callbacks** section +- `operation-callback-samples`: top level container for the **Callback Samples** section in the right panel +- `callback-sample`: container for the callback payload sample in the right panel ### Schemas - - `array-schema`: container for array schema - - `object-schema`: `` for object schema - - `oneOf-schema`: container for oneOf schema - - `recursive-schema` container for recursive schema +- `array-schema`: container for array schema +- `object-schema`: `` for object schema +- `oneOf-schema`: container for oneOf schema +- `recursive-schema` container for recursive schema ### Fields - - `field`: `` for individual fields inside a **Schema** - - `field-details`: container for details on an individual **Field** - - `field-constraints`: `` for constraints on an individual **Field** inside the field details - - `field-deprecated`: deprecated badge for an individual **Field** inside the field details - - `field-example`: example value for an individual **Field** inside the field details - - `field-pattern`: regex pattern for an individual **Field** inside the field details +- `field`: `` for individual fields inside a **Schema** +- `field-details`: container for details on an individual **Field** +- `field-constraints`: `` for constraints on an individual **Field** inside the field details +- `field-deprecated`: deprecated badge for an individual **Field** inside the field details +- `field-example`: example value for an individual **Field** inside the field details +- `field-pattern`: regex pattern for an individual **Field** inside the field details ### Other - - `side-menu`: top level container for the sidebar menu - - `endpoint`: container for the endpoint URL used in multiple places - - `request-body-description`: container for the description of a request body used in multiple places +- `side-menu`: top level container for the sidebar menu +- `endpoint`: container for the endpoint URL used in multiple places +- `request-body-description`: container for the description of a request body used in multiple places diff --git a/e2e/integration/menu.e2e.ts b/e2e/integration/menu.e2e.ts index d889d7015..61dcf1d67 100644 --- a/e2e/integration/menu.e2e.ts +++ b/e2e/integration/menu.e2e.ts @@ -4,7 +4,7 @@ describe('Menu', () => { cy.visit('e2e/standalone.html'); }); it('should have valid items count', () => { - cy.get('.menu-content').find('li').should('have.length', 40); + cy.get('.menu-content').find('li').should('have.length', 35); }); it('should sync active menu items while scroll', () => { diff --git a/e2e/integration/search.e2e.ts b/e2e/integration/search.e2e.ts index 51433366d..1f440a68b 100644 --- a/e2e/integration/search.e2e.ts +++ b/e2e/integration/search.e2e.ts @@ -16,9 +16,9 @@ describe('Search', () => { getSearchInput().type('t', { force: true }); cy.get('[role=search] [role=menuitem]') - .should('have.length', 4) - .first() - .should('contain', 'Delete purchase order'); + .should('have.length', 3) + .eq(1) + .should('contain', 'Delete purchase order by ID'); getSearchInput().type('{esc}', { force: true }); getSearchResults().should('not.exist'); @@ -44,8 +44,6 @@ describe('Search', () => { getResult(1).should('have.class', 'active'); getSearchInput().type('{enter}', { force: true }); - - cy.contains('[role=menu] label', 'Introduction').should('have.class', 'active'); }); it('should mark search results', () => { @@ -74,8 +72,5 @@ describe('Search', () => { .should('have.length', 1) .first() .should('contain', 'uploads an image'); - - getSearchInput().clear().type('/tnoptions', { force: true, parseSpecialCharSequences: false }); - cy.get('[role=search] [role=menuitem]').should('have.length', 4); }); }); diff --git a/package-lock.json b/package-lock.json index fbdb5afd4..5c78b9631 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2140,9 +2140,9 @@ } }, "node_modules/@emotion/is-prop-valid": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.1.tgz", - "integrity": "sha512-61Mf7Ufx4aDxx1xlDeOm8aFFigGHE4z+0sKCa+IHCeZKiyP9RLD0Mmx7m8b9/Cf37f7NAvQOOJAbQQGVr5uERw==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.2.tgz", + "integrity": "sha512-uNsoYd37AFmaCdXlg6EYD1KaPOaRWRByMCYzbKUX4+hhMfrxdVSelShywL4JVaAeM/eHUOSprYBQls+/neX3pw==", "dev": true, "dependencies": { "@emotion/memoize": "^0.8.1" @@ -6885,9 +6885,9 @@ "dev": true }, "node_modules/csstype": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz", - "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", "dev": true }, "node_modules/cypress": { @@ -14182,9 +14182,9 @@ } }, "node_modules/nanoid": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", - "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", "dev": true, "funding": [ { @@ -15110,9 +15110,9 @@ } }, "node_modules/postcss": { - "version": "8.4.31", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", - "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", + "version": "8.4.38", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", + "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", "dev": true, "funding": [ { @@ -15129,9 +15129,9 @@ } ], "dependencies": { - "nanoid": "^3.3.6", + "nanoid": "^3.3.7", "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" + "source-map-js": "^1.2.0" }, "engines": { "node": "^10 || ^12 || >=14" @@ -16899,9 +16899,9 @@ } }, "node_modules/source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", "dev": true, "engines": { "node": ">=0.10.0" @@ -20721,9 +20721,9 @@ "dev": true }, "@emotion/is-prop-valid": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.1.tgz", - "integrity": "sha512-61Mf7Ufx4aDxx1xlDeOm8aFFigGHE4z+0sKCa+IHCeZKiyP9RLD0Mmx7m8b9/Cf37f7NAvQOOJAbQQGVr5uERw==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.2.tgz", + "integrity": "sha512-uNsoYd37AFmaCdXlg6EYD1KaPOaRWRByMCYzbKUX4+hhMfrxdVSelShywL4JVaAeM/eHUOSprYBQls+/neX3pw==", "dev": true, "requires": { "@emotion/memoize": "^0.8.1" @@ -24283,9 +24283,9 @@ } }, "csstype": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz", - "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", "dev": true }, "cypress": { @@ -29672,9 +29672,9 @@ } }, "nanoid": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", - "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz", + "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==", "dev": true }, "nanospinner": { @@ -30373,14 +30373,14 @@ "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==" }, "postcss": { - "version": "8.4.31", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", - "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", + "version": "8.4.38", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", + "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", "dev": true, "requires": { - "nanoid": "^3.3.6", + "nanoid": "^3.3.7", "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" + "source-map-js": "^1.2.0" } }, "postcss-modules-extract-imports": { @@ -31741,9 +31741,9 @@ "dev": true }, "source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", "dev": true }, "source-map-support": { diff --git a/src/components/SearchBox/SearchBox.tsx b/src/components/SearchBox/SearchBox.tsx index b22e66d37..e976566eb 100644 --- a/src/components/SearchBox/SearchBox.tsx +++ b/src/components/SearchBox/SearchBox.tsx @@ -177,7 +177,9 @@ export class SearchBox extends React.PureComponent )} {this.state.term && this.state.noResults ? ( - {l('noResultsFound')} + + {l('noResultsFound')} + ) : null} ); diff --git a/src/services/models/Operation.ts b/src/services/models/Operation.ts index c5c77f61b..cb8bd73dd 100644 --- a/src/services/models/Operation.ts +++ b/src/services/models/Operation.ts @@ -78,7 +78,6 @@ export class OperationModel implements IMenuItem { httpVerb: string; badges: OpenAPIXBadges[]; deprecated: boolean; - badges: OperationCustomBadge[]; path: string; servers: OpenAPIServer[]; security: SecurityRequirementModel[]; @@ -103,7 +102,6 @@ export class OperationModel implements IMenuItem { this.externalDocs = operationSpec.externalDocs; this.deprecated = !!operationSpec.deprecated; - this.badges = operationSpec['x-badges'] ? operationSpec['x-badges'] : []; this.httpVerb = operationSpec.httpVerb; this.deprecated = !!operationSpec.deprecated; this.operationId = operationSpec.operationId; diff --git a/src/types/open-api.ts b/src/types/open-api.ts index ea287b6d2..648d98e42 100644 --- a/src/types/open-api.ts +++ b/src/types/open-api.ts @@ -64,20 +64,6 @@ export interface OpenAPIPath { $ref?: string; } -export type OperationCustomBadgeType = - | 'primary' - | 'success' - | 'warning' - | 'error' - | 'global' - | 'usonly' - | 'experimental'; - -export interface OperationCustomBadge { - name: string; - type: OperationCustomBadgeType; -} - export interface OpenAPIXCodeSample { lang: string; label?: string; @@ -103,7 +89,6 @@ export interface OpenAPIOperation { deprecated?: boolean; security?: OpenAPISecurityRequirement[]; servers?: OpenAPIServer[]; - 'x-badges'?: OperationCustomBadge[]; 'x-codeSamples'?: OpenAPIXCodeSample[]; 'x-code-samples'?: OpenAPIXCodeSample[]; // deprecated 'x-badges'?: OpenAPIXBadges[]; diff --git a/src/utils/openapi.ts b/src/utils/openapi.ts index 4f068c80e..33e0193a2 100644 --- a/src/utils/openapi.ts +++ b/src/utils/openapi.ts @@ -663,7 +663,6 @@ export function isRedocExtension(key: string): boolean { 'x-badges': true, 'x-additionalPropertiesName': true, 'x-explicitMappingOnly': true, - 'x-badges': true, }; return key in redocExtensions;