Merge pull request #450 from ylei-tsubame/tmp/rebuild

Web UI: patch #449

striker-ui-api/src/lib/consts/OS_LIST.ts

@@ -5,17 +5,19 @@ import SERVER_PATHS from './SERVER_PATHS';
 type OSKeyMapToName = Record<string, string>;
 
 const osList: string[] = execSync(
-  `${SERVER_PATHS.usr.sbin['striker-parse-os-list'].self} | ${SERVER_PATHS.usr.bin['sed'].self} -E 's/^.*name="os_list_([^"]+).*CDATA[[]([^]]+).*$/\\1,\\2/'`,
+  SERVER_PATHS.usr.sbin['striker-parse-os-list'].self,
   {
     encoding: 'utf-8',
     timeout: 10000,
   },
-).split('\n');
+)
-
+  .trim()
-osList.pop();
+  .split('\n');
 
 const osKeyMapToName: OSKeyMapToName = osList.reduce((map, csv) => {
-  const [osKey, osName] = csv.split(',', 2);
+  const [osKey, osName] = csv
+    .replace(/^key=([^\s]+),name=['"](.*)['"]$/, '$1,$2')
+    .split(',', 2);
 
   map[osKey] = osName;
 

striker-ui-api/src/lib/request_handlers/anvil/buildQueryAnvilDetail.ts

@@ -1,6 +1,6 @@
 import { dSize } from 'format-data-size';
 
-import { NODE_AND_DR_RESERVED_MEMORY_SIZE, OS_LIST } from '../../consts';
+import { NODE_AND_DR_RESERVED_MEMORY_SIZE, OS_LIST_MAP } from '../../consts';
 
 import join from '../../join';
 import { stdoutVar } from '../../shell';
@@ -320,7 +320,7 @@ const buildQueryAnvilDetail = ({
 
         results = {
           anvils: Object.values(anvils),
-          osList: OS_LIST,
+          oses: OS_LIST_MAP,
         };
       }
 

striker-ui/components/ProvisionServerDialog.tsx

@@ -1497,16 +1497,12 @@ const ProvisionServerDialog = ({
         });
 
         setOSAutocompleteOptions(
-          data.osList.map((keyValuePair: string) => {
+          Object.entries(data.oses as Record<string, string>).map(
-            const [osKey, osValue] = keyValuePair
+            ([key, label]) => ({
-              .replace(/^key=([^\s]+),name=['"](.*)['"]$/, '$1,$2')
+              key,
-              .split(',');
+              label,
-
-            return {
-              label: osValue,
-              key: osKey,
-            };
             }),
+          ),
         );
 
         setIsProvisionServerDataReady(true);

striker-ui/out/_next/static/4YSdIu7KT3DenHgC9VrZp/_buildManifest.js

@@ -1 +1 @@
-self.__BUILD_MANIFEST=function(s,a,c,e,t,n,i,f,d,b,u,k,h,j,r,g){return{__rewrites:{beforeFiles:[],afterFiles:[],fallback:[]},"/":[s,c,e,i,f,k,"static/chunks/717-8bd60b96d67fd464.js",a,t,n,d,h,j,"static/chunks/pages/index-7c2cb48473145987.js"],"/_error":["static/chunks/pages/_error-2280fa386d040b66.js"],"/anvil":[s,c,e,i,f,k,a,t,n,d,h,"static/chunks/pages/anvil-c0917177269e4c45.js"],"/config":[s,c,e,b,a,t,n,u,"static/chunks/pages/config-cb5dcd774a7f13bc.js"],"/file-manager":[s,c,e,i,"static/chunks/768-9ee3dcb62beecb53.js",a,t,"static/chunks/pages/file-manager-843b3cb0cc1119f6.js"],"/init":[s,c,i,f,b,r,a,t,n,d,g,"static/chunks/pages/init-124696b2707615f8.js"],"/login":[s,c,e,a,t,n,u,"static/chunks/pages/login-b5de0cd2f49998d6.js"],"/manage-element":[s,c,e,i,f,b,r,"static/chunks/195-d5fd184cc249f755.js",a,t,n,d,u,g,"static/chunks/pages/manage-element-c5172fe1e4c11fba.js"],"/server":[s,e,"static/chunks/227-a3756585a7ef09ae.js",a,j,"static/chunks/pages/server-db52258419acacf3.js"],sortedPages:["/","/_app","/_error","/anvil","/config","/file-manager","/init","/login","/manage-element","/server"]}}("static/chunks/382-f51344f6f9208507.js","static/chunks/62-532ed713980da8db.js","static/chunks/483-f8013e38dca1620d.js","static/chunks/894-e57948de523bcf96.js","static/chunks/780-e8b3396d257460a4.js","static/chunks/899-ec535b0f0a173e21.js","static/chunks/182-08683bbe95fbb010.js","static/chunks/614-0ce04fd295045ffe.js","static/chunks/140-ec935fb15330b98a.js","static/chunks/644-c7c6e21c71345aed.js","static/chunks/903-dc2a40be612a10c3.js","static/chunks/485-77798bccc4308d0e.js","static/chunks/825-f20d177b43a24683.js","static/chunks/94-e103c3735f0e061b.js","static/chunks/676-6159ce853338cc1f.js","static/chunks/86-a6f7430ac8a027ff.js"),self.__BUILD_MANIFEST_CB&&self.__BUILD_MANIFEST_CB();
+self.__BUILD_MANIFEST=function(s,a,c,e,t,n,i,f,d,b,u,k,h,j,r,g){return{__rewrites:{beforeFiles:[],afterFiles:[],fallback:[]},"/":[s,c,e,i,f,k,"static/chunks/717-8bd60b96d67fd464.js",a,t,n,d,h,j,"static/chunks/pages/index-7c2cb48473145987.js"],"/_error":["static/chunks/pages/_error-2280fa386d040b66.js"],"/anvil":[s,c,e,i,f,k,a,t,n,d,h,"static/chunks/pages/anvil-c0917177269e4c45.js"],"/config":[s,c,e,b,a,t,n,u,"static/chunks/pages/config-cb5dcd774a7f13bc.js"],"/file-manager":[s,c,e,i,"static/chunks/768-9ee3dcb62beecb53.js",a,t,"static/chunks/pages/file-manager-843b3cb0cc1119f6.js"],"/init":[s,c,i,f,b,r,a,t,n,d,g,"static/chunks/pages/init-124696b2707615f8.js"],"/login":[s,c,e,a,t,n,u,"static/chunks/pages/login-b5de0cd2f49998d6.js"],"/manage-element":[s,c,e,i,f,b,r,"static/chunks/195-d5fd184cc249f755.js",a,t,n,d,u,g,"static/chunks/pages/manage-element-c5172fe1e4c11fba.js"],"/server":[s,e,"static/chunks/227-a3756585a7ef09ae.js",a,j,"static/chunks/pages/server-db52258419acacf3.js"],sortedPages:["/","/_app","/_error","/anvil","/config","/file-manager","/init","/login","/manage-element","/server"]}}("static/chunks/382-f51344f6f9208507.js","static/chunks/62-532ed713980da8db.js","static/chunks/483-f8013e38dca1620d.js","static/chunks/894-e57948de523bcf96.js","static/chunks/780-e8b3396d257460a4.js","static/chunks/899-ec535b0f0a173e21.js","static/chunks/182-08683bbe95fbb010.js","static/chunks/614-0ce04fd295045ffe.js","static/chunks/140-ec935fb15330b98a.js","static/chunks/644-c7c6e21c71345aed.js","static/chunks/903-dc2a40be612a10c3.js","static/chunks/485-77798bccc4308d0e.js","static/chunks/825-1bb2d128cccc0e41.js","static/chunks/94-e103c3735f0e061b.js","static/chunks/676-6159ce853338cc1f.js","static/chunks/86-a6f7430ac8a027ff.js"),self.__BUILD_MANIFEST_CB&&self.__BUILD_MANIFEST_CB();