Skip to content

Commit bf0077a

Browse files
authored
Merge pull request #104 from Exabyte-io/update/SOF-7411
SOF-7411: remove defaultClassNames from JSONSchemaFormDataProvider
2 parents 6546597 + dc44d42 commit bf0077a

File tree

3 files changed

+6
-35
lines changed

3 files changed

+6
-35
lines changed

dist/js/context/json_schema_provider.d.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,12 @@ interface JSONSchemaFormDataProviderConfig extends ContextProviderConfig {
1414
* ```
1515
*/
1616
declare class JSONSchemaFormDataProvider extends ContextProvider {
17-
defaultClassNames: string;
1817
isUsingJinjaVariables: boolean;
1918
constructor(config: JSONSchemaFormDataProviderConfig);
2019
get jsonSchema(): void;
2120
get uiSchema(): UiSchema;
2221
get fields(): {};
23-
get defaultFieldStyles(): {
24-
classNames: string;
25-
};
26-
fieldStyles(classNames: string, overrideDefault?: boolean): {
27-
classNames: string;
28-
};
22+
get defaultFieldStyles(): {};
2923
get uiSchemaStyled(): UiSchema;
3024
}
3125
export { JSONSchemaFormDataProvider };

dist/js/context/json_schema_provider.js

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,37 +19,26 @@ const provider_1 = require("./provider");
1919
class JSONSchemaFormDataProvider extends provider_1.ContextProvider {
2020
constructor(config) {
2121
super(config);
22-
this.defaultClassNames = "col-xs-12 col-sm-6 col-md-4 col-lg-3";
2322
this.isUsingJinjaVariables = Boolean(config === null || config === void 0 ? void 0 : config.isUsingJinjaVariables);
2423
}
25-
// eslint-disable-next-line class-methods-use-this
2624
get jsonSchema() {
2725
throw new Error("Not implemented.");
2826
}
29-
// eslint-disable-next-line class-methods-use-this
3027
get uiSchema() {
3128
throw new Error("Not implemented.");
3229
}
33-
// eslint-disable-next-line class-methods-use-this
3430
get fields() {
3531
return {};
3632
}
3733
get defaultFieldStyles() {
38-
return { classNames: this.defaultClassNames };
39-
}
40-
fieldStyles(classNames, overrideDefault = false) {
41-
let names = classNames;
42-
if (!overrideDefault)
43-
names += " " + this.defaultClassNames;
44-
return { classNames: names };
34+
return {};
4535
}
4636
get uiSchemaStyled() {
4737
const schema = this.uiSchema;
4838
// @ts-ignore
4939
return underscore_1.default.each(schema, (v, k, l) => {
5040
l[k] = { ...v, ...this.defaultFieldStyles };
51-
// @ts-ignore
52-
l[k].classNames = `${v.classNames || ""} ${this.defaultClassNames || ""}`;
41+
l[k].classNames = `${v.classNames || ""}`;
5342
return null;
5443
});
5544
}

src/js/context/json_schema_provider.ts

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable class-methods-use-this */
12
import { UiSchema } from "react-jsonschema-form";
23
import _ from "underscore";
34

@@ -18,48 +19,35 @@ interface JSONSchemaFormDataProviderConfig extends ContextProviderConfig {
1819
* ```
1920
*/
2021
class JSONSchemaFormDataProvider extends ContextProvider {
21-
defaultClassNames: string;
22-
2322
isUsingJinjaVariables: boolean;
2423

2524
constructor(config: JSONSchemaFormDataProviderConfig) {
2625
super(config);
27-
this.defaultClassNames = "col-xs-12 col-sm-6 col-md-4 col-lg-3";
2826
this.isUsingJinjaVariables = Boolean(config?.isUsingJinjaVariables);
2927
}
3028

31-
// eslint-disable-next-line class-methods-use-this
3229
get jsonSchema() {
3330
throw new Error("Not implemented.");
3431
}
3532

36-
// eslint-disable-next-line class-methods-use-this
3733
get uiSchema(): UiSchema {
3834
throw new Error("Not implemented.");
3935
}
4036

41-
// eslint-disable-next-line class-methods-use-this
4237
get fields() {
4338
return {};
4439
}
4540

4641
get defaultFieldStyles() {
47-
return { classNames: this.defaultClassNames };
48-
}
49-
50-
fieldStyles(classNames: string, overrideDefault = false): { classNames: string } {
51-
let names = classNames;
52-
if (!overrideDefault) names += " " + this.defaultClassNames;
53-
return { classNames: names };
42+
return {};
5443
}
5544

5645
get uiSchemaStyled(): UiSchema {
5746
const schema = this.uiSchema;
5847
// @ts-ignore
5948
return _.each<UiSchema>(schema, (v: UiSchema, k: string, l: UiSchema) => {
6049
l[k] = { ...v, ...this.defaultFieldStyles };
61-
// @ts-ignore
62-
l[k].classNames = `${v.classNames || ""} ${this.defaultClassNames || ""}`;
50+
l[k].classNames = `${v.classNames || ""}`;
6351
return null;
6452
});
6553
}

0 commit comments

Comments
 (0)