Skip to content

Commit

Permalink
fix typecheck failure
Browse files Browse the repository at this point in the history
  • Loading branch information
adriantam committed Dec 21, 2023
1 parent f0586a8 commit 308dd36
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const BaseAuthzModelSnippetViewer: React.FC<AuthzModelSnippetViewerProps> = ({
showSchemaOneDotZero,
}) => {
if (onlyShow) {
return <AuthzModelCodeBlock configuration={configuration} syntaxFormat={onlyShow} skipVersion={skipVersion} />;
return <AuthzModelCodeBlock configuration={{ ...configuration, id: "" }} syntaxFormat={onlyShow} skipVersion={skipVersion} />;
}

if (!showSchemaOneDotZero) {
Expand All @@ -39,14 +39,14 @@ const BaseAuthzModelSnippetViewer: React.FC<AuthzModelSnippetViewerProps> = ({
<Tabs groupId="dsl">
<TabItem value="dsl" label="DSL">
<AuthzModelCodeBlock
configuration={configuration}
configuration={{ ...configuration, id: "" }}
syntaxFormat={SyntaxFormat.Friendly2}
skipVersion={skipVersion}
/>
</TabItem>
<TabItem value="json" label="JSON">
<AuthzModelCodeBlock
configuration={configuration}
configuration={{ ...configuration, id: "" }}
syntaxFormat={SyntaxFormat.Api}
skipVersion={skipVersion}
/>
Expand All @@ -61,21 +61,21 @@ const BaseAuthzModelSnippetViewer: React.FC<AuthzModelSnippetViewerProps> = ({
<Tabs groupId="dsl">
<TabItem value="dsl" label="DSL">
<AuthzModelCodeBlock
configuration={configuration}
configuration={{ ...configuration, id: "" }}
syntaxFormat={SyntaxFormat.Friendly2}
skipVersion={skipVersion}
/>
</TabItem>
<TabItem value="dsl-onedotzero" label="DSL (Version 1.0)">
<AuthzModelCodeBlock
configuration={{ ...configuration, schema_version: constants.enums.SchemaVersion.OneDotZero }}
configuration={{ ...configuration, schema_version: constants.enums.SchemaVersion.OneDotZero, id: "" }}
syntaxFormat={SyntaxFormat.Friendly2}
skipVersion={skipVersion}
/>
</TabItem>
<TabItem value="json" label="JSON">
<AuthzModelCodeBlock
configuration={configuration}
configuration={{ ...configuration, id: "" }}
syntaxFormat={SyntaxFormat.Api}
skipVersion={skipVersion}
/>
Expand Down Expand Up @@ -112,7 +112,7 @@ const AuthzModelSnippetViewer: React.FC<AuthzModelSnippetViewerProps> = ({
</div>
</Admonition>

<WriteAuthzModelViewer authorizationModel={configuration} skipSetup={true} />
<WriteAuthzModelViewer authorizationModel={{ ...configuration, id: "" }} skipSetup={true} />
</details>
) : undefined}
</>
Expand Down
5 changes: 3 additions & 2 deletions src/components/Docs/AuthorizationModel/SyntaxTransformer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export const loadSyntax = (
config = {
schema_version: SchemaVersion.OneDotOne,
type_definitions: [config as unknown as TypeDefinition],
id: ""
};
skipVersion = true;
} else if (!config.type_definitions) {
Expand All @@ -34,8 +35,8 @@ export const loadSyntax = (
case SyntaxFormat.Api:
default: {
return skipVersion
? JSON.stringify(config, null, ' ').replace(' "schema_version": "1.1",\n', '')
: JSON.stringify(config, null, ' ');
? JSON.stringify(config, null, ' ').replace(' "schema_version": "1.1",\n', '').replace(',\n "id": ""', '')
: JSON.stringify(config, null, ' ').replace(',\n "id": ""', '');
}
}
};

0 comments on commit 308dd36

Please sign in to comment.