Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions redisinsight/api/config/default.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ export default {
pluginsAssets: join(staticDir, 'resources', 'plugins'),
commands: join(homedir, 'commands'),
defaultCommandsDir: join(defaultsDir, 'commands'),
guides: process.env.RI_GUIDES_PATH || join(homedir, 'guides'),
defaultGuides: join(defaultsDir, 'guides'),
tutorials: process.env.RI_TUTORIALS_PATH || join(homedir, 'tutorials'),
defaultTutorials: join(defaultsDir, 'tutorials'),
content: process.env.RI_CONTENT_PATH || join(homedir, 'content'),
Expand All @@ -47,7 +45,6 @@ export default {
globalPrefix: 'api',
customPluginsUri: '/plugins',
staticUri: '/static',
guidesUri: '/static/guides',
tutorialsUri: '/static/tutorials',
customTutorialsUri: '/static/custom-tutorials',
contentUri: '/static/content',
Expand Down Expand Up @@ -110,13 +107,6 @@ export default {
plugins: {
stateMaxSize: parseInt(process.env.RI_PLUGIN_STATE_MAX_SIZE, 10) || 1024 * 1024,
},
guides: {
updateUrl: process.env.RI_GUIDES_UPDATE_URL
|| 'https://github.com/RedisInsight/Guides/releases/download/2.x.x',
zip: process.env.RI_GUIDES_ZIP || dataZipFileName,
buildInfo: process.env.RI_GUIDES_INFO || buildInfoFileName,
devMode: !!process.env.RI_GUIDES_PATH,
},
tutorials: {
updateUrl: process.env.RI_TUTORIALS_UPDATE_URL
|| 'https://github.com/RedisInsight/Tutorials/releases/download/2.x.x',
Expand Down
1 change: 0 additions & 1 deletion redisinsight/api/config/production.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ export default {
customPlugins: join(homedir, 'plugins'),
customTutorials: join(homedir, 'custom-tutorials'),
commands: join(homedir, 'commands'),
guides: process.env.RI_GUIDES_PATH || join(homedir, 'guides'),
tutorials: process.env.RI_TUTORIALS_PATH || join(homedir, 'tutorials'),
content: process.env.RI_CONTENT_PATH || join(homedir, 'content'),
caCertificates: join(homedir, 'ca_certificates'),
Expand Down
1 change: 0 additions & 1 deletion redisinsight/api/config/staging.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ export default {
customPlugins: join(homedir, 'plugins'),
customTutorials: join(homedir, 'custom-tutorials'),
commands: join(homedir, 'commands'),
guides: process.env.RI_GUIDES_PATH || join(homedir, 'guides'),
tutorials: process.env.RI_TUTORIALS_PATH || join(homedir, 'tutorials'),
content: process.env.RI_CONTENT_PATH || join(homedir, 'content'),
caCertificates: join(homedir, 'ca_certificates'),
Expand Down
3 changes: 1 addition & 2 deletions redisinsight/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@
},
"scripts": {
"build:defaults:commands": "ts-node ./scripts/default-commands.ts",
"build:defaults:guides": "ts-node ./scripts/default-guides.ts",
"build:defaults:tutorials": "ts-node ./scripts/default-tutorials.ts",
"build:defaults:content": "ts-node ./scripts/default-content.ts",
"build:defaults": "yarn build:defaults:guides && yarn build:defaults:commands && yarn build:defaults:content && yarn build:defaults:tutorials",
"build:defaults": "yarn build:defaults:commands && yarn build:defaults:content && yarn build:defaults:tutorials",
"prebuild": "rimraf dist",
"build": "nest build",
"build:prod": "rimraf dist && nest build -p ./tsconfig.build.prod.json && cross-env NODE_ENV=production",
Expand Down
39 changes: 0 additions & 39 deletions redisinsight/api/scripts/default-guides.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import config from 'src/utils/config';
import { AutoUpdatedStaticsProvider } from './auto-updated-statics.provider';

const PATH_CONFIG = config.get('dir_path');
const GUIDES = config.get('guides');
const TUTORIALS = config.get('tutorials');

jest.mock('axios');
const mockedAxios = axios as jest.Mocked<typeof axios>;
Expand All @@ -26,13 +26,13 @@ describe('AutoUpdatedStaticsProvider', () => {
jest.mock('adm-zip', () => jest.fn().mockImplementation(() => mockedAdmZip));

service = new AutoUpdatedStaticsProvider({
name: 'GuidesProvider',
destinationPath: PATH_CONFIG.guides,
defaultSourcePath: PATH_CONFIG.defaultGuides,
updateUrl: GUIDES.updateUrl,
buildInfo: GUIDES.buildInfo,
zip: GUIDES.zip,
devMode: GUIDES.devMode,
name: 'TutorialsProvider',
destinationPath: PATH_CONFIG.tutorials,
defaultSourcePath: PATH_CONFIG.defaultTutorials,
updateUrl: TUTORIALS.updateUrl,
buildInfo: TUTORIALS.buildInfo,
zip: TUTORIALS.zip,
devMode: TUTORIALS.devMode,
});
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,12 @@ import { AutoUpdatedStaticsProvider } from './providers/auto-updated-statics.pro

const SERVER_CONFIG = config.get('server') as Config['server'];
const PATH_CONFIG = config.get('dir_path') as Config['dir_path'];
const GUIDES_CONFIG = config.get('guides') as Config['guides'];
const TUTORIALS_CONFIG = config.get('tutorials') as Config['tutorials'];

const CONTENT_CONFIG = config.get('content');

@Module({
imports: [
ServeStaticModule.forRoot({
serveRoot: SERVER_CONFIG.guidesUri,
rootPath: join(PATH_CONFIG.guides),
serveStaticOptions: {
fallthrough: false,
},
}),
ServeStaticModule.forRoot({
serveRoot: SERVER_CONFIG.tutorialsUri,
rootPath: join(PATH_CONFIG.tutorials),
Expand Down Expand Up @@ -64,15 +56,6 @@ const CONTENT_CONFIG = config.get('content');
}),
],
providers: [
{
provide: 'GuidesProvider',
useFactory: () => new AutoUpdatedStaticsProvider({
name: 'GuidesProvider',
destinationPath: PATH_CONFIG.guides,
defaultSourcePath: PATH_CONFIG.defaultGuides,
...GUIDES_CONFIG,
}),
},
{
provide: 'TutorialsProvider',
useFactory: () => new AutoUpdatedStaticsProvider({
Expand Down